From d8f9c1c076cdf80d981f9a9bf8e366f53d706c4b Mon Sep 17 00:00:00 2001
From: Steven Edwards <steven_ed4153@yahoo.com>
Date: Fri, 2 Jan 2004 20:15:05 +0000
Subject: [PATCH] Fix compiling netapi32 on MSVC with PSDK headers.

---
 dlls/netapi32/nbcmdqueue.c | 4 ++--
 dlls/netapi32/nbt.c        | 2 +-
 dlls/netapi32/netbios.h    | 2 +-
 include/nb30.h             | 8 ++++++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/netapi32/nbcmdqueue.c b/dlls/netapi32/nbcmdqueue.c
index 15af9dd2e4e..ef6ad86bc1f 100644
--- a/dlls/netapi32/nbcmdqueue.c
+++ b/dlls/netapi32/nbcmdqueue.c
@@ -27,8 +27,8 @@ struct NBCmdQueue
     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??)
diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c
index 728d85f54d3..82941c4538f 100644
--- a/dlls/netapi32/nbt.c
+++ b/dlls/netapi32/nbt.c
@@ -838,7 +838,7 @@ static UCHAR NetBTAstat(void *adapt, PNCB ncb)
                 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;
         }
diff --git a/dlls/netapi32/netbios.h b/dlls/netapi32/netbios.h
index 1fe50c7846f..0130aaf701e 100644
--- a/dlls/netapi32/netbios.h
+++ b/dlls/netapi32/netbios.h
@@ -132,7 +132,7 @@ typedef void (*NetBIOSCleanup)(void);
  * 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);
diff --git a/include/nb30.h b/include/nb30.h
index b3c7591aa03..e746dd944d7 100644
--- a/include/nb30.h
+++ b/include/nb30.h
@@ -70,7 +70,11 @@ typedef struct _NCB
 	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 @@ typedef struct _ADAPTER_STATUS
 	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;