| dhcpcsdk.h (6.3.9600.17415-Windows 8.1) | | dhcpcsdk.h (10.0.10586.420-Windows 10 1511 10586.494) |
| | |
| skipping to change at line 45 | | skipping to change at line 45 |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
| #ifndef DHCP_OPTIONS_DEFINED | | #ifndef DHCP_OPTIONS_DEFINED |
| #define DHCP_OPTIONS_DEFINED | | #define DHCP_OPTIONS_DEFINED |
| | |
| #if _MSC_VER > 1000 | | #if _MSC_VER > 1000 |
| #pragma once | | #pragma once |
| #endif | | #endif |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| // | | // |
| // DHCP Standard Options. | | // DHCP Standard Options. |
| // | | // |
| | |
| #define OPTION_PAD 0 | | #define OPTION_PAD 0 |
| #define OPTION_SUBNET_MASK 1 | | #define OPTION_SUBNET_MASK 1 |
| #define OPTION_TIME_OFFSET 2 | | #define OPTION_TIME_OFFSET 2 |
| #define OPTION_ROUTER_ADDRESS 3 | | #define OPTION_ROUTER_ADDRESS 3 |
| #define OPTION_TIME_SERVERS 4 | | #define OPTION_TIME_SERVERS 4 |
| | |
| skipping to change at line 161 | | skipping to change at line 161 |
| #define OPTION_REBIND_TIME 59 // T2 | | #define OPTION_REBIND_TIME 59 // T2 |
| #define OPTION_CLIENT_CLASS_INFO 60 | | #define OPTION_CLIENT_CLASS_INFO 60 |
| #define OPTION_CLIENT_ID 61 | | #define OPTION_CLIENT_ID 61 |
| | |
| #define OPTION_TFTP_SERVER_NAME 66 | | #define OPTION_TFTP_SERVER_NAME 66 |
| #define OPTION_BOOTFILE_NAME 67 | | #define OPTION_BOOTFILE_NAME 67 |
| | |
| #define OPTION_MSFT_IE_PROXY 252 | | #define OPTION_MSFT_IE_PROXY 252 |
| #define OPTION_END 255 | | #define OPTION_END 255 |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #endif DHCP_OPTIONS_DEFINED | | #endif DHCP_OPTIONS_DEFINED |
| | |
|
| #pragma region Application Family | | #pragma region Application Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM) |
| | |
| #ifndef DHCPAPI_PARAMS_DEFINED | | #ifndef DHCPAPI_PARAMS_DEFINED |
| #define DHCPAPI_PARAMS_DEFINED | | #define DHCPAPI_PARAMS_DEFINED |
| typedef struct _DHCPAPI_PARAMS { // use this structure to reque
st params | | typedef struct _DHCPAPI_PARAMS { // use this structure to reque
st params |
| ULONG Flags; // for future use | | ULONG Flags; // for future use |
| ULONG OptionId; // what option is this? | | ULONG OptionId; // what option is this? |
| BOOL IsVendor; // is this vendor specific? | | BOOL IsVendor; // is this vendor specific? |
| #ifdef __midl | | #ifdef __midl |
| [size_is(nBytesData)] LPBYTE Data; // t
he actual data | | [size_is(nBytesData)] LPBYTE Data; // t
he actual data |
| #else | | #else |
| | |
| skipping to change at line 238 | | skipping to change at line 238 |
| IN LPVOID Reserved, // this parameter is reserved | | IN LPVOID Reserved, // this parameter is reserved |
| _In_ LPWSTR AdapterName, // adapter name to request for | | _In_ LPWSTR AdapterName, // adapter name to request for |
| IN LPDHCPCAPI_CLASSID ClassId, // reserved must be NULL | | IN LPDHCPCAPI_CLASSID ClassId, // reserved must be NULL |
| IN DHCPCAPI_PARAMS_ARRAY SendParams, // parameters to send. | | IN DHCPCAPI_PARAMS_ARRAY SendParams, // parameters to send. |
| IN OUT DHCPCAPI_PARAMS_ARRAY RecdParams, // parameters that are to be r
equested.. | | IN OUT DHCPCAPI_PARAMS_ARRAY RecdParams, // parameters that are to be r
equested.. |
| _Out_writes_bytes_to_(*pSize, *pSize) LPBYTE Buffer, // a buffer to hold
data for RecdParams | | _Out_writes_bytes_to_(*pSize, *pSize) LPBYTE Buffer, // a buffer to hold
data for RecdParams |
| _Inout_ LPDWORD pSize, // i/p: size of above in BYTES
, o/p required bytes.. | | _Inout_ LPDWORD pSize, // i/p: size of above in BYTES
, o/p required bytes.. |
| _In_ LPWSTR RequestIdStr // needed for persistent reque
sts | | _In_ LPWSTR RequestIdStr // needed for persistent reque
sts |
| ); // returns ERROR_MORE_DATA if o/p buffer is of insufficient size, and fills
in reqd size in # of bytes | | ); // returns ERROR_MORE_DATA if o/p buffer is of insufficient size, and fills
in reqd size in # of bytes |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */ |
| #pragma endregion | | #pragma endregion |
| | |
|
| #pragma region Desktop Family | | #pragma region Desktop Family or OneCore Family |
| #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) | | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM) |
| | |
| DWORD // win32 status | | DWORD // win32 status |
| APIENTRY | | APIENTRY |
| DhcpUndoRequestParams( // undo the effect of a persis
tent request -- currently undo from registry | | DhcpUndoRequestParams( // undo the effect of a persis
tent request -- currently undo from registry |
| _Reserved_ DWORD Flags, // must be zero, reserved | | _Reserved_ DWORD Flags, // must be zero, reserved |
| _Reserved_ LPVOID Reserved, // this parameter is reserved | | _Reserved_ LPVOID Reserved, // this parameter is reserved |
| _In_ LPWSTR AdapterName, // the name of the adpater to
delete for | | _In_ LPWSTR AdapterName, // the name of the adpater to
delete for |
| _In_ LPWSTR RequestIdStr // needed for persistent requ
ests.. | | _In_ LPWSTR RequestIdStr // needed for persistent requ
ests.. |
| ); | | ); |
| | |
| | |
| skipping to change at line 287 | | skipping to change at line 287 |
| VOID | | VOID |
| ); | | ); |
| | |
| DWORD | | DWORD |
| APIENTRY | | APIENTRY |
| DhcpGetOriginalSubnetMask( | | DhcpGetOriginalSubnetMask( |
| IN LPCWSTR sAdapterName, | | IN LPCWSTR sAdapterName, |
| OUT DWORD *dwSubnetMask | | OUT DWORD *dwSubnetMask |
| ); | | ); |
| | |
|
| #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ | | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */ |
| #pragma endregion | | #pragma endregion |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
| //==============================================================================
== | | //==============================================================================
== |
| // end of file | | // end of file |
| //==============================================================================
== | | //==============================================================================
== |
| #endif _DHCPCSDK_ | | #endif _DHCPCSDK_ |
| | |
| End of changes. 6 change blocks. |
| 9 lines changed or deleted | | 9 lines changed or added |
|