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 08c53e46c98bef62fb64e816d2257d54f724f104..917412fea6af313ce5105060d123023a6aef0d03 100644 (file)
--- 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 3b1c68c6b5e779a5ce62265f3c11992b1e96515d..5aa2073b9174f9996c20dd2da0b0a5c1a12f3664 100644 (file)
--- 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+
     } }
 } <com-wrapper> +listener-dragdrop-wrapper+ set-global
 
+>>
+
 : dragdrop-listener-window ( -- )
     world get handle>> hWnd>> dup <listener-dragdrop>
     +listener-dragdrop-wrapper+ get-global com-wrap