Changeset 93378 in vbox for trunk/src/VBox

Timestamp:

Jan 20, 2022 6:35:50 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Linux: scm fixes, bugref:10134.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• display-drm.cpp (modified) (1 diff)
• display-helper-generic.cpp (modified) (2 diffs)
• display-helper-gnome3.cpp (modified) (18 diffs)
• display-svga-session.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-drm.cpp

@@ -773 +773 @@
  * @interface_method_impl{VBOX_DRMIPC_CLIENT,pfnRxCb}
  */
-static int vbDrmIpcClientRxCallBack(uint8_t idCmd, void *pvData, uint32_t cbData)
+static DECLCALLBACK(int) vbDrmIpcClientRxCallBack(uint8_t idCmd, void *pvData, uint32_t cbData)
 {
     int rc = VERR_INVALID_PARAMETER;

trunk/src/VBox/Additions/x11/VBoxClient/display-helper-generic.cpp

@@ -315 +315 @@
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnSetPrimaryDisplay}
  */
-static int vbcl_hlp_generic_set_primary_display(uint32_t idDisplay)
+static DECLCALLBACK(int) vbcl_hlp_generic_set_primary_display(uint32_t idDisplay)
 {
     XRRScreenResources *pScreenResources;
@@ -353 +353 @@
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnProbe}
  */
-static int vbcl_hlp_generic_probe(void)
+static DECLCALLBACK(int) vbcl_hlp_generic_probe(void)
 {
     /* Generic helper always supposed to return positive status on probe(). This

trunk/src/VBox/Additions/x11/VBoxClient/display-helper-gnome3.cpp

@@ -90 +90 @@
  * @param   type    D-bus data type.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_verify_data_type(DBusMessageIter *iter, int type)
+static dbus_bool_t vbcl_hlp_gnome3_verify_data_type(DBusMessageIter *iter, int type)
 {
     if (!iter)
@@ -109 +108 @@
  * @param   signature   Expected iterator signature.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_check_iter_signature(DBusMessageIter *iter, const char *signature)
+static dbus_bool_t vbcl_hlp_gnome3_check_iter_signature(DBusMessageIter *iter, const char *signature)
 {
     char        *iter_signature;
@@ -141 +139 @@
  * @param   signature   Expected message signature.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_check_message_signature(DBusMessage *message, const char *signature)
+static dbus_bool_t vbcl_hlp_gnome3_check_message_signature(DBusMessage *message, const char *signature)
 {
     char *message_signature;
@@ -171 +168 @@
  * @param   array   Returned sub-iterator.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_iter_get_array(DBusMessageIter *iter, DBusMessageIter *array)
+static dbus_bool_t vbcl_hlp_gnome3_iter_get_array(DBusMessageIter *iter, DBusMessageIter *array)
 {
     if (!iter || !array)
@@ -202 +198 @@
  * @param   value   Returned value.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_iter_get_basic(DBusMessageIter *iter, int type, void *value)
+static dbus_bool_t vbcl_hlp_gnome3_iter_get_basic(DBusMessageIter *iter, int type, void *value)
 {
     if (!iter || !value)
@@ -235 +230 @@
  * @param   value       Returning value.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_lookup_dict(DBusMessageIter *dict, const char *key_match, int type, void *value)
+static dbus_bool_t vbcl_hlp_gnome3_lookup_dict(DBusMessageIter *dict, const char *key_match, int type, void *value)
 {
     dbus_bool_t found = false;
@@ -293 +287 @@
  * @param   modes   List of monitor modes.
  */
-static char *
-vbcl_hlp_gnome3_lookup_monitor_current_mode(DBusMessageIter *modes)
+static char *vbcl_hlp_gnome3_lookup_monitor_current_mode(DBusMessageIter *modes)
 {
     char            *szCurrentMode = NULL;
@@ -357 +350 @@
  * @param   physical_monitor_properties     A D-bus dictionary containing monitor properties (out).
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_parse_physical_monitor_record(
+static dbus_bool_t vbcl_hlp_gnome3_parse_physical_monitor_record(
     DBusMessageIter *physical_monitors_in,
     char **connector,
@@ -428 +420 @@
  * @param   properties              List of monitor properties (out).
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_parse_logical_monitor_record(
+static dbus_bool_t vbcl_hlp_gnome3_parse_logical_monitor_record(
     DBusMessageIter *logical_monitors_in,
     int32_t *x,
@@ -486 +477 @@
  * @param   cPhysicalMonitors       Actual number of physical displays parsed.
  */
-static dbus_bool_t
-vbcl_hlp_gnome3_get_physical_monitors_state(
+static dbus_bool_t vbcl_hlp_gnome3_get_physical_monitors_state(
     DBusMessageIter *physical_monitors_in,
     vbcl_hlp_gnome3_physical_display_state *state,
@@ -554 +544 @@
  * @param   cPhysicalMonitors   Number of elements in array.
  */
-static void
-vbcl_hlp_gnome3_free_physical_monitors_state(
+static void vbcl_hlp_gnome3_free_physical_monitors_state(
     vbcl_hlp_gnome3_physical_display_state *state,
     uint32_t cPhysicalMonitors)
@@ -584 +573 @@
  * @param   idPrimaryDisplay        ID (number) of display which is requested to be set as primary.
  */
-static int
-vbcl_hlp_gnome3_convert_and_apply_display_settings(
+static int vbcl_hlp_gnome3_convert_and_apply_display_settings(
     DBusConnection *connection,
     uint32_t serial,
@@ -782 +770 @@
  * @param   reply               Reply message of GetCurrentState call.
  */
-static int
-vbcl_hlp_gnome3_process_current_display_layout(
+static int vbcl_hlp_gnome3_process_current_display_layout(
     DBusConnection *connection, uint32_t idPrimaryDisplay, DBusMessage *reply)
 {
@@ -853 +840 @@
  * @param   idPrimaryDisplay    A display ID which is requested to be set as primary.
  */
-static int
-vbcl_hlp_gnome3_set_primary_display(uint32_t idPrimaryDisplay)
+static DECLCALLBACK(int) vbcl_hlp_gnome3_set_primary_display(uint32_t idPrimaryDisplay)
 {
     int rc = VERR_GENERAL_FAILURE;
@@ -919 +905 @@
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnProbe}
  */
-static int
-vbcl_hlp_gnome3_probe(void)
+static DECLCALLBACK(int) vbcl_hlp_gnome3_probe(void)
 {
     const char *pszCurrentDesktop = RTEnvGet(VBCL_HLP_ENV_XDG_CURRENT_DESKTOP);
@@ -938 +923 @@
  * @returns True if Wayland has been detected, False otherwise.
  */
-static bool
-vbcl_hlp_gnome3_has_wayland(void)
+static bool vbcl_hlp_gnome3_has_wayland(void)
 {
     return RTEnvGet(VBCL_HLP_ENV_WAYLAND_DISPLAY) != NULL;
@@ -947 +931 @@
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnInit}
  */
-static int
-vbcl_hlp_gnome3_init(void)
+static DECLCALLBACK(int) vbcl_hlp_gnome3_init(void)
 {
     int rc;
@@ -964 +947 @@
  * @interface_method_impl{VBCLDISPLAYHELPER,pfnTerm}
  */
-static int
-vbcl_hlp_gnome3_term(void)
+static DECLCALLBACK(int) vbcl_hlp_gnome3_term(void)
 {
     int rc;

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-session.cpp

@@ -90 +90 @@
  * @param   pDisplays   Display data.
  */
-static int vbclSVGASessionDisplayOffsetChanged(uint32_t cOffsets, RTPOINT *paOffsets)
+static DECLCALLBACK(int) vbclSVGASessionDisplayOffsetChanged(uint32_t cOffsets, RTPOINT *paOffsets)
 {
     int rc = RTCritSectEnter(&g_hClientCritSect);
@@ -291 +291 @@
  * @param   cbData  Size of DRM IPC command payload.
  */
-static int vbclSVGASessionRxCallBack(uint8_t idCmd, void *pvData, uint32_t cbData)
+static DECLCALLBACK(int) vbclSVGASessionRxCallBack(uint8_t idCmd, void *pvData, uint32_t cbData)
 {
     VBOXDRMIPCCLTCMD enmCmd =