Changeset 95624 in vbox for trunk/include

Timestamp:

Jul 13, 2022 8:31:41 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/RTAsn1,RTCrSpc: Generate setter functions for RTASN1TMPL_MEMBER_OPT_XTAG_EX and RTASN1TMPL_MEMBER_OPT_ITAG_EX members. Added setter prototypes to the spc.h header. bugref:8691

Location:

trunk/include/iprt

Files:

• asn1-generator-pass.h (modified) (1 diff)
• asn1.h (modified) (2 diffs)
• crypto/spc.h (modified) (3 diffs)
• mangling.h (modified) (5 diffs)

trunk/include/iprt/asn1-generator-pass.h

@@ -865 +865 @@
 # define RTASN1TMPL_END_SETCORE()                                                   RTASN1TMPL_SEMICOLON_DUMMY()
 
+# define RTASN1TMPL_MEMBER_OPT_ITAG_EX(a_Name, a_Type, a_Api, a_uTag, a_fClue, a_Constraints) \
+RTASN1TMPL_DECL(int) RT_CONCAT3(RTASN1TMPL_EXT_NAME,_Set,a_Name)(RT_CONCAT(P,RTASN1TMPL_TYPE) pThis, RT_CONCAT(PC,a_Type) pSrc,\
+                                                                 PCRTASN1ALLOCATORVTABLE pAllocator) \
+{ \
+    AssertPtr(pThis); AssertPtr(pSrc); Assert(RT_CONCAT(a_Api,_IsPresent)(pSrc)); \
+    if (RT_CONCAT(a_Api,_IsPresent)(&pThis->a_Name)) \
+        RT_CONCAT(a_Api,_Delete)(&pThis->a_Name); \
+    \
+    int rc = RT_CONCAT(a_Api,_Clone)(&pThis->a_Name, pSrc, pAllocator); \
+    if (RT_SUCCESS(rc)) \
+    { \
+        RTAsn1Core_ResetImplict(RT_CONCAT(a_Api,_GetAsn1Core)(&pThis->a_Name)); /* probably not needed */ \
+        rc = RTAsn1Core_SetTagAndFlags(RT_CONCAT(a_Api,_GetAsn1Core)(&pThis->a_Name), \
+                                       a_uTag, RTASN1TMPL_ITAG_F_EXPAND(a_fClue)); \
+    } \
+    return rc; \
+} RTASN1TMPL_SEMICOLON_DUMMY()
+
+# define RTASN1TMPL_MEMBER_OPT_XTAG_EX(a_TnNm, a_CtxTagN, a_Name, a_Type, a_Api, a_uTag, a_Constraints) \
+RTASN1TMPL_DECL(int) RT_CONCAT3(RTASN1TMPL_EXT_NAME,_Set,a_Name)(RT_CONCAT(P,RTASN1TMPL_TYPE) pThis, RT_CONCAT(PC,a_Type) pSrc,\
+                                                                 PCRTASN1ALLOCATORVTABLE pAllocator) \
+{ \
+    AssertPtr(pThis); AssertPtr(pSrc); Assert(RT_CONCAT(a_Api,_IsPresent)(pSrc)); \
+    if (RTASN1CORE_IS_PRESENT(&pThis->a_TnNm.a_CtxTagN.Asn1Core)) \
+        RT_CONCAT(a_Api,_Delete)(&pThis->a_TnNm.a_Name); \
+    \
+    int rc = RT_CONCAT3(RTAsn1ContextTag,a_uTag,_Init)(&pThis->a_TnNm.a_CtxTagN, \
+                                                       &RT_CONCAT5(g_,RTASN1TMPL_INT_NAME,_XTAG_,a_Name,_Vtable), \
+                                                       pAllocator); \
+    if (RT_SUCCESS(rc)) \
+    { \
+        rc = RT_CONCAT(a_Api,_Clone)(&pThis->a_TnNm.a_Name, pSrc, pAllocator); \
+        if (RT_SUCCESS(rc)) \
+            RTAsn1Core_ResetImplict(RT_CONCAT(a_Api,_GetAsn1Core)(&pThis->a_TnNm.a_Name)); \
+    } \
+    return rc; \
+} RTASN1TMPL_SEMICOLON_DUMMY()
 
 # define RTASN1TMPL_BEGIN_PCHOICE() RTASN1TMPL_SEMICOLON_DUMMY()

trunk/include/iprt/asn1.h

@@ -1107 +1107 @@
 
 RTDECL(int) RTAsn1ObjId_InitFromString(PRTASN1OBJID pThis, const char *pszObjId, PCRTASN1ALLOCATORVTABLE pAllocator);
+RTDECL(int) RTAsn1ObjId_SetFromString(PRTASN1OBJID pThis, const char *pszObjId, PCRTASN1ALLOCATORVTABLE pAllocator);
 
 /**
@@ -1185 +1186 @@
 #define RTASN1BITSTRING_GET_BYTE_SIZE(a_pBitString)  ( ((a_pBitString)->cBits + 7U) >> 3 )
 
+RTDECL(int) RTAsn1BitString_InitWithData(PRTASN1BITSTRING pThis, void const *pvSrc, uint32_t cSrcBits,
+                                         PCRTASN1ALLOCATORVTABLE pAllocator);
 RTDECL(int) RTAsn1BitString_DecodeAsn1Ex(PRTASN1CURSOR pCursor, uint32_t fFlags, uint32_t cMaxBits, PRTASN1BITSTRING pThis,
                                          const char *pszErrorTag);

trunk/include/iprt/crypto/spc.h

@@ -293 +293 @@
 typedef RTCRSPCSTRING const *PCRTCRSPCSTRING;
 RTASN1TYPE_STANDARD_PROTOTYPES(RTCRSPCSTRING, RTDECL, RTCrSpcString, Dummy.Asn1Core);
+
+RTDECL(int) RTCrSpcString_SetUcs2(PRTCRSPCSTRING pThis, PCRTASN1STRING pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
+RTDECL(int) RTCrSpcString_SetAscii(PRTCRSPCSTRING pThis, PCRTASN1STRING pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
 
 
@@ -351 +354 @@
 RTASN1TYPE_STANDARD_PROTOTYPES(RTCRSPCLINK, RTDECL, RTCrSpcLink, Dummy.Asn1Core);
 
+RTDECL(int) RTCrSpcLink_SetUrl(PRTCRSPCLINK pThis, PCRTASN1STRING pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
+RTDECL(int) RTCrSpcLink_SetMoniker(PRTCRSPCLINK pThis, PCRTCRSPCSERIALIZEDOBJECT pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
+RTDECL(int) RTCrSpcLink_SetFile(PRTCRSPCLINK pThis, PCRTCRSPCSTRING pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
+
 
 #if 0 /** @todo Might not be the correct bit order. */
@@ -389 +396 @@
 typedef RTCRSPCPEIMAGEDATA const *PCRTCRSPCPEIMAGEDATA;
 RTASN1TYPE_STANDARD_PROTOTYPES(RTCRSPCPEIMAGEDATA, RTDECL, RTCrSpcPeImageData, SeqCore.Asn1Core);
+
+RTDECL(int) RTCrSpcPeImageData_SetFlags(PRTCRSPCPEIMAGEDATA pThis, PCRTASN1BITSTRING pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
+RTDECL(int) RTCrSpcPeImageData_SetFile(PRTCRSPCPEIMAGEDATA pThis, PCRTCRSPCLINK pToClone, PCRTASN1ALLOCATORVTABLE pAllocator);
 
 /** The object ID for SpcPeImageData. */

trunk/include/iprt/mangling.h

@@ -3081 +3081 @@
 # define RTAsn1BitString_GetAsUInt64                    RT_MANGLER(RTAsn1BitString_GetAsUInt64)
 # define RTAsn1BitString_Init                           RT_MANGLER(RTAsn1BitString_Init)
+# define RTAsn1BitString_InitWithData                   RT_MANGLER(RTAsn1BitString_InitWithData)
 # define RTAsn1BitString_AreContentBitsValid            RT_MANGLER(RTAsn1BitString_AreContentBitsValid)
 # define RTAsn1BitString_RefreshContent                 RT_MANGLER(RTAsn1BitString_RefreshContent)
@@ -3206 +3207 @@
 # define RTAsn1ObjId_Init                               RT_MANGLER(RTAsn1ObjId_Init)
 # define RTAsn1ObjId_InitFromString                     RT_MANGLER(RTAsn1ObjId_InitFromString)
+# define RTAsn1ObjId_SetFromString                      RT_MANGLER(RTAsn1ObjId_SetFromString)
 # define RTAsn1ObjId_StartsWith                         RT_MANGLER(RTAsn1ObjId_StartsWith)
 # define RTAsn1SeqOfObjIds_CheckSanity                  RT_MANGLER(RTAsn1SeqOfObjIds_CheckSanity)
@@ -3627 +3629 @@
 # define RTCrSpcIndirectDataContent_DecodeAsn1          RT_MANGLER(RTCrSpcIndirectDataContent_DecodeAsn1)
 # define RTCrSpcLink_DecodeAsn1                         RT_MANGLER(RTCrSpcLink_DecodeAsn1)
+# define RTCrSpcPeImageData_SetFile                     RT_MANGLER(RTCrSpcPeImageData_SetFile)
+# define RTCrSpcPeImageData_SetFlags                    RT_MANGLER(RTCrSpcPeImageData_SetFlags)
 # define RTCrSpcPeImageData_DecodeAsn1                  RT_MANGLER(RTCrSpcPeImageData_DecodeAsn1)
 # define RTCrSpcSerializedObjectAttribute_DecodeAsn1    RT_MANGLER(RTCrSpcSerializedObjectAttribute_DecodeAsn1)
@@ -3640 +3644 @@
 # define RTCrSpcIndirectDataContent_Enum                RT_MANGLER(RTCrSpcIndirectDataContent_Enum)
 # define RTCrSpcIndirectDataContent_GetPeImageObjAttrib RT_MANGLER(RTCrSpcIndirectDataContent_GetPeImageObjAttrib)
+# define RTCrSpcLink_SetFile                            RT_MANGLER(RTCrSpcLink_SetFile)
+# define RTCrSpcLink_SetMoniker                         RT_MANGLER(RTCrSpcLink_SetMoniker)
+# define RTCrSpcLink_SetUrl                             RT_MANGLER(RTCrSpcLink_SetUrl)
 # define RTCrSpcLink_Compare                            RT_MANGLER(RTCrSpcLink_Compare)
 # define RTCrSpcLink_Delete                             RT_MANGLER(RTCrSpcLink_Delete)
@@ -3666 +3673 @@
 # define RTCrSpcIndirectDataContent_Clone               RT_MANGLER(RTCrSpcIndirectDataContent_Clone)
 # define RTCrSpcIndirectDataContent_Init                RT_MANGLER(RTCrSpcIndirectDataContent_Init)
+# define RTCrSpcString_SetAscii                         RT_MANGLER(RTCrSpcString_SetAscii)
+# define RTCrSpcString_SetUcs2                          RT_MANGLER(RTCrSpcString_SetUcs2)
 # define RTCrSpcLink_Clone                              RT_MANGLER(RTCrSpcLink_Clone)
 # define RTCrSpcLink_Init                               RT_MANGLER(RTCrSpcLink_Init)