projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[LOCALSPL]
[reactos.git]
/
reactos
/
win32ss
/
printing
/
providers
/
localspl
/
main.c
diff --git
a/reactos/win32ss/printing/providers/localspl/main.c
b/reactos/win32ss/printing/providers/localspl/main.c
index
c9b3e73
..
458edba
100644
(file)
--- a/
reactos/win32ss/printing/providers/localspl/main.c
+++ b/
reactos/win32ss/printing/providers/localspl/main.c
@@
-2,7
+2,7
@@
* PROJECT: ReactOS Local Spooler
* LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation
* PURPOSE: Main functions
* PROJECT: ReactOS Local Spooler
* LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation
* PURPOSE: Main functions
- * COPYRIGHT: Copyright 2015 Colin Finck <colin@reactos.org>
+ * COPYRIGHT: Copyright 2015
-2017
Colin Finck <colin@reactos.org>
*/
#include "precomp.h"
*/
#include "precomp.h"
@@
-12,23
+12,14
@@
WCHAR wszSpoolDirectory[MAX_PATH];
DWORD cchSpoolDirectory;
// Global Constants
DWORD cchSpoolDirectory;
// Global Constants
-const WCHAR wszCurrentEnvironment[] =
-#if defined(_X86_)
- L"Windows NT x86";
-#elif defined(_AMD64_)
- L"Windows x64";
-#elif defined(_ARM_)
- L"Windows ARM";
-#else
- #error Unsupported architecture
-#endif
+#include <prtprocenv.h>
const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document";
const WCHAR* wszPrintProviderInfo[3] = {
L"Windows NT Local Print Providor", // Name
const WCHAR wszDefaultDocumentName[] = L"Local Downlevel Document";
const WCHAR* wszPrintProviderInfo[3] = {
L"Windows NT Local Print Providor", // Name
- L"
Windows NT Local Printers", // Description
- L"
Locally connected Printers" // Comment
+ L"
Locally connected Printers", // Comment
+ L"
Windows NT Local Printers" // Description
};
// Local Constants
};
// Local Constants
@@
-57,7
+48,7
@@
static const PRINTPROVIDOR _PrintProviderFunctions = {
LocalWritePrinter, // fpWritePrinter
LocalEndPagePrinter, // fpEndPagePrinter
NULL, // fpAbortPrinter
LocalWritePrinter, // fpWritePrinter
LocalEndPagePrinter, // fpEndPagePrinter
NULL, // fpAbortPrinter
-
NULL,
// fpReadPrinter
+
LocalReadPrinter,
// fpReadPrinter
LocalEndDocPrinter, // fpEndDocPrinter
LocalAddJob, // fpAddJob
LocalScheduleJob, // fpScheduleJob
LocalEndDocPrinter, // fpEndDocPrinter
LocalAddJob, // fpAddJob
LocalScheduleJob, // fpScheduleJob
@@
-70,8
+61,8
@@
static const PRINTPROVIDOR _PrintProviderFunctions = {
NULL, // fpGetForm
NULL, // fpSetForm
NULL, // fpEnumForms
NULL, // fpGetForm
NULL, // fpSetForm
NULL, // fpEnumForms
-
NULL,
// fpEnumMonitors
-
NULL,
// fpEnumPorts
+
LocalEnumMonitors,
// fpEnumMonitors
+
LocalEnumPorts,
// fpEnumPorts
NULL, // fpAddPort
NULL, // fpConfigurePort
NULL, // fpDeletePort
NULL, // fpAddPort
NULL, // fpConfigurePort
NULL, // fpDeletePort
@@
-142,13
+133,16
@@
DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
_GetSpoolDirectory();
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
_GetSpoolDirectory();
- InitializePrintProcessorList();
- InitializePrinterList();
- InitializeGlobalJobList();
- break;
- }
- return TRUE;
+ return InitializePrintMonitorList() &&
+ InitializePortList() &&
+ InitializePrintProcessorList() &&
+ InitializePrinterList() &&
+ InitializeGlobalJobList();
+
+ default:
+ return TRUE;
+ }
}
BOOL WINAPI
}
BOOL WINAPI