fixed __FUNCTION__ use in Unicode build (it's a variable, not a macro)

[wxWidgets.git] / src / mac / corefoundation / hid.cpp

diff --git a/src/mac/corefoundation/hid.cpp b/src/mac/corefoundation/hid.cpp
index 80f61a3836bc5f2cb98e36aacf3dd1216adfa1f7..a4a9a6ea3779ff5523b8b30343894d41616f69be 100644 (file)
--- a/src/mac/corefoundation/hid.cpp
+++ b/src/mac/corefoundation/hid.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        hid.cpp
+// Name:        src/mac/corefoundation/hid.cpp

 // Purpose:     DARWIN HID layer for WX Implementation
 // Author:      Ryan Norton
 // Modified by:
 // Purpose:     DARWIN HID layer for WX Implementation
 // Author:      Ryan Norton
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "hid.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -53,12 +49,6 @@
 #define wxKERNCHECK(arg, msg) wxFORCECHECK_MSG(arg != KERN_SUCCESS, msg)
 #define wxSCHECK(arg, msg) wxFORCECHECK_MSG(arg != S_OK, msg)
 
 #define wxKERNCHECK(arg, msg) wxFORCECHECK_MSG(arg != KERN_SUCCESS, msg)
 #define wxSCHECK(arg, msg) wxFORCECHECK_MSG(arg != S_OK, msg)
 

-#ifdef __WXDEBUG___
-#    define wxVERIFY(arg)    wxASSERT(arg)
-#else
-#    define wxVERIFY(arg)    arg
-#endif
-

 /*
 void CFShowTypeIDDescription(CFTypeRef pData)
 {
 /*
 void CFShowTypeIDDescription(CFTypeRef pData)
 {


@@ -92,13 +82,15 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
     //Dictionary that will hold first
     //the matching dictionary for determining which kind of devices we want,
     //then later some registry properties from an iterator (see below)
     //Dictionary that will hold first
     //the matching dictionary for determining which kind of devices we want,
     //then later some registry properties from an iterator (see below)

-    CFMutableDictionaryRef pDictionary;
-
-    //Create a dictionary
+    //

     //The call to IOServiceMatching filters down the
     //the services we want to hid services (and also eats the
     //dictionary up for us (consumes one reference))
     //The call to IOServiceMatching filters down the
     //the services we want to hid services (and also eats the
     //dictionary up for us (consumes one reference))

-    wxVERIFY((pDictionary = IOServiceMatching(kIOHIDDeviceKey)) != NULL );
+    CFMutableDictionaryRef pDictionary = IOServiceMatching(kIOHIDDeviceKey);
+    wxCHECK_MSG( pDictionary, false,
+                    _T("IOServiceMatching(kIOHIDDeviceKey) failed") );
+
+    wxASSERT( pDictionary );

 
     //Here we'll filter down the services to what we want
     if (nType != -1)
 
     //Here we'll filter down the services to what we want
     if (nType != -1)


@@ -119,7 +111,8 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
     //Now get the maching services
     io_iterator_t pIterator;
     wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
     //Now get the maching services
     io_iterator_t pIterator;
     wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");

-    wxASSERT_MSG(pIterator != 0, wxT("No devices found!"));
+    if(pIterator == 0)
+        return false; // No devices found

 
     //Now we iterate through them
     io_object_t pObject;
 
     //Now we iterate through them
     io_object_t pObject;


@@ -128,8 +121,16 @@ bool wxHIDDevice::Create (int nClass, int nType, int nDev)
         if(--nDev != 0)
             continue;
 
         if(--nDev != 0)
             continue;
 

-        wxVERIFY(IORegistryEntryCreateCFProperties(pObject, &pDictionary,
-                                            kCFAllocatorDefault, kNilOptions) == KERN_SUCCESS);
+        if ( IORegistryEntryCreateCFProperties
+             (
+                pObject,
+                &pDictionary,
+                kCFAllocatorDefault,
+                kNilOptions
+             ) != KERN_SUCCESS )
+        {
+            wxLogDebug(_T("IORegistryEntryCreateCFProperties failed"));
+        }

 
         //Just for sanity :)
         wxASSERT(CFGetTypeID(CFDictionaryGetValue(pDictionary, CFSTR(kIOHIDProductKey))) == CFStringGetTypeID());
 
         //Just for sanity :)
         wxASSERT(CFGetTypeID(CFDictionaryGetValue(pDictionary, CFSTR(kIOHIDProductKey))) == CFStringGetTypeID());


@@ -187,7 +188,8 @@ USB Product Name
         (*ppPlugin)->Release(ppPlugin);
 
         //open the HID interface...
         (*ppPlugin)->Release(ppPlugin);
 
         //open the HID interface...

-        wxVERIFY((*m_ppDevice)->open(m_ppDevice, 0) == S_OK);
+        if ( (*m_ppDevice)->open(m_ppDevice, 0) != S_OK )
+            wxLogDebug(_T("HID device: open failed"));

 
         //
         //Now the hard part - in order to scan things we need "cookies" -
 
         //
         //Now the hard part - in order to scan things we need "cookies" -


@@ -206,7 +208,7 @@ USB Product Name
     return true;
 }//end Create()
 
     return true;
 }//end Create()
 

-int wxHIDDevice::GetCount (int nClass, int nType)
+size_t wxHIDDevice::GetCount (int nClass, int nType)

 {
     mach_port_t             m_pPort;
 
 {
     mach_port_t             m_pPort;
 


@@ -216,13 +218,9 @@ int wxHIDDevice::GetCount (int nClass, int nType)
     //Dictionary that will hold first
     //the matching dictionary for determining which kind of devices we want,
     //then later some registry properties from an iterator (see below)
     //Dictionary that will hold first
     //the matching dictionary for determining which kind of devices we want,
     //then later some registry properties from an iterator (see below)

-    CFMutableDictionaryRef pDictionary;
-
-    //Create a dictionary
-    //The call to IOServiceMatching filters down the
-    //the services we want to hid services (and also eats the
-    //dictionary up for us (consumes one reference))
-    wxVERIFY((pDictionary = IOServiceMatching(kIOHIDDeviceKey)) != NULL );
+    CFMutableDictionaryRef pDictionary = IOServiceMatching(kIOHIDDeviceKey);
+    wxCHECK_MSG( pDictionary, 0,
+                    _T("IOServiceMatching(kIOHIDDeviceKey) failed") );

 
     //Here we'll filter down the services to what we want
     if (nType != -1)
 
     //Here we'll filter down the services to what we want
     if (nType != -1)


@@ -244,13 +242,13 @@ int wxHIDDevice::GetCount (int nClass, int nType)
     io_iterator_t pIterator;
     wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
 
     io_iterator_t pIterator;
     wxIOCHECK(IOServiceGetMatchingServices(m_pPort, pDictionary, &pIterator), "No Matching HID Services");
 

-    if(pIterator == NULL)
+    if ( !pIterator )

         return 0;
 
     //Now we iterate through them
     io_object_t pObject;
 
         return 0;
 
     //Now we iterate through them
     io_object_t pObject;
 

-    int nCount = 0;
+    size_t nCount = 0;

 
     while ( (pObject = IOIteratorNext(pIterator)) != 0)
         ++nCount;
 
     while ( (pObject = IOIteratorNext(pIterator)) != 0)
         ++nCount;


@@ -274,8 +272,10 @@ void wxHIDDevice::AddCookie(CFTypeRef Data, int i)
 
 void wxHIDDevice::AddCookieInQueue(CFTypeRef Data, int i)
 {
 
 void wxHIDDevice::AddCookieInQueue(CFTypeRef Data, int i)
 {

+    //3rd Param flags (none yet)

     AddCookie(Data, i);
     AddCookie(Data, i);

-    wxVERIFY((*m_ppQueue)->addElement(m_ppQueue, m_pCookies[i], 0) == S_OK);//3rd Param flags (none yet)
+    if ( (*m_ppQueue)->addElement(m_ppQueue, m_pCookies[i], 0) != S_OK )
+        wxLogDebug(_T("HID device: adding element failed"));

 }
 
 void wxHIDDevice::InitCookies(size_t dwSize, bool bQueue)
 }
 
 void wxHIDDevice::InitCookies(size_t dwSize, bool bQueue)


@@ -284,8 +284,18 @@ void wxHIDDevice::InitCookies(size_t dwSize, bool bQueue)
     if (bQueue)
     {
         wxASSERT( m_ppQueue == NULL);
     if (bQueue)
     {
         wxASSERT( m_ppQueue == NULL);

-        wxVERIFY(  (m_ppQueue = (*m_ppDevice)->allocQueue(m_ppDevice)) != NULL);
-        wxVERIFY(  (*m_ppQueue)->create(m_ppQueue, 0, 512) == S_OK); //Param 2, flags, none yet
+        m_ppQueue = (*m_ppDevice)->allocQueue(m_ppDevice);
+        if ( !m_ppQueue )
+        {
+            wxLogDebug(_T("HID device: allocQueue failed"));
+            return;
+        }
+
+        //Param 2, flags, none yet
+        if ( (*m_ppQueue)->create(m_ppQueue, 0, 512) != S_OK )
+        {
+            wxLogDebug(_T("HID device: create failed"));
+        }

     }
 }
 
     }
 }