OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Révision7325 (tree)
l'heure2018-12-15 00:37:35
Auteurzmatsuo

Message de Log

Merge branch 'trunk' into cmake

Change Summary

Modification

--- branches/cmake/TTProxy/ProxyWSockHook.h (revision 7324)
+++ branches/cmake/TTProxy/ProxyWSockHook.h (revision 7325)
@@ -1927,107 +1927,142 @@
19271927 case IDS_UNABLE_TO_GET_ISSUER_CERT:
19281928 UTIL_get_lang_msg("MSG_UNABLE_TO_GET_ISSUER_CERT", uimsg, sizeof(uimsg),
19291929 "Unable to get Issuer Certificate");
1930+ break;
19301931 case IDS_UNABLE_TO_GET_CRL:
19311932 UTIL_get_lang_msg("MSG_UNABLE_TO_GET_CRL", uimsg, sizeof(uimsg),
19321933 "Unable to get Certificate CRL");
1934+ break;
19331935 case IDS_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
19341936 UTIL_get_lang_msg("MSG_UNABLE_TO_DECRYPT_CERT_SIGNATURE", uimsg, sizeof(uimsg),
19351937 "Unable to decrypt Certificate's Signature");
1938+ break;
19361939 case IDS_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
19371940 UTIL_get_lang_msg("MSG_UNABLE_TO_DECRYPT_CRL_SIGNATURE", uimsg, sizeof(uimsg),
19381941 "Unable to decrypt CRL's Signature");
1942+ break;
19391943 case IDS_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
19401944 UTIL_get_lang_msg("MSG_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY", uimsg, sizeof(uimsg),
19411945 "Unable to decode Issuer Public Key");
1946+ break;
19421947 case IDS_CERT_SIGNATURE_FAILURE:
19431948 UTIL_get_lang_msg("MSG_CERT_SIGNATURE_FAILURE", uimsg, sizeof(uimsg),
19441949 "Certificate Signature failure");
1950+ break;
19451951 case IDS_CRL_SIGNATURE_FAILURE:
19461952 UTIL_get_lang_msg("MSG_CRL_SIGNATURE_FAILURE", uimsg, sizeof(uimsg),
19471953 "CRL Signature failure");
1954+ break;
19481955 case IDS_CERT_NOT_YET_VALID:
19491956 UTIL_get_lang_msg("MSG_CERT_NOT_YET_VALID", uimsg, sizeof(uimsg),
19501957 "Certificate is not yet valid");
1958+ break;
19511959 case IDS_CERT_HAS_EXPIRED:
19521960 UTIL_get_lang_msg("MSG_CERT_HAS_EXPIRED", uimsg, sizeof(uimsg),
19531961 "Certificate has expired");
1962+ break;
19541963 case IDS_CRL_NOT_YET_VALID:
19551964 UTIL_get_lang_msg("MSG_CRL_NOT_YET_VALID", uimsg, sizeof(uimsg),
19561965 "CRL is not yet valid");
1966+ break;
19571967 case IDS_CRL_HAS_EXPIRED:
19581968 UTIL_get_lang_msg("MSG_CRL_HAS_EXPIRED", uimsg, sizeof(uimsg),
19591969 "CRL has expired");
1970+ break;
19601971 case IDS_ERROR_IN_CERT_NOT_BEFORE_FIELD:
19611972 UTIL_get_lang_msg("MSG_ERROR_IN_CERT_NOT_BEFORE_FIELD", uimsg, sizeof(uimsg),
19621973 "Format error in Certificate's notBefore field");
1974+ break;
19631975 case IDS_ERROR_IN_CERT_NOT_AFTER_FIELD:
19641976 UTIL_get_lang_msg("MSG_ERROR_IN_CERT_NOT_AFTER_FIELD", uimsg, sizeof(uimsg),
19651977 "Format error in Certificate's notAfter field");
1978+ break;
19661979 case IDS_ERROR_IN_CRL_LAST_UPDATE_FIELD:
19671980 UTIL_get_lang_msg("MSG_ERROR_IN_CRL_LAST_UPDATE_FIELD", uimsg, sizeof(uimsg),
19681981 "Format error in CRL's lastUpdate field");
1982+ break;
19691983 case IDS_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
19701984 UTIL_get_lang_msg("MSG_ERROR_IN_CRL_NEXT_UPDATE_FIELD", uimsg, sizeof(uimsg),
19711985 "Format error in CRL's nextUpdate field");
1986+ break;
19721987 case IDS_OUT_OF_MEM:
19731988 UTIL_get_lang_msg("MSG_OUT_OF_MEM", uimsg, sizeof(uimsg),
19741989 "Out of memory");
1990+ break;
19751991 case IDS_DEPTH_ZERO_SELF_SIGNED_CERT:
19761992 UTIL_get_lang_msg("MSG_DEPTH_ZERO_SELF_SIGNED_CERT", uimsg, sizeof(uimsg),
19771993 "Self-signed Certificate");
1994+ break;
19781995 case IDS_SELF_SIGNED_CERT_IN_CHAIN:
19791996 UTIL_get_lang_msg("MSG_SELF_SIGNED_CERT_IN_CHAIN", uimsg, sizeof(uimsg),
19801997 "Self-signed Certificate found in Certificate chain");
1998+ break;
19811999 case IDS_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
19822000 UTIL_get_lang_msg("MSG_UNABLE_TO_GET_ISSUER_CERT_LOCALLY", uimsg, sizeof(uimsg),
19832001 "Unable to get Local Issuer Certificate");
2002+ break;
19842003 case IDS_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
19852004 UTIL_get_lang_msg("MSG_UNABLE_TO_VERIFY_LEAF_SIGNATURE", uimsg, sizeof(uimsg),
19862005 "Unable to verify the first Certificate");
2006+ break;
19872007 case IDS_CERT_CHAIN_TOO_LONG:
19882008 UTIL_get_lang_msg("MSG_CERT_CHAIN_TOO_LONG", uimsg, sizeof(uimsg),
19892009 "Certificate chain too long");
2010+ break;
19902011 case IDS_CERT_REVOKED:
19912012 UTIL_get_lang_msg("MSG_CERT_REVOKED", uimsg, sizeof(uimsg),
19922013 "Certificate revoked");
2014+ break;
19932015 case IDS_INVALID_CA:
19942016 UTIL_get_lang_msg("MSG_INVALID_CA", uimsg, sizeof(uimsg),
19952017 "Invalid CA Certificate");
2018+ break;
19962019 case IDS_PATH_LENGTH_EXCEEDED:
19972020 UTIL_get_lang_msg("MSG_PATH_LENGTH_EXCEEDED", uimsg, sizeof(uimsg),
19982021 "Path length constraint exceeded");
2022+ break;
19992023 case IDS_INVALID_PURPOSE:
20002024 UTIL_get_lang_msg("MSG_INVALID_PURPOSE", uimsg, sizeof(uimsg),
20012025 "Unsupported Certificate purpose");
2026+ break;
20022027 case IDS_CERT_UNTRUSTED:
20032028 UTIL_get_lang_msg("MSG_CERT_UNTRUSTED", uimsg, sizeof(uimsg),
20042029 "Certificate not trusted");
2030+ break;
20052031 case IDS_CERT_REJECTED:
20062032 UTIL_get_lang_msg("MSG_CERT_REJECTED", uimsg, sizeof(uimsg),
20072033 "Certificate rejected");
2034+ break;
20082035 case IDS_SUBJECT_ISSUER_MISMATCH:
20092036 UTIL_get_lang_msg("MSG_SUBJECT_ISSUER_MISMATCH", uimsg, sizeof(uimsg),
20102037 "Subject Issuer mismatch");
2038+ break;
20112039 case IDS_AKID_SKID_MISMATCH:
20122040 UTIL_get_lang_msg("MSG_AKID_SKID_MISMATCH", uimsg, sizeof(uimsg),
20132041 "Authority and Subject Key Identifier mismatch");
2042+ break;
20142043 case IDS_AKID_ISSUER_SERIAL_MISMATCH:
20152044 UTIL_get_lang_msg("MSG_AKID_ISSUER_SERIAL_MISMATCH", uimsg, sizeof(uimsg),
20162045 "Authority and Issuer Serial Number mismatch");
2046+ break;
20172047 case IDS_KEYUSAGE_NO_CERTSIGN:
20182048 UTIL_get_lang_msg("MSG_KEYUSAGE_NO_CERTSIGN", uimsg, sizeof(uimsg),
20192049 "Key usage does not include Certificate signing");
2050+ break;
20202051 case IDS_APPLICATION_VERIFICATION:
20212052 UTIL_get_lang_msg("MSG_APPLICATION_VERIFICATION", uimsg, sizeof(uimsg),
20222053 "Application verification failure");
2054+ break;
20232055 case IDS_UNMATCH_COMMON_NAME:
20242056 UTIL_get_lang_msg("MSG_UNMATCH_COMMON_NAME", uimsg, sizeof(uimsg),
20252057 "Unmatch Common Name");
2058+ break;
20262059 case IDS_UNABLE_TO_GET_COMMON_NAME:
20272060 UTIL_get_lang_msg("MSG_UNABLE_TO_GET_COMMON_NAME", uimsg, sizeof(uimsg),
20282061 "Unable to get Common Name");
2062+ break;
20292063 default:
20302064 uimsg[0] = NULL;
2065+ break;
20312066 }
20322067 return setError(s, uimsg);
20332068 }
--- branches/cmake/TTProxy/YCL/include/YCL/Integer.h (revision 7324)
+++ branches/cmake/TTProxy/YCL/include/YCL/Integer.h (revision 7325)
@@ -35,7 +35,7 @@
3535 negative = true;
3636 value = -value;
3737 }
38- return toString(value, 10, negative);
38+ return toString(value, base, negative);
3939 }
4040 static String toString(unsigned long value) {
4141 return toString(value, 10);
--- branches/cmake/TTProxy/YCL/include/YCL/Resource.h (revision 7324)
+++ branches/cmake/TTProxy/YCL/include/YCL/Resource.h (revision 7325)
@@ -82,7 +82,7 @@
8282 return loadIcon(instance, MAKEINTRESOURCE(id), cx, cy, flags);
8383 }
8484 static HICON loadIcon(HINSTANCE instance, const char* id, int cx, int cy, int flags) {
85- return (HICON) ::LoadImage(instance, id, IMAGE_ICON, cx, cx, flags);
85+ return (HICON) ::LoadImage(instance, id, IMAGE_ICON, cx, cy, flags);
8686 }
8787
8888 static HCURSOR loadCursor(int id) {
@@ -120,7 +120,7 @@
120120 return loadCursor(instance, MAKEINTRESOURCE(id), cx, cy, flags);
121121 }
122122 static HCURSOR loadCursor(HINSTANCE instance, const char* id, int cx, int cy, int flags) {
123- return (HCURSOR) ::LoadImage(instance, id, IMAGE_CURSOR, cx, cx, flags);
123+ return (HCURSOR) ::LoadImage(instance, id, IMAGE_CURSOR, cx, cy, flags);
124124 }
125125
126126 static HMENU loadMenu(int id) {
Afficher sur ancien navigateur de dépôt.