August 2016 - Wine-commits - list.winehq.org

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-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-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-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-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-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-shell-shellfolders-l1-1-0: Add dll.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 94845c400e2d09c96854e756075a0004c17776bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=94845c400e2d09c96854e7560… Author: Max Qian <public(a)maxqia.com> Date: Tue Aug 23 01:26:54 2016 -0700 api-ms-win-shell-shellfolders-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-shell-shellfolders-l1-1-0/Makefile.in | 1 + .../api-ms-win-shell-shellfolders-l1-1-0.spec | 14 ++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 19 insertions(+) diff --git a/configure b/configure index 533151c..27dcd4b 100755 --- a/configure +++ b/configure @@ -987,6 +987,7 @@ enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 enable_api_ms_win_service_winsvc_l1_2_0 +enable_api_ms_win_shell_shellfolders_l1_1_0 enable_apphelp enable_appwiz_cpl enable_atl @@ -17530,6 +17531,7 @@ wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sd wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 wine_fn_config_dll api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 +wine_fn_config_dll api-ms-win-shell-shellfolders-l1-1-0 enable_api_ms_win_shell_shellfolders_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl clean diff --git a/configure.ac b/configure.ac index b6e2aab..d008fe8 100644 --- a/configure.ac +++ b/configure.ac @@ -2752,6 +2752,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[clean]) diff --git a/dlls/api-ms-win-shell-shellfolders-l1-1-0/Makefile.in b/dlls/api-ms-win-shell-shellfolders-l1-1-0/Makefile.in new file mode 100644 index 0000000..5f1d020 --- /dev/null +++ b/dlls/api-ms-win-shell-shellfolders-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shell-shellfolders-l1-1-0.dll diff --git a/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec new file mode 100644 index 0000000..5909c04 --- /dev/null +++ b/dlls/api-ms-win-shell-shellfolders-l1-1-0/api-ms-win-shell-shellfolders-l1-1-0.spec @@ -0,0 +1,14 @@ +@ stdcall PathCleanupSpec(ptr ptr) shell32.PathCleanupSpec +@ stdcall PathIsExe(ptr) shell32.PathIsExe +@ stdcall SHCreateDirectoryExW(long wstr ptr) shell32.SHCreateDirectoryExW +@ stdcall SHGetDesktopFolder(ptr) shell32.SHGetDesktopFolder +@ stdcall SHGetFileInfoW(ptr long ptr long long) shell32.SHGetFileInfoW +@ stdcall SHGetFolderLocation(long long long long ptr) shell32.SHGetFolderLocation +@ stdcall SHGetFolderPathA(long long long long ptr) shell32.SHGetFolderPathA +@ stdcall SHGetFolderPathAndSubDirW(long long long long wstr ptr) shell32.SHGetFolderPathAndSubDirW +@ stdcall SHGetFolderPathW(long long long long ptr) shell32.SHGetFolderPathW +@ stdcall SHGetInstanceExplorer(long) shell32.SHGetInstanceExplorer +@ stdcall SHGetKnownFolderPath(ptr long ptr ptr) shell32.SHGetKnownFolderPath +@ stdcall SHGetSpecialFolderPathA(long ptr long long) shell32.SHGetSpecialFolderPathA +@ stdcall SHGetSpecialFolderPathW(long ptr long long) shell32.SHGetSpecialFolderPathW +@ stub SHSetKnownFolderPath diff --git a/tools/make_specfiles b/tools/make_specfiles index b5e5904..ad8a357 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -216,6 +216,7 @@ my @dll_groups = [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", + "api-ms-win-shell-shellfolders-l1-1-0", ], [ "shlwapi",

1 0

Bruno Jesus : ntdll: Use a helper to allocate threadpool workers.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 3b3c0d9e09c609e9fada24a451f7cb878b2d3f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b3c0d9e09c609e9fada24a45… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 17:39:10 2016 -0300 ntdll: Use a helper to allocate threadpool workers. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 68 +++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 173e865..6063d51 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1282,6 +1282,28 @@ static void CALLBACK timerqueue_thread_proc( void *param ) } /*********************************************************************** + * tp_new_worker_thread (internal) + * + * Create and account a new worker thread for the desired pool. + */ +static NTSTATUS tp_new_worker_thread( struct threadpool *pool ) +{ + HANDLE thread; + NTSTATUS status; + + status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, + threadpool_worker_proc, pool, &thread, NULL ); + if (status == STATUS_SUCCESS) + { + interlocked_inc( &pool->refcount ); + pool->num_workers++; + pool->num_busy_workers++; + NtClose( thread ); + } + return status; +} + +/*********************************************************************** * tp_timerqueue_lock (internal) * * Acquires a lock on the global timerqueue. When the lock is acquired @@ -1713,18 +1735,7 @@ static NTSTATUS tp_threadpool_lock( struct threadpool **out, TP_CALLBACK_ENVIRON /* Make sure that the threadpool has at least one thread. */ if (!pool->num_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Keep a reference, and increment objcount to ensure that the * last thread doesn't terminate. */ @@ -1910,18 +1921,7 @@ static void tp_object_submit( struct threadpool_object *object, BOOL signaled ) /* Start new worker threads if required. */ if (pool->num_busy_workers >= pool->num_workers && pool->num_workers < pool->max_workers) - { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } - } + status = tp_new_worker_thread( pool ); /* Queue work item and increment refcount. */ interlocked_inc( &object->refcount ); @@ -2406,16 +2406,7 @@ NTSTATUS WINAPI TpCallbackMayRunLong( TP_CALLBACK_INSTANCE *instance ) { if (pool->num_workers < pool->max_workers) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, pool, &thread, NULL ); - if (status == STATUS_SUCCESS) - { - interlocked_inc( &pool->refcount ); - pool->num_workers++; - pool->num_busy_workers++; - NtClose( thread ); - } + status = tp_new_worker_thread( pool ); } else { @@ -2708,16 +2699,9 @@ BOOL WINAPI TpSetPoolMinThreads( TP_POOL *pool, DWORD minimum ) while (this->num_workers < minimum) { - HANDLE thread; - status = RtlCreateUserThread( GetCurrentProcess(), NULL, FALSE, NULL, 0, 0, - threadpool_worker_proc, this, &thread, NULL ); + status = tp_new_worker_thread( this ); if (status != STATUS_SUCCESS) break; - - interlocked_inc( &this->refcount ); - this->num_workers++; - this->num_busy_workers++; - NtClose( thread ); } if (status == STATUS_SUCCESS)

1 0

Nikolay Sivov : dinput: Explicitly check for -1 as open() failure code.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: 3605cde8eaf9388d0321a250d0d85bd0d8708381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3605cde8eaf9388d0321a250d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 23 00:22:15 2016 +0300 dinput: Explicitly check for -1 as open() failure code. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3086e68..1f8f94d 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -150,8 +150,7 @@ static BOOL read_sys_id_variable(int index, const char *property, WORD *value) BOOL ret = FALSE; sprintf(sys_path, SYS_PATH_FORMAT, index, property); - sys_fd = open(sys_path, O_RDONLY); - if (sys_fd > 0) + if ((sys_fd = open(sys_path, O_RDONLY)) != -1) { if (read(sys_fd, id_str, 4) == 4) { @@ -180,10 +179,10 @@ static INT find_joystick_devices(void) BYTE axes_map[ABS_MAX + 1]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); - if ((fd = open(joydev.device, O_RDONLY)) < 0) + if ((fd = open(joydev.device, O_RDONLY)) == -1) { snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_OLD, i); - if ((fd = open(joydev.device, O_RDONLY)) < 0) continue; + if ((fd = open(joydev.device, O_RDONLY)) == -1) continue; } strcpy(joydev.name, "Wine Joystick"); @@ -355,7 +354,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) + if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) { WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE; @@ -384,7 +383,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { /* check whether we have a joystick */ - if ((fd = open(joystick_devices[id].device, O_RDONLY)) < 0) + if ((fd = open(joystick_devices[id].device, O_RDONLY)) == -1) { WARN("open(%s, O_RDONLY) failed: %s\n", joystick_devices[id].device, strerror(errno)); return S_FALSE;

1 0

Bruno Jesus : dinput: Dump the force feedback effect before upload.
by Alexandre Julliard 23 Aug '16

23 Aug '16

Module: wine Branch: master Commit: c7e6b4fbec93274f5f362fff0ea11cbdd7d3fd96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7e6b4fbec93274f5f362fff0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 22 22:06:55 2016 -0300 dinput: Dump the force feedback effect before upload. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/effect_linuxinput.c | 87 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index dc12aa6..9215265 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -72,6 +72,92 @@ static double ff_effect_direction_to_rad(unsigned int dir) return (dir & 0xffff) * M_PI / 0x8000; } +static void ff_dump_effect(struct ff_effect *effect) +{ + const char *type = "(Unknown)", *length = "INFINITE"; + struct ff_envelope *env = NULL; + double angle; +#define FE(x) case x: type = #x; break + switch (effect->type) + { + FE(FF_RUMBLE); + FE(FF_PERIODIC); + FE(FF_CONSTANT); + FE(FF_SPRING); + FE(FF_FRICTION); + FE(FF_DAMPER); + FE(FF_INERTIA); + FE(FF_RAMP); + } +#undef FE + + /* rotate so 0 points right */ + angle = 360 - ff_effect_direction_to_rad(effect->direction + 0xc000) * 180 / M_PI; + + if (effect->replay.length) + length = wine_dbg_sprintf("%u ms", effect->replay.length); + + TRACE("type: 0x%x %s, id %d, direction 0x%x (angle: %.2f), time length %s, start delay %u ms\n", + effect->type, type, effect->id, effect->direction, angle, length, effect->replay.delay); + if (effect->trigger.button || effect->trigger.interval) + TRACE("trigger button %u, re-trigger interval %u ms\n", + effect->trigger.button, effect->trigger.interval); + + if (effect->type == FF_PERIODIC) + { + struct ff_periodic_effect *per = &effect->u.periodic; + const char *wave = "(Unknown)"; +#define FE(x) case x: wave = #x; break + switch (per->waveform) + { + FE(FF_SQUARE); + FE(FF_TRIANGLE); + FE(FF_SINE); + FE(FF_SAW_UP); + FE(FF_SAW_DOWN); + FE(FF_CUSTOM); + } +#undef FE + TRACE(" -> waveform 0x%x %s, period %u, magnitude %d, offset %d, phase %u, custom len %d\n", + per->waveform, wave, per->period, per->magnitude, per->offset, per->phase, per->custom_len); + env = &per->envelope; + } + else if (effect->type == FF_CONSTANT) + { + struct ff_constant_effect *cons = &effect->u.constant; + TRACE(" -> level %d\n", cons->level); + env = &cons->envelope; + } + else if (effect->type == FF_RAMP) + { + struct ff_ramp_effect *ramp = &effect->u.ramp; + TRACE(" -> start/end level %d/%d\n", ramp->start_level, ramp->end_level); + env = &ramp->envelope; + } + else if (effect->type == FF_RUMBLE) + { + struct ff_rumble_effect *rumble = &effect->u.rumble; + TRACE(" -> strong/weak magnitude %d/%d\n", rumble->strong_magnitude, rumble->weak_magnitude); + } + else if (effect->type == FF_SPRING || effect->type == FF_FRICTION || + effect->type == FF_DAMPER || effect->type == FF_INERTIA) + { + struct ff_condition_effect *cond = effect->u.condition; + int i; + for (i = 0; i < 2; i++) + { + /* format numbers here to make them align correctly */ + TRACE(" -> [%d] right/left saturation %5u/%5u, right/left coefficient %5d/%5d," + " deadband %5u, center %5d\n", i, cond[i].right_saturation, cond[i].left_saturation, + cond[i].right_coeff, cond[i].left_coeff, cond[i].deadband, cond[i].center); + } + } + + if (env) + TRACE(" -> envelope attack length/level %u/%u, fade length/level %u/%u\n", + env->attack_length, env->attack_level, env->fade_length, env->fade_level); +} + /****************************************************************************** * LinuxInputEffectImpl */ @@ -89,6 +175,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_Download( LinuxInputEffectImpl *This = impl_from_IDirectInputEffect(iface); TRACE("(this=%p)\n", This); + ff_dump_effect(&This->effect); if (ioctl(*(This->fd), EVIOCSFF, &This->effect) == -1) { if (errno == ENOMEM) {

1 0