[PATCH] spoolss: Move routing functions to a seperate file
Detlef Riekenberg
wine.dev at web.de
Fri Feb 6 02:35:13 CST 2009
---
dlls/spoolss/Makefile.in | 1 +
dlls/spoolss/router.c | 271 +++++++++++++++++++++++++++++++++++++++++++
dlls/spoolss/spoolss.h | 45 +++++++
dlls/spoolss/spoolss_main.c | 86 +-------------
4 files changed, 320 insertions(+), 83 deletions(-)
create mode 100644 dlls/spoolss/router.c
create mode 100644 dlls/spoolss/spoolss.h
diff --git a/dlls/spoolss/Makefile.in b/dlls/spoolss/Makefile.in
index 35e7038..f90808f 100644
--- a/dlls/spoolss/Makefile.in
+++ b/dlls/spoolss/Makefile.in
@@ -7,6 +7,7 @@ IMPORTLIB = spoolss
IMPORTS = winspool kernel32
C_SRCS = \
+ router.c \
spoolss_main.c
@MAKE_DLL_RULES@
diff --git a/dlls/spoolss/router.c b/dlls/spoolss/router.c
new file mode 100644
index 0000000..6d861ba
--- /dev/null
+++ b/dlls/spoolss/router.c
@@ -0,0 +1,271 @@
+/*
+ * Routing for Spooler-Service helper DLL
+ *
+ * Copyright 2006-2009 Detlef Riekenberg
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+
+#include "wingdi.h"
+#include "winspool.h"
+#include "ddk/winsplp.h"
+#include "spoolss.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(spoolss);
+
+/* ################################ */
+
+#define MAX_BACKEND 3
+
+typedef struct {
+ /* PRINTPROVIDOR functions */
+ DWORD (WINAPI *fpOpenPrinter)(LPWSTR, HANDLE *, LPPRINTER_DEFAULTSW);
+ DWORD (WINAPI *fpSetJob)(HANDLE, DWORD, DWORD, LPBYTE, DWORD);
+ DWORD (WINAPI *fpGetJob)(HANDLE, DWORD, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumJobs)(HANDLE, DWORD, DWORD, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ HANDLE (WINAPI *fpAddPrinter)(LPWSTR, DWORD, LPBYTE);
+ DWORD (WINAPI *fpDeletePrinter)(HANDLE);
+ DWORD (WINAPI *fpSetPrinter)(HANDLE, DWORD, LPBYTE, DWORD);
+ DWORD (WINAPI *fpGetPrinter)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumPrinters)(DWORD, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpAddPrinterDriver)(LPWSTR, DWORD, LPBYTE);
+ DWORD (WINAPI *fpEnumPrinterDrivers)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpGetPrinterDriver)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpGetPrinterDriverDirectory)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpDeletePrinterDriver)(LPWSTR, LPWSTR, LPWSTR);
+ DWORD (WINAPI *fpAddPrintProcessor)(LPWSTR, LPWSTR, LPWSTR, LPWSTR);
+ DWORD (WINAPI *fpEnumPrintProcessors)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpGetPrintProcessorDirectory)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpDeletePrintProcessor)(LPWSTR, LPWSTR, LPWSTR);
+ DWORD (WINAPI *fpEnumPrintProcessorDatatypes)(LPWSTR, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpStartDocPrinter)(HANDLE, DWORD, LPBYTE);
+ DWORD (WINAPI *fpStartPagePrinter)(HANDLE);
+ DWORD (WINAPI *fpWritePrinter)(HANDLE, LPVOID, DWORD, LPDWORD);
+ DWORD (WINAPI *fpEndPagePrinter)(HANDLE);
+ DWORD (WINAPI *fpAbortPrinter)(HANDLE);
+ DWORD (WINAPI *fpReadPrinter)(HANDLE, LPVOID, DWORD, LPDWORD);
+ DWORD (WINAPI *fpEndDocPrinter)(HANDLE);
+ DWORD (WINAPI *fpAddJob)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpScheduleJob)(HANDLE, DWORD);
+ DWORD (WINAPI *fpGetPrinterData)(HANDLE, LPWSTR, LPDWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpSetPrinterData)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD);
+ DWORD (WINAPI *fpWaitForPrinterChange)(HANDLE, DWORD);
+ DWORD (WINAPI *fpClosePrinter)(HANDLE);
+ DWORD (WINAPI *fpAddForm)(HANDLE, DWORD, LPBYTE);
+ DWORD (WINAPI *fpDeleteForm)(HANDLE, LPWSTR);
+ DWORD (WINAPI *fpGetForm)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpSetForm)(HANDLE, LPWSTR, DWORD, LPBYTE);
+ DWORD (WINAPI *fpEnumForms)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumMonitors)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumPorts)(LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpAddPort)(LPWSTR, HWND, LPWSTR);
+ DWORD (WINAPI *fpConfigurePort)(LPWSTR, HWND, LPWSTR);
+ DWORD (WINAPI *fpDeletePort)(LPWSTR, HWND, LPWSTR);
+ HANDLE (WINAPI *fpCreatePrinterIC)(HANDLE, LPDEVMODEW);
+ DWORD (WINAPI *fpPlayGdiScriptOnPrinterIC)(HANDLE, LPBYTE, DWORD, LPBYTE, DWORD, DWORD);
+ DWORD (WINAPI *fpDeletePrinterIC)(HANDLE);
+ DWORD (WINAPI *fpAddPrinterConnection)(LPWSTR);
+ DWORD (WINAPI *fpDeletePrinterConnection)(LPWSTR);
+ DWORD (WINAPI *fpPrinterMessageBox)(HANDLE, DWORD, HWND, LPWSTR, LPWSTR, DWORD);
+ DWORD (WINAPI *fpAddMonitor)(LPWSTR, DWORD, LPBYTE);
+ DWORD (WINAPI *fpDeleteMonitor)(LPWSTR, LPWSTR, LPWSTR);
+ DWORD (WINAPI *fpResetPrinter)(HANDLE, LPPRINTER_DEFAULTSW);
+ DWORD (WINAPI *fpGetPrinterDriverEx)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, LPDWORD, DWORD, DWORD, PDWORD, PDWORD);
+ HANDLE (WINAPI *fpFindFirstPrinterChangeNotification)(HANDLE, DWORD, DWORD, LPVOID);
+ DWORD (WINAPI *fpFindClosePrinterChangeNotification)(HANDLE);
+ DWORD (WINAPI *fpAddPortEx)(HANDLE, LPWSTR, DWORD, LPBYTE, LPWSTR);
+ DWORD (WINAPI *fpShutDown)(LPVOID);
+ DWORD (WINAPI *fpRefreshPrinterChangeNotification)(HANDLE, DWORD, PVOID, PVOID);
+ DWORD (WINAPI *fpOpenPrinterEx)(LPWSTR, LPHANDLE, LPPRINTER_DEFAULTSW, LPBYTE, DWORD);
+ HANDLE (WINAPI *fpAddPrinterEx)(LPWSTR, DWORD, LPBYTE, LPBYTE, DWORD);
+ DWORD (WINAPI *fpSetPort)(LPWSTR, LPWSTR, DWORD, LPBYTE);
+ DWORD (WINAPI *fpEnumPrinterData)(HANDLE, DWORD, LPWSTR, DWORD, LPDWORD, LPDWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpDeletePrinterData)(HANDLE, LPWSTR);
+ DWORD (WINAPI *fpClusterSplOpen)(LPCWSTR, LPCWSTR, PHANDLE, LPCWSTR, LPCWSTR);
+ DWORD (WINAPI *fpClusterSplClose)(HANDLE);
+ DWORD (WINAPI *fpClusterSplIsAlive)(HANDLE);
+ DWORD (WINAPI *fpSetPrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR, DWORD, LPBYTE, DWORD);
+ DWORD (WINAPI *fpGetPrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR, LPDWORD, LPBYTE, DWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumPrinterDataEx)(HANDLE, LPCWSTR, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpEnumPrinterKey)(HANDLE, LPCWSTR, LPWSTR, DWORD, LPDWORD);
+ DWORD (WINAPI *fpDeletePrinterDataEx)(HANDLE, LPCWSTR, LPCWSTR);
+ DWORD (WINAPI *fpDeletePrinterKey)(HANDLE hPrinter, LPCWSTR pKeyName);
+ DWORD (WINAPI *fpSeekPrinter)(HANDLE, LARGE_INTEGER, PLARGE_INTEGER, DWORD, BOOL);
+ DWORD (WINAPI *fpDeletePrinterDriverEx)(LPWSTR, LPWSTR, LPWSTR, DWORD, DWORD);
+ DWORD (WINAPI *fpAddPerMachineConnection)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR);
+ DWORD (WINAPI *fpDeletePerMachineConnection)(LPCWSTR, LPCWSTR);
+ DWORD (WINAPI *fpEnumPerMachineConnections)(LPCWSTR, LPBYTE, DWORD, LPDWORD, LPDWORD);
+ DWORD (WINAPI *fpXcvData)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD);
+ DWORD (WINAPI *fpAddPrinterDriverEx)(LPWSTR, DWORD, LPBYTE, DWORD);
+ DWORD (WINAPI *fpSplReadPrinter)(HANDLE, LPBYTE *, DWORD);
+ DWORD (WINAPI *fpDriverUnloadComplete)(LPWSTR);
+ DWORD (WINAPI *fpGetSpoolFileInfo)(HANDLE, LPWSTR *, LPHANDLE, HANDLE, HANDLE);
+ DWORD (WINAPI *fpCommitSpoolData)(HANDLE, DWORD);
+ DWORD (WINAPI *fpCloseSpoolFileHandle)(HANDLE);
+ DWORD (WINAPI *fpFlushPrinter)(HANDLE, LPBYTE, DWORD, LPDWORD, DWORD);
+ DWORD (WINAPI *fpSendRecvBidiData)(HANDLE, LPCWSTR, LPBIDI_REQUEST_CONTAINER, LPBIDI_RESPONSE_CONTAINER *);
+ DWORD (WINAPI *fpAddDriverCatalog)(HANDLE, DWORD, VOID *, DWORD);
+ /* Private Data */
+ HMODULE dll;
+ LPWSTR dllname;
+ LPWSTR name;
+ LPWSTR regroot;
+ DWORD index;
+} backend_t;
+
+/* ################################ */
+
+static backend_t *backend[MAX_BACKEND] = {NULL};
+static DWORD used_backends = 0;
+
+static CRITICAL_SECTION backend_cs;
+static CRITICAL_SECTION_DEBUG backend_cs_debug =
+{
+ 0, 0, &backend_cs,
+ { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList },
+ 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") }
+};
+static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 };
+
+/* ################################ */
+
+static WCHAR localsplW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0};
+
+/******************************************************************
+ * strdupW [internal]
+ *
+ * create a copy of a unicode-string
+ *
+ */
+
+static LPWSTR strdupW(LPCWSTR p)
+{
+ LPWSTR ret;
+ DWORD len;
+
+ if(!p) return NULL;
+ len = (lstrlenW(p) + 1) * sizeof(WCHAR);
+ ret = heap_alloc(len);
+ memcpy(ret, p, len);
+ return ret;
+}
+
+/******************************************************************
+ * backend_unload_all [internal]
+ *
+ * unload all backends
+ */
+void backend_unload_all(void)
+{
+ EnterCriticalSection(&backend_cs);
+ while (used_backends > 0) {
+ used_backends--;
+ FreeLibrary(backend[used_backends]->dll);
+ heap_free(backend[used_backends]->dllname);
+ heap_free(backend[used_backends]->name);
+ heap_free(backend[used_backends]->regroot);
+ heap_free(backend[used_backends]);
+ backend[used_backends] = NULL;
+ }
+ LeaveCriticalSection(&backend_cs);
+}
+
+/******************************************************************************
+ * backend_load [internal]
+ *
+ * load and init a backend
+ *
+ * PARAMS
+ * name [I] Printprovider to use for the backend. NULL for the local print provider
+ *
+ * RETURNS
+ * Success: PTR to the backend
+ * Failure: NULL
+ *
+ */
+static backend_t * backend_load(LPWSTR dllname, LPWSTR name, LPWSTR regroot)
+{
+
+ BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR);
+ DWORD id;
+ DWORD res;
+
+ EnterCriticalSection(&backend_cs);
+ id = used_backends;
+
+ backend[id] = heap_alloc_zero(sizeof(backend_t));
+ if (!backend[id]) return NULL;
+
+ backend[id]->dllname = strdupW(dllname);
+ backend[id]->name = strdupW(name);
+ backend[id]->regroot = strdupW(regroot);
+
+ backend[id]->dll = LoadLibraryW(dllname);
+ if (backend[id]->dll) {
+ pInitializePrintProvidor = (void *) GetProcAddress(backend[id]->dll, "InitializePrintProvidor");
+ if (pInitializePrintProvidor) {
+
+ /* native localspl does not clear unused entries */
+ res = pInitializePrintProvidor((PRINTPROVIDOR *) backend[id], sizeof(PRINTPROVIDOR), regroot);
+ if (res) {
+ used_backends++;
+ backend[id]->index = used_backends;
+ LeaveCriticalSection(&backend_cs);
+ TRACE("--> backend #%d: %p (%s)\n", id, backend[id], debugstr_w(dllname));
+ return backend[id];
+ }
+ }
+ FreeLibrary(backend[id]->dll);
+ }
+ heap_free(backend[id]->dllname);
+ heap_free(backend[id]->name);
+ heap_free(backend[id]->regroot);
+ heap_free(backend[id]);
+ backend[id] = NULL;
+ LeaveCriticalSection(&backend_cs);
+ WARN("failed to init %s: %u\n", debugstr_w(dllname), GetLastError());
+ return NULL;
+}
+
+/******************************************************************************
+ * backend_load_all [internal]
+ *
+ * load and init all backends
+ *
+ * RETURNS
+ * Success: TRUE
+ * Failure: FALSE
+ *
+ */
+BOOL backend_load_all(void)
+{
+ backend_t * pb;
+
+ pb = backend_load(localsplW, NULL, NULL);
+
+ /* ToDo: parse the registry and load all other backends */
+
+ return (pb != NULL);
+}
+
diff --git a/dlls/spoolss/spoolss.h b/dlls/spoolss/spoolss.h
new file mode 100644
index 0000000..0720474
--- /dev/null
+++ b/dlls/spoolss/spoolss.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2006-2009 Detlef Riekenberg
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "windef.h"
+#include "winbase.h"
+
+/* ################################ */
+
+BOOL backend_load_all(void);
+void backend_unload_all(void);
+
+/* ## Memory allocation functions ## */
+
+static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len )
+{
+ return HeapAlloc( GetProcessHeap(), 0, len );
+}
+
+static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len )
+{
+ return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len );
+}
+
+static inline BOOL heap_free( void *mem )
+{
+ return HeapFree( GetProcessHeap(), 0, mem );
+}
+
+
+
diff --git a/dlls/spoolss/spoolss_main.c b/dlls/spoolss/spoolss_main.c
index cc4487c..9f248f0 100644
--- a/dlls/spoolss/spoolss_main.c
+++ b/dlls/spoolss/spoolss_main.c
@@ -28,6 +28,7 @@
#include "wingdi.h"
#include "winspool.h"
#include "ddk/winsplp.h"
+#include "spoolss.h"
#include "wine/debug.h"
@@ -35,92 +36,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolss);
/* ################################ */
-static CRITICAL_SECTION backend_cs;
-static CRITICAL_SECTION_DEBUG backend_cs_debug =
-{
- 0, 0, &backend_cs,
- { &backend_cs_debug.ProcessLocksList, &backend_cs_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": backend_cs") }
-};
-static CRITICAL_SECTION backend_cs = { &backend_cs_debug, -1, 0, 0, 0, 0 };
-
-/* ################################ */
-
static HMODULE hwinspool;
-static HMODULE hlocalspl;
-static BOOL (WINAPI *pInitializePrintProvidor)(LPPRINTPROVIDOR, DWORD, LPWSTR);
-
-static PRINTPROVIDOR * backend;
-/* ################################ */
-
-static const WCHAR localspldllW[] = {'l','o','c','a','l','s','p','l','.','d','l','l',0};
static const WCHAR winspooldrvW[] = {'w','i','n','s','p','o','o','l','.','d','r','v',0};
/******************************************************************************
- * backend_load [internal]
- *
- * load and init our backend (the local printprovider: "localspl.dll")
- *
- * PARAMS
- *
- * RETURNS
- * Success: TRUE
- * Failure: FALSE and RPC_S_SERVER_UNAVAILABLE
- *
- * NOTES
- * In windows, the spooler router (spoolss.dll) support multiple
- * printprovider (localspl.dll for the local system)
- *
- */
-static BOOL backend_load(void)
-{
- static PRINTPROVIDOR mybackend;
- DWORD res;
-
- if (backend) return TRUE;
-
- EnterCriticalSection(&backend_cs);
- hlocalspl = LoadLibraryW(localspldllW);
- if (hlocalspl) {
- pInitializePrintProvidor = (void *) GetProcAddress(hlocalspl, "InitializePrintProvidor");
- if (pInitializePrintProvidor) {
-
- /* native localspl does not clear unused entries */
- memset(&mybackend, 0, sizeof(mybackend));
- res = pInitializePrintProvidor(&mybackend, sizeof(mybackend), NULL);
- if (res) {
- backend = &mybackend;
- LeaveCriticalSection(&backend_cs);
- TRACE("backend: %p (%p)\n", backend, hlocalspl);
- return TRUE;
- }
- }
- FreeLibrary(hlocalspl);
- }
-
- LeaveCriticalSection(&backend_cs);
-
- WARN("failed to load the backend: %u\n", GetLastError());
- SetLastError(RPC_S_SERVER_UNAVAILABLE);
- return FALSE;
-}
-
-/******************************************************************
- * unload_backend [internal]
- *
- */
-static void backend_unload(void)
-{
- EnterCriticalSection(&backend_cs);
- if (backend) {
- backend = NULL;
- FreeLibrary(hlocalspl);
- }
- LeaveCriticalSection(&backend_cs);
-}
-
-/******************************************************************************
*
*/
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
@@ -135,7 +55,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
break;
case DLL_PROCESS_DETACH:
- backend_unload();
+ backend_unload_all();
break;
}
}
@@ -267,7 +187,7 @@ BOOL WINAPI ImpersonatePrinterClient(HANDLE hToken)
BOOL WINAPI InitializeRouter(void)
{
TRACE("()\n");
- return backend_load();
+ return backend_load_all();
}
/******************************************************************
--
1.5.4.3
--=-FhTPQV9v46UtF+M7+PTk--
More information about the wine-patches
mailing list