Eric Pouech : nsi: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4481d0359c7e246271c5b6aaa0078aad4f52d70b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4481d0359c7e246271c5b6aaa...

Author: Eric Pouech 
Date:   Mon Feb 21 07:59:55 2022 +0100

nsi: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Huw Davies 
Signed-off-by: Alexandre Julliard

---

dlls/nsi/Makefile.in | 1 -
 dlls/nsi/nsi.c       | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/nsi/Makefile.in b/dlls/nsi/Makefile.in
index 8fac9224923..2d3d98f69d0 100644
--- a/dlls/nsi/Makefile.in
+++ b/dlls/nsi/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = nsi.dll
 IMPORTLIB = nsi

diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c
index 08aec49257a..efb10c0f615 100644
--- a/dlls/nsi/nsi.c
+++ b/dlls/nsi/nsi.c
@@ -44,7 +44,7 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR
     DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size };
     int i, attempt;

-    TRACE( "%d %p %d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key_data, key_size,
+    TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key_data, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 );

for (attempt = 0; attempt < 5; attempt++)
@@ -95,7 +95,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_
     struct nsi_enumerate_all_ex params;
     DWORD err;

-    TRACE( "%d %d %p %d %p %d %p %d %p %d %p %d %p\n", unk, unk2, module, table, key_data, key_size,
+    TRACE( "%ld %ld %p %ld %p %ld %p %ld %p %ld %p %ld %p\n", unk, unk2, module, table, key_data, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count );

params.unknown[0] = 0;
@@ -184,7 +184,7 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t
 {
     struct nsi_get_all_parameters_ex params;

-    TRACE( "%d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key, key_size,
+    TRACE( "%ld %p %ld %p %ld %p %ld %p %ld %p %ld\n", unk, module, table, key, key_size,
            rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size );

params.unknown[0] = 0;
@@ -257,7 +257,7 @@ DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table
 {
     struct nsi_get_parameter_ex params;

-    TRACE( "%d %p %d %p %d %d %p %d %d\n", unk, module, table, key, key_size,
+    TRACE( "%ld %p %ld %p %ld %ld %p %ld %ld\n", unk, module, table, key, key_size,
            param_type, data, data_size, data_offset );

params.unknown[0] = 0;