From 9a2af5a31265ff8d2e1d2a5f8d2ffe015f31de7d Mon Sep 17 00:00:00 2001
From: Doug Coleman <doug.coleman@gmail.com>
Date: Thu, 31 Aug 2017 23:24:12 -0500
Subject: [PATCH] windows: Fix some drag and drop apis.

Attempting to define IDropTarget::QueryInterface-callback-1 outside of a compilation unit
Re-definition of LPD3DXPRTCOMPBUFFER
---
 basis/windows/directx/d3dx9mesh/d3dx9mesh.factor         | 4 ++--
 basis/windows/dragdrop-listener/dragdrop-listener.factor | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

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+
     } }
 } <com-wrapper> +listener-dragdrop-wrapper+ set-global
 
+>>
+
 : dragdrop-listener-window ( -- )
     world get handle>> hWnd>> dup <listener-dragdrop>
     +listener-dragdrop-wrapper+ get-global com-wrap
-- 
2.34.1