Changeset 1566 in vbox for trunk/src/VBox

Timestamp:

Mar 20, 2007 3:29:09 AM (18 years ago)

Author:

vboxsync

Message:

VBOXDDU_DECL & IN_VBOXDDU

Location:

trunk/src/VBox/Devices

Files:

• Makefile (modified) (1 diff)
• Storage/VDICore.cpp (modified) (39 diffs)
• Storage/VDICore.h (modified) (1 diff)

trunk/src/VBox/Devices/Makefile

@@ -63 +63 @@
 #
 VBoxDDU_TEMPLATE         = VBOXR3
-VBoxDDU_SDKS.win         = WINPSDK DXSDK W2K3DDK VBOX_NTDLL
+VBoxDDU_SDKS.win         = WINPSDK
+VBoxDDU_DEFS             = IN_VBOXDDU
 VBoxDDU_SOURCES          = \
         Storage/VDICore.cpp

trunk/src/VBox/Devices/Storage/VDICore.cpp

@@ -946 +946 @@
  * @param   cbToRead        Number of bytes to read.
  */
-IDER3DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, unsigned cbToRead)
+VBOXDDU_DECL(int) VDIDiskRead(PVDIDISK pDisk, uint64_t offStart, void *pvBuf, unsigned cbToRead)
 {
     /* sanity check */
@@ -1206 +1206 @@
  * @param   cbToWrite       Number of bytes to write.
  */
-IDER3DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, unsigned cbToWrite)
+VBOXDDU_DECL(int) VDIDiskWrite(PVDIDISK pDisk, uint64_t offStart, const void *pvBuf, unsigned cbToWrite)
 {
     /* sanity check */
@@ -1605 +1605 @@
  * @param   cbComment       The size of pszComment buffer. 0 is ok.
  */
-IDER3DECL(int) VDICheckImage(const char *pszFilename, unsigned *puVersion, PVDIIMAGETYPE penmType,
-                             uint64_t *pcbSize, PRTUUID pUuid, PRTUUID pParentUuid,
-                             char *pszComment, unsigned cbComment)
+VBOXDDU_DECL(int) VDICheckImage(const char *pszFilename, unsigned *puVersion, PVDIIMAGETYPE penmType,
+                                uint64_t *pcbSize, PRTUUID pUuid, PRTUUID pParentUuid,
+                                char *pszComment, unsigned cbComment)
 {
     LogFlow(("VDICheckImage:\n"));
@@ -1667 +1667 @@
  * @param   pszComment      New comment string (UTF-8). NULL is allowed to reset the comment.
  */
-IDER3DECL(int) VDISetImageComment(const char *pszFilename, const char *pszComment)
+VBOXDDU_DECL(int) VDISetImageComment(const char *pszFilename, const char *pszComment)
 {
     LogFlow(("VDISetImageComment:\n"));
@@ -1741 +1741 @@
  * @param   pvUser          User argument for the progress callback.
  */
-IDER3DECL(int) VDICreateBaseImage(const char *pszFilename, VDIIMAGETYPE enmType, uint64_t cbSize,
-                                  const char *pszComment, PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDICreateBaseImage(const char *pszFilename, VDIIMAGETYPE enmType, uint64_t cbSize,
+                                     const char *pszComment, PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDICreateBaseImage:\n"));
@@ -1773 +1773 @@
  * @param   pvUser          User argument for the progress callback.
  */
-IDER3DECL(int) VDICreateDifferenceImage(const char *pszFilename, const char *pszParent,
-                                        const char *pszComment, PFNVMPROGRESS pfnProgress,
-                                        void *pvUser)
+VBOXDDU_DECL(int) VDICreateDifferenceImage(const char *pszFilename, const char *pszParent,
+                                           const char *pszComment, PFNVMPROGRESS pfnProgress,
+                                           void *pvUser)
 {
     LogFlow(("VDICreateDifferenceImage:\n"));
@@ -1809 +1809 @@
  * @param   pszFilename     Name of the image file to check.
  */
-IDER3DECL(int) VDIDeleteImage(const char *pszFilename)
+VBOXDDU_DECL(int) VDIDeleteImage(const char *pszFilename)
 {
     LogFlow(("VDIDeleteImage:\n"));
@@ -1839 +1839 @@
  * @param   pvUser          User argument for the progress callback.
  */
-IDER3DECL(int) VDICopyImage(const char *pszDstFilename, const char *pszSrcFilename,
-                            const char *pszComment, PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDICopyImage(const char *pszDstFilename, const char *pszSrcFilename,
+                               const char *pszComment, PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDICopyImage:\n"));
@@ -2000 +2000 @@
  * @param   pvUser          User argument for the progress callback.
  */
-IDER3DECL(int) VDIShrinkImage(const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDIShrinkImage(const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDIShrinkImage:\n"));
@@ -2218 +2218 @@
  * @remark  Only used by vditool
  */
-IDER3DECL(int) VDIConvertImage(const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDIConvertImage(const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDIConvertImage:\n"));
@@ -2417 +2417 @@
  * @param   pParentModificationUuid Where to store parent modification UUID (can be NULL).
  */
-IDER3DECL(int) VDIGetImageUUIDs(const char *pszFilename,
-                                PRTUUID pUuid, PRTUUID pModificationUuid,
-                                PRTUUID pParentUuid, PRTUUID pParentModificationUuid)
+VBOXDDU_DECL(int) VDIGetImageUUIDs(const char *pszFilename,
+                                   PRTUUID pUuid, PRTUUID pModificationUuid,
+                                   PRTUUID pParentUuid, PRTUUID pParentModificationUuid)
 {
     LogFlow(("VDIGetImageUUIDs:\n"));
@@ -2496 +2496 @@
  * @param   pParentModificationUuid Optional parameter, new parent modification UUID of the image.
  */
-IDER3DECL(int) VDISetImageUUIDs(const char *pszFilename,
-                                PCRTUUID pUuid, PCRTUUID pModificationUuid,
-                                PCRTUUID pParentUuid, PCRTUUID pParentModificationUuid)
+VBOXDDU_DECL(int) VDISetImageUUIDs(const char *pszFilename,
+                                   PCRTUUID pUuid, PCRTUUID pModificationUuid,
+                                   PCRTUUID pParentUuid, PCRTUUID pParentModificationUuid)
 {
     LogFlow(("VDISetImageUUIDs:\n"));
@@ -2564 +2564 @@
  * @param   pvUser          User argument for the progress callback.
  */
-IDER3DECL(int) VDIMergeImage(const char *pszFilenameFrom, const char *pszFilenameTo,
-                             PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDIMergeImage(const char *pszFilenameFrom, const char *pszFilenameTo,
+                                PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDIMergeImage:\n"));
@@ -2726 +2726 @@
  * @returns NULL on failure, typically out of memory.
  */
-IDER3DECL(PVDIDISK) VDIDiskCreate(void)
+VBOXDDU_DECL(PVDIDISK) VDIDiskCreate(void)
 {
     PVDIDISK pDisk = (PVDIDISK)RTMemAllocZ(sizeof(VDIDISK));
@@ -2740 +2740 @@
  * @param   pDisk           Pointer to VDI HDD container.
  */
-IDER3DECL(void) VDIDiskDestroy(PVDIDISK pDisk)
+VBOXDDU_DECL(void) VDIDiskDestroy(PVDIDISK pDisk)
 {
     LogFlow(("VDIDiskDestroy: pDisk=%X\n", pDisk));
@@ -2759 +2759 @@
  * @returns Working buffer size in bytes.
  */
-IDER3DECL(unsigned) VDIDiskGetBufferSize(PVDIDISK pDisk)
+VBOXDDU_DECL(unsigned) VDIDiskGetBufferSize(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -2775 +2775 @@
  * @returns true if no one VDI image is opened in HDD container.
  */
-IDER3DECL(bool) VDIDiskIsReadOnly(PVDIDISK pDisk)
+VBOXDDU_DECL(bool) VDIDiskIsReadOnly(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -2797 +2797 @@
  * @returns 0 if no one VDI image is opened in HDD container.
  */
-IDER3DECL(uint64_t) VDIDiskGetSize(PVDIDISK pDisk)
+VBOXDDU_DECL(uint64_t) VDIDiskGetSize(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -2819 +2819 @@
  * @returns 0 if no one VDI image is opened in HDD container.
  */
-IDER3DECL(unsigned) VDIDiskGetBlockSize(PVDIDISK pDisk)
+VBOXDDU_DECL(unsigned) VDIDiskGetBlockSize(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -2846 +2846 @@
  * @param   pcSectors       Where to store the number of sectors. NULL is ok.
  */
-IDER3DECL(int) VDIDiskGetGeometry(PVDIDISK pDisk, unsigned *pcCylinders, unsigned *pcHeads, unsigned *pcSectors)
+VBOXDDU_DECL(int) VDIDiskGetGeometry(PVDIDISK pDisk, unsigned *pcCylinders, unsigned *pcHeads, unsigned *pcSectors)
 {
     /* sanity check */
@@ -2892 +2892 @@
  * @param   cSectors        Number of sectors.
  */
-IDER3DECL(int) VDIDiskSetGeometry(PVDIDISK pDisk, unsigned cCylinders, unsigned cHeads, unsigned cSectors)
+VBOXDDU_DECL(int) VDIDiskSetGeometry(PVDIDISK pDisk, unsigned cCylinders, unsigned cHeads, unsigned cSectors)
 {
     LogFlow(("VDIDiskSetGeometry: C/H/S = %u/%u/%u\n", cCylinders, cHeads, cSectors));
@@ -2925 +2925 @@
  * @param   penmTranslation Where to store the translation mode (see pdm.h).
  */
-IDER3DECL(int) VDIDiskGetTranslation(PVDIDISK pDisk, PPDMBIOSTRANSLATION penmTranslation)
+VBOXDDU_DECL(int) VDIDiskGetTranslation(PVDIDISK pDisk, PPDMBIOSTRANSLATION penmTranslation)
 {
     /* sanity check */
@@ -2953 +2953 @@
  * @param   enmTranslation  Translation mode (see pdm.h).
  */
-IDER3DECL(int) VDIDiskSetTranslation(PVDIDISK pDisk, PDMBIOSTRANSLATION enmTranslation)
+VBOXDDU_DECL(int) VDIDiskSetTranslation(PVDIDISK pDisk, PDMBIOSTRANSLATION enmTranslation)
 {
     LogFlow(("VDIDiskSetTranslation: enmTranslation=%d\n", enmTranslation));
@@ -2980 +2980 @@
  * @param   pDisk           Pointer to VDI HDD container.
  */
-IDER3DECL(int) VDIDiskGetImagesCount(PVDIDISK pDisk)
+VBOXDDU_DECL(int) VDIDiskGetImagesCount(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -3010 +3010 @@
  * @param   puVersion       Where to store the image version.
  */
-IDER3DECL(int) VDIDiskGetImageVersion(PVDIDISK pDisk, int nImage, unsigned *puVersion)
+VBOXDDU_DECL(int) VDIDiskGetImageVersion(PVDIDISK pDisk, int nImage, unsigned *puVersion)
 {
     /* sanity check */
@@ -3042 +3042 @@
  * @param   cbFilename      Size of buffer pszFilename points to.
  */
-IDER3DECL(int) VDIDiskGetImageFilename(PVDIDISK pDisk, int nImage, char *pszFilename, unsigned cbFilename)
+VBOXDDU_DECL(int) VDIDiskGetImageFilename(PVDIDISK pDisk, int nImage, char *pszFilename, unsigned cbFilename)
 {
     /* sanity check */
@@ -3085 +3085 @@
  * @param   cbComment       The size of pszComment buffer. 0 is ok.
  */
-IDER3DECL(int) VDIDiskGetImageComment(PVDIDISK pDisk, int nImage, char *pszComment, unsigned cbComment)
+VBOXDDU_DECL(int) VDIDiskGetImageComment(PVDIDISK pDisk, int nImage, char *pszComment, unsigned cbComment)
 {
     /* sanity check */
@@ -3127 +3127 @@
  * @param   penmType        Where to store the image type.
  */
-IDER3DECL(int) VDIDiskGetImageType(PVDIDISK pDisk, int nImage, PVDIIMAGETYPE penmType)
+VBOXDDU_DECL(int) VDIDiskGetImageType(PVDIDISK pDisk, int nImage, PVDIIMAGETYPE penmType)
 {
     /* sanity check */
@@ -3158 +3158 @@
  * @param   pfFlags         Where to store the image flags.
  */
-IDER3DECL(int) VDIDiskGetImageFlags(PVDIDISK pDisk, int nImage, unsigned *pfFlags)
+VBOXDDU_DECL(int) VDIDiskGetImageFlags(PVDIDISK pDisk, int nImage, unsigned *pfFlags)
 {
     /* sanity check */
@@ -3189 +3189 @@
  * @param   pUuid           Where to store the image creation uuid.
  */
-IDER3DECL(int) VDIDiskGetImageUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
+VBOXDDU_DECL(int) VDIDiskGetImageUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
 {
     /* sanity check */
@@ -3220 +3220 @@
  * @param   pUuid           Where to store the image modification uuid.
  */
-IDER3DECL(int) VDIDiskGetImageModificationUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
+VBOXDDU_DECL(int) VDIDiskGetImageModificationUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
 {
     /* sanity check */
@@ -3251 +3251 @@
  * @param   pUuid           Where to store the image creation uuid.
  */
-IDER3DECL(int) VDIDiskGetParentImageUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
+VBOXDDU_DECL(int) VDIDiskGetParentImageUuid(PVDIDISK pDisk, int nImage, PRTUUID pUuid)
 {
     /* sanity check */
@@ -3371 +3371 @@
  * @param   fOpen           Image file open mode, see VDI_OPEN_FLAGS_* constants.
  */
-IDER3DECL(int) VDIDiskOpenImage(PVDIDISK pDisk, const char *pszFilename, unsigned fOpen)
+VBOXDDU_DECL(int) VDIDiskOpenImage(PVDIDISK pDisk, const char *pszFilename, unsigned fOpen)
 {
     /* sanity check */
@@ -3430 +3430 @@
  * @param   pDisk           Pointer to VDI HDD container.
  */
-IDER3DECL(void) VDIDiskCloseImage(PVDIDISK pDisk)
+VBOXDDU_DECL(void) VDIDiskCloseImage(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -3468 +3468 @@
  * @param   pDisk           Pointer to VDI HDD container.
  */
-IDER3DECL(void) VDIDiskCloseAllImages(PVDIDISK pDisk)
+VBOXDDU_DECL(void) VDIDiskCloseAllImages(PVDIDISK pDisk)
 {
     LogFlow(("VDIDiskCloseAllImages:\n"));
@@ -3503 +3503 @@
  * @remark  Only used by tstVDI.
  */
-IDER3DECL(int) VDIDiskCommitLastDiff(PVDIDISK pDisk, PFNVMPROGRESS pfnProgress, void *pvUser)
+VBOXDDU_DECL(int) VDIDiskCommitLastDiff(PVDIDISK pDisk, PFNVMPROGRESS pfnProgress, void *pvUser)
 {
     LogFlow(("VDIDiskCommitLastDiff:\n"));
@@ -3571 +3571 @@
  * @remark  Only used by tstVDI.
  */
-IDER3DECL(int) VDIDiskCreateOpenDifferenceImage(PVDIDISK pDisk, const char *pszFilename,
-                                                const char *pszComment, PFNVMPROGRESS pfnProgress,
-                                                void *pvUser)
+VBOXDDU_DECL(int) VDIDiskCreateOpenDifferenceImage(PVDIDISK pDisk, const char *pszFilename,
+                                                   const char *pszComment, PFNVMPROGRESS pfnProgress,
+                                                   void *pvUser)
 {
     LogFlow(("VDIDiskCreateOpenDifferenceImage:\n"));
@@ -3677 +3677 @@
  * @remark  Only used by tstVDI and vditool
  */
-IDER3DECL(void) VDIDiskDumpImages(PVDIDISK pDisk)
+VBOXDDU_DECL(void) VDIDiskDumpImages(PVDIDISK pDisk)
 {
     /* sanity check */
@@ -3687 +3687 @@
         vdiDumpImage(pImage);
 }
+

trunk/src/VBox/Devices/Storage/VDICore.h

@@ -521 +521 @@
 __BEGIN_DECLS
 
-void vdiInitVDIDisk(PVDIDISK pDisk);
-void vdiFlushImage(PVDIIMAGEDESC pImage);
-int  vdiChangeImageMode(PVDIIMAGEDESC pImage, bool fReadOnly);
+VBOXDDU_DECL(void) vdiInitVDIDisk(PVDIDISK pDisk);
+VBOXDDU_DECL(void) vdiFlushImage(PVDIIMAGEDESC pImage);
+VBOXDDU_DECL(int)  vdiChangeImageMode(PVDIIMAGEDESC pImage, bool fReadOnly);
 
 __END_DECLS