Eric Pouech : netapi32: In unixlib, don't use Windows long type.

Alexandre Julliard julliard at winehq.org
Tue Feb 1 15:21:35 CST 2022


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

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Tue Feb  1 14:06:27 2022 +0100

netapi32: In unixlib, don't use Windows long type.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/netapi32/unixlib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/netapi32/unixlib.c b/dlls/netapi32/unixlib.c
index c6b389950f7..19132791567 100644
--- a/dlls/netapi32/unixlib.c
+++ b/dlls/netapi32/unixlib.c
@@ -132,7 +132,7 @@ static NET_API_STATUS server_info_101_from_samba( const unsigned char *buf, void
     return NERR_Success;
 }
 
-static NET_API_STATUS server_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size )
+static NET_API_STATUS server_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size )
 {
     switch (level)
     {
@@ -438,9 +438,9 @@ static unsigned char ace_flags_to_samba( BYTE flags )
 #define GENERIC_WRITE_ACCESS   (1u << 30)
 #define GENERIC_READ_ACCESS    (1u << 31)
 
-static unsigned int access_mask_to_samba( DWORD mask )
+static unsigned int access_mask_to_samba( unsigned int mask )
 {
-    static const DWORD known_rights =
+    static const unsigned int known_rights =
         GENERIC_ALL | GENERIC_EXECUTE | GENERIC_WRITE | GENERIC_READ;
     unsigned int ret = 0;
 
@@ -692,7 +692,7 @@ static NET_API_STATUS share_info_502_to_samba( const BYTE *buf, unsigned char **
     return NERR_Success;
 }
 
-static NET_API_STATUS share_info_to_samba( DWORD level, const BYTE *buf, unsigned char **bufptr )
+static NET_API_STATUS share_info_to_samba( unsigned int level, const BYTE *buf, unsigned char **bufptr )
 {
     switch (level)
     {
@@ -793,7 +793,7 @@ static NET_API_STATUS wksta_info_100_from_samba( const unsigned char *buf, void
     return NERR_Success;
 }
 
-static NET_API_STATUS wksta_info_from_samba( DWORD level, const unsigned char *buf, void *buffer, ULONG *size )
+static NET_API_STATUS wksta_info_from_samba( unsigned int level, const unsigned char *buf, void *buffer, ULONG *size )
 {
     switch (level)
     {
@@ -826,7 +826,7 @@ static NTSTATUS wksta_getinfo( void *args )
 
 static NTSTATUS netapi_init( void *args )
 {
-    DWORD status;
+    unsigned int status;
     void *ctx;
 
     if (!(libnetapi_handle = dlopen( SONAME_LIBNETAPI, RTLD_NOW )))




More information about the wine-cvs mailing list