August 2021 - Wine-Commits - list.winehq.org

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

Aug. 10, 2021

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

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

Aug. 10, 2021

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 : d3d10/effect: Implement GetString().
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

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 : d3dx10: Partially implement D3DX10CreateEffectFromFileW().
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

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 Aug. 10, 2021

Aug. 10, 2021

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

Nikolay Sivov : d3d10/effect: Partially implement ID3D10Effect::GetDesc().
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: f63ecaedc72f3580e7016ba71a480025e4d86e99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f63ecaedc72f3580e7016ba7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 10 15:56:46 2021 +0200 d3d10/effect: Partially implement ID3D10Effect::GetDesc(). 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 | 24 +++++- dlls/d3d10/tests/effect.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 217 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f63ecaedc72f3580e701…

1 0

Giovanni Mascellani : kernelbase: Fix an incorrect allocation size.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

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

Alexandre Julliard : wow64: Add thunks for the Unix library syscalls.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

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: Don't try to load .so dlls for a different machine.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: ccd9008d8d0a33769d8b328d5bc6775f940ef0bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccd9008d8d0a33769d8b328d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 10 16:42:09 2021 +0200 ntdll: Don't try to load .so dlls for a different machine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 55fc73d2d06..5f1cbda51a9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1286,12 +1286,14 @@ static NTSTATUS open_builtin_pe_file( const char *name, OBJECT_ATTRIBUTES *attr, * open_builtin_so_file */ static NTSTATUS open_builtin_so_file( const char *name, OBJECT_ATTRIBUTES *attr, void **module, - SECTION_IMAGE_INFORMATION *image_info, BOOL prefer_native ) + SECTION_IMAGE_INFORMATION *image_info, + WORD machine, BOOL prefer_native ) { NTSTATUS status; int fd; *module = NULL; + if (machine != current_machine) return STATUS_DLL_NOT_FOUND; if ((fd = open( name, O_RDONLY )) == -1) return STATUS_DLL_NOT_FOUND; if (check_library_arch( fd )) @@ -1362,7 +1364,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; /* now as a program */ @@ -1376,7 +1378,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1393,11 +1395,10 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status != STATUS_DLL_NOT_FOUND) goto done; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); - if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_pe_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) { @@ -1406,7 +1407,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T } if (status != STATUS_DLL_NOT_FOUND) goto done; strcpy( file + pos + len + 1, ".so" ); - status = open_builtin_so_file( ptr, &attr, module, image_info, prefer_native ); + status = open_builtin_so_file( ptr, &attr, module, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; } @@ -1777,7 +1778,7 @@ static void load_ntdll(void) if (status == STATUS_DLL_NOT_FOUND) { sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); - status = open_builtin_so_file( name, &attr, &module, &info, FALSE ); + status = open_builtin_so_file( name, &attr, &module, &info, current_machine, FALSE ); } if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); else if (status) fatal_error( "failed to load %s error %x\n", name, status );

1 0

Andrew Boyarshin : include: Fix IRequestDictionary IID.
by Alexandre Julliard Aug. 10, 2021

Aug. 10, 2021

Module: wine Branch: master Commit: 32ec7d7b94d1c2a476553c1e50f59ac6ecb5c8f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32ec7d7b94d1c2a476553c1e… Author: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Date: Fri Jul 23 14:49:36 2021 +0700 include: Fix IRequestDictionary IID. IRequestDictionary had the wrong UUID specified (IResponse one). Found by using MIDL instead of WIDL to compile Wine headers: duplicated IID caused compilation error in MIDL. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 2 +- include/asptlb.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index df30104a156..a7890d56f71 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13170,7 +13170,7 @@ static HRESULT WINAPI transformdest_QueryInterface(IUnknown *iface, REFIID riid, IsEqualIID(riid, &IID_IServiceProvider) || IsEqualIID(riid, &IID_IStream) || IsEqualIID(riid, &IID_ISequentialStream) || - IsEqualIID(riid, &IID_IRequestDictionary); + IsEqualIID(riid, &IID_IResponse); todo_wine_if(IsEqualIID(riid, &IID_IXMLDOMDocument)) ok(known_iid, "Unexpected riid %s\n", wine_dbgstr_guid(riid)); diff --git a/include/asptlb.idl b/include/asptlb.idl index b38bc5d1fe9..07f250702dd 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -23,7 +23,7 @@ import "oaidl.idl"; [ object, dual, - uuid(D97A6DA0-A864-11cf-83BE-00A0C90C2BD8) + uuid(D97A6DA0-A85F-11DF-83AE-00A0C90C2BD8) ] interface IRequestDictionary : IDispatch {

1 0