netapi32: Win64 printf format warning fixes.

dlls/netapi32/Makefile.in

-EXTRADEFS = -D_SVRAPI_ -DWINE_NO_LONG_AS_INT
+EXTRADEFS = -D_SVRAPI_
 TOPSRCDIR = @top_srcdir@
 TOPOBJDIR = ../..
 SRCDIR    = @srcdir@

dlls/netapi32/access.c

@@ -104,7 +104,7 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername,
                   DWORD level, LPBYTE bufptr, LPDWORD parm_err)
 {
     NET_API_STATUS status;
-    FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err);
+    FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err);
 
     status = NETAPI_ValidateServername(servername);
     if (status != NERR_Success)
@@ -113,9 +113,9 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername,
     if ((bufptr != NULL) && (level > 0) && (level <= 4))
     {
         PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr;
-        TRACE("usri%ld_name: %s\n", level, debugstr_w(ui->usri1_name));
-        TRACE("usri%ld_password: %s\n", level, debugstr_w(ui->usri1_password));
-        TRACE("usri%ld_comment: %s\n", level, debugstr_w(ui->usri1_comment));
+        TRACE("usri%d_name: %s\n", level, debugstr_w(ui->usri1_name));
+        TRACE("usri%d_password: %s\n", level, debugstr_w(ui->usri1_password));
+        TRACE("usri%d_comment: %s\n", level, debugstr_w(ui->usri1_comment));
     }
     return status;
 }
@@ -147,7 +147,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level,
                LPBYTE* bufptr)
 {
     NET_API_STATUS status;
-    TRACE("(%s, %s, %ld, %p)\n", debugstr_w(servername), debugstr_w(username),
+    TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username),
           level, bufptr);
     status = NETAPI_ValidateServername(servername);
     if (status != NERR_Success)
@@ -293,11 +293,11 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level,
     case 1052:
     case 1053:
     {
-        FIXME("Level %ld is not implemented\n", level);
+        FIXME("Level %d is not implemented\n", level);
         return NERR_InternalError;
     }
     default:
-        ERR("Invalid level %ld is specified\n", level);
+        ERR("Invalid level %d is specified\n", level);
         return ERROR_INVALID_LEVEL;
     }
     return NERR_Success;
@@ -311,7 +311,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level,
                       DWORD flags, LPBYTE* bufptr, DWORD prefmaxlen,
                       LPDWORD entriesread, LPDWORD totalentries)
 {
-    FIXME("(%s, %s, %ld, %08lx, %p %ld, %p, %p) stub!\n",
+    FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n",
           debugstr_w(servername), debugstr_w(username), level, flags, bufptr,
           prefmaxlen, entriesread, totalentries);
     return NERR_InternalError;
@@ -325,7 +325,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr,
 	    DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries,
 	    LPDWORD resume_handle)
 {
-  FIXME("(%s,%ld, 0x%ld,%p,%ld,%p,%p,%p) stub!\n", debugstr_w(servername), level,
+  FIXME("(%s,%d, 0x%d,%p,%d,%p,%p,%p) stub!\n", debugstr_w(servername), level,
         filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
 
   return ERROR_ACCESS_DENIED;
@@ -454,7 +454,7 @@ NetQueryDisplayInformation(
     DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount,
     PVOID *SortedBuffer)
 {
-    TRACE("(%s, %ld, %ld, %ld, %ld, %p, %p)\n", debugstr_w(ServerName),
+    TRACE("(%s, %d, %d, %d, %d, %p, %p)\n", debugstr_w(ServerName),
           Level, Index, EntriesRequested, PreferredMaximumLength,
           ReturnedEntryCount, SortedBuffer);
     NETAPI_ForceLocalComputer(ServerName, ERROR_ACCESS_DENIED);
@@ -479,7 +479,7 @@ NetQueryDisplayInformation(
          */
         int records = 3;
 
-        FIXME("Level %ld partially implemented\n", Level);
+        FIXME("Level %d partially implemented\n", Level);
         *ReturnedEntryCount = records;
         comment_sz = 1;
         full_name_sz = 1;
@@ -539,12 +539,12 @@ NetQueryDisplayInformation(
     case 2:
     case 3:
     {
-        FIXME("Level %ld is not implemented\n", Level);
+        FIXME("Level %d is not implemented\n", Level);
         break;
     }
 
     default:
-        ERR("Invalid level %ld is specified\n", Level);
+        ERR("Invalid level %d is specified\n", Level);
         return ERROR_INVALID_LEVEL;
     }
     return NERR_Success;
@@ -594,7 +594,7 @@ NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr)
 NET_API_STATUS WINAPI NetUserModalsGet(
     LPCWSTR szServer, DWORD level, LPBYTE *pbuffer)
 {
-    TRACE("(%s %ld %p)\n", debugstr_w(szServer), level, pbuffer);
+    TRACE("(%s %d %p)\n", debugstr_w(szServer), level, pbuffer);
     
     switch (level)
     {
@@ -627,7 +627,7 @@ NET_API_STATUS WINAPI NetUserModalsGet(
                                      &policyHandle);
             if (ntStatus != STATUS_SUCCESS)
             {
-                WARN("LsaOpenPolicy failed with NT status %lx\n",
+                WARN("LsaOpenPolicy failed with NT status %x\n",
                      LsaNtStatusToWinError(ntStatus));
                 return ntStatus;
             }
@@ -637,7 +637,7 @@ NET_API_STATUS WINAPI NetUserModalsGet(
                                                  (PVOID *)&domainInfo);
             if (ntStatus != STATUS_SUCCESS)
             {
-                WARN("LsaQueryInformationPolicy failed with NT status %lx\n",
+                WARN("LsaQueryInformationPolicy failed with NT status %x\n",
                      LsaNtStatusToWinError(ntStatus));
                 LsaClose(policyHandle);
                 return ntStatus;
@@ -681,7 +681,7 @@ NET_API_STATUS WINAPI NetUserModalsGet(
             *pbuffer = NULL;
             return NERR_InternalError;
         default:
-            WARN("Invalid level %ld is specified\n", level);
+            WARN("Invalid level %d is specified\n", level);
             *pbuffer = NULL;
             return ERROR_INVALID_LEVEL;
     }

dlls/netapi32/apibuf.c

@@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
  */
 NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer)
 {
-    TRACE("(%ld, %p)\n", ByteCount, Buffer);
+    TRACE("(%d, %p)\n", ByteCount, Buffer);
 
     if (Buffer == NULL) return ERROR_INVALID_PARAMETER;
     *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount);
@@ -61,7 +61,7 @@ NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer)
 NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount,
                                              LPVOID* NewBuffer)
 {
-    TRACE("(%p, %ld, %p)\n", OldBuffer, NewByteCount, NewBuffer);
+    TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer);
     if (NewByteCount) 
     {
         if (OldBuffer)
@@ -89,7 +89,7 @@ NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount)
     if (Buffer == NULL)
         return ERROR_INVALID_PARAMETER;
     dw = HeapSize(GetProcessHeap(), 0, Buffer);
-    TRACE("size: %ld\n", dw);
+    TRACE("size: %d\n", dw);
     if (dw != 0xFFFFFFFF)
         *ByteCount = dw;
     else

dlls/netapi32/ds.c

@@ -37,7 +37,7 @@ DWORD WINAPI DsGetDcNameW(LPCWSTR ComputerName, LPCWSTR AvoidDCName,
  GUID* DomainGuid, LPCWSTR SiteName, ULONG Flags,
  PDOMAIN_CONTROLLER_INFOW *DomainControllerInfo)
 {
-    FIXME("(%s, %s, %s, %s, %08lx, %p): stub\n", debugstr_w(ComputerName),
+    FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_w(ComputerName),
      debugstr_w(AvoidDCName), debugstr_guid(DomainGuid),
      debugstr_w(SiteName), Flags, DomainControllerInfo);
     return ERROR_CALL_NOT_IMPLEMENTED;
@@ -47,7 +47,7 @@ DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName,
  GUID* DomainGuid, LPCSTR SiteName, ULONG Flags,
  PDOMAIN_CONTROLLER_INFOA *DomainControllerInfo)
 {
-    FIXME("(%s, %s, %s, %s, %08lx, %p): stub\n", debugstr_a(ComputerName),
+    FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_a(ComputerName),
      debugstr_a(AvoidDCName), debugstr_guid(DomainGuid),
      debugstr_a(SiteName), Flags, DomainControllerInfo);
     return ERROR_CALL_NOT_IMPLEMENTED;
@@ -117,7 +117,7 @@ DWORD WINAPI DsRoleGetPrimaryDomainInformation(
              POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle);
             if (NtStatus != STATUS_SUCCESS)
             {
-                ERR("LsaOpenPolicyFailed with NT status %lx\n",
+                ERR("LsaOpenPolicyFailed with NT status %x\n",
                     LsaNtStatusToWinError(NtStatus));
                 return ERROR_OUTOFMEMORY;
             }

dlls/netapi32/local_group.c

@@ -47,7 +47,7 @@ NET_API_STATUS WINAPI NetLocalGroupAdd(
     LPBYTE buf,
     LPDWORD parm_err)
 {
-    FIXME("(%s %ld %p %p) stub!\n", debugstr_w(servername), level, buf,
+    FIXME("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf,
           parm_err);
     return NERR_Success;
 }
@@ -75,7 +75,7 @@ NET_API_STATUS WINAPI NetLocalGroupAddMembers(
     LPBYTE buf,
     DWORD totalentries)
 {
-    FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername),
           debugstr_w(groupname), level, buf, totalentries);
     return NERR_Success;
 }
@@ -114,7 +114,7 @@ NET_API_STATUS WINAPI NetLocalGroupDelMembers(
     LPBYTE buf,
     DWORD totalentries)
 {
-    FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername),
           debugstr_w(groupname), level, buf, totalentries);
     return NERR_Success;
 }
@@ -131,7 +131,7 @@ NET_API_STATUS WINAPI NetLocalGroupEnum(
     LPDWORD totalentries,
     PDWORD_PTR resumehandle)
 {
-    FIXME("(%s %ld %p %ld %p %p %p) stub!\n", debugstr_w(servername),
+    FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername),
           level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle);
     *entriesread = 0;
     *totalentries = 0;
@@ -147,7 +147,7 @@ NET_API_STATUS WINAPI NetLocalGroupGetInfo(
     DWORD level,
     LPBYTE* bufptr)
 {
-    FIXME("(%s %s %ld %p) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p) stub!\n", debugstr_w(servername),
           debugstr_w(groupname), level, bufptr);
     return NERR_Success;
 }
@@ -165,7 +165,7 @@ NET_API_STATUS WINAPI NetLocalGroupGetMembers(
     LPDWORD totalentries,
     PDWORD_PTR resumehandle)
 {
-    FIXME("(%s %s %ld %p %ld, %p %p %p) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername),
           debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread,
           totalentries, resumehandle);
     return NERR_Success;
@@ -181,7 +181,7 @@ NET_API_STATUS WINAPI NetLocalGroupSetInfo(
     LPBYTE buf,
     LPDWORD parm_err)
 {
-    FIXME("(%s %s %ld %p %p) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p %p) stub!\n", debugstr_w(servername),
           debugstr_w(groupname), level, buf, parm_err);
     return NERR_Success;
 }
@@ -196,7 +196,7 @@ NET_API_STATUS WINAPI NetLocalGroupSetMembers(
     LPBYTE buf,
     DWORD totalentries)
 {
-    FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername),
+    FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername),
             debugstr_w(groupname), level, buf, totalentries);
     return NERR_Success;
 }

dlls/netapi32/nbt.c

@@ -1111,7 +1111,7 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb)
     }
     else if (bytesSent < NBSS_HDRSIZE + ncb->ncb_length)
     {
-        FIXME("Only sent %ld bytes (of %d), hanging up session\n", bytesSent,
+        FIXME("Only sent %d bytes (of %d), hanging up session\n", bytesSent,
          NBSS_HDRSIZE + ncb->ncb_length);
         NetBIOSHangupSession(ncb);
         ret = NRC_SABORT;

dlls/netapi32/netapi32.c

@@ -28,7 +28,7 @@ HMODULE NETAPI32_hModule = 0;
 
 BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
-    TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved);
+    TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved);
 
     switch (fdwReason) {
         case DLL_PROCESS_ATTACH:
@@ -64,7 +64,7 @@ NET_API_STATUS  WINAPI NetServerEnum(
   LPDWORD resume_handle
 )
 {
-    FIXME("Stub (%s %ld %p %ld %p %p %ld %s %p)\n", debugstr_w(servername),
+    FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(servername),
      level, bufptr, prefmaxlen, entriesread, totalentries, servertype,
      debugstr_w(domain), resume_handle);
 
@@ -85,7 +85,7 @@ NET_API_STATUS WINAPI NetServerEnumEx(
     LPCWSTR domain,
     LPCWSTR FirstNameToReturn)
 {
-    FIXME("Stub (%s %ld %p %ld %p %p %ld %s %p)\n", debugstr_w(ServerName),
+    FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(ServerName),
      Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype,
      debugstr_w(domain), debugstr_w(FirstNameToReturn));
                                                                                 
@@ -97,7 +97,7 @@ NET_API_STATUS WINAPI NetServerEnumEx(
  */
 NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bufptr)
 {
-    FIXME("stub (%p, %ld, %p)\n", servername, level, bufptr);
+    FIXME("stub (%p, %d, %p)\n", servername, level, bufptr);
     return ERROR_ACCESS_DENIED;
 }
 
@@ -109,7 +109,7 @@ NET_API_STATUS WINAPI NetStatisticsGet(LPWSTR server, LPWSTR service,
                                        DWORD level, DWORD options,
                                        LPBYTE *bufptr)
 {
-    TRACE("(%p, %p, %ld, %ld, %p)\n", server, service, level, options, bufptr);
+    TRACE("(%p, %p, %d, %d, %p)\n", server, service, level, options, bufptr);
     return NERR_InternalError;
 }
 

dlls/netapi32/netbios.c

@@ -130,7 +130,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport)
 {
     BOOL ret;
 
-    TRACE(": transport 0x%08lx, p %p\n", id, transport);
+    TRACE(": transport 0x%08x, p %p\n", id, transport);
     if (!transport)
         ret = FALSE;
     else if (gNumTransports >= sizeof(gTransports) / sizeof(gTransports[0]))
@@ -147,7 +147,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport)
         {
             if (gTransports[i].id == id)
             {
-                WARN("Replacing NetBIOS transport ID %ld\n", id);
+                WARN("Replacing NetBIOS transport ID %d\n", id);
                 memcpy(&gTransports[i].transport, transport,
                  sizeof(NetBIOSTransport));
                 ret = TRUE;
@@ -175,7 +175,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data)
     BOOL ret;
     UCHAR i;
 
-    TRACE(": transport 0x%08lx, ifIndex 0x%08lx, data %p\n", transport, ifIndex,
+    TRACE(": transport 0x%08x, ifIndex 0x%08x, data %p\n", transport, ifIndex,
      data);
     for (i = 0; i < gNumTransports && gTransports[i].id != transport; i++)
         ;
@@ -183,7 +183,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data)
     {
         NetBIOSTransport *transportPtr = &gTransports[i].transport;
 
-        TRACE(": found transport %p for id 0x%08lx\n", transportPtr, transport);
+        TRACE(": found transport %p for id 0x%08x\n", transportPtr, transport);
 
         EnterCriticalSection(&gNBTable.cs);
         ret = FALSE;
@@ -292,7 +292,7 @@ UCHAR NetBIOSNumAdapters(void)
 void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb,
  void *closure)
 {
-    TRACE("transport 0x%08lx, callback %p, closure %p\n", transport, cb,
+    TRACE("transport 0x%08x, callback %p, closure %p\n", transport, cb,
      closure);
     if (cb)
     {

dlls/netapi32/share.c

@@ -51,7 +51,7 @@ NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName,
     LPWSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread,
     LPDWORD totalentries, LPDWORD resume_handle)
 {
-    FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername),
+    FIXME("Stub (%s %s %s %d %p %d %p %p %p)\n", debugstr_w(servername),
         debugstr_w(UncClientName), debugstr_w(username),
         level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle);
 
@@ -78,7 +78,7 @@ NET_API_STATUS WINAPI NetSessionEnum(LPWSTR servername, LPWSTR UncClientName,
 NET_API_STATUS WINAPI NetShareEnum( LPWSTR servername, DWORD level, LPBYTE* bufptr,
     DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle)
 {
-    FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr,
+    FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(servername), level, bufptr,
         prefmaxlen, entriesread, totalentries, resume_handle);
 
     return ERROR_NOT_SUPPORTED;

dlls/netapi32/wksta.c

@@ -255,7 +255,7 @@ NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
 {
     NET_API_STATUS ret;
 
-    TRACE(":%s, 0x%08lx, %p, 0x%08lx, %p, %p, %p\n", debugstr_w(ServerName), 
+    TRACE(":%s, 0x%08x, %p, 0x%08x, %p, %p, %p\n", debugstr_w(ServerName), 
      level, pbuf, prefmaxlen, read_entries, total_entries,hresume);
     if (!NETAPI_IsLocalComputer(ServerName))
     {
@@ -296,7 +296,7 @@ NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
                 break;
             }
             default:
-                ERR("Invalid level %ld is specified\n", level);
+                ERR("Invalid level %d is specified\n", level);
                 ret = ERROR_INVALID_LEVEL;
         }
     }
@@ -310,7 +310,7 @@ NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf,
 NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
                                           PBYTE* bufptr)
 {
-    TRACE("(%s, %ld, %p)\n", debugstr_w(reserved), level, bufptr);
+    TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr);
     switch (level)
     {
     case 0:
@@ -367,7 +367,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
                                  &PolicyHandle);
         if (NtStatus != STATUS_SUCCESS)
         {
-            ERR("LsaOpenPolicyFailed with NT status %lx\n",
+            ERR("LsaOpenPolicyFailed with NT status %x\n",
                 LsaNtStatusToWinError(NtStatus));
             NetApiBufferFree(ui0);
             return ERROR_NOT_ENOUGH_MEMORY;
@@ -427,7 +427,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level,
         break;
     }
     default:
-        ERR("Invalid level %ld is specified\n", level);
+        ERR("Invalid level %d is specified\n", level);
         return ERROR_INVALID_LEVEL;
     }
     return NERR_Success;
@@ -476,7 +476,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level,
 {
     NET_API_STATUS ret;
 
-    TRACE("%s %ld %p\n", debugstr_w( servername ), level, bufptr );
+    TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr );
     if (servername)
     {
         if (!NETAPI_IsLocalComputer(servername))
@@ -543,7 +543,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LPWSTR servername, DWORD level,
         }
 
         default:
-            FIXME("level %ld unimplemented\n", level);
+            FIXME("level %d unimplemented\n", level);
             ret = ERROR_INVALID_LEVEL;
     }
     return ret;