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

Francois Gouget : winedump: Fix the spelling of a trace and a comment.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: d5e85d975f1346569e101001c30b8b6e1c3516fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5e85d975f1346569e101001… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:32 2021 +0200 winedump: Fix the spelling of a trace and a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 25cfcba0630..12ec25b1a1c 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -299,7 +299,7 @@ static const char* get_varflags(unsigned flags) if (flags & 0x0002) X("addr-taken"); if (flags & 0x0004) X("compiler-gen"); if (flags & 0x0008) X("aggregated"); - if (flags & 0x0010) X("in-aggreate"); + if (flags & 0x0010) X("in-aggregate"); if (flags & 0x0020) X("aliased"); if (flags & 0x0040) X("alias"); if (flags & 0x0080) X("retval"); @@ -1189,7 +1189,7 @@ static void dump_defrange(const struct cv_addr_range* range, const void* last, c printf("%s\toffset:%x range:#%x\n", pfx, gap->gapStartOffset, gap->cbRange); } -/* return adress of first byte after the symbol */ +/* return address of first byte after the symbol */ static inline const char* get_last(const union codeview_symbol* sym) { return (const char*)sym + sym->generic.len + 2;

1 0

Francois Gouget : kernel32/tests: Fix a couple of ASCII / ANSI mixups in ok() messages.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: eae25715f5d2dda369514f94d9e885cec613735e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae25715f5d2dda369514f94… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:46:39 2021 +0200 kernel32/tests: Fix a couple of ASCII / ANSI mixups in ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/atom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/atom.c b/dlls/kernel32/tests/atom.c index ad9e91ba257..4796d41d23d 100644 --- a/dlls/kernel32/tests/atom.c +++ b/dlls/kernel32/tests/atom.c @@ -86,7 +86,7 @@ static void test_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "GlobalAddAtomW set last error\n" ); } @@ -344,7 +344,7 @@ static void test_local_add_atom(void) if (unicode_OS) { - ok( w_atom == atom, "Unicode atom does not match ASCII\n" ); + ok( w_atom == atom, "Unicode atom does not match ANSI one\n" ); ok( GetLastError() == 0xdeadbeef, "AddAtomW set last error\n" ); }

1 0

Francois Gouget : winepulse.drv: Use the official PulseAudio case for the endpoint id.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 18b98df060071aad16f6fab591ce6beb127b7f14 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b98df060071aad16f6fab5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:59:49 2021 +0200 winepulse.drv: Use the official PulseAudio case for the endpoint id. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index ab4cccd7242..35a66e18d8a 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -147,7 +147,7 @@ struct ACImpl { AudioSessionWrapper *session_wrapper; }; -static const WCHAR defaultW[] = L"Pulseaudio"; +static const WCHAR defaultW[] = L"PulseAudio"; static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl;

1 0

Rémi Bernon : dinput: Implement HID joystick IDirectInputDevice8_GetDeviceState.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 91f4af3418230305c9407711abe34d89156a47cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=91f4af3418230305c9407711… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Aug 27 12:45:23 2021 +0200 dinput: Implement HID joystick IDirectInputDevice8_GetDeviceState. Removing the trace as it can get pretty verbose otherwise. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 01864bb91e5..53dc97177a1 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY( DEVPROPKEY_HID_HANDLE, 0xbc62e415, 0xf4fe, 0x405c, 0x8e, 0xda struct hid_joystick { IDirectInputDeviceImpl base; + DIJOYSTATE2 state; HANDLE device; PHIDP_PREPARSED_DATA preparsed; @@ -142,11 +143,13 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con static HRESULT WINAPI hid_joystick_GetDeviceState( IDirectInputDevice8W *iface, DWORD len, void *ptr ) { - FIXME( "iface %p, len %u, ptr %p stub!\n", iface, len, ptr ); + struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); if (!ptr) return DIERR_INVALIDPARAM; - return DIERR_UNSUPPORTED; + fill_DataFormat( ptr, len, &impl->state, &impl->base.data_format ); + + return DI_OK; } static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance )

1 0

Nikolay Sivov : d3dx10_40/tests: Enable tests.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: cd0cb0cbd590fc2e21dfe90fdb6865adbe4f3b28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0cb0cbd590fc2e21dfe90f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:33:38 2021 +0300 d3dx10_40/tests: Enable tests. 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> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_40/Makefile.in | 1 + dlls/d3dx10_40/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 020ca989d4f..ca7863420b4 100755 --- a/configure +++ b/configure @@ -20386,6 +20386,7 @@ wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 +wine_fn_config_makefile dlls/d3dx10_40/tests enable_tests wine_fn_config_makefile dlls/d3dx10_41 enable_d3dx10_41 wine_fn_config_makefile dlls/d3dx10_41/tests enable_tests wine_fn_config_makefile dlls/d3dx10_42 enable_d3dx10_42 diff --git a/configure.ac b/configure.ac index f139c59be74..594794ed93c 100644 --- a/configure.ac +++ b/configure.ac @@ -3086,6 +3086,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_40/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41) WINE_CONFIG_MAKEFILE(dlls/d3dx10_41/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_42) diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index af15cc5c921..3f1c534702a 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_40.dll +IMPORTLIB = d3dx10_40 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_40/tests/Makefile.in b/dlls/d3dx10_40/tests/Makefile.in new file mode 100644 index 00000000000..ba566ff908d --- /dev/null +++ b/dlls/d3dx10_40/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_40.dll +IMPORTS = d3dx10_40 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3d10/effect: Store explicit bind point value for constant buffers and object variables.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 6cd12a9a432f0ed17de7ba98da5e4fa5bede4e4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cd12a9a432f0ed17de7ba98… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:13 2021 +0300 d3d10/effect: Store explicit bind point value for constant buffers and object variables. 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/d3d10_private.h | 1 + dlls/d3d10/effect.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 751c39dc895..5e406110988 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -199,6 +199,7 @@ struct d3d10_effect_variable DWORD annotation_count; DWORD flag; DWORD data_size; + DWORD explicit_bind_point; struct d3d10_effect *effect; struct d3d10_effect_variable *elements; struct d3d10_effect_variable *members; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index fe494e952d6..acc7199138b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1165,6 +1165,8 @@ static HRESULT parse_fx10_variable_head(const char *data, size_t data_size, } set_variable_vtbl(v); + v->explicit_bind_point = ~0u; + return copy_variableinfo_from_type(v); } @@ -1927,7 +1929,8 @@ static HRESULT parse_fx10_local_variable(const char *data, size_t data_size, } TRACE("Variable semantic: %s.\n", debugstr_a(v->semantic)); - skip_dword_unknown("local variable", ptr, 1); + read_dword(ptr, &v->explicit_bind_point); + TRACE("Variable explicit bind point %#x.\n", v->explicit_bind_point); switch (v->type->basetype) { @@ -2191,7 +2194,8 @@ static HRESULT parse_fx10_local_buffer(const char *data, size_t data_size, read_dword(ptr, &l->type->member_count); TRACE("Local buffer member count: %#x.\n", l->type->member_count); - skip_dword_unknown("local buffer", ptr, 1); + read_dword(ptr, &l->explicit_bind_point); + TRACE("Local buffer explicit bind point: %#x.\n", l->explicit_bind_point); read_dword(ptr, &l->annotation_count); TRACE("Local buffer has %u annotations.\n", l->annotation_count);

1 0

Huw Davies : ntdll: Remove unnecessary casts on macOS registers.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: dd37c3c4a04ef783ada136f561c0d4884a698713 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd37c3c4a04ef783ada136f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 27 07:48:53 2021 +0100 ntdll: Remove unnecessary casts on macOS registers. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index e033a3987ee..1c1022886fc 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -313,8 +313,8 @@ static inline int set_thread_area( struct modify_ldt_s *ptr ) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define SS_sig(context) ((context)->uc_mcontext->__ss.__ss) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__eflags) -#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__eip)) -#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__esp)) +#define EIP_sig(context) ((context)->uc_mcontext->__ss.__eip) +#define ESP_sig(context) ((context)->uc_mcontext->__ss.__esp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) NULL diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8065f1b8220..a9bdbf62929 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -229,8 +229,8 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel, #define FS_sig(context) ((context)->uc_mcontext->__ss.__fs) #define GS_sig(context) ((context)->uc_mcontext->__ss.__gs) #define EFL_sig(context) ((context)->uc_mcontext->__ss.__rflags) -#define RIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rip)) -#define RSP_sig(context) (*((unsigned long*)&(context)->uc_mcontext->__ss.__rsp)) +#define RIP_sig(context) ((context)->uc_mcontext->__ss.__rip) +#define RSP_sig(context) ((context)->uc_mcontext->__ss.__rsp) #define TRAP_sig(context) ((context)->uc_mcontext->__es.__trapno) #define ERROR_sig(context) ((context)->uc_mcontext->__es.__err) #define FPU_sig(context) ((XMM_SAVE_AREA32 *)&(context)->uc_mcontext->__fs.__fpu_fcw)

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Implement PsGetCurrentProcessSessionId.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 5aec01a7af42cd0b026a763f0c5d13e609a254f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5aec01a7af42cd0b026a763f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 27 16:45:05 2021 +1000 ntoskrnl.exe: Implement PsGetCurrentProcessSessionId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36887 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f1248300683..5c3a42c3d76 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3008,6 +3008,13 @@ HANDLE WINAPI PsGetCurrentProcessId(void) return KeGetCurrentThread()->id.UniqueProcess; } +/*********************************************************************** + * PsGetCurrentProcessSessionId (NTOSKRNL.EXE.@) + */ +ULONG WINAPI PsGetCurrentProcessSessionId(void) +{ + return PsGetCurrentProcess()->info.PebBaseAddress->SessionId; +} /*********************************************************************** * PsGetCurrentThreadId (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 071dae6ceca..0208e2f633f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -888,7 +888,7 @@ @ stub PsGetContextThread @ stdcall PsGetCurrentProcess() IoGetCurrentProcess @ stdcall PsGetCurrentProcessId() -@ stub PsGetCurrentProcessSessionId +@ stdcall PsGetCurrentProcessSessionId() @ stdcall PsGetCurrentThread() KeGetCurrentThread @ stdcall PsGetCurrentThreadId() @ stub PsGetCurrentThreadPreviousMode

1 0

Alexandre Julliard : winegcc: Fix subsystem check to avoid running winebuild on Unix libraries.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: a7076690b186ad876d2d12d9cc4b49cb692feed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7076690b186ad876d2d12d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 27 12:25:26 2021 +0200 winegcc: Fix subsystem check to avoid running winebuild on Unix libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 710f6dc900d..5f8e6c0e086 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1387,7 +1387,7 @@ static void build(struct options* opts) else entry_point = opts->entry_point; /* run winebuild to generate the .spec.o file */ - if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "native"))) + if (!(opts->unix_lib && opts->subsystem && !strcmp(opts->subsystem, "unixlib"))) spec_o_name = build_spec_obj( opts, spec_file, output_file, files, lib_dirs, entry_point ); if (fake_module) return; /* nothing else to do */

1 0

Nikolay Sivov : d3d10/effect: Clear up unknown fields in effect header.
by Alexandre Julliard Aug. 27, 2021

Aug. 27, 2021

Module: wine Branch: master Commit: 03c88ad6220f77fd32cf2b069e55bf53e908b02c URL: https://source.winehq.org/git/wine.git/?a=commit;h=03c88ad6220f77fd32cf2b06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 26 08:32:12 2021 +0300 d3d10/effect: Clear up unknown fields in effect header. 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 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 9312cfec6f6..fe494e952d6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2442,7 +2442,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_size) { const char *ptr = data; - DWORD unknown; + DWORD unused; if (!require_space(0, 19, sizeof(DWORD), data_size)) { @@ -2464,14 +2464,13 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s TRACE("Object count: %u\n", e->local_variable_count); read_dword(&ptr, &e->sharedbuffers_count); - TRACE("Sharedbuffers count: %u\n", e->sharedbuffers_count); + TRACE("Pool buffer count: %u\n", e->sharedbuffers_count); - /* Number of variables in shared buffers? */ - read_dword(&ptr, &unknown); - FIXME("Unknown 0: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("Pool variable count: %u\n", unused); read_dword(&ptr, &e->sharedobjects_count); - TRACE("Sharedobjects count: %u\n", e->sharedobjects_count); + TRACE("Pool objects count: %u\n", e->sharedobjects_count); read_dword(&ptr, &e->technique_count); TRACE("Technique count: %u\n", e->technique_count); @@ -2479,8 +2478,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->index_offset); TRACE("Index offset: %#x\n", e->index_offset); - read_dword(&ptr, &unknown); - FIXME("Unknown 1: %u\n", unknown); + read_dword(&ptr, &unused); + TRACE("String count: %u\n", unused); read_dword(&ptr, &e->texture_count); TRACE("Texture count: %u\n", e->texture_count);

1 0