commit d8f9c1c076cdf80d981f9a9bf8e366f53d706c4b
author Steven Edwards <steven_ed4153@yahoo.com> Fri Jan 02 20:15:05 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jan 02 20:15:05 2004 +0000
tree c0c7f169d1c4ed494f4715a5050dd1bb8a027428
parent 092f7dd35268239ab70704457ef98bbf334dce6f

Fix compiling netapi32 on MSVC with PSDK headers.

dlls/netapi32/nbcmdqueue.c

diff --git a/dlls/netapi32/nbcmdqueue.c b/dlls/netapi32/nbcmdqueue.c
index 15af9dd..ef6ad86 100644
--- a/dlls/netapi32/nbcmdqueue.c
+++ b/dlls/netapi32/nbcmdqueue.c
@@ -27,8 +27,8 @@
     PNCB             head;
 };
 
-#define CANCEL_EVENT_PTR(ncb) (PHANDLE)((ncb)->ncb_reserved)
-#define NEXT_PTR(ncb) (PNCB *)((ncb)->ncb_reserved + sizeof(HANDLE))
+#define CANCEL_EVENT_PTR(ncb) (PHANDLE)((ncb)->ncb_reserve)
+#define NEXT_PTR(ncb) (PNCB *)((ncb)->ncb_reserve + sizeof(HANDLE))
 
 /* The reserved area of an ncb will be used for the following data:
  * - a cancelled flag (BOOL, 4 bytes??)

dlls/netapi32/nbt.c

diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
index 728d85f..82941c4 100644
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -838,7 +838,7 @@
                 astat->adapter_type = 0xff;
             else
                 astat->adapter_type = 0xfe; /* for Ethernet */
-            astat->max_sess_pktsize = 0xffff;
+            astat->max_sess_pkt_size = 0xffff;
             astat->xmit_success = adapter->xmit_success;
             astat->recv_success = adapter->recv_success;
         }

dlls/netapi32/netbios.h

diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h
index 1fe50c7..0130aaf 100644
--- a/dlls/netapi32/netbios.h
+++ b/dlls/netapi32/netbios.h
@@ -132,7 +132,7 @@
  * some calls (recv) will block indefinitely, so a reset, shutdown, etc. will
  * never occur.
  */
-#define NCB_CANCELLED(pncb) *(PBOOL)((pncb)->ncb_reserved)
+#define NCB_CANCELLED(pncb) *(PBOOL)((pncb)->ncb_reserve)
 
 typedef UCHAR (*NetBIOSAstat)(void *adapter, PNCB ncb);
 typedef UCHAR (*NetBIOSFindName)(void *adapter, PNCB ncb);

include/nb30.h

diff --git a/include/nb30.h b/include/nb30.h
index b3c7591..e746dd9 100644
--- a/include/nb30.h
+++ b/include/nb30.h
@@ -70,7 +70,11 @@
 	VOID	(CALLBACK *ncb_post)(struct _NCB *);
 	UCHAR	ncb_lana_num;
 	UCHAR	ncb_cmd_cplt;
-	UCHAR	ncb_reserved[10];
+#ifdef _WIN64
+	UCHAR	ncb_reserve[18];
+#else
+	UCHAR	ncb_reserve[10];
+#endif
 	HANDLE	ncb_event;
 } NCB, *PNCB;
 
@@ -101,7 +105,7 @@
 	WORD	pending_sess;
 	WORD	max_cfg_sess;
 	WORD	max_sess;
-	WORD	max_sess_pktsize;
+	WORD	max_sess_pkt_size;
 	WORD	name_count;
 } ADAPTER_STATUS, *PADAPTER_STATUS;