Added a few more wrapped nns3 and nspr4 functions

5 files changed, 11 insertions, 6 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index e0df6b53..2810cd91 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -738,6 +738,7 @@
 #() iFipLu
 #() iFipLp
 #() iFippi
+#() iFippu
 #() iFippL
 #() iFippp
 #() iFipON
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 14725e3a..da0b70cf 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -772,6 +772,7 @@ typedef int64_t (*iFipLi_t)(int64_t, void*, uintptr_t, int64_t);
 typedef int64_t (*iFipLu_t)(int64_t, void*, uintptr_t, uint64_t);
 typedef int64_t (*iFipLp_t)(int64_t, void*, uintptr_t, void*);
 typedef int64_t (*iFippi_t)(int64_t, void*, void*, int64_t);
+typedef int64_t (*iFippu_t)(int64_t, void*, void*, uint64_t);
 typedef int64_t (*iFippL_t)(int64_t, void*, void*, uintptr_t);
 typedef int64_t (*iFippp_t)(int64_t, void*, void*, void*);
 typedef int64_t (*iFipON_t)(int64_t, void*, int32_t, ...);
@@ -2934,6 +2935,7 @@ void iFipLi(x64emu_t *emu, uintptr_t fcn) { iFipLi_t fn = (iFipLi_t)fcn; R_RAX=(
 void iFipLu(x64emu_t *emu, uintptr_t fcn) { iFipLu_t fn = (iFipLu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uint64_t)R_RCX); }
 void iFipLp(x64emu_t *emu, uintptr_t fcn) { iFipLp_t fn = (iFipLp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFippi(x64emu_t *emu, uintptr_t fcn) { iFippi_t fn = (iFippi_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
+void iFippu(x64emu_t *emu, uintptr_t fcn) { iFippu_t fn = (iFippu_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void iFippL(x64emu_t *emu, uintptr_t fcn) { iFippL_t fn = (iFippL_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFippp(x64emu_t *emu, uintptr_t fcn) { iFippp_t fn = (iFippp_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFipON(x64emu_t *emu, uintptr_t fcn) { iFipON_t fn = (iFipON_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (void*)R_RSI, of_convert((int32_t)R_RDX), (void*)R_RCX); }
@@ -4988,6 +4990,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipLu) return 1;
 	if (fun == &iFipLp) return 1;
 	if (fun == &iFippi) return 1;
+	if (fun == &iFippu) return 1;
 	if (fun == &iFippL) return 1;
 	if (fun == &iFippp) return 1;
 	if (fun == &iFuipu) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 577ab144..8dc0ebde 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -771,6 +771,7 @@ void iFipLi(x64emu_t *emu, uintptr_t fnc);
 void iFipLu(x64emu_t *emu, uintptr_t fnc);
 void iFipLp(x64emu_t *emu, uintptr_t fnc);
 void iFippi(x64emu_t *emu, uintptr_t fnc);
+void iFippu(x64emu_t *emu, uintptr_t fnc);
 void iFippL(x64emu_t *emu, uintptr_t fnc);
 void iFippp(x64emu_t *emu, uintptr_t fnc);
 void iFipON(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappednspr4_private.h b/src/wrapped/wrappednspr4_private.h
index 20a091ca..9a02d1c7 100755
--- a/src/wrapped/wrappednspr4_private.h
+++ b/src/wrapped/wrappednspr4_private.h
@@ -93,7 +93,7 @@ GO(PR_Close, iFp)
 //GO(PR_DestroyWaitGroup, 
 //GO(PR_DetachProcess, 
 //GO(PR_DetachSharedMemory, 
-//GO(PR_DetachThread, 
+GO(PR_DetachThread, vFv)
 //GO(PR_DisableClockInterrupts, 
 //GO(PR_dtoa, 
 //GO(PR_DuplicateEnvironment, 
diff --git a/src/wrapped/wrappednss3_private.h b/src/wrapped/wrappednss3_private.h
index adc078bb..a826602a 100755
--- a/src/wrapped/wrappednss3_private.h
+++ b/src/wrapped/wrappednss3_private.h
@@ -83,7 +83,7 @@ GO(CERT_DestroyCertificate, vFp)
 GO(CERT_DestroyCertificateList, vFp)
 //GO(CERT_DestroyCertificatePoliciesExtension, 
 GO(CERT_DestroyCertificateRequest, vFp)
-//GO(CERT_DestroyCertList, 
+GO(CERT_DestroyCertList, vFp)
 //GO(CERT_DestroyCERTRevocationFlags, 
 //GO(CERT_DestroyName, 
 //GO(CERT_DestroyOCSPCertID, 
@@ -279,7 +279,7 @@ GO(DER_DecodeTimeChoice, iFpp)
 //GO(HASH_GetHashOidTagByHashType, 
 //GO(HASH_GetHashTypeByOidTag, 
 //GO(HASH_GetType, 
-//GO(HASH_HashBuf, 
+GO(HASH_HashBuf, iFippu)
 //GO(HASH_ResultLen, 
 //GO(HASH_ResultLenByOidTag, 
 //GO(HASH_ResultLenContext, 
@@ -736,7 +736,7 @@ GO(SECITEM_FreeItem, iFpi)
 //GO(SECKEY_DestroyPrivateKey, 
 //GO(SECKEY_DestroyPrivateKeyInfo, 
 //GO(SECKEY_DestroyPrivateKeyList, 
-//GO(SECKEY_DestroyPublicKey, 
+GO(SECKEY_DestroyPublicKey, vFp)
 //GO(SECKEY_DestroyPublicKeyList, 
 //GO(SECKEY_DestroySubjectPublicKeyInfo, 
 //DATA(SECKEY_DSAPublicKeyTemplate,     //R type
@@ -754,7 +754,7 @@ DATA(SECKEY_EncryptedPrivateKeyInfoTemplate, 128)
 //DATA(SECKEY_PointerToPrivateKeyInfoTemplate, 
 DATA(SECKEY_PrivateKeyInfoTemplate, 192)
 //GO(SECKEY_PublicKeyStrength, 
-//GO(SECKEY_PublicKeyStrengthInBits, 
+GO(SECKEY_PublicKeyStrengthInBits, uFp)
 //GO(SECKEY_RemovePrivateKeyListNode, 
 //DATA(SECKEY_RSAPSSParamsTemplate, 
 //DATA(SECKEY_RSAPublicKeyTemplate,     //R type
@@ -813,7 +813,7 @@ DATA(SECOID_AlgorithmIDTemplate, 16*sizeof(void*))   //R type
 //GO(SECOID_DestroyAlgorithmID, 
 //GO(SECOID_FindOID, 
 //GO(SECOID_FindOIDByTag, 
-//GO(SECOID_FindOIDTag, 
+GO(SECOID_FindOIDTag, iFp)
 //GO(SECOID_FindOIDTagDescription, 
 //GO(SECOID_GetAlgorithmTag, 
 //GO(SECOID_SetAlgorithmID,