version update

added support for windows metafile images
further simplified image processing

Author: GCuser99

.gitignore

@@ -3,7 +3,7 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-images/
+## images/
 
 # User-specific files
 *.rsuser

dist/tBUserFormConverter_win32.dll

@@ -5,7 +5,7 @@ Class About
 
 	Sub New()
     	lblInfo.Caption = "Author: GCUser99" & vbCrLf & _  
-        "Version: v2.2" & vbCrLf & _  
+        "Version: v2.3" & vbCrLf & _  
         "Description: A VBIDE add-in (complied with twinBASIC) that converts VBA UserForms for use in twinBASIC."
         lblWebsite.Caption = "https://github.com/GCuser99/VBA-UserForm-to-twinBASIC"
         Set Me.Icon = GetImageFromResources("transparent.ico", "IMAGES")

dist/tBUserFormConverter_win64.dll

@@ -26,7 +26,7 @@
 		"HasDC": true,
 		"Height": 370,
 		"HelpContextID": 0,
-		"Icon": "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7u7u7uwAAQAQEAAAABAQEAAD3u7u7u7ukAAAAAEACO7u7u7u7BAAAAAAAAEBABAAABnu7u7u7u2RAAAAAAEY7u7u7u7sAAEAABABAAAQAAABXe7u7u7u7pAAAAAAAQju7u7u7uwAAQABAAAAAAAAAAPO7u7u7u7tkQAQEBAAGO7u7u7u7AEAABAQAQABAAARPO7u7u7u7u2QABAQEBAI7u7u7u7sAQEAEAABAAEAABXO7u7u7u7u7qAAAAAAARju7u7u7uwAAAAAAAAAEAESju7u7u7u7u7uwBAAAAAACO7u7u7u7AAAABAAAAAQAnzu7u7u7u7u7u7mAQAAAAAY7u7u7u7sAAABAAERASWd7u7u7u7u7u7u7u2CARERERju7u7u7uwREREAAkaK3u7u7u7u7u7u7u7u7u27u7u7vO7u7u7u7bu7u7zd7u7u7u7u7u7u7u7uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+		"Icon": "",
 		"Index": -1,
 		"KeyPreview": false,
 		"Left": 0,
@@ -73,10 +73,11 @@
 			"gridHeight": 10,
 			"gridWidth": 10,
 			"lockedControls": [],
+			"multiColoredGrabbers": false,
 			"showGrid": true,
 			"showOutlines": false
 		},
-		"__lastUpdateMarker": 1563196456,
+		"__lastUpdateMarker": 2325407002,
 		"_children": [
 			{
 				"Anchors": {
@@ -303,8 +304,7 @@
 				"WhatsThisHelpID": 0,
 				"Width": 208,
 				"_className": "OptionButton",
-				"_clsid": "{33AD4F00-6699-11CF-B70C-00AA0060D393}",
-				"_isExclusiveWithinContainer": true
+				"_clsid": "{33AD4F00-6699-11CF-B70C-00AA0060D393}"
 			},
 			{
 				"Alignment": "tbLeftJustify",
@@ -360,8 +360,7 @@
 				"WhatsThisHelpID": 0,
 				"Width": 215.666666666667,
 				"_className": "OptionButton",
-				"_clsid": "{33AD4F00-6699-11CF-B70C-00AA0060D393}",
-				"_isExclusiveWithinContainer": true
+				"_clsid": "{33AD4F00-6699-11CF-B70C-00AA0060D393}"
 			},
 			{
 				"Anchors": {
@@ -773,7 +772,6 @@
 			}
 		],
 		"_className": "Form",
-		"_clsid": "{33AD4F38-6699-11CF-B70C-00AA0060D393}",
-		"hDC": 1560351248
+		"_clsid": "{33AD4F38-6699-11CF-B70C-00AA0060D393}"
 	}
 ]

dist/tBUserformConverterSetup.exe

@@ -1,5 +1,5 @@
 ' ==========================================================================
-' tBUserFormConverter v2.2
+' tBUserFormConverter v2.3
 '
 ' A VBIDE add-in (complied with twinBASIC) that converts VBA UserForms for use in twinBASIC.
 '

src/source/About.twin

@@ -25,12 +25,19 @@ Module ImageProcessing
     Const CRYPT_STRING_NOCRLF As Long = &H40000000& 'Do not append any new line characters to the encoded string.
     Const CRYPT_STRING_NOCR As Long = &H80000000& 'Only use the line feed (LF) character (0x0A) for a new line.
 
+    Private Enum PictureTypeConstants
+        vbPicTypeNone = 0
+        vbPicTypeBitmap = 1
+        vbPicTypeMetafile = 2
+        vbPicTypeIcon = 3
+        vbPicTypeEMetafile = 4
+    End Enum
+    
     Public Function GetImageString(pic As stdole.IPictureDisp) As String
         Dim bytes() As Byte
         If pic Is Nothing Then Exit Function
         bytes = BytesFromPicture(pic)
-        'offset determined through some reverse engineering...
-        GetImageString = Mid(ToBase64Array(bytes), 73)
+        GetImageString = ToBase64Array(bytes)
     End Function
 
     Public Function ToBase64Array(bytes() As Byte) As String
@@ -46,9 +53,11 @@ Module ImageProcessing
 
     Public Function BytesFromPicture(pic As IPictureDisp) As Byte()
         Dim pb As PropertyBag
+        Dim headerOffset As Long = 55
         Set pb = New PropertyBag
         pb.WriteProperty "Image", pic
-        BytesFromPicture = pb.Contents
+        'skip the stdPicture header on output
+        BytesFromPicture = MidB(pb.Contents, headerOffset)
     End Function
 
     Public Function GetTransparentIconString() As String