From 1abde46c790e108ca870373a02359cf0d2bd190a Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 15 Mar 2020 13:21:24 -0500 Subject: [PATCH 1/2] windows: Move IStream to windows.com to fix bootstrap. --- basis/windows/com/com.factor | 1 + basis/windows/directx/d3dx9mesh/d3dx9mesh.factor | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor index 36a83de952..4bfff1bfcc 100644 --- a/basis/windows/com/com.factor +++ b/basis/windows/com/com.factor @@ -60,6 +60,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 ) diff --git a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor index 917412fea6..17957b7bf3 100644 --- a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/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 ( ) From c23230ed82ed66ae86a64d13fd3ec1a443ca42c5 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 15 Mar 2020 13:31:46 -0500 Subject: [PATCH 2/2] windows: Move types to ole32 --- basis/windows/com/com.factor | 5 ----- basis/windows/ole32/ole32.factor | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor index 4bfff1bfcc..674bae2b14 100644 --- a/basis/windows/com/com.factor +++ b/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 diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor index 0da1cef38e..ac351a1f91 100644 --- a/basis/windows/ole32/ole32.factor +++ b/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