[Printing] Fix ups and Implementations.

WinSpool : Implement missing API. Sync/Port from wine. Setting it to fast track for needed testing of the later GDI code. Leaving Fix-me debug prints on.
Local tree has WinSpool_winetest turned on. So no debug noise during normal ReactOS operation.

SpoolSS : Reordered header types. Have more Spl function to be added while SpoolSV is being coded to forward to LocalSpl.

Based on wine and old research from the GDI code.

Author: jimtabor

win32ss/printing/base/printui/printui.spec

@@ -1,6 +1,6 @@
 @ stub ConnectToPrinterDlg
 @ stub ConnectToPrinterPropertyPage
-@ stub ConstructPrinterFriendlyName
+@ stdcall -stub ConstructPrinterFriendlyName(wstr wstr ptr)
 @ stub -private DllCanUnloadNow
 @ stub -private DllGetClassObject
 @ stub DocumentPropertiesWrap

win32ss/printing/base/spoolss/memory.c

@@ -111,6 +111,7 @@ DllAllocSplMem(DWORD dwBytes)
 BOOL WINAPI
 DllFreeSplMem(PVOID pMem)
 {
+    if ( !pMem ) return TRUE;
     return HeapFree(hProcessHeap, 0, pMem);
 }
 
@@ -128,7 +129,9 @@ DllFreeSplMem(PVOID pMem)
 BOOL WINAPI
 DllFreeSplStr(PWSTR pwszString)
 {
-    return HeapFree(hProcessHeap, 0, pwszString);
+    if ( pwszString )
+       return HeapFree(hProcessHeap, 0, pwszString);
+    return FALSE;
 }
 
 /**

win32ss/printing/base/spoolss/precomp.h

@@ -52,12 +52,4 @@ SPOOLSS_PRINTER_HANDLE, *PSPOOLSS_PRINTER_HANDLE;
 extern HANDLE hProcessHeap;
 extern LIST_ENTRY PrintProviderList;
 
-// spoolfile.c
-typedef struct _FILE_INFO_1
-{
-    BOOL   bInheritHandle;
-    HANDLE hSpoolFileHandle;
-    DWORD  dwOptions;
-} FILE_INFO_1, *PFILE_INFO_1;
-
 #endif

win32ss/printing/base/spoolsv/precomp.h

@@ -28,27 +28,4 @@ WINE_DEFAULT_DEBUG_CHANNEL(spoolsv);
 // rpcserver.c
 DWORD WINAPI LrpcThreadProc(LPVOID lpParameter);
 
-// spoolfile.c
-BOOL WINAPI
-SplGetSpoolFileInfo(
-    HANDLE hPrinter,
-    HANDLE hProcessHandle,
-    DWORD Level,
-    WINSPOOL_FILE_INFO_1 *pFileInfo,
-    DWORD dwSize,
-    DWORD* dwNeeded );
-
-BOOL WINAPI
-SplCommitSpoolData(
-    HANDLE hPrinter,
-    HANDLE hProcessHandle,
-    DWORD cbCommit,
-    DWORD Level,
-    WINSPOOL_FILE_INFO_1 *pFileInfo,
-    DWORD dwSize,
-    DWORD* dwNeeded );
-
-BOOL WINAPI
-SplCloseSpoolFileHandle( HANDLE hPrinter );
-
 #endif

win32ss/printing/base/spoolsv/spoolfile.c

@@ -19,7 +19,7 @@ _RpcGetSpoolFileInfo( WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_HANDLE hProcess
         return dwErrorCode;
     }
 
-    if (!SplGetSpoolFileInfo( hPrinter, hProcessHandle, Level, pFileInfo, dwSize, dwNeeded ) )
+    if (!SplGetSpoolFileInfo( hPrinter, hProcessHandle, Level, (FILE_INFO_1*)pFileInfo, dwSize, dwNeeded ) )
         dwErrorCode = GetLastError();
 
     RpcRevertToSelf();
@@ -38,7 +38,7 @@ _RpcCommitSpoolData( WINSPOOL_PRINTER_HANDLE hPrinter, WINSPOOL_HANDLE hProcessH
         return dwErrorCode;
     }
 
-    if (!SplCommitSpoolData( hPrinter, hProcessHandle, cbCommit, Level, pFileInfo, dwSize, dwNeeded ) )
+    if (!SplCommitSpoolData( hPrinter, hProcessHandle, cbCommit, Level, (FILE_INFO_1*)pFileInfo, dwSize, dwNeeded ) )
         dwErrorCode = GetLastError();
 
     RpcRevertToSelf();
@@ -61,7 +61,7 @@ _RpcGetSpoolFileInfo2( WINSPOOL_PRINTER_HANDLE hPrinter, DWORD dwProcessId, DWOR
     hProcessHandle = OpenProcess( PROCESS_DUP_HANDLE, FALSE, dwProcessId );
 
 
-    if (!SplGetSpoolFileInfo( hPrinter, hProcessHandle, Level, pFileInfoContainer->FileInfo.pFileInfo1, sizeof(WINSPOOL_FILE_INFO_1), &dwNeeded ) )
+    if (!SplGetSpoolFileInfo( hPrinter, hProcessHandle, Level, (FILE_INFO_1*)pFileInfoContainer->FileInfo.pFileInfo1, sizeof(FILE_INFO_1), &dwNeeded ) )
         dwErrorCode = GetLastError();
 
     if ( hProcessHandle )
@@ -88,7 +88,7 @@ _RpcCommitSpoolData2( WINSPOOL_PRINTER_HANDLE hPrinter, DWORD dwProcessId, DWORD
 
     hProcessHandle = OpenProcess( PROCESS_DUP_HANDLE, FALSE, dwProcessId );
 
-    if (!SplCommitSpoolData( hPrinter, hProcessHandle, cbCommit, Level, pFileInfoContainer->FileInfo.pFileInfo1, sizeof(WINSPOOL_FILE_INFO_1), &dwNeeded ) )
+    if (!SplCommitSpoolData( hPrinter, hProcessHandle, cbCommit, Level, (FILE_INFO_1*)pFileInfoContainer->FileInfo.pFileInfo1, sizeof(FILE_INFO_1), &dwNeeded ) )
         dwErrorCode = GetLastError();
 
     if ( hProcessHandle )

win32ss/printing/base/winspool/CMakeLists.txt

@@ -16,6 +16,7 @@ list(APPEND SOURCE
     printers.c
     printprocessors.c
     printproviders.c
+    spoolfile.c
     utils.c
     ${CMAKE_CURRENT_BINARY_DIR}/winspool_c.c)
 
@@ -31,6 +32,6 @@ add_library(winspool MODULE
 set_target_properties(winspool PROPERTIES SUFFIX ".drv")
 set_module_type(winspool win32dll UNICODE)
 target_link_libraries(winspool wine ${PSEH_LIB})
-add_importlibs(winspool advapi32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
+add_importlibs(winspool advapi32 gdi32 user32 rpcrt4 msvcrt kernel32 ntdll)
 add_pch(winspool precomp.h "${PCH_SKIP_SOURCE}")
 add_cd_file(TARGET winspool DESTINATION reactos/system32 FOR all)

win32ss/printing/base/winspool/devmode.c

@@ -234,15 +234,63 @@ IsValidDevmodeW(PDEVMODEW pDevmode, size_t DevmodeSize)
     return FALSE;
 }
 
-void RosConvertAnsiDevModeToUnicodeDevmode(PDEVMODEA pDevModeInput, PDEVMODEW pDevModeOutput)
+BOOL WINAPI
+IsValidDevmodeNoSizeW(PDEVMODEW pDevmode)
+{
+    PMINIMUM_SIZE_TABLE pTable = MinimumSizeW;
+    WORD wRequiredSize;
+
+    TRACE("IsValidDevmodeNoSizeW(%p)\n", pDevmode);
+
+    // Check if a Devmode was given at all.
+    if (!pDevmode)
+        goto Failure;
+
+    // If the structure has private members, the public structure must be 32-bit packed.
+    if (pDevmode->dmDriverExtra && pDevmode->dmSize % 4)
+        goto Failure;
+
+    // Now determine the minimum possible dmSize based on the given fields in dmFields.
+    wRequiredSize = FIELD_OFFSET(DEVMODEW, dmFields) + RTL_FIELD_SIZE(DEVMODEW, dmFields);
+
+    while (pTable->dwField)
+    {
+        if (pDevmode->dmFields & pTable->dwField)
+        {
+            wRequiredSize = pTable->wSize;
+            break;
+        }
+
+        pTable++;
+    }
+
+    // Verify that the value in dmSize is big enough for the used fields.
+    if (pDevmode->dmSize < wRequiredSize)
+        goto Failure;
+
+    // Check if dmDeviceName and (if used) dmFormName are null-terminated.
+    // Fix this if they aren't.
+    _FixStringW(pDevmode->dmDeviceName, sizeof(pDevmode->dmDeviceName));
+    if (pDevmode->dmFields & DM_FORMNAME)
+        _FixStringW(pDevmode->dmFormName, sizeof(pDevmode->dmFormName));
+
+    // Return success without setting the error code.
+    return TRUE;
+
+Failure:
+    SetLastError(ERROR_INVALID_DATA);
+    return FALSE;
+}
+
+void RosConvertAnsiDevModeToUnicodeDevmode(PDEVMODEA pDevModeInput, PDEVMODEW *pDevModeOutput)
 {
     // FIXME: This function should become ConvertAnsiDevModeToUnicodeDevmode when its parameters are known!
 
     // Check if a pDevModeInput and pDevModeOutput are both not NULL.
     if (!pDevModeInput || !pDevModeOutput)
         return;
 
-    pDevModeOutput = GdiConvertToDevmodeW(pDevModeInput);
+    *pDevModeOutput = GdiConvertToDevmodeW(pDevModeInput);
 }
 
 // Internal counterpart to GdiConvertToDevmodeW from gdi32
@@ -304,11 +352,15 @@ _ConvertToDevmodeA(const DEVMODEW *dmW)
 
 void RosConvertUnicodeDevModeToAnsiDevmode(PDEVMODEW pDevModeInput, PDEVMODEA pDevModeOutput)
 {
+    PDEVMODEA pTmp;
+
     // FIXME: This function should become ConvertUnicodeDevModeToAnsiDevmode when its parameters are known!
 
     // Check if a pDevModeInput and pDevModeOutput are both not NULL.
     if (!pDevModeInput || !pDevModeOutput)
         return;
 
-    pDevModeOutput = _ConvertToDevmodeA(pDevModeInput);
+    pTmp = _ConvertToDevmodeA(pDevModeInput);
+    memcpy( pDevModeOutput, pTmp, pTmp->dmSize + pTmp->dmDriverExtra); // Copy into a Wide char (Larger) buffer.
+    HeapFree(hProcessHeap, 0, pTmp);
 }