Merge remote-tracking branch 'origin/master' into modern-harvey4

basis/windows/com/com.factor

@@ -40,11 +40,6 @@ COM-INTERFACE: IDropTarget IUnknown {00000122-0000-0000-C000-000000000046}
     HRESULT DragOver ( DWORD grfKeyState, POINTL pt, DWORD* pdwEffect )
     HRESULT DragLeave ( )
     HRESULT Drop ( IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect ) ;
-
-TYPEDEF: LPWSTR LPCOLESTR
-TYPEDEF: LPWSTR OLESTR
-TYPEDEF: OLESTR** SNB
-TYPEDEF: wchar_t* OLECHAR
 C-TYPE: IEnumSTATSTG
 
 STRUCT: STATSTG
@@ -60,6 +55,7 @@ STRUCT: STATSTG
     { grfStateBits DWORD }
     { reserved DWORD } ;
 
+C-TYPE: IStream
 COM-INTERFACE: IStorage IUnknown {0000000B-0000-0000-C000-000000000046}
     HRESULT Commit ( DWORD grfCommitFlags )
     HRESULT CopyTo ( DWORD ciidExclude, IID *rgiidExclude, SNB snbExclude, IStorage *pstgDest )

basis/windows/directx/d3dx9mesh/d3dx9mesh.factor

@@ -177,8 +177,6 @@ COM-INTERFACE: ID3DXBaseMesh IUnknown {7ED943DD-52E8-40b5-A8D8-76685C406330}
     HRESULT GenerateAdjacency ( FLOAT Epsilon, DWORD* pAdjacency )
     HRESULT UpdateSemantics ( D3DVERTEXELEMENT9* Declaration ) ;
 
-C-TYPE: IStream
-
 COM-INTERFACE: ID3DXMesh ID3DXBaseMesh {4020E5C2-1403-4929-883F-E2E849FAC195}
     HRESULT LockAttributeBuffer ( DWORD Flags, DWORD** ppData )
     HRESULT UnlockAttributeBuffer ( )

basis/windows/ole32/ole32.factor

@@ -10,8 +10,11 @@ LIBRARY: ole32
 
 TYPEDEF: GUID* REFGUID
 TYPEDEF: void* LPUNKNOWN
+TYPEDEF: LPWSTR OLESTR
 TYPEDEF: LPWSTR LPOLESTR
 TYPEDEF: LPWSTR LPCOLESTR
+TYPEDEF: wchar_t* OLECHAR
+TYPEDEF: OLESTR** SNB
 
 TYPEDEF: GUID IID
 TYPEDEF: GUID CLSID