From 684f94e30521f3da4cf1b80e608406af6cd10053 Mon Sep 17 00:00:00 2001 From: Dimitri Papadopoulos Date: Tue, 30 Sep 2003 07:40:46 +0000 Subject: * include/dhcpcsvc.h: New file. Note that MSDN is confused about whether it should start constant and structure names with DHCPCAPI or DHCPAPI. It's using both but experience suggests it's DHCPCAPI with `C'. * lib/dhcpcsvc.def: New file. --- winsup/w32api/ChangeLog | 9 +++++++++ winsup/w32api/include/dhcpcsdk.h | 42 ++++++++++++++++++++++++++++++++++++++++ winsup/w32api/include/winuser.h | 8 ++++---- winsup/w32api/lib/dhcpcsvc.def | 8 ++++++++ winsup/w32api/lib/test.c | 1 + 5 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 winsup/w32api/include/dhcpcsdk.h create mode 100644 winsup/w32api/lib/dhcpcsvc.def diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 0996bf02c..56e95af08 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,12 @@ +2003-09-30 Dimitri Papadopoulos + + * include/dhcpcsvc.h: New file. + Note that MSDN is confused about whether it should start constant + and structure names with DHCPCAPI or DHCPAPI. It's using both but + experience suggests it's DHCPCAPI with `C'. + + * lib/dhcpcsvc.def: New file. + 2003-09-30 Dimitri Papadopoulos * include/winuser.h [_WIN32_WINNT >= 0x0501] (RIM_INPUT, diff --git a/winsup/w32api/include/dhcpcsdk.h b/winsup/w32api/include/dhcpcsdk.h new file mode 100644 index 000000000..1d27df766 --- /dev/null +++ b/winsup/w32api/include/dhcpcsdk.h @@ -0,0 +1,42 @@ +#ifndef _DHCPCDSK_H +#define _DHCPCDSK_H +#if __GNUC__ >= 3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#if (_WIN32_WINNT >= 0x0500) +#define DHCPCAPI_REGISTER_HANDLE_EVENT 0x00000001 +#define DHCPCAPI_REQUEST_PERSISTENT 0x00000001 +#define DHCPCAPI_REQUEST_SYNCHRONOUS 0x00000002 +typedef struct _DHCPAPI_CLASSID { + ULONG Flags; + LPBYTE Data; + ULONG nBytesData; +} DHCPCAPI_CLASSID,*PDHCPCAPI_CLASSID,*LPDHCPCAPI_CLASSID; +typedef struct _DHCPAPI_PARAMS { + ULONG Flags; + ULONG OptionId; + BOOL IsVendor; + LPBYTE Data; + DWORD nBytesData; +} DHCPAPI_PARAMS,*PDHCPAPI_PARAMS,*LPDHCPAPI_PARAMS; +typedef struct _DHCPAPI_PARAMS_ARRAY { + ULONG nParams; + LPDHCPAPI_PARAMS Params; +} DHCPCAPI_PARAMS_ARRAY,*PDHCPCAPI_PARAMS_ARRAY,*LPDHCPCAPI_PARAMS_ARRAY; +VOID WINAPI DhcpCApiCleanup(void); +DWORD WINAPI DhcpCApiInitialize(LPDWORD); +DWORD WINAPI DhcpDeRegisterParamChange(DWORD,LPVOID,LPVOID); +DWORD WINAPI DhcpRegisterParamChange(DWORD,LPVOID,PWSTR,LPDHCPCAPI_CLASSID,DHCPCAPI_PARAMS_ARRAY,LPVOID); +DWORD WINAPI DhcpRemoveDNSRegistrations(void); +DWORD WINAPI DhcpUndoRequestParams(DWORD,LPVOID,LPWSTR,LPWSTR); +#endif /* (_WIN32_WINNT >= 0x0500) */ + +#ifdef __cplusplus +} +#endif +#endif diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h index db5d7cd5d..ff6b32017 100644 --- a/winsup/w32api/include/winuser.h +++ b/winsup/w32api/include/winuser.h @@ -3197,7 +3197,7 @@ BOOL WINAPI EnableScrollBar(HWND,UINT,UINT); BOOL WINAPI EnableWindow(HWND,BOOL); BOOL WINAPI EndDeferWindowPos(HDWP); BOOL WINAPI EndDialog(HWND,int); -BOOL WINAPI EndMenu(VOID); +BOOL WINAPI EndMenu(void); BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*); #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI EndTask(HWND,BOOL,BOOL); @@ -3336,7 +3336,7 @@ BOOL WINAPI GetScrollInfo(HWND,int,LPSCROLLINFO); int WINAPI GetScrollPos(HWND,int); BOOL WINAPI GetScrollRange(HWND,int,LPINT,LPINT); #if (_WIN32_WINNT >= 0x0500) -HWND WINAPI GetShellWindow(VOID); +HWND WINAPI GetShellWindow(void); #endif HMENU WINAPI GetSubMenu(HMENU,int); DWORD WINAPI GetSysColor(int); @@ -3401,7 +3401,7 @@ BOOL WINAPI GrayStringW(HDC,HBRUSH,GRAYSTRINGPROC,LPARAM,int,int,int,int,int); BOOL WINAPI HideCaret(HWND); BOOL WINAPI HiliteMenuItem(HWND,HMENU,UINT,UINT); BOOL WINAPI InflateRect(LPRECT,int,int); -BOOL WINAPI InSendMessage(VOID); +BOOL WINAPI InSendMessage(void); #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0410) DWORD WINAPI InSendMessageEx(LPVOID); #endif @@ -3467,7 +3467,7 @@ int WINAPI LoadStringA(HINSTANCE,UINT,LPSTR,int); int WINAPI LoadStringW(HINSTANCE,UINT,LPWSTR,int); BOOL WINAPI LockWindowUpdate(HWND); #if (_WIN32_WINNT >= 0x0500) -BOOL WINAPI LockWorkStation(VOID); +BOOL WINAPI LockWorkStation(void); #endif int WINAPI LookupIconIdFromDirectory(PBYTE,BOOL); int WINAPI LookupIconIdFromDirectoryEx(PBYTE,BOOL,int,int,UINT); diff --git a/winsup/w32api/lib/dhcpcsvc.def b/winsup/w32api/lib/dhcpcsvc.def new file mode 100644 index 000000000..a1cd3b984 --- /dev/null +++ b/winsup/w32api/lib/dhcpcsvc.def @@ -0,0 +1,8 @@ +LIBRARY DHCPCSVC.DLL +EXPORTS +DhcpCApiCleanup@0 +DhcpCApiInitialize@4 +DhcpDeRegisterParamChange@12 +DhcpRegisterParamChange@28 +DhcpRemoveDNSRegistrations@0 +DhcpUndoRequestParams@16 diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c index 18aca95e9..f17fcf7d9 100644 --- a/winsup/w32api/lib/test.c +++ b/winsup/w32api/lib/test.c @@ -80,6 +80,7 @@ #include #include #include +#include #ifndef __OBJC__ /* problems with BOOL */ #include -- cgit v1.2.3