September 2016 - Wine-commits

Frédéric Delanoy : French translation for release 1.9.19
by Jeremy Newman 26 Sep '16

26 Sep '16

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 26 Sep '16

26 Sep '16

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

Andrey Gusev : api-ms-win-core-appinit-l1-1-0: Add dll.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: f3994e6e84d0f883e1710db0ab0b797a62475304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3994e6e84d0f883e1710db0a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Sep 24 13:45:47 2016 +0300 api-ms-win-core-appinit-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-appinit-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index fc48509..41f70be 100755 --- a/configure +++ b/configure @@ -875,6 +875,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_apiquery_l1_1_0 +enable_api_ms_win_core_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 @@ -17555,6 +17556,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 +wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 diff --git a/configure.ac b/configure.ac index ac217f0..406ac9d 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in b/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in new file mode 100644 index 0000000..aaf5f6b --- /dev/null +++ b/dlls/api-ms-win-core-appinit-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-appinit-l1-1-0.dll diff --git a/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec new file mode 100644 index 0000000..7ace09e --- /dev/null +++ b/dlls/api-ms-win-core-appinit-l1-1-0/api-ms-win-core-appinit-l1-1-0.spec @@ -0,0 +1 @@ +@ stub LoadAppInitDlls diff --git a/tools/make_specfiles b/tools/make_specfiles index d17bb17..0f60b90 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -213,6 +213,7 @@ my @dll_groups = [ "kernel32", "user32", + "api-ms-win-core-appinit-l1-1-0", "api-ms-win-core-libraryloader-l1-1-0", "api-ms-win-core-libraryloader-l1-1-1", "api-ms-win-core-libraryloader-l1-2-0",

1 0

Andrey Gusev : api-ms-win-core-version-private-l1-1-0: Add dll.
by Alexandre Julliard 26 Sep '16

26 Sep '16

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

Alexandre Julliard : user32: Store clipboard data on the server side.
by Alexandre Julliard 26 Sep '16

26 Sep '16

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 : user32: Retrieve available clipboard formats from the server.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: c69b4995c5bed5189a0742ed795a7af778b56a1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69b4995c5bed5189a0742ed7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 13:55:09 2016 +0900 user32: Retrieve available clipboard formats from the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 61 ++++++++++++++++++++++++++---------------- dlls/user32/tests/clipboard.c | 3 +-- include/wine/server_protocol.h | 37 ++++++++++++++++++++++++- server/clipboard.c | 55 +++++++++++++++++++++++++++++++++++++ server/protocol.def | 17 ++++++++++++ server/request.h | 12 +++++++++ server/trace.c | 27 +++++++++++++++++++ 7 files changed, 186 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c69b4995c5bed5189a074…

1 0

Alexandre Julliard : user32: Retrieve clipboard data from the server.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: 3044935b0e8fb76ea2b223418e35f392422e0a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3044935b0e8fb76ea2b223418… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 14:19:28 2016 +0900 user32: Retrieve clipboard data from the server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 131 ++++++++++++++++++++++++++++------------- dlls/user32/tests/clipboard.c | 56 +++++++++--------- include/wine/server_protocol.h | 20 ++++++- server/clipboard.c | 25 ++++++++ server/protocol.def | 10 ++++ server/request.h | 7 +++ server/trace.c | 15 +++++ 7 files changed, 195 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3044935b0e8fb76ea2b22…

1 0

Alexandre Julliard : user32: Add synthesized clipboard formats on the server side.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: 9ed8f5e83fbd00d6c3c31167a632df0664e6b1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed8f5e83fbd00d6c3c31167a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:00:22 2016 +0900 user32: Add synthesized clipboard formats on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 139 +++-------------------------------------- include/wine/server_protocol.h | 6 +- server/clipboard.c | 63 ++++++++++++++++++- server/protocol.def | 2 + server/request.h | 10 +-- server/trace.c | 4 +- 6 files changed, 84 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ed8f5e83fbd00d6c3c31…

1 0

Alexandre Julliard : user32: Cache clipboard data on the client side.
by Alexandre Julliard 26 Sep '16

26 Sep '16

Module: wine Branch: master Commit: f0fbf1a9d1345750c2bfce5858617b4095ce3ba7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0fbf1a9d1345750c2bfce585… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 26 15:09:27 2016 +0900 user32: Cache clipboard data on the client side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/clipboard.c | 181 ++++++++++++++++++++++++++++++++++++++++- dlls/user32/tests/clipboard.c | 18 ++-- include/wine/server_protocol.h | 10 ++- server/clipboard.c | 12 ++- server/protocol.def | 7 +- server/request.h | 9 +- server/trace.c | 12 ++- 7 files changed, 224 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f0fbf1a9d1345750c2bfc…

1 0

Alexandre Julliard : user32: Remove no longer used clipboard driver entry points.
by Alexandre Julliard 26 Sep '16

26 Sep '16

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