Skip to content

W
wine-winehq
Commit dea3d786 authored by François Gouget's avatar François Gouget Committed by Alexandre Julliard
Browse files
Options

Moved HDROP to shellapi.h.

parent 504973de
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
dlls/shell32/shellole.c
View file @ dea3d786
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include "shlobj.h" #include "shlobj.h"
#include "shellapi.h"
#include "shlguid.h" #include "shlguid.h"
#include "winreg.h" #include "winreg.h"
#include "wine/unicode.h" #include "wine/unicode.h"
......
include/shellapi.h
View file @ dea3d786
...@@ -9,6 +9,8 @@ extern "C" { ...@@ -9,6 +9,8 @@ extern "C" {
#include "pshpack1.h" #include "pshpack1.h"
DECLARE_HANDLE(HDROP);
/****************************************** /******************************************
* DragObject * DragObject
*/ */
......
include/windef.h
View file @ dea3d786
...@@ -67,7 +67,6 @@ DECLARE_OLD_HANDLE(HBITMAP); ...@@ -67,7 +67,6 @@ DECLARE_OLD_HANDLE(HBITMAP);
DECLARE_OLD_HANDLE(HBRUSH); DECLARE_OLD_HANDLE(HBRUSH);
DECLARE_HANDLE(HCOLORSPACE); DECLARE_HANDLE(HCOLORSPACE);
DECLARE_OLD_HANDLE(HDC); DECLARE_OLD_HANDLE(HDC);
DECLARE_OLD_HANDLE(HDROP);
DECLARE_OLD_HANDLE(HDRVR); DECLARE_OLD_HANDLE(HDRVR);
DECLARE_OLD_HANDLE(HDWP); DECLARE_OLD_HANDLE(HDWP);
DECLARE_OLD_HANDLE(HENHMETAFILE); DECLARE_OLD_HANDLE(HENHMETAFILE);
...@@ -87,7 +86,6 @@ DECLARE_OLD_HANDLE(HMIXEROBJ); ...@@ -87,7 +86,6 @@ DECLARE_OLD_HANDLE(HMIXEROBJ);
DECLARE_OLD_HANDLE(HMMIO); DECLARE_OLD_HANDLE(HMMIO);
DECLARE_OLD_HANDLE(HPALETTE); DECLARE_OLD_HANDLE(HPALETTE);
DECLARE_OLD_HANDLE(HPEN); DECLARE_OLD_HANDLE(HPEN);
DECLARE_OLD_HANDLE(HQUEUE);
DECLARE_OLD_HANDLE(HRGN); DECLARE_OLD_HANDLE(HRGN);
DECLARE_OLD_HANDLE(HRSRC); DECLARE_OLD_HANDLE(HRSRC);
DECLARE_OLD_HANDLE(HTASK); DECLARE_OLD_HANDLE(HTASK);
......
windows/x11drv/event.c
View file @ dea3d786
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "file.h" #include "file.h"
#include "windef.h" #include "windef.h"
#include "x11drv.h" #include "x11drv.h"
#include "shellapi.h"
DEFAULT_DEBUG_CHANNEL(event); DEFAULT_DEBUG_CHANNEL(event);
DECLARE_DEBUG_CHANNEL(win); DECLARE_DEBUG_CHANNEL(win);
...@@ -1628,7 +1629,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) ...@@ -1628,7 +1629,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event )
p += strlen(p) + 1; p += strlen(p) + 1;
} }
*p_drop = '\0'; *p_drop = '\0';
PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L ); PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
} }
} }
} }
...@@ -1708,7 +1709,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) ...@@ -1708,7 +1709,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
pDropWnd = WIN_FindWndPtr( hWnd ); pDropWnd = WIN_FindWndPtr( hWnd );
drop_len += sizeof(DROPFILES) + 1; drop_len += sizeof(DROPFILES) + 1;
hDrop = (HDROP)GlobalAlloc( GMEM_SHARE, drop_len ); hDrop = GlobalAlloc( GMEM_SHARE, drop_len );
lpDrop = (DROPFILES *) GlobalLock( hDrop ); lpDrop = (DROPFILES *) GlobalLock( hDrop );
if( lpDrop ) { if( lpDrop ) {
...@@ -1752,7 +1753,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) ...@@ -1752,7 +1753,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event )
} }
GlobalUnlock(hDrop); GlobalUnlock(hDrop);
PostMessageA( hWnd, WM_DROPFILES, hDrop, 0L ); PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L );
} }
WIN_ReleaseWndPtr(pDropWnd); WIN_ReleaseWndPtr(pDropWnd);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment