marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compiling netapi32 on MSVC with PSDK headers.

oldstable
Steven Edwards 2004-01-02 20:15:05 +00:00 committed by Alexandre Julliard
parent 092f7dd352
commit d8f9c1c076
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/netapi32/nbcmdqueue.c
View File

@ -27,8 +27,8 @@ struct NBCmdQueue
PNCB head; PNCB head;
}; };
#define CANCEL_EVENT_PTR(ncb) (PHANDLE)((ncb)->ncb_reserved) #define CANCEL_EVENT_PTR(ncb) (PHANDLE)((ncb)->ncb_reserve)
#define NEXT_PTR(ncb) (PNCB *)((ncb)->ncb_reserved + sizeof(HANDLE)) #define NEXT_PTR(ncb) (PNCB *)((ncb)->ncb_reserve + sizeof(HANDLE))
/* The reserved area of an ncb will be used for the following data: /* The reserved area of an ncb will be used for the following data:
* - a cancelled flag (BOOL, 4 bytes??) * - a cancelled flag (BOOL, 4 bytes??)

2
dlls/netapi32/nbt.c
View File

@ -838,7 +838,7 @@ static UCHAR NetBTAstat(void *adapt, PNCB ncb)
astat->adapter_type = 0xff; astat->adapter_type = 0xff;
else else
astat->adapter_type = 0xfe; /* for Ethernet */ astat->adapter_type = 0xfe; /* for Ethernet */
astat->max_sess_pktsize = 0xffff; astat->max_sess_pkt_size = 0xffff;
astat->xmit_success = adapter->xmit_success; astat->xmit_success = adapter->xmit_success;
astat->recv_success = adapter->recv_success; astat->recv_success = adapter->recv_success;
} }

2
dlls/netapi32/netbios.h
View File

@ -132,7 +132,7 @@ typedef void (*NetBIOSCleanup)(void);
* some calls (recv) will block indefinitely, so a reset, shutdown, etc. will * some calls (recv) will block indefinitely, so a reset, shutdown, etc. will
* never occur. * 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 (*NetBIOSAstat)(void *adapter, PNCB ncb);
typedef UCHAR (*NetBIOSFindName)(void *adapter, PNCB ncb); typedef UCHAR (*NetBIOSFindName)(void *adapter, PNCB ncb);

8
include/nb30.h
View File

@ -70,7 +70,11 @@ typedef struct _NCB
VOID (CALLBACK *ncb_post)(struct _NCB *); VOID (CALLBACK *ncb_post)(struct _NCB *);
UCHAR ncb_lana_num; UCHAR ncb_lana_num;
UCHAR ncb_cmd_cplt; UCHAR ncb_cmd_cplt;
UCHAR ncb_reserved[10]; #ifdef _WIN64
UCHAR ncb_reserve[18];
#else
UCHAR ncb_reserve[10];
#endif
HANDLE ncb_event; HANDLE ncb_event;
} NCB, *PNCB; } NCB, *PNCB;
@ -101,7 +105,7 @@ typedef struct _ADAPTER_STATUS
WORD pending_sess; WORD pending_sess;
WORD max_cfg_sess; WORD max_cfg_sess;
WORD max_sess; WORD max_sess;
WORD max_sess_pktsize; WORD max_sess_pkt_size;
WORD name_count; WORD name_count;
} ADAPTER_STATUS, *PADAPTER_STATUS; } ADAPTER_STATUS, *PADAPTER_STATUS;