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

modern-harvey4
Doug Coleman 2020-03-15 13:38:10 -05:00
commit c14ffd4d0f
3 changed files with 4 additions and 7 deletions

View File

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

View File

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

View File

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