Changeset 18821 in vbox
- Timestamp:
- Apr 7, 2009 1:19:58 PM (16 years ago)
- svn:sync-xref-src-repo-rev:
- 45824
- Location:
- trunk/src/VBox/Main/cbinding
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/cbinding/tstXPCOMCCall.c
r18806 r18821 33 33 static char *nsIDToString(nsID *guid); 34 34 static void listVMs(IVirtualBox *virtualBox, ISession *session); 35 static void startVM(IVirtualBox *virtualBox, ISession *session, nsID *id);36 35 37 36 int volatile g_refcount = 0; … … 82 81 83 82 static nsresult OnMousePointerShapeChange( 84 IConsoleCallback * this_,83 IConsoleCallback *pThis, 85 84 PRBool visible, 86 85 PRBool alpha, … … 96 95 97 96 static nsresult OnMouseCapabilityChange( 98 IConsoleCallback * this_,97 IConsoleCallback *pThis, 99 98 PRBool supportsAbsolute, 100 99 PRBool needsHostCursor … … 105 104 106 105 static nsresult OnKeyboardLedsChange( 107 IConsoleCallback * this_,106 IConsoleCallback *pThis, 108 107 PRBool numLock, 109 108 PRBool capsLock, … … 115 114 116 115 static nsresult OnStateChange( 117 IConsoleCallback * this_,116 IConsoleCallback *pThis, 118 117 PRUint32 state 119 118 ) { … … 124 123 } 125 124 126 static nsresult OnAdditionsStateChange(IConsoleCallback * this_)127 { 128 printf("%d here\n",__LINE__); 129 return 0; 130 } 131 132 static nsresult OnDVDDriveChange(IConsoleCallback * this_)133 { 134 printf("%d here\n",__LINE__); 135 return 0; 136 } 137 138 static nsresult OnFloppyDriveChange(IConsoleCallback * this_)125 static nsresult OnAdditionsStateChange(IConsoleCallback *pThis ) 126 { 127 printf("%d here\n",__LINE__); 128 return 0; 129 } 130 131 static nsresult OnDVDDriveChange(IConsoleCallback *pThis ) 132 { 133 printf("%d here\n",__LINE__); 134 return 0; 135 } 136 137 static nsresult OnFloppyDriveChange(IConsoleCallback *pThis ) 139 138 { 140 139 printf("%d here\n",__LINE__); … … 143 142 144 143 static nsresult OnNetworkAdapterChange( 145 IConsoleCallback * this_,144 IConsoleCallback *pThis, 146 145 INetworkAdapter * networkAdapter 147 146 ) { … … 151 150 152 151 static nsresult OnSerialPortChange( 153 IConsoleCallback * this_,152 IConsoleCallback *pThis, 154 153 ISerialPort * serialPort 155 154 ) { … … 159 158 160 159 static nsresult OnParallelPortChange( 161 IConsoleCallback * this_,160 IConsoleCallback *pThis, 162 161 IParallelPort * parallelPort 163 162 ) { … … 166 165 } 167 166 168 static nsresult OnStorageControllerChange(IConsoleCallback * this_)169 { 170 printf("%d here\n",__LINE__); 171 return 0; 172 } 173 174 static nsresult OnVRDPServerChange(IConsoleCallback * this_)175 { 176 printf("%d here\n",__LINE__); 177 return 0; 178 } 179 180 static nsresult OnUSBControllerChange(IConsoleCallback * this_)167 static nsresult OnStorageControllerChange(IConsoleCallback *pThis ) 168 { 169 printf("%d here\n",__LINE__); 170 return 0; 171 } 172 173 static nsresult OnVRDPServerChange(IConsoleCallback *pThis ) 174 { 175 printf("%d here\n",__LINE__); 176 return 0; 177 } 178 179 static nsresult OnUSBControllerChange(IConsoleCallback *pThis ) 181 180 { 182 181 printf("%d here\n",__LINE__); … … 185 184 186 185 static nsresult OnUSBDeviceStateChange( 187 IConsoleCallback * this_,186 IConsoleCallback *pThis, 188 187 IUSBDevice * device, 189 188 PRBool attached, … … 195 194 196 195 static nsresult OnSharedFolderChange( 197 IConsoleCallback * this_,196 IConsoleCallback *pThis, 198 197 PRUint32 scope 199 198 ) { … … 203 202 204 203 static nsresult OnRuntimeError( 205 IConsoleCallback * this_,204 IConsoleCallback *pThis, 206 205 PRBool fatal, 207 206 PRUnichar * id, … … 213 212 214 213 static nsresult OnCanShowWindow( 215 IConsoleCallback * this_,214 IConsoleCallback *pThis, 216 215 PRBool * canShow 217 216 ) { … … 221 220 222 221 static nsresult OnShowWindow( 223 IConsoleCallback * this_,222 IConsoleCallback *pThis, 224 223 PRUint64 * winId 225 224 ) { … … 229 228 230 229 231 static nsresult AddRef(nsISupports * this_)230 static nsresult AddRef(nsISupports *pThis) 232 231 { 233 232 nsresult c; … … 238 237 } 239 238 240 static nsresult Release(nsISupports * this_)239 static nsresult Release(nsISupports *pThis) 241 240 { 242 241 nsresult c; … … 247 246 { 248 247 /* delete object */ 249 #if 0/* test */250 free( this_->vtbl);251 free( this_);248 #if 1 /* test */ 249 free(pThis->vtbl); 250 free(pThis); 252 251 #endif 253 252 } … … 255 254 } 256 255 257 static nsresult QueryInterface(nsISupports * this_, const nsID *iid, void **resultp)258 { 259 IConsoleCallback *that = (IConsoleCallback *) this_;256 static nsresult QueryInterface(nsISupports *pThis, const nsID *iid, void **resultp) 257 { 258 IConsoleCallback *that = (IConsoleCallback *)pThis; 260 259 261 260 printf("QueryInterface\n"); -
trunk/src/VBox/Main/cbinding/xpcidl.xsl
r18374 r18821 452 452 * NS_ERROR_INVALID_POINTER if aInstancePtr is NULL. 453 453 */ 454 nsresult (*QueryInterface)(nsISupports * this_, const nsID *iid, void **resultp);454 nsresult (*QueryInterface)(nsISupports *pThis, const nsID *iid, void **resultp); 455 455 /** 456 456 * Increases the reference count for this interface. … … 460 460 * @return The resulting reference count. 461 461 */ 462 nsresult (*AddRef)(nsISupports * this_);462 nsresult (*AddRef)(nsISupports *pThis); 463 463 464 464 /** … … 469 469 * @return The resulting reference count. 470 470 */ 471 nsresult (*Release)(nsISupports * this_);471 nsresult (*Release)(nsISupports *pThis); 472 472 473 473 }; … … 490 490 491 491 /* readonly attribute string message; */ 492 nsresult (*GetMessage)(nsIException * this_, PRUnichar * *aMessage);492 nsresult (*GetMessage)(nsIException *pThis, PRUnichar * *aMessage); 493 493 494 494 /* readonly attribute nsresult (*result; */ 495 nsresult (*GetResult)(nsIException * this_, nsresult *aResult);495 nsresult (*GetResult)(nsIException *pThis, nsresult *aResult); 496 496 497 497 /* readonly attribute string name; */ 498 nsresult (*GetName)(nsIException * this_, PRUnichar * *aName);498 nsresult (*GetName)(nsIException *pThis, PRUnichar * *aName); 499 499 500 500 /* readonly attribute string filename; */ 501 nsresult (*GetFilename)(nsIException * this_, PRUnichar * *aFilename);501 nsresult (*GetFilename)(nsIException *pThis, PRUnichar * *aFilename); 502 502 503 503 /* readonly attribute PRUint32 lineNumber; */ 504 nsresult (*GetLineNumber)(nsIException * this_, PRUint32 *aLineNumber);504 nsresult (*GetLineNumber)(nsIException *pThis, PRUint32 *aLineNumber); 505 505 506 506 /* readonly attribute PRUint32 columnNumber; */ 507 nsresult (*GetColumnNumber)(nsIException * this_, PRUint32 *aColumnNumber);507 nsresult (*GetColumnNumber)(nsIException *pThis, PRUint32 *aColumnNumber); 508 508 509 509 /* readonly attribute nsIStackFrame location; */ 510 nsresult (*GetLocation)(nsIException * this_, nsIStackFrame * *aLocation);510 nsresult (*GetLocation)(nsIException *pThis, nsIStackFrame * *aLocation); 511 511 512 512 /* readonly attribute nsIException inner; */ 513 nsresult (*GetInner)(nsIException * this_, nsIException * *aInner);513 nsresult (*GetInner)(nsIException *pThis, nsIException * *aInner); 514 514 515 515 /* readonly attribute nsISupports data; */ 516 nsresult (*GetData)(nsIException * this_, nsISupports * *aData);516 nsresult (*GetData)(nsIException *pThis, nsISupports * *aData); 517 517 518 518 /* string toString (); */ 519 nsresult (*ToString)(nsIException * this_, PRUnichar **_retval);519 nsresult (*ToString)(nsIException *pThis, PRUnichar **_retval); 520 520 }; 521 521 … … 537 537 538 538 /* readonly attribute PRUint32 language; */ 539 nsresult (*GetLanguage)(nsIStackFrame * this_, PRUint32 *aLanguage);539 nsresult (*GetLanguage)(nsIStackFrame *pThis, PRUint32 *aLanguage); 540 540 541 541 /* readonly attribute string languageName; */ 542 nsresult (*GetLanguageName)(nsIStackFrame * this_, PRUnichar * *aLanguageName);542 nsresult (*GetLanguageName)(nsIStackFrame *pThis, PRUnichar * *aLanguageName); 543 543 544 544 /* readonly attribute string filename; */ 545 nsresult (*GetFilename)(nsIStackFrame * this_, PRUnichar * *aFilename);545 nsresult (*GetFilename)(nsIStackFrame *pThis, PRUnichar * *aFilename); 546 546 547 547 /* readonly attribute string name; */ 548 nsresult (*GetName)(nsIStackFrame * this_, PRUnichar * *aName);548 nsresult (*GetName)(nsIStackFrame *pThis, PRUnichar * *aName); 549 549 550 550 /* readonly attribute PRInt32 lineNumber; */ 551 nsresult (*GetLineNumber)(nsIStackFrame * this_, PRInt32 *aLineNumber);551 nsresult (*GetLineNumber)(nsIStackFrame *pThis, PRInt32 *aLineNumber); 552 552 553 553 /* readonly attribute string sourceLine; */ 554 nsresult (*GetSourceLine)(nsIStackFrame * this_, PRUnichar * *aSourceLine);554 nsresult (*GetSourceLine)(nsIStackFrame *pThis, PRUnichar * *aSourceLine); 555 555 556 556 /* readonly attribute nsIStackFrame caller; */ 557 nsresult (*GetCaller)(nsIStackFrame * this_, nsIStackFrame * *aCaller);557 nsresult (*GetCaller)(nsIStackFrame *pThis, nsIStackFrame * *aCaller); 558 558 559 559 /* string toString (); */ 560 nsresult (*ToString)(nsIStackFrame * this_, PRUnichar **_retval);560 nsresult (*ToString)(nsIStackFrame *pThis, PRUnichar **_retval); 561 561 }; 562 562 … … 844 844 <xsl:text>)(</xsl:text> 845 845 <xsl:value-of select="../@name" /> 846 <xsl:text> * this_, </xsl:text>846 <xsl:text> *pThis, </xsl:text> 847 847 <!-- array size --> 848 848 <xsl:text>PRUint32 *</xsl:text> … … 885 885 <xsl:text>)(</xsl:text> 886 886 <xsl:value-of select="../@name" /> 887 <xsl:text> * this_, </xsl:text>887 <xsl:text> *pThis, </xsl:text> 888 888 <xsl:apply-templates select="@type" mode="forwarder"/> 889 889 <xsl:text> *</xsl:text> … … 901 901 <xsl:text>)(</xsl:text> 902 902 <xsl:value-of select="../@name" /> 903 <xsl:text> * this_, </xsl:text>903 <xsl:text> *pThis, </xsl:text> 904 904 <xsl:apply-templates select="@type" mode="forwarder"/> 905 905 <xsl:text> *</xsl:text> … … 912 912 <xsl:text>)(</xsl:text> 913 913 <xsl:value-of select="../@name" /> 914 <xsl:text> * this_, </xsl:text>914 <xsl:text> *pThis, </xsl:text> 915 915 <xsl:apply-templates select="@type" mode="forwarder"/> 916 916 <xsl:text> </xsl:text> … … 1096 1096 <xsl:text> </xsl:text> 1097 1097 <xsl:value-of select="../@name" /> 1098 <xsl:text> * this_,
</xsl:text>1098 <xsl:text> *pThis,
</xsl:text> 1099 1099 <xsl:for-each select="param [position() != last()]"> 1100 1100 <xsl:text> </xsl:text> … … 1109 1109 <xsl:text>)(</xsl:text> 1110 1110 <xsl:value-of select="../@name" /> 1111 <xsl:text> * this_);
</xsl:text>1111 <xsl:text> *pThis );
</xsl:text> 1112 1112 </xsl:if> 1113 1113 <xsl:apply-templates select="@if" mode="end"/> … … 1307 1307 <xsl:text> nsresult (*HasMore)(</xsl:text> 1308 1308 <xsl:value-of select="@name" /> 1309 <xsl:text> * this_, PRBool *more);

</xsl:text>1309 <xsl:text> *pThis, PRBool *more);

</xsl:text> 1310 1310 <!-- GetNext --> 1311 1311 <xsl:text> nsresult (*GetNext)(</xsl:text> 1312 1312 <xsl:value-of select="@name" /> 1313 <xsl:text> * this_, </xsl:text>1313 <xsl:text> *pThis, </xsl:text> 1314 1314 <xsl:apply-templates select="@type" mode="forwarder"/> 1315 1315 <xsl:text> *next);

</xsl:text> … … 1371 1371 <xsl:text> nsresult (*GetCount)(</xsl:text> 1372 1372 <xsl:value-of select="@name" /> 1373 <xsl:text> * this_, PRUint32 *aCount);

</xsl:text>1373 <xsl:text> *pThis, PRUint32 *aCount);

</xsl:text> 1374 1374 <!-- GetItemAt --> 1375 1375 <xsl:text> nsresult (*GetItemAt)(</xsl:text> 1376 1376 <xsl:value-of select="@name" /> 1377 <xsl:text> * this_, PRUint32 index, </xsl:text>1377 <xsl:text> *pThis, PRUint32 index, </xsl:text> 1378 1378 <xsl:apply-templates select="@type" mode="forwarder"/> 1379 1379 <xsl:text> **item);

</xsl:text> … … 1381 1381 <xsl:text> nsresult (*Enumerate)(</xsl:text> 1382 1382 <xsl:value-of select="@name" /> 1383 <xsl:text> * this_, </xsl:text>1383 <xsl:text> *pThis, </xsl:text> 1384 1384 <xsl:apply-templates select="@enumerator"/> 1385 1385 <xsl:text> **enumerator);

</xsl:text>
Note:
See TracChangeset
for help on using the changeset viewer.