wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Nikolay Sivov : d3d10/effect: Implement GetString().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 14ec330052541111b9bea110c40e4dd582a9a383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14ec330052541111b9bea110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 15:56:45 2021 +0200 d3d10/effect: Implement GetString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 20 ++++++++++++++++++-- dlls/d3d10/tests/effect.c | 24 +++++++++++++++--------- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index e121ad9cac2..12cfb457399 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -5794,6 +5794,11 @@ static const struct ID3D10EffectMatrixVariableVtbl d3d10_effect_matrix_variable_ /* ID3D10EffectVariable methods */ +static inline struct d3d10_effect_variable *impl_from_ID3D10EffectStringVariable(ID3D10EffectStringVariable *iface) +{ + return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); +} + static BOOL STDMETHODCALLTYPE d3d10_effect_string_variable_IsValid(ID3D10EffectStringVariable *iface) { TRACE("iface %p\n", iface); @@ -5950,9 +5955,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetRawValue(ID3D10 static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetString(ID3D10EffectStringVariable *iface, const char **str) { - FIXME("iface %p, str %p stub!\n", iface, str); + struct d3d10_effect_variable *var = impl_from_ID3D10EffectStringVariable(iface); + char *value = (char *)var->u.buffer.local_buffer; - return E_NOTIMPL; + TRACE("iface %p, str %p.\n", iface, str); + + if (!value) + return E_FAIL; + + if (!str) + return E_INVALIDARG; + + *str = value; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_string_variable_GetStringArray(ID3D10EffectStringVariable *iface, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 18560705049..fd0c7f7830a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -1422,22 +1422,28 @@ static void test_effect_variable_type_class(void) ok(td.Stride == 0x0, "Stride is %#x, expected 0x0\n", td.Stride); string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = string_var->lpVtbl->GetString(string_var, &str1); -todo_wine ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); + ok(!strcmp(str1, "STRING"), "Unexpected value %s.\n", str1); variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 1); string_var = variable->lpVtbl->AsString(variable); hr = string_var->lpVtbl->GetString(string_var, &str2); -todo_wine ok(SUCCEEDED(hr), "GetString failed, hr %#x.\n", hr); - if (SUCCEEDED(hr)) - { - ok(str2 != str1, "Unexpected string pointer.\n"); - ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); - } + ok(str2 != str1, "Unexpected string pointer.\n"); + ok(!strcmp(str2, "STRING"), "Unexpected value %s.\n", str1); + + /* Only two annotations */ + variable = constantbuffer->lpVtbl->GetAnnotationByIndex(constantbuffer, 2); + string_var = variable->lpVtbl->AsString(variable); + hr = string_var->lpVtbl->GetString(string_var, NULL); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + str1 = (void *)0xdeadbeef; + hr = string_var->lpVtbl->GetString(string_var, &str1); + ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); + ok(str1 == (void *)0xdeadbeef, "Unexpected pointer.\n"); /* check float f */ variable = constantbuffer->lpVtbl->GetMemberByIndex(constantbuffer, variable_nr++);

1 0

Nikolay Sivov : d3d10/effect: Store string annotation values.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: b73ed1977c85ee95f1dab2a818ff333b19b35eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b73ed1977c85ee95f1dab2a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 15:56:44 2021 +0200 d3d10/effect: Store string annotation values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 22 +++++- dlls/d3d10/tests/effect.c | 182 +++++++++++++++++++--------------------------- 2 files changed, 97 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b73ed1977c85ee95f1da…

1 0

Nikolay Sivov : d3dx10: Partially implement D3DX10CreateEffectFromFileW().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: eb2946addfbb8f6d41c848aa8047b16d98199d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb2946addfbb8f6d41c848aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 15:56:43 2021 +0200 d3dx10: Partially implement D3DX10CreateEffectFromFileW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/compiler.c | 33 +++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 ------------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 1ccb0e45a69..932bdadea1a 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -60,3 +60,36 @@ HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, c return hr; } + +HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, + ID3D10Include *include, const char *profile, UINT shader_flags, UINT effect_flags, + ID3D10Device *device, ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, + ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) +{ + ID3D10Blob *code; + HRESULT hr; + + TRACE("filename %s, defines %p, include %p, profile %s, shader_flags %#x, effect_flags %#x, " + "device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", + debugstr_w(filename), defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + if (FAILED(hr = D3DCompileFromFile(filename, defines, include, "main", profile, shader_flags, + effect_flags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + effect_flags, device, effect_pool, effect); + ID3D10Blob_Release(code); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 2bbfac9c632..2c53924ac20 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -61,19 +61,6 @@ HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHA return E_NOTIMPL; } -HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SHADER_MACRO *defines, - ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, - ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, - HRESULT *hresult) -{ - FIXME("filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - debugstr_w(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, - effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,

1 0

Nikolay Sivov : d3dx10: Partially implement D3DX10CreateEffectFromMemory().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 5279212cd93a00bdf04ebe5568df5e5e82098984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5279212cd93a00bdf04ebe55… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 15:56:42 2021 +0200 d3dx10: Partially implement D3DX10CreateEffectFromMemory(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/Makefile.in | 1 + dlls/d3dx10_43/compiler.c | 62 +++++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43_main.c | 13 --------- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 1108dcb0948..1fae34191ee 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -7,6 +7,7 @@ EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ async.c \ + compiler.c \ d3dx10_43_main.c \ texture.c diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c new file mode 100644 index 00000000000..1ccb0e45a69 --- /dev/null +++ b/dlls/d3dx10_43/compiler.c @@ -0,0 +1,62 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * 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 "wine/debug.h" + +#define COBJMACROS + +#include "d3d10_1.h" +#include "d3dx10.h" +#include "d3dcompiler.h" + +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + + +HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, + UINT shader_flags, UINT effect_flags, ID3D10Device *device, ID3D10EffectPool *effect_pool, + ID3DX10ThreadPump *pump, ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) +{ + ID3D10Blob *code; + HRESULT hr; + + TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, shader_flags %#x," + "effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, errors %p, hresult %p.\n", + data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + + if (pump) + FIXME("Asynchronous mode is not supported.\n"); + + if (!include) + include = D3D_COMPILE_STANDARD_FILE_INCLUDE; + + if (FAILED(hr = D3DCompile(data, datasize, filename, defines, include, "main", profile, + shader_flags, effect_flags, &code, errors))) + { + WARN("Effect compilation failed, hr %#x.\n", hr); + return hr; + } + + hr = D3D10CreateEffectFromMemory(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), + effect_flags, device, effect_pool, effect); + ID3D10Blob_Release(code); + + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43_main.c b/dlls/d3dx10_43/d3dx10_43_main.c index 06b00cb0393..2bbfac9c632 100644 --- a/dlls/d3dx10_43/d3dx10_43_main.c +++ b/dlls/d3dx10_43/d3dx10_43_main.c @@ -74,19 +74,6 @@ HRESULT WINAPI D3DX10CreateEffectFromFileW(const WCHAR *filename, const D3D10_SH return E_NOTIMPL; } -HRESULT WINAPI D3DX10CreateEffectFromMemory(const void *data, SIZE_T datasize, const char *filename, - const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, - UINT fxflags, ID3D10Device *device, ID3D10EffectPool *effectpool, ID3DX10ThreadPump *pump, - ID3D10Effect **effect, ID3D10Blob **errors, HRESULT *hresult) -{ - FIXME("data %p, datasize %lu, filename %s, defines %p, include %p, profile %s, hlslflags %#x, fxflags %#x, " - "device %p, effectpool %p, pump %p, effect %p, errors %p, hresult %p\n", - data, datasize, debugstr_a(filename), defines, include, debugstr_a(profile), hlslflags, fxflags, device, - effectpool, pump, effect, errors, hresult); - - return E_NOTIMPL; -} - HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasize, const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, const char *profile, UINT hlslflags, UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool,

1 0

Giovanni Mascellani : kernelbase: Fix an incorrect allocation size.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 1ca54db1bfd05c46dbd3039ed5ad48d9d915f212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ca54db1bfd05c46dbd3039e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Aug 10 16:40:12 2021 +0200 kernelbase: Fix an incorrect allocation size. Variable nt_privs has type TOKEN_PRIVILEGES*, not TOKEN_GROUPS*. This fixes a crash in the Cyberpunk 2077 launcher. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 36196304db3..472076cf7fe 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -667,7 +667,7 @@ BOOL WINAPI CreateRestrictedToken( HANDLE token, DWORD flags, if (delete_priv_count) { - if (!(nt_privs = heap_alloc( offsetof( TOKEN_GROUPS, Groups[delete_priv_count] ) ))) goto out; + if (!(nt_privs = heap_alloc( offsetof( TOKEN_PRIVILEGES, Privileges[delete_priv_count] ) ))) goto out; nt_privs->PrivilegeCount = delete_priv_count; memcpy( nt_privs->Privileges, delete_privs, delete_priv_count * sizeof(*delete_privs) ); }

1 0

Alex Henrie : ntoskrnl: Add MmGetPhysicalAddress semi-stub.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: c5c9c589743f921ce3dd0961cf051b0861fd75e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c9c589743f921ce3dd0961… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 6 21:13:44 2021 -0600 ntoskrnl: Add MmGetPhysicalAddress semi-stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47047 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0580231d8e3..7f5ca846db2 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2723,6 +2723,17 @@ BOOLEAN WINAPI MmIsAddressValid(PVOID VirtualAddress) return !IsBadReadPtr(VirtualAddress, 1); } +/*********************************************************************** + * MmGetPhysicalAddress (NTOSKRNL.EXE.@) + */ +PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address) +{ + PHYSICAL_ADDRESS ret; + FIXME("(%p): semi-stub\n", virtual_address); + ret.QuadPart = (ULONG_PTR)virtual_address; + return ret; +} + /*********************************************************************** * MmMapIoSpace (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ea6d9e9fc95..f51833b91a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -702,7 +702,7 @@ @ stub MmFreeMappingAddress @ stdcall MmFreeNonCachedMemory(ptr long) @ stub MmFreePagesFromMdl -@ stub MmGetPhysicalAddress +@ stdcall MmGetPhysicalAddress(ptr) @ stub MmGetPhysicalMemoryRanges @ stdcall MmGetSystemRoutineAddress(ptr) @ stub MmGetVirtualForPhysical

1 0

Eduard Permyakov : xmllite: Don't lose terminating character when shrinking buffer.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 2d33f406c93bc0d5c0ec6053a3967a19ee5e9f72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d33f406c93bc0d5c0ec6053… Author: Eduard Permyakov <epermyakov(a)codeweavers.com> Date: Fri Aug 6 15:01:16 2021 +0300 xmllite: Don't lose terminating character when shrinking buffer. The utf16 buffer is expected to be terminated by a '0' character. Flawed buffer shrinking logic would move the buffer contents but forget about the terminating character, which could cause reading junk past the end of the buffer contents. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a5a75c29887..834c36ae18c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2128,6 +2128,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start + 1, ptr + 1, len); buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; buffer->cur = cur + 1; *start = ch; @@ -2151,6 +2152,7 @@ static HRESULT reader_parse_reference(xmlreader *reader) memmove(start+1, ptr+1, len); buffer->cur = cur + 1; buffer->written -= (ptr - start) * sizeof(WCHAR); + *(WCHAR*)(buffer->data + buffer->written) = 0; *start = ch; }

1 0

Alexandre Julliard : winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory().
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 4303e753137d0b44cff4f9261d10ef86d57016f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4303e753137d0b44cff4f926… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:02:39 2021 +0200 winepulse.drv: Convert the Unix call initialization to NtQueryVirtualMemory(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 9 ++++--- dlls/winepulse.drv/pulse.c | 59 +++++++++++++++++++++---------------------- dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 67a42de97f9..ab4cccd7242 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pulse); -static UINT64 pulse_handle; +static unixlib_handle_t pulse_handle; #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) @@ -82,10 +82,13 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { if (reason == DLL_PROCESS_ATTACH) { DisableThreadLibraryCalls(dll); - if (__wine_init_unix_lib(dll, reason, NULL, &pulse_handle)) + if (NtQueryVirtualMemory( GetCurrentProcess(), dll, MemoryWineUnixFuncs, + &pulse_handle, sizeof(pulse_handle), NULL )) + return FALSE; + if (__wine_unix_call(pulse_handle, process_attach, NULL)) return FALSE; } else if (reason == DLL_PROCESS_DETACH) { - __wine_init_unix_lib(dll, reason, NULL, NULL); + __wine_unix_call(pulse_handle, process_detach, NULL); if (pulse_thread) { WaitForSingleObject(pulse_thread, INFINITE); CloseHandle(pulse_thread); diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 55579ecda80..2e6ad4848eb 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -178,6 +178,32 @@ static int pulse_poll_func(struct pollfd *ufds, unsigned long nfds, int timeout, return r; } +static NTSTATUS pulse_process_attach(void *args) +{ + pthread_mutexattr_t attr; + + pthread_mutexattr_init(&attr); + pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); + + if (pthread_mutex_init(&pulse_mutex, &attr) != 0) + pthread_mutex_init(&pulse_mutex, NULL); + + return STATUS_SUCCESS; +} + +static NTSTATUS pulse_process_detach(void *args) +{ + if (pulse_ctx) + { + pa_context_disconnect(pulse_ctx); + pa_context_unref(pulse_ctx); + } + if (pulse_ml) + pa_mainloop_quit(pulse_ml, 0); + + return STATUS_SUCCESS; +} + static NTSTATUS pulse_main_loop(void *args) { struct main_loop_params *params = args; @@ -1929,8 +1955,10 @@ static NTSTATUS pulse_is_started(void *args) return STATUS_SUCCESS; } -static const unixlib_entry_t unix_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { + pulse_process_attach, + pulse_process_detach, pulse_main_loop, pulse_create_stream, pulse_release_stream, @@ -1953,32 +1981,3 @@ static const unixlib_entry_t unix_funcs[] = pulse_test_connect, pulse_is_started, }; - -NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out) -{ - pthread_mutexattr_t attr; - - switch (reason) - { - case DLL_PROCESS_ATTACH: - pthread_mutexattr_init(&attr); - pthread_mutexattr_setprotocol(&attr, PTHREAD_PRIO_INHERIT); - - if (pthread_mutex_init(&pulse_mutex, &attr) != 0) - pthread_mutex_init(&pulse_mutex, NULL); - - *(UINT64 *)ptr_out = (UINT_PTR)&unix_funcs; - break; - case DLL_PROCESS_DETACH: - if (pulse_ctx) - { - pa_context_disconnect(pulse_ctx); - pa_context_unref(pulse_ctx); - } - if (pulse_ml) - pa_mainloop_quit(pulse_ml, 0); - - } - - return STATUS_SUCCESS; -} diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 9e7af57b716..98639e7705f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -187,6 +187,8 @@ struct is_started_params enum unix_funcs { + process_attach, + process_detach, main_loop, create_stream, release_stream,

1 0

Alexandre Julliard : wow64: Add thunks for the Unix library syscalls.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 8347c686e9fd3a6a72f4e5c59b0712956648b6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8347c686e9fd3a6a72f4e5c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:09:33 2021 +0200 wow64: Add thunks for the Unix library syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 13 +++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 5 +++++ 3 files changed, 19 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6ae3cc13861..bdd9a6b6ea7 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -262,6 +262,19 @@ NTSTATUS WINAPI wow64___wine_dbg_write( UINT *args ) } +/********************************************************************** + * wow64___wine_unix_call + */ +NTSTATUS WINAPI wow64___wine_unix_call( UINT *args ) +{ + unixlib_handle_t handle = get_ulong64( &args ); + unsigned int code = get_ulong( &args ); + void *args_ptr = get_ptr( &args ); + + return __wine_unix_call( handle, code, args_ptr ); +} + + /********************************************************************** * wow64_wine_server_call */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 6ae43e0e8ef..2df0323b36f 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -245,6 +245,7 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( __wine_dbg_write ) \ + SYSCALL_ENTRY( __wine_unix_call ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 9659557b64a..b4aabb13c7d 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -364,8 +364,13 @@ NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) } case MemoryWineImageInitFuncs: + case MemoryWineUnixWow64Funcs: return STATUS_INVALID_INFO_CLASS; + case MemoryWineUnixFuncs: + status = NtQueryVirtualMemory( handle, addr, MemoryWineUnixWow64Funcs, ptr, len, &res_len ); + break; + default: FIXME( "unsupported class %u\n", class ); return STATUS_INVALID_INFO_CLASS;

1 0

Alexandre Julliard : ntdll: Add a custom type for the Unix functions table handle.
by Alexandre Julliard 10 Aug '21

10 Aug '21

Module: wine Branch: master Commit: 572817948a9dbd47e781f987538fe506ee362968 URL: https://source.winehq.org/git/wine.git/?a=commit;h=572817948a9dbd47e781f987… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 18:07:08 2021 +0200 ntdll: Add a custom type for the Unix functions table handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/virtual.c | 4 ++-- include/winternl.h | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f5135a19f40..f1a2b9f5a79 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1141,7 +1141,7 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr /*********************************************************************** * __wine_unix_call */ -NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ) +NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ) { return ((unixlib_entry_t*)(UINT_PTR)handle)[code]( args ); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3532f5c8746..372447eb8af 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4345,14 +4345,14 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, case MemoryWineUnixFuncs: case MemoryWineUnixWow64Funcs: - if (len != sizeof(UINT64)) return STATUS_INFO_LENGTH_MISMATCH; + if (len != sizeof(unixlib_handle_t)) return STATUS_INFO_LENGTH_MISMATCH; if (process == GetCurrentProcess()) { void *module = (void *)addr; void *funcs = NULL; status = get_builtin_unix_funcs( module, info_class == MemoryWineUnixWow64Funcs, &funcs ); - if (!status) *(UINT64 *)buffer = (UINT_PTR)funcs; + if (!status) *(unixlib_handle_t *)buffer = (UINT_PTR)funcs; return status; } return STATUS_INVALID_HANDLE; diff --git a/include/winternl.h b/include/winternl.h index 41bc56d186d..562a35a83a1 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4612,11 +4612,12 @@ static inline PLIST_ENTRY RemoveTailList(PLIST_ENTRY le) #ifdef __WINESRC__ +typedef NTSTATUS (*unixlib_entry_t)( void *args ); +typedef UINT64 unixlib_handle_t; + /* Wine internal functions */ extern NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ); -extern NTSTATUS CDECL __wine_unix_call( UINT64 handle, unsigned int code, void *args ); - -typedef NTSTATUS (*unixlib_entry_t)( void *args ); +extern NTSTATUS CDECL __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); /* The thread information for 16-bit threads */ /* NtCurrentTeb()->SubSystemTib points to this */

1 0

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 2021