May 2023 - Wine-commits - list.winehq.org

Mohamad Al-Jaf : include: Add hrtfapoapi.idl file.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 2b32ba593dc06db3689ce07908265af96b9c03b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b32ba593dc06db3689ce07908265a… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Thu Dec 8 19:43:52 2022 -0500 include: Add hrtfapoapi.idl file. --- include/Makefile.in | 1 + include/hrtfapoapi.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c957fed884c..0dae4cab2bf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -340,6 +340,7 @@ SOURCES = \ highlevelmonitorconfigurationapi.h \ hlguids.h \ hlink.idl \ + hrtfapoapi.idl \ hstring.idl \ htiface.idl \ htiframe.idl \ diff --git a/include/hrtfapoapi.idl b/include/hrtfapoapi.idl new file mode 100644 index 00000000000..15b479d0216 --- /dev/null +++ b/include/hrtfapoapi.idl @@ -0,0 +1,108 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "xapo.idl"; + +cpp_quote("#include <float.h>") + +cpp_quote("#define HRTF_MAX_GAIN_LIMIT 12.0f") +cpp_quote("#define HRTF_MIN_GAIN_LIMIT -96.0f") +cpp_quote("#define HRTF_MIN_UNITY_GAIN_DISTANCE 0.05f") +cpp_quote("#define HRTF_DEFAULT_UNITY_GAIN_DISTANCE 1.0f") +cpp_quote("#define HRTF_DEFAULT_CUTOFF_DISTANCE FLT_MAX") + +typedef struct HrtfPosition +{ + float x; + float y; + float z; +} HrtfPosition; + +typedef struct HrtfOrientation +{ + float element[9]; +} HrtfOrientation; + +typedef enum HrtfDirectivityType +{ + OmniDirectional, + Cardioid, + Cone, +} HrtfDirectivityType; + +typedef enum HrtfEnvironment +{ + Small, + Medium, + Large, + Outdoors, +} HrtfEnvironment; + +typedef struct HrtfDirectivity +{ + HrtfDirectivityType type; + float scaling; +} HrtfDirectivity; + +typedef struct HrtfDirectivityCardioid +{ + HrtfDirectivity directivity; + float order; +} HrtfDirectivityCardioid; + +typedef struct HrtfDirectivityCone +{ + HrtfDirectivity directivity; + float innerAngle; + float outerAngle; +} HrtfDirectivityCone; + +typedef enum HrtfDistanceDecayType +{ + NaturalDecay, + CustomDecay, +} HrtfDistanceDecayType; + +typedef struct HrtfDistanceDecay +{ + HrtfDistanceDecayType type; + float maxGain; + float minGain; + float unityGainDistance; + float cutoffDistance; +} HrtfDistanceDecay; + +typedef struct HrtfApoInit +{ + HrtfDistanceDecay *distanceDecay; + HrtfDirectivity *directivity; +} HrtfApoInit; + +HRESULT __stdcall CreateHrtfApo(const HrtfApoInit *init, IXAPO **xapo); + +[ + object, + uuid(15b3cd66-e9de-4464-b6e6-2bc3cf63d455) +] +interface IXAPOHrtfParameters : IUnknown +{ + HRESULT SetSourcePosition(const HrtfPosition *position); + HRESULT SetSourceOrientation(const HrtfOrientation *orientation); + HRESULT SetSourceGain(float gain); + HRESULT SetEnvironment(HrtfEnvironment environment); +}

1 0

Mohamad Al-Jaf : hrtfapo: Add stub DLL.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 9c46b673ba99de85bff98ee2f2a8924b9ae24e83 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c46b673ba99de85bff98ee2f2a892… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 23:31:01 2022 -0500 hrtfapo: Add stub DLL. --- configure | 2 ++ configure.ac | 1 + dlls/hrtfapo/Makefile.in | 1 + dlls/hrtfapo/hrtfapo.spec | 5 +++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 6201d4444fd..001e80be636 100755 --- a/configure +++ b/configure @@ -1151,6 +1151,7 @@ enable_hidclass_sys enable_hidparse_sys enable_hlink enable_hnetcfg +enable_hrtfapo enable_http_sys enable_httpapi enable_ia2comproxy @@ -21391,6 +21392,7 @@ wine_fn_config_makefile dlls/hlink enable_hlink wine_fn_config_makefile dlls/hlink/tests enable_tests wine_fn_config_makefile dlls/hnetcfg enable_hnetcfg wine_fn_config_makefile dlls/hnetcfg/tests enable_tests +wine_fn_config_makefile dlls/hrtfapo enable_hrtfapo wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests diff --git a/configure.ac b/configure.ac index 265c7425a8e..0a6171e7fd3 100644 --- a/configure.ac +++ b/configure.ac @@ -2629,6 +2629,7 @@ WINE_CONFIG_MAKEFILE(dlls/hlink) WINE_CONFIG_MAKEFILE(dlls/hlink/tests) WINE_CONFIG_MAKEFILE(dlls/hnetcfg) WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) +WINE_CONFIG_MAKEFILE(dlls/hrtfapo) WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) diff --git a/dlls/hrtfapo/Makefile.in b/dlls/hrtfapo/Makefile.in new file mode 100644 index 00000000000..c2a24658436 --- /dev/null +++ b/dlls/hrtfapo/Makefile.in @@ -0,0 +1 @@ +MODULE = hrtfapo.dll diff --git a/dlls/hrtfapo/hrtfapo.spec b/dlls/hrtfapo/hrtfapo.spec new file mode 100644 index 00000000000..d9395a66c7e --- /dev/null +++ b/dlls/hrtfapo/hrtfapo.spec @@ -0,0 +1,5 @@ +@ stub CreateHrtfApo +@ stub CreateHrtfApoWithDatasetType +@ stub CreateHrtfEngineFactory +@ stub IsHrtfApoAvailable +@ stub GetHrtfEngineMinFrameCount

1 0

Mohamad Al-Jaf : hrtfapo: Add CreateHrtfApo() stub.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: eff714e339caed6e36a3857f07b0c3e1c13306e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/eff714e339caed6e36a3857f07b0c3… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sun Dec 18 23:42:38 2022 -0500 hrtfapo: Add CreateHrtfApo() stub. Needed by Britannia VR: Out of Your Mind. --- dlls/hrtfapo/Makefile.in | 3 +++ dlls/hrtfapo/hrtfapo.spec | 2 +- dlls/hrtfapo/main.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/hrtfapo/Makefile.in b/dlls/hrtfapo/Makefile.in index c2a24658436..16a745e0fca 100644 --- a/dlls/hrtfapo/Makefile.in +++ b/dlls/hrtfapo/Makefile.in @@ -1 +1,4 @@ MODULE = hrtfapo.dll + +C_SRCS = \ + main.c diff --git a/dlls/hrtfapo/hrtfapo.spec b/dlls/hrtfapo/hrtfapo.spec index d9395a66c7e..42248518619 100644 --- a/dlls/hrtfapo/hrtfapo.spec +++ b/dlls/hrtfapo/hrtfapo.spec @@ -1,4 +1,4 @@ -@ stub CreateHrtfApo +@ stdcall CreateHrtfApo(ptr ptr) @ stub CreateHrtfApoWithDatasetType @ stub CreateHrtfEngineFactory @ stub IsHrtfApoAvailable diff --git a/dlls/hrtfapo/main.c b/dlls/hrtfapo/main.c new file mode 100644 index 00000000000..711f0bc9c29 --- /dev/null +++ b/dlls/hrtfapo/main.c @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "hrtfapoapi.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); + +HRESULT WINAPI CreateHrtfApo(const HrtfApoInit *init, IXAPO **xapo) +{ + FIXME("(%p, %p): stub!\n", init, xapo); + return E_NOTIMPL; +}

1 0

Tim Clem : ntdll: Decrement thread count from exit_thread and exit the process if needed.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: fac1aabbef3753afc53a4ea4f933b3d0516fd302 URL: https://gitlab.winehq.org/wine/wine/-/commit/fac1aabbef3753afc53a4ea4f933b3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Apr 24 11:51:31 2023 -0700 ntdll: Decrement thread count from exit_thread and exit the process if needed. --- dlls/ntdll/unix/thread.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 2686a8365cf..d76de4fcc98 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1429,6 +1429,8 @@ static DECLSPEC_NORETURN void exit_thread( int status ) pthread_sigmask( SIG_BLOCK, &server_block_set, NULL ); + if (InterlockedDecrement( &nb_threads ) <= 0) exit_process( status ); + if ((teb = InterlockedExchangePointer( &prev_teb, NtCurrentTeb() ))) { struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch;

1 0

Zhiyi Zhang : findstr: Add basic functionality.
by Alexandre Julliard 02 May '23

02 May '23

1 0

Zhiyi Zhang : tasklist: Partially support '/fi' option.
by Alexandre Julliard 02 May '23

02 May '23

1 0

Zhiyi Zhang : tasklist: Support '/fo' option.
by Alexandre Julliard 02 May '23

02 May '23

1 0

Zhiyi Zhang : tasklist: Add basic functionality.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 62af0b5f84a4b846d6c392f3acdcc8f8240d72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/62af0b5f84a4b846d6c392f3acdcc8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 14 17:14:42 2023 +0800 tasklist: Add basic functionality. Company of Heroes: Battle of Crete needs a functioning tasklist.exe to exit properly. --- configure | 1 + configure.ac | 1 + po/ar.po | 52 +++++-- po/ast.po | 52 +++++-- po/bg.po | 49 +++++-- po/ca.po | 52 +++++-- po/cs.po | 52 +++++-- po/da.po | 52 +++++-- po/de.po | 52 +++++-- po/el.po | 45 +++++-- po/en.po | 44 ++++-- po/en_US.po | 44 ++++-- po/eo.po | 52 +++++-- po/es.po | 52 +++++-- po/fa.po | 47 +++++-- po/fi.po | 52 +++++-- po/fr.po | 52 +++++-- po/he.po | 52 +++++-- po/hi.po | 44 ++++-- po/hr.po | 52 +++++-- po/hu.po | 52 +++++-- po/it.po | 52 +++++-- po/ja.po | 52 +++++-- po/ko.po | 52 +++++-- po/lt.po | 52 +++++-- po/ml.po | 48 +++++-- po/nb_NO.po | 52 +++++-- po/nl.po | 52 +++++-- po/or.po | 44 ++++-- po/pa.po | 44 ++++-- po/pl.po | 52 +++++-- po/pt_BR.po | 52 +++++-- po/pt_PT.po | 52 +++++-- po/rm.po | 46 +++++-- po/ro.po | 52 +++++-- po/ru.po | 52 +++++-- po/si.po | 52 +++++-- po/sk.po | 49 +++++-- po/sl.po | 52 +++++-- po/sr_RS(a)cyrillic.po | 53 ++++++-- po/sr_RS(a)latin.po | 53 ++++++-- po/sv.po | 52 +++++-- po/ta.po | 50 +++++-- po/te.po | 44 ++++-- po/th.po | 47 +++++-- po/tr.po | 52 +++++-- po/uk.po | 52 +++++-- po/wa.po | 46 +++++-- po/wine.pot | 44 ++++-- po/zh_CN.po | 52 +++++-- po/zh_TW.po | 52 +++++-- programs/tasklist/Makefile.in | 3 +- programs/tasklist/tasklist.c | 186 +++++++++++++++++++++++++- programs/tasklist/tasklist.h | 38 ++++++ programs/tasklist/{version.rc => tasklist.rc} | 18 +++ programs/tasklist/tests/Makefile.in | 4 + programs/tasklist/tests/tasklist.c | 120 +++++++++++++++++ 57 files changed, 2229 insertions(+), 595 deletions(-)

1 0

Zhiyi Zhang : tasklist: Support '/nh' option.
by Alexandre Julliard 02 May '23

02 May '23

Module: wine Branch: master Commit: 8238c1d48fe4d867d746579c0b79ffa6df6c738b URL: https://gitlab.winehq.org/wine/wine/-/commit/8238c1d48fe4d867d746579c0b79ff… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Apr 18 17:59:07 2023 +0800 tasklist: Support '/nh' option. --- programs/tasklist/tasklist.c | 21 +++++++++++++++------ programs/tasklist/tasklist.h | 5 +++++ programs/tasklist/tests/tasklist.c | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/programs/tasklist/tasklist.c b/programs/tasklist/tasklist.c index 687b8bf6985..48d9b438e84 100644 --- a/programs/tasklist/tasklist.c +++ b/programs/tasklist/tasklist.c @@ -163,17 +163,21 @@ static BOOL tasklist_get_process_info(const PROCESSENTRY32W *process_entry, stru return TRUE; } -static void tasklist_print(void) +static void tasklist_print(const struct tasklist_options *options) { struct tasklist_process_info header, info; PROCESSENTRY32W *process_list; DWORD process_count, i; wprintf(L"\n"); - tasklist_get_header(&header); - wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" - L"========================= ======== ================ =========== ============\n", - header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + + if (!options->no_header) + { + tasklist_get_header(&header); + wprintf(L"%-25.25s %8.8s %-16.16s %11.11s %12.12s\n" + L"========================= ======== ================ =========== ============\n", + header.image_name, header.pid, header.session_name, header.session_number, header.memory_usage); + } process_list = enumerate_processes(&process_count); for (i = 0; i < process_count; ++i) @@ -189,6 +193,7 @@ static void tasklist_print(void) int __cdecl wmain(int argc, WCHAR *argv[]) { + struct tasklist_options options = {0}; int i; for (i = 0; i < argc; i++) @@ -202,12 +207,16 @@ int __cdecl wmain(int argc, WCHAR *argv[]) tasklist_message(STRING_USAGE); return 0; } + else if (!wcsicmp(argv[i], L"/nh")) + { + options.no_header = TRUE; + } else { WINE_WARN("Ignoring option %s\n", wine_dbgstr_w(argv[i])); } } - tasklist_print(); + tasklist_print(&options); return 0; } diff --git a/programs/tasklist/tasklist.h b/programs/tasklist/tasklist.h index 707121680ec..6add1f30277 100644 --- a/programs/tasklist/tasklist.h +++ b/programs/tasklist/tasklist.h @@ -36,3 +36,8 @@ struct tasklist_process_info WCHAR session_number[32]; WCHAR memory_usage[32]; }; + +struct tasklist_options +{ + BOOL no_header; +}; diff --git a/programs/tasklist/tests/tasklist.c b/programs/tasklist/tests/tasklist.c index cd4a2be0178..2c4d77855b0 100644 --- a/programs/tasklist/tests/tasklist.c +++ b/programs/tasklist/tests/tasklist.c @@ -108,6 +108,20 @@ static void test_basic(void) ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); } +static void test_no_header(void) +{ + char *pos; + + /* /nh */ + run_tasklist("/nh", 0); + ok(stdout_size > 0, "Unexpected stdout buffer size %ld.\n", stdout_size); + ok(stderr_size == 0, "Unexpected stderr buffer size %ld.\n", stderr_size); + pos = strstr(stdout_buffer, "Image Name"); + ok(!pos, "Got header.\n"); + pos = strstr(stdout_buffer, "="); + ok(!pos, "Got header.\n"); +} + START_TEST(tasklist) { if (PRIMARYLANGID(GetUserDefaultUILanguage()) != LANG_ENGLISH) @@ -117,4 +131,5 @@ START_TEST(tasklist) } test_basic(); + test_no_header(); }

1 0

Conor McCarthy : vkd3d: Do not reset the descriptor heap count unless full or the command list is reset.
by Alexandre Julliard 02 May '23

02 May '23

Module: vkd3d Branch: master Commit: e2dac061e26f6b0404f680ca33ccc3e0443ede6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e2dac061e26f6b0404f680ca33ccc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 2 16:40:30 2023 +1000 vkd3d: Do not reset the descriptor heap count unless full or the command list is reset. The same heaps must be flushed again if the command list is executed again without a reset. --- libs/vkd3d/command.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 81ddccb4..dd5c78a4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2463,6 +2463,8 @@ static void d3d12_command_list_reset_state(struct d3d12_command_list *list, memset(list->so_counter_buffers, 0, sizeof(list->so_counter_buffers)); memset(list->so_counter_buffer_offsets, 0, sizeof(list->so_counter_buffer_offsets)); + list->descriptor_heap_count = 0; + ID3D12GraphicsCommandList2_SetPipelineState(iface, initial_pipeline_state); } @@ -3181,7 +3183,6 @@ static void command_list_flush_vk_heap_updates(struct d3d12_command_list *list) d3d12_desc_flush_vk_heap_updates_locked(list->descriptor_heaps[i], device); vkd3d_mutex_unlock(&list->descriptor_heaps[i]->vk_sets_mutex); } - list->descriptor_heap_count = 0; } static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *list, @@ -3215,6 +3216,7 @@ static void d3d12_command_list_bind_descriptor_heap(struct d3d12_command_list *l /* Descriptors can be written after binding. */ FIXME("Flushing descriptor updates while list %p is not closed.\n", list); command_list_flush_vk_heap_updates(list); + list->descriptor_heap_count = 0; } list->descriptor_heaps[list->descriptor_heap_count++] = heap; }

1 0