wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Nikolay Sivov : mfplat/sample: Fix use-after-free of a critical section.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 1d7d3f58d6666e2a5793a79ea8a28476f961e9c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7d3f58d6666e2a5793a79e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:13:24 2022 +0300 mfplat/sample: Fix use-after-free of a critical section. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index ed39b5f7297..687ada1a477 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -183,22 +183,25 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) { struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); + IRtwqAsyncResult *tracked_result = NULL; HRESULT hr; EnterCriticalSection(&sample->attributes.cs); if (sample->tracked_result && sample->tracked_refcount == refcount) { - IRtwqAsyncResult *tracked_result = sample->tracked_result; + tracked_result = sample->tracked_result; sample->tracked_result = NULL; sample->tracked_refcount = 0; /* Call could fail if queue system is not initialized, it's not critical. */ if (FAILED(hr = RtwqInvokeCallback(tracked_result))) WARN("Failed to invoke tracking callback, hr %#lx.\n", hr); - IRtwqAsyncResult_Release(tracked_result); } LeaveCriticalSection(&sample->attributes.cs); + if (tracked_result) + IRtwqAsyncResult_Release(tracked_result); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount)

1 0

Nikolay Sivov : mf/session: Do not request more samples when SA sample becomes available.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 048e21d22e33fb8187532851dad6ce566592156b URL: https://source.winehq.org/git/wine.git/?a=commit;h=048e21d22e33fb8187532851… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:12:22 2022 +0300 mf/session: Do not request more samples when SA sample becomes available. The issue here is that upstream nodes get their request counters increased while sink hasn't requested any. This causes desync between sink request counters and upstream node counters, potentially causing sample drops and sink waiting forever for samples that will never come. Case like that is easy to reproduce with mfplay-based player, where occasionally end-of-presentation condition does not trigger, but new samples are coming in. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 62 insertions(+), 9 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 85b63f767fe..a78e7cfc473 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2369,6 +2369,8 @@ static HRESULT WINAPI session_commands_callback_GetParameters(IMFAsyncCallback * return E_NOTIMPL; } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node); + static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct session_op *op = impl_op_from_IUnknown(IMFAsyncResult_GetStateNoAddRef(result)); @@ -2411,7 +2413,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, { if (SUCCEEDED(IMFTopologyNode_GetInput(topo_node->node, 0, &upstream_node, &upstream_output))) { - session_request_sample_from_node(session, upstream_node, upstream_output); + session_deliver_pending_samples(session, upstream_node); IMFTopologyNode_Release(upstream_node); } } @@ -2952,19 +2954,19 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: - if (sample) + if (topo_node->u.sink.requests) { - if (topo_node->u.sink.requests) + if (sample) { if (FAILED(hr = IMFStreamSink_ProcessSample(topo_node->object.sink_stream, sample))) WARN("Stream sink failed to process sample, hr %#lx.\n", hr); - topo_node->u.sink.requests--; } - } - else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, - NULL, NULL))) - { - WARN("Failed to place sink marker, hr %#lx.\n", hr); + else if (FAILED(hr = IMFStreamSink_PlaceMarker(topo_node->object.sink_stream, MFSTREAMSINK_MARKER_ENDOFSEGMENT, + NULL, NULL))) + { + WARN("Failed to place sink marker, hr %#lx.\n", hr); + } + topo_node->u.sink.requests--; } break; case MF_TOPOLOGY_TRANSFORM_NODE: @@ -3048,6 +3050,57 @@ static void session_deliver_sample_to_node(struct media_session *session, IMFTop } } +static void session_deliver_pending_samples(struct media_session *session, IMFTopologyNode *node) +{ + struct sample *sample_entry, *sample_entry2; + IMFTopologyNode *downstream_node; + struct topo_node *topo_node; + MF_TOPOLOGY_TYPE node_type; + DWORD downstream_input; + TOPOID node_id; + unsigned int i; + + IMFTopologyNode_GetNodeType(node, &node_type); + IMFTopologyNode_GetTopoNodeID(node, &node_id); + + topo_node = session_get_node_by_id(session, node_id); + + switch (node_type) + { + case MF_TOPOLOGY_TRANSFORM_NODE: + + transform_node_pull_samples(session, topo_node); + + /* Push down all available output. */ + for (i = 0; i < topo_node->u.transform.output_count; ++i) + { + if (FAILED(IMFTopologyNode_GetOutput(node, i, &downstream_node, &downstream_input))) + { + WARN("Failed to get connected node for output %u.\n", i); + continue; + } + + LIST_FOR_EACH_ENTRY_SAFE(sample_entry, sample_entry2, &topo_node->u.transform.outputs[i].samples, + struct sample, entry) + { + if (!topo_node->u.transform.outputs[i].requests) + break; + + session_deliver_sample_to_node(session, downstream_node, downstream_input, sample_entry->sample); + topo_node->u.transform.outputs[i].requests--; + + transform_release_sample(sample_entry); + } + + IMFTopologyNode_Release(downstream_node); + } + break; + default: + FIXME("Unexpected node type %u.\n", node_type); + } +} + + static HRESULT session_request_sample_from_node(struct media_session *session, IMFTopologyNode *node, DWORD output) { IMFTopologyNode *downstream_node, *upstream_node;

1 0

Jinoh Kang : wineusb.sys: Remove erroneous call to LeaveCriticalSection() in add_usb_device.
by Alexandre Julliard 11 May '22

11 May '22

Module: wine Branch: master Commit: 2c83ec801d228a54ed297809fec5b63c98054f4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c83ec801d228a54ed297809… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 7 17:34:29 2022 +0900 wineusb.sys: Remove erroneous call to LeaveCriticalSection() in add_usb_device. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index cca0257bb02..c41ea580137 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -114,7 +114,6 @@ static void add_usb_device(libusb_device *libusb_device) FILE_DEVICE_USB, 0, FALSE, &device_obj))) { ERR("Failed to create device, status %#x.\n", status); - LeaveCriticalSection(&wineusb_cs); libusb_close(handle); return; }

1 0

Alexandre Julliard : Wine release 7.8
by Alexandre Julliard 06 May '22

06 May '22

Module: website Branch: master Commit: 44f2de0497c2a3f9b18ebc3b143a1ec60e072233 URL: https://source.winehq.org/git/website.git/?a=commit;h=44f2de0497c2a3f9b18eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:39:11 2022 +0200 Wine release 7.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022050601.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022050601.xml b/news/en/2022050601.xml new file mode 100644 index 00000000..6ca2abdf --- /dev/null +++ b/news/en/2022050601.xml @@ -0,0 +1,16 @@ +<news> +<date>May 6, 2022</date> +<title>Wine 7.8 Released</title> +<body> + The Wine development release 7.8 is now available. + <a href="{$root}/announce/7.8">What's new</a> in this release: +<ul> + <li>X11 and OSS drivers converted to PE.</li> + <li>WoW64 support in the sound drivers.</li> + <li>Number formatting using the new locale database.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.8 : Alexandre Julliard : Release 7.8
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: refs/tags/wine-7.8 Tag: 1c25681084f19b152af765dc4d20ab816b8225d3 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1c25681084f19b152af765dc4d2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:36:51 2022 +0200 Release 7.8

1 0

Alexandre Julliard : Release 7.8.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 3ded60bd1654dc689d24a23305f4a93acce3a6f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ded60bd1654dc689d24a233… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 6 22:36:51 2022 +0200 Release 7.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1014 +++++++++++++++++++++++++++++++++++-------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 586 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3ded60bd1654dc689d24…

1 0

Zhiyi Zhang : wintypes: Implement IApiInformationStatics stubs.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 1c5d218ffb357cdb6b6dd71359740167352e1d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5d218ffb357cdb6b6dd713… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri May 6 17:29:28 2022 +0800 wintypes: Implement IApiInformationStatics stubs. Required for Iragon: Prologue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/wintypes/main.c | 207 +++++++++++++++++++ dlls/wintypes/tests/Makefile.in | 5 + dlls/wintypes/tests/wintypes.c | 437 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 651 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5d218ffb357cdb6b6d…

1 0

Rémi Bernon : dinput: Do not delete static critical section.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 78ecbc4b2d548e4cb57af622d40d0149366a7354 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ecbc4b2d548e4cb57af622… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 13:14:31 2022 +0200 dinput: Do not delete static critical section. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/dinput_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index a7ab3b7a9e2..0cd5eb59588 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1439,7 +1439,6 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) if (reserved) break; dinput_thread_stop(); unregister_di_em_win_class(); - DeleteCriticalSection(&dinput_hook_crit); break; } return TRUE;

1 0

Jacek Caban : winex11: Don't use unicode.h.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: a3132f2906d0f8bdcb150749b3fbe31a63923da0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3132f2906d0f8bdcb150749… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:48:24 2022 +0200 winex11: Don't use unicode.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 3 +-- dlls/winex11.drv/graphics.c | 5 ++--- dlls/winex11.drv/keyboard.c | 5 ++--- dlls/winex11.drv/mouse.c | 9 ++++----- dlls/winex11.drv/settings.c | 5 ++--- dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/wintab.c | 23 +++++++++++------------ dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/x11drv_main.c | 13 ++++++------- dlls/winex11.drv/xim.c | 7 +++---- dlls/winex11.drv/xrandr.c | 3 +-- dlls/winex11.drv/xrender.c | 7 +++---- 12 files changed, 36 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3132f2906d0f8bdcb15…

1 0

Jacek Caban : winex11: Build with msvcrt.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: a3d4eefa0d851e79154b5b509434c439cde5e511 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3d4eefa0d851e79154b5b50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:38:52 2022 +0200 winex11: Build with msvcrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 2 -- dlls/winex11.drv/dllmain.c | 3 +-- dlls/winex11.drv/ime.c | 11 +--------- dlls/winex11.drv/systray.c | 16 +------------- dlls/winex11.drv/x11drv.h | 19 ---------------- dlls/winex11.drv/x11drv_dll.h | 51 +++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/xdnd.c | 20 +++-------------- 7 files changed, 57 insertions(+), 65 deletions(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9de440c35ff..3c653902ef2 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -6,8 +6,6 @@ DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = -lwin32u $(X_LIBS) $(X_EXTRA_LIBS) $(PTHREAD_LIBS) -lm -EXTRADLLFLAGS = -mcygwin - C_SRCS = \ bitblt.c \ brush.c \ diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 1f1d98903bc..b9bf5efd1e3 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -18,8 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "x11drv.h" +#include "x11drv_dll.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index b2b61a17604..5f8bdd8c68b 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -40,19 +40,10 @@ * generate the messages that we want the IMM layer to send to the application. */ -#include "config.h" - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winerror.h" +#include "x11drv_dll.h" #include "wine/debug.h" #include "imm.h" #include "ddk/imm.h" -#include "winnls.h" -#include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 961ec05a7dc..599240e3672 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -20,25 +20,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <assert.h> -#include <stdarg.h> -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> - -#include <X11/Xlib.h> - #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" +#include "x11drv_dll.h" #include "commctrl.h" #include "shellapi.h" -#include "x11drv.h" #include "wine/list.h" #include "wine/debug.h" diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 56c141a018d..257146fadcf 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -435,7 +435,6 @@ extern int primary_monitor DECLSPEC_HIDDEN; extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; extern int xrender_error_base DECLSPEC_HIDDEN; -extern HMODULE x11drv_module DECLSPEC_HIDDEN; extern char *process_name DECLSPEC_HIDDEN; extern Display *clipboard_display DECLSPEC_HIDDEN; extern WNDPROC client_foreign_window_proc; @@ -841,24 +840,6 @@ extern NTSTATUS x11drv_tablet_info( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_xim_preedit_state( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_xim_reset( void *arg ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_ime_set_composition_string( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_ime_set_result( void *params, ULONG size ) DECLSPEC_HIDDEN; -extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) DECLSPEC_HIDDEN; - -extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_get_cursor_pos( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_composition_status( UINT arg ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN; -extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; - -extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, - LPARAM lparam ) DECLSPEC_HIDDEN; - extern NTSTATUS x11drv_client_func( enum x11drv_client_funcs func, const void *params, ULONG size ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_client_call( enum client_callback func, UINT arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h new file mode 100644 index 00000000000..047bb430d39 --- /dev/null +++ b/dlls/winex11.drv/x11drv_dll.h @@ -0,0 +1,51 @@ +/* + * X11 driver definitions + * + * Copyright 2022 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_X11DRV_DLL_H +#define __WINE_X11DRV_DLL_H + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "ntgdi.h" +#include "unixlib.h" + +extern NTSTATUS WINAPI x11drv_dnd_enter_event( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_dnd_position_event( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_dnd_post_drop( void *data, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_ime_set_composition_string( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_ime_set_result( void *params, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) DECLSPEC_HIDDEN; + +extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_get_cursor_pos( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_composition_status( UINT arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; + +extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, + LPARAM lparam ) DECLSPEC_HIDDEN; + +extern BOOL show_systray DECLSPEC_HIDDEN; +extern HMODULE x11drv_module DECLSPEC_HIDDEN; + +#endif /* __WINE_X11DRV_DLL_H */ diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 975fe7a114b..9137f46b5dc 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -19,26 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include <string.h> -#include <unistd.h> -#include <stdarg.h> -#include <stdio.h> - +#define COBJMACROS #define NONAMELESSUNION -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#define COBJMACROS -#include "x11drv.h" +#include "x11drv_dll.h" #include "shellapi.h" -#include "shlobj.h" /* DROPFILES */ -#include "oleidl.h" -#include "objidl.h" +#include "shlobj.h" #include "wine/debug.h" #include "wine/list.h"

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022