Ticket #5306: win32_api.patch

win32_api.hpp

@@ -1472 +1472 @@
             )
          )
       {
+             CoUninitialize();
          return false;
       }
  
@@ -1489 +1490 @@
       {
          pIWbemLocator->Release();
  
+                 CoUninitialize();
          return false;
       }
  
@@ -1510 +1512 @@
          pIWbemLocator->Release();
          pWbemServices->Release();
  
+                 CoUninitialize();
          return false;
       }
       
@@ -1522 +1525 @@
          pWbemServices->Release();
          pEnumObject->Release();
  
+         CoUninitialize();
          return false;
       }
 
       wchar_variant vwchar;
 
-      while( 0 == pEnumObject->Next( WBEM_INFINITE_IG, uCount, &pClassObject, &uReturned ) )
-      {
-         if ( 0 == pClassObject->Get( L"LastBootUpTime", 0, &vwchar, 0, 0 ) )
-         {
-            bRet = true;
-             strValue = vwchar.value.pbstrVal;
-             VariantClear(&vwchar );
-             break;
-         }
-      }
+          while( 0 == pEnumObject->Next( WBEM_INFINITE_IG, uCount, &pClassObject, &uReturned ) )
+          {
+                if (pClassObject != 0)
+                {
+                        if ( 0 == pClassObject->Get( L"LastBootUpTime", 0, &vwchar, 0, 0 ) )
+                        {
+                                bRet = true;
+                                strValue = vwchar.value.pbstrVal;
+                                VariantClear(&vwchar );
+                                break;
+                        }
+                }
+          }
  
-      pIWbemLocator->Release();
-      pWbemServices->Release();
-      pEnumObject->Release();
-      pClassObject->Release();
+      if (pIWbemLocator != 0) 
+          pIWbemLocator->Release();
+
+      if (pWbemServices != 0) 
+          pWbemServices->Release();
+
+      if (pEnumObject != 0)
+          pEnumObject->Release();
+
+      if (pClassObject != 0)
+          pClassObject->Release();
    }
  
    CoUninitialize();