Changeset 4155 in vbox for trunk/src/VBox/Additions/common
- Timestamp:
- Aug 15, 2007 7:41:26 PM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp
r4119 r4155 25 25 #if !defined(RT_OS_WINDOWS) && !defined(RT_OS_LINUX) 26 26 #include <iprt/memobj.h> 27 #endif 27 #endif 28 28 29 29 … … 31 31 { 32 32 int rc = VINF_SUCCESS; 33 33 34 34 #ifdef RT_OS_WINDOWS 35 35 PMDL pMdl = IoAllocateMdl (pv, u32Size, FALSE, FALSE, NULL); … … 47 47 KernelMode, 48 48 (fWriteAccess) ? IoModifyAccess : IoReadAccess); 49 49 50 50 *ppvCtx = pMdl; 51 51 … … 66 66 /* Default to IPRT - this ASSUMES that it is USER addresses we're locking. */ 67 67 RTR0MEMOBJ MemObj; 68 rc = RTR0MemObjLockUser(&MemObj, pv, u32Size, NIL_RTR0PROCESS);68 rc = RTR0MemObjLockUser(&MemObj, (RTR3PTR)pv, u32Size, NIL_RTR0PROCESS); 69 69 if (RT_SUCCESS(rc)) 70 70 *ppvCtx = MemObj; … … 73 73 74 74 #endif 75 75 76 76 return rc; 77 77 } … … 123 123 #ifdef RT_OS_OS2 124 124 __BEGIN_DECLS 125 /* 126 * On OS/2 we'll do the connecting in the assembly code of the 125 /* 126 * On OS/2 we'll do the connecting in the assembly code of the 127 127 * client driver, exporting a g_VBoxGuestIDC symbol containing 128 128 * the connection information obtained from the 16-bit IDC. … … 130 130 extern VBOXGUESTOS2IDCCONNECT g_VBoxGuestIDC; 131 131 __END_DECLS 132 #endif 132 #endif 133 133 134 134 … … 168 168 169 169 #elif defined (RT_OS_OS2) 170 /* 170 /* 171 171 * Just check whether the connection was made or not. 172 172 */ … … 221 221 NULL); 222 222 223 rc = ioStatusBlock.Status; 224 } 223 rc = ioStatusBlock.Status; 224 } 225 225 226 226 if (!NT_SUCCESS(rc)) … … 233 233 234 234 #elif defined (RT_OS_OS2) 235 if ( pDriver->u32Session 235 if ( pDriver->u32Session 236 236 && pDriver->u32Session == g_VBoxGuestIDC.u32Session) 237 237 return g_VBoxGuestIDC.pfnServiceEP(pDriver->u32Session, u32Function, pvData, cbData, NULL);
Note:
See TracChangeset
for help on using the changeset viewer.