October 2023 - Wine-commits

Rémi Bernon : dmime: Introduce a new segment_state_create constructor.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 45d1c00eeaf833e64767a43241612d0411f86493 URL: https://gitlab.winehq.org/wine/wine/-/commit/45d1c00eeaf833e64767a43241612d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 3 11:37:11 2023 +0200 dmime: Introduce a new segment_state_create constructor. --- dlls/dmime/dmime_private.h | 3 +++ dlls/dmime/performance.c | 36 ++++++++++++++++++++++-------- dlls/dmime/segmentstate.c | 55 ++++++++++++++++++++++++++++++++++++++-------- dlls/dmime/tests/dmime.c | 14 ++++++------ 4 files changed, 83 insertions(+), 25 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index eacde4b46be..c35c52eb066 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -70,6 +70,9 @@ extern void set_audiopath_perf_pointer(IDirectMusicAudioPath*,IDirectMusicPerfor extern void set_audiopath_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); extern void set_audiopath_primary_dsound_buffer(IDirectMusicAudioPath*,IDirectSoundBuffer*); +extern HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time, + IDirectMusicSegmentState **ret_iface); + /***************************************************************************** * Auxiliary definitions */ diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index e590db88997..9f293358ca6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1063,17 +1063,35 @@ static HRESULT WINAPI performance_InitAudio(IDirectMusicPerformance8 *iface, IDi return S_OK; } -static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, IUnknown *pSource, - WCHAR *pwzSegmentName, IUnknown *pTransition, DWORD dwFlags, __int64 i64StartTime, - IDirectMusicSegmentState **ppSegmentState, IUnknown *pFrom, IUnknown *pAudioPath) +static HRESULT WINAPI performance_PlaySegmentEx(IDirectMusicPerformance8 *iface, IUnknown *source, + WCHAR *segment_name, IUnknown *transition, DWORD segment_flags, INT64 start_time, + IDirectMusicSegmentState **segment_state, IUnknown *from, IUnknown *audio_path) { - struct performance *This = impl_from_IDirectMusicPerformance8(iface); + struct performance *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicSegmentState *state; + IDirectMusicSegment *segment; + HRESULT hr; - FIXME("(%p, %p, %p, %p, %ld, 0x%s, %p, %p, %p): stub\n", This, pSource, pwzSegmentName, - pTransition, dwFlags, wine_dbgstr_longlong(i64StartTime), ppSegmentState, pFrom, pAudioPath); - if (ppSegmentState) - return create_dmsegmentstate(&IID_IDirectMusicSegmentState,(void**)ppSegmentState); - return S_OK; + FIXME("(%p, %p, %s, %p, %#lx, %I64d, %p, %p, %p): stub\n", This, source, debugstr_w(segment_name), + transition, segment_flags, start_time, segment_state, from, audio_path); + + if (FAILED(hr = IUnknown_QueryInterface(source, &IID_IDirectMusicSegment, (void **)&segment))) + return hr; + if (FAILED(hr = segment_state_create((IDirectMusicSegment *)segment, start_time, &state))) + { + IDirectMusicSegment_Release(segment); + return hr; + } + + if (segment_state) + { + *segment_state = state; + IDirectMusicSegmentState_AddRef(state); + } + + IDirectMusicSegmentState_Release(state); + IDirectMusicSegment_Release(segment); + return hr; } static HRESULT WINAPI performance_StopEx(IDirectMusicPerformance8 *iface, IUnknown *pObjectToStop, diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 655940311b3..1a09bed5dd3 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -25,6 +25,10 @@ struct segment_state { IDirectMusicSegmentState8 IDirectMusicSegmentState8_iface; LONG ref; + + IDirectMusicSegment *segment; + MUSIC_TIME start_point; + MUSIC_TIME start_time; }; static inline struct segment_state *impl_from_IDirectMusicSegmentState8(IDirectMusicSegmentState8 *iface) @@ -73,7 +77,11 @@ static ULONG WINAPI segment_state_Release(IDirectMusicSegmentState8 *iface) TRACE("(%p): %ld\n", This, ref); - if (!ref) free(This); + if (!ref) + { + if (This->segment) IDirectMusicSegment_Release(This->segment); + free(This); + } return ref; } @@ -89,17 +97,21 @@ static HRESULT WINAPI segment_state_GetSegment(IDirectMusicSegmentState8 *iface, { struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %p): semi-stub\n", This, segment); + TRACE("(%p, %p)\n", This, segment); - *segment = NULL; - return DMUS_E_NOT_FOUND; + if (!(*segment = This->segment)) return DMUS_E_NOT_FOUND; + + IDirectMusicSegment_AddRef(This->segment); + return S_OK; } static HRESULT WINAPI segment_state_GetStartTime(IDirectMusicSegmentState8 *iface, MUSIC_TIME *start_time) { struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %p): semi-stub\n", This, start_time); - *start_time = -1; + + TRACE("(%p, %p)\n", This, start_time); + + *start_time = This->start_time; return S_OK; } @@ -111,13 +123,13 @@ static HRESULT WINAPI segment_state_GetSeek(IDirectMusicSegmentState8 *iface, MU return S_OK; } -static HRESULT WINAPI segment_state_GetStartPoint(IDirectMusicSegmentState8 *iface, MUSIC_TIME *start_time) +static HRESULT WINAPI segment_state_GetStartPoint(IDirectMusicSegmentState8 *iface, MUSIC_TIME *start_point) { struct segment_state *This = impl_from_IDirectMusicSegmentState8(iface); - FIXME("(%p, %p): semi-stub\n", This, start_time); + TRACE("(%p, %p)\n", This, start_point); - *start_time = 0; + *start_point = This->start_point; return S_OK; } @@ -161,8 +173,33 @@ HRESULT create_dmsegmentstate(REFIID riid, void **ret_iface) if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicSegmentState8_iface.lpVtbl = &segment_state_vtbl; obj->ref = 1; + obj->start_time = -1; + TRACE("Created IDirectMusicSegmentState %p\n", obj); hr = IDirectMusicSegmentState8_QueryInterface(&obj->IDirectMusicSegmentState8_iface, riid, ret_iface); IDirectMusicSegmentState8_Release(&obj->IDirectMusicSegmentState8_iface); return hr; } + +HRESULT segment_state_create(IDirectMusicSegment *segment, MUSIC_TIME start_time, + IDirectMusicSegmentState **ret_iface) +{ + IDirectMusicSegmentState *iface; + struct segment_state *This; + HRESULT hr; + + TRACE("(%p, %lu, %p)\n", segment, start_time, ret_iface); + + if (FAILED(hr = create_dmsegmentstate(&IID_IDirectMusicSegmentState, (void **)&iface))) return hr; + This = impl_from_IDirectMusicSegmentState8((IDirectMusicSegmentState8 *)iface); + + This->segment = segment; + IDirectMusicSegment_AddRef(This->segment); + + This->start_time = start_time; + hr = IDirectMusicSegment_GetStartPoint(segment, &This->start_point); + + if (SUCCEEDED(hr)) *ret_iface = iface; + else IDirectMusicSegmentState_Release(iface); + return hr; +} diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index e7113d2bb5c..87d938a9015 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4043,14 +4043,14 @@ static void test_segment_state(void) tmp_segment = (void *)0xdeadbeef; hr = IDirectMusicSegmentState_GetSegment(state, &tmp_segment); - todo_wine ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(tmp_segment == segment, "got %p\n", tmp_segment); - if (tmp_segment) IDirectMusicSegment_Release(tmp_segment); + ok(hr == S_OK, "got %#lx\n", hr); + ok(tmp_segment == segment, "got %p\n", tmp_segment); + IDirectMusicSegment_Release(tmp_segment); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time == 50, "got %lu\n", time); + ok(time == 50, "got %lu\n", time); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); @@ -4058,7 +4058,7 @@ static void test_segment_state(void) time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time == 20, "got %#lx\n", time); + ok(time == 20, "got %#lx\n", time); time = 0xdeadbeef; /* The seek value is also dependent on whether the tracks are playing. @@ -4080,7 +4080,7 @@ static void test_segment_state(void) time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartPoint(state, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time == 50, "got %#lx\n", time); + ok(time == 50, "got %#lx\n", time); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetRepeats(state, &value); ok(hr == S_OK, "got %#lx\n", hr); @@ -4088,7 +4088,7 @@ static void test_segment_state(void) time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetStartTime(state, &time); ok(hr == S_OK, "got %#lx\n", hr); - todo_wine ok(time == 20, "got %#lx\n", time); + ok(time == 20, "got %#lx\n", time); time = 0xdeadbeef; hr = IDirectMusicSegmentState_GetSeek(state, &time); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Alexandre Julliard : ntdll: Fix relocation of the 32-bit ntdll.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: e9b65e99b2ba47b48e298d136b97ced5524d528f URL: https://gitlab.winehq.org/wine/wine/-/commit/e9b65e99b2ba47b48e298d136b97ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 26 21:06:29 2023 +0200 ntdll: Fix relocation of the 32-bit ntdll. --- dlls/ntdll/unix/loader.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 7bf3ca22566..1f8d560ddfb 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1113,17 +1113,35 @@ static const IMAGE_BASE_RELOCATION *process_relocation_block( void *module, cons return (IMAGE_BASE_RELOCATION *)relocs; /* return address of next block */ } -static void relocate_ntdll( void *module ) + +/*********************************************************************** + * relocate_module + */ +static NTSTATUS relocate_module( void *module ) { const IMAGE_NT_HEADERS *nt = get_rva( module, ((IMAGE_DOS_HEADER *)module)->e_lfanew ); const IMAGE_BASE_RELOCATION *rel, *end; const IMAGE_SECTION_HEADER *sec; ULONG protect_old[96], i, size; + ULONG_PTR image_base; INT_PTR delta; - ERR( "ntdll could not be mapped at preferred address (%p), expect trouble\n", module ); + if (nt->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + image_base = ((const IMAGE_NT_HEADERS64 *)nt)->OptionalHeader.ImageBase; + else + image_base = ((const IMAGE_NT_HEADERS32 *)nt)->OptionalHeader.ImageBase; - if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) return; + if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) + { + ERR( "Need to relocate module from %p to %p, but relocation records are stripped\n", + (void *)image_base, module ); + return STATUS_CONFLICTING_ADDRESSES; + } + + TRACE( "%p -> %p\n", (void *)image_base, module ); + + if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) + return STATUS_SUCCESS; sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) @@ -1134,7 +1152,7 @@ static void relocate_ntdll( void *module ) } end = (IMAGE_BASE_RELOCATION *)((const char *)rel + size); - delta = (char *)module - (char *)nt->OptionalHeader.ImageBase; + delta = (ULONG_PTR)module - image_base; while (rel && rel < end - 1 && rel->SizeOfBlock) rel = process_relocation_block( module, rel, delta ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) @@ -1143,6 +1161,7 @@ static void relocate_ntdll( void *module ) SIZE_T size = sec[i].SizeOfRawData; NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, protect_old[i], &protect_old[i] ); } + return STATUS_SUCCESS; } @@ -1938,8 +1957,8 @@ static void load_ntdll(void) sprintf( name, "%s/ntdll.dll.so", ntdll_dir ); status = open_builtin_so_file( name, &attr, &module, &info, 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 ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = relocate_module( module ); + if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); } @@ -2033,19 +2052,10 @@ static void load_wow64_ntdll( USHORT machine ) wcscat( path, ntdllW ); init_unicode_string( &nt_name, path ); status = find_builtin_dll( &nt_name, &module, &size, &info, 0, 0, machine, 0, FALSE ); - switch (status) - { - case STATUS_IMAGE_NOT_AT_BASE: - relocate_ntdll( module ); - /* fall through */ - case STATUS_SUCCESS: - load_ntdll_wow64_functions( module ); - TRACE("loaded %s at %p\n", debugstr_w(path), module ); - break; - default: - ERR( "failed to load %s error %x\n", debugstr_w(path), status ); - break; - } + if (status == STATUS_IMAGE_NOT_AT_BASE) status = relocate_module( module ); + if (status) fatal_error( "failed to load %s error %x\n", debugstr_w(path), status ); + load_ntdll_wow64_functions( module ); + TRACE("loaded %s at %p\n", debugstr_w(path), module ); free( path ); }

1 0

Alexandre Julliard : ntdll: Move the module relocation support to virtual.c.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 56d9e1a8a8dcce492587b2d26889a3072f4d2e2c URL: https://gitlab.winehq.org/wine/wine/-/commit/56d9e1a8a8dcce492587b2d26889a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 14:39:48 2023 +0200 ntdll: Move the module relocation support to virtual.c. --- dlls/ntdll/unix/loader.c | 109 +----------------------------- dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 147 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 147 insertions(+), 110 deletions(-)

1 0

Alexandre Julliard : ntdll: Support relocating the main exe.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 526b9fc89bc3aea2e972a5541a0f09766cd773c9 URL: https://gitlab.winehq.org/wine/wine/-/commit/526b9fc89bc3aea2e972a5541a0f09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 4 15:19:12 2023 +0200 ntdll: Support relocating the main exe. --- dlls/ntdll/loader.c | 3 ++- dlls/ntdll/unix/env.c | 2 +- dlls/ntdll/unix/loader.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 5b2f9bdce0d..cfb1e833cc6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2041,7 +2041,8 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T if (nt->OptionalHeader.SectionAlignment < page_size) return STATUS_SUCCESS; - if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && NtCurrentTeb()->Peb->ImageBaseAddress) + if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL) && + module != NtCurrentTeb()->Peb->ImageBaseAddress) return STATUS_SUCCESS; relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index feae7d4b954..80f151c4cb9 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2116,7 +2116,7 @@ void init_startup_info(void) status = load_main_exe( params->ImagePathName.Buffer, NULL, params->CommandLine.Buffer, machine, &image, &module ); - if (status) + if (!NT_SUCCESS(status)) { MESSAGE( "wine: failed to start %s\n", debugstr_us(&params->ImagePathName) ); NtTerminateProcess( GetCurrentProcess(), status ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 5eab3d519c8..0b83d11d373 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1743,7 +1743,7 @@ NTSTATUS load_start_exe( WCHAR **image, void **module ) wcscat( *image, startW ); init_unicode_string( &nt_name, *image ); status = find_builtin_dll( &nt_name, module, &size, &main_image_info, 0, 0, current_machine, 0, FALSE ); - if (status) + if (!NT_SUCCESS(status)) { MESSAGE( "wine: failed to load start.exe: %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status );

1 0

Alistair Leslie-Hughes : wpcap: Return NULL on error in get_broadcast.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 16217163d9ef575c7dab9498cba63a2351fdc09e URL: https://gitlab.winehq.org/wine/wine/-/commit/16217163d9ef575c7dab9498cba63a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 4 16:55:21 2023 +1100 wpcap: Return NULL on error in get_broadcast. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 6ad4fc5f04f..de4bac33871 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -519,7 +519,7 @@ static struct sockaddr *get_broadcast( const IP_ADAPTER_UNICAST_ADDRESS *addr ) struct sockaddr_in *broadcast_addr_in, *addr_in = (struct sockaddr_in *)addr->Address.lpSockaddr; ULONG netmask; - if (!(broadcast_addr_in = calloc( 1, sizeof(*broadcast_addr_in) ))) return FALSE; + if (!(broadcast_addr_in = calloc( 1, sizeof(*broadcast_addr_in) ))) return NULL; broadcast_addr_in->sin_family = AF_INET; ConvertLengthToIpv4Mask( addr->OnLinkPrefixLength, &netmask ); broadcast_addr_in->sin_addr.S_un.S_addr = addr_in->sin_addr.S_un.S_addr | ~netmask;

1 0

Martin Storsjö : configure: Fix restoring CFLAGS after the test for -Wl,-z,defs.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: 2c7524021ec862eba304c788274d6b49b7c1aca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c7524021ec862eba304c788274d6b… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Oct 4 15:03:21 2023 +0300 configure: Fix restoring CFLAGS after the test for -Wl,-z,defs. This fixes a regression from 450c358881dbc6dcfb2692b8f4debb7db8fdc54b; after testing for -Wl,-z,defs, CFLAGS was restored from an incorrect variable, leaving CFLAGS essentially empty. This would break builds for e.g. arm with Clang, where -mthumb would be essential for being able to build some inline assembly snippets correctly. This also had the effect of dropping the default "-g -O2" arguments from CFLAGS. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cbcc88d6626..a8139a60b10 100755 --- a/configure +++ b/configure @@ -10123,7 +10123,7 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_save_cflags + CFLAGS=$ac_save_CFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_z_defs" >&5 printf "%s\n" "$ac_cv_wl_z_defs" >&6; } diff --git a/configure.ac b/configure.ac index d288c544dfd..4803b7abea4 100644 --- a/configure.ac +++ b/configure.ac @@ -771,7 +771,7 @@ case $host_os in dnl On FreeBSD, shared libraries using environ fail to link with -Wl,-z,defs AC_LINK_IFELSE([AC_LANG_SOURCE([[extern char **environ; char **envp; void myfunc(void) { envp = environ; }]])], [ac_cv_wl_z_defs=yes],[ac_cv_wl_z_defs=no]) - CFLAGS=$ac_save_cflags]) + CFLAGS=$ac_save_CFLAGS]) test $ac_cv_wl_z_defs != yes || AS_VAR_APPEND([UNIXLDFLAGS],[" -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])

1 0

Stefan Dösinger : wined3d: Reference the push constant buffers.
by Alexandre Julliard 04 Oct '23

04 Oct '23

Module: wine Branch: master Commit: f9c5176ad8f0fed79930bdeb9c6895eb5a09c548 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9c5176ad8f0fed79930bdeb9c6895… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 27 22:43:50 2023 +0300 wined3d: Reference the push constant buffers. --- dlls/wined3d/cs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3cfce72ae94..50d89615dd3 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1056,6 +1056,11 @@ static void reference_graphics_pipeline_resources(struct wined3d_device_context if (state->fb.render_targets[i]) wined3d_device_context_reference_resource(context, state->fb.render_targets[i]->resource); } + for (i = 0; i < WINED3D_PUSH_CONSTANTS_COUNT; ++i) + { + if (context->device->push_constants[i]) + wined3d_device_context_reference_resource(context, &context->device->push_constants[i]->resource); + } if (state->fb.depth_stencil) wined3d_device_context_reference_resource(context, state->fb.depth_stencil->resource); reference_shader_resources(context, ~(1u << WINED3D_SHADER_TYPE_COMPUTE));

1 0

Nikolay Sivov : propsys: Partially implement VariantToString().
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: f7ef02bd8f74ea052d61e48cd84b226d8a5867a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7ef02bd8f74ea052d61e48cd84b22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 3 18:41:11 2023 +0200 propsys: Partially implement VariantToString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55708 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 32 ++++++++++++++++++++++++++++++++ dlls/propsys/tests/propsys.c | 30 ++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index cf7a4c299f4..b2d48a87577 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -190,7 +190,7 @@ @ stub VariantToInt64WithDefault @ stub VariantToPropVariant @ stub VariantToStrRet -@ stub VariantToString +@ stdcall VariantToString(ptr ptr long) @ stub VariantToStringAlloc @ stub VariantToStringArray @ stub VariantToStringArrayAlloc diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index c170f82c598..bf77e7d51e5 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -431,6 +431,38 @@ PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *defau return default_value; } +/****************************************************************** + * VariantToString (PROPSYS.@) + */ +HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch) +{ + WCHAR *str = NULL; + + TRACE("%p, %p, %u.\n", var, ret, cch); + + *ret = 0; + + if (!cch) + return E_INVALIDARG; + + if (V_VT(var) == VT_BSTR) + { + str = V_BSTR(var); + } + else + { + FIXME("Unsupported type %d.\n", V_VT(var)); + + return E_NOTIMPL; + } + + if (wcslen(str) > cch - 1) + return STRSAFE_E_INSUFFICIENT_BUFFER; + wcscpy(ret, str); + + return S_OK; +} + /****************************************************************** * PropVariantChangeType (PROPSYS.@) */ diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index 2d683a3bdf5..dab0537991b 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2277,6 +2277,35 @@ static void test_VariantToStringWithDefault(void) SysFreeString(b); } +static void test_VariantToString(void) +{ + HRESULT hr; + VARIANT v; + WCHAR buff[64]; + + buff[0] = 1; + V_VT(&v) = VT_EMPTY; + hr = VariantToString(&v, buff, 64); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!buff[0], "Unexpected buffer.\n"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = SysAllocString(L"test1"); + + buff[0] = 1; + hr = VariantToString(&v, buff, 0); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!buff[0], "Unexpected buffer.\n"); + + hr = VariantToString(&v, buff, 5); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#lx.\n", hr); + hr = VariantToString(&v, buff, 6); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(buff, L"test1"), "Unexpected string.\n"); + VariantClear(&v); +} + START_TEST(propsys) { test_InitPropVariantFromGUIDAsString(); @@ -2304,4 +2333,5 @@ START_TEST(propsys) test_propertystore(); test_PSCreatePropertyStoreFromObject(); test_VariantToStringWithDefault(); + test_VariantToString(); } diff --git a/include/propvarutil.h b/include/propvarutil.h index 575c498b230..6c1878c6aa5 100644 --- a/include/propvarutil.h +++ b/include/propvarutil.h @@ -95,6 +95,7 @@ HRESULT WINAPI PropVariantToBuffer(REFPROPVARIANT propvarIn, void *ret, UINT cb) HRESULT WINAPI PropVariantToString(REFPROPVARIANT propvarIn, PWSTR ret, UINT cch); PCWSTR WINAPI PropVariantToStringWithDefault(REFPROPVARIANT propvarIn, LPCWSTR pszDefault); PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, LPCWSTR pszDefault); +HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch); HRESULT WINAPI PropVariantToStringAlloc(REFPROPVARIANT propvarIn, WCHAR **ret);

1 0

Alex Henrie : http: Use the strdup function instead of reimplementing it.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: d5b64a1f14b472563c95a02d0062ba592c64e06a URL: https://gitlab.winehq.org/wine/wine/-/commit/d5b64a1f14b472563c95a02d0062ba… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 19 23:01:50 2023 -0600 http: Use the strdup function instead of reimplementing it. --- dlls/http.sys/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 5c075908f63..52887259aa7 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -731,9 +731,8 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) if (strchr(params->url, '?')) return STATUS_INVALID_PARAMETER; - if (!(url = malloc(strlen(params->url)+1))) + if (!(url = strdup(params->url))) return STATUS_NO_MEMORY; - strcpy(url, params->url); if (!(new_entry = malloc(sizeof(struct url)))) {

1 0

Alistair Leslie-Hughes : msxml3: IXMLDOMElement::selectSingleNode always assign a value to the output parameter.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 0770ba61ceb81794e5d03b6d6c48597d1b67c7ae URL: https://gitlab.winehq.org/wine/wine/-/commit/0770ba61ceb81794e5d03b6d6c4859… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 3 17:08:16 2023 +1100 msxml3: IXMLDOMElement::selectSingleNode always assign a value to the output parameter. --- dlls/msxml3/node.c | 3 +++ dlls/msxml3/tests/domdoc.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 339504477ac..4e4a9cfd1ef 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1560,6 +1560,9 @@ HRESULT node_select_singlenode(const xmlnode *This, BSTR query, IXMLDOMNode **no IXMLDOMNodeList *list; HRESULT hr; + if (node) + *node = NULL; + hr = node_select_nodes(This, query, &list); if (hr == S_OK) { diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 582c3ba6621..b2cddb5d140 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2516,6 +2516,11 @@ static void test_domnode( void ) ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); ok( node == NULL, "node %p\n", node ); + node = (void*)0xdeadbeef; + hr = IXMLDOMElement_selectSingleNode( element, _bstr_("In Valid"), &node ); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + ok( node == NULL, "node %p\n", node ); + str = SysAllocString(L"bs"); hr = IXMLDOMElement_selectSingleNode( element, str, &node ); SysFreeString(str);

1 0