VirtualBox

Changeset 102334 in vbox


Ignore:
Timestamp:
Nov 27, 2023 4:08:53 PM (15 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
160470
Message:

libs/xpcom: Drop VBOX_USE_IPRT_IN_XPCOM andmake the code the default as running without IPRT is impossible anyways, bugref:10545

Location:
trunk/src/libs/xpcom18a4
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/libs/xpcom18a4/Config.kmk

    r102321 r102334  
    7878        NDEBUG=1 \
    7979        _IMPL_NS_COM \
    80         IN_RING3 \
    81         VBOX_USE_IPRT_IN_XPCOM
     80        IN_RING3
    8281ifdef VBOX_WITH_AUTOMATIC_DEFS_QUOTING
    8382 TEMPLATE_XPComDll_DEFS              += \
    … …  
    242241#
    243242TEMPLATE_XPComBldProg                     = XPCOM Build programs executables
    244 TEMPLATE_XPComBldProg_EXTENDS             = VBoxBldProg
    245 ## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPComExe is expanded when this is being used.)
    246 TEMPLATE_XPComBldProg_DEFS                = \
    247         $(TEMPLATE_VBoxBldProg_DEFS) \
    248         $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPComExe_DEFS))
    249 TEMPLATE_XPComBldProg_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPComExe_DEFS.$(KBUILD_HOST))
    250 TEMPLATE_XPComBldProg_DEFS.x86            = $(TEMPLATE_VBoxBldProg_DEFS.x86)            $(TEMPLATE_XPComExe_DEFS.x86)
    251 TEMPLATE_XPComBldProg_DEFS.amd64          = $(TEMPLATE_VBoxBldProg_DEFS.amd64)          $(TEMPLATE_XPComExe_DEFS.amd64)
     243TEMPLATE_XPComBldProg_EXTENDS             = VBoxAdvBldProg
     244TEMPLATE_XPComBldProg_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxAdvBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPComExe_DEFS.$(KBUILD_HOST))
     245TEMPLATE_XPComBldProg_DEFS.x86            = $(TEMPLATE_VBoxAdvBldProg_DEFS.x86)            $(TEMPLATE_XPComExe_DEFS.x86)
     246TEMPLATE_XPComBldProg_DEFS.amd64          = $(TEMPLATE_VBoxAdvBldProg_DEFS.amd64)          $(TEMPLATE_XPComExe_DEFS.amd64)
     247TEMPLATE_XPComBldProg_DEFS.arm64          = $(TEMPLATE_VBoxAdvBldProg_DEFS.arm64)          $(TEMPLATE_XPComExe_DEFS.arm64)
    252248TEMPLATE_XPComBldProg_INCS                = \
    253249        $(VBOX_PATH_SDK)/bindings/xpcom/include \
    … …  
    256252        $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
    257253        $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
    258 TEMPLATE_XPComBldProg_CFLAGS             = $(filter-out $(VBOX_GCC_PEDANTIC_C), $(TEMPLATE_VBoxBldProg_CFLAGS)) \
     254TEMPLATE_XPComBldProg_CFLAGS             = $(filter-out $(VBOX_GCC_PEDANTIC_C), $(TEMPLATE_VBoxAdvBldProg_CFLAGS)) \
    259255        $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) $(VBOX_GCC_NON_PEDANTIC_C)
    260 TEMPLATE_XPComBldProg_CXXFLAGS.darwin    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
    261 TEMPLATE_XPComBldProg_CXXFLAGS.solaris   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
    262 TEMPLATE_XPComBldProg_LDFLAGS.darwin     = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
     256TEMPLATE_XPComBldProg_CXXFLAGS.darwin    = $(TEMPLATE_VBoxAdvBldProg_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
     257TEMPLATE_XPComBldProg_CXXFLAGS.solaris   = $(TEMPLATE_VBoxAdvBldProg_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
     258TEMPLATE_XPComBldProg_LDFLAGS.darwin     = $(TEMPLATE_VBoxAdvBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
    263259TEMPLATE_XPComBldProg_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
    264260

  • trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/common/tmTransaction.cpp

    r31259 r102334  
    3838#include <stdlib.h>
    3939#include "tmTransaction.h"
    40 #ifdef VBOX_USE_IPRT_IN_XPCOM
    41 # include <iprt/mem.h>
    42 #endif
     40
     41#include <iprt/mem.h>
    4342
    4443///////////////////////////////////////////////////////////////////////////////
    … …  
    4746tmTransaction::~tmTransaction() {
    4847  if (mHeader)
    49 #ifdef VBOX_USE_IPRT_IN_XPCOM
    5048    RTMemFree(mHeader);
    51 #else
    52     free(mHeader);
    53 #endif
    5449}
    5550
    … …  
    6863  // indicates the message is the entire raw message
    6964  if (aQueueID == TM_INVALID_ID) {
    70 #ifdef VBOX_USE_IPRT_IN_XPCOM
    7165    header = (tmHeader*) RTMemAlloc(aLength);
    72 #else
    73     header = (tmHeader*) malloc(aLength);
    74 #endif
    7566    if (header) {
    7667      mRawMessageLength = aLength;
    … …  
    8172  }
    8273  else {   // need to create the tmHeader and concat the message
    83 #ifdef VBOX_USE_IPRT_IN_XPCOM
    8474    header = (tmHeader*) RTMemAlloc (sizeof(tmHeader) + aLength);
    85 #else
    86     header = (tmHeader*) malloc (sizeof(tmHeader) + aLength);
    87 #endif
    8875    if (header) {
    8976      mRawMessageLength = sizeof(tmHeader) + aLength;

  • trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcMessage.cpp

    r101996 r102334  
    205205                if (MsgLen() > IPC_MSG_GUESSED_SIZE) {
    206206                    // realloc message buffer to the correct size
    207 #ifdef VBOX_USE_IPRT_IN_XPCOM
    208207                    mMsgHdr = (ipcMessageHeader *) RTMemRealloc(mMsgHdr, MsgLen());
    209 #else
    210                     mMsgHdr = (ipcMessageHeader *) realloc(mMsgHdr, MsgLen());
    211 #endif
    212208                }
    213209            }
    … …  
    219215            // allocate a partial buffer
    220216            PRUint32 msgLen = IPC_MSG_GUESSED_SIZE;
    221 #ifdef VBOX_USE_IPRT_IN_XPCOM
    222217            mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
    223 #else
    224             mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
    225 #endif
    226218            if (!mMsgHdr)
    227219                return PR_FAILURE;
    … …  
    234226        else {
    235227            PRUint32 msgLen = *(PRUint32 *) buf;
    236 #ifdef VBOX_USE_IPRT_IN_XPCOM
    237228            mMsgHdr = (ipcMessageHeader *) RTMemAlloc(msgLen);
    238 #else
    239             mMsgHdr = (ipcMessageHeader *) malloc(msgLen);
    240 #endif
    241229            if (!mMsgHdr)
    242230                return PR_FAILURE;

  • trunk/src/libs/xpcom18a4/ipc/ipcd/util/src/ipcMessageWriter.cpp

    r31259 r102334  
    4040#include "prmem.h"
    4141#include <string.h>
    42 #ifdef VBOX_USE_IPRT_IN_XPCOM
    43 # include <iprt/mem.h>
    44 #endif
     42
     43#include <iprt/mem.h>
    4544
    4645//*****************************************************************************
    … …  
    5150{
    5251  if (mBuf)
    53 #ifdef VBOX_USE_IPRT_IN_XPCOM
    5452    RTMemFree(mBuf);
    55 #else
    56     free(mBuf);
    57 #endif
    5853}
    5954
    … …  
    116111
    117112  PRInt32 curPos = mBufPtr - mBuf;
    118 #ifdef VBOX_USE_IPRT_IN_XPCOM
    119113  mBuf = (PRUint8*)RTMemRealloc(mBuf, mCapacity);
    120 #else
    121   mBuf = (PRUint8*)realloc(mBuf, mCapacity);
    122 #endif
    123114  if (!mBuf) {
    124115    mError = PR_TRUE;

  • trunk/src/libs/xpcom18a4/xpcom/components/xcDll.cpp

    r101944 r102334  
    6565
    6666#include "nsNativeComponentLoader.h"
    67 #ifdef VBOX_USE_IPRT_IN_XPCOM
    68 # include "nsMemory.h"
    69 #endif
     67#include "nsMemory.h"
    7068
    7169nsDll::nsDll(nsIFile *dllSpec, nsNativeComponentLoader *loader)

  • trunk/src/libs/xpcom18a4/xpcom/ds/pldhash.c

    r101997 r102334  
    5656# define METER(x)       /* nothing */
    5757#endif
    58 #ifdef VBOX_USE_IPRT_IN_XPCOM
    59 # include <iprt/assert.h>
    60 # include <iprt/mem.h>
    61 #endif
     58#include <iprt/assert.h>
     59#include <iprt/mem.h>
    6260
    6361PR_IMPLEMENT(void *)
    6462PL_DHashAllocTable(PLDHashTable *table, PRUint32 nbytes)
    6563{
    66 #ifdef VBOX_USE_IPRT_IN_XPCOM
    6764    return RTMemAlloc(nbytes);
    68 #else
    69     return malloc(nbytes);
    70 #endif
    7165}
    7266
    … …  
    7468PL_DHashFreeTable(PLDHashTable *table, void *ptr)
    7569{
    76 #ifdef VBOX_USE_IPRT_IN_XPCOM
    7770    RTMemFree(ptr);
    78 #else
    79     free(ptr);
    80 #endif
    8171}
    8272
    … …  
    148138    const PLDHashEntryStub *stub = (const PLDHashEntryStub *)entry;
    149139
    150 #ifdef VBOX_USE_IPRT_IN_XPCOM
    151140    RTMemFree((void *) stub->key);
    152 #else
    153     free((void *) stub->key);
    154 #endif
    155141    memset(entry, 0, table->entrySize);
    156142}
    … …  
    185171    PLDHashTable *table;
    186172
    187 #ifdef VBOX_USE_IPRT_IN_XPCOM
    188173    table = (PLDHashTable *) RTMemAlloc(sizeof *table);
    189 #else
    190     table = (PLDHashTable *) malloc(sizeof *table);
    191 #endif
    192174    if (!table)
    193175        return NULL;
    194176    if (!PL_DHashTableInit(table, ops, data, entrySize, capacity)) {
    195 #ifdef VBOX_USE_IPRT_IN_XPCOM
    196177        RTMemFree(table);
    197 #else
    198         free(table);
    199 #endif
    200178        return NULL;
    201179    }
    … …  
    207185{
    208186    PL_DHashTableFinish(table);
    209 #ifdef VBOX_USE_IPRT_IN_XPCOM
    210187    RTMemFree(table);
    211 #else
    212     free(table);
    213 #endif
    214188}
    215189

  • trunk/src/libs/xpcom18a4/xpcom/proxy/src/nsProxyEvent.cpp

    r102175 r102334  
    4949 */
    5050
     51#include <iprt/mem.h>
    5152#include <iprt/string.h>
    5253
    … …  
    5657#include "nsCRT.h"
    5758
     59#include "xptcall.h"
     60
    5861#include "prmem.h"
    59 #include "xptcall.h"
    6062
    6163#include "nsIComponentManager.h"
    6264#include "nsComponentManagerObsolete.h"
    6365#include "nsIServiceManager.h"
    64 #include "nsMemory.h"
    6566#include "nsIEventQueueService.h"
    6667
    … …  
    122123
    123124    if (mParameterList)
    124 #ifdef VBOX_USE_IPRT_IN_XPCOM
    125         nsMemory::Free((void*) mParameterList);
    126 #else
    127         free( (void*) mParameterList);
    128 #endif
     125        RTMemFree((void*) mParameterList);
    129126}
    130127
    … …  
    421418    if (!paramCount) return NS_OK;
    422419
    423 #ifdef VBOX_USE_IPRT_IN_XPCOM
    424     *fullParam = (nsXPTCVariant*)nsMemory::Alloc(sizeof(nsXPTCVariant) * paramCount);
    425 #else
    426     *fullParam = (nsXPTCVariant*)malloc(sizeof(nsXPTCVariant) * paramCount);
    427 #endif
    428 
     420    *fullParam = (nsXPTCVariant*)RTMemAlloc(sizeof(nsXPTCVariant) * paramCount);
    429421    if (*fullParam == nsnull)
    430422        return NS_ERROR_OUT_OF_MEMORY;
    … …  
    484476
    485477        if (fullParam)
    486 #ifdef VBOX_USE_IPRT_IN_XPCOM
    487             nsMemory::Free(fullParam);
    488 #else
    489             free(fullParam);
    490 #endif
     478            RTMemFree(fullParam);
    491479        return rv;
    492480    }
    … …  
    496484    if (event == nsnull) {
    497485        if (fullParam)
    498 #ifdef VBOX_USE_IPRT_IN_XPCOM
    499             nsMemory::Free(fullParam);
    500 #else
    501             free(fullParam);
    502 #endif
     486            RTMemFree(fullParam);
    503487        return NS_ERROR_OUT_OF_MEMORY;
    504488    }
    … …  
    514498        PR_DELETE(event);
    515499        if (fullParam)
    516 #ifdef VBOX_USE_IPRT_IN_XPCOM
    517             nsMemory::Free(fullParam);
    518 #else
    519             free(fullParam);
    520 #endif
     500            RTMemFree(fullParam);
    521501        return NS_ERROR_OUT_OF_MEMORY;
    522502    }

  • trunk/src/libs/xpcom18a4/xpcom/string/src/nsSubstring.cpp

    r101967 r102334  
    5050#include "nsDependentString.h"
    5151#include "nsMemory.h"
    52 #ifdef VBOX_USE_IPRT_IN_XPCOM
    53 # include <iprt/asm.h>
    54 # include <iprt/mem.h>
    55 #endif
     52
     53#include <iprt/asm.h>
     54#include <iprt/mem.h>
    5655
    5756// ---------------------------------------------------------------------------
    … …  
    142141            {
    143142              STRING_STAT_INCREMENT(Free);
    144 #ifdef VBOX_USE_IPRT_IN_XPCOM
    145143              RTMemFree(this); // we were allocated with |malloc|
    146 #else
    147               free(this); // we were allocated with |malloc|
    148 #endif
    149144            }
    150145        }
    … …  
    160155
    161156          nsStringHeader *hdr =
    162 #ifdef VBOX_USE_IPRT_IN_XPCOM
    163157              (nsStringHeader *) RTMemAlloc(sizeof(nsStringHeader) + size);
    164 #else
    165               (nsStringHeader *) malloc(sizeof(nsStringHeader) + size);
    166 #endif
    167158          if (hdr)
    168159            {
    … …  
    182173          NS_ASSERTION(!hdr->IsReadonly(), "|Realloc| attempted on readonly string");
    183174
    184 #ifdef VBOX_USE_IPRT_IN_XPCOM
    185175          hdr = (nsStringHeader*) RTMemRealloc(hdr, sizeof(nsStringHeader) + size);
    186 #else
    187           hdr = (nsStringHeader*) realloc(hdr, sizeof(nsStringHeader) + size);
    188 #endif
    189176          if (hdr)
    190177            hdr->mStorageSize = size;

  • trunk/src/libs/xpcom18a4/xpcom/typelib/xpt/src/xpt_arena.c

    r31259 r102334  
    4848#include <stdio.h>
    4949#include <stdlib.h>
    50 #ifdef VBOX_USE_IPRT_IN_XPCOM
    51 # include <iprt/mem.h>
    52 #endif
     50
     51#include <iprt/mem.h>
    5352
    5453
    … …  
    141140XPT_NewArena(PRUint32 block_size, size_t alignment, const char* name)
    142141{
    143 #ifdef VBOX_USE_IPRT_IN_XPCOM
    144142    XPTArena *arena = RTMemAllocZ(sizeof(XPTArena));
    145 #else
    146     XPTArena *arena = calloc(1, sizeof(XPTArena));
    147 #endif
    148143    if (arena) {
    149144        XPT_ASSERT(alignment);
    … …  
    183178    while (cur) {
    184179        next = cur->next;
    185 #ifdef VBOX_USE_IPRT_IN_XPCOM
    186180        RTMemFree(cur);
    187 #else
    188         free(cur);
    189 #endif
    190181        cur = next;
    191182    }
    192 #ifdef VBOX_USE_IPRT_IN_XPCOM
    193183    RTMemFree(arena);
    194 #else
    195     free(arena);
    196 #endif
    197184}
    198185
    … …  
    235222            new_space += bytes;
    236223
    237 #ifdef VBOX_USE_IPRT_IN_XPCOM
    238224        new_block = (BLK_HDR*) RTMemAllocZ(new_space/arena->alignment * (size_t)arena->alignment);
    239 #else
    240         new_block = (BLK_HDR*) calloc(new_space/arena->alignment,
    241                                       arena->alignment);
    242 #endif
    243225        if (!new_block) {
    244226            arena->next = NULL;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette