diff --git a/include/WinStd/COM.h b/include/WinStd/COM.h index a2c34b4a..8c99664e 100644 --- a/include/WinStd/COM.h +++ b/include/WinStd/COM.h @@ -98,7 +98,7 @@ namespace winstd template class com_obj : public dplhandle { - DPLHANDLE_IMPL(com_obj, NULL) + WINSTD_DPLHANDLE_IMPL(com_obj, NULL) public: /// @@ -226,7 +226,7 @@ namespace winstd /// class bstr : public dplhandle { - DPLHANDLE_IMPL(bstr, NULL) + WINSTD_DPLHANDLE_IMPL(bstr, NULL) public: /// diff --git a/include/WinStd/Common.h b/include/WinStd/Common.h index 06145d10..2f5e33fb 100644 --- a/include/WinStd/Common.h +++ b/include/WinStd/Common.h @@ -58,12 +58,12 @@ /// /// Stringizing macro helper /// -#define STRING_IMPL(x) #x +#define WINSTD_STRING_IMPL(x) #x /// /// Stringizing macro /// -#define STRING(x) STRING_IMPL(x) +#define WINSTD_STRING(x) WINSTD_STRING_IMPL(x) /// /// Declares a class as non-copyable @@ -126,7 +126,7 @@ private: \ /// /// Implements default constructors and operators to prevent their auto-generation by compiler. /// -#define HANDLE_IMPL(C, INVAL) \ +#define WINSTD_HANDLE_IMPL(C, INVAL) \ public: \ inline C ( ) noexcept { } \ inline C (_In_opt_ handle_type h) noexcept : handle( h ) { } \ @@ -138,7 +138,7 @@ WINSTD_NONCOPYABLE(C) /// /// Implements default constructors and operators to prevent their auto-generation by compiler. /// -#define DPLHANDLE_IMPL(C, INVAL) \ +#define WINSTD_DPLHANDLE_IMPL(C, INVAL) \ public: \ inline C ( ) noexcept { } \ inline C (_In_opt_ handle_type h) noexcept : dplhandle( h ) { } \ diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h index 9ba4b720..aee3969f 100644 --- a/include/WinStd/Crypt.h +++ b/include/WinStd/Crypt.h @@ -108,7 +108,7 @@ namespace winstd /// class cert_context : public dplhandle { - DPLHANDLE_IMPL(cert_context, NULL) + WINSTD_DPLHANDLE_IMPL(cert_context, NULL) public: /// @@ -248,7 +248,7 @@ namespace winstd /// class cert_chain_context : public dplhandle { - DPLHANDLE_IMPL(cert_chain_context, NULL) + WINSTD_DPLHANDLE_IMPL(cert_chain_context, NULL) public: /// @@ -303,7 +303,7 @@ namespace winstd /// class cert_store : public handle { - HANDLE_IMPL(cert_store, NULL) + WINSTD_HANDLE_IMPL(cert_store, NULL) public: /// @@ -366,7 +366,7 @@ namespace winstd /// class crypt_prov : public handle { - HANDLE_IMPL(crypt_prov, NULL) + WINSTD_HANDLE_IMPL(crypt_prov, NULL) public: /// @@ -410,7 +410,7 @@ namespace winstd /// class crypt_hash : public dplhandle { - DPLHANDLE_IMPL(crypt_hash, NULL) + WINSTD_DPLHANDLE_IMPL(crypt_hash, NULL) public: /// @@ -465,7 +465,7 @@ namespace winstd /// class crypt_key : public dplhandle { - DPLHANDLE_IMPL(crypt_key, NULL) + WINSTD_DPLHANDLE_IMPL(crypt_key, NULL) public: /// diff --git a/include/WinStd/EAP.h b/include/WinStd/EAP.h index 42875918..72f739df 100644 --- a/include/WinStd/EAP.h +++ b/include/WinStd/EAP.h @@ -388,7 +388,7 @@ namespace winstd /// class eap_packet : public dplhandle { - DPLHANDLE_IMPL(eap_packet, NULL) + WINSTD_DPLHANDLE_IMPL(eap_packet, NULL) public: /// diff --git a/include/WinStd/ETW.h b/include/WinStd/ETW.h index f4894102..0896daa3 100644 --- a/include/WinStd/ETW.h +++ b/include/WinStd/ETW.h @@ -406,7 +406,7 @@ namespace winstd /// class event_provider : public handle { - HANDLE_IMPL(event_provider, NULL) + WINSTD_HANDLE_IMPL(event_provider, NULL) public: /// @@ -811,7 +811,7 @@ namespace winstd /// class event_trace : public handle { - HANDLE_IMPL(event_trace, INVALID_PROCESSTRACE_HANDLE) + WINSTD_HANDLE_IMPL(event_trace, INVALID_PROCESSTRACE_HANDLE) public: /// diff --git a/include/WinStd/GDI.h b/include/WinStd/GDI.h index 3c80812e..b0693899 100644 --- a/include/WinStd/GDI.h +++ b/include/WinStd/GDI.h @@ -33,7 +33,7 @@ namespace winstd template class gdi_handle : public handle { - HANDLE_IMPL(gdi_handle, NULL) + WINSTD_HANDLE_IMPL(gdi_handle, NULL) public: /// @@ -65,7 +65,7 @@ namespace winstd /// class dc : public handle { - HANDLE_IMPL(dc, NULL) + WINSTD_HANDLE_IMPL(dc, NULL) public: /// diff --git a/include/WinStd/SetupAPI.h b/include/WinStd/SetupAPI.h index 5279a0f6..51bee002 100644 --- a/include/WinStd/SetupAPI.h +++ b/include/WinStd/SetupAPI.h @@ -33,7 +33,7 @@ namespace winstd /// class setup_device_info_list : public handle { - HANDLE_IMPL(setup_device_info_list, INVALID_HANDLE_VALUE) + WINSTD_HANDLE_IMPL(setup_device_info_list, INVALID_HANDLE_VALUE) public: /// diff --git a/include/WinStd/WLAN.h b/include/WinStd/WLAN.h index c2cd06d2..b996c4c5 100644 --- a/include/WinStd/WLAN.h +++ b/include/WinStd/WLAN.h @@ -112,7 +112,7 @@ namespace winstd /// class wlan_handle : public handle { - HANDLE_IMPL(wlan_handle, NULL) + WINSTD_HANDLE_IMPL(wlan_handle, NULL) public: /// diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h index de946d3e..f3b6a06d 100644 --- a/include/WinStd/Win.h +++ b/include/WinStd/Win.h @@ -87,6 +87,7 @@ template inline VOID GuidToStringA(_In_ L /// \param[out] str String to store the result to /// template inline VOID GuidToStringW(_In_ LPCGUID lpGuid, _Out_ std::basic_string<_Elem, _Traits, _Ax> &str) noexcept; + /// @copydoc GuidToStringW() #ifdef _UNICODE #define GuidToString GuidToStringW @@ -109,6 +110,7 @@ _Success_(return) BOOL StringToGuidA(_In_z_ LPCSTR lpszGuid, _Out_ LPGUID lpGuid /// - `FALSE` otherwise. /// _Success_(return) BOOL StringToGuidW(_In_z_ LPCWSTR lpszGuid, _Out_ LPGUID lpGuid, _Out_opt_ LPCWSTR *lpszGuidEnd = NULL) noexcept; + /// @copydoc StringToGuidW() #ifdef _UNICODE #define StringToGuid StringToGuidW @@ -387,7 +389,7 @@ namespace winstd template class win_handle : public handle { - HANDLE_IMPL(win_handle, INVALID) + WINSTD_HANDLE_IMPL(win_handle, INVALID) public: /// @@ -419,7 +421,7 @@ namespace winstd /// class library : public handle { - HANDLE_IMPL(library, NULL) + WINSTD_HANDLE_IMPL(library, NULL) public: /// @@ -601,7 +603,7 @@ namespace winstd /// class find_file : public handle { - HANDLE_IMPL(find_file, INVALID_HANDLE_VALUE) + WINSTD_HANDLE_IMPL(find_file, INVALID_HANDLE_VALUE) public: /// @@ -645,7 +647,7 @@ namespace winstd /// class heap : public handle { - HANDLE_IMPL(heap, NULL) + WINSTD_HANDLE_IMPL(heap, NULL) public: /// @@ -1018,7 +1020,7 @@ namespace winstd /// class reg_key : public handle { - HANDLE_IMPL(reg_key, NULL) + WINSTD_HANDLE_IMPL(reg_key, NULL) public: /// @@ -1109,7 +1111,7 @@ namespace winstd /// class security_id : public handle { - HANDLE_IMPL(security_id, NULL) + WINSTD_HANDLE_IMPL(security_id, NULL) public: /// diff --git a/include/WinStd/WinSock2.h b/include/WinStd/WinSock2.h index 784d132b..83361efb 100644 --- a/include/WinStd/WinSock2.h +++ b/include/WinStd/WinSock2.h @@ -109,7 +109,7 @@ namespace winstd /// class addrinfo : public handle { - HANDLE_IMPL(addrinfo, NULL) + WINSTD_HANDLE_IMPL(addrinfo, NULL) public: ///