From: Doug Coleman Date: Fri, 1 Sep 2017 04:24:12 +0000 (-0500) Subject: windows: Fix some drag and drop apis. X-Git-Tag: 0.98~675 X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=9a2af5a31265ff8d2e1d2a5f8d2ffe015f31de7d windows: Fix some drag and drop apis. Attempting to define IDropTarget::QueryInterface-callback-1 outside of a compilation unit Re-definition of LPD3DXPRTCOMPBUFFER --- diff --git a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor index 08c53e46c9..917412fea6 100644 --- a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -1126,8 +1126,8 @@ FUNCTION: HRESULT ALIAS: D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileW -C-TYPE: D3DXPRTCOMPBUFFER -TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER +C-TYPE: D3DXPRTCompBuffer +! TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER FUNCTION: HRESULT D3DXLoadPRTCompBufferFromFileA ( diff --git a/basis/windows/dragdrop-listener/dragdrop-listener.factor b/basis/windows/dragdrop-listener/dragdrop-listener.factor index 3b1c68c6b5..5aa2073b91 100644 --- a/basis/windows/dragdrop-listener/dragdrop-listener.factor +++ b/basis/windows/dragdrop-listener/dragdrop-listener.factor @@ -48,6 +48,9 @@ TUPLE: listener-dragdrop hWnd last-drop-effect ; DROPEFFECT_NONE listener-dragdrop boa ; SYMBOL: +listener-dragdrop-wrapper+ + +<< + { { IDropTarget { [ ! HRESULT DragEnter ( IDataObject* pDataObject, DWORD grfKeyState, POINTL pt, DWORD* pdwEffect ) @@ -78,6 +81,8 @@ SYMBOL: +listener-dragdrop-wrapper+ } } } +listener-dragdrop-wrapper+ set-global +>> + : dragdrop-listener-window ( -- ) world get handle>> hWnd>> dup +listener-dragdrop-wrapper+ get-global com-wrap