Headers diff for rtutils.dll between 6.1.7601.17514-Windows_7.0 and 6.3.9600.17415-Windows_8.1 versions
| rtutils.h (6.1.7601.17514-Windows_7.0) | | rtutils.h (6.3.9600.17415-Windows_8.1) |
|---|
| | |
| skipping to change at line 20 | | skipping to change at line 20 |
|---|
| Public declarations for the Router process utility functions. | | Public declarations for the Router process utility functions. |
| | |
| --*/ | | --*/ |
| | |
| #ifndef __ROUTING_RTUTILS_H__ | | #ifndef __ROUTING_RTUTILS_H__ |
| #define __ROUTING_RTUTILS_H__ | | #define __ROUTING_RTUTILS_H__ |
| | |
| #if _MSC_VER > 1000 | | #if _MSC_VER > 1000 |
| #pragma once | | #pragma once |
| #endif | | #endif |
|
| | #include <winapifamily.h> |
| | |
| | #pragma region Desktop Family |
| | #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| extern "C" { | | extern "C" { |
| #endif | | #endif |
| | |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| // // | | // // |
| // TRACING FUNCTION PROTOTYPES // | | // TRACING FUNCTION PROTOTYPES // |
| // // | | // // |
| // See DOCUMENT for more information // | | // See DOCUMENT for more information // |
| | |
| skipping to change at line 283 | | skipping to change at line 287 |
|---|
| // // | | // // |
| // ANSI prototypes // | | // ANSI prototypes // |
| // // | | // // |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| | |
| VOID | | VOID |
| APIENTRY | | APIENTRY |
| LogErrorA( | | LogErrorA( |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD cNumberOfSubStrings, | | IN DWORD cNumberOfSubStrings, |
|
| __in_ecount(cNumberOfSubStrings) IN LPSTR *plpwsSubStrings, | | _In_reads_(cNumberOfSubStrings) IN LPSTR *plpwsSubStrings, |
| IN DWORD dwErrorCode | | IN DWORD dwErrorCode |
| ); | | ); |
| | |
| VOID | | VOID |
| APIENTRY | | APIENTRY |
| LogEventA( | | LogEventA( |
| IN DWORD wEventType, | | IN DWORD wEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD cNumberOfSubStrings, | | IN DWORD cNumberOfSubStrings, |
|
| __in_ecount(cNumberOfSubStrings) IN LPSTR *plpwsSubStrings | | _In_reads_(cNumberOfSubStrings) IN LPSTR *plpwsSubStrings |
| ); | | ); |
| | |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| // // | | // // |
| // Unicode prototypes // | | // Unicode prototypes // |
| // // | | // // |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| | |
| VOID | | VOID |
| LogErrorW( | | LogErrorW( |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD cNumberOfSubStrings, | | IN DWORD cNumberOfSubStrings, |
|
| __in_ecount(cNumberOfSubStrings) IN LPWSTR *plpwsSubStrings, | | _In_reads_(cNumberOfSubStrings) IN LPWSTR *plpwsSubStrings, |
| IN DWORD dwErrorCode | | IN DWORD dwErrorCode |
| ); | | ); |
| | |
| VOID | | VOID |
| LogEventW( | | LogEventW( |
| IN DWORD wEventType, | | IN DWORD wEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD cNumberOfSubStrings, | | IN DWORD cNumberOfSubStrings, |
|
| __in_ecount(cNumberOfSubStrings) IN LPWSTR *plpwsSubStrings | | _In_reads_(cNumberOfSubStrings) IN LPWSTR *plpwsSubStrings |
| ); | | ); |
| | |
| #ifdef UNICODE | | #ifdef UNICODE |
| #define LogError LogErrorW | | #define LogError LogErrorW |
| #define LogEvent LogEventW | | #define LogEvent LogEventW |
| #else | | #else |
| #define LogError LogErrorA | | #define LogError LogErrorA |
| #define LogEvent LogEventA | | #define LogEvent LogEventA |
| #endif | | #endif |
| | |
| | |
| skipping to change at line 365 | | skipping to change at line 369 |
|---|
| RouterLogDeregisterA( | | RouterLogDeregisterA( |
| HANDLE hLogHandle | | HANDLE hLogHandle |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventA( | | RouterLogEventA( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| IN __in_ecount_opt(dwSubStringCount) LPSTR *plpszSubStringArray, | | IN _In_reads_opt_(dwSubStringCount) LPSTR *plpszSubStringArray, |
| IN DWORD dwErrorCode | | IN DWORD dwErrorCode |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventDataA( | | RouterLogEventDataA( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| __in_ecount_opt(dwSubStringCount) IN LPSTR *plpszSubStringArray, | | _In_reads_opt_(dwSubStringCount) IN LPSTR *plpszSubStringArray, |
| IN DWORD dwDataBytes, | | IN DWORD dwDataBytes, |
| IN LPBYTE lpDataBytes | | IN LPBYTE lpDataBytes |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventStringA( | | RouterLogEventStringA( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| __in_ecount(dwSubStringCount) IN LPSTR *plpszSubStringArray, | | _In_reads_(dwSubStringCount) IN LPSTR *plpszSubStringArray, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| IN DWORD dwErrorIndex | | IN DWORD dwErrorIndex |
| ); | | ); |
| | |
| VOID | | VOID |
| __cdecl | | __cdecl |
| RouterLogEventExA( | | RouterLogEventExA( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| | |
| skipping to change at line 415 | | skipping to change at line 419 |
|---|
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN LPCSTR ptszFormat, | | IN LPCSTR ptszFormat, |
| IN va_list arglist | | IN va_list arglist |
| ); | | ); |
| | |
| DWORD | | DWORD |
| RouterGetErrorStringA( | | RouterGetErrorStringA( |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
|
| __out OUT LPSTR * lplpszErrorString | | _Out_ OUT LPSTR * lplpszErrorString |
| ); | | ); |
| | |
| #define RouterLogErrorA(h,msg,count,array,err) \ | | #define RouterLogErrorA(h,msg,count,array,err) \ |
| RouterLogEventA(h,EVENTLOG_ERROR_TYPE,msg,count,array,err) | | RouterLogEventA(h,EVENTLOG_ERROR_TYPE,msg,count,array,err) |
| #define RouterLogWarningA(h,msg,count,array,err) \ | | #define RouterLogWarningA(h,msg,count,array,err) \ |
| RouterLogEventA(h,EVENTLOG_WARNING_TYPE,msg,count,array,err) | | RouterLogEventA(h,EVENTLOG_WARNING_TYPE,msg,count,array,err) |
| #define RouterLogInformationA(h,msg,count,array,err) \ | | #define RouterLogInformationA(h,msg,count,array,err) \ |
| RouterLogEventA(h,EVENTLOG_INFORMATION_TYPE,msg,count,array,err) | | RouterLogEventA(h,EVENTLOG_INFORMATION_TYPE,msg,count,array,err) |
| | |
| #define RouterLogErrorDataA(h,msg,count,array,c,buf) \ | | #define RouterLogErrorDataA(h,msg,count,array,c,buf) \ |
| | |
| skipping to change at line 462 | | skipping to change at line 466 |
|---|
| RouterLogDeregisterW( | | RouterLogDeregisterW( |
| HANDLE hLogHandle | | HANDLE hLogHandle |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventW( | | RouterLogEventW( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| IN __in_ecount_opt(dwSubStringCount) LPWSTR *plpszSubStringArray, | | IN _In_reads_opt_(dwSubStringCount) LPWSTR *plpszSubStringArray, |
| IN DWORD dwErrorCode | | IN DWORD dwErrorCode |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventDataW( | | RouterLogEventDataW( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| __in_ecount_opt(dwSubStringCount) IN LPWSTR *plpszSubStringArray, | | _In_reads_opt_(dwSubStringCount) IN LPWSTR *plpszSubStringArray, |
| IN DWORD dwDataBytes, | | IN DWORD dwDataBytes, |
| IN LPBYTE lpDataBytes | | IN LPBYTE lpDataBytes |
| ); | | ); |
| | |
| VOID | | VOID |
| RouterLogEventStringW( | | RouterLogEventStringW( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN DWORD dwSubStringCount, | | IN DWORD dwSubStringCount, |
|
| __in_ecount(dwSubStringCount) IN LPWSTR *plpszSubStringArray, | | _In_reads_(dwSubStringCount) IN LPWSTR *plpszSubStringArray, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| IN DWORD dwErrorIndex | | IN DWORD dwErrorIndex |
| ); | | ); |
| | |
| VOID | | VOID |
| __cdecl | | __cdecl |
| RouterLogEventExW( | | RouterLogEventExW( |
| IN HANDLE hLogHandle, | | IN HANDLE hLogHandle, |
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| | |
| skipping to change at line 512 | | skipping to change at line 516 |
|---|
| IN DWORD dwEventType, | | IN DWORD dwEventType, |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
| IN DWORD dwMessageId, | | IN DWORD dwMessageId, |
| IN LPCWSTR ptszFormat, | | IN LPCWSTR ptszFormat, |
| IN va_list arglist | | IN va_list arglist |
| ); | | ); |
| | |
| DWORD | | DWORD |
| RouterGetErrorStringW( | | RouterGetErrorStringW( |
| IN DWORD dwErrorCode, | | IN DWORD dwErrorCode, |
|
| __out OUT LPWSTR * lplpwszErrorString | | _Out_ OUT LPWSTR * lplpwszErrorString |
| ); | | ); |
| | |
| #define RouterLogErrorW(h,msg,count,array,err) \ | | #define RouterLogErrorW(h,msg,count,array,err) \ |
| RouterLogEventW(h,EVENTLOG_ERROR_TYPE,msg,count,array,err) | | RouterLogEventW(h,EVENTLOG_ERROR_TYPE,msg,count,array,err) |
| #define RouterLogWarningW(h,msg,count,array,err) \ | | #define RouterLogWarningW(h,msg,count,array,err) \ |
| RouterLogEventW(h,EVENTLOG_WARNING_TYPE,msg,count,array,err) | | RouterLogEventW(h,EVENTLOG_WARNING_TYPE,msg,count,array,err) |
| #define RouterLogInformationW(h,msg,count,array,err) \ | | #define RouterLogInformationW(h,msg,count,array,err) \ |
| RouterLogEventW(h,EVENTLOG_INFORMATION_TYPE,msg,count,array,err) | | RouterLogEventW(h,EVENTLOG_INFORMATION_TYPE,msg,count,array,err) |
| | |
| #define RouterLogErrorDataW(h,msg,count,array,c,buf) \ | | #define RouterLogErrorDataW(h,msg,count,array,c,buf) \ |
| | |
| skipping to change at line 596 | | skipping to change at line 600 |
|---|
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| | |
| typedef VOID (APIENTRY * WORKERFUNCTION)(PVOID); | | typedef VOID (APIENTRY * WORKERFUNCTION)(PVOID); |
| | |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| // // | | // // |
| // ROUTER ASSERT DECLARATION // | | // ROUTER ASSERT DECLARATION // |
| // // | | // // |
| ////////////////////////////////////////////////////////////////////////////// | | ////////////////////////////////////////////////////////////////////////////// |
| | |
|
| | _Analysis_noreturn_ |
| VOID | | VOID |
| RouterAssert( | | RouterAssert( |
|
| __in IN PSTR pszFailedAssertion, | | _In_ IN PSTR pszFailedAssertion, |
| __in IN PSTR pszFileName, | | _In_ IN PSTR pszFileName, |
| __in IN DWORD dwLineNumber, | | _In_ IN DWORD dwLineNumber, |
| __in IN PSTR pszMessage OPTIONAL | | _In_ IN PSTR pszMessage OPTIONAL |
| ); | | ); |
| | |
| #if DBG | | #if DBG |
| #define RTASSERT(exp) \ | | #define RTASSERT(exp) \ |
| if (!(exp)) \ | | if (!(exp)) \ |
| RouterAssert(#exp, __FILE__, __LINE__, NULL) | | RouterAssert(#exp, __FILE__, __LINE__, NULL) |
| #define RTASSERTMSG(msg, exp) \ | | #define RTASSERTMSG(msg, exp) \ |
| if (!(exp)) \ | | if (!(exp)) \ |
| RouterAssert(#exp, __FILE__, __LINE__, msg) | | RouterAssert(#exp, __FILE__, __LINE__, msg) |
| #else | | #else |
| | |
| skipping to change at line 682 | | skipping to change at line 687 |
|---|
| #define OPT1_2 | | #define OPT1_2 |
| #define OPT2_1 | | #define OPT2_1 |
| #define OPT2_2 | | #define OPT2_2 |
| #define OPT3_1 | | #define OPT3_1 |
| #define OPT3_2 | | #define OPT3_2 |
| | |
| #ifdef __cplusplus | | #ifdef __cplusplus |
| } | | } |
| #endif | | #endif |
| | |
|
| | #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ |
| | #pragma endregion |
| | |
| #endif // ___ROUTING_RTUTILS_H__ | | #endif // ___ROUTING_RTUTILS_H__ |
| | |
| End of changes. 16 change blocks. |
|---|
| 16 lines changed or deleted | | 24 lines changed or added |
|---|
|
This html diff was produced by rfcdiff 1.41. |