September 2016 - Wine-Commits

Frédéric Delanoy : French translation for release 1.9.19
by Jeremy Newman Sept. 26, 2016

Sept. 26, 2016

Module: website Branch: master Commit: f6d6fae0411b7d2bb58d2bc2ac75b879988e13ac URL: http://source.winehq.org/git/website.git/?a=commit;h=f6d6fae0411b7d2bb58d2b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sun Sep 25 09:26:44 2016 +0200 French translation for release 1.9.19 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016091701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2016091701.xml b/news/fr/2016091701.xml new file mode 100644 index 0000000..be4b357 --- /dev/null +++ b/news/fr/2016091701.xml @@ -0,0 +1,15 @@ +<news> +<date>17 septembre 2016</date> +<title>Sortie de Wine 1.9.19</title> +<body> +La version de développement 1.9.19 de Wine est disponible. +<a href="{$root}/announce/1.9.19">Nouveautés</a> de cette version : +<ul> + <li>Version initiale d'un pilote de bus udev pour les périphériques HID.</li> + <li>Diverses améliorations dans la prise en charge des joysticks.</li> + <li>Implémentation initiale du rendu DC dans Direct2D.</li> + <li>Prise en charge améliorée des métafichiers dans GDI+.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.19.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 760 Ti to the GPU list.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: c76c7d85d0be45edf72e63ae7eae51c018383070 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c76c7d85d0be45edf72e63ae7… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Sat Sep 24 02:58:50 2016 +0200 wined3d: Add NVIDIA GTX 760 Ti to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2cdc03f..7ab68aa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1290,7 +1290,8 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT750M, "NVIDIA GeForce GT 750M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750, "NVIDIA GeForce GTX 750", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX750TI, "NVIDIA GeForce GTX 750 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA Geforce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760, "NVIDIA GeForce GTX 760", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX760TI, "NVIDIA GeForce GTX 760 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1798,6 +1799,7 @@ cards_nvidia_binary[] = {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ + {"GTX 760 Ti", CARD_NVIDIA_GEFORCE_GTX760TI}, /* Geforce 700 - midend high */ {"GTX 760", CARD_NVIDIA_GEFORCE_GTX760}, /* Geforce 700 - midend high */ {"GTX 750 Ti", CARD_NVIDIA_GEFORCE_GTX750TI}, /* Geforce 700 - midend */ {"GTX 750", CARD_NVIDIA_GEFORCE_GTX750}, /* Geforce 700 - midend */ @@ -2170,7 +2172,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX / 760TI */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8b11d6..83d5248 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1927,6 +1927,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX750 = 0x1381, CARD_NVIDIA_GEFORCE_GTX750TI = 0x1380, CARD_NVIDIA_GEFORCE_GTX760 = 0x1187, + CARD_NVIDIA_GEFORCE_GTX760TI = 0x1193, CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,

1 0

Filip Frąckiewicz : wined3d: Add NVIDIA GTX 675MX to the GPU list.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: b8273a1118fec45237d76d3e357ecb215c09d8c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8273a1118fec45237d76d3e3… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Sat Sep 24 00:00:18 2016 +0200 wined3d: Add NVIDIA GTX 675MX to the GPU list. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 783cd45..2cdc03f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1281,6 +1281,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX660TI, "NVIDIA GeForce GTX 660 Ti", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE8, 3072}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, @@ -1806,6 +1807,7 @@ cards_nvidia_binary[] = {"GT 730", CARD_NVIDIA_GEFORCE_GT730}, /* Geforce 700 - lowend */ {"GTX 690", CARD_NVIDIA_GEFORCE_GTX690}, /* Geforce 600 - highend */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ + {"GTX 675MX", CARD_NVIDIA_GEFORCE_GTX675MX}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ {"GTX 660 Ti", CARD_NVIDIA_GEFORCE_GTX660TI}, /* Geforce 600 - midend high */ @@ -2168,7 +2170,7 @@ cards_nvidia_mesa[] = {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, - {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 */ + {"NVE4", CARD_NVIDIA_GEFORCE_GTX680}, /* 690 / 675MX */ /* Fermi */ {"NVD9", CARD_NVIDIA_GEFORCE_GT520}, {"NVD7", CARD_NVIDIA_GEFORCE_820M}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f1440ba..e8b11d6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1917,6 +1917,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX660TI = 0x1183, CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, + CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, CARD_NVIDIA_GEFORCE_GT730 = 0x1287,

1 0

Alexandre Julliard : user32: Store clipboard data on the server side.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: 79f90e4e41477f600ac24b1a756e9cb557fe1d71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f90e4e41477f600ac24b1a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 11:48:32 2016 +0900 user32: Store clipboard data on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 101 +++++++++++++++++++++++++++----- dlls/user32/tests/clipboard.c | 27 +++++---- include/wine/server_protocol.h | 20 ++++++- server/clipboard.c | 128 +++++++++++++++++++++++++++++++++++++---- server/protocol.def | 8 ++- server/request.h | 5 +- server/trace.c | 10 +++- 7 files changed, 255 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79f90e4e41477f600ac24…

1 0

Alexandre Julliard : winex11: Ignore X11 errors happening on the clipboard display connection.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: 4bbe8f90d47e9a9fffc7e471cd27fa7768636e53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bbe8f90d47e9a9fffc7e471c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 21:06:14 2016 +0900 winex11: Ignore X11 errors happening on the clipboard display connection. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 17 +++++------------ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 3 +++ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 1b4817f..d0d301b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,6 +203,8 @@ static ULONG64 last_clipboard_update; static struct clipboard_format **current_x11_formats; static unsigned int nb_current_x11_formats; +Display *clipboard_display = NULL; + static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; @@ -259,11 +261,6 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) return (event->error_code == BadAtom); } -static int is_window_error( Display *display, XErrorEvent *event, void *arg ) -{ - return (event->error_code == BadWindow); -} - /************************************************************************** * find_win32_format @@ -2007,12 +2004,12 @@ static DWORD WINAPI clipboard_thread( void *arg ) XSetWindowAttributes attr; WNDCLASSW class; MSG msg; - Display *display = thread_init_display(); if (!wait_clipboard_mutex()) return 0; + clipboard_display = thread_init_display(); attr.event_mask = PropertyChangeMask; - import_window = XCreateWindow( display, root_window, 0, 0, 1, 1, 0, CopyFromParent, + import_window = XCreateWindow( clipboard_display, root_window, 0, 0, 1, 1, 0, CopyFromParent, InputOutput, CopyFromParent, CWEventMask, &attr ); if (!import_window) { @@ -2039,7 +2036,7 @@ static DWORD WINAPI clipboard_thread( void *arg ) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener( clipboard_hwnd ); register_builtin_formats(); - grab_win32_clipboard( display ); + grab_win32_clipboard( clipboard_display ); TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); @@ -2075,8 +2072,6 @@ BOOL X11DRV_SelectionRequest( HWND hwnd, XEvent *xev ) XEvent result; Atom rprop = None; - X11DRV_expect_error( display, is_window_error, NULL ); - TRACE( "got request on %lx for selection %s target %s win %lx prop %s\n", event->owner, debugstr_xatom( event->selection ), debugstr_xatom( event->target ), event->requestor, debugstr_xatom( event->property )); @@ -2105,8 +2100,6 @@ done: result.xselection.time = event->time; TRACE( "sending SelectionNotify for %s to %lx\n", debugstr_xatom( rprop ), event->requestor ); XSendEvent( display, event->requestor, False, NoEventMask, &result ); - XSync( display, False ); - if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor ); return FALSE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 544e869..d622468 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -385,6 +385,7 @@ 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 Display *clipboard_display DECLSPEC_HIDDEN; /* atoms */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e020c68..41097f4 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -210,6 +210,9 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event ) if ((event->request_code == X_SetInputFocus || event->request_code == X_ChangeWindowAttributes) && (event->error_code == BadMatch || event->error_code == BadWindow)) return TRUE; + /* the clipboard display interacts with external windows, ignore all errors */ + if (display == clipboard_display) return TRUE; + /* ignore a number of errors on gdi display caused by creating/destroying windows */ if (display == gdi_display) {

1 0

Alexandre Julliard : winex11: Remove the driver-side clipboard data storage.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: a46d7360123ab02b5bf9dfb9234c433e8c6ebcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a46d7360123ab02b5bf9dfb92… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:24:47 2016 +0900 winex11: Remove the driver-side clipboard data storage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 412 +------------------------------------- dlls/winex11.drv/winex11.drv.spec | 6 - 2 files changed, 3 insertions(+), 415 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a46d7360123ab02b5bf9d…

1 0

Alexandre Julliard : winex11: Run a single clipboard manager thread per window station, inside the explorer process.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: a52d09198d3264c9c712a70de57446e6183957dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52d09198d3264c9c712a70de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:27:40 2016 +0900 winex11: Run a single clipboard manager thread per window station, inside the explorer process. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 423 ++++++++++++++++++++--------------------- dlls/winex11.drv/window.c | 6 +- dlls/winex11.drv/x11drv.h | 5 +- dlls/winex11.drv/x11drv_main.c | 2 - 4 files changed, 216 insertions(+), 220 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a52d09198d3264c9c712a…

1 0

Alexandre Julliard : winex11: Add a helper function to register builtin clipboard formats.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: e9461b4567935c75ab1d6d48358de9dd06df85f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9461b4567935c75ab1d6d483… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 20:16:06 2016 +0900 winex11: Add a helper function to register builtin clipboard formats. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 47 ++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index cc4f92f..602a69a 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -342,6 +342,31 @@ static struct clipboard_format *find_x11_format( Atom atom ) /************************************************************************** + * register_builtin_formats + */ +static void register_builtin_formats(void) +{ + struct clipboard_format *formats; + unsigned int i; + + if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; + + for (i = 0; i < NB_BUILTIN_FORMATS; i++) + { + if (builtin_formats[i].name) + formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); + else + formats[i].id = builtin_formats[i].id; + + formats[i].atom = GET_ATOM(builtin_formats[i].data); + formats[i].import = builtin_formats[i].import; + formats[i].export = builtin_formats[i].export; + list_add_tail( &format_list, &formats[i].entry ); + } +} + + +/************************************************************************** * register_formats */ static void register_formats( const UINT *ids, const Atom *atoms, unsigned int count ) @@ -376,6 +401,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) Atom atoms[256]; WCHAR buffer[256]; + if (list_empty( &format_list)) register_builtin_formats(); + while (size) { for (count = 0; count < 256 && size; ids++, size--) @@ -410,6 +437,8 @@ static void register_x11_formats( const Atom *atoms, UINT size ) Atom new_atoms[256]; WCHAR buffer[256]; + if (list_empty( &format_list)) register_builtin_formats(); + while (size) { for (count = 0; count < 256 && size; atoms++, size--) @@ -442,23 +471,7 @@ static void register_x11_formats( const Atom *atoms, UINT size ) */ void X11DRV_InitClipboard(void) { - struct clipboard_format *formats; - UINT i; - - if (!(formats = HeapAlloc( GetProcessHeap(), 0, NB_BUILTIN_FORMATS * sizeof(*formats)))) return; - - for (i = 0; i < NB_BUILTIN_FORMATS; i++) - { - if (builtin_formats[i].name) - formats[i].id = RegisterClipboardFormatW( builtin_formats[i].name ); - else - formats[i].id = builtin_formats[i].id; - - formats[i].atom = GET_ATOM(builtin_formats[i].data); - formats[i].import = builtin_formats[i].import; - formats[i].export = builtin_formats[i].export; - list_add_tail( &format_list, &formats[i].entry ); - } + register_builtin_formats(); }

1 0

Alexandre Julliard : user32: Remove no longer used clipboard driver entry points.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: b39a0f008b9ba7aba6d5b0837dabb236d103dfff URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39a0f008b9ba7aba6d5b0837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:54:05 2016 +0900 user32: Remove no longer used clipboard driver entry points. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 89 ---------------------------------------------- dlls/user32/user_private.h | 7 ---- 2 files changed, 96 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 1745b50..c4cbb8a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -121,13 +121,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(GetCursorPos); GET_USER_FUNC(SetCursorPos); GET_USER_FUNC(ClipCursor); - GET_USER_FUNC(EmptyClipboard); - GET_USER_FUNC(SetClipboardData); - GET_USER_FUNC(GetClipboardData); - GET_USER_FUNC(CountClipboardFormats); - GET_USER_FUNC(EnumClipboardFormats); - GET_USER_FUNC(IsClipboardFormatAvailable); - GET_USER_FUNC(EndClipboardUpdate); GET_USER_FUNC(UpdateClipboard); GET_USER_FUNC(ChangeDisplaySettingsEx); GET_USER_FUNC(EnumDisplayMonitors); @@ -337,39 +330,6 @@ static BOOL CDECL nulldrv_ClipCursor( LPCRECT clip ) return FALSE; } -static BOOL CDECL nulldrv_CountClipboardFormats(void) -{ - return 0; -} - -static void CDECL nulldrv_EmptyClipboard(void) -{ -} - -static void CDECL nulldrv_EndClipboardUpdate(void) -{ -} - -static UINT CDECL nulldrv_EnumClipboardFormats( UINT format ) -{ - return 0; -} - -static HANDLE CDECL nulldrv_GetClipboardData( UINT format ) -{ - return 0; -} - -static BOOL CDECL nulldrv_IsClipboardFormatAvailable( UINT format ) -{ - return FALSE; -} - -static BOOL CDECL nulldrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) -{ - return FALSE; -} - static void CDECL nulldrv_UpdateClipboard(void) { } @@ -546,13 +506,6 @@ static USER_DRIVER null_driver = nulldrv_SetCursorPos, nulldrv_ClipCursor, /* clipboard functions */ - nulldrv_CountClipboardFormats, - nulldrv_EmptyClipboard, - nulldrv_EndClipboardUpdate, - nulldrv_EnumClipboardFormats, - nulldrv_GetClipboardData, - nulldrv_IsClipboardFormatAvailable, - nulldrv_SetClipboardData, nulldrv_UpdateClipboard, /* display modes */ nulldrv_ChangeDisplaySettingsEx, @@ -687,41 +640,6 @@ static BOOL CDECL loaderdrv_ClipCursor( LPCRECT clip ) return load_driver()->pClipCursor( clip ); } -static BOOL CDECL loaderdrv_CountClipboardFormats(void) -{ - return load_driver()->pCountClipboardFormats(); -} - -static void CDECL loaderdrv_EmptyClipboard(void) -{ - load_driver()->pEmptyClipboard(); -} - -static void CDECL loaderdrv_EndClipboardUpdate(void) -{ - load_driver()->pEndClipboardUpdate(); -} - -static UINT CDECL loaderdrv_EnumClipboardFormats( UINT format ) -{ - return load_driver()->pEnumClipboardFormats( format ); -} - -static HANDLE CDECL loaderdrv_GetClipboardData( UINT format ) -{ - return load_driver()->pGetClipboardData( format ); -} - -static BOOL CDECL loaderdrv_IsClipboardFormatAvailable( UINT format ) -{ - return load_driver()->pIsClipboardFormatAvailable( format ); -} - -static BOOL CDECL loaderdrv_SetClipboardData( UINT format, HANDLE handle, BOOL owner ) -{ - return load_driver()->pSetClipboardData( format, handle, owner ); -} - static void CDECL loaderdrv_UpdateClipboard(void) { load_driver()->pUpdateClipboard(); @@ -809,13 +727,6 @@ static USER_DRIVER lazy_load_driver = loaderdrv_SetCursorPos, loaderdrv_ClipCursor, /* clipboard functions */ - loaderdrv_CountClipboardFormats, - loaderdrv_EmptyClipboard, - loaderdrv_EndClipboardUpdate, - loaderdrv_EnumClipboardFormats, - loaderdrv_GetClipboardData, - loaderdrv_IsClipboardFormatAvailable, - loaderdrv_SetClipboardData, loaderdrv_UpdateClipboard, /* display modes */ loaderdrv_ChangeDisplaySettingsEx, diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3b9b200..0b5b2ac 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -80,13 +80,6 @@ typedef struct tagUSER_DRIVER { BOOL (CDECL *pSetCursorPos)(INT,INT); BOOL (CDECL *pClipCursor)(LPCRECT); /* clipboard functions */ - BOOL (CDECL *pCountClipboardFormats)(void); /* Count available clipboard formats */ - void (CDECL *pEmptyClipboard)(void); /* Empty clipboard data */ - void (CDECL *pEndClipboardUpdate)(void); /* End clipboard update */ - UINT (CDECL *pEnumClipboardFormats)(UINT); /* Enumerate clipboard formats */ - HANDLE (CDECL *pGetClipboardData)(UINT); /* Get specified selection data */ - BOOL (CDECL *pIsClipboardFormatAvailable)(UINT); /* Check if specified format is available */ - BOOL (CDECL *pSetClipboardData)(UINT, HANDLE, BOOL); /* Set specified selection data */ void (CDECL *pUpdateClipboard)(void); /* display modes */ LONG (CDECL *pChangeDisplaySettingsEx)(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);

1 0

Andrey Gusev : api-ms-win-core-version-private-l1-1-0: Add dll.
by Alexandre Julliard Sept. 26, 2016

Sept. 26, 2016

Module: wine Branch: master Commit: ac005d460d05d0e02fc97684dc25d1e383858368 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac005d460d05d0e02fc97684d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun Sep 25 12:49:35 2016 +0300 api-ms-win-core-version-private-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-version-private-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-version-private-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 41f70be..7ef7019 100755 --- a/configure +++ b/configure @@ -964,6 +964,7 @@ enable_api_ms_win_core_toolhelp_l1_1_0 enable_api_ms_win_core_url_l1_1_0 enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_version_l1_1_0 +enable_api_ms_win_core_version_private_l1_1_0 enable_api_ms_win_core_versionansi_l1_1_0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 @@ -17645,6 +17646,7 @@ wine_fn_config_dll api-ms-win-core-toolhelp-l1-1-0 enable_api_ms_win_core_toolhe wine_fn_config_dll api-ms-win-core-url-l1-1-0 enable_api_ms_win_core_url_l1_1_0 wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-version-l1-1-0 enable_api_ms_win_core_version_l1_1_0 +wine_fn_config_dll api-ms-win-core-version-private-l1-1-0 enable_api_ms_win_core_version_private_l1_1_0 wine_fn_config_dll api-ms-win-core-versionansi-l1-1-0 enable_api_ms_win_core_versionansi_l1_1_0 wine_fn_config_dll api-ms-win-core-windowserrorreporting-l1-1-0 enable_api_ms_win_core_windowserrorreporting_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 diff --git a/configure.ac b/configure.ac index 406ac9d..950489b 100644 --- a/configure.ac +++ b/configure.ac @@ -2740,6 +2740,7 @@ WINE_CONFIG_DLL(api-ms-win-core-toolhelp-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-url-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-version-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-version-private-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-versionansi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-windowserrorreporting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) diff --git a/dlls/api-ms-win-core-version-private-l1-1-0/Makefile.in b/dlls/api-ms-win-core-version-private-l1-1-0/Makefile.in new file mode 100644 index 0000000..15ed3b4 --- /dev/null +++ b/dlls/api-ms-win-core-version-private-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-version-private-l1-1-0.dll diff --git a/dlls/api-ms-win-core-version-private-l1-1-0/api-ms-win-core-version-private-l1-1-0.spec b/dlls/api-ms-win-core-version-private-l1-1-0/api-ms-win-core-version-private-l1-1-0.spec new file mode 100644 index 0000000..1c6c7ae --- /dev/null +++ b/dlls/api-ms-win-core-version-private-l1-1-0/api-ms-win-core-version-private-l1-1-0.spec @@ -0,0 +1 @@ +@ stub GetFileVersionInfoByHandle diff --git a/tools/make_specfiles b/tools/make_specfiles index 0f60b90..86dfeb6 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -265,6 +265,7 @@ my @dll_groups = "version", "api-ms-win-core-versionansi-l1-1-0", "api-ms-win-core-version-l1-1-0", + "api-ms-win-core-version-private-l1-1-0", "api-ms-win-downlevel-version-l1-1-0", ], [

1 0