VirtualBox

Changeset 71323 in vbox for trunk


Ignore:
Timestamp:
Mar 14, 2018 2:05:32 PM (7 years ago)
Author:
vboxsync
Message:

WDDM: build and use VBoxWddm.sys. bugref:9133

Location:
trunk/src/VBox/Additions/WINNT
Files:
2 deleted
7 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/Makefile.kmk

    r71200 r71323  
    55
    66#
    7 # Copyright (C) 2011-2017 Oracle Corporation
     7# Copyright (C) 2011-2018 Oracle Corporation
    88#
    99# This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    7171 # miniport driver and the display dll.
    7272 #
    73  INSTALLS += VBoxVideoWddm-inf
    74  VBoxVideoWddm-inf_INST = $(INST_ADDITIONS)
    75  VBoxVideoWddm-inf_MODE = a+r,u+w
    76  VBoxVideoWddm-inf_SOURCES = \
    77         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf
     73 INSTALLS += VBoxWddm-inf
     74 VBoxWddm-inf_INST = $(INST_ADDITIONS)
     75 VBoxWddm-inf_MODE = a+r,u+w
     76 VBoxWddm-inf_SOURCES = \
     77        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf
    7878 ifdef VBOX_SIGN_ADDITIONS
    79   VBoxVideoWddm-inf_SOURCES += \
    80         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    81         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat
     79  VBoxWddm-inf_SOURCES += \
     80        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
     81        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat
    8282
    8383  ifdef VBOXWDDM_WITH_DISPD3D
    84    VBoxVideoWddm-inf_SOURCES += \
    85         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll
    86    VBoxVideoWddm-inf_SOURCES.amd64 += \
    87         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll
     84   VBoxWddm-inf_SOURCES += \
     85        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll
     86   VBoxWddm-inf_SOURCES.amd64 += \
     87        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll
    8888  endif # VBOXWDDM_WITH_DISPD3D
    8989
    9090  ifdef VBOXWDDM_WITH_GL
    91    VBoxVideoWddm-inf_SOURCES += \
    92         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
    93         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    94         $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
    95         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
    96         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
    97         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
    98         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
    99         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
    100         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll
    101    VBoxVideoWddm-inf_SOURCES.amd64 += \
    102         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
    103         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
    104         $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
    105         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
    106         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
    107         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
    108         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
    109         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
    110         $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
     91   VBoxWddm-inf_SOURCES += \
     92        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
     93        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
     94        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
     95        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \
     96        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
     97        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
     98        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll \
     99        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll \
     100        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll
     101   VBoxWddm-inf_SOURCES.amd64 += \
     102        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
     103        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
     104        $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
     105        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \
     106        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
     107        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \
     108        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
     109        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll \
     110        $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll
    111111  endif # VBOXWDDM_WITH_GL
    112 
    113  endif # signing
    114  VBoxVideoWddm-inf_CLEAN = $(VBoxVideoWddm-inf_SOURCES)
    115  VBoxVideoWddm-inf_BLDDIRS = \
    116         $(PATH_TARGET)/VBoxVideoWddmCat.dir
     112 endif # VBOX_SIGN_ADDITIONS
     113
     114 VBoxWddm-inf_CLEAN = $(VBoxWddm-inf_SOURCES)
     115 VBoxWddm-inf_BLDDIRS = \
     116        $(PATH_TARGET)/VBoxWddmCat.dir
    117117
    118118 VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDM_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
    119119 VBOXWDDM_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDM_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
    120 
    121  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf: \
    122                 $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    123         $(call MSG_GENERATE,VBoxVideoWddm-inf,$@,$<)
    124         $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG))
    125 
    126  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys: $$(VBoxVideoWddm_1_TARGET) | $$(dir $$@)
     120 # Depends on VBOXWDDM_WITH_GL. ";icd" prefix is used for telling which lines are for OpenGL ICD
     121 VBOXWDDM_EDIT_INF_ICD_FN_ARG     = $(if $(VBOXWDDM_WITH_GL),-e 's/^;icd  *//', -e '/^;icd /d')
     122
     123 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf: \
     124                $(PATH_SUB_CURRENT)/mp/wddm/VBoxWddm.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
     125        $(call MSG_GENERATE,VBoxWddm-inf,$@,$<)
     126        $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDM_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDM_EDIT_INF_GL_FN_ARG) $(VBOXWDDM_EDIT_INF_ICD_FN_ARG))
     127
     128 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys: $$(VBoxWddm_1_TARGET) | $$(dir $$@)
    127129        $(INSTALL) -m 644 $< $(@D)
    128130
    129131 ifdef VBOXWDDM_WITH_DISPD3D
    130   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
     132  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
    131133        $(INSTALL) -m 644 $< $(@D)
    132134
    133135  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    134    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
     136   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
    135137        $(INSTALL) -m 644 $< $(@D)
    136138  endif
    … …  
    138140
    139141 ifdef VBOXWDDM_WITH_GL
    140   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll: $(PATH_OBJ)/VBoxOGL/VBoxOGL.dll | $$(dir $$@)
    141         $(INSTALL) -m 644 $< $(@D)
    142 
    143   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll: $(PATH_OBJ)/VBoxD3D9wddm/VBoxD3D9wddm.dll | $$(dir $$@)
    144         $(INSTALL) -m 644 $< $(@D)
    145 
    146   $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll: $(PATH_OBJ)/wined3dwddm/wined3dwddm.dll | $$(dir $$@)
    147         $(INSTALL) -m 644 $< $(@D)
    148 
    149   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll: $(PATH_OBJ)/VBoxOGLarrayspu/VBoxOGLarrayspu.dll | $$(dir $$@)
    150         $(INSTALL) -m 644 $< $(@D)
    151 
    152   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@)
    153         $(INSTALL) -m 644 $< $(@D)
    154 
    155   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll: $(PATH_OBJ)/VBoxOGLerrorspu/VBoxOGLerrorspu.dll | $$(dir $$@)
    156         $(INSTALL) -m 644 $< $(@D)
    157 
    158   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu/VBoxOGLfeedbackspu.dll | $$(dir $$@)
    159         $(INSTALL) -m 644 $< $(@D)
    160 
    161   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll: $(PATH_OBJ)/VBoxOGLpackspu/VBoxOGLpackspu.dll | $$(dir $$@)
    162         $(INSTALL) -m 644 $< $(@D)
    163 
    164   $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu/VBoxOGLpassthroughspu.dll | $$(dir $$@)
     142  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll: $(PATH_OBJ)/VBoxOGL/VBoxOGL.dll | $$(dir $$@)
     143        $(INSTALL) -m 644 $< $(@D)
     144
     145  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll: $(PATH_OBJ)/VBoxD3D9wddm/VBoxD3D9wddm.dll | $$(dir $$@)
     146        $(INSTALL) -m 644 $< $(@D)
     147
     148  $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll: $(PATH_OBJ)/wined3dwddm/wined3dwddm.dll | $$(dir $$@)
     149        $(INSTALL) -m 644 $< $(@D)
     150
     151  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll: $(PATH_OBJ)/VBoxOGLarrayspu/VBoxOGLarrayspu.dll | $$(dir $$@)
     152        $(INSTALL) -m 644 $< $(@D)
     153
     154  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@)
     155        $(INSTALL) -m 644 $< $(@D)
     156
     157  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll: $(PATH_OBJ)/VBoxOGLerrorspu/VBoxOGLerrorspu.dll | $$(dir $$@)
     158        $(INSTALL) -m 644 $< $(@D)
     159
     160  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu/VBoxOGLfeedbackspu.dll | $$(dir $$@)
     161        $(INSTALL) -m 644 $< $(@D)
     162
     163  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll: $(PATH_OBJ)/VBoxOGLpackspu/VBoxOGLpackspu.dll | $$(dir $$@)
     164        $(INSTALL) -m 644 $< $(@D)
     165
     166  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu/VBoxOGLpassthroughspu.dll | $$(dir $$@)
    165167        $(INSTALL) -m 644 $< $(@D)
    166168
    167169  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    168    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll: $(PATH_OBJ)/VBoxOGL-x86/VBoxOGL-x86.dll | $$(dir $$@)
    169         $(INSTALL) -m 644 $< $(@D)
    170 
    171    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll: $(PATH_OBJ)/VBoxD3D9wddm-x86/VBoxD3D9wddm-x86.dll | $$(dir $$@)
    172         $(INSTALL) -m 644 $< $(@D)
    173 
    174    $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@)
    175         $(INSTALL) -m 644 $< $(@D)
    176 
    177    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll: $(PATH_OBJ)/VBoxOGLarrayspu-x86/VBoxOGLarrayspu-x86.dll | $$(dir $$@)
    178         $(INSTALL) -m 644 $< $(@D)
    179 
    180    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll: $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGLcrutil-x86.dll | $$(dir $$@)
    181         $(INSTALL) -m 644 $< $(@D)
    182 
    183    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll: $(PATH_OBJ)/VBoxOGLerrorspu-x86/VBoxOGLerrorspu-x86.dll | $$(dir $$@)
    184         $(INSTALL) -m 644 $< $(@D)
    185 
    186    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu-x86/VBoxOGLfeedbackspu-x86.dll | $$(dir $$@)
    187         $(INSTALL) -m 644 $< $(@D)
    188 
    189    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll: $(PATH_OBJ)/VBoxOGLpackspu-x86/VBoxOGLpackspu-x86.dll | $$(dir $$@)
    190         $(INSTALL) -m 644 $< $(@D)
    191 
    192    $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu-x86/VBoxOGLpassthroughspu-x86.dll | $$(dir $$@)
     170   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll: $(PATH_OBJ)/VBoxOGL-x86/VBoxOGL-x86.dll | $$(dir $$@)
     171        $(INSTALL) -m 644 $< $(@D)
     172
     173   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll: $(PATH_OBJ)/VBoxD3D9wddm-x86/VBoxD3D9wddm-x86.dll | $$(dir $$@)
     174        $(INSTALL) -m 644 $< $(@D)
     175
     176   $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@)
     177        $(INSTALL) -m 644 $< $(@D)
     178
     179   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll: $(PATH_OBJ)/VBoxOGLarrayspu-x86/VBoxOGLarrayspu-x86.dll | $$(dir $$@)
     180        $(INSTALL) -m 644 $< $(@D)
     181
     182   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll: $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGLcrutil-x86.dll | $$(dir $$@)
     183        $(INSTALL) -m 644 $< $(@D)
     184
     185   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll: $(PATH_OBJ)/VBoxOGLerrorspu-x86/VBoxOGLerrorspu-x86.dll | $$(dir $$@)
     186        $(INSTALL) -m 644 $< $(@D)
     187
     188   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu-x86/VBoxOGLfeedbackspu-x86.dll | $$(dir $$@)
     189        $(INSTALL) -m 644 $< $(@D)
     190
     191   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll: $(PATH_OBJ)/VBoxOGLpackspu-x86/VBoxOGLpackspu-x86.dll | $$(dir $$@)
     192        $(INSTALL) -m 644 $< $(@D)
     193
     194   $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu-x86/VBoxOGLpassthroughspu-x86.dll | $$(dir $$@)
    193195        $(INSTALL) -m 644 $< $(@D)
    194196  endif # ($(KBUILD_TARGET_ARCH), amd64)
    195197 endif # VBOXWDDM_WITH_GL
    196198
    197  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.cat: \
    198                 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.inf \
    199                 $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxVideoWddm.sys \
    200                 $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D.dll, ) \
    201                 $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
    202                 $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL.dll \
    203                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm.dll \
    204                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm.dll \
    205                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu.dll \
    206                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil.dll \
    207                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu.dll \
    208                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu.dll \
    209                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu.dll \
    210                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
     199 $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.cat: \
     200                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.inf \
     201                $(PATH_TARGET)/VBoxWddmCat.dir/VBoxWddm.sys \
     202                $(if $(VBOXWDDM_WITH_DISPD3D), $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D.dll, ) \
     203                $(if $(VBOXWDDM_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxWddmCat.dir/VBoxDispD3D-x86.dll, ), ) \
     204                $(if $(VBOXWDDM_WITH_GL),  $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL.dll \
     205                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm.dll \
     206                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm.dll \
     207                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu.dll \
     208                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil.dll \
     209                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu.dll \
     210                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu.dll \
     211                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu.dll \
     212                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu.dll, ) \
    211213                $(if $(VBOXWDDM_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    212                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGL-x86.dll \
    213                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxD3D9wddm-x86.dll \
    214                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/wined3dwddm-x86.dll \
    215                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLarrayspu-x86.dll \
    216                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLcrutil-x86.dll \
    217                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLerrorspu-x86.dll \
    218                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
    219                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpackspu-x86.dll \
    220                                            $(PATH_TARGET)/VBoxVideoWddmCat.dir/VBoxOGLpassthroughspu-x86.dll, ), )
    221         $(call MSG_TOOL,Inf2Cat,VBoxVideoWddm-inf,$@,$<)
     214                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGL-x86.dll \
     215                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxD3D9wddm-x86.dll \
     216                                           $(PATH_TARGET)/VBoxWddmCat.dir/wined3dwddm-x86.dll \
     217                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLarrayspu-x86.dll \
     218                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLcrutil-x86.dll \
     219                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLerrorspu-x86.dll \
     220                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLfeedbackspu-x86.dll \
     221                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpackspu-x86.dll \
     222                                           $(PATH_TARGET)/VBoxWddmCat.dir/VBoxOGLpassthroughspu-x86.dll, ), )
     223        $(call MSG_TOOL,Inf2Cat,VBoxWddm-inf,$@,$<)
    222224        $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    223225
    224   VBOXWDDMW8_WITH_DISPD3D = 1
    225   ifdef VBOX_WITH_CROGL
    226    VBOXWDDMW8_WITH_GL = 1
    227   endif
    228 
    229   INSTALLS += VBoxVideoW8-inf
    230   VBoxVideoW8-inf_INST = $(INST_ADDITIONS)
    231   VBoxVideoW8-inf_MODE = a+r,u+w
    232 
    233   VBoxVideoW8-inf_SOURCES = \
    234         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf
    235   ifdef VBOX_SIGN_ADDITIONS
    236    VBoxVideoW8-inf_SOURCES += \
    237         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
    238         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat
    239    if defined(VBOXWDDMW8_WITH_DISPD3D) && !defined(VBOXWDDM_WITH_DISPD3D)
    240     VBoxVideoW8-inf_SOURCES += \
    241         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll
    242     VBoxVideoW8-inf_SOURCES.amd64 += \
    243         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll
    244    endif
    245    if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
    246     VBoxVideoW8-inf_SOURCES += \
    247         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    248         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    249         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    250         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    251         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    252         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    253         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    254         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    255         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    256     VBoxVideoW8-inf_SOURCES.amd64 += \
    257         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
    258         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
    259         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
    260         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
    261         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
    262         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
    263         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
    264         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
    265         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
    266    endif # VBOXWDDMW8_WITH_GL
    267   endif # VBOX_SIGN_ADDITIONS
    268 
    269   VBoxVideoW8-inf_CLEAN = $(VBoxVideoW8-inf_SOURCES)
    270   if defined(VBOXWDDMW8_WITH_DISPD3D) && defined(VBOXWDDM_WITH_DISPD3D)
    271    VBoxVideoW8-inf_CLEAN += \
    272         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    273         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    274         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    275         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    276         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    277         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    278         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    279         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    280         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    281   endif
    282   if defined(VBOXWDDMW8_WITH_GL) && !defined(VBOXWDDM_WITH_GL)
    283    VBoxVideoW8-inf_CLEAN += \
    284         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    285         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    286         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    287         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    288         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    289         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    290         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    291         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    292         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll
    293    VBoxVideoW8-inf_CLEAN.amd64 += \
    294         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
    295         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
    296         $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
    297         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
    298         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
    299         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
    300         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
    301         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
    302         $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll
    303   endif
    304   VBoxVideoW8-inf_BLDDIRS = \
    305       $(PATH_TARGET)/VBoxVideoW8Cat.dir
    306 
    307   VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG = $(if $(VBOXWDDMW8_WITH_DISPD3D),-e 's/^;dispd3d  *//', -e '/^;dispd3d /d')
    308   VBOXWDDMW8_EDIT_INF_GL_FN_ARG      = $(if $(VBOXWDDMW8_WITH_GL),-e 's/^;gl  *//', -e '/^;gl /d')
    309   VBOXWDDMW8_EDIT_INF_ICD_FN_ARG     = $(if $(VBOXWDDMW8_WITH_ICD),-e 's/^;icd  *//', -e '/^;icd /d')
    310 
    311   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf: $(PATH_SUB_CURRENT)/mp/wddm/VBoxVideoW8.inf $(MAKEFILE_CURRENT) | $$(dir $$@)
    312         $(call MSG_GENERATE,VBoxVideoW8-inf,$@,$<)
    313         $(call VBOX_EDIT_INF_FN,$<,$@ $(VBOXWDDMW8_EDIT_INF_DISPD3D_FN_ARG) $(VBOXWDDMW8_EDIT_INF_GL_FN_ARG) $(VBOXWDDMW8_EDIT_INF_ICD_FN_ARG))
    314 
    315   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys: $$(VBoxVideoW8_1_TARGET) | $$(dir $$@)
    316         $(INSTALL) -m 644 $< $(@D)
    317 
    318   ifdef VBOXWDDMW8_WITH_DISPD3D
    319    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll: $$(VBoxDispD3D_1_TARGET) | $$(dir $$@)
    320         $(INSTALL) -m 644 $< $(@D)
    321 
    322    ifeq ($(KBUILD_TARGET_ARCH),amd64)
    323     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll: $$(VBoxDispD3D-x86_1_TARGET) | $$(dir $$@)
    324         $(INSTALL) -m 644 $< $(@D)
    325    endif # ($(KBUILD_TARGET_ARCH), amd64)
    326   endif # VBOXWDDMW8_WITH_DISPD3D
    327 
    328   ifdef VBOXWDDMW8_WITH_GL
    329    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll: $(PATH_OBJ)/VBoxOGL/VBoxOGL.dll | $$(dir $$@)
    330         $(INSTALL) -m 644 $< $(@D)
    331 
    332    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll: $(PATH_OBJ)/VBoxD3D9wddm/VBoxD3D9wddm.dll | $$(dir $$@)
    333         $(INSTALL) -m 644 $< $(@D)
    334 
    335    $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll: $(PATH_OBJ)/wined3dwddm/wined3dwddm.dll | $$(dir $$@)
    336         $(INSTALL) -m 644 $< $(@D)
    337 
    338    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll: $(PATH_OBJ)/VBoxOGLarrayspu/VBoxOGLarrayspu.dll | $$(dir $$@)
    339         $(INSTALL) -m 644 $< $(@D)
    340 
    341    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll: $(PATH_OBJ)/VBoxOGLcrutil/VBoxOGLcrutil.dll | $$(dir $$@)
    342         $(INSTALL) -m 644 $< $(@D)
    343 
    344    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll: $(PATH_OBJ)/VBoxOGLerrorspu/VBoxOGLerrorspu.dll | $$(dir $$@)
    345         $(INSTALL) -m 644 $< $(@D)
    346 
    347    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu/VBoxOGLfeedbackspu.dll | $$(dir $$@)
    348         $(INSTALL) -m 644 $< $(@D)
    349 
    350    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll: $(PATH_OBJ)/VBoxOGLpackspu/VBoxOGLpackspu.dll | $$(dir $$@)
    351         $(INSTALL) -m 644 $< $(@D)
    352 
    353    $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu/VBoxOGLpassthroughspu.dll | $$(dir $$@)
    354         $(INSTALL) -m 644 $< $(@D)
    355 
    356    ifeq ($(KBUILD_TARGET_ARCH), amd64)
    357     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll: $(PATH_OBJ)/VBoxOGL-x86/VBoxOGL-x86.dll | $$(dir $$@)
    358         $(INSTALL) -m 644 $< $(@D)
    359 
    360     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll: $(PATH_OBJ)/VBoxD3D9wddm-x86/VBoxD3D9wddm-x86.dll | $$(dir $$@)
    361         $(INSTALL) -m 644 $< $(@D)
    362 
    363     $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll: $(PATH_OBJ)/wined3dwddm-x86/wined3dwddm-x86.dll | $$(dir $$@)
    364         $(INSTALL) -m 644 $< $(@D)
    365 
    366     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll: $(PATH_OBJ)/VBoxOGLarrayspu-x86/VBoxOGLarrayspu-x86.dll | $$(dir $$@)
    367         $(INSTALL) -m 644 $< $(@D)
    368 
    369     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll: $(PATH_OBJ)/VBoxOGLcrutil-x86/VBoxOGLcrutil-x86.dll | $$(dir $$@)
    370         $(INSTALL) -m 644 $< $(@D)
    371 
    372     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll: $(PATH_OBJ)/VBoxOGLerrorspu-x86/VBoxOGLerrorspu-x86.dll | $$(dir $$@)
    373         $(INSTALL) -m 644 $< $(@D)
    374 
    375     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll: $(PATH_OBJ)/VBoxOGLfeedbackspu-x86/VBoxOGLfeedbackspu-x86.dll | $$(dir $$@)
    376         $(INSTALL) -m 644 $< $(@D)
    377 
    378     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll: $(PATH_OBJ)/VBoxOGLpackspu-x86/VBoxOGLpackspu-x86.dll | $$(dir $$@)
    379         $(INSTALL) -m 644 $< $(@D)
    380 
    381     $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll: $(PATH_OBJ)/VBoxOGLpassthroughspu-x86/VBoxOGLpassthroughspu-x86.dll | $$(dir $$@)
    382         $(INSTALL) -m 644 $< $(@D)
    383    endif # ($(KBUILD_TARGET_ARCH), amd64)
    384   endif # VBOXWDDMW8_WITH_GL
    385 
    386   $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.cat: \
    387                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.inf \
    388                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxVideoW8.sys \
    389                 $(if $(VBOXWDDMW8_WITH_DISPD3D), $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D.dll, ) \
    390                 $(if $(VBOXWDDMW8_WITH_DISPD3D), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxDispD3D-x86.dll, ), ) \
    391                 $(if $(VBOXWDDMW8_WITH_GL),  $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL.dll \
    392                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm.dll \
    393                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm.dll \
    394                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu.dll \
    395                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil.dll \
    396                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu.dll \
    397                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu.dll \
    398                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu.dll \
    399                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu.dll, ) \
    400                 $(if $(VBOXWDDMW8_WITH_GL), $(if-expr "$(KBUILD_TARGET_ARCH)" == "amd64", \
    401                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGL-x86.dll \
    402                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxD3D9wddm-x86.dll \
    403                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/wined3dwddm-x86.dll \
    404                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLarrayspu-x86.dll \
    405                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLcrutil-x86.dll \
    406                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLerrorspu-x86.dll \
    407                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLfeedbackspu-x86.dll \
    408                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpackspu-x86.dll \
    409                                 $(PATH_TARGET)/VBoxVideoW8Cat.dir/VBoxOGLpassthroughspu-x86.dll, ), )
    410         $(call MSG_TOOL,Inf2Cat,VBoxVideoW8-inf,$@,$<)
    411         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
    412 
    413226endif # VBOX_WITH_WDDM
    414227

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

    r71200 r71323  
    6464ifdef VBOX_WITH_WDDM
    6565 #
    66  # VBoxVideoWddm - Windows Guest Additions WDDM Miniport Video Driver
     66 # VBoxWddm - Windows Guest Additions WDDM Miniport Video Driver
    6767 #
    68  SYSMODS += VBoxVideoWddm
    69  VBoxVideoWddm_TEMPLATE    = VBOXGUESTR0
    70  VBoxVideoWddm_SDKS        = $(VBOX_WINDDK_GST_W8)
     68 SYSMODS += VBoxWddm
     69 VBoxWddm_TEMPLATE         = VBOXGUESTR0
     70 VBoxWddm_SDKS             = $(VBOX_WINDDK_GST_W8)
     71 VBoxWddm_DEFS            += VBOX_WDDM_MINIPORT VBOX_WITH_WDDM VBOX_WITH_HGCM
    7172 # WIN9X_COMPAT_SPINLOCK inlines KeInitializeSpinLock in W8 DDK (Windows 7 or older ntoskrnl does not export it).
    72  VBoxVideoWddm_DEFS       += VBOX_WITH_8BPP_MODES WIN9X_COMPAT_SPINLOCK
    73  VBoxVideoWddm_DEFS       += VBOX_WDDM_MINIPORT VBOX_WITH_WDDM VBOX_WITH_HGCM
     73 VBoxWddm_DEFS            += WIN9X_COMPAT_SPINLOCK
     74 VBoxWddm_DEFS            += VBOX_WITH_8BPP_MODES
    7475 ifdef VBOX_WITH_VIDEOHWACCEL
    75   VBoxVideoWddm_DEFS      += VBOX_WITH_VIDEOHWACCEL
     76  VBoxWddm_DEFS           += VBOX_WITH_VIDEOHWACCEL
    7677 endif
    7778 ifdef VBOXWDDM_WITH_VBVA
    78   VBoxVideoWddm_DEFS      += VBOXWDDM_WITH_VBVA
    79   VBoxVideoWddm_DEFS      += VBOXWDDM_RENDER_FROM_SHADOW
     79  VBoxWddm_DEFS           += VBOXWDDM_WITH_VBVA
     80  VBoxWddm_DEFS           += VBOXWDDM_RENDER_FROM_SHADOW
    8081  ifdef VBOXVDMA_WITH_VBVA
    81    VBoxVideoWddm_DEFS     += VBOXVDMA_WITH_VBVA
     82   VBoxWddm_DEFS          += VBOXVDMA_WITH_VBVA
    8283  endif
    8384 endif
    8485 ifdef VBOX_WITH_VDMA
    85   VBoxVideoWddm_DEFS      += VBOX_WITH_VDMA
     86  VBoxWddm_DEFS           += VBOX_WITH_VDMA
    8687 endif
    8788 ifdef VBOX_WITH_CRHGSMI
    88   VBoxVideoWddm_DEFS      += VBOX_WITH_CRHGSMI
     89  VBoxWddm_DEFS           += VBOX_WITH_CRHGSMI
    8990 endif
    90  ifdef DEBUG_misha
    91   VBoxVideoWddm_DEFS      += LOG_ENABLED
     91 VBoxWddm_DEFS            += LOG_TO_BACKDOOR
     92 VBoxWddm_DEFS            += VBOX_SVN_REV=$(VBOX_SVN_REV)
     93 ifdef VBOX_VDMA_WITH_WATCHDOG
     94  VBoxWddm_DEFS           += VBOX_VDMA_WITH_WATCHDOG
    9295 endif
    93  VBoxVideoWddm_DEFS       += LOG_TO_BACKDOOR
    94  VBoxVideoWddm_DEFS       += VBOX_SVN_REV=$(VBOX_SVN_REV)
    95  ifdef VBOX_VDMA_WITH_WATCHDOG
    96   VBoxVideoWddm_DEFS      += VBOX_VDMA_WITH_WATCHDOG
    97  endif
    98  VBoxVideoWddm_INCS       += \
     96 VBoxWddm_INCS            += \
    9997        ../../../include \
    10098        .. \
    … …  
    105103        $(VBOX_GRAPHICS_INCS)
    106104
    107  VBoxVideoWddm_LDFLAGS.x86 += /Entry:DriverEntry@8
    108  VBoxVideoWddm_LDFLAGS.amd64 += /Entry:DriverEntry
     105 VBoxWddm_LDFLAGS.x86    += /Entry:DriverEntry@8
     106 VBoxWddm_LDFLAGS.amd64  += /Entry:DriverEntry
    109107
    110  VBoxVideoWddm_SOURCES     = \
     108 VBoxWddm_SOURCES          = \
    111109        wddm/VBoxMPWddm.cpp \
    112110        wddm/VBoxMPVidPn.cpp \
    … …  
    116114        wddm/VBoxMPCr.cpp \
    117115        wddm/VBoxMPMisc.cpp \
    118         wddm/VBoxMPWddm.rc \
     116        wddm/VBoxWddm.rc \
    119117        wddm/VBoxMPRegistry.cpp \
    120118        wddm/VBoxMPVModes.cpp \
    … …  
    128126        $(PATH_ROOT)/src/VBox/Additions/common/VBoxVideo/Modesetting.cpp
    129127
    130    VBoxVideoWddm_SOURCES   += \
     128 VBoxWddm_SOURCES         += \
    131129        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/util/sortarray.cpp
    132130
    133131 if defined(VBOX_WITH_CROGL)
    134    VBoxVideoWddm_SOURCES   += \
     132   VBoxWddm_SOURCES       += \
    135133        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/util/vreg.cpp \
    136134        $(PATH_ROOT)/src/VBox/GuestHost/OpenGL/packer/pack_buffer.c \
    … …  
    141139        $(VBOX_PATH_CROGL_GENFILES)/packer.c \
    142140        wddm/VBoxMPCrUtil.cpp
    143    VBoxVideoWddm_DEFS      += VBOX_WITH_CROGL
     141   VBoxWddm_DEFS          += VBOX_WITH_CROGL
    144142 endif
    145143 ifdef VBOXWDDM_WITH_VBVA
    146   VBoxVideoWddm_SOURCES   += \
     144  VBoxWddm_SOURCES        += \
    147145    wddm/VBoxMPVbva.cpp
    148146 endif
    149147 ifdef VBOX_WITH_VIDEOHWACCEL
    150   VBoxVideoWddm_SOURCES   += \
     148  VBoxWddm_SOURCES        += \
    151149    wddm/VBoxMPVhwa.cpp
    152150 endif
    153151
    154  VBoxVideoWddm_LIBS        = \
     152 VBoxWddm_LIBS             = \
    155153        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/BufferOverflowK.lib \
    156154        $(PATH_SDK_$(VBOX_WINDDK_GST_W8)_LIB)/ntoskrnl.lib \
    … …  
    160158        $(VBOX_LIB_IPRT_GUEST_R0) \
    161159        $(VBOX_PATH_ADDITIONS_LIB)/HGSMIGuestR0Lib$(VBOX_SUFF_LIB)
    162 
    163  #
    164  # VBoxVideoW8 - Windows Guest Additions WDDM 1.2 Miniport Video Driver for Win8
    165  #
    166  SYSMODS += VBoxVideoW8
    167  VBoxVideoW8_EXTENDS    = VBoxVideoWddm
    168  VBoxVideoW8_TEMPLATE   = VBOXGUESTR0
    169  VBoxVideoW8_DEFS       = $(VBoxVideoWddm_DEFS) VBOX_WDDM_WIN8
    170  VBoxVideoW8_SOURCES    = $(subst VBoxMPWddm.rc,VBoxMPW8.rc,$(VBoxVideoWddm_SOURCES))
    171  VBoxVideoW8_LIBS       = $(VBoxVideoWddm_LIBS)
    172160
    173161endif # VBOX_WITH_WDDM
    … …  
    181169 VBoxVideo_DEBUG_INSTTYPE      = both
    182170 ifdef VBOX_WITH_WDDM
    183   VBoxVideoWddm_INSTTYPE       = none
    184   VBoxVideoWddm_DEBUG_INSTTYPE = both
    185   VBoxVideoW8_INSTTYPE         = none
    186   VBoxVideoW8_DEBUG_INSTTYPE   = both
     171  VBoxWddm_INSTTYPE            = none
     172  VBoxWddm_DEBUG_INSTTYPE      = both
    187173 endif
    188174endif # VBOX_SIGN_ADDITIONS

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp

    r71196 r71323  
    13421342
    13431343#ifdef VBOX_WDDM_REPLUG_ON_MODE_CHANGE
    1344     /* The VBOXESC_UPDATEMODES is a hint for VBoxVideoW8.sys to use new display mode as soon as VidPn
     1344    /* The VBOXESC_UPDATEMODES is a hint for the driver to use new display mode as soon as VidPn
    13451345     * manager will ask for it.
    13461346     * Probably, some new interface is required to plug/unplug displays by calling

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h

    r71196 r71323  
    1919#define ___VBoxMPWddm_h___
    2020
    21 #ifdef VBOX_WDDM_WIN8
    22 # define VBOX_WDDM_DRIVERNAME L"VBoxVideoW8"
    23 #else
    24 # define VBOX_WDDM_DRIVERNAME L"VBoxVideoWddm"
    25 #endif
     21#define VBOX_WDDM_DRIVERNAME L"VBoxWddm"
    2622
    2723#ifndef DEBUG_misha

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.inf

    r71191 r71323  
    55
    66;
    7 ; Copyright (C) 2011-2017 Oracle Corporation
     7; Copyright (C) 2011-2018 Oracle Corporation
    88;
    99; This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    2323DriverPackageType=PlugAndPlay
    2424;edit-DriverVer=02/26/2010,1.00.0000
    25 ;cat CatalogFile = VBoxVideoWddm.cat
     25;cat CatalogFile = VBoxWddm.cat
    2626
    2727[DestinationDirs]
    … …  
    5151
    5252[VBoxVideo.Miniport]
    53 VBoxVideoWddm.sys
     53VBoxWddm.sys
    5454
    5555[VBoxVideo.Display]
    … …  
    8585;dispd3d HKR,, UserModeDriverName,    %REG_MULTI_SZ%, VBoxDispD3D.dll
    8686;amd64 ;dispd3d HKR,, UserModeDriverNameWow,    %REG_MULTI_SZ%, VBoxDispD3D-x86.dll
    87 ;gl HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
    88 ;amd64 ;gl HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL-x86.dll
    89 ;gl        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
    90 ;amd64 ;gl HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
    91 ;gl        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
    92 ;amd64 ;gl HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
     87;icd        HKR,, OpenGLDriverName,    %REG_MULTI_SZ%, VBoxOGL.dll
     88;amd64 ;icd HKR,, OpenGLDriverNameWoW, %REG_MULTI_SZ%, VBoxOGL-x86.dll
     89;icd        HKR,, OpenGLFlags,         %REG_DWORD%,    0x00000001
     90;amd64 ;icd HKR,, OpenGLFlagsWoW,      %REG_DWORD%,    0x00000001
     91;icd        HKR,, OpenGLVersion,       %REG_DWORD%,    0x00000001
     92;amd64 ;icd HKR,, OpenGLVersionWoW,    %REG_DWORD%,    0x00000001
    9393HKR,, VgaCompatible, %REG_DWORD%, 0
    9494
    … …  
    9797
    9898[VBoxVideo.Services]
    99 AddService=VBoxVideoWddm, 0x00000002, VBoxVideo_Service_Inst, VBoxVideo_EventLog_Inst
     99AddService=VBoxWddm, 0x00000002, VBoxVideo_Service_Inst, VBoxVideo_EventLog_Inst
    100100
    101101[VBoxVideo_Service_Inst]
    … …  
    104104ErrorControl=0                  ; SERVICE_ERROR_IGNORE
    105105LoadOrderGroup=Video
    106 ServiceBinary=%12%\VBoxVideoWddm.sys
     106ServiceBinary=%12%\VBoxWddm.sys
    107107
    108108[VBoxVideo_EventLog_Inst]
    … …  
    110110
    111111[VBoxVideo_EventLog_AddReg]
    112 HKR,,EventMessageFile,0x00020000,"%SystemRoot%\System32\IoLogMsg.dll;%SystemRoot%\System32\drivers\VBoxVideoWddm.sys"
     112HKR,,EventMessageFile,0x00020000,"%SystemRoot%\System32\IoLogMsg.dll;%SystemRoot%\System32\drivers\VBoxWddm.sys"
    113113HKR,,TypesSupported,0x00010001,7
    114114
    … …  
    117117
    118118[SourceDisksFiles]
    119 VBoxVideoWddm.sys = 1
     119VBoxWddm.sys = 1
    120120;amd64 ;dispd3d VBoxDispD3D-x86.dll = 1
    121121;dispd3d VBoxDispD3D.dll = 1
    … …  
    148148ORACLE = "Oracle Corporation"
    149149VBoxVideo.Disk = "VirtualBox Video Driver Disk"
    150 VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter for Windows Vista and 7"
     150VBoxVideo.SvcDesc = "VirtualBox Graphics Adapter (WDDM)"

  • trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxWddm.rc

    r71191 r71323  
    11/* $Id$ */
    22/** @file
    3  * VBoxVideoWddm - Resource file containing version info and icon.
     3 * VBoxWddm - Resource file containing version info and icon.
    44 */
    55
    66/*
    7  * Copyright (C) 2011-2017 Oracle Corporation
     7 * Copyright (C) 2011-2018 Oracle Corporation
    88 *
    99 * This file is part of VirtualBox Open Source Edition (OSE), as
    … …  
    3333      BLOCK "040904b0"
    3434      BEGIN
    35          VALUE "FileDescription",  "VirtualBox Video Driver for Windows Vista and 7\0"
    36          VALUE "InternalName",     "VBoxMPWddm\0"
    37          VALUE "OriginalFilename", "VBoxVideoWddm.sys\0"
     35         VALUE "FileDescription",  "VirtualBox WDDM Video Driver\0"
     36         VALUE "InternalName",     "VBoxWddm\0"
     37         VALUE "OriginalFilename", "VBoxWddm.sys\0"
    3838         VALUE "CompanyName",      VBOX_RC_COMPANY_NAME
    3939         VALUE "FileVersion",      VBOX_RC_FILE_VERSION_STR

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r71200 r71323  
    131131ifdef VBOX_WITH_WDDM
    132132DRIVER_FILES += \
    133         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \
    134         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
     133        $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
     134        $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
    135135        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
    136 DRIVER_FILES += \
    137         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.sys \
    138         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.inf
    139136 ifdef VBOX_WITH_CROGL
    140137DRIVER_FILES += \
    … …  
    144141 ifdef VBOX_SIGN_ADDITIONS
    145142DRIVER_FILES += \
    146         $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
    147 DRIVER_FILES += \
    148         $(PATH_STAGE_BIN)/additions/VBoxVideoW8.cat
     143        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat
    149144 endif
    150145 ifeq ($(KBUILD_TARGET_ARCH),amd64)

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsCommon.nsh

    r71200 r71323  
    9898
    9999!if $%VBOX_WITH_WDDM% == "1"
    100   ; WDDM Video driver for Vista and 7
    101   SetOutPath "$0\VBoxVideoWddm"
     100  ; WDDM Video driver
     101  SetOutPath "$0\VBoxWddm"
    102102
    103103  !ifdef VBOX_SIGN_ADDITIONS
    104     FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
     104    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
    105105  !endif
    106   FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
    107   FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
     106  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
     107  FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
    108108  FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
    109109
    … …  
    137137    !endif ; $%VBOX_WITH_CROGL% == "1"
    138138  !endif ; $%BUILD_TARGET_ARCH% == "amd64"
    139 
    140   ; WDDM Video driver for Win8
    141   SetOutPath "$0\VBoxVideoW8"
    142 
    143     !ifdef VBOX_SIGN_ADDITIONS
    144       FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
    145     !endif
    146     FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
    147     FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
    148     FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
    149 
    150     !if $%VBOX_WITH_CROGL% == "1"
    151       FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu.dll"
    152       FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil.dll"
    153       FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu.dll"
    154       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu.dll"
    155       FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu.dll"
    156       FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu.dll"
    157       FILE "$%PATH_OUT%\bin\additions\VBoxOGL.dll"
    158 
    159       FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm.dll"
    160       FILE "$%PATH_OUT%\bin\additions\wined3dwddm.dll"
    161     !endif ; $%VBOX_WITH_CROGL% == "1"
    162 
    163     !if $%BUILD_TARGET_ARCH% == "amd64"
    164       FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D-x86.dll"
    165 
    166       !if $%VBOX_WITH_CROGL% == "1"
    167         FILE "$%PATH_OUT%\bin\additions\VBoxOGLarrayspu-x86.dll"
    168         FILE "$%PATH_OUT%\bin\additions\VBoxOGLcrutil-x86.dll"
    169         FILE "$%PATH_OUT%\bin\additions\VBoxOGLerrorspu-x86.dll"
    170         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpackspu-x86.dll"
    171         FILE "$%PATH_OUT%\bin\additions\VBoxOGLpassthroughspu-x86.dll"
    172         FILE "$%PATH_OUT%\bin\additions\VBoxOGLfeedbackspu-x86.dll"
    173         FILE "$%PATH_OUT%\bin\additions\VBoxOGL-x86.dll"
    174 
    175         FILE "$%PATH_OUT%\bin\additions\VBoxD3D9wddm-x86.dll"
    176         FILE "$%PATH_OUT%\bin\additions\wined3dwddm-x86.dll"
    177       !endif ; $%VBOX_WITH_CROGL% == "1"
    178     !endif ; $%BUILD_TARGET_ARCH% == "amd64"
    179139!endif ; $%VBOX_WITH_WDDM% == "1"
    180140

  • trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsW2KXP.nsh

    r71200 r71323  
    233233    SetOutPath "$INSTDIR"
    234234
    235     ${If} $g_strWinVersion == "8"
    236     ${OrIf} $g_strWinVersion == "8_1"
    237     ${OrIf} $g_strWinVersion == "10"
    238       !ifdef VBOX_SIGN_ADDITIONS
    239         FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.cat"
    240       !endif
    241       FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
    242       FILE "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
    243     ${Else}
    244       !ifdef VBOX_SIGN_ADDITIONS
    245         FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
    246       !endif
    247       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
    248       FILE "$%PATH_OUT%\bin\additions\VBoxVideoWddm.inf"
    249     ${EndIf}
     235    !ifdef VBOX_SIGN_ADDITIONS
     236      FILE "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     237    !endif
     238    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
     239    FILE "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
    250240
    251241    FILE "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
    … …  
    391381  ${If} $g_bNoVideoDrv == "false"
    392382    ${If} $g_bWithWDDM == "true"
    393       ${If} $g_strWinVersion == "8"
    394       ${OrIf} $g_strWinVersion == "8_1"
    395       ${OrIf} $g_strWinVersion == "10"
    396         ${LogVerbose} "Installing WDDM video driver for Windows 8 or newer..."
    397         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoW8.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
    398       ${Else}
    399         ${LogVerbose} "Installing WDDM video driver for Windows Vista and 7..."
    400         ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxVideoWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
    401       ${EndIf}
     383      ${LogVerbose} "Installing WDDM video driver..."
     384      ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver install $\"$INSTDIR\VBoxWddm.inf$\" $\"$INSTDIR\install_drivers.log$\"" "false"
    402385    ${Else}
    403386      ${LogVerbose} "Installing video driver ..."
    … …  
    530513
    531514!if $%VBOX_WITH_WDDM% == "1"
     515  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.cat"
     516  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.sys"
     517  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxWddm.inf"
     518  ; Obsolete files begin
    532519  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.cat"
    533520  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoWddm.sys"
    … …  
    536523  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.sys"
    537524  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxVideoW8.inf"
     525  ; Obsolete files end
    538526  Delete /REBOOTOK "$%PATH_OUT%\bin\additions\VBoxDispD3D.dll"
    539527
    … …  
    596584!if $%VBOX_WITH_WDDM% == "1"
    597585
     586  ${LogVerbose} "Uninstalling WDDM video driver..."
     587  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxWddm.inf$\"" "true"
     588  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" service delete VBoxWddm" "true"
     589  ;misha> @todo driver file removal (as well as service removal) should be done as driver package uninstall
     590  ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
     591  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxWddm.sys"
     592
     593  ; Obsolete files begin
    598594  ${LogVerbose} "Uninstalling WDDM video driver for Windows 8..."
    599595  ${CmdExecute} "$\"$INSTDIR\VBoxDrvInst.exe$\" driver uninstall $\"$INSTDIR\VBoxVideoW8.inf$\"" "true"
    … …  
    610606  ;       could be done with "VBoxDrvInst.exe /u", e.g. by passing additional arg to it denoting that driver package is to be uninstalled
    611607  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxVideoWddm.sys"
     608  ; Obsolete files end
     609
    612610  Delete /REBOOTOK "$g_strSystemDir\VBoxDispD3D.dll"
    613611!endif ; $%VBOX_WITH_WDDM% == "1"
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