VirtualBox

Changeset 106466 in vbox for trunk/src/VBox/Additions/WINNT


Ignore:
Timestamp:
Oct 18, 2024 7:03:23 AM (4 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
165292
Message:

Additions/VBoxTray: More cleanup (renaming). ​bugref:10763

Location:
trunk/src/VBox/Additions/WINNT/VBoxTray
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

    r106449 r106466  
    926926 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    927927 */
    928 DECLCALLBACK(int) vbtrShClInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     928DECLCALLBACK(int) vbtrShClInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    929929{
    930930    LogFlowFuncEnter();
    … …  
    980980        if (RT_SUCCESS(rc))
    981981        {
    982             *ppInstance = pCtx;
     982            *ppvInstance = pCtx;
    983983        }
    984984        else
    … …  
    996996 * @interface_method_impl{VBOXTRAYSVCDESC,pfnWorker}
    997997 */
    998 DECLCALLBACK(int) vbtrShClWorker(void *pInstance, bool volatile *pfShutdown)
    999 {
    1000     AssertPtr(pInstance);
    1001     LogFlowFunc(("pInstance=%p\n", pInstance));
     998DECLCALLBACK(int) vbtrShClWorker(void *pvInstance, bool volatile *pfShutdown)
     999{
     1000    AssertPtr(pvInstance);
     1001    LogFlowFunc(("pvInstance=%p\n", pvInstance));
    10021002
    10031003    /*
    … …  
    10071007    RTThreadUserSignal(RTThreadSelf());
    10081008
    1009     const PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pInstance;
     1009    const PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pvInstance;
    10101010    AssertPtr(pCtx);
    10111011
    … …  
    11681168 * @interface_method_impl{VBOXTRAYSVCDESC,pfnStop}
    11691169 */
    1170 DECLCALLBACK(int) vbtrShClStop(void *pInstance)
    1171 {
    1172     AssertPtrReturn(pInstance, VERR_INVALID_POINTER);
    1173 
    1174     LogFunc(("Stopping pInstance=%p\n", pInstance));
    1175 
    1176     PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pInstance;
     1170DECLCALLBACK(int) vbtrShClStop(void *pvInstance)
     1171{
     1172    AssertPtrReturn(pvInstance, VERR_INVALID_POINTER);
     1173
     1174    LogFunc(("Stopping pvInstance=%p\n", pvInstance));
     1175
     1176    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pvInstance;
    11771177    AssertPtr(pCtx);
    11781178
    … …  
    11951195 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    11961196 */
    1197 DECLCALLBACK(void) vbtrShClDestroy(void *pInstance)
    1198 {
    1199     AssertPtrReturnVoid(pInstance);
    1200 
    1201     PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pInstance;
     1197DECLCALLBACK(void) vbtrShClDestroy(void *pvInstance)
     1198{
     1199    AssertPtrReturnVoid(pvInstance);
     1200
     1201    PSHCLCONTEXT pCtx = (PSHCLCONTEXT)pvInstance;
    12021202    AssertPtrReturnVoid(pCtx);
    12031203

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp

    r106452 r106466  
    104104 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    105105 */
    106 static DECLCALLBACK(int) vbtrDisplayInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     106static DECLCALLBACK(int) vbtrDisplayInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    107107{
    108108    LogFlowFuncEnter();
    109109
    110     PVBOXDISPLAYCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     110    PVBOXDISPLAYCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    111111    AssertPtr(pCtx);
    112112
    … …  
    188188            pCtx->fAnyX = TRUE;
    189189
    190         *ppInstance = pCtx;
     190        *ppvInstance = pCtx;
    191191    }
    192192
    … …  
    198198 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    199199 */
    200 static DECLCALLBACK(void) vbtrDisplayDestroy(void *pInstance)
    201 {
    202     RT_NOREF(pInstance);
     200static DECLCALLBACK(void) vbtrDisplayDestroy(void *pvInstance)
     201{
     202    RT_NOREF(pvInstance);
    203203    return;
    204204}

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

    r106449 r106466  
    17771777 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    17781778 */
    1779 DECLCALLBACK(int) vbtrDnDInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     1779DECLCALLBACK(int) vbtrDnDInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    17801780{
    17811781    AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
    1782     AssertPtrReturn(ppInstance, VERR_INVALID_POINTER);
     1782    AssertPtrReturn(ppvInstance, VERR_INVALID_POINTER);
    17831783
    17841784    LogFlowFuncEnter();
    … …  
    18591859    if (RT_SUCCESS(rc))
    18601860    {
    1861         *ppInstance = pCtx;
     1861        *ppvInstance = pCtx;
    18621862
    18631863        VBoxTrayInfo("DnD: Drag and drop service successfully started\n");
    … …  
    18731873 * @interface_method_impl{VBOXTRAYSVCDESC,pfnStop}
    18741874 */
    1875 DECLCALLBACK(int) vbtrDnDStop(void *pInstance)
    1876 {
    1877     AssertPtrReturn(pInstance, VERR_INVALID_POINTER);
    1878 
    1879     LogFunc(("Stopping pInstance=%p\n", pInstance));
    1880 
    1881     PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pInstance;
     1875DECLCALLBACK(int) vbtrDnDStop(void *pvInstance)
     1876{
     1877    AssertPtrReturn(pvInstance, VERR_INVALID_POINTER);
     1878
     1879    LogFunc(("Stopping pvInstance=%p\n", pvInstance));
     1880
     1881    PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pvInstance;
    18821882    AssertPtr(pCtx);
    18831883
    … …  
    18951895 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    18961896 */
    1897 DECLCALLBACK(void) vbtrDnDDestroy(void *pInstance)
    1898 {
    1899     AssertPtrReturnVoid(pInstance);
    1900 
    1901     LogFunc(("Destroying pInstance=%p\n", pInstance));
    1902 
    1903     PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pInstance;
     1897DECLCALLBACK(void) vbtrDnDDestroy(void *pvInstance)
     1898{
     1899    AssertPtrReturnVoid(pvInstance);
     1900
     1901    LogFunc(("Destroying pvInstance=%p\n", pvInstance));
     1902
     1903    PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pvInstance;
    19041904    AssertPtr(pCtx);
    19051905
    … …  
    19191919    }
    19201920
    1921     LogFunc(("Destroyed pInstance=%p\n", pInstance));
     1921    LogFunc(("Destroyed pvInstance=%p\n", pvInstance));
    19221922}
    19231923
    … …  
    19251925 * @interface_method_impl{VBOXTRAYSVCDESC,pfnWorker}
    19261926 */
    1927 DECLCALLBACK(int) vbtrDnDWorker(void *pInstance, bool volatile *pfShutdown)
    1928 {
    1929     AssertPtr(pInstance);
     1927DECLCALLBACK(int) vbtrDnDWorker(void *pvInstance, bool volatile *pfShutdown)
     1928{
     1929    AssertPtr(pvInstance);
    19301930    AssertPtr(pfShutdown);
    19311931
    1932     LogFlowFunc(("pInstance=%p\n", pInstance));
     1932    LogFlowFunc(("pvInstance=%p\n", pvInstance));
    19331933
    19341934    /*
    … …  
    19381938    RTThreadUserSignal(RTThreadSelf());
    19391939
    1940     PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pInstance;
     1940    PVBOXDNDCONTEXT pCtx = (PVBOXDNDCONTEXT)pvInstance;
    19411941    AssertPtr(pCtx);
    19421942

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.cpp

    r106449 r106466  
    225225 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    226226 */
    227 DECLCALLBACK(int) vbtrIPCInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     227DECLCALLBACK(int) vbtrIPCInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    228228{
    229229    AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
    230     AssertPtrReturn(ppInstance, VERR_INVALID_POINTER);
     230    AssertPtrReturn(ppvInstance, VERR_INVALID_POINTER);
    231231
    232232    LogFlowFuncEnter();
    … …  
    254254                RTListInit(&pCtx->SessionList);
    255255
    256                 *ppInstance = pCtx;
     256                *ppvInstance = pCtx;
    257257
    258258                /* GetLastInputInfo only is available starting at Windows 2000 -- might fail. */
    … …  
    275275 * @interface_method_impl{VBOXTRAYSVCDESC,pfnStop}
    276276 */
    277 DECLCALLBACK(void) VBoxIPCStop(void *pInstance)
     277DECLCALLBACK(void) VBoxIPCStop(void *pvInstance)
    278278{
    279279    /* Can be NULL if VBoxIPCInit failed. */
    280     if (!pInstance)
     280    if (!pvInstance)
    281281        return;
    282     AssertPtrReturnVoid(pInstance);
    283 
    284     LogFlowFunc(("Stopping pInstance=%p\n", pInstance));
     282    AssertPtrReturnVoid(pvInstance);
     283
     284    LogFlowFunc(("Stopping pvInstance=%p\n", pvInstance));
    285285
    286286    /* Shut down local IPC server. */
    287     PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pInstance;
     287    PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pvInstance;
    288288    AssertPtr(pCtx);
    289289
    … …  
    316316 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    317317 */
    318 DECLCALLBACK(void) vbtrIPCDestroy(void *pInstance)
    319 {
    320     AssertPtrReturnVoid(pInstance);
    321 
    322     LogFlowFunc(("Destroying pInstance=%p\n", pInstance));
    323 
    324     PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pInstance;
     318DECLCALLBACK(void) vbtrIPCDestroy(void *pvInstance)
     319{
     320    AssertPtrReturnVoid(pvInstance);
     321
     322    LogFlowFunc(("Destroying pvInstance=%p\n", pvInstance));
     323
     324    PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pvInstance;
    325325    AssertPtr(pCtx);
    326326
    … …  
    368368        rc = rc2;
    369369
    370     LogFlowFunc(("Destroyed pInstance=%p, rc=%Rrc\n",
    371              pInstance, rc));
     370    LogFlowFunc(("Destroyed pvInstance=%p, rc=%Rrc\n",
     371             pvInstance, rc));
    372372}
    373373
    … …  
    570570 * requests
    571571 */
    572 DECLCALLBACK(int) vbtrIPCWorker(void *pInstance, bool volatile *pfShutdown)
    573 {
    574     AssertPtr(pInstance);
    575     LogFlowFunc(("pInstance=%p\n", pInstance));
     572DECLCALLBACK(int) vbtrIPCWorker(void *pvInstance, bool volatile *pfShutdown)
     573{
     574    AssertPtr(pvInstance);
     575    LogFlowFunc(("pvInstance=%p\n", pvInstance));
    576576
    577577    LogFlowFuncEnter();
    … …  
    583583    RTThreadUserSignal(RTThreadSelf());
    584584
    585     PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pInstance;
     585    PVBOXIPCCONTEXT pCtx = (PVBOXIPCCONTEXT)pvInstance;
    586586    AssertPtr(pCtx);
    587587

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxIPC.h

    r106411 r106466  
    3434#endif
    3535
    36 int                vbtrIPCInit    (const VBOXTRAYSVCENV *pEnv, void **ppInstance, bool *pfStartThread);
    37 unsigned __stdcall vbtrIPCWorker  (void *pInstance);
    38 void               VBoxIPCStop    (const VBOXTRAYSVCENV *pEnv, void *pInstance);
    39 void               vbtrIPCDestroy (const VBOXTRAYSVCENV *pEnv, void *pInstance);
     36int                vbtrIPCInit    (const VBOXTRAYSVCENV *pEnv, void **ppvInstance, bool *pfStartThread);
     37unsigned __stdcall vbtrIPCWorker  (void *pvInstance);
     38void               VBoxIPCStop    (const VBOXTRAYSVCENV *pEnv, void *pvInstance);
     39void               vbtrIPCDestroy (const VBOXTRAYSVCENV *pEnv, void *pvInstance);
    4040
    4141#endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxIPC_h */

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxLA.cpp

    r106449 r106466  
    12311231 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    12321232 */
    1233 DECLCALLBACK(int) vbtrLAInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     1233DECLCALLBACK(int) vbtrLAInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    12341234{
    12351235    AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
    1236     AssertPtrReturn(ppInstance, VERR_INVALID_POINTER);
     1236    AssertPtrReturn(ppvInstance, VERR_INVALID_POINTER);
    12371237
    12381238    LogFlowFuncEnter();
    … …  
    12791279    *(void **)&pCtx->pfnProcessIdToSessionId = RTLdrGetSystemSymbol("kernel32.dll", "ProcessIdToSessionId");
    12801280
    1281     *ppInstance = pCtx;
     1281    *ppvInstance = pCtx;
    12821282    LogFlowFuncLeaveRC(VINF_SUCCESS);
    12831283    return VINF_SUCCESS;
    … …  
    12871287 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    12881288 */
    1289 DECLCALLBACK(void) vbtrLADestroy(void *pInstance)
    1290 {
    1291     AssertPtrReturnVoid(pInstance);
    1292 
    1293     LogFlowFunc(("Destroying pInstance=%p\n", pInstance));
    1294 
    1295     PVBOXLACONTEXT pCtx = (PVBOXLACONTEXT)pInstance;
     1289DECLCALLBACK(void) vbtrLADestroy(void *pvInstance)
     1290{
     1291    AssertPtrReturnVoid(pvInstance);
     1292
     1293    LogFlowFunc(("Destroying pvInstance=%p\n", pvInstance));
     1294
     1295    PVBOXLACONTEXT pCtx = (PVBOXLACONTEXT)pvInstance;
    12961296    AssertPtr(pCtx);
    12971297
    … …  
    13101310 * @interface_method_impl{VBOXTRAYSVCDESC,pfnWorker}
    13111311 */
    1312 DECLCALLBACK(int) vbtrLAWorker(void *pInstance, bool volatile *pfShutdown)
    1313 {
    1314     AssertPtr(pInstance);
    1315     LogFlowFunc(("pInstance=%p\n", pInstance));
     1312DECLCALLBACK(int) vbtrLAWorker(void *pvInstance, bool volatile *pfShutdown)
     1313{
     1314    AssertPtr(pvInstance);
     1315    LogFlowFunc(("pvInstance=%p\n", pvInstance));
    13161316
    13171317    /*
    … …  
    13211321    RTThreadUserSignal(RTThreadSelf());
    13221322
    1323     PVBOXLACONTEXT pCtx = (PVBOXLACONTEXT)pInstance;
     1323    PVBOXLACONTEXT pCtx = (PVBOXLACONTEXT)pvInstance;
    13241324
    13251325    /*

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxSeamless.cpp

    r106449 r106466  
    103103 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    104104 */
    105 static DECLCALLBACK(int) vbtrSeamlessInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     105static DECLCALLBACK(int) vbtrSeamlessInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    106106{
    107107    LogFlowFuncEnter();
    … …  
    137137                vboxSeamlessSetSupported(TRUE);
    138138
    139                 *ppInstance = pCtx;
     139                *ppvInstance = pCtx;
    140140            }
    141141            else
    … …  
    159159 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    160160 */
    161 static DECLCALLBACK(void) VBoxSeamlessDestroy(void *pInstance)
     161static DECLCALLBACK(void) VBoxSeamlessDestroy(void *pvInstance)
    162162{
    163163    LogFlowFuncEnter();
    164164
    165     if (!pInstance)
     165    if (!pvInstance)
    166166        return;
    167167
    168     PVBOXSEAMLESSCONTEXT pCtx = (PVBOXSEAMLESSCONTEXT)pInstance;
     168    PVBOXSEAMLESSCONTEXT pCtx = (PVBOXSEAMLESSCONTEXT)pvInstance;
    169169    AssertPtr(pCtx);
    170170
    … …  
    184184static void VBoxSeamlessInstallHook(void)
    185185{
    186     PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     186    PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    187187    AssertPtr(pCtx);
    188188
    … …  
    200200static void VBoxSeamlessRemoveHook(void)
    201201{
    202     PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     202    PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    203203    AssertPtr(pCtx);
    204204
    … …  
    220220void VBoxSeamlessEnable(void)
    221221{
    222     PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     222    PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    223223    AssertPtr(pCtx);
    224224
    … …  
    232232void VBoxSeamlessDisable(void)
    233233{
    234     PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     234    PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    235235    AssertPtr(pCtx);
    236236    NOREF(pCtx);
    … …  
    354354void VBoxSeamlessCheckWindows(bool fForce)
    355355{
    356     PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pInstance). */
     356    PVBOXSEAMLESSCONTEXT pCtx = &g_Ctx; /** @todo r=andy Use instance data via service lookup (add void *pvInstance). */
    357357    AssertPtr(pCtx);
    358358

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

    r106413 r106466  
    246246#endif
    247247
    248     int rc = pSvc->pDesc->pfnWorker(pSvc->pInstance, &pSvc->fShutdown);
     248    int rc = pSvc->pDesc->pfnWorker(pSvc->pvInstance, &pSvc->fShutdown);
    249249    ASMAtomicXchgBool(&pSvc->fShutdown, true);
    250250    RTThreadUserSignal(ThreadSelf);
    … …  
    301301
    302302        pSvc->hThread   = NIL_RTTHREAD;
    303         pSvc->pInstance = NULL;
     303        pSvc->pvInstance = NULL;
    304304        pSvc->fStarted  = false;
    305305        pSvc->fShutdown = false;
    … …  
    308308
    309309        if (pSvc->pDesc->pfnInit)
    310             rc2 = pSvc->pDesc->pfnInit(pEnv, &pSvc->pInstance);
     310            rc2 = pSvc->pDesc->pfnInit(pEnv, &pSvc->pvInstance);
    311311
    312312        if (RT_FAILURE(rc2))
    … …  
    355355                    VBoxTrayInfo("Failed to start thread for service '%s': %Rrc\n", rc2);
    356356                    if (pSvc->pDesc->pfnDestroy)
    357                         pSvc->pDesc->pfnDestroy(pSvc->pInstance);
     357                        pSvc->pDesc->pfnDestroy(pSvc->pvInstance);
    358358                }
    359359            }
    … …  
    400400        {
    401401            VBoxTrayVerbose(1, "Calling stop function for service '%s' ...\n", pSvc->pDesc->pszName);
    402             int rc2 = pSvc->pDesc->pfnStop(pSvc->pInstance);
     402            int rc2 = pSvc->pDesc->pfnStop(pSvc->pvInstance);
    403403            if (RT_FAILURE(rc2))
    404404                VBoxTrayError("Failed to stop service '%s': %Rrc\n", pSvc->pDesc->pszName, rc2);
    … …  
    438438
    439439        if (   pSvc->pDesc->pfnDestroy
    440             && pSvc->pInstance) /* pInstance might be NULL if initialization of a service failed. */
     440            && pSvc->pvInstance) /* pvInstance might be NULL if initialization of a service failed. */
    441441        {
    442442            VBoxTrayVerbose(1, "Terminating service '%s' ...\n", pSvc->pDesc->pszName);
    443             pSvc->pDesc->pfnDestroy(pSvc->pInstance);
     443            pSvc->pDesc->pfnDestroy(pSvc->pvInstance);
    444444        }
    445445    }

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.h

    r106411 r106466  
    135135     *          Returning any other error will be considered as a fatal error.
    136136     * @param   pEnv
    137      * @param   ppInstance      Where to return the thread-specific instance data.
     137     * @param   ppvInstance     Where to return the thread-specific instance data.
    138138     * @todo r=bird: The pEnv type is WRONG!  Please check all your const pointers.
    139139     */
    140     DECLCALLBACKMEMBER(int, pfnInit,(const PVBOXTRAYSVCENV pEnv, void **ppInstance));
     140    DECLCALLBACKMEMBER(int, pfnInit,(const PVBOXTRAYSVCENV pEnv, void **ppvInstance));
    141141
    142142    /** Called from the worker thread.
    … …  
    144144     * @returns VBox status code.
    145145     * @retval  VINF_SUCCESS if exitting because *pfShutdown was set.
    146      * @param   pInstance       Pointer to thread-specific instance data.
     146     * @param   pvInstance      Pointer to thread-specific instance data.
    147147     * @param   pfShutdown      Pointer to a per service termination flag to check
    148148     *                          before and after blocking.
    149149     */
    150     DECLCALLBACKMEMBER(int, pfnWorker,(void *pInstance, bool volatile *pfShutdown));
     150    DECLCALLBACKMEMBER(int, pfnWorker,(void *pvInstance, bool volatile *pfShutdown));
    151151
    152152    /**
    153153     * Stops a service.
    154      */
    155     DECLCALLBACKMEMBER(int, pfnStop,(void *pInstance));
     154     * @param   pvInstance      Pointer to thread-specific instance data.
     155     */
     156    DECLCALLBACKMEMBER(int, pfnStop,(void *pvInstance));
    156157
    157158    /**
    158159     * Does termination cleanups.
    159160     *
     161     * @param   pvInstance      Pointer to thread-specific instance data.
     162     *
    160163     * @remarks This may be called even if pfnInit hasn't been called!
    161164     */
    162     DECLCALLBACKMEMBER(void, pfnDestroy,(void *pInstance));
     165    DECLCALLBACKMEMBER(void, pfnDestroy,(void *pvInstance));
    163166} VBOXTRAYSVCDESC;
    164167/** Pointer to a VBoxTray service descriptor. */
    … …  
    176179    /** Pointer to service-specific instance data.
    177180     *  Must be free'd by the service itself. */
    178     void            *pInstance;
     181    void            *pvInstance;
    179182    /** Whether Pre-init was called. */
    180183    bool             fPreInited;

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.cpp

    r106449 r106466  
    300300 * @interface_method_impl{VBOXTRAYSVCDESC,pfnInit}
    301301 */
    302 static DECLCALLBACK(int) vbtrVRDPInit(const PVBOXTRAYSVCENV pEnv, void **ppInstance)
     302static DECLCALLBACK(int) vbtrVRDPInit(const PVBOXTRAYSVCENV pEnv, void **ppvInstance)
    303303{
    304304    AssertPtrReturn(pEnv, VERR_INVALID_POINTER);
    305     AssertPtrReturn(ppInstance, VERR_INVALID_POINTER);
     305    AssertPtrReturn(ppvInstance, VERR_INVALID_POINTER);
    306306
    307307    LogFlowFuncEnter();
    … …  
    320320        *(PFNRT *)&pCtx->pfnIsThemeActive = RTLdrGetFunction(g_Ctx.hModUxTheme, "IsThemeActive");
    321321
    322         *ppInstance = &g_Ctx;
     322        *ppvInstance = &g_Ctx;
    323323    }
    324324    else
    … …  
    340340 * @interface_method_impl{VBOXTRAYSVCDESC,pfnDestroy}
    341341 */
    342 static DECLCALLBACK(void) VBoxVRDPDestroy(void *pInstance)
    343 {
    344     AssertPtrReturnVoid(pInstance);
     342static DECLCALLBACK(void) VBoxVRDPDestroy(void *pvInstance)
     343{
     344    AssertPtrReturnVoid(pvInstance);
    345345
    346346    LogFlowFuncEnter();
    347347
    348     PVBOXVRDPCONTEXT pCtx = (PVBOXVRDPCONTEXT)pInstance;
     348    PVBOXVRDPCONTEXT pCtx = (PVBOXVRDPCONTEXT)pvInstance;
    349349
    350350    vboxExperienceRestore (pCtx->level);

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxVRDP.h

    r106411 r106466  
    3333
    3434/* The restore service prototypes. */
    35 int                VBoxVRDPInit    (const VBOXTRAYSVCENV *pEnv, void **ppInstance, bool *pfStartThread);
    36 unsigned __stdcall VBoxVRDPThread  (void *pInstance);
    37 void               VBoxVRDPDestroy (const VBOXTRAYSVCENV *pEnv, void *pInstance);
     35int                VBoxVRDPInit    (const VBOXTRAYSVCENV *pEnv, void **ppvInstance, bool *pfStartThread);
     36unsigned __stdcall VBoxVRDPThread  (void *pvInstance);
     37void               VBoxVRDPDestroy (const VBOXTRAYSVCENV *pEnv, void *pvInstance);
    3838
    3939#endif /* !GA_INCLUDED_SRC_WINNT_VBoxTray_VBoxVRDP_h */
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