Changeset 108285 in vbox for trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

Timestamp:

Feb 19, 2025 10:53:35 AM (4 weeks ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

167628

Message:

Host installer/win: Added routines for handling CustomActionData to the common InstallHelper.dll code. Required as a prerequisite for using shared (sessison / system) CustomActionData by the installer, to better support elevated driver installs on modern Windows OSes (>= 10). bugref:10762

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h (modified) (2 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

@@ -36 +36 @@
 #endif
 
+/** Struct for keeping a single "CustomActionData" key=value item. */
+typedef struct VBOXMSICUSTOMACTIONDATAENTRY
+{
+    /** Key (name) of the item. */
+    char *pszKey;
+    /** Value of the item. Always a string but can represent other stuff. Use with care. */
+    char *pszVal;
+} VBOXMSICUSTOMACTIONDATAENTRY;
+/** Pointer to a struct for keeping a single "CustomActionData" key=value item. */
+typedef VBOXMSICUSTOMACTIONDATAENTRY *PVBOXMSICUSTOMACTIONDATAENTRY;
+
+/** Struct for keeping "CustomActionData" entries. */
+typedef struct VBOXMSICUSTOMACTIONDATA
+{
+    /** Array of CustomActionData entries. */
+    PVBOXMSICUSTOMACTIONDATAENTRY paEntries;
+    /** Number of entries in \a paEntries. */
+    size_t                        cEntries;
+} VBOXMSICUSTOMACTIONDATA;
+/** Pointer to a struct for keeping "CustomActionData" entries. */
+typedef VBOXMSICUSTOMACTIONDATA *PVBOXMSICUSTOMACTIONDATA;
+
+/** Default separator for custom action data key=value pairs. */
+#define VBOX_MSI_CUSTOMACTIONDATA_SEP_STR "##"
+
+void VBoxMsiCustomActionDataFree(PVBOXMSICUSTOMACTIONDATA pData);
+int  VBoxMsiCustomActionDataQueryEx(MSIHANDLE hMsi, const char *pszSep, PVBOXMSICUSTOMACTIONDATA *ppData);
+int  VBoxMsiCustomActionDataQuery(MSIHANDLE hMsi, PVBOXMSICUSTOMACTIONDATA *ppData);
+const char *VBoxMsiCustomActionDataFind(PVBOXMSICUSTOMACTIONDATA pHaystack, const char *pszNeedle);
+
 int  VBoxMsiQueryProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszVal, DWORD cwVal);
 int  VBoxMsiQueryPropEx(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszVal, DWORD *pcwVal);
@@ -41 +71 @@
 int  VBoxMsiQueryPropInt32(MSIHANDLE hMsi, const char *pszName, DWORD *pdwValue);
 UINT VBoxMsiSetProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue);
-int VBoxMsiSetPropUtf8(MSIHANDLE hMsi, const char *pszName, const char *pszValue);
+int  VBoxMsiSetPropUtf8(MSIHANDLE hMsi, const char *pszName, const char *pszValue);
 UINT VBoxMsiSetPropDWORD(MSIHANDLE hMsi, const WCHAR *pwszName, DWORD dwVal);
-int VBoxMsiRegQueryDWORDW(MSIHANDLE hMsi, HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue);
-int VBoxMsiRegQueryDWORD(MSIHANDLE hMsi, HKEY hKey, const char *pszName, DWORD *pdwValue);
+int  VBoxMsiRegQueryDWORDW(MSIHANDLE hMsi, HKEY hKey, LPCWSTR pwszName, DWORD *pdwValue);
+int  VBoxMsiRegQueryDWORD(MSIHANDLE hMsi, HKEY hKey, const char *pszName, DWORD *pdwValue);
 
 #endif /* !VBOX_INCLUDED_SRC_InstallHelper_VBoxCommon_h */