diff options
author | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
---|---|---|
committer | George Hazan <george.hazan@gmail.com> | 2016-07-26 09:20:25 +0000 |
commit | 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac (patch) | |
tree | 2e8bb660c908b54914abd562af8aafa4a486c846 /libs | |
parent | a61c8728b379057fe7f0a0d86fe0b037598229dd (diff) |
less TCHARs:
- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*
git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'libs')
-rw-r--r-- | libs/libcurl/src/curl_memory.h | 8 | ||||
-rw-r--r-- | libs/libcurl/src/curl_ntlm_msgs.c | 22 | ||||
-rw-r--r-- | libs/libcurl/src/curl_schannel.c | 10 | ||||
-rw-r--r-- | libs/libcurl/src/http_negotiate_sspi.c | 6 | ||||
-rw-r--r-- | libs/libcurl/src/memdebug.h | 8 | ||||
-rw-r--r-- | libs/libcurl/src/socks_sspi.c | 4 | ||||
-rw-r--r-- | libs/libevent/src/evdns.c | 2 | ||||
-rw-r--r-- | libs/libevent/src/evutil.c | 11 | ||||
-rw-r--r-- | libs/libevent/src/util-internal.h | 8 | ||||
-rw-r--r-- | libs/libjson/src/libJSON.cpp | 10 | ||||
-rw-r--r-- | libs/zlib/src/ioapi.c | 14 | ||||
-rw-r--r-- | libs/zlib/src/ioapi.h | 2 | ||||
-rw-r--r-- | libs/zlib/src/iowin32.c | 4 |
13 files changed, 54 insertions, 55 deletions
diff --git a/libs/libcurl/src/curl_memory.h b/libs/libcurl/src/curl_memory.h index e3cdc721c4..adc45cd639 100644 --- a/libs/libcurl/src/curl_memory.h +++ b/libs/libcurl/src/curl_memory.h @@ -119,11 +119,11 @@ extern curl_wcsdup_callback Curl_cwcsdup; # define wcsdup(ptr) Curl_cwcsdup(ptr) # undef _wcsdup # define _wcsdup(ptr) Curl_cwcsdup(ptr) -# undef _tcsdup -# define _tcsdup(ptr) Curl_cwcsdup(ptr) +# undef wcsdup +# define wcsdup(ptr) Curl_cwcsdup(ptr) # else -# undef _tcsdup -# define _tcsdup(ptr) Curl_cstrdup(ptr) +# undef wcsdup +# define wcsdup(ptr) Curl_cstrdup(ptr) # endif #endif diff --git a/libs/libcurl/src/curl_ntlm_msgs.c b/libs/libcurl/src/curl_ntlm_msgs.c index 125ce6e496..bc88feadb6 100644 --- a/libs/libcurl/src/curl_ntlm_msgs.c +++ b/libs/libcurl/src/curl_ntlm_msgs.c @@ -371,9 +371,9 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, if(!useranddomain.tchar_ptr) return CURLE_OUT_OF_MEMORY; - user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, TEXT('\\')); + user.const_tchar_ptr = wcschr(useranddomain.const_tchar_ptr, TEXT('\\')); if(!user.const_tchar_ptr) - user.const_tchar_ptr = _tcschr(useranddomain.const_tchar_ptr, TEXT('/')); + user.const_tchar_ptr = wcschr(useranddomain.const_tchar_ptr, TEXT('/')); if(user.tchar_ptr) { domain.tchar_ptr = useranddomain.tchar_ptr; @@ -387,22 +387,22 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, } /* setup ntlm identity's user and length */ - dup_user.tchar_ptr = _tcsdup(user.tchar_ptr); + dup_user.tchar_ptr = wcsdup(user.tchar_ptr); if(!dup_user.tchar_ptr) { Curl_unicodefree(useranddomain.tchar_ptr); return CURLE_OUT_OF_MEMORY; } ntlm->identity.User = dup_user.tbyte_ptr; - ntlm->identity.UserLength = curlx_uztoul(_tcslen(dup_user.tchar_ptr)); + ntlm->identity.UserLength = curlx_uztoul(wcslen(dup_user.tchar_ptr)); dup_user.tchar_ptr = NULL; /* setup ntlm identity's domain and length */ - dup_domain.tchar_ptr = malloc(sizeof(TCHAR) * (domlen + 1)); + dup_domain.tchar_ptr = malloc(sizeof(wchar_t) * (domlen + 1)); if(!dup_domain.tchar_ptr) { Curl_unicodefree(useranddomain.tchar_ptr); return CURLE_OUT_OF_MEMORY; } - _tcsncpy(dup_domain.tchar_ptr, domain.tchar_ptr, domlen); + wcsncpy(dup_domain.tchar_ptr, domain.tchar_ptr, domlen); *(dup_domain.tchar_ptr + domlen) = TEXT('\0'); ntlm->identity.Domain = dup_domain.tbyte_ptr; ntlm->identity.DomainLength = curlx_uztoul(domlen); @@ -414,14 +414,14 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, passwd.tchar_ptr = Curl_convert_UTF8_to_tchar((char *)passwdp); if(!passwd.tchar_ptr) return CURLE_OUT_OF_MEMORY; - dup_passwd.tchar_ptr = _tcsdup(passwd.tchar_ptr); + dup_passwd.tchar_ptr = wcsdup(passwd.tchar_ptr); if(!dup_passwd.tchar_ptr) { Curl_unicodefree(passwd.tchar_ptr); return CURLE_OUT_OF_MEMORY; } ntlm->identity.Password = dup_passwd.tbyte_ptr; ntlm->identity.PasswordLength = - curlx_uztoul(_tcslen(dup_passwd.tchar_ptr)); + curlx_uztoul(wcslen(dup_passwd.tchar_ptr)); dup_passwd.tchar_ptr = NULL; Curl_unicodefree(passwd.tchar_ptr); @@ -433,7 +433,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, ntlm->p_identity = NULL; status = s_pSecFn->AcquireCredentialsHandle(NULL, - (TCHAR *) TEXT("NTLM"), + (wchar_t *) TEXT("NTLM"), SECPKG_CRED_OUTBOUND, NULL, ntlm->p_identity, NULL, NULL, &ntlm->handle, &tsDummy); @@ -448,7 +448,7 @@ CURLcode Curl_ntlm_create_type1_message(const char *userp, buf.pvBuffer = ntlmbuf; status = s_pSecFn->InitializeSecurityContext(&ntlm->handle, NULL, - (TCHAR *) TEXT(""), + (wchar_t *) TEXT(""), ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION, @@ -624,7 +624,7 @@ CURLcode Curl_ntlm_create_type3_message(struct SessionHandle *data, status = s_pSecFn->InitializeSecurityContext(&ntlm->handle, &ntlm->c_handle, - (TCHAR *) TEXT(""), + (wchar_t *) TEXT(""), ISC_REQ_CONFIDENTIALITY | ISC_REQ_REPLAY_DETECT | ISC_REQ_CONNECTION, diff --git a/libs/libcurl/src/curl_schannel.c b/libs/libcurl/src/curl_schannel.c index 68139db586..e137e05c5a 100644 --- a/libs/libcurl/src/curl_schannel.c +++ b/libs/libcurl/src/curl_schannel.c @@ -120,7 +120,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) #ifdef ENABLE_IPV6 struct in6_addr addr6; #endif - TCHAR *host_name; + wchar_t *host_name; CURLcode code; infof(data, "schannel: SSL/TLS connection with %s port %hu (step 1/3)\n", @@ -197,7 +197,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex) memset(connssl->cred, 0, sizeof(struct curl_schannel_cred)); /* http://msdn.microsoft.com/en-us/library/windows/desktop/aa374716.aspx */ - sspi_status = s_pSecFn->AcquireCredentialsHandle(NULL, (TCHAR *)UNISP_NAME, + sspi_status = s_pSecFn->AcquireCredentialsHandle(NULL, (wchar_t *)UNISP_NAME, SECPKG_CRED_OUTBOUND, NULL, &schannel_cred, NULL, NULL, &connssl->cred->cred_handle, &connssl->cred->time_stamp); @@ -288,7 +288,7 @@ schannel_connect_step2(struct connectdata *conn, int sockindex) SecBuffer inbuf[2]; SecBufferDesc inbuf_desc; SECURITY_STATUS sspi_status = SEC_E_OK; - TCHAR *host_name; + wchar_t *host_name; CURLcode code; bool doread; @@ -1075,7 +1075,7 @@ int Curl_schannel_shutdown(struct connectdata *conn, int sockindex) SecBuffer outbuf; SecBufferDesc outbuf_desc; CURLcode code; - TCHAR *host_name; + wchar_t *host_name; DWORD dwshut = SCHANNEL_SHUTDOWN; InitSecBuffer(&Buffer, SECBUFFER_TOKEN, &dwshut, sizeof(dwshut)); @@ -1257,7 +1257,7 @@ static CURLcode verify_certificate(struct connectdata *conn, int sockindex) if(result == CURLE_OK) { if(data->set.ssl.verifyhost) { - TCHAR cert_hostname_buff[128]; + wchar_t cert_hostname_buff[128]; xcharp_u hostname; xcharp_u cert_hostname; DWORD len; diff --git a/libs/libcurl/src/http_negotiate_sspi.c b/libs/libcurl/src/http_negotiate_sspi.c index 1381d5292d..997e161165 100644 --- a/libs/libcurl/src/http_negotiate_sspi.c +++ b/libs/libcurl/src/http_negotiate_sspi.c @@ -91,7 +91,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, SecBuffer in_sec_buff; unsigned long context_attributes; TimeStamp lifetime; - TCHAR *sname; + wchar_t *sname; int ret; size_t len = 0, input_token_len = 0; bool gss = FALSE; @@ -138,7 +138,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, if(!neg_ctx->output_token) { PSecPkgInfo SecurityPackage; - ret = s_pSecFn->QuerySecurityPackageInfo((TCHAR *) TEXT("Negotiate"), + ret = s_pSecFn->QuerySecurityPackageInfo((wchar_t *) TEXT("Negotiate"), &SecurityPackage); if(ret != SEC_E_OK) return -1; @@ -168,7 +168,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy, neg_ctx->status = s_pSecFn->AcquireCredentialsHandle(NULL, - (TCHAR *) TEXT("Negotiate"), + (wchar_t *) TEXT("Negotiate"), SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, neg_ctx->credentials, &lifetime); diff --git a/libs/libcurl/src/memdebug.h b/libs/libcurl/src/memdebug.h index bd565c8dcf..c5bee0d865 100644 --- a/libs/libcurl/src/memdebug.h +++ b/libs/libcurl/src/memdebug.h @@ -95,11 +95,11 @@ CURL_EXTERN int curl_fclose(FILE *file, int line, const char *source); # define wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) # undef _wcsdup # define _wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) -# undef _tcsdup -# define _tcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) +# undef wcsdup +# define wcsdup(ptr) curl_dowcsdup(ptr, __LINE__, __FILE__) # else -# undef _tcsdup -# define _tcsdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__) +# undef wcsdup +# define wcsdup(ptr) curl_dostrdup(ptr, __LINE__, __FILE__) # endif #endif diff --git a/libs/libcurl/src/socks_sspi.c b/libs/libcurl/src/socks_sspi.c index 0313de3334..ed5024cd27 100644 --- a/libs/libcurl/src/socks_sspi.c +++ b/libs/libcurl/src/socks_sspi.c @@ -141,7 +141,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, cred_handle.dwUpper = 0; status = s_pSecFn->AcquireCredentialsHandle(NULL, - (TCHAR *) TEXT("Kerberos"), + (wchar_t *) TEXT("Kerberos"), SECPKG_CRED_OUTBOUND, NULL, NULL, @@ -160,7 +160,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, /* As long as we need to keep sending some context info, and there's no */ /* errors, keep sending it... */ for(;;) { - TCHAR *sname; + wchar_t *sname; sname = Curl_convert_UTF8_to_tchar(service_name); if(!sname) diff --git a/libs/libevent/src/evdns.c b/libs/libevent/src/evdns.c index c4112330a9..f087962336 100644 --- a/libs/libevent/src/evdns.c +++ b/libs/libevent/src/evdns.c @@ -3773,7 +3773,7 @@ load_nameservers_with_getnetworkparams(struct evdns_base *base) } static int -config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const TCHAR *subkey) +config_nameserver_from_reg_key(struct evdns_base *base, HKEY key, const wchar_t *subkey) { char *buf; DWORD bufsz = 0, type = 0; diff --git a/libs/libevent/src/evutil.c b/libs/libevent/src/evutil.c index 495bfcc029..0ea9bc7521 100644 --- a/libs/libevent/src/evutil.c +++ b/libs/libevent/src/evutil.c @@ -34,7 +34,6 @@ #include <windows.h> #undef WIN32_LEAN_AND_MEAN #include <io.h> -#include <tchar.h> #include <process.h> #undef _WIN32_WINNT /* For structs needed by GetAdaptersAddresses */ @@ -2472,15 +2471,15 @@ evutil_hex_char_to_int_(char c) #ifdef _WIN32 HMODULE -evutil_load_windows_system_library_(const TCHAR *library_name) +evutil_load_windows_system_library_(const wchar_t *library_name) { - TCHAR path[MAX_PATH]; + wchar_t path[MAX_PATH]; unsigned n; n = GetSystemDirectory(path, MAX_PATH); - if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH) + if (n == 0 || n + wcslen(library_name) + 2 >= MAX_PATH) return 0; - _tcscat(path, TEXT("\\")); - _tcscat(path, library_name); + wcscat(path, TEXT("\\")); + wcscat(path, library_name); return LoadLibrary(path); } #endif diff --git a/libs/libevent/src/util-internal.h b/libs/libevent/src/util-internal.h index a6318f2890..61db4e9aca 100644 --- a/libs/libevent/src/util-internal.h +++ b/libs/libevent/src/util-internal.h @@ -52,11 +52,11 @@ extern "C" { /* If we need magic to say "inline", get it for free internally. */ #ifdef EVENT__inline -#if(_MSC_VER < 1900)
+#if(_MSC_VER < 1900) #define inline __inline -#else
+#else #define inline EVENT__inline -#endif
+#endif #endif @@ -398,7 +398,7 @@ void evutil_free_secure_rng_globals_(void); void evutil_free_globals_(void); #ifdef _WIN32 -HMODULE evutil_load_windows_system_library_(const TCHAR *library_name); +HMODULE evutil_load_windows_system_library_(const wchar_t *library_name); #endif #ifndef EV_SIZE_FMT diff --git a/libs/libjson/src/libJSON.cpp b/libs/libjson/src/libJSON.cpp index 255e3b1d06..a14c7865e2 100644 --- a/libs/libjson/src/libJSON.cpp +++ b/libs/libjson/src/libJSON.cpp @@ -53,7 +53,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern JSONNode nullNode;
-inline TCHAR* toCString(const json_string & str)
+inline wchar_t* toCString(const json_string & str)
{
return mir_utf8decodeT( str.c_str());
}
@@ -102,7 +102,7 @@ LIBJSON_DLL(JSONNode*) json_parse(const json_char *json) { return 0;
}
-LIBJSON_DLL(TCHAR*) json_strip_white_space(const json_char *json) {
+LIBJSON_DLL(wchar_t*) json_strip_white_space(const json_char *json) {
JSON_ASSERT_SAFE(json, JSON_TEXT("null ptr to json_strip_white_space"), return 0;);
return toCString(JSONWorker::RemoveWhiteSpaceAndComments(json));
}
@@ -277,7 +277,7 @@ LIBJSON_DLL(const json_char*) json_name(const JSONNode *node) { }
#endif
-LIBJSON_DLL(TCHAR*) json_as_string(const JSONNode *node) {
+LIBJSON_DLL(wchar_t*) json_as_string(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_as_string"), return toCString(EMPTY_CSTRING););
return toCString(node->as_string());
}
@@ -325,12 +325,12 @@ LIBJSON_DLL(JSONNode*) json_as_array(const JSONNode *node) { #endif
#ifdef JSON_WRITER
- LIBJSON_DLL(TCHAR*) json_write(const JSONNode *node) {
+ LIBJSON_DLL(wchar_t*) json_write(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_write"), return toCString(EMPTY_CSTRING););
return toCString(node->write());
}
- LIBJSON_DLL(TCHAR*) json_write_formatted(const JSONNode *node) {
+ LIBJSON_DLL(wchar_t*) json_write_formatted(const JSONNode *node) {
JSON_ASSERT_SAFE(node, JSON_TEXT("null node to json_write_formatted"), return toCString(EMPTY_CSTRING););
return toCString(node->write_formatted());
}
diff --git a/libs/zlib/src/ioapi.c b/libs/zlib/src/ioapi.c index de9151aae5..815c9035c4 100644 --- a/libs/zlib/src/ioapi.c +++ b/libs/zlib/src/ioapi.c @@ -33,7 +33,7 @@ voidpf call_zopen64(const zlib_filefunc64_32_def* pfilefunc, const void*filename if (pfilefunc->zfile_func64.zopen64_file != NULL) return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque, filename, mode); else { - return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque, (const TCHAR*)filename, mode); + return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque, (const wchar_t*)filename, mode); } } @@ -81,7 +81,7 @@ void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filef -static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const TCHAR* filename, int mode)); +static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const wchar_t* filename, int mode)); static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream)); @@ -89,10 +89,10 @@ static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPO static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream)); static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream)); -static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const TCHAR* filename, int mode) +static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const wchar_t* filename, int mode) { FILE* file = NULL; - const TCHAR* mode_fopen = NULL; + const wchar_t* mode_fopen = NULL; if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ) mode_fopen = L"rb"; else @@ -103,14 +103,14 @@ static voidpf ZCALLBACK fopen_file_func(voidpf opaque, const TCHAR* filename, in mode_fopen = L"wb"; if ((filename != NULL) && (mode_fopen != NULL)) - file = _tfopen(filename, mode_fopen); + file = _wfopen(filename, mode_fopen); return file; } static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, int mode) { FILE* file = NULL; - const TCHAR* mode_fopen = NULL; + const wchar_t* mode_fopen = NULL; if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER) == ZLIB_FILEFUNC_MODE_READ) mode_fopen = L"rb"; else @@ -121,7 +121,7 @@ static voidpf ZCALLBACK fopen64_file_func(voidpf opaque, const void* filename, i mode_fopen = L"wb"; if ((filename != NULL) && (mode_fopen != NULL)) - file = _tfopen((const TCHAR*)filename, mode_fopen); + file = _wfopen((const wchar_t*)filename, mode_fopen); return file; } diff --git a/libs/zlib/src/ioapi.h b/libs/zlib/src/ioapi.h index 20cacd9427..7dda60e52a 100644 --- a/libs/zlib/src/ioapi.h +++ b/libs/zlib/src/ioapi.h @@ -133,7 +133,7 @@ extern "C" { -typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const TCHAR* filename, int mode)); +typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const wchar_t* filename, int mode)); typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); diff --git a/libs/zlib/src/iowin32.c b/libs/zlib/src/iowin32.c index 8b4ea93970..dbca36fb19 100644 --- a/libs/zlib/src/iowin32.c +++ b/libs/zlib/src/iowin32.c @@ -32,7 +32,7 @@ #endif #endif -voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const TCHAR* filename, int mode)); +voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const wchar_t* filename, int mode)); uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); @@ -155,7 +155,7 @@ voidpf ZCALLBACK win32_open64_file_funcW(voidpf opaque, const void* filename, in return win32_build_iowin(hFile); } -voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const TCHAR* filename, int mode) +voidpf ZCALLBACK win32_open_file_func(voidpf opaque, const wchar_t* filename, int mode) { const char* mode_fopen = NULL; DWORD dwDesiredAccess, dwCreationDisposition, dwShareMode, dwFlagsAndAttributes; |