VirtualBox

Changeset 48282 in vbox for trunk/src/VBox/Main


Ignore:
Timestamp:
Sep 4, 2013 11:59:15 PM (12 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
88697
Message:

32-bit main API on 64-bit solaris.

Location:
trunk/src/VBox/Main
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/Makefile.kmk

    r47649 r48282  
    168168#
    169169LIBRARIES += VBoxAPIWrap
    170 VBoxAPIWrap_TEMPLATE        = VBOXMAINLIB
     170VBoxAPIWrap_TEMPLATE        = VBoxMainLib
    171171VBoxAPIWrap_SOURCES         = $(VBoxAPIWrap_GENERATEDCPP)
    172172VBoxAPIWrap_GENERATEDCPP    = $(filter %.cpp,$(VBoxAPIWrap_GENERATEDSOURCES))
    … …  
    187187include $(VBoxAPIWrap_KMK)
    188188
     189ifdef VBOX_WITH_32_ON_64_MAIN_API
     190LIBRARIES += VBoxAPIWrap-x86
     191VBoxAPIWrap-x86_TEMPLATE = VBoxMainLib-x86
     192VBoxAPIWrap-x86_EXTENDS  = VBoxAPIWrap
     193endif
    189194
    190195#
    … …  
    542547 endif
    543548VBoxSVCM_INTERMEDIATES += $(VBOX_IDL_HEADER.XPCOM)
     549
     550 # 32-bit version of the module.
     551 ifdef VBOX_WITH_32_ON_64_MAIN_API
     552DLLS += VBoxSVCM-x86
     553VBoxSVCM-x86_TEMPLATE = VBoxMainComp-x86
     554VBoxSVCM-x86_EXTENDS  = VBoxSVCM
     555 endif
     556
    544557endif # VBOX_WITH_XPCOM
    545558
    … …  
    574587        $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
    575588        $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
    576 
    577 
     589ifdef VBOX_WITH_CRHGSMI
     590 VBoxC_DEFS += VBOX_WITH_CRHGSMI
     591endif
     592ifdef VBOX_WITH_NETSHAPER
     593 VBoxC_DEFS += VBOX_WITH_NETSHAPER
     594endif
    578595VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
    579596VBoxC_DEFS.win.x86 += _WIN32_WINNT=0x0500
    … …  
    605622        $(if-expr "$(LIB_VMM)" == "$(VBOX_LIB_VMM_LAZY)",$(LIB_REM),) \
    606623        $(VBOX_LIB_VMM_LAZY)
    607 
    608624ifdef VBOX_WITH_NETFLT
    609625 VBoxC_LIBS.win += \
    … …  
    621637endif
    622638
    623 
    624 VBoxC_INTERMEDIATES =            \
    625         $(VBOX_MAIN_PREREQS)     \
     639VBoxC_INTERMEDIATES = \
     640        $(VBOX_MAIN_PREREQS) \
    626641        $(VBOX_XML_SCHEMADEFS_H) \
    627642        $(VBOX_AUTOGEN_EVENT_H)
    … …  
    676691        src-client/win/VBoxC.def \
    677692        src-client/win/VBoxC.rc
    678 
    679693ifdef VBOX_WITH_GUEST_CONTROL
    680 VBoxC_SOURCES += \
     694 VBoxC_SOURCES += \
    681695        src-client/GuestSessionImplTasks.cpp \
    682696        src-client/GuestCtrlPrivate.cpp
    683697endif
    684 
    685698ifdef VBOX_WITH_DRAG_AND_DROP
    686 VBoxC_SOURCES += \
     699 VBoxC_SOURCES += \
    687700        src-client/GuestDnDImpl.cpp
    688701endif
    689 
    690702ifdef VBOX_WITH_XPCOM
    691 VBoxC_SOURCES += \
     703 VBoxC_SOURCES += \
    692704        src-client/xpcom/module.cpp
    693705endif
    694 
    695706ifdef VBOX_WITH_HGCM
    696 VBoxC_SOURCES += \
     707 VBoxC_SOURCES += \
    697708        src-client/HGCMObjects.cpp \
    698709        src-client/HGCMThread.cpp \
    699710        src-client/HGCM.cpp
    700711endif
    701 
    702 ifdef VBOX_WITH_CRHGSMI
    703 VBoxC_DEFS += VBOX_WITH_CRHGSMI
    704 endif
    705 
    706712ifdef VBOX_WITH_USB
    707 VBoxC_SOURCES += \
     713 VBoxC_SOURCES += \
    708714        src-client/RemoteUSBBackend.cpp
    709715endif
    710 
    711716ifdef VBOX_WITH_VPX
    712 VBoxC_SOURCES += \
     717 VBoxC_SOURCES += \
    713718        src-client/EbmlWriter.cpp \
    714719        src-client/VideoRec.cpp
    715 endif
    716 
    717 ifdef VBOX_WITH_NETSHAPER
    718 VBoxC_DEFS += VBOX_WITH_NETSHAPER
    719720endif
    720721
    … …  
    738739        $(VBOX_XSLTPROC) --stringparam Module VBoxC -o $@ $< $(VBOX_XIDL_FILE)
    739740
     741ifdef VBOX_WITH_32_ON_64_MAIN_API
     742 #
     743 # 32-bit VBox API Client In-Process module.
     744 #
     745 DLLS += VBoxClient-x86
     746 VBoxClient-x86_TEMPLATE = VBoxMainComp-x86
     747 VBoxClient-x86_EXTENDS  = VBoxC
     748 VBoxClient-x86_DEFS = VBOX_COM_INPROC_API_CLIENT $(VBoxC_DEFS)
     749 VBoxClient-x86_SOURCES = \
     750        src-all/EventImpl.cpp \
     751        src-all/Global.cpp \
     752        src-all/VirtualBoxBase.cpp \
     753        src-all/VirtualBoxErrorInfoImpl.cpp \
     754        src-client/ClientTokenHolder.cpp \
     755        src-client/SessionImpl.cpp \
     756        src-client/VirtualBoxClientImpl.cpp \
     757        $(VBOX_AUTOGEN_EVENT_CPP) \
     758        $(VBOX_XML_SCHEMADEFS_CPP)
     759 VBoxClient-x86_SOURCES.win = \
     760        src-client/win/dllmain.cpp \
     761        src-client/win/VBoxC.def \
     762        src-client/win/VBoxC.rc
     763 ifdef VBOX_WITH_XPCOM
     764  VBoxClient-x86_SOURCES += \
     765        src-client/xpcom/module.cpp
     766 endif
     767 VBoxClient-x86_LIBS = $(NO_SUCH_VARIABLE)
     768endif
     769
    740770
    741771#
    … …  
    743773#
    744774LIBRARIES += VBoxCOM
    745 VBoxCOM_TEMPLATE        = VBOXMAINLIB
     775VBoxCOM_TEMPLATE        = VBoxMainLib
    746776VBoxCOM_INTERMEDIATES   = $(VBOX_MAIN_PREREQS)
    747777VBoxCOM_SOURCES         = \
    … …  
    769799        $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
    770800
     801# 32-bit version of VBoxCOM.
     802ifdef VBOX_WITH_32_ON_64_MAIN_API
     803 LIBRARIES += VBoxCOM-x86
     804 VBoxCOM-x86_TEMPLATE = VBoxMainLib-x86
     805 VBoxCOM-x86_EXTENDS  = VBoxCOM
     806endif
     807
     808
    771809
    772810#

  • trunk/src/VBox/Main/glue/initterm.cpp

    r48164 r48282  
    338338    vrc = RTStrCopy(szXptiDat, sizeof(szXptiDat), szCompReg);
    339339    AssertRCReturn(vrc, NS_ERROR_FAILURE);
     340#ifdef VBOX_IN_32_ON_64_MAIN_API
     341    vrc = RTPathAppend(szCompReg, sizeof(szCompReg), "compreg-x86.dat");
     342    AssertRCReturn(vrc, NS_ERROR_FAILURE);
     343    vrc = RTPathAppend(szXptiDat, sizeof(szXptiDat), "xpti-x86.dat");
     344    AssertRCReturn(vrc, NS_ERROR_FAILURE);
     345#else
    340346    vrc = RTPathAppend(szCompReg, sizeof(szCompReg), "compreg.dat");
    341347    AssertRCReturn(vrc, NS_ERROR_FAILURE);
    342348    vrc = RTPathAppend(szXptiDat, sizeof(szXptiDat), "xpti.dat");
    343349    AssertRCReturn(vrc, NS_ERROR_FAILURE);
     350#endif
    344351
    345352    LogFlowFunc(("component registry  : \"%s\"\n", szCompReg));

  • trunk/src/VBox/Main/glue/vboxapi.py

    r48045 r48282  
    3737    # Will be set by the installer
    3838    VBoxBinDir = "%VBOX_INSTALL_PATH%"
     39else:
     40    VBoxBinDir = os.path.abspath(VBoxBinDir);
    3941
    4042if VBoxSdkDir is None:
    4143    # Will be set by the installer
    4244    VBoxSdkDir = "%VBOX_SDK_PATH%"
     45else:
     46    VBoxBinDir = os.path.abspath(VBoxSdkDir);
    4347
    4448os.environ["VBOX_PROGRAM_PATH"] = VBoxBinDir

  • trunk/src/VBox/Main/include/SessionImpl.h

    r47561 r48282  
    11/** @file
    2  *
    32 * VBox Client Session COM Class definition
    43 */
    … …  
    122121    ComPtr<IInternalMachineControl> mControl;
    123122
     123#ifndef VBOX_COM_INPROC_API_CLIENT
    124124    ComObjPtr<Console> mConsole;
     125#endif
    125126
    126127    ComPtr<IMachine> mRemoteMachine;
    … …  
    134135};
    135136
    136 #endif // ____H_SESSIONIMPL
     137#endif // !____H_SESSIONIMPL
    137138/* vi: set tabstop=4 shiftwidth=4 expandtab: */

  • trunk/src/VBox/Main/src-client/SessionImpl.cpp

    r47561 r48282  
    165165
    166166    HRESULT rc;
     167#ifndef VBOX_COM_INPROC_API_CLIENT
    167168    if (mConsole)
    168169       rc = mConsole->machine().queryInterfaceTo(aMachine);
    169170    else
     171#endif
    170172       rc = mRemoteMachine.queryInterfaceTo(aMachine);
    171173    if (FAILED(rc))
    172174    {
    173175        /** @todo VBox 3.3: replace E_FAIL with rc here. */
     176#ifndef VBOX_COM_INPROC_API_CLIENT
    174177        if (mConsole)
    175178            setError(E_FAIL, tr("Failed to query the session machine (%Rhrc)"), rc);
    176         else if (FAILED_DEAD_INTERFACE(rc))
     179        else
     180#endif
     181        if (FAILED_DEAD_INTERFACE(rc))
    177182            setError(E_FAIL, tr("Peer process crashed"));
    178183        else
    … …  
    195200
    196201    HRESULT rc;
     202#ifndef VBOX_COM_INPROC_API_CLIENT
    197203    if (mConsole)
    198204        rc = mConsole.queryInterfaceTo(aConsole);
    199205    else
     206#endif
    200207        rc = mRemoteConsole.queryInterfaceTo(aConsole);
    201208
    … …  
    203210    {
    204211        /** @todo VBox 3.3: replace E_FAIL with rc here. */
     212#ifndef VBOX_COM_INPROC_API_CLIENT
    205213        if (mConsole)
    206214            setError(E_FAIL, tr("Failed to query the console (%Rhrc)"), rc);
    207         else if (FAILED_DEAD_INTERFACE(rc))
     215        else
     216#endif
     217        if (FAILED_DEAD_INTERFACE(rc))
    208218            setError(E_FAIL, tr("Peer process crashed"));
    209219        else
    … …  
    262272    AssertReturn(mState != SessionState_Unlocked, VBOX_E_INVALID_VM_STATE);
    263273
     274#ifndef VBOX_COM_INPROC_API_CLIENT
    264275    AssertMsgReturn(mType == SessionType_WriteLock && !!mConsole,
    265276                    ("This is not a direct session!\n"),
    … …  
    276287
    277288    return S_OK;
     289
     290#else  /* VBOX_COM_INPROC_API_CLIENT */
     291    return VBOX_E_INVALID_OBJECT_STATE;
     292#endif /* VBOX_COM_INPROC_API_CLIENT */
    278293}
    279294
    … …  
    313328    AssertReturn(!!mControl, E_FAIL);
    314329
     330#ifndef VBOX_COM_INPROC_API_CLIENT
    315331    rc = mConsole.createObject();
    316332    AssertComRCReturn(rc, rc);
    … …  
    318334    rc = mConsole->init(aMachine, mControl, aLockType);
    319335    AssertComRCReturn(rc, rc);
     336#endif
    320337
    321338    Utf8Str strTokenId(aTokenId);
    … …  
    353370        /* some cleanup */
    354371        mControl.setNull();
     372#ifndef VBOX_COM_INPROC_API_CLIENT
    355373        if (!mConsole.isNull())
    356374        {
    … …  
    358376            mConsole.setNull();
    359377        }
     378#endif
    360379    }
    361380
    … …  
    465484
    466485    AssertReturn(!mControl.isNull(), E_FAIL);
     486#ifndef VBOX_COM_INPROC_API_CLIENT
    467487    AssertReturn(!mConsole.isNull(), E_FAIL);
    468488
    469489    return mConsole->updateMachineState(aMachineState);
     490#else
     491    return S_OK;
     492#endif
    470493}
    471494
    … …  
    529552    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    530553    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     554#ifndef VBOX_COM_INPROC_API_CLIENT
    531555    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    532556
    533557    return mConsole->onNetworkAdapterChange(networkAdapter, changeAdapter);
     558#else
     559    return S_OK;
     560#endif
    534561}
    535562
    … …  
    544571    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    545572    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     573#ifndef VBOX_COM_INPROC_API_CLIENT
    546574    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    547575
    548576    return mConsole->onSerialPortChange(serialPort);
     577#else
     578    return S_OK;
     579#endif
    549580}
    550581
    … …  
    559590    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    560591    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     592#ifndef VBOX_COM_INPROC_API_CLIENT
    561593    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    562594
    563595    return mConsole->onParallelPortChange(parallelPort);
     596#else
     597    return S_OK;
     598#endif
    564599}
    565600
    … …  
    574609    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    575610    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     611#ifndef VBOX_COM_INPROC_API_CLIENT
    576612    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    577613
    578614    return mConsole->onStorageControllerChange();
     615#else
     616    return S_OK;
     617#endif
    579618}
    580619
    … …  
    589628    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    590629    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     630#ifndef VBOX_COM_INPROC_API_CLIENT
    591631    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    592632
    593633    return mConsole->onMediumChange(aMediumAttachment, aForce);
     634#else
     635    return S_OK;
     636#endif
    594637}
    595638
    … …  
    604647    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    605648    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     649#ifndef VBOX_COM_INPROC_API_CLIENT
    606650    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    607651
    608652    return mConsole->onCPUChange(aCPU, aRemove);
     653#else
     654    return S_OK;
     655#endif
    609656}
    610657
    … …  
    619666    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    620667    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     668#ifndef VBOX_COM_INPROC_API_CLIENT
    621669    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    622670
    623671    return mConsole->onCPUExecutionCapChange(aExecutionCap);
     672#else
     673    return S_OK;
     674#endif
    624675}
    625676
    … …  
    634685    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    635686    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     687#ifndef VBOX_COM_INPROC_API_CLIENT
    636688    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    637689
    638690    return mConsole->onVRDEServerChange(aRestart);
     691#else
     692    return S_OK;
     693#endif
    639694}
    640695
    … …  
    649704    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    650705    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     706#ifndef VBOX_COM_INPROC_API_CLIENT
    651707    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    652708
    653709    return mConsole->onVideoCaptureChange();
     710#else
     711    return S_OK;
     712#endif
    654713}
    655714
    … …  
    664723    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    665724    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     725#ifndef VBOX_COM_INPROC_API_CLIENT
    666726    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    667727
    668728    return mConsole->onUSBControllerChange();
     729#else
     730    return S_OK;
     731#endif
    669732}
    670733
    … …  
    679742    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    680743    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     744#ifndef VBOX_COM_INPROC_API_CLIENT
    681745    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    682746
    683747    return mConsole->onSharedFolderChange(aGlobal);
     748#else
     749    return S_OK;
     750#endif
    684751}
    685752
    … …  
    694761    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    695762    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     763#ifndef VBOX_COM_INPROC_API_CLIENT
    696764    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    697765
    698766    return mConsole->onClipboardModeChange(aClipboardMode);
     767#else
     768    return S_OK;
     769#endif
    699770}
    700771
    … …  
    708779    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
    709780    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
     781#ifndef VBOX_COM_INPROC_API_CLIENT
    710782    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
    711783
    712784    return mConsole->onDragAndDropModeChange(aDragAndDropMode);
     785#else
     786    return S_OK;
     787#endif
    713788}
    714789
    … …  
    725800    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    726801    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     802#ifndef VBOX_COM_INPROC_API_CLIENT
    727803    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    728804
    729805    return mConsole->onUSBDeviceAttach(aDevice, aError, aMaskedIfs);
     806#else
     807    return S_OK;
     808#endif
    730809}
    731810
    … …  
    741820    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    742821    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     822#ifndef VBOX_COM_INPROC_API_CLIENT
    743823    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    744824
    745825    return mConsole->onUSBDeviceDetach(aId, aError);
     826#else
     827    return S_OK;
     828#endif
    746829}
    747830
    … …  
    754837
    755838    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
    756     AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
     839#ifndef VBOX_COM_INPROC_API_CLIENT
     840    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
     841#endif
    757842
    758843    if (mState != SessionState_Locked)
    … …  
    767852    }
    768853
     854#ifndef VBOX_COM_INPROC_API_CLIENT
    769855    return mConsole->onShowWindow(aCheck, aCanShow, aWinId);
     856#else
     857    return S_OK;
     858#endif
    770859}
    771860
    … …  
    780869    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    781870    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     871#ifndef VBOX_COM_INPROC_API_CLIENT
    782872    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    783873
    784874    return mConsole->onBandwidthGroupChange(aBandwidthGroup);
     875#else
     876    return S_OK;
     877#endif
    785878}
    786879
    … …  
    795888    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    796889    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     890#ifndef VBOX_COM_INPROC_API_CLIENT
    797891    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    798892
    799893    return mConsole->onStorageDeviceChange(aMediumAttachment, aRemove, aSilent);
     894#else
     895    return S_OK;
     896#endif
    800897}
    801898
    … …  
    803900                                          BOOL aIsSetter, BSTR *aRetValue, LONG64 *aRetTimestamp, BSTR *aRetFlags)
    804901{
    805 #ifdef VBOX_WITH_GUEST_PROPS
     902#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_COM_INPROC_API_CLIENT)
    806903    AutoCaller autoCaller(this);
    807904    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
    … …  
    846943                                               ComSafeArrayOut(BSTR, aFlags))
    847944{
    848 #ifdef VBOX_WITH_GUEST_PROPS
     945#if defined(VBOX_WITH_GUEST_PROPS) && !defined(VBOX_COM_INPROC_API_CLIENT)
    849946    AutoCaller autoCaller(this);
    850947    AssertComRCReturn(autoCaller.rc(), autoCaller.rc());
    … …  
    896993                        tr("Machine is not locked by session (session state: %s)."),
    897994                        Global::stringifySessionState(mState));
     995#ifndef VBOX_COM_INPROC_API_CLIENT
    898996    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
    899997    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    … …  
    9061004                                       ComSafeArrayInArg(aChildrenToReparent),
    9071005                                       aProgress);
     1006#else
     1007    return E_NOTIMPL;
     1008#endif
    9081009}
    9091010
    … …  
    9161017    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    9171018    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     1019#ifndef VBOX_COM_INPROC_API_CLIENT
    9181020    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    9191021
    … …  
    9211023
    9221024    return S_OK;
     1025#else
     1026    return E_NOTIMPL;
     1027#endif
    9231028}
    9241029
    … …  
    9311036    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    9321037    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     1038#ifndef VBOX_COM_INPROC_API_CLIENT
    9331039    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    9341040
    9351041    return mConsole->pause(aReason);
     1042#else
     1043    return E_NOTIMPL;
     1044#endif
    9361045}
    9371046
    … …  
    9441053    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    9451054    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     1055#ifndef VBOX_COM_INPROC_API_CLIENT
    9461056    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    9471057
    9481058    return mConsole->resume(aReason);
     1059#else
     1060    return E_NOTIMPL;
     1061#endif
    9491062}
    9501063
    … …  
    9571070    AssertReturn(mState == SessionState_Locked, VBOX_E_INVALID_VM_STATE);
    9581071    AssertReturn(mType == SessionType_WriteLock, VBOX_E_INVALID_OBJECT_STATE);
     1072#ifndef VBOX_COM_INPROC_API_CLIENT
    9591073    AssertReturn(mConsole, VBOX_E_INVALID_OBJECT_STATE);
    9601074
    9611075    return mConsole->saveState(aReason, aProgress);
     1076#else
     1077    return E_NOTIMPL;
     1078#endif
    9621079}
    9631080
    … …  
    10151132    if (mType == SessionType_WriteLock)
    10161133    {
     1134#ifndef VBOX_COM_INPROC_API_CLIENT
    10171135        if (!mConsole.isNull())
    10181136        {
    … …  
    10201138            mConsole.setNull();
    10211139        }
     1140#endif
    10221141    }
    10231142    else
    10241143    {
    10251144        mRemoteMachine.setNull();
     1145#ifndef VBOX_COM_INPROC_API_CLIENT
    10261146        mRemoteConsole.setNull();
     1147#endif
    10271148    }
    10281149

  • trunk/src/VBox/Main/src-client/xpcom/module.cpp

    r46824 r48282  
    6060// XPCOM glue code unfolding
    6161
     62NS_DECL_CLASSINFO(VirtualBoxClient)
     63NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VirtualBoxClient, IVirtualBoxClient)
     64NS_DECL_CLASSINFO(Session)
     65NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Session, ISession, IInternalSessionControl)
     66
     67#ifndef VBOX_COM_INPROC_API_CLIENT
    6268NS_DECL_CLASSINFO(Guest)
    6369NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Guest, IGuest)
    64 #ifdef VBOX_WITH_GUEST_CONTROL
     70 #ifdef VBOX_WITH_GUEST_CONTROL
    6571NS_DECL_CLASSINFO(GuestDirectory)
    6672NS_IMPL_THREADSAFE_ISUPPORTS2_CI(GuestDirectory, IGuestDirectory, IDirectory)
    … …  
    7379NS_DECL_CLASSINFO(GuestSession)
    7480NS_IMPL_THREADSAFE_ISUPPORTS1_CI(GuestSession, IGuestSession)
    75 #endif
     81 #endif
    7682NS_DECL_CLASSINFO(Keyboard)
    7783NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Keyboard, IKeyboard)
    … …  
    9298NS_DECL_CLASSINFO(VRDEServerInfo)
    9399NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VRDEServerInfo, IVRDEServerInfo)
    94 #ifdef VBOX_WITH_EXTPACK
     100 #ifdef VBOX_WITH_EXTPACK
    95101// deliberately omit ExtPackFile as it's unusable in the client context
    96102// NS_DECL_CLASSINFO(ExtPackFile)
    … …  
    100106NS_DECL_CLASSINFO(ExtPackManager)
    101107NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ExtPackManager, IExtPackManager)
    102 #endif
     108 #endif
    103109NS_DECL_CLASSINFO(AdditionsFacility)
    104110NS_IMPL_THREADSAFE_ISUPPORTS1_CI(AdditionsFacility, IAdditionsFacility)
    105111
    106 NS_DECL_CLASSINFO(Session)
    107 NS_IMPL_THREADSAFE_ISUPPORTS2_CI(Session, ISession, IInternalSessionControl)
    108112NS_DECL_CLASSINFO(Console)
    109113NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Console, IConsole)
    110114
    111 NS_DECL_CLASSINFO(VirtualBoxClient)
    112 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VirtualBoxClient, IVirtualBoxClient)
     115#endif /* VBOX_COM_INPROC_API_CLIENT */
    113116
    114117/**
Note: See TracChangeset for help on using the changeset viewer.

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