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

Connor McAdams : mfplat: Add MFCreateWaveFormatExFromMFMediaType AudioFormat_Float test.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 7dc454be852a63a776c5cf2d7804f0c97c24ac4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc454be852a63a776c5cf2d… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Apr 21 10:20:05 2021 -0400 mfplat: Add MFCreateWaveFormatExFromMFMediaType AudioFormat_Float test. Add test for MFAudioFormat_Float subtype being passed to MFCreateWaveFormatExFromMFMediaType. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 87 ++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index caf6f78d9e9..b6468b5da9b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -4240,10 +4240,20 @@ static void test_wrapped_media_type(void) static void test_MFCreateWaveFormatExFromMFMediaType(void) { + static const struct wave_fmt_test + { + const GUID *subtype; + WORD format_tag; + } + wave_fmt_tests[] = + { + { &MFAudioFormat_PCM, WAVE_FORMAT_PCM, }, + { &MFAudioFormat_Float, WAVE_FORMAT_IEEE_FLOAT, }, + }; WAVEFORMATEXTENSIBLE *format_ext; IMFMediaType *mediatype; WAVEFORMATEX *format; - UINT32 size; + UINT32 size, i; HRESULT hr; hr = MFCreateMediaType(&mediatype); @@ -4261,45 +4271,48 @@ static void test_MFCreateWaveFormatExFromMFMediaType(void) hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFMediaType_Video); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - /* Audio/PCM */ hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); - ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(format != NULL, "Expected format structure.\n"); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); - ok(format->wFormatTag == WAVE_FORMAT_PCM, "Unexpected tag.\n"); - ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); - ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); - ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); - ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); - ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); - ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); - CoTaskMemFree(format); - - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, - MFWaveFormatExConvertFlag_ForceExtensible); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(format_ext != NULL, "Expected format structure.\n"); - ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); - ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); - ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); - ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); - ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", - format_ext->Format.nAvgBytesPerSec); - ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); - ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); - ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", - format_ext->Format.cbSize); - CoTaskMemFree(format_ext); - - hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); - ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); - ok(size == sizeof(*format), "Unexpected size %u.\n", size); - CoTaskMemFree(format); + for (i = 0; i < ARRAY_SIZE(wave_fmt_tests); ++i) + { + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, wave_fmt_tests[i].subtype); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + ok(format->wFormatTag == wave_fmt_tests[i].format_tag, "Expected tag %u, got %u.\n", wave_fmt_tests[i].format_tag, format->wFormatTag); + ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); + ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); + ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); + ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); + ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); + ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + CoTaskMemFree(format); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, + MFWaveFormatExConvertFlag_ForceExtensible); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format_ext != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); + ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); + ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); + ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", + format_ext->Format.nAvgBytesPerSec); + ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); + ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", + format_ext->Format.cbSize); + CoTaskMemFree(format_ext); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + CoTaskMemFree(format); + } IMFMediaType_Release(mediatype); }

1 0

Jacek Caban : mshtml: Return null from IHTMLStorage::getItem stub.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 655adf6521f131c581229077621354c7c91f3b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=655adf6521f131c581229077… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:41 2021 +0200 mshtml: Return null from IHTMLStorage::getItem stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstorage.c | 5 ++++- dlls/mshtml/tests/dom.js | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 3b16027a5f9..c3896475270 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -145,8 +145,11 @@ static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) { HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); - return E_NOTIMPL; + + V_VT(p) = VT_NULL; + return S_OK; } static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index 564ca87821a..f5e4f393b58 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -412,6 +412,9 @@ sync_test("storage", function() { "typeof(window.sessionStorage) = " + typeof(window.sessionStorage)); ok(typeof(window.localStorage) === "object" || typeof(window.localStorage) === "unknown", "typeof(window.localStorage) = " + typeof(window.localStorage)); + + var item = sessionStorage.getItem("nonexisting"); + ok(item === null, "item = " + item); }); async_test("animation", function() {

1 0

Nikolay Sivov : mfplay: Implement border color control methods.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: b1203230a3e4fb2b207aedbefbbe97ae67e01d76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1203230a3e4fb2b207aedbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:48 2021 +0300 mfplay: Implement border color control methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 708df7614e8..aa9392a1e97 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1363,16 +1363,38 @@ static HRESULT WINAPI media_player_UpdateVideo(IMFPMediaPlayer *iface) static HRESULT WINAPI media_player_SetBorderColor(IMFPMediaPlayer *iface, COLORREF color) { - FIXME("%p, %#x.\n", iface, color); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, color); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_SetBorderColor(display_control, color); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_GetBorderColor(IMFPMediaPlayer *iface, COLORREF *color) { - FIXME("%p, %p.\n", iface, color); + struct media_player *player = impl_from_IMFPMediaPlayer(iface); + IMFVideoDisplayControl *display_control; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, color); + + if (SUCCEEDED(hr = MFGetService((IUnknown *)player->session, &MR_VIDEO_RENDER_SERVICE, + &IID_IMFVideoDisplayControl, (void **)&display_control))) + { + hr = IMFVideoDisplayControl_GetBorderColor(display_control, color); + IMFVideoDisplayControl_Release(display_control); + } + + return hr; } static HRESULT WINAPI media_player_InsertEffect(IMFPMediaPlayer *iface, IUnknown *effect,

1 0

Nikolay Sivov : mfplay: Create video output branches.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: baa97389103096cac90908e5d56fe7d5f6b58cd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baa97389103096cac90908e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 21 12:29:43 2021 +0300 mfplay: Create video output branches. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index 87ddf613288..6a6f3b6cddc 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1043,29 +1043,23 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out) { IMFTopologyNode *src_node, *sink_node; + BOOL selected, video_added = FALSE; IMFStreamDescriptor *sd; IMFTopology *topology; unsigned int idx; IUnknown *sink; - BOOL selected; HRESULT hr; GUID major; if (FAILED(hr = MFCreateTopology(&topology))) return hr; - /* Use first stream if none selected. */ - if (player->output_window) - { - FIXME("Video streams are not handled.\n"); - } - /* Set up branches for all selected streams. */ idx = 0; while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd))) { - if (!selected) + if (!selected || FAILED(media_item_get_stream_type(sd, &major))) { IMFStreamDescriptor_Release(sd); continue; @@ -1077,11 +1071,17 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me { /* User sink is attached as-is. */ } - else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) + else if (IsEqualGUID(&major, &MFMediaType_Audio)) { if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink))) WARN("Failed to create SAR activation object, hr %#x.\n", hr); } + else if (IsEqualGUID(&major, &MFMediaType_Video) && player->output_window && !video_added) + { + if (FAILED(hr = MFCreateVideoRendererActivate(player->output_window, (IMFActivate **)&sink))) + WARN("Failed to create EVR activation object, hr %#x.\n", hr); + video_added = SUCCEEDED(hr); + } if (sink) {

1 0

Rémi Bernon : server: Track desktop users per thread instead of per process.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 769a2616aec500df19e92c47886df3cf99b4d51d URL: https://source.winehq.org/git/wine.git/?a=commit;h=769a2616aec500df19e92c47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 21 10:38:15 2021 +0200 server: Track desktop users per thread instead of per process. As some thread may use a different desktop from their process. This fixes the user32 win tests, which leaks a desktop that never gets closed. The test_shell_window test creates a new desktop, which spawns explorer.exe process, incrementing the desktop user count to 1, then associates the desktop to a thread, which closes it on exit. Never the user count is incremented to 2, and closing the thread desktop doesn't either check whether the desktop process should be terminated. Reversely, it is possible to create a desktop, associate it with a thread /and/ a process, and this time the desktop process would be terminated when the process exits, although the thread may still be using it. Tracking the users per thread is more robust and fixes the problem as set_thread_desktop increments the desktop user count, and thread exit decrements it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 6 +++-- server/thread.c | 15 +++++++++-- server/user.h | 3 ++- server/winstation.c | 72 +++++++++++++++++++++++++++++++++-------------------- 4 files changed, 64 insertions(+), 32 deletions(-) diff --git a/server/process.c b/server/process.c index 8ad5a59a20b..d819f03a615 100644 --- a/server/process.c +++ b/server/process.c @@ -841,7 +841,7 @@ static void process_killed( struct process *process ) assert( list_empty( &process->thread_list )); process->end_time = current_time; - if (!process->is_system) close_process_desktop( process ); + close_process_desktop( process ); process->winstation = 0; process->desktop = 0; cancel_process_asyncs( process ); @@ -1503,6 +1503,7 @@ DECL_HANDLER(get_process_idle_event) DECL_HANDLER(make_process_system) { struct process *process = current->process; + struct thread *thread; if (!shutdown_event) { @@ -1515,8 +1516,9 @@ DECL_HANDLER(make_process_system) if (!process->is_system) { + LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) + release_thread_desktop( thread, 0 ); process->is_system = 1; - close_process_desktop( process ); if (!--user_processes && !shutdown_stage && master_socket_timeout != TIMEOUT_INFINITE) shutdown_timeout = add_timeout_user( master_socket_timeout, server_shutdown_timeout, NULL ); } diff --git a/server/thread.c b/server/thread.c index fe9f9bdec37..66f1057d1db 100644 --- a/server/thread.c +++ b/server/thread.c @@ -306,6 +306,7 @@ static struct context *create_thread_context( struct thread *thread ) /* create a new thread */ struct thread *create_thread( int fd, struct process *process, const struct security_descriptor *sd ) { + struct desktop *desktop; struct thread *thread; int request_pipe[2]; @@ -342,7 +343,7 @@ struct thread *create_thread( int fd, struct process *process, const struct secu init_thread_structure( thread ); thread->process = (struct process *)grab_object( process ); - thread->desktop = process->desktop; + thread->desktop = 0; thread->affinity = process->affinity; if (!current) current = thread; @@ -369,6 +370,16 @@ struct thread *create_thread( int fd, struct process *process, const struct secu return NULL; } + if (process->desktop) + { + if (!(desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); /* ignore errors */ + else + { + set_thread_default_desktop( thread, desktop, process->desktop ); + release_object( desktop ); + } + } + set_fd_events( thread->request_fd, POLLIN ); /* start listening to events */ add_process_thread( thread->process, thread ); return thread; @@ -416,7 +427,7 @@ static void cleanup_thread( struct thread *thread ) cleanup_clipboard_thread(thread); destroy_thread_windows( thread ); free_msg_queue( thread ); - close_thread_desktop( thread ); + release_thread_desktop( thread, 1 ); for (i = 0; i < MAX_INFLIGHT_FDS; i++) { if (thread->inflight[i].client != -1) diff --git a/server/user.h b/server/user.h index 6267f3e2881..80f7e91f12c 100644 --- a/server/user.h +++ b/server/user.h @@ -188,7 +188,8 @@ extern void connect_process_winstation( struct process *process, struct thread * extern void set_process_default_desktop( struct process *process, struct desktop *desktop, obj_handle_t handle ); extern void close_process_desktop( struct process *process ); -extern void close_thread_desktop( struct thread *thread ); +extern void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ); +extern void release_thread_desktop( struct thread *thread, int close ); static inline int is_rect_empty( const rectangle_t *rect ) { diff --git a/server/winstation.c b/server/winstation.c index 1c7552f0687..61f9f77c73f 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -324,15 +324,22 @@ static void add_desktop_user( struct desktop *desktop ) /* remove a user of the desktop and start the close timeout if necessary */ static void remove_desktop_user( struct desktop *desktop ) { + struct process *process; assert( desktop->users > 0 ); desktop->users--; /* if we have one remaining user, it has to be the manager of the desktop window */ - if (desktop->users == 1 && get_top_window_owner( desktop )) - { - assert( !desktop->close_timeout ); + if ((process = get_top_window_owner( desktop )) && desktop->users == process->running_threads && !desktop->close_timeout) desktop->close_timeout = add_timeout_user( -TICKS_PER_SEC, close_desktop_timeout, desktop ); - } +} + +/* set the thread default desktop handle */ +void set_thread_default_desktop( struct thread *thread, struct desktop *desktop, obj_handle_t handle ) +{ + if (thread->desktop) return; /* nothing to do */ + + thread->desktop = handle; + if (!thread->process->is_system) add_desktop_user( desktop ); } /* set the process default desktop handle */ @@ -340,24 +347,14 @@ void set_process_default_desktop( struct process *process, struct desktop *deskt obj_handle_t handle ) { struct thread *thread; - struct desktop *old_desktop; if (process->desktop == handle) return; /* nothing to do */ - if (!(old_desktop = get_desktop_obj( process, process->desktop, 0 ))) clear_error(); process->desktop = handle; /* set desktop for threads that don't have one yet */ LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) - if (!thread->desktop) thread->desktop = handle; - - if (!process->is_system && desktop != old_desktop) - { - add_desktop_user( desktop ); - if (old_desktop) remove_desktop_user( old_desktop ); - } - - if (old_desktop) release_object( old_desktop ); + set_thread_default_desktop( thread, desktop, handle ); } /* connect a process to its window station */ @@ -413,23 +410,37 @@ done: /* close the desktop of a given process */ void close_process_desktop( struct process *process ) { - struct desktop *desktop; + obj_handle_t handle; - if (process->desktop && (desktop = get_desktop_obj( process, process->desktop, 0 ))) - { - remove_desktop_user( desktop ); - release_object( desktop ); - } - clear_error(); /* ignore errors */ + if (!(handle = process->desktop)) return; + + process->desktop = 0; + close_handle( process, handle ); } -/* close the desktop of a given thread */ -void close_thread_desktop( struct thread *thread ) +/* release (and eventually close) the desktop of a given thread */ +void release_thread_desktop( struct thread *thread, int close ) { - obj_handle_t handle = thread->desktop; + struct desktop *desktop; + obj_handle_t handle; + + if (!(handle = thread->desktop)) return; + + if (!thread->process->is_system) + { + if (!(desktop = get_desktop_obj( thread->process, handle, 0 ))) clear_error(); /* ignore errors */ + else + { + remove_desktop_user( desktop ); + release_object( desktop ); + } + } - thread->desktop = 0; - if (handle) close_handle( thread->process, handle ); + if (close) + { + thread->desktop = 0; + close_handle( thread->process, handle ); + } } /* create a window station */ @@ -624,7 +635,14 @@ DECL_HANDLER(set_thread_desktop) if (old_desktop != new_desktop && current->desktop_users > 0) set_error( STATUS_DEVICE_BUSY ); else + { current->desktop = req->handle; /* FIXME: should we close the old one? */ + if (!current->process->is_system && old_desktop != new_desktop) + { + add_desktop_user( new_desktop ); + if (old_desktop) remove_desktop_user( old_desktop ); + } + } if (!current->process->desktop) set_process_default_desktop( current->process, new_desktop, req->handle );

1 0

Jacek Caban : jscript: Introduce INVALID_LOCAL_REF.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 609e9de65c74233644fd6f9588122bdfc8c64d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=609e9de65c74233644fd6f95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 21 17:23:06 2021 +0200 jscript: Introduce INVALID_LOCAL_REF. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 1 + dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 08a5e3af64b..717ae00d053 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -2314,6 +2314,7 @@ static HRESULT compile_function(compiler_ctx_t *ctx, source_elements_t *source, TRACE("\n"); func->bytecode = ctx->code; + func->local_ref = INVALID_LOCAL_REF; ctx->func_head = ctx->func_tail = NULL; ctx->from_eval = from_eval; ctx->func = func; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f3d9d694b2a..e0a6e10e98b 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3039,7 +3039,7 @@ static HRESULT setup_scope(script_ctx_t *ctx, call_frame_t *frame, scope_chain_t } for(i = 0; i < frame->function->func_cnt; i++) { - if(frame->function->funcs[i].name && !frame->function->funcs[i].event_target) { + if(frame->function->funcs[i].local_ref != INVALID_LOCAL_REF) { jsdisp_t *func_obj; unsigned off; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 483c32232c1..442e7334c41 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -145,6 +145,8 @@ typedef struct { int ref; } local_ref_t; +#define INVALID_LOCAL_REF 0x7fffffff + typedef struct _function_code_t { BSTR name; int local_ref;

1 0

Alexandre Julliard : kernelbase: Fix buffer size passed to read_nt_symlink().
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 00bd0518cab0f7808d6bef5d1cc27f0fddd82d98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00bd0518cab0f7808d6bef5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 20:54:00 2021 +0200 kernelbase: Fix buffer size passed to read_nt_symlink(). Spotted by David Torok. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/volume.c b/dlls/kernelbase/volume.c index 594c1b8e138..d513dda1f9d 100644 --- a/dlls/kernelbase/volume.c +++ b/dlls/kernelbase/volume.c @@ -308,7 +308,7 @@ BOOL WINAPI GetVolumeNameForVolumeMountPointW( LPCWSTR path, LPWSTR volume, DWOR /* Take the mount point and get the "nonpersistent name" */ /* We will then take that and get the volume name */ nonpersist_name = (WCHAR *)(input + 1); - status = read_nt_symlink( symlink_name, nonpersist_name, i_size - sizeof(*input) ); + status = read_nt_symlink( symlink_name, nonpersist_name, (i_size - sizeof(*input)) / sizeof(WCHAR) ); TRACE("read_nt_symlink got stat=%x, for %s, got <%s>\n", status, debugstr_w(symlink_name), debugstr_w(nonpersist_name)); if (status != STATUS_SUCCESS)

1 0

Alexandre Julliard : ntdll: Fix buffer allocation size in get_env_var().
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: aaa501fe93fb7140b472850060d652613406307f URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaa501fe93fb7140b4728500… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 21 17:06:43 2021 +0200 ntdll: Fix buffer allocation size in get_env_var(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 9f614db01c5..38dd276608b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2593,7 +2593,7 @@ static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *re for (;;) { - ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size ); + ret->Buffer = RtlAllocateHeap( GetProcessHeap(), 0, size * sizeof(WCHAR) ); status = RtlQueryEnvironmentVariable( NULL, name, wcslen(name), ret->Buffer, size - extra - 1, &len ); if (!status)

1 0

Hans Leidekker : kerberos: Use CRT memory allocators.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 30e07109a74639d62c0b4500af1e057d822fbd49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30e07109a74639d62c0b4500… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:33 2021 +0200 kerberos: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 239d6a1bded..581fcb4a789 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -22,6 +22,7 @@ */ #include <stdarg.h> +#include <stdlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" @@ -32,7 +33,7 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" -#include "wine/heap.h" + #include "wine/debug.h" #include "unixlib.h" @@ -267,7 +268,7 @@ static char *get_str_unixcp( const UNICODE_STRING *str ) { char *ret; int len = WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, str->Buffer, str->Length / sizeof(WCHAR), ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -280,7 +281,7 @@ static char *get_username_unixcp( const WCHAR *user, ULONG user_len, const WCHAR len_user = WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, NULL, 0, NULL, NULL ); len_domain = WideCharToMultiByte( CP_UNIXCP, 0, domain, domain_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len_user + len_domain + 2 ))) return NULL; + if (!(ret = malloc( len_user + len_domain + 2 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, user, user_len, ret, len_user, NULL, NULL ); ret[len_user] = '@'; @@ -295,7 +296,7 @@ static char *get_password_unixcp( const WCHAR *passwd, ULONG passwd_len ) char *ret; len = WideCharToMultiByte( CP_UNIXCP, WC_NO_BEST_FIT_CHARS, passwd, passwd_len, NULL, 0, NULL, NULL ); - if (!(ret = heap_alloc( len + 1 ))) return NULL; + if (!(ret = malloc( len + 1 ))) return NULL; WideCharToMultiByte( CP_UNIXCP, 0, passwd, passwd_len, ret, len, NULL, NULL ); ret[len] = 0; return ret; @@ -328,9 +329,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, expiry ); done: - heap_free( principal ); - heap_free( username ); - heap_free( password ); + free( principal ); + free( username ); + free( password ); return status; } @@ -364,7 +365,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_attr, expiry ); if (!status) *mapped_context = TRUE; /* FIXME: initialize context_data */ - heap_free( target ); + free( target ); return status; } @@ -399,7 +400,7 @@ static SecPkgInfoW *build_package_info( const SecPkgInfoW *info ) DWORD size_name = (wcslen(info->Name) + 1) * sizeof(WCHAR); DWORD size_comment = (wcslen(info->Comment) + 1) * sizeof(WCHAR); - if (!(ret = heap_alloc( sizeof(*ret) + size_name + size_comment ))) return NULL; + if (!(ret = malloc( sizeof(*ret) + size_name + size_comment ))) return NULL; ret->fCapabilities = info->fCapabilities; ret->wVersion = info->wVersion; ret->wRPCID = info->wRPCID;

1 0

Hans Leidekker : kerberos: Use wide character string literals.
by Alexandre Julliard April 21, 2021

April 21, 2021

Module: wine Branch: master Commit: 1a16994a65aac5d1373fac1732602d9cc3f9b6ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a16994a65aac5d1373fac17… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 21 09:47:32 2021 +0200 kerberos: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 6e3135a9f02..239d6a1bded 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -61,8 +61,8 @@ const struct krb5_funcs *krb5_funcs = NULL; | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) -static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; -static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static WCHAR kerberos_name_W[] = L"Kerberos"; +static WCHAR kerberos_comment_W[] = L"Microsoft Kerberos V1.0"; static const SecPkgInfoW infoW = { KERBEROS_CAPS,

1 0