May 2021 - Wine-commits - list.winehq.org

Jacek Caban : winepulse: Adjust pulse stream volumes for session volumes.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 131b7fd5e16a3da17aed28e86933074c5d663d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=131b7fd5e16a3da17aed28e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:04:14 2021 +0200 winepulse: Adjust pulse stream volumes for session volumes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 14 +++++++++----- dlls/winepulse.drv/pulse.c | 4 ++-- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 8933a95d834..fc9077b41ce 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -248,7 +248,7 @@ static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes) { - float vol[PA_CHANNELS_MAX]; + const float *vol = This->pulse_stream->vol; BOOL adjust = FALSE; UINT32 i, channels; BYTE *end; @@ -263,10 +263,7 @@ static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes) /* Adjust the buffer based on the volume for each channel */ channels = This->pulse_stream->ss.channels; for (i = 0; i < channels; i++) - { - vol[i] = This->pulse_stream->vol[i] * This->session->channel_vols[i]; adjust |= vol[i] != 1.0f; - } if (!adjust) goto write; end = buffer + bytes; @@ -528,7 +525,8 @@ static DWORD WINAPI pulse_timer_cb(void *user) static void set_stream_volumes(ACImpl *This) { - pulse->set_volumes(This->pulse_stream, This->session->master_vol, This->vol); + pulse->set_volumes(This->pulse_stream, This->session->master_vol, This->vol, + This->session->channel_vols); } HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, const WCHAR ***ids, GUID **keys, @@ -2728,6 +2726,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2745,6 +2744,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( pulse->lock(); session->channel_vols[index] = level; + LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) + set_stream_volumes(client); pulse->unlock(); return S_OK; @@ -2775,6 +2776,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; int i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, @@ -2794,6 +2796,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( pulse->lock(); for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; + LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) + set_stream_volumes(client); pulse->unlock(); return S_OK; } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 02f4d11a7f1..e2af68ea922 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1005,12 +1005,12 @@ static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) } static void WINAPI pulse_set_volumes(struct pulse_stream *stream, float master_volume, - const float *volumes) + const float *volumes, const float *session_volumes) { unsigned int i; for (i = 0; i < stream->ss.channels; i++) - stream->vol[i] = volumes[i] * master_volume; + stream->vol[i] = volumes[i] * master_volume * session_volumes[i]; } static const struct unix_funcs unix_funcs = diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 8636f11d6f5..54c6ab66303 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -81,6 +81,6 @@ struct unix_funcs void (WINAPI *read)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, - const float *volumes); + const float *volumes, const float *session_volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config); };

1 0

Jacek Caban : winepulse: Set pulse master volume to 0 when session is muted.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 0b0ae164f4ccebf4b5bc1bb1529a90786d2d5941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b0ae164f4ccebf4b5bc1bb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:04:23 2021 +0200 winepulse: Set pulse master volume to 0 when session is muted. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index fc9077b41ce..e638c815ba4 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -249,21 +249,25 @@ static void silence_buffer(pa_sample_format_t format, BYTE *buffer, UINT32 bytes static int write_buffer(const ACImpl *This, BYTE *buffer, UINT32 bytes) { const float *vol = This->pulse_stream->vol; + UINT32 i, channels, mute = 0; BOOL adjust = FALSE; - UINT32 i, channels; BYTE *end; if (!bytes) return 0; - if (This->session->mute) - { - silence_buffer(This->pulse_stream->ss.format, buffer, bytes); - goto write; - } /* Adjust the buffer based on the volume for each channel */ channels = This->pulse_stream->ss.channels; for (i = 0; i < channels; i++) + { adjust |= vol[i] != 1.0f; + if (vol[i] == 0.0f) + mute++; + } + if (mute == channels) + { + silence_buffer(This->pulse_stream->ss.format, buffer, bytes); + goto write; + } if (!adjust) goto write; end = buffer + bytes; @@ -525,7 +529,8 @@ static DWORD WINAPI pulse_timer_cb(void *user) static void set_stream_volumes(ACImpl *This) { - pulse->set_volumes(This->pulse_stream, This->session->master_vol, This->vol, + float master_vol = This->session->mute ? 0.0f : This->session->master_vol; + pulse->set_volumes(This->pulse_stream, master_vol, This->vol, This->session->channel_vols); } @@ -2633,13 +2638,18 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); if (context) FIXME("Notifications not supported yet\n"); + pulse->lock(); session->mute = mute; + LIST_FOR_EACH_ENTRY(client, &This->session->clients, ACImpl, entry) + set_stream_volumes(client); + pulse->unlock(); return S_OK; }

1 0

Jacek Caban : winepulse: Move mult_* functions to separated file.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 8ea23d0d44ced0ce7dadc9b2546cbc56f6bce364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea23d0d44ced0ce7dadc9b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:04:38 2021 +0200 winepulse: Move mult_* functions to separated file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/Makefile.in | 1 + dlls/winepulse.drv/mmdevdrv.c | 1995 +-------------------------------------- dlls/winepulse.drv/mult.c | 2011 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 2014 insertions(+), 1993 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ea23d0d44ced0ce7dad…

1 0

Jacek Caban : winepulse: Move pulse_write to unix lib.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: d7b957654d4739b8dd07c91f051b7940f416ef42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7b957654d4739b8dd07c91f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:04:56 2021 +0200 winepulse: Move pulse_write to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 190 +----------------------------------------- dlls/winepulse.drv/mult.c | 4 + dlls/winepulse.drv/pulse.c | 190 ++++++++++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 4 files changed, 197 insertions(+), 188 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d7b957654d4739b8dd07…

1 0

Jacek Caban : winepulse: Move timer loop to unix lib.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 13cac6287c454146eff73aabc4b92b5c8f76d4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=13cac6287c454146eff73aab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 13 16:05:06 2021 +0200 winepulse: Move timer loop to unix lib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 87 +--------------------------------- dlls/winepulse.drv/pulse.c | 107 +++++++++++++++++++++++++++++++++++++++++- dlls/winepulse.drv/unixlib.h | 2 +- 3 files changed, 107 insertions(+), 89 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 975f38794ac..f9b16bee66b 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -251,93 +251,8 @@ static void pulse_op_cb(pa_stream *s, int success, void *user) { static DWORD WINAPI pulse_timer_cb(void *user) { - LARGE_INTEGER delay; - UINT32 adv_bytes; ACImpl *This = user; - int success; - pa_operation *o; - - pulse->lock(); - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - pa_stream_get_time(This->pulse_stream->stream, &This->pulse_stream->last_time); - pulse->unlock(); - - while(!This->pulse_stream->please_quit){ - pa_usec_t now, adv_usec = 0; - int err; - - NtDelayExecution(FALSE, &delay); - - pulse->lock(); - - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - - o = pa_stream_update_timing_info(This->pulse_stream->stream, pulse_op_cb, &success); - if (o) - { - while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) - pulse->cond_wait(); - pa_operation_unref(o); - } - err = pa_stream_get_time(This->pulse_stream->stream, &now); - if(err == 0){ - TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(This->pulse_stream->last_time)); - if(This->pulse_stream->started && (This->dataflow == eCapture || This->pulse_stream->held_bytes)){ - if(This->pulse_stream->just_underran){ - This->pulse_stream->last_time = now; - This->pulse_stream->just_started = TRUE; - } - - if(This->pulse_stream->just_started){ - /* let it play out a period to absorb some latency and get accurate timing */ - pa_usec_t diff = now - This->pulse_stream->last_time; - - if(diff > This->pulse_stream->mmdev_period_usec){ - This->pulse_stream->just_started = FALSE; - This->pulse_stream->last_time = now; - } - }else{ - INT32 adjust = This->pulse_stream->last_time + This->pulse_stream->mmdev_period_usec - now; - - adv_usec = now - This->pulse_stream->last_time; - - if(adjust > ((INT32)(This->pulse_stream->mmdev_period_usec / 2))) - adjust = This->pulse_stream->mmdev_period_usec / 2; - else if(adjust < -((INT32)(This->pulse_stream->mmdev_period_usec / 2))) - adjust = -1 * This->pulse_stream->mmdev_period_usec / 2; - - delay.QuadPart = -(This->pulse_stream->mmdev_period_usec + adjust) * 10; - - This->pulse_stream->last_time += This->pulse_stream->mmdev_period_usec; - } - - if(This->dataflow == eRender){ - pulse->write(This->pulse_stream); - - /* regardless of what PA does, advance one period */ - adv_bytes = min(This->pulse_stream->period_bytes, This->pulse_stream->held_bytes); - This->pulse_stream->lcl_offs_bytes += adv_bytes; - This->pulse_stream->lcl_offs_bytes %= This->pulse_stream->real_bufsize_bytes; - This->pulse_stream->held_bytes -= adv_bytes; - }else if(This->dataflow == eCapture){ - pulse->read(This->pulse_stream); - } - }else{ - This->pulse_stream->last_time = now; - delay.QuadPart = -This->pulse_stream->mmdev_period_usec * 10; - } - } - - if (This->pulse_stream->event) - SetEvent(This->pulse_stream->event); - - TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", - This, (int)adv_usec, - (int)(This->pulse_stream->held_bytes/ pa_frame_size(&This->pulse_stream->ss)), (unsigned int)(-delay.QuadPart / 10)); - - pulse->unlock(); - } - + pulse->timer_loop(This->pulse_stream); return 0; } diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 1dd906aef68..d720b79a22d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1054,7 +1054,7 @@ static void WINAPI pulse_write(struct pulse_stream *stream) stream->pa_held_bytes -= to_write; } -static void WINAPI pulse_read(struct pulse_stream *stream) +static void pulse_read(struct pulse_stream *stream) { size_t bytes = pa_stream_readable_size(stream->stream); @@ -1154,6 +1154,109 @@ static void WINAPI pulse_read(struct pulse_stream *stream) } } +static void WINAPI pulse_timer_loop(struct pulse_stream *stream) +{ + LARGE_INTEGER delay; + UINT32 adv_bytes; + int success; + pa_operation *o; + + pulse_lock(); + delay.QuadPart = -stream->mmdev_period_usec * 10; + pa_stream_get_time(stream->stream, &stream->last_time); + pulse_unlock(); + + while (!stream->please_quit) + { + pa_usec_t now, adv_usec = 0; + int err; + + NtDelayExecution(FALSE, &delay); + + pulse_lock(); + + delay.QuadPart = -stream->mmdev_period_usec * 10; + + o = pa_stream_update_timing_info(stream->stream, pulse_op_cb, &success); + if (o) + { + while (pa_operation_get_state(o) == PA_OPERATION_RUNNING) + pulse_cond_wait(); + pa_operation_unref(o); + } + err = pa_stream_get_time(stream->stream, &now); + if (err == 0) + { + TRACE("got now: %s, last time: %s\n", wine_dbgstr_longlong(now), wine_dbgstr_longlong(stream->last_time)); + if (stream->started && (stream->dataflow == eCapture || stream->held_bytes)) + { + if(stream->just_underran) + { + stream->last_time = now; + stream->just_started = TRUE; + } + + if (stream->just_started) + { + /* let it play out a period to absorb some latency and get accurate timing */ + pa_usec_t diff = now - stream->last_time; + + if (diff > stream->mmdev_period_usec) + { + stream->just_started = FALSE; + stream->last_time = now; + } + } + else + { + INT32 adjust = stream->last_time + stream->mmdev_period_usec - now; + + adv_usec = now - stream->last_time; + + if(adjust > ((INT32)(stream->mmdev_period_usec / 2))) + adjust = stream->mmdev_period_usec / 2; + else if(adjust < -((INT32)(stream->mmdev_period_usec / 2))) + adjust = -1 * stream->mmdev_period_usec / 2; + + delay.QuadPart = -(stream->mmdev_period_usec + adjust) * 10; + + stream->last_time += stream->mmdev_period_usec; + } + + if (stream->dataflow == eRender) + { + pulse_write(stream); + + /* regardless of what PA does, advance one period */ + adv_bytes = min(stream->period_bytes, stream->held_bytes); + stream->lcl_offs_bytes += adv_bytes; + stream->lcl_offs_bytes %= stream->real_bufsize_bytes; + stream->held_bytes -= adv_bytes; + } + else if(stream->dataflow == eCapture) + { + pulse_read(stream); + } + } + else + { + stream->last_time = now; + delay.QuadPart = -stream->mmdev_period_usec * 10; + } + } + + if (stream->event) + NtSetEvent(stream->event, NULL); + + TRACE("%p after update, adv usec: %d, held: %u, delay usec: %u\n", + stream, (int)adv_usec, + (int)(stream->held_bytes/ pa_frame_size(&stream->ss)), + (unsigned int)(-delay.QuadPart / 10)); + + pulse_unlock(); + } +} + static HRESULT WINAPI pulse_stop(struct pulse_stream *stream) { HRESULT hr = S_OK; @@ -1212,8 +1315,8 @@ static const struct unix_funcs unix_funcs = pulse_create_stream, pulse_release_stream, pulse_write, - pulse_read, pulse_stop, + pulse_timer_loop, pulse_set_volumes, pulse_test_connect, }; diff --git a/dlls/winepulse.drv/unixlib.h b/dlls/winepulse.drv/unixlib.h index 5413c4d2c78..4188dacc25f 100644 --- a/dlls/winepulse.drv/unixlib.h +++ b/dlls/winepulse.drv/unixlib.h @@ -79,8 +79,8 @@ struct unix_funcs struct pulse_stream **ret); void (WINAPI *release_stream)(struct pulse_stream *stream, HANDLE timer); void (WINAPI *write)(struct pulse_stream *stream); - void (WINAPI *read)(struct pulse_stream *stream); HRESULT (WINAPI *stop)(struct pulse_stream *stream); + void (WINAPI *timer_loop)(struct pulse_stream *stream); void (WINAPI *set_volumes)(struct pulse_stream *stream, float master_volume, const float *volumes, const float *session_volumes); HRESULT (WINAPI *test_connect)(const char *name, struct pulse_config *config);

1 0

Zebediah Figura : quartz/tests: Avoid testing the result of GetQueueStatus().
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 44472fae6baf86f1c66725e02720b251fdf1bbd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44472fae6baf86f1c66725e0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 10:49:12 2021 -0500 quartz/tests: Avoid testing the result of GetQueueStatus(). It's very unreliable; our window can receive messages not related to the ones we're trying to test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 44 +++++++++++++++++++++++++++------------ dlls/quartz/tests/vmr7.c | 44 +++++++++++++++++++++++++++------------ dlls/quartz/tests/vmr9.c | 44 +++++++++++++++++++++++++++------------ 3 files changed, 93 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f4d9660316c..797ea7acc7c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2109,37 +2109,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 212ce213e89..02b5a626d74 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2094,37 +2094,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 44b9a453305..1697a321915 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2333,37 +2333,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Fix some test failures related to thread timing.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 9172ca5baa27b0c929b14a49f60333613cc30c65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9172ca5baa27b0c929b14a49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 10:49:13 2021 -0500 quartz/tests: Fix some test failures related to thread timing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 8 +++++--- dlls/quartz/tests/vmr9.c | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 797ea7acc7c..22cc703a539 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -971,7 +971,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1083,7 +1083,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input hr = IPin_BeginFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr); hr = IPin_EndFlush(pin); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -1093,7 +1094,8 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == E_FAIL, "Got hr %#x.\n", hr); IMediaSeeking_Release(seeking); } diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 1697a321915..c7a84d65b7b 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1199,7 +1199,7 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IMediaControl *control thread = send_frame(input); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); - hr = IMediaControl_GetState(control, 0, &state); + hr = IMediaControl_GetState(control, 1000, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_BeginFlush(pin); @@ -1453,7 +1453,8 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont hr = IMediaControl_Stop(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = join_thread(thread); - ok(hr == S_OK, "Got hr %#x.\n", hr); + /* If the frame makes it to Receive() in time to be rendered, we get S_OK. */ + ok(hr == S_OK || hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); } static void test_current_image(IBaseFilter *filter, IMemInputPin *input,

1 0

Francois Gouget : advapi32/tests: Time zones should have both MUI and regular strings.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: ec517d4f07873f6cca7ce3753b4bb32acdbda6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec517d4f07873f6cca7ce375… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 17 16:53:55 2021 +0200 advapi32/tests: Time zones should have both MUI and regular strings. However a few time zones were missing the MUI display name in some Windows 1809 versions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 65 ++++++++++++++++++++++++++++++------------ 1 file changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 66382876fa5..72423eae94c 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -4012,9 +4012,8 @@ static void test_EnumDynamicTimeZoneInformation(void) { LSTATUS status; HKEY key, subkey; - WCHAR name[32]; + WCHAR name[128]; WCHAR keyname[128]; - WCHAR displayname[128]; WCHAR sysdir[MAX_PATH]; DWORD index, ret, gle, size; DYNAMIC_TIME_ZONE_INFORMATION bogus_dtzi, dtzi; @@ -4058,6 +4057,7 @@ static void test_EnumDynamicTimeZoneInformation(void) index = 0; while (!(status = RegEnumKeyW(key, index, keyname, ARRAY_SIZE(keyname)))) { + winetest_push_context("%s" , wine_dbgstr_w(keyname)); subkey = NULL; status = RegOpenKeyExW(key, keyname, 0, KEY_QUERY_VALUE, &subkey); ok(status == ERROR_SUCCESS, "got %d\n", status); @@ -4079,31 +4079,57 @@ static void test_EnumDynamicTimeZoneInformation(void) { size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d Std %s\n", status, + wine_dbgstr_w(name)); + ok(*name, "Std name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Std", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Std", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.StandardName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); + ok(status == ERROR_SUCCESS, "status %d MUI_Std %s\n", + status, wine_dbgstr_w(name)); + ok(*name, "MUI_Std name is empty\n"); + } + ok(!memcmp(&dtzi.StandardName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.StandardName)); size = sizeof(name); memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Dlt name is empty\n"); if (pRegLoadMUIStringW) + { + size = sizeof(name); + memset(name, 0, sizeof(name)); status = pRegLoadMUIStringW(subkey, L"MUI_Dlt", name, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Dlt", RRF_RT_REG_SZ, NULL, name, &size); - ok(status == ERROR_SUCCESS, "status %d name %s\n", status, wine_dbgstr_w(name)); - ok(!memcmp(&dtzi.DaylightName, name, size), - "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); - - size = sizeof(displayname); - memset(displayname, 0, sizeof(displayname)); + ok(status == ERROR_SUCCESS, "status %d %s MUI_Dlt %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "MUI_Dlt name is empty\n"); + } + ok(!memcmp(&dtzi.DaylightName, name, size), "expected %s, got %s\n", + wine_dbgstr_w(name), wine_dbgstr_w(dtzi.DaylightName)); + + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, name, &size); + ok(status == ERROR_SUCCESS, "status %d %s Display %s\n", + status, wine_dbgstr_w(keyname), wine_dbgstr_w(name)); + ok(*name, "Display name is empty\n"); if (pRegLoadMUIStringW) - status = pRegLoadMUIStringW(subkey, L"MUI_Display", displayname, size, &size, 0, sysdir); - else - status = pRegGetValueW(subkey, NULL, L"Display", RRF_RT_REG_SZ, NULL, displayname, &size); - todo_wine ok(status == ERROR_SUCCESS, "status %d displayname %s\n", status, wine_dbgstr_w(displayname)); + { + size = sizeof(name); + memset(name, 0, sizeof(name)); + status = pRegLoadMUIStringW(subkey, L"MUI_Display", name, size, &size, 0, sysdir); + /* recently added time zones may not have MUI strings */ + todo_wine ok((status == ERROR_SUCCESS && *name) || + broken(status == ERROR_RESOURCE_TYPE_NOT_FOUND) /* Win10 1809 32-bit */ || + broken(status == ERROR_MUI_FILE_NOT_FOUND) /* Win10 1809 64-bit */, + "status %d MUI_Display %s\n", status, wine_dbgstr_w(name)); + } } else { @@ -4132,6 +4158,7 @@ static void test_EnumDynamicTimeZoneInformation(void) "expected %s, got %s\n", dbgstr_SYSTEMTIME(&tz_data.dlt_date), dbgstr_SYSTEMTIME(&dtzi.DaylightDate)); + winetest_pop_context(); RegCloseKey(subkey); index++; }

1 0

Zebediah Figura : wined3d: Make wined3d_texture_set_map_binding() static.
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 3b2f892c4cde6ba283895a2ebc160a59940f703e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2f892c4cde6ba283895a2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 14 11:16:35 2021 -0500 wined3d: Make wined3d_texture_set_map_binding() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 39e6e2a68b7..dcdd08ac9b1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -920,7 +920,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) texture->update_map_binding = 0; } -void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) +static void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) { texture->update_map_binding = map_binding; if (!texture->resource.map_count) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f5b1a078907..079b60e4a7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4364,7 +4364,6 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_device_set_light().
by Alexandre Julliard 17 May '21

17 May '21

Module: wine Branch: master Commit: 1d578e367dc4f5aabc64cfbe460da72b4bc0e1b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d578e367dc4f5aabc64cfbe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 16 16:36:35 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_device_set_light(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 484130b3103..2cd0ac6bb38 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1348,15 +1348,13 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, * stateblock problems. When capturing the state block, I duplicate the * hashmap, but when recording, just build a chain pretty much of commands to * be replayed. */ -static void wined3d_device_set_light(struct wined3d_device *device, - UINT light_idx, const struct wined3d_light *light) +static void wined3d_device_context_set_light(struct wined3d_device_context *context, + unsigned int light_idx, const struct wined3d_light *light) { struct wined3d_light_info *object = NULL; float rho; - TRACE("device %p, light_idx %u, light %p.\n", device, light_idx, light); - - if (FAILED(wined3d_light_state_set_light(&device->cs->c.state->light_state, light_idx, light, &object))) + if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; /* Initialize the object. */ @@ -1445,7 +1443,7 @@ static void wined3d_device_set_light(struct wined3d_device *device, FIXME("Unrecognized light type %#x.\n", light->type); } - wined3d_device_context_emit_set_light(&device->cs->c, object); + wined3d_device_context_emit_set_light(context, object); } static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT light_idx, BOOL enable) @@ -1459,7 +1457,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { TRACE("Light enabled requested but light not defined, so defining one!\n"); - wined3d_device_set_light(device, light_idx, &WINED3D_default_light); + wined3d_device_context_set_light(&device->cs->c, light_idx, &WINED3D_default_light); if (!(light_info = wined3d_light_state_get_light(light_state, light_idx))) { @@ -1849,7 +1847,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } } @@ -4046,7 +4044,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, LIST_FOR_EACH_ENTRY(light, &state->light_state->light_map[i], struct wined3d_light_info, entry) { - wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); + wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); wined3d_device_set_light_enable(device, light->OriginalIndex, light->glIndex != -1); } }

1 0