VBox

Timestamp:

Dec 15, 2013 3:59:38 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91290

Message:

Quick midl proxy dll experiment.

Location:

trunk/src/VBox/Main

Files:

trunk/src/VBox/Main/Makefile.kmk

-              r49906
+              r49908
+if defined(VBOX_WITH_MIDL_PROXY_STUB) && "$(KBUILD_TARGET)" == "win"
+ #
+ # Experimental COM proxy + stub DLL.
+ #
+ DLLS += VBoxProxyStub
+ VBoxProxyStub_TEMPLATE = VBOXMAINCOMP
+ VBoxProxyStub_DEFS     = REGISTER_PROXY_DLL
+ VBoxProxyStub_SOURCES  = \
+        $(VBoxCOM_0_OUTDIR)/dlldata.c \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_p.c \
+        $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
+       src-all/win/VBoxProxyStub.def
+endif
 # generate rules
 include $(FILE_KBUILD_SUB_FOOTER)
 …
 $(VBoxCOM_0_OUTDIR)/VirtualBox_i.c \
 + $(VBoxCOM_0_OUTDIR)/VirtualBox.h \
+$(if $(VBOX_WITH_MIDL_PROXY_STUB),+ $(VBoxCOM_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM_0_OUTDIR)/dlldata.c,) \
 + $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@)
         $(VBOX_WIN_MIDL) /nologo \
 …
 $(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c \
 + $(VBoxCOM-x86_0_OUTDIR)/VirtualBox.h \
+$(if $(VBOX_WITH_MIDL_PROXY_STUB),+ $(VBoxCOM-x86_0_OUTDIR)/VirtualBox_p.c + $(VBoxCOM-x86_0_OUTDIR)/dlldata.c,) \
 + $(VBoxCOM-x86_0_OUTDIR)/VirtualBox-x86.tlb: $(VBOX_IDL_FILE.MSCOM) | $$(dir $$@)
         $(VBOX_WIN_MIDL) /nologo /env win32 /target NT51 \

-              r49906
+              r49908
     <!-- all enums go first -->
     <xsl:apply-templates select="enum | if/enum"/>
+    <!-- everything else but result codes and enums -->
+    <xsl:apply-templates select="*[not(self::result or self::enum) and
+                                   not(self::if[result] or self::if[enum])]"/>
+    <!-- declare the interfaces -->
+    <xsl:apply-templates select="if | interface"/>
   </xsl:if>
 …
   </xsl:for-each>
   <xsl:text>&#x0A;</xsl:text>
-  <!-- forward declarations -->
-  <xsl:apply-templates select="if | interface" mode="forward"/>
   <xsl:text>&#x0A;</xsl:text>
   <xsl:choose>
     <xsl:when test="$g_fGenProxy = 'yes'">
+      <!-- all enums go first -->
+      <!-- reference enums and interfaces -->
+      <xsl:apply-templates select="if | interface" mode="forward"/>
       <xsl:apply-templates select="enum | if/enum" mode="forward"/>
+      <!-- the modules (i.e. everything else) -->
+      <xsl:apply-templates select="module | if/module"/>
     </xsl:when>
     <xsl:otherwise>
+      <!-- forward declarations -->
+      <xsl:apply-templates select="if | interface" mode="forward"/>
       <!-- all enums go first -->
       <xsl:apply-templates select="enum | if/enum"/>

-              r49900
+              r49908
+; $Id$
 ;; @file
+;
 ; VBoxC DLL Definition File.
+;
+; Copyright (C) 2006-2010 Oracle Corporation
+;
+; Copyright (C) 2006-2013 Oracle Corporation
+;
 ; This file is part of VirtualBox Open Source Edition (OSE), as
 …
+;
 LIBRARY VBoxC.dll
+LIBRARY VBoxProxyStub.dll
 EXPORTS
-    ; COM entry points
     DllGetClassObject   PRIVATE
     DllCanUnloadNow     PRIVATE
     DllRegisterServer   PRIVATE
     DllUnregisterServer PRIVATE
+    ; private entry points
+    VBoxDriversRegister PRIVATE

Note: See TracChangeset for help on using the changeset viewer.