-
diff -urN vbox-trunk-bk\src\VBox\Main/cbinding/Makefile.kmk vbox-trunk\src\VBox\Main/cbinding/Makefile.kmk
old
|
new
|
|
78 | 78 | VBoxCAPI_TEMPLATE = VBOXMAINCLIENTDLL |
79 | 79 | ifdef VBOX_WITH_XPCOM |
80 | 80 | # Keep old name on XPCOM so that legacy code is happy. |
81 | | VBoxCAPI_INST = $(INST_BIN)VBoxXPCOMC$(VBOX_SUFF_DLL) |
| 81 | ifeq ($(KBUILD_TARGET),os2) |
| 82 | VBoxCAPI_INST = $(INST_BIN)VBoxXPC$(VBOX_SUFF_DLL) |
| 83 | else |
| 84 | VBoxCAPI_INST = $(INST_BIN)VBoxXPCOMC$(VBOX_SUFF_DLL) |
| 85 | endif |
82 | 86 | endif |
83 | 87 | VBoxCAPI_DEFS = IN_VBOXCAPI |
84 | 88 | VBoxCAPI_SOURCES = \ |
… |
… |
|
137 | 141 | tstCAPIGlue.c |
138 | 142 | tstCAPIGlue_LIBS = \ |
139 | 143 | $(VBoxCAPIGlue_1_TARGET) |
| 144 | |
| 145 | ifeq ($(KBUILD_TARGET),os2) |
| 146 | tstCAPIGlue_LIBS += \ |
| 147 | $(PATH_STAGE_LIB)/VBox-os2-poll$(VBOX_SUFF_LIB) \ |
| 148 | pthread |
| 149 | tstCAPIGlue_INCS += \ |
| 150 | $(PATH_SUB_CURRENT)/src/libs/poll-os2 |
| 151 | endif |
| 152 | |
140 | 153 | endif |
141 | 154 | |
142 | 155 | endif # ! VBOX_ONLY_SDK |
-
diff -urN vbox-trunk-bk\src\VBox\Main/cbinding/VBoxCAPIGlue.c vbox-trunk\src\VBox\Main/cbinding/VBoxCAPIGlue.c
old
|
new
|
|
55 | 55 | #elif defined(__APPLE__) |
56 | 56 | # define DYNLIB_NAME "VBoxXPCOMC.dylib" |
57 | 57 | #elif defined(__OS2__) |
58 | | # define DYNLIB_NAME "VBoxXPCOMC.dll" |
| 58 | # define DYNLIB_NAME "VBoxXPC.dll" |
59 | 59 | #elif defined(WIN32) |
60 | 60 | # define DYNLIB_NAME "VBoxCAPI.dll" |
61 | 61 | #else |
-
diff -urN vbox-trunk-bk\src\VBox\Main/glue/initterm.cpp vbox-trunk\src\VBox\Main/glue/initterm.cpp
old
|
new
|
|
330 | 330 | char szCompReg[RTPATH_MAX]; |
331 | 331 | char szXptiDat[RTPATH_MAX]; |
332 | 332 | |
| 333 | #if 1 |
333 | 334 | int vrc = GetVBoxUserHomeDirectory(szCompReg, sizeof(szCompReg)); |
334 | 335 | if (vrc == VERR_ACCESS_DENIED) |
335 | 336 | return NS_ERROR_FILE_ACCESS_DENIED; |
… |
… |
|
351 | 352 | LogFlowFunc(("component registry : \"%s\"\n", szCompReg)); |
352 | 353 | LogFlowFunc(("XPTI data file : \"%s\"\n", szXptiDat)); |
353 | 354 | |
| 355 | #else |
| 356 | int vrc = NULL; |
| 357 | #endif |
354 | 358 | static const char *kAppPathsToProbe[] = |
355 | 359 | { |
356 | 360 | NULL, /* 0: will use VBOX_APP_HOME */ |
… |
… |
|
425 | 429 | } |
426 | 430 | LogFlowFunc(("component directory : \"%s\"\n", szCompDir)); |
427 | 431 | |
| 432 | RTStrCopy(szCompReg, sizeof(szXptiDat), szCompDir); |
| 433 | RTStrCopy(szXptiDat, sizeof(szXptiDat), szCompReg); |
| 434 | |
| 435 | vrc = RTPathAppend(szCompReg, sizeof(szCompReg), "compreg.dat"); |
| 436 | AssertRCReturn(vrc, NS_ERROR_FAILURE); |
| 437 | vrc = RTPathAppend(szXptiDat, sizeof(szXptiDat), "xpti.dat"); |
| 438 | AssertRCReturn(vrc, NS_ERROR_FAILURE); |
| 439 | |
428 | 440 | nsCOMPtr<DirectoryServiceProvider> dsProv; |
429 | 441 | dsProv = new DirectoryServiceProvider(); |
430 | 442 | if (dsProv) |
-
diff -urN vbox-trunk-bk\src\VBox\Main/glue/NativeEventQueue.cpp vbox-trunk\src\VBox\Main/glue/NativeEventQueue.cpp
old
|
new
|
|
24 | 24 | # include <CoreFoundation/CFRunLoop.h> |
25 | 25 | #endif |
26 | 26 | |
27 | | #if defined(VBOX_WITH_XPCOM) && !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2) |
| 27 | #if defined(VBOX_WITH_XPCOM) && !defined(RT_OS_DARWIN) // && !defined(RT_OS_OS2) |
28 | 28 | # define USE_XPCOM_QUEUE |
29 | 29 | #endif |
30 | 30 | |
… |
… |
|
36 | 36 | # include <errno.h> |
37 | 37 | #endif |
38 | 38 | |
| 39 | #ifdef RT_OS_OS2 |
| 40 | #include <sys/time.h> |
| 41 | #endif |
| 42 | |
39 | 43 | namespace com |
40 | 44 | { |
41 | 45 | |
-
diff -urN vbox-trunk-bk\src\VBox\Main/include/ClientToken.h vbox-trunk\src\VBox\Main/include/ClientToken.h
old
|
new
|
|
31 | 31 | #if defined(RT_OS_WINDOWS) |
32 | 32 | # define CTTOKENARG NULL |
33 | 33 | # define CTTOKENTYPE HANDLE |
34 | | #elif defined(RT_OS_OS2) |
| 34 | #elif 0 //defined(RT_OS_OS2) |
35 | 35 | # define CTTOKENARG NULLHANDLE |
36 | 36 | # define CTTOKENTYPE HMTX |
37 | 37 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) |
-
diff -urN vbox-trunk-bk\src\VBox\Main/include/ClientTokenHolder.h vbox-trunk\src\VBox\Main/include/ClientTokenHolder.h
old
|
new
|
|
28 | 28 | /* this second semaphore is only used on Windows */ |
29 | 29 | # define CTHTHREADSEMARG NULL |
30 | 30 | # define CTHTHREADSEMTYPE HANDLE |
31 | | #elif defined(RT_OS_OS2) |
| 31 | #elif 0 //defined(RT_OS_OS2) |
32 | 32 | # define CTHSEMARG NIL_RTSEMEVENT |
33 | 33 | # define CTHSEMTYPE RTSEMEVENT |
34 | 34 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) |
-
diff -urN vbox-trunk-bk\src\VBox\Main/include/ClientWatcher.h vbox-trunk\src\VBox\Main/include/ClientWatcher.h
old
|
new
|
|
29 | 29 | #if defined(RT_OS_WINDOWS) |
30 | 30 | # define CWUPDATEREQARG NULL |
31 | 31 | # define CWUPDATEREQTYPE HANDLE |
32 | | #elif defined(RT_OS_OS2) |
| 32 | #elif 0 //defined(RT_OS_OS2) |
33 | 33 | # define CWUPDATEREQARG NIL_RTSEMEVENT |
34 | 34 | # define CWUPDATEREQTYPE RTSEMEVENT |
35 | 35 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) || defined(VBOX_WITH_GENERIC_SESSION_WATCHER) |
-
diff -urN vbox-trunk-bk\src\VBox\Main/include/DHCPServerImpl.h vbox-trunk\src\VBox\Main/include/DHCPServerImpl.h
old
|
new
|
|
27 | 27 | struct NETIFINFO; |
28 | 28 | #endif |
29 | 29 | |
30 | | #ifdef RT_OS_WINDOWS |
| 30 | #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) |
31 | 31 | # define DHCP_EXECUTABLE_NAME "VBoxNetDHCP.exe" |
32 | 32 | #else |
33 | 33 | # define DHCP_EXECUTABLE_NAME "VBoxNetDHCP" |
-
diff -urN vbox-trunk-bk\src\VBox\Main/include/NATNetworkImpl.h vbox-trunk\src\VBox\Main/include/NATNetworkImpl.h
old
|
new
|
|
30 | 30 | struct NATRule; |
31 | 31 | } |
32 | 32 | |
33 | | #ifdef RT_OS_WINDOWS |
| 33 | #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) |
34 | 34 | # define NATSR_EXECUTABLE_NAME "VBoxNetNAT.exe" |
35 | 35 | #else |
36 | 36 | # define NATSR_EXECUTABLE_NAME "VBoxNetNAT" |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-client/ClientTokenHolder.cpp vbox-trunk\src\VBox\Main/src-client/ClientTokenHolder.cpp
old
|
new
|
|
68 | 68 | mThread = NIL_RTTHREAD; |
69 | 69 | } |
70 | 70 | |
71 | | #elif defined(RT_OS_OS2) |
| 71 | #elif 0 //defined(RT_OS_OS2) |
72 | 72 | |
73 | 73 | if (mThread != NIL_RTTHREAD) |
74 | 74 | { |
… |
… |
|
167 | 167 | ::CloseHandle(mThreadSem); |
168 | 168 | mThreadSem = NULL; |
169 | 169 | } |
170 | | #elif defined(RT_OS_OS2) |
| 170 | #elif 0 //defined(RT_OS_OS2) // 0 // defined(VBOX_WITH_GENERIC_SESSION_WATCHER) |
171 | 171 | Bstr bstrTokenId(strTokenId); |
172 | 172 | |
173 | 173 | /* |
… |
… |
|
228 | 228 | |
229 | 229 | bool Session::ClientTokenHolder::isReady() |
230 | 230 | { |
231 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 231 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
232 | 232 | return mSem != CTHSEMARG; |
233 | 233 | #else /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
234 | 234 | return !mToken.isNull(); |
235 | 235 | #endif /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
236 | 236 | } |
237 | 237 | |
238 | | #if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2) |
| 238 | #if defined(RT_OS_WINDOWS) // || defined(RT_OS_OS2) |
239 | 239 | /** client token holder thread */ |
240 | 240 | DECLCALLBACK(int) ClientTokenHolderThread(RTTHREAD Thread, void *pvUser) |
241 | 241 | { |
… |
… |
|
280 | 280 | |
281 | 281 | /* signal we're done */ |
282 | 282 | ::SetEvent(initDoneSem); |
283 | | # elif defined(RT_OS_OS2) |
284 | | Utf8Str sessionId = (BSTR)data[0]; |
| 283 | # elif 0 //defined(RT_OS_OS2) |
| 284 | //Utf8Str sessionId = (BSTR)data[0]; |
| 285 | BSTR sessionId = (BSTR)data[0]; |
285 | 286 | RTSEMEVENT finishSem = (RTSEMEVENT)data[1]; |
286 | 287 | |
287 | 288 | LogFlowFunc(("sessionId='%s', finishSem=%p\n", sessionId.raw(), finishSem)); |
288 | 289 | |
289 | 290 | HMTX mutex = NULLHANDLE; |
290 | | APIRET arc = ::DosOpenMutexSem((PSZ)sessionId.raw(), &mutex); |
| 291 | //APIRET arc = ::DosOpenMutexSem((PSZ)sessionId.raw(), &mutex); |
| 292 | APIRET arc = ::DosOpenMutexSem((PSZ)sessionId, &mutex); |
291 | 293 | AssertMsg(arc == NO_ERROR, ("cannot open token, arc=%ld\n", arc)); |
292 | 294 | |
293 | 295 | if (arc == NO_ERROR) |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-client/ConsoleImpl2.cpp vbox-trunk\src\VBox\Main/src-client/ConsoleImpl2.cpp
old
|
new
|
|
2893 | 2893 | if (/* mode != ClipboardMode_Disabled */ true) |
2894 | 2894 | { |
2895 | 2895 | /* Load the service */ |
| 2896 | #ifndef RT_OS_OS2 |
2896 | 2897 | rc = pVMMDev->hgcmLoadService("VBoxSharedClipboard", "VBoxSharedClipboard"); |
| 2898 | #else |
| 2899 | rc = pVMMDev->hgcmLoadService("VBoxSC", "VBoxSharedClipboard"); |
| 2900 | #endif |
2897 | 2901 | if (RT_FAILURE(rc)) |
2898 | 2902 | { |
2899 | 2903 | LogRel(("Shared clipboard is not available, rc=%Rrc\n", rc)); |
… |
… |
|
2927 | 2931 | if ( hrc == S_OK |
2928 | 2932 | && value == "1") |
2929 | 2933 | { |
| 2934 | #ifndef RT_OS_OS2 |
2930 | 2935 | rc = pVMMDev->hgcmLoadService("VBoxHostChannel", "VBoxHostChannel"); |
| 2936 | #else |
| 2937 | rc = pVMMDev->hgcmLoadService("VBoxHC", "VBoxHostChannel"); |
| 2938 | #endif |
2931 | 2939 | if (RT_FAILURE(rc)) |
2932 | 2940 | { |
2933 | 2941 | LogRel(("VBoxHostChannel is not available, rc=%Rrc\n", rc)); |
… |
… |
|
2946 | 2954 | hrc = pMachine->COMGETTER(DnDMode)(&enmMode); H(); |
2947 | 2955 | |
2948 | 2956 | /* Load the service */ |
| 2957 | #ifndef RT_OS_OS2 |
2949 | 2958 | rc = pVMMDev->hgcmLoadService("VBoxDragAndDropSvc", "VBoxDragAndDropSvc"); |
| 2959 | #else |
| 2960 | rc = pVMMDev->hgcmLoadService("VBoxDnD", "VBoxDragAndDropSvc"); |
| 2961 | #endif |
2950 | 2962 | if (RT_FAILURE(rc)) |
2951 | 2963 | { |
2952 | 2964 | LogRel(("Drag and drop service is not available, rc=%Rrc\n", rc)); |
… |
… |
|
5207 | 5219 | |
5208 | 5220 | #elif defined(RT_OS_WINDOWS) /* not defined NetFlt */ |
5209 | 5221 | /* NOTHING TO DO HERE */ |
| 5222 | #elif defined(RT_OS_OS2) |
| 5223 | /* NOTHING TO DO HERE */ |
5210 | 5224 | #elif defined(RT_OS_LINUX) |
5211 | 5225 | /// @todo aleksey: is there anything to be done here? |
5212 | 5226 | #elif defined(RT_OS_FREEBSD) |
… |
… |
|
5666 | 5680 | AssertReturn(pConsole->m_pVMMDev, VERR_INVALID_POINTER); |
5667 | 5681 | |
5668 | 5682 | /* Load the service */ |
| 5683 | #ifndef RT_OS_OS2 |
5669 | 5684 | int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxGuestPropSvc", "VBoxGuestPropSvc"); |
| 5685 | #else |
| 5686 | int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxSIS", "VBoxGuestPropSvc"); |
| 5687 | #endif |
5670 | 5688 | |
5671 | 5689 | if (RT_FAILURE(rc)) |
5672 | 5690 | { |
… |
… |
|
5822 | 5840 | ComObjPtr<Console> pConsole = static_cast<Console *>(pvConsole); |
5823 | 5841 | |
5824 | 5842 | /* Load the service */ |
| 5843 | #ifndef RT_OS_OS2 |
5825 | 5844 | int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxGuestControlSvc", "VBoxGuestControlSvc"); |
| 5845 | #else |
| 5846 | int rc = pConsole->m_pVMMDev->hgcmLoadService("VBoxSIS", "VBoxGuestControlSvc"); |
| 5847 | #endif |
5826 | 5848 | |
5827 | 5849 | if (RT_FAILURE(rc)) |
5828 | 5850 | { |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-client/SessionImpl.cpp vbox-trunk\src\VBox\Main/src-client/SessionImpl.cpp
old
|
new
|
|
297 | 297 | #endif |
298 | 298 | } |
299 | 299 | |
300 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 300 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
301 | 301 | HRESULT Session::assignMachine(const ComPtr<IMachine> &aMachine, |
302 | 302 | LockType_T aLockType, |
303 | 303 | const com::Utf8Str &aTokenId) |
… |
… |
|
348 | 348 | mRemoteMachine = aMachine; |
349 | 349 | #endif |
350 | 350 | |
351 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 351 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
352 | 352 | Utf8Str strTokenId(aTokenId); |
353 | 353 | Assert(!strTokenId.isEmpty()); |
354 | 354 | #else /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
… |
… |
|
357 | 357 | /* create the machine client token */ |
358 | 358 | try |
359 | 359 | { |
360 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 360 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
361 | 361 | mClientTokenHolder = new ClientTokenHolder(strTokenId); |
362 | 362 | #else /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
363 | 363 | mClientTokenHolder = new ClientTokenHolder(aToken); |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/ClientToken.cpp vbox-trunk\src\VBox\Main/src-server/ClientToken.cpp
old
|
new
|
|
49 | 49 | #if defined(RT_OS_WINDOWS) |
50 | 50 | if (mClientToken) |
51 | 51 | ::CloseHandle(mClientToken); |
52 | | #elif defined(RT_OS_OS2) |
| 52 | #elif 0 // defined(RT_OS_OS2) |
53 | 53 | if (mClientToken != NULLHANDLE) |
54 | 54 | ::DosCloseMutexSem(mClientToken); |
55 | 55 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) |
… |
… |
|
87 | 87 | AssertMsg(mClientToken, |
88 | 88 | ("Cannot create token '%s', err=%d", |
89 | 89 | mClientTokenId.c_str(), ::GetLastError())); |
90 | | #elif defined(RT_OS_OS2) |
| 90 | #elif 0 //defined(RT_OS_OS2) |
91 | 91 | NOREF(pSessionMachine); |
92 | 92 | Utf8Str ipcSem = Utf8StrFmt("\\SEM32\\VBOX\\VM\\{%RTuuid}", |
93 | 93 | pMachine->mData->mUuid.raw()); |
… |
… |
|
228 | 228 | /* release the token */ |
229 | 229 | ::ReleaseMutex(mClientToken); |
230 | 230 | terminated = true; |
231 | | #elif defined(RT_OS_OS2) |
| 231 | #elif 0 //defined(RT_OS_OS2) |
232 | 232 | AssertMsg(mClientToken, ("semaphore must be created")); |
233 | 233 | |
234 | 234 | /* release the token */ |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/ClientWatcher.cpp vbox-trunk\src\VBox\Main/src-server/ClientWatcher.cpp
old
|
new
|
|
85 | 85 | { |
86 | 86 | #if defined(RT_OS_WINDOWS) |
87 | 87 | mUpdateReq = ::CreateEvent(NULL, FALSE, FALSE, NULL); |
88 | | #elif defined(RT_OS_OS2) |
| 88 | #elif 0 //defined(RT_OS_OS2) |
89 | 89 | RTSemEventCreate(&mUpdateReq); |
90 | 90 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) || defined(VBOX_WITH_GENERIC_SESSION_WATCHER) |
91 | 91 | RTSemEventCreate(&mUpdateReq); |
… |
… |
|
120 | 120 | /* sent an update request */ |
121 | 121 | #if defined(RT_OS_WINDOWS) |
122 | 122 | ::SetEvent(mUpdateReq); |
123 | | #elif defined(RT_OS_OS2) |
| 123 | #elif 0 //defined(RT_OS_OS2) |
124 | 124 | RTSemEventSignal(mUpdateReq); |
125 | 125 | #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER) |
126 | 126 | /* use short timeouts, as we expect changes */ |
… |
… |
|
329 | 329 | |
330 | 330 | ::CoUninitialize(); |
331 | 331 | |
332 | | #elif defined(RT_OS_OS2) |
| 332 | #elif 0 //defined(RT_OS_OS2) |
333 | 333 | |
334 | 334 | /// @todo (dmik) processes reaping! |
335 | 335 | |
… |
… |
|
477 | 477 | { |
478 | 478 | AutoReadLock smLock(sm COMMA_LOCKVAL_SRC_POS); |
479 | 479 | ClientToken *ct = sm->i_getClientToken(); |
| 480 | //Machine::ClientToken *ct = sm->i_get(); |
480 | 481 | if (ct) |
481 | 482 | { |
482 | 483 | HMTX ipcSem = ct->getToken(); |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/HostNetworkInterfaceImpl.cpp vbox-trunk\src\VBox\Main/src-server/HostNetworkInterfaceImpl.cpp
old
|
new
|
|
27 | 27 | |
28 | 28 | #include <iprt/cpp/utils.h> |
29 | 29 | |
30 | | #ifdef RT_OS_FREEBSD |
| 30 | #if defined(RT_OS_FREEBSD) || defined(RT_OS_OS2) |
31 | 31 | # include <netinet/in.h> /* INADDR_NONE */ |
32 | 32 | #endif /* RT_OS_FREEBSD */ |
33 | 33 | |
… |
… |
|
152 | 152 | |
153 | 153 | #endif /* VBOX_WITH_RESOURCE_USAGE_API */ |
154 | 154 | |
| 155 | Bstr HostNetworkInterface::i_composeNetworkName(const Utf8Str aShortName) |
| 156 | { |
| 157 | return Utf8Str("HostInterfaceNetworking-").append(aShortName); |
| 158 | } |
| 159 | |
155 | 160 | #ifdef VBOX_WITH_HOSTNETIF_API |
156 | 161 | |
157 | 162 | HRESULT HostNetworkInterface::updateConfig() |
… |
… |
|
179 | 184 | return rc == VERR_NOT_IMPLEMENTED ? E_NOTIMPL : E_FAIL; |
180 | 185 | } |
181 | 186 | |
| 187 | #if 0 |
182 | 188 | Bstr HostNetworkInterface::i_composeNetworkName(const Utf8Str aShortName) |
183 | 189 | { |
184 | 190 | return Utf8Str("HostInterfaceNetworking-").append(aShortName); |
185 | 191 | } |
| 192 | #endif |
186 | 193 | /** |
187 | 194 | * Initializes the host object. |
188 | 195 | * |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/MachineImpl.cpp vbox-trunk\src\VBox\Main/src-server/MachineImpl.cpp
old
|
new
|
|
3370 | 3370 | SessionState_T origState = mData->mSession.mState; |
3371 | 3371 | mData->mSession.mState = SessionState_Spawning; |
3372 | 3372 | |
3373 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 3373 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
3374 | 3374 | /* Get the client token ID to be passed to the client process */ |
3375 | 3375 | Utf8Str strTokenId; |
3376 | 3376 | sessionMachine->i_getTokenId(strTokenId); |
… |
… |
|
3396 | 3396 | alock.release(); |
3397 | 3397 | |
3398 | 3398 | LogFlowThisFunc(("Calling AssignMachine()...\n")); |
3399 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 3399 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
3400 | 3400 | rc = pSessionControl->AssignMachine(sessionMachine, aLockType, Bstr(strTokenId).raw()); |
3401 | 3401 | #else /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
3402 | 3402 | rc = pSessionControl->AssignMachine(sessionMachine, aLockType, pToken); |
… |
… |
|
7711 | 7711 | |
7712 | 7712 | /* inform the session that it will be a remote one */ |
7713 | 7713 | LogFlowThisFunc(("Calling AssignMachine (NULL)...\n")); |
7714 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 7714 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
7715 | 7715 | HRESULT rc = aControl->AssignMachine(NULL, LockType_Write, Bstr::Empty.raw()); |
7716 | 7716 | #else /* VBOX_WITH_GENERIC_SESSION_WATCHER */ |
7717 | 7717 | HRESULT rc = aControl->AssignMachine(NULL, LockType_Write, NULL); |
… |
… |
|
13551 | 13551 | // public methods only for internal purposes |
13552 | 13552 | ///////////////////////////////////////////////////////////////////////////// |
13553 | 13553 | |
13554 | | #ifndef VBOX_WITH_GENERIC_SESSION_WATCHER |
| 13554 | #if !defined(VBOX_WITH_GENERIC_SESSION_WATCHER) // && !defined(RT_OS_OS2) |
13555 | 13555 | /** |
13556 | 13556 | * Called from the client watcher thread to check for expected or unexpected |
13557 | 13557 | * death of the client process that has a direct session to this machine. |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/os2/NetIf-os2.cpp vbox-trunk\src\VBox\Main/src-server/os2/NetIf-os2.cpp
old
|
new
|
|
22 | 22 | *********************************************************************************************************************************/ |
23 | 23 | #define LOG_GROUP LOG_GROUP_MAIN |
24 | 24 | |
| 25 | #include <VBox/com/defs.h> |
25 | 26 | #include <iprt/err.h> |
26 | 27 | #include <list> |
27 | 28 | |
… |
… |
|
33 | 34 | return VERR_NOT_IMPLEMENTED; |
34 | 35 | } |
35 | 36 | |
36 | | int NetIfEnableStaticIpConfig(VirtualBox *pVBox, HostNetworkInterface * pIf, ULONG ip, ULONG mask) |
| 37 | int NetIfEnableStaticIpConfig(VirtualBox *vBox, HostNetworkInterface * pIf, ULONG aOldIp, ULONG ip, ULONG mask) |
37 | 38 | { |
38 | 39 | return VERR_NOT_IMPLEMENTED; |
39 | 40 | } |
40 | 41 | |
41 | | int NetIfEnableStaticIpConfigV6(VirtualBox *pVBox, HostNetworkInterface * pIf, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength) |
| 42 | int NetIfEnableStaticIpConfigV6(VirtualBox *vBox, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address, |
| 43 | IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength) |
42 | 44 | { |
43 | 45 | return VERR_NOT_IMPLEMENTED; |
44 | 46 | } |
… |
… |
|
53 | 55 | { |
54 | 56 | return VERR_NOT_IMPLEMENTED; |
55 | 57 | } |
| 58 | |
| 59 | |
| 60 | int NetIfGetState(const char *pcszIfName, NETIFSTATUS *penmState) |
| 61 | { |
| 62 | return VERR_NOT_IMPLEMENTED; |
| 63 | } |
| 64 | |
| 65 | int NetIfGetLinkSpeed(const char *pcszIfName, uint32_t *puMbits) |
| 66 | { |
| 67 | return VERR_NOT_IMPLEMENTED; |
| 68 | } |
| 69 | |
| 70 | int NetIfCreateHostOnlyNetworkInterface(VirtualBox *pVirtualBox, |
| 71 | IHostNetworkInterface **aHostNetworkInterface, |
| 72 | IProgress **aProgress, |
| 73 | const char *pcszName) |
| 74 | { |
| 75 | return VERR_NOT_IMPLEMENTED; |
| 76 | } |
| 77 | |
| 78 | int NetIfGetConfig(HostNetworkInterface * pIf, NETIFINFO *pInfo) |
| 79 | { |
| 80 | return VERR_NOT_IMPLEMENTED; |
| 81 | } |
| 82 | |
| 83 | int NetIfRemoveHostOnlyNetworkInterface(VirtualBox *pVirtualBox, IN_GUID aId, |
| 84 | IProgress **aProgress) |
| 85 | { |
| 86 | return VERR_NOT_IMPLEMENTED; |
| 87 | } |
56 | 88 | |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/os2/USBProxyServiceOs2.cpp vbox-trunk\src\VBox\Main/src-server/os2/USBProxyServiceOs2.cpp
old
|
new
|
|
251 | 251 | pCur->u64SerialHash = 0; |
252 | 252 | //pCur->bNumConfigurations = pDevDesc->bNumConfigurations; |
253 | 253 | pCur->bNumConfigurations = 0; |
254 | | pCur->paConfigurations = NULL; |
| 254 | //pCur->paConfigurations = NULL; // vs: Now USBDEVICE format changed |
255 | 255 | pCur->enmState = USBDEVICESTATE_USED_BY_HOST_CAPTURABLE; |
256 | 256 | pCur->enmSpeed = USBDEVICESPEED_UNKNOWN; |
257 | 257 | pCur->pszAddress = NULL; |
… |
… |
|
259 | 259 | pDevDesc->idProduct, pDevDesc->idVendor, pDevDesc->bcdDevice, i); |
260 | 260 | |
261 | 261 | pCur->bBus = 0; |
262 | | pCur->bLevel = 0; |
263 | | pCur->bDevNum = 0; |
264 | | pCur->bDevNumParent = 0; |
| 262 | //pCur->bLevel = 0; |
| 263 | //pCur->bDevNum = 0; |
| 264 | //pCur->bDevNumParent = 0; |
265 | 265 | pCur->bPort = 0; |
266 | | pCur->bNumDevices = 0; |
267 | | pCur->bMaxChildren = 0; |
| 266 | //pCur->bNumDevices = 0; |
| 267 | //pCur->bMaxChildren = 0; |
268 | 268 | |
269 | 269 | /* link it */ |
270 | 270 | pCur->pNext = NULL; |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/xpcom/server_module.cpp vbox-trunk\src\VBox\Main/src-server/xpcom/server_module.cpp
old
|
new
|
|
118 | 118 | if (PR_ProcessAttrSetInheritableFD(attr, writable, VBOXSVC_STARTUP_PIPE_NAME) != PR_SUCCESS) |
119 | 119 | goto end; |
120 | 120 | |
| 121 | #ifndef RT_OS_OS2 |
121 | 122 | devNull = PR_Open("/dev/null", PR_RDWR, 0); |
| 123 | #else |
| 124 | devNull = PR_Open("/dev/nul", PR_RDWR, 0); |
| 125 | #endif |
122 | 126 | if (!devNull) |
123 | 127 | goto end; |
124 | 128 | |
-
diff -urN vbox-trunk-bk\src\VBox\Main/src-server/xpcom/server.cpp vbox-trunk\src\VBox\Main/src-server/xpcom/server.cpp
old
|
new
|
|
629 | 629 | if (PR_ProcessAttrSetInheritableFD(attr, writable, VBOXSVC_STARTUP_PIPE_NAME) != PR_SUCCESS) |
630 | 630 | goto end; |
631 | 631 | |
| 632 | #ifndef RT_OS_OS2 |
632 | 633 | devNull = PR_Open("/dev/null", PR_RDWR, 0); |
| 634 | #else |
| 635 | devNull = PR_Open("/dev/nul", PR_RDWR, 0); |
| 636 | #endif |
633 | 637 | if (!devNull) |
634 | 638 | goto end; |
635 | 639 | |