Changeset 14944 in vbox for trunk/src/VBox/Main/glue
- Timestamp:
- Dec 3, 2008 2:09:42 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/glue/initterm.cpp
r14325 r14944 75 75 DirectoryServiceProvider() 76 76 : mCompRegLocation (NULL), mXPTIDatLocation (NULL) 77 77 , mComponentDirLocation (NULL), mCurrProcDirLocation (NULL) 78 78 {} 79 79 … … 82 82 HRESULT init (const char *aCompRegLocation, 83 83 const char *aXPTIDatLocation, 84 85 84 const char *aComponentDirLocation, 85 const char *aCurrProcDirLocation); 86 86 87 87 NS_DECL_NSIDIRECTORYSERVICEPROVIDER … … 128 128 DirectoryServiceProvider::init (const char *aCompRegLocation, 129 129 const char *aXPTIDatLocation, 130 131 130 const char *aComponentDirLocation, 131 const char *aCurrProcDirLocation) 132 132 { 133 133 AssertReturn (aCompRegLocation, NS_ERROR_INVALID_ARG); … … 140 140 vrc = RTStrUtf8ToCurrentCP (&mComponentDirLocation, aComponentDirLocation); 141 141 if (RT_SUCCESS (vrc) && aCurrProcDirLocation) 142 142 vrc = RTStrUtf8ToCurrentCP (&mCurrProcDirLocation, aCurrProcDirLocation); 143 143 144 144 return RT_SUCCESS (vrc) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; … … 163 163 fileLocation = mXPTIDatLocation; 164 164 else if (mComponentDirLocation && strcmp (aProp, NS_XPCOM_COMPONENT_DIR) == 0) 165 165 fileLocation = mComponentDirLocation; 166 166 else if (mCurrProcDirLocation && strcmp (aProp, NS_XPCOM_CURRENT_PROCESS_DIR) == 0) 167 167 fileLocation = mCurrProcDirLocation; 168 168 else 169 169 return NS_ERROR_FAILURE;
Note:
See TracChangeset
for help on using the changeset viewer.