Changeset 85121 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB/win

Timestamp:

Jul 8, 2020 7:33:26 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139061

Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/win

Files:

• lib/VBoxUsbLib-win.cpp (modified) (3 diffs)
• mon/VBoxUsbMon.h (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp

@@ -1820 +1820 @@
 
 
-static VOID CALLBACK usbLibTimerCallback(__in PVOID lpParameter, __in BOOLEAN TimerOrWaitFired)
+static VOID CALLBACK usbLibTimerCallback(__in PVOID lpParameter, __in BOOLEAN TimerOrWaitFired) RT_NOTHROW_DEF
 {
     RT_NOREF2(lpParameter, TimerOrWaitFired);
@@ -1886 +1886 @@
 }
 
-/** @todo r=bird: Use an IPRT thread? */
-static DWORD WINAPI usbLibMsgThreadProc(__in LPVOID lpParameter)
+/** @todo r=bird: Use an IPRT thread!! */
+static DWORD WINAPI usbLibMsgThreadProc(__in LPVOID lpParameter) RT_NOTHROW_DEF
 {
     static LPCSTR   s_szVBoxUsbWndClassName = "VBoxUsbLibClass";
@@ -2050 +2050 @@
                         if (g_VBoxUsbGlobal.hTimerQueue)
                         {
+/** @todo r=bird: Which lunatic used CreateThread here?!?
+ *  Only the CRT uses CreateThread. */
                             g_VBoxUsbGlobal.hThread = CreateThread(
                               NULL, /*__in_opt   LPSECURITY_ATTRIBUTES lpThreadAttributes, */

trunk/src/VBox/HostDrivers/VBoxUSB/win/mon/VBoxUsbMon.h

@@ -60 +60 @@
 void vboxUsbDbgPrintUnicodeString(PUNICODE_STRING pUnicodeString);
 
-typedef DECLCALLBACK(BOOLEAN) FNVBOXUSBMONDEVWALKER(PFILE_OBJECT pHubFile, PDEVICE_OBJECT pHubDo, PVOID pvContext);
+typedef DECLCALLBACKTYPE(BOOLEAN, FNVBOXUSBMONDEVWALKER,(PFILE_OBJECT pHubFile, PDEVICE_OBJECT pHubDo, PVOID pvContext));
 typedef FNVBOXUSBMONDEVWALKER *PFNVBOXUSBMONDEVWALKER;