Navigation

← Previous Changeset
Next Changeset →

Changeset 3191

Timestamp:

06/21/07 00:26:49 (2 years ago)

Author:

vboxsync

Message:

Main: Made it build on OS/2.

Files:

trunk/include/VBox/com/defs.h (modified) (7 diffs)
trunk/src/VBox/Main/AudioAdapterImpl.cpp (modified) (1 diff)
trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)
trunk/src/VBox/Main/Makefile.kmk (modified) (1 diff)
trunk/src/VBox/Main/ProgressImpl.cpp (modified) (4 diffs)
trunk/src/VBox/Main/VirtualBoxBase.cpp (modified) (6 diffs)
trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp (modified) (3 diffs)
trunk/src/VBox/Main/VirtualBoxImpl.cpp (modified) (1 diff)
trunk/src/VBox/Main/glue/com.cpp (modified) (1 diff)
trunk/src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)
trunk/src/VBox/Main/include/VirtualBoxXMLUtil.h (modified) (1 diff)
trunk/src/VBox/Main/linux/server.cpp (modified) (1 diff)
trunk/src/VBox/Main/xml/VirtualBox-settings-os2.xsd (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/include/VBox/com/defs.h

r2981	r3191
31	31	#include <iprt/types.h>
32	32
	33	#if !defined (VBOX_WITH_XPCOM)
	34
33	35	#if defined (__WIN__)
34	36
…	…
44	46	#define NS_IMPL_ISUPPORTS1_CI(a, b)
45	47
46		/~~/ these are XPCOM only, one for every interface implemented~~
	48	/* these are XPCOM only, one for every interface implemented */
47	49	#define NS_DECL_ISUPPORTS
48	50	#define NS_DECL_IVIRTUALBOX
…	…
50	52	#define NS_DECL_IMACHINE
51	53
52		/~~/ input pointer argument to method~~
	54	/* input pointer argument to method */
53	55	#define INPTR
54	56
55		/~~/ makes the name of the getter interface function (n must be capitalized)~~
	57	/* makes the name of the getter interface function (n must be capitalized) */
56	58	#define COMGETTER(n) get_##n
57		/~~/ makes the name of the setter interface function (n must be capitalized)~~
	59	/* makes the name of the setter interface function (n must be capitalized) */
58	60	#define COMSETTER(n) put_##n
59	61
60		/~~/ a type for an input GUID parameter in the interface method declaration~~
	62	/* a type for an input GUID parameter in the interface method declaration */
61	63	#define GUIDPARAM GUID
62		/~~/ a type for an output GUID parameter in the interface method declaration~~
	64	/* a type for an output GUID parameter in the interface method declaration */
63	65	#define GUIDPARAMOUT GUID*
64	66
…	…
71	73	#define COM_IIDOF(I) _ATL_IIDOF (I)
72	74
73		#else // !defined (__WIN__)
	75	#else // defined (__WIN__)
	76
	77	#error "VBOX_WITH_XPCOM is not defined!"
	78
	79	#endif // defined (__WIN__)
	80
	81	#else // !defined (VBOX_WITH_XPCOM)
74	82
75	83	// XPCOM
76	84	/////////////////////////////////////////////////////////////////////////////
	85
	86	#if defined (__OS2__)
	87
	88	/* Make sure OS/2 Toolkit headers are pulled in to have
	89	* BOOL/ULONG/etc. typedefs already defined in order to be able to redefine
	90	* them using #define. */
	91	#include <os2.h>
	92
	93	/* OS/2 Toolkit defines TRUE and FALSE */
	94	#undef FALSE
	95	#undef TRUE
	96
	97	#endif // defined (__OS2__)
77	98
78	99	#include <nsID.h>
…	…
112	133	#define TRUE PR_TRUE
113	134
114		/~~/ makes the name of the getter interface function (n must be capitalized)~~
	135	/* makes the name of the getter interface function (n must be capitalized) */
115	136	#define COMGETTER(n) Get##n
116		/~~/ makes the name of the setter interface function (n must be capitalized)~~
	137	/* makes the name of the setter interface function (n must be capitalized) */
117	138	#define COMSETTER(n) Set##n
118	139
119		/~~/ a type to define a raw GUID variable (better to use the Guid class)~~
	140	/* a type to define a raw GUID variable (better to use the Guid class) */
120	141	#define GUID nsID
121		/~~/ a type for an input GUID parameter in the interface method declaration~~
	142	/* a type for an input GUID parameter in the interface method declaration */
122	143	#define GUIDPARAM nsID &
123		/~~/ a type for an output GUID parameter in the interface method declaration~~
	144	/* a type for an output GUID parameter in the interface method declaration */
124	145	#define GUIDPARAMOUT nsID **
125	146
126		/~~/ CLSID and IID for compatibility with Win32~~
	147	/* CLSID and IID for compatibility with Win32 */
127	148	typedef nsCID CLSID;
128	149	typedef nsIID IID;
129	150
130		/~~/ OLE error codes~~
	151	/* OLE error codes */
131	152	#define S_OK NS_OK
132	153	#define E_UNEXPECTED NS_ERROR_UNEXPECTED
…	…
147	168	#define COM_IIDOF(I) NS_GET_IID (I)
148	169
149		// two very simple ATL emulator classes to provide
150		// FinalConstruct()/FinalRelease() functionality on Linux
	170	/* two very simple ATL emulator classes to provide
	171	* FinalConstruct()/FinalRelease() functionality on Linux */
151	172
152	173	class CComObjectRootEx
…	…
163	184	};
164	185
165		/~~/ input pointer argument to method~~
	186	/* input pointer argument to method */
166	187	#define INPTR const
167	188
168		/~~/ helper functions~~
	189	/* helper functions */
169	190	extern "C"
170	191	{

trunk/src/VBox/Main/AudioAdapterImpl.cpp

r2981	r3191
233	233	case AudioDriverType_CoreAudioDriver:
234	234	#endif
	235	#ifdef __OS2__
	236	case AudioDriverType_MMPMAudioDriver:
	237	#endif
235	238	{
236	239	mData.backup();

trunk/src/VBox/Main/ConsoleImpl.cpp

r3155	r3191
6007	6007	/** @todo Implement tap networking for Darwin. */
6008	6008	int rcVBox = VERR_NOT_IMPLEMENTED;
	6009	#elif defined(__OS2__)
	6010	/** @todo Implement tap networking for OS/2. */
	6011	int rcVBox = VERR_NOT_IMPLEMENTED;
6009	6012	#elif defined(VBOX_WITH_UNIXY_TAP_NETWORKING)
6010	6013	# error "PORTME: Implement OS specific TAP interface open/creation."
…	…
6573	6576	static const char * const s_apszGroups[] = VBOX_LOGGROUP_NAMES;
6574	6577	RTUINT fFlags = RTLOGFLAGS_PREFIX_TIME_PROG;
6575		#if~~def __WIN__~~
	6578	#if defined (__WIN__) \|\| defined (__OS2__)
6576	6579	fFlags \|= RTLOGFLAGS_USECRLF;
6577		#endif ~~/* __WIN__ */~~
	6580	#endif
6578	6581	char szError[RTPATH_MAX + 128] = "";
6579	6582	vrc = RTLogCreateEx(&loggerRelease, fFlags, "all",

trunk/src/VBox/Main/MachineImpl.cpp

r3072	r3191
4237	4237	audioDriver = AudioDriverType_CoreAudioDriver;
4238	4238	#endif
	4239	#ifdef __OS2__
	4240	else if (driver == L"mmpm")
	4241	audioDriver = AudioDriverType_MMPMAudioDriver;
	4242	#endif
4239	4243	else
4240	4244	AssertMsgFailed (("Invalid driver: %ls\n", driver.raw()));
…	…
6041	6045	}
6042	6046	#endif
	6047	#ifdef __OS2__
	6048	case AudioDriverType_MMPMAudioDriver:
	6049	{
	6050	CFGLDRSetString (adapterNode, "driver", "mmpm");
	6051	break;
	6052	}
	6053	#endif
6043	6054	default:
6044	6055	ComAssertMsgFailedBreak (("Wrong audio driver type! driver = %d\n",

trunk/src/VBox/Main/Makefile.kmk

r3188	r3191
446	446	VBOX_XML_SCHEMA.linux = xml/VirtualBox-settings-linux.xsd
447	447	VBOX_XML_SCHEMA.win = xml/VirtualBox-settings-windows.xsd
	448	VBOX_XML_SCHEMA.os2 = xml/VirtualBox-settings-os2.xsd
448	449
449	450	VirtualBoxXMLUtil.cpp_DEPS = $(VBOX_XML_ENTITIES) $(VBOX_XML_ENTITIES_COMMON)

trunk/src/VBox/Main/ProgressImpl.cpp

r2981	r3191
20	20	*/
21	21
22		#if ~~!defined (__WIN__~~)
	22	#if defined (VBOX_WITH_XPCOM)
23	23	#include <nsIServiceManager.h>
24	24	#include <nsIExceptionService.h>
25	25	#include <nsCOMPtr.h>
26		#endif // ~~!defined (__WIN__~~)
	26	#endif // defined (VBOX_WITH_XPCOM)
27	27
28	28	#include "ProgressImpl.h"
…	…
768	768	/* try to import error info from the current thread */
769	769
	770	#if !defined (VBOX_WITH_XPCOM)
770	771	#if defined (__WIN__)
771	772
…	…
779	780	}
780	781
781		#else // !defined (__WIN__)
	782	#endif // !defined (__WIN__)
	783	#else // !defined (VBOX_WITH_XPCOM)
782	784
783	785	nsCOMPtr <nsIExceptionService> es;
…	…
799	801	}
800	802	}
801		#endif // !defined (~~__WIN__~~)
	803	#endif // !defined (VBOX_WITH_XPCOM)
802	804
803	805	AssertMsg (rc == S_OK, ("Couldn't get error info (rc=%08X) while trying "

trunk/src/VBox/Main/VirtualBoxBase.cpp

r2981	r3191
20	20	*/
21	21
	22	#if !defined (VBOX_WITH_XPCOM)
22	23	#if defined (__WIN__)
23	24	#include <windows.h>
24	25	#include <dbghelp.h>
25		#else // !defined (__WIN__)
	26	#endif
	27	#else // !defined (VBOX_WITH_XPCOM)
26	28	#include <nsIServiceManager.h>
27	29	#include <nsIExceptionService.h>
28		#endif
	30	#endif // !defined (VBOX_WITH_XPCOM)
29	31
30	32	#include "VirtualBoxBase.h"
…	…
507	509	AssertReturn (aLock, (void) 0);
508	510
509		#if ~~defined(__LINUX__~~) && defined(__GNUC__)
	511	#if (defined(__LINUX__) \|\| defined(__OS2__)) && defined(__GNUC__)
510	512
511	513	RTCritSectEnterDebug (aLock,
…	…
570	572	RTCritSectEnter (aLock);
571	573
572		#endif // defined(__LINUX__)
	574	#endif // defined(__LINUX__)...
573	575	}
574	576
…	…
671	673	CheckComRCBreakRC (rc);
672	674
	675	#if !defined (VBOX_WITH_XPCOM)
673	676	#if defined (__WIN__)
674	677
…	…
707	710	rc = ::SetErrorInfo (0, err);
708	711
709		#else // !defined (__WIN__)
	712	#endif
	713	#else // !defined (VBOX_WITH_XPCOM)
710	714
711	715	nsCOMPtr <nsIExceptionService> es;
…	…
769	773	}
770	774
771		#endif // !defined (~~__WIN__~~)
	775	#endif // !defined (VBOX_WITH_XPCOM)
772	776	}
773	777	while (0);

trunk/src/VBox/Main/VirtualBoxErrorInfoImpl.cpp

r2981	r3191
87	87	}
88	88
	89	#if !defined (VBOX_WITH_XPCOM)
89	90	#if defined (__WIN__)
90	91
…	…
142	143	}
143	144
144		#else // !defined (__WIN__)
	145	#endif // defined (__WIN__)
	146	#else // !defined (VBOX_WITH_XPCOM)
145	147
146	148	/**
…	…
241	243	nsIException, IVirtualBoxErrorInfo)
242	244
243		#endif
244
	245	#endif // !defined (VBOX_WITH_XPCOM)
	246

trunk/src/VBox/Main/VirtualBoxImpl.cpp

r3116	r3191
3328	3328	aId = &aHardDisk->id();
3329	3329	if (aHardDisk->storageType() == HardDiskStorageType_VirtualDiskImage)
	3330	#if !defined (VBOX_WITH_XPCOM)
3330	3331	#if defined(__WIN__)
3331	3332	/// @todo (dmik) stupid BSTR declaration lacks the BCSTR counterpart
3332	3333	const_cast <BSTR> (aFilePathFull) = aHardDisk->asVDI()->filePathFull();
	3334	#endif
3333	3335	#else
3334	3336	aFilePathFull = aHardDisk->asVDI()->filePathFull();

trunk/src/VBox/Main/glue/com.cpp

r2981	r3191
160	160	/* compose the config directory (full path) */
161	161	vrc = RTPathUserHome (path, sizeof (path));
162		aDir = Utf8StrFmt ("%s%c%s", path, RTPATH_DELIMITER,
163		VBOX_USER_HOME_SUFFIX);
	162	if (RT_SUCCESS (vrc))
	163	aDir = Utf8StrFmt ("%s%c%s", path, RTPATH_DELIMITER,
	164	VBOX_USER_HOME_SUFFIX);
164	165	}
165	166

trunk/src/VBox/Main/idl/VirtualBox.xidl

r3153	r3191
7300	7300	<enum
7301	7301	name="AudioDriverType"
7302		uuid="~~0194b900-7233-42d3-b7a1-097bbf53febd~~"
	7302	uuid="4bcc3d73-c2fe-40db-b72f-0c2ca9d68496"
7303	7303	>
7304	7304	<const name="NullAudioDriver" value="0"/>
…	…
7308	7308	<const name="DSOUNDAudioDriver" value="4"/>
7309	7309	<const name="CoreAudioDriver" value="5"/>
	7310	<const name="MMPMAudioDriver" value="5"/>
7310	7311	</enum>
7311	7312

trunk/src/VBox/Main/include/VirtualBoxXMLUtil.h

r2981	r3191
42	42	#elif defined (__DARWIN__)
43	43	# define VBOX_XML_PLATFORM "macosx"
	44	#elif defined (__OS2__)
	45	# define VBOX_XML_PLATFORM "os2"
44	46	#else
45	47	# error Unsupported platform!

trunk/src/VBox/Main/linux/server.cpp

r3117	r3191
815	815	* nsMyModuleComponentInfo::mFactoryConstructor.
816	816	*/
817		~~NS_COM~~ nsresult
	817	nsresult
818	818	NS_NewMyFactory(nsIGenericFactory* *result,
819	819	const nsMyModuleComponentInfo *info)

Navigation

Changeset 3191

Legend:

Download in other formats: