[PATCH 0/2] MR1670: winprint: bug fixes

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1670

[PATCH 1/2] winprint: Fix parameters validation in EnumPrintProcessorDatatypesW.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/winprint/printproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c
index d7d9cce9d93..8ea3557b3bc 100644
--- a/dlls/winprint/printproc.c
+++ b/dlls/winprint/printproc.c
@@ -81,7 +81,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesW(WCHAR *server, WCHAR *name, DWORD level
     *no = 0;
     *needed = sizeof(*info) + sizeof(raw);
 
-    if (level != 1 || !datatypes)
+    if (level != 1 || (size && !datatypes))
     {
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/1670

[PATCH 2/2] winprint: Fix datatype validation in PrintDocumentOnPrintProcessor.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/winprint/printproc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/winprint/printproc.c b/dlls/winprint/printproc.c
index 8ea3557b3bc..03275bb4afb 100644
--- a/dlls/winprint/printproc.c
+++ b/dlls/winprint/printproc.c
@@ -111,7 +111,7 @@ HANDLE WINAPI OpenPrintProcessor(WCHAR *port, PRINTPROCESSOROPENDATA *open_data)
         SetLastError(ERROR_INVALID_PARAMETER);
         return NULL;
     }
-    if (!wcscmp(open_data->pDatatype, L"RAW"))
+    if (wcscmp(open_data->pDatatype, L"RAW"))
     {
         SetLastError(ERROR_INVALID_DATATYPE);
         return NULL;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1670

[PATCH 0/2] MR1670: winprint: bug fixes - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1670