Commit dd3d988e authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

winemac: Use unixlib for query_drag_exited.

parent 219eb6ec
...@@ -29,6 +29,7 @@ HMODULE macdrv_module = 0; ...@@ -29,6 +29,7 @@ HMODULE macdrv_module = 0;
typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size); typedef NTSTATUS (WINAPI *kernel_callback)(void *params, ULONG size);
static const kernel_callback kernel_callbacks[] = static const kernel_callback kernel_callbacks[] =
{ {
macdrv_dnd_query_exited,
macdrv_ime_query_char_rect, macdrv_ime_query_char_rect,
macdrv_ime_set_text, macdrv_ime_set_text,
}; };
......
...@@ -482,14 +482,15 @@ BOOL query_drag_drop(macdrv_query* query) ...@@ -482,14 +482,15 @@ BOOL query_drag_drop(macdrv_query* query)
/************************************************************************** /**************************************************************************
* query_drag_exited * macdrv_dnd_query_exited
*/ */
BOOL query_drag_exited(macdrv_query* query) NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size)
{ {
HWND hwnd = macdrv_get_window_hwnd(query->window); struct dnd_query_exited_params *params = arg;
HWND hwnd = params->hwnd;
IDropTarget *droptarget; IDropTarget *droptarget;
TRACE("win %p/%p\n", hwnd, query->window); TRACE("win %p\n", hwnd);
droptarget = get_droptarget_pointer(last_droptarget_hwnd); droptarget = get_droptarget_pointer(last_droptarget_hwnd);
if (droptarget) if (droptarget)
......
...@@ -180,6 +180,17 @@ static void macdrv_sent_text_input(const macdrv_event *event) ...@@ -180,6 +180,17 @@ static void macdrv_sent_text_input(const macdrv_event *event)
/************************************************************************** /**************************************************************************
* query_drag_exited
*/
static BOOL query_drag_exited(macdrv_query *query)
{
struct dnd_query_exited_params params;
params.hwnd = macdrv_get_window_hwnd(query->window);
return macdrv_client_func(client_func_dnd_query_exited, &params, sizeof(params));
}
/**************************************************************************
* query_ime_char_rect * query_ime_char_rect
*/ */
BOOL query_ime_char_rect(macdrv_query* query) BOOL query_ime_char_rect(macdrv_query* query)
......
...@@ -261,7 +261,6 @@ extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form ...@@ -261,7 +261,6 @@ extern BOOL macdrv_pasteboard_has_format(CFTypeRef pasteboard, UINT desired_form
extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN; extern UINT* macdrv_get_pasteboard_formats(CFTypeRef pasteboard, UINT* num_formats) DECLSPEC_HIDDEN;
extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_operation(macdrv_query* query) DECLSPEC_HIDDEN;
extern BOOL query_drag_exited(macdrv_query* query) DECLSPEC_HIDDEN;
extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN; extern BOOL query_drag_drop(macdrv_query* query) DECLSPEC_HIDDEN;
extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN; extern struct opengl_funcs *macdrv_wine_get_wgl_driver(UINT version) DECLSPEC_HIDDEN;
...@@ -298,6 +297,8 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN; ...@@ -298,6 +297,8 @@ extern NTSTATUS macdrv_notify_icon(void *arg) DECLSPEC_HIDDEN;
extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params, extern NTSTATUS macdrv_client_func(enum macdrv_client_funcs func, const void *params,
ULONG size) DECLSPEC_HIDDEN; ULONG size) DECLSPEC_HIDDEN;
extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN;
/* user helpers */ /* user helpers */
static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
......
...@@ -67,11 +67,18 @@ struct notify_icon_params ...@@ -67,11 +67,18 @@ struct notify_icon_params
/* driver client callbacks exposed with KernelCallbackTable interface */ /* driver client callbacks exposed with KernelCallbackTable interface */
enum macdrv_client_funcs enum macdrv_client_funcs
{ {
client_func_ime_query_char_rect = NtUserDriverCallbackFirst, client_func_dnd_query_exited = NtUserDriverCallbackFirst,
client_func_ime_query_char_rect,
client_func_ime_set_text, client_func_ime_set_text,
client_func_last client_func_last
}; };
/* macdrv_dnd_query_exited params */
struct dnd_query_exited_params
{
HWND hwnd;
};
/* macdrv_ime_query_char_rect result */ /* macdrv_ime_query_char_rect result */
struct ime_query_char_rect_result struct ime_query_char_rect_result
{ {
......
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