summaryrefslogtreecommitdiff
path: root/src/VBox/Additions/x11/vboxmouse
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/Additions/x11/vboxmouse')
-rw-r--r--src/VBox/Additions/x11/vboxmouse/Makefile.kmk123
-rw-r--r--src/VBox/Additions/x11/vboxmouse/undefined33
-rw-r--r--src/VBox/Additions/x11/vboxmouse/undefined_extra18
-rw-r--r--src/VBox/Additions/x11/vboxmouse/vboxmouse.c6
4 files changed, 58 insertions, 122 deletions
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index f7f2c8c9..5a4dbf45 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -4,7 +4,7 @@
#
#
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2013 Oracle Corporation
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
@@ -249,6 +249,7 @@ endif
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
+
ifdef VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
ifndef VBOX_USE_SYSTEM_XORG_HEADERS
@@ -263,109 +264,29 @@ ifdef VBOX_WITH_TESTCASES
$$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET)
$(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
$(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- "$(vboxmouse_drv_1_STAGE_TARGET)" "$(VBOXMOUSE_SRC_PATH)/undefined" --static
+ "$(vboxmouse_drv_1_STAGE_TARGET)" --static "$(VBOXMOUSE_SRC_PATH)/undefined"
$(QUIET)$(APPEND) -t "$@" "done"
endif
- TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
- OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run
-$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_70_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
- OTHERS += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run
-$$(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run: $$(vboxmouse_drv_71_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_71_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
- OTHERS += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run
-$$(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run: $$(vboxmouse_drv_13_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_13_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
- OTHERS += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run
-$$(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run: $$(vboxmouse_drv_14_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_14_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
- OTHERS += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run
-$$(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run: $$(vboxmouse_drv_15_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_15_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
- OTHERS += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run
-$$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(vboxmouse_drv_16_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
-ifneq ($(KBUILD_TARGET), linux)
-
- TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
- OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run
-$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_17_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
- OTHERS += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run
-$$(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run: $$(vboxmouse_drv_18_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_18_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
- OTHERS += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run
-$$(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run: $$(vboxmouse_drv_19_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_19_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run
- OTHERS += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run
-$$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run: $$(vboxmouse_drv_110_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_110_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run
- OTHERS += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run
-$$(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run: $$(vboxmouse_drv_111_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_111_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
- TESTING += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run
- OTHERS += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run
-$$(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run: $$(vboxmouse_drv_112_1_STAGE_TARGET)
- $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
- $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \
- $(vboxmouse_drv_112_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
- $(QUIET)$(APPEND) -t "$@" "done"
-
-endif # neq ($(KBUILD_TARGET),linux)
+##
+# Using the extra expansion to replace $(ver) before eval, thus everything
+# else needs escaped dollars.
+ define def_vboxmouse_test
+ TESTING += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run
+ OTHERS += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run
+ $$$$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run: $$$$(vboxmouse_drv$(ver)_1_STAGE_TARGET)
+ $$(QUIET)$$(call MSG_L1,Checking for unresolved symbols in $$<)
+ $$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST) \
+ $$(vboxmouse_drv$(ver)_1_STAGE_TARGET) $$(VBOXMOUSE_SRC_PATH)/undefined $$(VBOXMOUSE_SRC_PATH)/undefined_extra
+ $$(QUIET)$$(APPEND) -t "$$@" "done"
+ endef
+
+ $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test)))
+
+ ifneq ($(KBUILD_TARGET), linux)
+ $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test)))
+
+ endif # neq ($(KBUILD_TARGET),linux)
endif # ! VBOX_ONLY_SDK
endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxmouse/undefined b/src/VBox/Additions/x11/vboxmouse/undefined
index 8f1dfdf3..864f0a00 100644
--- a/src/VBox/Additions/x11/vboxmouse/undefined
+++ b/src/VBox/Additions/x11/vboxmouse/undefined
@@ -7,33 +7,19 @@ InitPtrFeedbackClassDeviceStruct
InitValuatorClassDeviceStruct
VErrorF
Xalloc
-_ITM_registerTMCloneTable
-_ITM_deregisterTMCloneTable
-_Jv_RegisterClasses
-___errno
-__cxa_finalize
-__deregister_frame_info_bases
-__divdi3
-__errno_location
-__fxstat64
-__gmon_start__
-__iob
-__moddi3
-__register_frame_info_bases
-__stack_chk_fail
-__udivdi3
-__umoddi3
-__xstat64
+Xfree
calloc
chdir
chmod
chown
close
fchmod
+fchown
fcntl
fflush
flock
fprintf
+__fprintf_chk
fputs
free
fstat
@@ -41,6 +27,7 @@ fsync
ftruncate
ftruncate64
futimes
+fwrite
getcwd
getenv
geteuid
@@ -53,11 +40,11 @@ lchown
lseek
lseek64
malloc
-nanosleep
memalign
memchr
memcmp
memcpy
+__memcpy_chk
memmove
memset
miPointerCurrentScreen
@@ -67,15 +54,19 @@ miPointerGetScreen
mmap64
mprotect
munmap
+nanosleep
nl_langinfo
open
open64
posix_memalign
+pthread_self
pthread_sigmask
+pthread_yield
putenv
read
realloc
realpath
+__realpath_chk
rename
screenInfo
setenv
@@ -95,6 +86,8 @@ tolower
unlink
unsetenv
utimes
+vfprintf
+__vfprintf_chk
write
xf86AddEnabledDevice
xf86AddInputDriver
@@ -111,7 +104,11 @@ xf86RemoveEnabledDevice
xf86ScaleAxis
xf86SetIntOption
xf86SetStrOption
+xf86close
xf86errno
+xf86ioctl
xf86isspace
+xf86open
+xf86read
xf86strtoul
xf86vsnprintf
diff --git a/src/VBox/Additions/x11/vboxmouse/undefined_extra b/src/VBox/Additions/x11/vboxmouse/undefined_extra
new file mode 100644
index 00000000..72c99ca8
--- /dev/null
+++ b/src/VBox/Additions/x11/vboxmouse/undefined_extra
@@ -0,0 +1,18 @@
+_ITM_deregisterTMCloneTable
+_ITM_registerTMCloneTable
+_Jv_RegisterClasses
+___errno
+__cxa_finalize
+__deregister_frame_info_bases
+__divdi3
+__errno_location
+__fxstat64
+__gmon_start__
+__iob
+__lxstat64
+__moddi3
+__register_frame_info_bases
+__stack_chk_fail
+__udivdi3
+__umoddi3
+__xstat64
diff --git a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c
index 85c9706f..def915f4 100644
--- a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c
+++ b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c
@@ -3,7 +3,7 @@
*/
/*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
*
* This file is part of VirtualBox Open Source Edition (OSE), as
* available from http://www.virtualbox.org. This file is free software;
@@ -69,7 +69,7 @@ VBoxReadInput(InputInfoPtr pInfo)
/* Read a byte from the device to acknowledge the event */
char c;
- read(pInfo->fd, &c, 1);
+ (void) read(pInfo->fd, &c, 1);
/* The first test here is a workaround for an apparent bug in Xorg Server 1.5 */
if (
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 2
@@ -116,7 +116,7 @@ VBoxInit(DeviceIntPtr device)
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
VBoxPtrCtrlProc, GetMotionHistorySize(),
- 2 /* Number of axes */
+ 2 /* Number of axes */
#else
# error Unsupported version of X.Org
#endif
View Lorry Controller Status