From 08332f4d3da4c7897872c4f552ea33116fd3440a Mon Sep 17 00:00:00 2001
From: Eric Pouech <eric.pouech@gmail.com>
Date: Thu, 17 Feb 2022 07:11:01 +0100
Subject: [PATCH] prntvpt: Enable compilation with long types.

Signed-off-by: Eric Pouech <eric.pouech@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/prntvpt/Makefile.in |  1 -
 dlls/prntvpt/main.c      |  4 ++--
 dlls/prntvpt/ticket.c    | 14 +++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in
index 7c581662357..77eaf354224 100644
--- a/dlls/prntvpt/Makefile.in
+++ b/dlls/prntvpt/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = prntvpt.dll
 IMPORTLIB = prntvpt
 IMPORTS   = winspool ole32 oleaut32
diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c
index d6ad0cff46a..e046c6cbaed 100644
--- a/dlls/prntvpt/main.c
+++ b/dlls/prntvpt/main.c
@@ -76,7 +76,7 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid
 {
     DWORD used_version;
 
-    TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider);
+    TRACE("%s, %ld, %p\n", debugstr_w(printer), version, provider);
 
     if (version != 1) return E_INVALIDARG;
 
@@ -87,7 +87,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p
 {
     struct prn_provider *prov;
 
-    TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version);
+    TRACE("%s, %ld, %ld, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version);
 
     if (!max_version || !provider || !used_version)
         return E_INVALIDARG;
diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c
index 13aaf80423f..e43cda8be6b 100644
--- a/dlls/prntvpt/ticket.c
+++ b/dlls/prntvpt/ticket.c
@@ -574,7 +574,7 @@ static void set_SelectionNamespaces(IXMLDOMDocument2 *doc)
                 {
                     if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6))
                     {
-                        TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var)));
+                        TRACE("ns[%ld]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var)));
                         IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL);
                         IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL);
                         IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL);
@@ -1174,7 +1174,7 @@ while (0)
     CHECK_FIELD(DM_DITHERTYPE);
     CHECK_FIELD(DM_PANNINGWIDTH);
     CHECK_FIELD(DM_PANNINGHEIGHT);
-    if (fields) TRACE(" %#x", fields);
+    if (fields) TRACE(" %#lx", fields);
     TRACE("\n");
 #undef CHECK_FIELD
 }
@@ -1192,7 +1192,7 @@ static void dump_devmode(const DEVMODEW *dm)
     TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion);
     TRACE("dmSize: 0x%04x\n", dm->dmSize);
     TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra);
-    TRACE("dmFields: 0x%04x\n", dm->dmFields);
+    TRACE("dmFields: 0x%04lx\n", dm->dmFields);
     dump_fields(dm->dmFields);
     TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation);
     TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize);
@@ -1209,9 +1209,9 @@ static void dump_devmode(const DEVMODEW *dm)
     TRACE("dmCollate: %d\n", dm->dmCollate);
     TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName));
     TRACE("dmLogPixels %u\n", dm->dmLogPixels);
-    TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel);
-    TRACE("dmPelsWidth %u\n", dm->dmPelsWidth);
-    TRACE("dmPelsHeight %u\n", dm->dmPelsHeight);
+    TRACE("dmBitsPerPel %lu\n", dm->dmBitsPerPel);
+    TRACE("dmPelsWidth %lu\n", dm->dmPelsWidth);
+    TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight);
 }
 
 HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm,
@@ -1221,7 +1221,7 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P
     struct ticket ticket;
     HRESULT hr;
 
-    TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream);
+    TRACE("%p,%lu,%p,%d,%p\n", provider, size, dm, scope, stream);
 
     if (!is_valid_provider(provider) || !dm || !stream)
         return E_INVALIDARG;