- minor fixes

activex/utils.cpp

@@ -62,7 +62,7 @@ BSTR BSTRFromCStr(UINT codePage, LPCSTR s)
             ZeroMemory(wideStr, wideLen*sizeof(WCHAR));
             MultiByteToWideChar(codePage, 0, s, -1, wideStr, wideLen);
             bstr = SysAllocStringLen(wideStr, wideLen);
-            free(wideStr);
+            CoTaskMemFree(wideStr);
 
             return bstr;
         }
@@ -105,22 +105,26 @@ HRESULT GetObjectProperty(LPUNKNOWN object, DISPID dispID, VARIANT& v)
 HDC CreateDevDC(DVTARGETDEVICE *ptd)
 {
 	HDC hdc=NULL;
+	if( NULL == ptd )
+    {
+		hdc = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL);
+	}
+    else
+    {
         LPDEVNAMES lpDevNames;
         LPDEVMODE lpDevMode;
         LPTSTR lpszDriverName;
         LPTSTR lpszDeviceName;
         LPTSTR lpszPortName;
 
-	if (ptd == NULL) {
-		hdc = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL);
-		goto errReturn;
-	}
-
         lpDevNames = (LPDEVNAMES) ptd; // offset for size field
 
-	if (ptd->tdExtDevmodeOffset == 0) {
+        if (ptd->tdExtDevmodeOffset == 0)
+        {
             lpDevMode = NULL;
-	}else{
+        }
+        else
+        {
             lpDevMode  = (LPDEVMODE) ((LPTSTR)ptd + ptd->tdExtDevmodeOffset);
         }
 
@@ -129,8 +133,7 @@ HDC CreateDevDC(DVTARGETDEVICE *ptd)
         lpszPortName   = (LPTSTR) lpDevNames + ptd->tdPortNameOffset;
 
         hdc = CreateDC(lpszDriverName, lpszDeviceName, lpszPortName, lpDevMode);
-
-errReturn:
+    }
 	return hdc;
 };