--- a/Win32FileDialog.st	Fri Apr 01 00:15:01 2016 +0200
+++ b/Win32FileDialog.st	Fri Apr 01 11:33:43 2016 +0200
@@ -922,12 +922,28 @@
 
 !Win32FileDialog::OpenFilenameStructure class methodsFor:'accessing'!
 
+fieldNames
+    ^ #(lStructSize hwndOwner hInstance Flags lpstrFilter lpstrCustomFilter)
+
+    "
+     OLEStructure getFieldInfoFor:self
+    "
+!
+
 sizeInBytes
     ExternalAddress pointerSize == 8 ifTrue:[
         ^ 124
     ] ifFalse:[
         ^ 76
     ]
+!
+
+structureName
+    ^ 'OPENFILENAME'
+
+    "
+     OLEStructure getFieldInfoFor:self
+    "
 ! !
 
 !Win32FileDialog::OpenFilenameStructure class methodsFor:'documentation'!
@@ -980,7 +996,7 @@
     "Answer the receiver's flags field as a Smalltalk object."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        ^ self unsignedInt32At: 84+1
+        ^ self unsignedInt32At: 96+1
     ] ifFalse:[
         ^ self unsignedInt32At: 52+1
     ]
@@ -990,7 +1006,7 @@
     "Set the receiver's flags field as a Smalltalk object."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        self unsignedInt32At: 84+1 put: anObject
+        self unsignedInt32At: 96+1 put: anObject
     ] ifFalse:[
         self unsignedInt32At: 52+1 put: anObject
     ]
@@ -1000,7 +1016,7 @@
     "Get the receiver's hInstance field."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        ^ self unsignedInt64At: 12+1
+        ^ self unsignedInt64At: 16+1
     ] ifFalse:[
         ^ self unsignedInt32At: 8+1
     ]
@@ -1010,7 +1026,7 @@
     "Set the receiver's hInstance field to the value of anInteger."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        self unsignedInt64At: 12+1 put: anInteger
+        self unsignedInt64At: 16+1 put: anInteger
     ] ifFalse:[
         self unsignedInt32At: 8+1 put: anInteger
     ]
@@ -1020,7 +1036,7 @@
     "Get the receiver's hwndOwner field."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        ^ self unsignedInt64At: 4+1
+        ^ self unsignedInt64At: 8+1
     ] ifFalse:[
         ^ self unsignedInt32At: 4+1
     ]
@@ -1030,7 +1046,7 @@
     "Set the receiver's hwndOwner field to the value of anInteger."
 
     ExternalAddress pointerSize == 8 ifTrue:[
-        self unsignedInt64At: 4+1 put: anInteger
+        self unsignedInt64At: 8+1 put: anInteger
     ] ifFalse:[
         self unsignedInt32At: 4+1 put: anInteger
     ]