wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Max Qian : api-ms-win-eventlog-legacy-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: b2200d7275067585810c4f25dbec869b31dc4074 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2200d7275067585810c4f25d… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:53 2016 -0700 api-ms-win-eventlog-legacy-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-eventlog-legacy-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index edcfea5..533151c 100755 --- a/configure +++ b/configure @@ -977,6 +977,7 @@ enable_api_ms_win_downlevel_user32_l1_1_0 enable_api_ms_win_downlevel_version_l1_1_0 enable_api_ms_win_eventing_classicprovider_l1_1_0 enable_api_ms_win_eventing_provider_l1_1_0 +enable_api_ms_win_eventlog_legacy_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 @@ -17519,6 +17520,7 @@ wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downleve wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll api-ms-win-eventing-classicprovider-l1-1-0 enable_api_ms_win_eventing_classicprovider_l1_1_0 wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventing_provider_l1_1_0 +wine_fn_config_dll api-ms-win-eventlog-legacy-l1-1-0 enable_api_ms_win_eventlog_legacy_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 diff --git a/configure.ac b/configure.ac index fc629dc..b6e2aab 100644 --- a/configure.ac +++ b/configure.ac @@ -2742,6 +2742,7 @@ WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-classicprovider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-eventlog-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) diff --git a/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..11590ca --- /dev/null +++ b/dlls/api-ms-win-eventlog-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-eventlog-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec new file mode 100644 index 0000000..6a12a60 --- /dev/null +++ b/dlls/api-ms-win-eventlog-legacy-l1-1-0/api-ms-win-eventlog-legacy-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall DeregisterEventSource(long) advapi32.DeregisterEventSource +@ stdcall GetEventLogInformation(long long ptr long ptr) advapi32.GetEventLogInformation +@ stdcall RegisterEventSourceA(ptr ptr) advapi32.RegisterEventSourceA +@ stdcall RegisterEventSourceW(ptr ptr) advapi32.RegisterEventSourceW +@ stdcall ReportEventA(long long long long ptr long long ptr ptr) advapi32.ReportEventA +@ stdcall ReportEventW(long long long long ptr long long ptr ptr) advapi32.ReportEventW diff --git a/tools/make_specfiles b/tools/make_specfiles index 25a5bdf..b5e5904 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -115,6 +115,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-classicprovider-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", + "api-ms-win-eventlog-legacy-l1-1-0", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0",

1 0

Max Qian : api-ms-win-core-toolhelp-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 87976da4415a8e90829d43c56316417f4ae70f6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87976da4415a8e90829d43c56… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:52 2016 -0700 api-ms-win-core-toolhelp-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-toolhelp-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-toolhelp-l1-1-0.spec | 7 +++++++ tools/make_specfiles | 1 + 5 files changed, 12 insertions(+) diff --git a/configure b/configure index d7940ba..edcfea5 100755 --- a/configure +++ b/configure @@ -940,6 +940,7 @@ enable_api_ms_win_core_sysinfo_l1_2_1 enable_api_ms_win_core_threadpool_l1_2_0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 enable_api_ms_win_core_timezone_l1_1_0 +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 @@ -17481,6 +17482,7 @@ wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-1 enable_api_ms_win_core_sysinfo wine_fn_config_dll api-ms-win-core-threadpool-l1-2-0 enable_api_ms_win_core_threadpool_l1_2_0 wine_fn_config_dll api-ms-win-core-threadpool-legacy-l1-1-0 enable_api_ms_win_core_threadpool_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-timezone-l1-1-0 enable_api_ms_win_core_timezone_l1_1_0 +wine_fn_config_dll api-ms-win-core-toolhelp-l1-1-0 enable_api_ms_win_core_toolhelp_l1_1_0 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 diff --git a/configure.ac b/configure.ac index 90c2d04..fc629dc 100644 --- a/configure.ac +++ b/configure.ac @@ -2705,6 +2705,7 @@ WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-1) WINE_CONFIG_DLL(api-ms-win-core-threadpool-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-threadpool-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-timezone-l1-1-0) +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) diff --git a/dlls/api-ms-win-core-toolhelp-l1-1-0/Makefile.in b/dlls/api-ms-win-core-toolhelp-l1-1-0/Makefile.in new file mode 100644 index 0000000..50368cb --- /dev/null +++ b/dlls/api-ms-win-core-toolhelp-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-toolhelp-l1-1-0.dll diff --git a/dlls/api-ms-win-core-toolhelp-l1-1-0/api-ms-win-core-toolhelp-l1-1-0.spec b/dlls/api-ms-win-core-toolhelp-l1-1-0/api-ms-win-core-toolhelp-l1-1-0.spec new file mode 100644 index 0000000..6275601 --- /dev/null +++ b/dlls/api-ms-win-core-toolhelp-l1-1-0/api-ms-win-core-toolhelp-l1-1-0.spec @@ -0,0 +1,7 @@ +@ stdcall CreateToolhelp32Snapshot(long long) kernel32.CreateToolhelp32Snapshot +@ stdcall Module32FirstW(long ptr) kernel32.Module32FirstW +@ stdcall Module32NextW(long ptr) kernel32.Module32NextW +@ stdcall Process32FirstW(ptr ptr) kernel32.Process32FirstW +@ stdcall Process32NextW(ptr ptr) kernel32.Process32NextW +@ stdcall Thread32First(long ptr) kernel32.Thread32First +@ stdcall Thread32Next(long ptr) kernel32.Thread32Next diff --git a/tools/make_specfiles b/tools/make_specfiles index 7d4848d..25a5bdf 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -172,6 +172,7 @@ my @dll_groups = "api-ms-win-core-threadpool-l1-2-0", "api-ms-win-core-threadpool-legacy-l1-1-0", "api-ms-win-core-timezone-l1-1-0", + "api-ms-win-core-toolhelp-l1-1-0", "api-ms-win-core-sysinfo-l1-2-1", "api-ms-win-core-processthreads-l1-1-2", "api-ms-win-core-fibers-l1-1-0",

1 0

Max Qian : api-ms-win-core-string-obsolete-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 7b5b3eee71b8994881f9f3d6346acef28b54c4b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5b3eee71b8994881f9f3d63… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:51 2016 -0700 api-ms-win-core-string-obsolete-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-string-obsolete-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-string-obsolete-l1-1-0.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 1d32921..d7940ba 100755 --- a/configure +++ b/configure @@ -931,6 +931,7 @@ enable_api_ms_win_core_rtlsupport_l1_2_0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_string_l2_1_0 +enable_api_ms_win_core_string_obsolete_l1_1_0 enable_api_ms_win_core_synch_l1_1_0 enable_api_ms_win_core_synch_l1_2_0 enable_api_ms_win_core_sysinfo_l1_1_0 @@ -17471,6 +17472,7 @@ wine_fn_config_dll api-ms-win-core-rtlsupport-l1-2-0 enable_api_ms_win_core_rtls wine_fn_config_dll api-ms-win-core-shlwapi-legacy-l1-1-0 enable_api_ms_win_core_shlwapi_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l2-1-0 enable_api_ms_win_core_string_l2_1_0 +wine_fn_config_dll api-ms-win-core-string-obsolete-l1-1-0 enable_api_ms_win_core_string_obsolete_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-1-0 enable_api_ms_win_core_synch_l1_1_0 wine_fn_config_dll api-ms-win-core-synch-l1-2-0 enable_api_ms_win_core_synch_l1_2_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-1-0 enable_api_ms_win_core_sysinfo_l1_1_0 diff --git a/configure.ac b/configure.ac index fb38861..90c2d04 100644 --- a/configure.ac +++ b/configure.ac @@ -2696,6 +2696,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-core-string-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-synch-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-1-0) diff --git a/dlls/api-ms-win-core-string-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-core-string-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..f02787a --- /dev/null +++ b/dlls/api-ms-win-core-string-obsolete-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-string-obsolete-l1-1-0.dll diff --git a/dlls/api-ms-win-core-string-obsolete-l1-1-0/api-ms-win-core-string-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-string-obsolete-l1-1-0/api-ms-win-core-string-obsolete-l1-1-0.spec new file mode 100644 index 0000000..fbf70a1 --- /dev/null +++ b/dlls/api-ms-win-core-string-obsolete-l1-1-0/api-ms-win-core-string-obsolete-l1-1-0.spec @@ -0,0 +1,10 @@ +@ stdcall lstrcatW(wstr wstr) kernel32.lstrcatW +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcpyW(ptr wstr) kernel32.lstrcpyW +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlenW(wstr) kernel32.lstrlenW diff --git a/tools/make_specfiles b/tools/make_specfiles index cca8920..7d4848d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -136,6 +136,7 @@ my @dll_groups = "api-ms-win-core-misc-l1-1-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-string-obsolete-l1-1-0", "api-ms-win-core-sysinfo-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", "api-ms-win-core-util-l1-1-0",

1 0

Max Qian : api-ms-win-core-normalization-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 6b00445e69c9239a0c30bf68eaf15376d08e7479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b00445e69c9239a0c30bf68e… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:50 2016 -0700 api-ms-win-core-normalization-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-normalization-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-normalization-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 56b239a..1d32921 100755 --- a/configure +++ b/configure @@ -916,6 +916,7 @@ enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 enable_api_ms_win_core_namespace_l1_1_0 +enable_api_ms_win_core_normalization_l1_1_0 enable_api_ms_win_core_path_l1_1_0 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 @@ -17455,6 +17456,7 @@ wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_ wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 wine_fn_config_dll api-ms-win-core-namespace-l1-1-0 enable_api_ms_win_core_namespace_l1_1_0 +wine_fn_config_dll api-ms-win-core-normalization-l1-1-0 enable_api_ms_win_core_normalization_l1_1_0 wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 diff --git a/configure.ac b/configure.ac index 6b01df0..fb38861 100644 --- a/configure.ac +++ b/configure.ac @@ -2681,6 +2681,7 @@ WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-namespace-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-normalization-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-normalization-l1-1-0/Makefile.in b/dlls/api-ms-win-core-normalization-l1-1-0/Makefile.in new file mode 100644 index 0000000..c968955 --- /dev/null +++ b/dlls/api-ms-win-core-normalization-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-normalization-l1-1-0.dll diff --git a/dlls/api-ms-win-core-normalization-l1-1-0/api-ms-win-core-normalization-l1-1-0.spec b/dlls/api-ms-win-core-normalization-l1-1-0/api-ms-win-core-normalization-l1-1-0.spec new file mode 100644 index 0000000..4388922 --- /dev/null +++ b/dlls/api-ms-win-core-normalization-l1-1-0/api-ms-win-core-normalization-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub GetStringScripts +@ stdcall IdnToNameprepUnicode(long wstr long ptr long) kernel32.IdnToNameprepUnicode +@ stdcall IsNormalizedString(long wstr long) kernel32.IsNormalizedString +@ stdcall NormalizeString(long wstr long ptr long) kernel32.NormalizeString +@ stub VerifyScripts diff --git a/tools/make_specfiles b/tools/make_specfiles index 0e3a54e..cca8920 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -164,6 +164,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2", "api-ms-win-core-namespace-l1-1-0", + "api-ms-win-core-normalization-l1-1-0", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0",

1 0

Max Qian : api-ms-win-core-namespace-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: fcb4aa86e8c39a35973993cb354a91f07f957736 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb4aa86e8c39a35973993cb3… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:49 2016 -0700 api-ms-win-core-namespace-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-namespace-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-namespace-l1-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 05d5bfd..56b239a 100755 --- a/configure +++ b/configure @@ -915,6 +915,7 @@ enable_api_ms_win_core_memory_l1_1_2 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 +enable_api_ms_win_core_namespace_l1_1_0 enable_api_ms_win_core_path_l1_1_0 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 @@ -17453,6 +17454,7 @@ wine_fn_config_dll api-ms-win-core-memory-l1-1-2 enable_api_ms_win_core_memory_l wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 +wine_fn_config_dll api-ms-win-core-namespace-l1-1-0 enable_api_ms_win_core_namespace_l1_1_0 wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 diff --git a/configure.ac b/configure.ac index 984e54d..6b01df0 100644 --- a/configure.ac +++ b/configure.ac @@ -2680,6 +2680,7 @@ WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-namespace-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/Makefile.in b/dlls/api-ms-win-core-namespace-l1-1-0/Makefile.in new file mode 100644 index 0000000..ff22a3a --- /dev/null +++ b/dlls/api-ms-win-core-namespace-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-namespace-l1-1-0.dll diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec new file mode 100644 index 0000000..ebb4148 --- /dev/null +++ b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec @@ -0,0 +1,6 @@ +@ stub AddSIDToBoundaryDescriptor +@ stub ClosePrivateNamespace +@ stub CreateBoundaryDescriptorW +@ stub CreatePrivateNamespaceW +@ stub DeleteBoundaryDescriptor +@ stub OpenPrivateNamespaceW diff --git a/tools/make_specfiles b/tools/make_specfiles index 267caf3..0e3a54e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -163,6 +163,7 @@ my @dll_groups = "api-ms-win-core-memory-l1-1-0", "api-ms-win-core-memory-l1-1-1", "api-ms-win-core-memory-l1-1-2", + "api-ms-win-core-namespace-l1-1-0", "api-ms-win-core-processenvironment-l1-1-0", "api-ms-win-core-processenvironment-l1-2-0", "api-ms-win-core-psapi-l1-1-0",

1 0

Max Qian : api-ms-win-core-job-l2-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: f49516e774ed9ec786a658d874e536666f08ec90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49516e774ed9ec786a658d87… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:48 2016 -0700 api-ms-win-core-job-l2-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-job-l2-1-0/Makefile.in | 1 + dlls/api-ms-win-core-job-l2-1-0/api-ms-win-core-job-l2-1-0.spec | 6 ++++++ tools/make_specfiles | 1 + 5 files changed, 11 insertions(+) diff --git a/configure b/configure index 928c3a6..05d5bfd 100755 --- a/configure +++ b/configure @@ -898,6 +898,7 @@ enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 enable_api_ms_win_core_job_l1_1_0 +enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -17435,6 +17436,7 @@ wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_int wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 wine_fn_config_dll api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_job_l1_1_0 +wine_fn_config_dll api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_job_l2_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index 36c7107..984e54d 100644 --- a/configure.ac +++ b/configure.ac @@ -2663,6 +2663,7 @@ WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-job-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-job-l2-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-job-l2-1-0/Makefile.in b/dlls/api-ms-win-core-job-l2-1-0/Makefile.in new file mode 100644 index 0000000..9f3e130 --- /dev/null +++ b/dlls/api-ms-win-core-job-l2-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-job-l2-1-0.dll diff --git a/dlls/api-ms-win-core-job-l2-1-0/api-ms-win-core-job-l2-1-0.spec b/dlls/api-ms-win-core-job-l2-1-0/api-ms-win-core-job-l2-1-0.spec new file mode 100644 index 0000000..94871ad --- /dev/null +++ b/dlls/api-ms-win-core-job-l2-1-0/api-ms-win-core-job-l2-1-0.spec @@ -0,0 +1,6 @@ +@ stdcall AssignProcessToJobObject(ptr ptr) kernel32.AssignProcessToJobObject +@ stdcall CreateJobObjectW(ptr wstr) kernel32.CreateJobObjectW +@ stdcall OpenJobObjectW(long long wstr) kernel32.OpenJobObjectW +@ stdcall QueryInformationJobObject(long long ptr long ptr) kernel32.QueryInformationJobObject +@ stdcall SetInformationJobObject(long long ptr long) kernel32.SetInformationJobObject +@ stdcall TerminateJobObject(long long) kernel32.TerminateJobObject diff --git a/tools/make_specfiles b/tools/make_specfiles index 265e3ea..267caf3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -154,6 +154,7 @@ my @dll_groups = "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", "api-ms-win-core-job-l1-1-0", + "api-ms-win-core-job-l2-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-localization-l1-1-0",

1 0

Max Qian : api-ms-win-core-job-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: de111cd3362f44052ca96bee7f6df59073efa466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de111cd3362f44052ca96bee7… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:47 2016 -0700 api-ms-win-core-job-l1-1-0: Add dll. Signed-off-by: Max Qian <public(a)maxqia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-job-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec | 1 + tools/make_specfiles | 1 + 5 files changed, 6 insertions(+) diff --git a/configure b/configure index 0211b20..928c3a6 100755 --- a/configure +++ b/configure @@ -897,6 +897,7 @@ enable_api_ms_win_core_heap_obsolete_l1_1_0 enable_api_ms_win_core_interlocked_l1_1_0 enable_api_ms_win_core_interlocked_l1_2_0 enable_api_ms_win_core_io_l1_1_1 +enable_api_ms_win_core_job_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -17433,6 +17434,7 @@ wine_fn_config_dll api-ms-win-core-heap-obsolete-l1-1-0 enable_api_ms_win_core_h wine_fn_config_dll api-ms-win-core-interlocked-l1-1-0 enable_api_ms_win_core_interlocked_l1_1_0 wine_fn_config_dll api-ms-win-core-interlocked-l1-2-0 enable_api_ms_win_core_interlocked_l1_2_0 wine_fn_config_dll api-ms-win-core-io-l1-1-1 enable_api_ms_win_core_io_l1_1_1 +wine_fn_config_dll api-ms-win-core-job-l1-1-0 enable_api_ms_win_core_job_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_dll api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_dll api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index bc95e88..36c7107 100644 --- a/configure.ac +++ b/configure.ac @@ -2662,6 +2662,7 @@ WINE_CONFIG_DLL(api-ms-win-core-heap-obsolete-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-interlocked-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-io-l1-1-1) +WINE_CONFIG_DLL(api-ms-win-core-job-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-job-l1-1-0/Makefile.in b/dlls/api-ms-win-core-job-l1-1-0/Makefile.in new file mode 100644 index 0000000..412c521 --- /dev/null +++ b/dlls/api-ms-win-core-job-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-job-l1-1-0.dll diff --git a/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec b/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec new file mode 100644 index 0000000..720fecb --- /dev/null +++ b/dlls/api-ms-win-core-job-l1-1-0/api-ms-win-core-job-l1-1-0.spec @@ -0,0 +1 @@ +@ stdcall IsProcessInJob(long long ptr) kernel32.IsProcessInJob diff --git a/tools/make_specfiles b/tools/make_specfiles index 947cde7..265e3ea 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,7 @@ my @dll_groups = "api-ms-win-core-heap-l1-2-0", "api-ms-win-core-heap-obsolete-l1-1-0", "api-ms-win-core-io-l1-1-1", + "api-ms-win-core-job-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-localization-l1-1-0",

1 0

Alexandre Julliard : server: Cleanup clipboard information upon window destruction.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 5962df3a1e2e19545e5ad8e6be4c5ed3b1cb2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5962df3a1e2e19545e5ad8e6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 20:58:44 2016 +0900 server: Cleanup clipboard information upon window destruction. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 8 ++++---- server/clipboard.c | 19 +++++++++++++++++++ server/user.h | 1 + server/window.c | 1 + 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 9893e8a..b6914da 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -266,13 +266,13 @@ static void test_ClipboardOwner(void) ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); - todo_wine ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); - todo_wine ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); + ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); SetLastError( 0xdeadbeef ); ret = CloseClipboard(); - todo_wine ok( !ret, "CloseClipboard succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); + ok( !ret, "CloseClipboard succeeded\n" ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); diff --git a/server/clipboard.c b/server/clipboard.c index ca0067a..98df230 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -111,6 +111,25 @@ static struct clipboard *get_process_clipboard(void) return clipboard; } +/* cleanup clipboard information upon window destruction */ +void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ) +{ + struct clipboard *clipboard = desktop->winstation->clipboard; + + if (!clipboard) return; + + if (clipboard->open_win == window) + { + clipboard->open_win = 0; + clipboard->open_thread = NULL; + } + if (clipboard->owner_win == window) + { + clipboard->owner_win = 0; + clipboard->owner_thread = NULL; + } + if (clipboard->viewer == window) clipboard->viewer = 0; +} /* Called when thread terminates to allow release of clipboard */ void cleanup_clipboard_thread(struct thread *thread) diff --git a/server/user.h b/server/user.h index 89646f1..2f70674 100644 --- a/server/user.h +++ b/server/user.h @@ -91,6 +91,7 @@ extern void free_process_user_handles( struct process *process ); /* clipboard functions */ +extern void cleanup_clipboard_window( struct desktop *desktop, user_handle_t window ); extern void cleanup_clipboard_thread( struct thread *thread ); /* hook functions */ diff --git a/server/window.c b/server/window.c index 143b60c..4f30079 100644 --- a/server/window.c +++ b/server/window.c @@ -1855,6 +1855,7 @@ void destroy_window( struct window *win ) if (win == progman_window) progman_window = NULL; if (win == taskman_window) taskman_window = NULL; free_hotkeys( win->desktop, win->handle ); + cleanup_clipboard_window( win->desktop, win->handle ); free_user_handle( win->handle ); destroy_properties( win ); list_remove( &win->entry );

1 0

Alexandre Julliard : user32/tests: Add a few more clipboard tests.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 43e38153eed81d4c3aac41472192a0674afbcc7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43e38153eed81d4c3aac41472… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 23 18:00:02 2016 +0900 user32/tests: Add a few more clipboard tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 63 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 549a625..9893e8a 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -68,6 +68,11 @@ static DWORD WINAPI set_clipboard_data_thread(LPVOID arg) ok( IsClipboardFormatAvailable( CF_WAVE ), "%u: SetClipboardData failed\n", thread_from_line ); ret = SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_DDESHARE | GMEM_ZEROINIT, 100 )); ok( ret != 0, "%u: SetClipboardData failed err %u\n", thread_from_line, GetLastError() ); + SetLastError( 0xdeadbeef ); + ret = GetClipboardData( CF_WAVE ); + ok( !ret, "%u: GetClipboardData succeeded\n", thread_from_line ); + ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "%u: wrong error %u\n", + thread_from_line, GetLastError()); } else { @@ -147,6 +152,24 @@ static void run_process( const char *args ) CloseHandle( info.hThread ); } +static WNDPROC old_proc; +static LRESULT CALLBACK winproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + static int destroyed; + + if (msg == WM_DESTROY) destroyed = TRUE; + + trace( "%p msg %04x\n", hwnd, msg ); + if (!destroyed) + ok( GetClipboardOwner() == hwnd, "%04x: wrong owner %p/%p\n", msg, GetClipboardOwner(), hwnd ); + else todo_wine_if (msg == WM_DESTROY) + ok( !GetClipboardOwner(), "%04x: wrong owner %p\n", msg, GetClipboardOwner() ); + ok( GetClipboardViewer() == hwnd, "%04x: wrong viewer %p/%p\n", msg, GetClipboardViewer(), hwnd ); + ok( GetOpenClipboardWindow() == hwnd, "%04x: wrong open win %p/%p\n", + msg, GetOpenClipboardWindow(), hwnd ); + return old_proc( hwnd, msg, wp, lp ); +} + static void test_ClipboardOwner(void) { HWND hWnd1, hWnd2; @@ -182,6 +205,8 @@ static void test_ClipboardOwner(void) run_thread( open_clipboard_thread, hWnd1, __LINE__ ); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( !IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE available\n" ); + ok( !GetClipboardData( CF_WAVE ), "CF_WAVE data available\n" ); run_process( "set_clipboard_data 0" ); ok(!CloseClipboard(), "CloseClipboard should fail if clipboard wasn't open\n"); ok(OpenClipboard(hWnd1), "OpenClipboard failed\n"); @@ -198,6 +223,8 @@ static void test_ClipboardOwner(void) ok(GetClipboardOwner() == hWnd1, "clipboard should be owned by %p, not by %p\n", hWnd1, GetClipboardOwner()); run_thread( empty_clipboard_thread, 0, __LINE__ ); run_thread( set_clipboard_data_thread, hWnd1, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 1" ); SetLastError(0xdeadbeef); @@ -217,6 +244,8 @@ static void test_ClipboardOwner(void) ok( GetClipboardOwner() == GetDesktopWindow(), "wrong owner %p/%p\n", GetClipboardOwner(), GetDesktopWindow() ); run_thread( set_clipboard_data_thread, GetDesktopWindow(), __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 2" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -225,20 +254,31 @@ static void test_ClipboardOwner(void) ok( ret, "OpenClipboard error %d\n", GetLastError()); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); + SetClipboardViewer( hWnd1 ); ok( GetClipboardOwner() == hWnd1, "wrong owner %p/%p\n", GetClipboardOwner(), hWnd1 ); - ret = CloseClipboard(); - ok( ret, "CloseClipboard error %d\n", GetLastError()); + ok( GetClipboardViewer() == hWnd1, "wrong viewer %p/%p\n", GetClipboardViewer(), hWnd1 ); + ok( GetOpenClipboardWindow() == hWnd1, "wrong open win %p/%p\n", GetOpenClipboardWindow(), hWnd1 ); + old_proc = (WNDPROC)SetWindowLongPtrA( hWnd1, GWLP_WNDPROC, (LONG_PTR)winproc_wrapper ); ret = DestroyWindow(hWnd1); ok( ret, "DestroyWindow error %d\n", GetLastError()); ret = DestroyWindow(hWnd2); ok( ret, "DestroyWindow error %d\n", GetLastError()); SetLastError(0xdeadbeef); ok(!GetClipboardOwner() && GetLastError() == 0xdeadbeef, "clipboard should not be owned\n"); + todo_wine ok(!GetClipboardViewer() && GetLastError() == 0xdeadbeef, "viewer still exists\n"); + todo_wine ok(!GetOpenClipboardWindow() && GetLastError() == 0xdeadbeef, "clipboard should not be open\n"); + + SetLastError( 0xdeadbeef ); + ret = CloseClipboard(); + todo_wine ok( !ret, "CloseClipboard succeeded\n" ); + todo_wine ok( GetLastError() == ERROR_CLIPBOARD_NOT_OPEN, "wrong error %u\n", GetLastError() ); ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 3" ); ret = CloseClipboard(); ok( ret, "CloseClipboard error %d\n", GetLastError()); @@ -248,6 +288,8 @@ static void test_ClipboardOwner(void) ret = OpenClipboard( 0 ); ok( ret, "OpenClipboard error %d\n", GetLastError()); run_thread( set_clipboard_data_thread, 0, __LINE__ ); + ok( IsClipboardFormatAvailable( CF_WAVE ), "CF_WAVE not available\n" ); + ok( GetClipboardData( CF_WAVE ) != 0, "CF_WAVE data not available\n" ); run_process( "set_clipboard_data 4" ); ret = EmptyClipboard(); ok( ret, "EmptyClipboard error %d\n", GetLastError()); @@ -459,6 +501,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA static UINT wm_drawclipboard; static UINT wm_clipboardupdate; static UINT wm_destroyclipboard; + static UINT nb_formats; LRESULT ret; switch(msg) { @@ -476,6 +519,7 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_DESTROYCLIPBOARD: wm_destroyclipboard++; ok( GetClipboardOwner() == hwnd, "WM_DESTROYCLIPBOARD owner %p\n", GetClipboardOwner() ); + nb_formats = CountClipboardFormats(); break; case WM_CLIPBOARDUPDATE: wm_clipboardupdate++; @@ -496,6 +540,8 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA ret = wm_destroyclipboard; wm_destroyclipboard = 0; return ret; + case WM_USER+4: + return nb_formats; } return DefWindowProcA(hwnd, msg, wp, lp); @@ -506,7 +552,7 @@ static DWORD WINAPI clipboard_thread(void *param) HWND win = param; BOOL r; HANDLE handle; - UINT count, old_seq = 0, seq; + UINT count, formats, old_seq = 0, seq; if (pGetClipboardSequenceNumber) old_seq = pGetClipboardSequenceNumber(); @@ -575,6 +621,8 @@ static DWORD WINAPI clipboard_thread(void *param) ok( !count, "WM_CLIPBOARDUPDATE received\n" ); count = SendMessageA( win, WM_USER+3, 0, 0 ); ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_text() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); @@ -686,6 +734,10 @@ static DWORD WINAPI clipboard_thread(void *param) count = SendMessageA( win, WM_USER+2, 0, 0 ); ok( !count, "WM_CLIPBOARDUPDATE received\n" ); + formats = CountClipboardFormats(); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( !count, "WM_DESTROYCLIPBOARD received\n" ); + r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = EmptyClipboard(); @@ -693,6 +745,11 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); + count = SendMessageA( win, WM_USER+3, 0, 0 ); + ok( count, "WM_DESTROYCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); return 0;

1 0

Alexandre Julliard : winex11: Don't try to free custom GDI formats at all.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 13fbbfac1c06132575640ede90863c4860f933d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fbbfac1c06132575640ede9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 24 00:16:07 2016 +0900 winex11: Don't try to free custom GDI formats at all. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index af8fa37..5424c53 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -597,6 +597,7 @@ static void X11DRV_CLIPBOARD_FreeData(LPWINE_CLIPDATA lpData) DeleteEnhMetaFile(lpData->hData); break; default: + if (lpData->wFormatID >= CF_GDIOBJFIRST && lpData->wFormatID <= CF_GDIOBJLAST) break; if (lpData->wFormatID >= CF_PRIVATEFIRST && lpData->wFormatID <= CF_PRIVATELAST) break; GlobalFree(lpData->hData); break;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
78
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 August 2016