- Timestamp:
- Mar 31, 2014 6:43:49 PM (11 years ago)
- Location:
- trunk/src/VBox/HostServices/SharedOpenGL/crserverlib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h ¶
r50921 r50937 44 44 45 45 #define VBOXCRHGSMI_CMD_COMPLETE(_pData, _rc) do { \ 46 Assert(CRVBOXHGSMI_CMDDATA_IS_HGSMICMD(_pData)); \47 46 CRVBOXHGSMI_CMDDATA_ASSERT_ISSET(_pData); \ 48 47 CRVBOXHGSMI_CMDDATA_RC(_pData, _rc); \ 49 crServerCrHgsmiCmdComplete((_pData)->pHgsmiCmd, VINF_SUCCESS); \ 48 if (CRVBOXHGSMI_CMDDATA_IS_HGSMICMD(_pData)) { \ 49 Assert(CRVBOXHGSMI_CMDDATA_IS_HGSMICMD(_pData)); \ 50 crServerCrHgsmiCmdComplete((_pData)->pHgsmiCmd, VINF_SUCCESS); \ 51 } \ 50 52 } while (0) 51 53 52 54 #define VBOXCRHGSMI_CMD_CHECK_COMPLETE(_pData, _rc) do { \ 53 if (CRVBOXHGSMI_CMDDATA_IS_ HGSMICMD(_pData)) {\55 if (CRVBOXHGSMI_CMDDATA_IS_SET(_pData)) {\ 54 56 VBOXCRHGSMI_CMD_COMPLETE(_pData, _rc); \ 55 57 } \ -
TabularUnified trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c ¶
r50921 r50937 677 677 } 678 678 679 static int32_tcrVBoxServerInternalClientWriteRead(CRClient *pClient)679 static void crVBoxServerInternalClientWriteRead(CRClient *pClient) 680 680 { 681 681 #ifdef VBOXCR_LOGFPS … … 756 756 #endif 757 757 /*crDebug("<=crServer: ClientWrite u32ClientID=%d", u32ClientID);*/ 758 759 return VINF_SUCCESS;760 758 } 761 759 … … 781 779 #endif 782 780 783 return crVBoxServerInternalClientWriteRead(pClient); 781 crVBoxServerInternalClientWriteRead(pClient); 782 783 return VINF_SUCCESS; 784 784 } 785 785 … … 3100 3100 pClient->conn->cbBuffer = cbBuffer; 3101 3101 CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, false); 3102 rc =crVBoxServerInternalClientWriteRead(pClient);3102 crVBoxServerInternalClientWriteRead(pClient); 3103 3103 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3104 if (RT_FAILURE(rc)) 3105 { 3106 WARN(("crVBoxServerInternalClientWriteRead failed %d", rc)); 3107 break; 3108 } 3109 break; 3104 return VINF_SUCCESS; 3110 3105 } 3111 3106 … … 3117 3112 case SHCRGL_GUEST_FN_INJECT: 3118 3113 { 3119 Log(("svcCall: SHCRGL_GUEST_FN_INJECT\n"));3114 WARN(("svcCall: SHCRGL_GUEST_FN_INJECT\n")); 3120 3115 3121 3116 /* @todo: Verify */ … … 3158 3153 pClient->conn->cbBuffer = cbBuffer; 3159 3154 CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, false); 3160 rc =crVBoxServerInternalClientWriteRead(pClient);3155 crVBoxServerInternalClientWriteRead(pClient); 3161 3156 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3162 if (RT_FAILURE(rc)) 3163 { 3164 WARN(("crVBoxServerInternalClientWriteRead failed %d", rc)); 3165 break; 3166 } 3167 3168 break; 3157 return VINF_SUCCESS; 3169 3158 } 3170 3159 … … 3287 3276 pClient->conn->cbBuffer = cbBuffer; 3288 3277 CRVBOXHGSMI_CMDDATA_SETWB(&pClient->conn->CmdData, pCmd, pHdr, pWriteback, cbWriteback, &pFnCmd->cbWriteback, false); 3289 rc =crVBoxServerInternalClientWriteRead(pClient);3278 crVBoxServerInternalClientWriteRead(pClient); 3290 3279 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3291 3292 if (RT_FAILURE(rc)) 3293 { 3294 WARN(("crVBoxServerInternalClientWriteRead failed %d", rc)); 3295 break; 3296 } 3297 3298 break; 3280 return VINF_SUCCESS; 3299 3281 } 3300 3282 … … 3654 3636 pClient->conn->cbBuffer = cbBuffer; 3655 3637 CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, true); 3656 rc =crVBoxServerInternalClientWriteRead(pClient);3638 crVBoxServerInternalClientWriteRead(pClient); 3657 3639 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3658 return rc;3640 return VINF_SUCCESS; 3659 3641 } 3660 3642 else … … 3709 3691 pClient->conn->cbBuffer = cbBuffer; 3710 3692 CRVBOXHGSMI_CMDDATA_SET(&pClient->conn->CmdData, pCmd, pHdr, true); 3711 rc =crVBoxServerInternalClientWriteRead(pClient);3693 crVBoxServerInternalClientWriteRead(pClient); 3712 3694 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3713 return rc;3695 return VINF_SUCCESS; 3714 3696 } 3715 3697 … … 3830 3812 pClient->conn->cbBuffer = cbBuffer; 3831 3813 CRVBOXHGSMI_CMDDATA_SETWB(&pClient->conn->CmdData, pCmd, pHdr, pWriteback, cbWriteback, &pFnCmd->cbWriteback, true); 3832 rc =crVBoxServerInternalClientWriteRead(pClient);3814 crVBoxServerInternalClientWriteRead(pClient); 3833 3815 CRVBOXHGSMI_CMDDATA_ASSERT_CLEANED(&pClient->conn->CmdData); 3834 return rc;3816 return VINF_SUCCESS; 3835 3817 } 3836 3818
Note:
See TracChangeset
for help on using the changeset viewer.