Skip to content

Commit b2c65c4

Browse files
bird2toribird2tori
committed
VBoxClient: Eliminated the RTDECL non-sense. bugref:10194
svn:sync-xref-src-repo-rev: r174582
1 parent c5bd613 commit b2c65c4

11 files changed

Lines changed: 53 additions & 59 deletions

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: display-helper-generic.cpp 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $ */
1+
/* $Id: display-helper-generic.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Generic Desktop Environment helper.
44
*
@@ -371,7 +371,7 @@ static DECLCALLBACK(int) vbcl_hlp_generic_probe(void)
371371
return VINF_SUCCESS;
372372
}
373373

374-
RTDECL(int) vbcl_hlp_generic_init(void)
374+
int vbcl_hlp_generic_init(void)
375375
{
376376
ASMAtomicWriteBool(&g_fShutdown, false);
377377

@@ -382,7 +382,7 @@ RTDECL(int) vbcl_hlp_generic_init(void)
382382
return VINF_SUCCESS;
383383
}
384384

385-
RTDECL(int) vbcl_hlp_generic_term(void)
385+
int vbcl_hlp_generic_term(void)
386386
{
387387
int rc = VINF_SUCCESS;
388388

@@ -398,12 +398,12 @@ RTDECL(int) vbcl_hlp_generic_term(void)
398398
return rc;
399399
}
400400

401-
RTDECL(void) vbcl_hlp_generic_subscribe_display_offset_changed(FNDISPLAYOFFSETCHANGE *pfnCb)
401+
void vbcl_hlp_generic_subscribe_display_offset_changed(FNDISPLAYOFFSETCHANGE *pfnCb)
402402
{
403403
g_pfnDisplayOffsetChangeCb = pfnCb;
404404
}
405405

406-
RTDECL(void) vbcl_hlp_generic_unsubscribe_display_offset_changed(void)
406+
void vbcl_hlp_generic_unsubscribe_display_offset_changed(void)
407407
{
408408
g_pfnDisplayOffsetChangeCb = NULL;
409409
}

‎src/VBox/Additions/x11/VBoxClient/display-helper.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: display-helper.h 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $ */
1+
/* $Id: display-helper.h 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Definitions for Desktop Environment helpers.
44
*/
@@ -101,26 +101,26 @@ typedef struct
101101
*
102102
* @returns IPRT status code.
103103
*/
104-
RTDECL(int) vbcl_hlp_generic_init(void);
104+
int vbcl_hlp_generic_init(void);
105105

106106
/**
107107
* Termination callback for generic Desktop Environment helper.
108108
*
109109
* @returns IPRT status code.
110110
*/
111-
RTDECL(int) vbcl_hlp_generic_term(void);
111+
int vbcl_hlp_generic_term(void);
112112

113113
/**
114114
* Subscribe to display offset change notifications emitted by Generic Desktop Environment helper.
115115
*
116116
* @param pfnCb A pointer to callback function which will be triggered when event arrives.
117117
*/
118-
RTDECL(void) vbcl_hlp_generic_subscribe_display_offset_changed(FNDISPLAYOFFSETCHANGE *pfnCb);
118+
void vbcl_hlp_generic_subscribe_display_offset_changed(FNDISPLAYOFFSETCHANGE *pfnCb);
119119

120120
/**
121121
* Unsubscribe from display offset change notifications emitted by Generic Desktop Environment helper.
122122
*/
123-
RTDECL(void) vbcl_hlp_generic_unsubscribe_display_offset_changed(void);
123+
void vbcl_hlp_generic_unsubscribe_display_offset_changed(void);
124124

125125
/** GNOME3 helper private data. */
126126
extern const VBCLDISPLAYHELPER g_DisplayHelperGnome3;

‎src/VBox/Additions/x11/VBoxClient/display-ipc.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: display-ipc.cpp 114416 2026-06-17 23:01:21Z knut.osmundsen@oracle.com $ */
1+
/* $Id: display-ipc.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - DRM IPC communication core functions.
44
*/
@@ -80,8 +80,8 @@
8080
* @param cTxListCapacity Maximum number of messages which can be queued for TX for this IPC session.
8181
* @param pfnRxCb IPC RX callback function pointer.
8282
*/
83-
RTDECL(int) vbDrmIpcClientInit(PVBOX_DRMIPC_CLIENT pClient, RTTHREAD hThread, RTLOCALIPCSESSION hClientSession,
84-
uint32_t cTxListCapacity, PFNDRMIPCRXCB pfnRxCb)
83+
int vbDrmIpcClientInit(PVBOX_DRMIPC_CLIENT pClient, RTTHREAD hThread, RTLOCALIPCSESSION hClientSession,
84+
uint32_t cTxListCapacity, PFNDRMIPCRXCB pfnRxCb)
8585
{
8686
AssertReturn(pClient, VERR_INVALID_PARAMETER);
8787
AssertReturn(hThread, VERR_INVALID_PARAMETER);
@@ -109,7 +109,7 @@ RTDECL(int) vbDrmIpcClientInit(PVBOX_DRMIPC_CLIENT pClient, RTTHREAD hThread, RT
109109
* @return IPRT status code.
110110
* @param pClient IPC session private data to be initialized.
111111
*/
112-
RTDECL(int) vbDrmIpcClientReleaseResources(PVBOX_DRMIPC_CLIENT pClient)
112+
int vbDrmIpcClientReleaseResources(PVBOX_DRMIPC_CLIENT pClient)
113113
{
114114
pClient->hClientSession = NIL_RTLOCALIPCSESSION;
115115

@@ -215,7 +215,7 @@ static PVBOX_DRMIPC_TX_LIST_ENTRY vbDrmIpcSessionPickupTxMessage(PVBOX_DRMIPC_CL
215215
return pEntry;
216216
}
217217

218-
RTDECL(int) vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession)
218+
int vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession)
219219
{
220220
AssertReturn(hClientSession != NIL_RTLOCALIPCSESSION, VERR_INVALID_PARAMETER);
221221

@@ -247,7 +247,7 @@ RTDECL(int) vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession)
247247
return rc;
248248
}
249249

250-
RTDECL(int) vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDisplay)
250+
int vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDisplay)
251251
{
252252
int rc = VERR_GENERAL_FAILURE;
253253

@@ -293,7 +293,7 @@ RTDECL(int) vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDi
293293
* @param cDisplays Number of monitors which have offsets changed.
294294
* @param aDisplays Offsets data.
295295
*/
296-
RTDECL(int) vbDrmIpcReportDisplayOffsets(PVBOX_DRMIPC_CLIENT pClient, uint32_t cDisplays, struct VBOX_DRMIPC_VMWRECT *aDisplays)
296+
int vbDrmIpcReportDisplayOffsets(PVBOX_DRMIPC_CLIENT pClient, uint32_t cDisplays, struct VBOX_DRMIPC_VMWRECT *aDisplays)
297297
{
298298
int rc = VERR_GENERAL_FAILURE;
299299

@@ -340,7 +340,7 @@ RTDECL(int) vbDrmIpcReportDisplayOffsets(PVBOX_DRMIPC_CLIENT pClient, uint32_t c
340340
* @return IPRT status code.
341341
* @param pClient IPC connection private data.
342342
*/
343-
RTDECL(int) vbDrmIpcConnectionHandler(PVBOX_DRMIPC_CLIENT pClient)
343+
int vbDrmIpcConnectionHandler(PVBOX_DRMIPC_CLIENT pClient)
344344
{
345345
int rc;
346346
static uint8_t aInputBuf[VBOX_DRMIPC_RX_BUFFER_SIZE];

‎src/VBox/Additions/x11/VBoxClient/display-ipc.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: display-ipc.h 112403 2026-01-11 19:29:08Z knut.osmundsen@oracle.com $ */
1+
/* $Id: display-ipc.h 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - DRM IPC communication core function definitions.
44
*
@@ -191,16 +191,16 @@ typedef VBOX_DRMIPC_CLIENT *PVBOX_DRMIPC_CLIENT;
191191
* @param cTxListCapacity Maximum number of messages which can be queued for TX for this IPC session.
192192
* @param pfnRxCb IPC RX callback function pointer.
193193
*/
194-
RTDECL(int) vbDrmIpcClientInit(PVBOX_DRMIPC_CLIENT pClient, RTTHREAD hThread, RTLOCALIPCSESSION hClientSession,
195-
uint32_t cTxListCapacity, PFNDRMIPCRXCB pfnRxCb);
194+
int vbDrmIpcClientInit(PVBOX_DRMIPC_CLIENT pClient, RTTHREAD hThread, RTLOCALIPCSESSION hClientSession,
195+
uint32_t cTxListCapacity, PFNDRMIPCRXCB pfnRxCb);
196196

197197
/**
198198
* Releases IPC client private data resources.
199199
*
200200
* @return IPRT status code.
201201
* @param pClient IPC session private data to be initialized.
202202
*/
203-
RTDECL(int) vbDrmIpcClientReleaseResources(PVBOX_DRMIPC_CLIENT pClient);
203+
int vbDrmIpcClientReleaseResources(PVBOX_DRMIPC_CLIENT pClient);
204204

205205
/**
206206
* Verify if remote IPC peer corresponds to a process which is running
@@ -209,7 +209,7 @@ RTDECL(int) vbDrmIpcClientReleaseResources(PVBOX_DRMIPC_CLIENT pClient);
209209
* @return IPRT status code.
210210
* @param hClientSession IPC session handle.
211211
*/
212-
RTDECL(int) vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession);
212+
int vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession);
213213

214214
/**
215215
* Common function for both IPC server and client which is responsible
@@ -218,7 +218,7 @@ RTDECL(int) vbDrmIpcAuth(RTLOCALIPCSESSION hClientSession);
218218
* @return IPRT status code.
219219
* @param pClient IPC connection private data.
220220
*/
221-
RTDECL(int) vbDrmIpcConnectionHandler(PVBOX_DRMIPC_CLIENT pClient);
221+
int vbDrmIpcConnectionHandler(PVBOX_DRMIPC_CLIENT pClient);
222222

223223
/**
224224
* Request remote IPC peer to set primary display.
@@ -227,7 +227,7 @@ RTDECL(int) vbDrmIpcConnectionHandler(PVBOX_DRMIPC_CLIENT pClient);
227227
* @param pClient IPC session private data.
228228
* @param idDisplay ID of display to be set as primary.
229229
*/
230-
RTDECL(int) vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDisplay);
230+
int vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDisplay);
231231

232232
/**
233233
* Report to IPC server that display layout offsets have been changed (called by IPC client).
@@ -237,6 +237,6 @@ RTDECL(int) vbDrmIpcSetPrimaryDisplay(PVBOX_DRMIPC_CLIENT pClient, uint32_t idDi
237237
* @param cDisplays Number of monitors which have offsets changed.
238238
* @param aDisplays Offsets data.
239239
*/
240-
RTDECL(int) vbDrmIpcReportDisplayOffsets(PVBOX_DRMIPC_CLIENT pClient, uint32_t cDisplays, struct VBOX_DRMIPC_VMWRECT *aDisplays);
240+
int vbDrmIpcReportDisplayOffsets(PVBOX_DRMIPC_CLIENT pClient, uint32_t cDisplays, struct VBOX_DRMIPC_VMWRECT *aDisplays);
241241

242242
#endif /* !GA_INCLUDED_SRC_x11_VBoxClient_display_ipc_h */

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper-gtk.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-gtk.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Gtk helper for Wayland.
44
*
@@ -56,7 +56,7 @@ static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_probe(void)
5656
/**
5757
* @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnInit}
5858
*/
59-
RTDECL(int) vbcl_wayland_hlp_gtk_clip_init(void)
59+
int vbcl_wayland_hlp_gtk_clip_init(void)
6060
{
6161
VBCL_LOG_CALLBACK;
6262

@@ -66,7 +66,7 @@ RTDECL(int) vbcl_wayland_hlp_gtk_clip_init(void)
6666
/**
6767
* @interface_method_impl{VBCLWAYLANDHELPER_CLIPBOARD,pfnTerm}
6868
*/
69-
RTDECL(int) vbcl_wayland_hlp_gtk_clip_term(void)
69+
int vbcl_wayland_hlp_gtk_clip_term(void)
7070
{
7171
PSHCLCONTEXT const pShClCtx = &g_Ctx;
7272

@@ -121,7 +121,7 @@ static DECLCALLBACK(int) vbcl_wayland_hlp_gtk_clip_hg_report(PSHCLCONTEXT pCtx,
121121
/**
122122
* @interface_method_impl{VBCLWAYLANDHELPER_DND,pfnInit}
123123
*/
124-
RTDECL(int) vbcl_wayland_hlp_gtk_dnd_init(void)
124+
int vbcl_wayland_hlp_gtk_dnd_init(void)
125125
{
126126
VBCL_LOG_CALLBACK;
127127

@@ -131,7 +131,7 @@ RTDECL(int) vbcl_wayland_hlp_gtk_dnd_init(void)
131131
/**
132132
* @interface_method_impl{VBCLWAYLANDHELPER_DND,pfnTerm}
133133
*/
134-
RTDECL(int) vbcl_wayland_hlp_gtk_dnd_term(void)
134+
int vbcl_wayland_hlp_gtk_dnd_term(void)
135135
{
136136
VBCL_LOG_CALLBACK;
137137

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper-ipc.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-ipc.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - IPC between VBoxClient and vboxwl tool.
44
*
@@ -46,7 +46,7 @@
4646
#include "VBoxClient.h"
4747
#include "wayland-helper-ipc.h"
4848

49-
RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(const char *pszNamePrefix, char *pszBuf, size_t cbBuf)
49+
int vbcl_wayland_hlp_gtk_ipc_srv_name(const char *pszNamePrefix, char *pszBuf, size_t cbBuf)
5050
{
5151
/*
5252
* Validate and prep input.

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper-ipc.h 114495 2026-06-22 21:47:36Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-ipc.h 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Definitions for IPC between VBoxClient and vboxwl tool.
44
*/
@@ -461,7 +461,7 @@ namespace vbcl
461461
* @param pszBuf Where to store generated name string.
462462
* @param cbBuf Size of the buffer.
463463
*/
464-
RTDECL(int) vbcl_wayland_hlp_gtk_ipc_srv_name(const char *pszNamePrefix, char *pszBuf, size_t cbBuf);
464+
int vbcl_wayland_hlp_gtk_ipc_srv_name(const char *pszNamePrefix, char *pszBuf, size_t cbBuf);
465465

466466
#endif /* !GA_INCLUDED_SRC_x11_VBoxClient_wayland_helper_ipc_h */
467467

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-xdcp-common.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper-xdcp-common.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-xdcp-common.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Common code for Data Control Protocol (DCP) family helper for Wayland.
44
*
@@ -314,7 +314,7 @@ static int vbcl_wayland_hlp_dcp_write_wl_fd(int fd, void *pvBuf, size_t cbBuf)
314314
* @returns IPRT status code.
315315
* @param pCtx Context data.
316316
*/
317-
RTDECL(int) vbcl_wayland_xdcp_next_event(vbox_wl_xdcp_base_ctx_t *pCtx)
317+
int vbcl_wayland_xdcp_next_event(vbox_wl_xdcp_base_ctx_t *pCtx)
318318
{
319319
int rc = VINF_SUCCESS;
320320

@@ -380,7 +380,7 @@ static void vbcl_wayland_xdcp_session_init(vbox_wl_dcp_session_t *pSession)
380380
pSession->clip.fFmts.init(VBOX_SHCL_FMT_NONE, VBCL_WAYLAND_VALUE_WAIT_TIMEOUT_MS);
381381
}
382382

383-
RTDECL(void) vbcl_wayland_xdcp_session_prepare(vbox_wl_xdcp_base_ctx_t *pCtx)
383+
void vbcl_wayland_xdcp_session_prepare(vbox_wl_xdcp_base_ctx_t *pCtx)
384384
{
385385
AssertPtrReturnVoid(pCtx);
386386

‎src/VBox/Additions/x11/VBoxClient/wayland-helper-xdcp-common.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper-xdcp-common.h 114480 2026-06-22 12:04:59Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper-xdcp-common.h 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Definitions for Data Control protocols family helpers.
44
*/
@@ -175,14 +175,14 @@ struct vbcl_wl_dcp_enumerate_ctx
175175
* @returns IPRT status code.
176176
* @param pCtx Context data.
177177
*/
178-
RTDECL(int) vbcl_wayland_xdcp_next_event(vbox_wl_xdcp_base_ctx_t *pCtx);
178+
int vbcl_wayland_xdcp_next_event(vbox_wl_xdcp_base_ctx_t *pCtx);
179179

180180
/**
181181
* Reset previously initialized session.
182182
*
183183
* @param pCtx Context data.
184184
*/
185-
RTDECL(void) vbcl_wayland_xdcp_session_prepare(vbox_wl_xdcp_base_ctx_t *pCtx);
185+
void vbcl_wayland_xdcp_session_prepare(vbox_wl_xdcp_base_ctx_t *pCtx);
186186

187187
/**
188188
* Initializes the common context.

‎src/VBox/Additions/x11/VBoxClient/wayland-helper.cpp‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: wayland-helper.cpp 114743 2026-07-21 18:31:58Z knut.osmundsen@oracle.com $ */
1+
/* $Id: wayland-helper.cpp 114745 2026-07-21 18:40:35Z knut.osmundsen@oracle.com $ */
22
/** @file
33
* Guest Additions - Common code for Wayland Desktop Environment helpers.
44
*
@@ -165,7 +165,7 @@ static int vbclWaylandSessionWaitForState(vbcl_wl_session_state_t volatile *penm
165165

166166

167167

168-
RTDECL(void) vbcl_wayland_session_init(vbcl_wl_session_t *pSession)
168+
void vbcl_wayland_session_init(vbcl_wl_session_t *pSession)
169169
{
170170
AssertPtrReturnVoid(pSession);
171171

@@ -179,10 +179,8 @@ RTDECL(void) vbcl_wayland_session_init(vbcl_wl_session_t *pSession)
179179
ASMAtomicWriteU32(&pSession->cUsers, 0);
180180
}
181181

182-
RTDECL(int) vbcl_wayland_session_start(vbcl_wl_session_t *pSession,
183-
vbcl_wl_session_type_t enmType,
184-
PFNVBCLWLSESSIONCB pfnStart,
185-
void *pvUser)
182+
int vbcl_wayland_session_start(vbcl_wl_session_t *pSession, vbcl_wl_session_type_t enmType,
183+
PFNVBCLWLSESSIONCB pfnStart, void *pvUser)
186184
{
187185
int rc;
188186
const char *pcszDesc;
@@ -322,8 +320,7 @@ int VBClWaylandSessionJoinAnyTypeEx(vbcl_wl_session_t *pSession, PFNVBCLWLSESSIO
322320
return rc;
323321
}
324322

325-
RTDECL(int) vbcl_wayland_session_end(vbcl_wl_session_t *pSession,
326-
PFNVBCLWLSESSIONCB pfnEnd, void *pvUser)
323+
int vbcl_wayland_session_end(vbcl_wl_session_t *pSession, PFNVBCLWLSESSIONCB pfnEnd, void *pvUser)
327324
{
328325
int rc;
329326

@@ -382,7 +379,7 @@ RTDECL(int) vbcl_wayland_session_end(vbcl_wl_session_t *pSession,
382379
return rc;
383380
}
384381

385-
RTDECL(bool) vbcl_wayland_session_is_started(vbcl_wl_session_t *pSession)
382+
bool vbcl_wayland_session_is_started(vbcl_wl_session_t *pSession)
386383
{
387384
/* Make sure mandatory parameters were provided. */
388385
AssertPtrReturn(pSession, false);

0 commit comments

Comments
 (0)