Changeset 47257 in vbox

Timestamp:

Jul 19, 2013 1:37:51 PM (12 years ago)

Author:

vboxsync

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

87386

Message:

Main: fix and enable mouse test case.

Location:

trunk/src/VBox/Main/testcase

Files:

• Makefile.kmk (modified) (2 diffs)
• tstMouseImpl.cpp (modified) (1 diff)

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

@@ -32 +32 @@
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlContextID,) \
-        $(if ,tstMouseImpl,)
+        $(if true,tstMouseImpl,)
   PROGRAMS.linux += \
         $(if $(VBOX_WITH_USB),tstUSBProxyLinux,)
@@ -215 +215 @@
 # case.
 #
-tstMouseImpl_TEMPLATE = VBOXMAINCLIENTEXE
-tstMouseImpl_INST     = $(INST_TESTCASE)
+tstMouseImpl_TEMPLATE = VBOXR3TSTEXE
 tstMouseImpl_SOURCES  = \
         tstMouseImpl.cpp \
         ../src-client/MouseImpl.cpp \
         ../src-all/EventImpl.cpp \
-        ../src-all/VirtualBoxBase.cpp
-tstMouseImpl_INCS     = ../include \
+        ../src-all/VirtualBoxBase.cpp \
+        ../src-all/VirtualBoxErrorInfoImpl.cpp \
+        $(VBOX_AUTOGEN_EVENT_CPP) \
+        $(VBOX_XML_SCHEMADEFS_CPP)
+tstMouseImpl_CFLAGS   += $(TEMPLATE_VBOXMAINEXE_CFLAGS)
+tstMouseImpl_CXXFLAGS += $(TEMPLATE_VBOXMAINEXE_CXXFLAGS)
+tstMouseImpl_DEFS     += $(TEMPLATE_VBOXMAINEXE_DEFS)
+tstMouseImpl_INCS      = ../include \
+    $(VBOX_PATH_SDK)/bindings/xpcom/include \
+    $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub \
+    $(VBOX_PATH_SDK)/bindings/xpcom/include/xpcom \
         $(dir $(VBOX_XML_SCHEMADEFS_H))
-tstMouseImpl_LIBS     = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
+tstMouseImpl_INCS     += $(TEMPLATE_VBOXMAINEXE_INCS)
+tstMouseImpl_LIBS      = $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB)
+tstMouseImpl_LIBS     += $(TEMPLATE_VBOXMAINEXE_LIBS)
 
 

trunk/src/VBox/Main/testcase/tstMouseImpl.cpp

@@ -170 +170 @@
 }
 
-int TestDisplay::getScreenResolution(uint32_t cScreen, ULONGt *pcx,
+int TestDisplay::getScreenResolution(uint32_t cScreen, ULONG *pcx,
                                      ULONG *pcy, ULONG *pcBPP)
 {