February 2020 - Wine-Commits

Zebediah Figura : ddraw: Stop setting the device state when setting transforms.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: b5c249faa1b8ec67fd2f247f30789e81df0d99f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c249faa1b8ec67fd2f247f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 18:48:44 2020 -0600 ddraw: Stop setting the device state when setting transforms. 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/ddraw/device.c | 19 ------------------- dlls/ddraw/viewport.c | 1 - 2 files changed, 20 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index ee860d4010..4284109237 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1359,28 +1359,16 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, *m = *matrix; if (matrix_handle == device->world) - { wined3d_stateblock_set_transform(device->state, WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_WORLD_MATRIX(0), (struct wined3d_matrix *)matrix); - } if (matrix_handle == device->view) - { wined3d_stateblock_set_transform(device->state, WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_VIEW, (struct wined3d_matrix *)matrix); - } if (matrix_handle == device->proj) - { wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)matrix); - } wined3d_mutex_unlock(); @@ -3135,8 +3123,6 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); wined3d_stateblock_set_transform(device->update_state, wined3d_state, (const struct wined3d_matrix *)matrix); - if (!device->recording) - wined3d_device_set_transform(device->wined3d_device, wined3d_state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -3179,8 +3165,6 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); - wined3d_device_set_transform(device->wined3d_device, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock(); @@ -3350,8 +3334,6 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, wined3d_mutex_lock(); wined3d_stateblock_multiply_transform(device->state, wined3d_state, (struct wined3d_matrix *)matrix); - wined3d_device_multiply_transform(device->wined3d_device, - wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -3391,7 +3373,6 @@ static HRESULT WINAPI d3d_device3_MultiplyTransform(IDirect3DDevice3 *iface, multiply_matrix(&tmp, &device->legacy_projection, (struct wined3d_matrix *)matrix); multiply_matrix(&projection, &device->legacy_clipspace, &tmp); wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); - wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, &projection); device->legacy_projection = tmp; wined3d_mutex_unlock(); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 2f2515036d..ac56928e4f 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -39,7 +39,6 @@ static void update_clip_space(struct d3d_device *device, multiply_matrix(&projection, &clip_space, &device->legacy_projection); wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); - wined3d_device_set_transform(device->wined3d_device, WINED3D_TS_PROJECTION, &projection); device->legacy_clipspace = clip_space; }

1 0

Matteo Bruni : wined3d: Optimize scanning changed clip planes in wined3d_device_apply_stateblock().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: ad5f230afc1535bb59d857f25c688949e64ca15f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5f230afc1535bb59d857f2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 28 11:25:03 2020 +0100 wined3d: Optimize scanning changed clip planes in wined3d_device_apply_stateblock(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6474b02ccc..660ba777ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4022,10 +4022,11 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, wined3d_device_set_texture(device, stage, state->textures[i]); } - for (i = 0; i < ARRAY_SIZE(state->clip_planes); ++i) + map = changed->clipplane; + while (map) { - if (changed->clipplane & (1u << i)) - wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); + i = wined3d_bit_scan(&map); + wined3d_device_set_clip_plane(device, i, &state->clip_planes[i]); } memset(&stateblock->changed, 0, sizeof(stateblock->changed)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15e376c832..744e647008 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3926,7 +3926,7 @@ struct wined3d_saved_states DWORD renderState[(WINEHIGHEST_RENDER_STATE >> 5) + 1]; DWORD textureState[WINED3D_MAX_TEXTURES]; /* WINED3D_HIGHEST_TEXTURE_STATE + 1, 18 */ WORD samplerState[WINED3D_MAX_COMBINED_SAMPLERS]; /* WINED3D_HIGHEST_SAMPLER_STATE + 1, 14 */ - DWORD clipplane; /* WINED3D_MAX_USER_CLIP_PLANES, 32 */ + DWORD clipplane; /* WINED3D_MAX_CLIP_DISTANCES, 8 */ DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ DWORD indices : 1; DWORD material : 1;

1 0

Nikolay Sivov : mf: Use generic enum for object states.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 5dc6db5fd3e702602537d5e95593908cab4ff91e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dc6db5fd3e702602537d5e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Feb 28 15:00:56 2020 +0300 mf: Use generic enum for object states. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 17bb44eaa7..12685583e2 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -79,11 +79,12 @@ enum session_state SESSION_STATE_SHUT_DOWN, }; -enum source_state +enum object_state { - SOURCE_STATE_STOPPED = 0, - SOURCE_STATE_STARTED, - SOURCE_STATE_PAUSED, + OBJ_STATE_STOPPED = 0, + OBJ_STATE_STARTED, + OBJ_STATE_PAUSED, + OBJ_STATE_INVALID, }; struct media_source @@ -91,7 +92,7 @@ struct media_source struct list entry; IMFMediaSource *source; IMFPresentationDescriptor *pd; - enum source_state state; + enum object_state state; }; struct source_node @@ -1385,7 +1386,7 @@ static HRESULT session_add_media_stream(struct media_session *session, IMFMediaS return S_OK; } -static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum source_state state) +static BOOL session_set_source_state(struct media_session *session, IMFMediaSource *source, enum object_state state) { struct media_source *cur; BOOL ret = TRUE; @@ -1469,7 +1470,7 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM { struct media_session *session = impl_from_events_callback_IMFAsyncCallback(iface); IMFMediaEventGenerator *event_source; - enum source_state source_state; + enum object_state source_state; IMFMediaEvent *event = NULL; MediaEventType event_type; IMFMediaSource *source; @@ -1506,11 +1507,11 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM case MESourcePaused: case MESourceStopped: if (event_type == MESourceStarted) - source_state = SOURCE_STATE_STARTED; + source_state = OBJ_STATE_STARTED; else if (event_type == MESourcePaused) - source_state = SOURCE_STATE_PAUSED; + source_state = OBJ_STATE_PAUSED; else - source_state = SOURCE_STATE_STOPPED; + source_state = OBJ_STATE_STOPPED; EnterCriticalSection(&session->cs);

1 0

Zebediah Figura : d3dcompiler/tests: Add a test for the comma operator.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 1cea81d1044c4c8a6af833bdc49f1610eb00dc7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cea81d1044c4c8a6af833bd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Feb 28 11:24:01 2020 +0100 d3dcompiler/tests: Add a test for the comma operator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 36ea9c3765..9bf3784c1d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -574,6 +574,36 @@ static void test_trig(void) release_test_context(&test_context); } +static void test_comma(void) +{ + struct test_context test_context; + ID3D10Blob *ps_code = NULL; + struct vec4 v; + + static const char ps_source[] = + "float4 main(float x: TEXCOORD0): COLOR\n" + "{\n" + " float4 ret;\n" + " return (ret = float4(0.1, 0.2, 0.3, 0.4)), ret + 0.5;\n" + "}"; + + if (!init_test_context(&test_context)) + return; + + todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + if (ps_code) + { + draw_quad(test_context.device, ps_code); + + v = get_color_vec4(test_context.device, 0, 0); + ok(compare_vec4(&v, 0.6f, 0.7f, 0.8f, 0.9f, 0), + "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); + + ID3D10Blob_Release(ps_code); + } + release_test_context(&test_context); +} + static void test_fail(void) { static const char *tests[] = @@ -679,5 +709,6 @@ START_TEST(hlsl_d3d9) test_conditionals(); test_float_vectors(); test_trig(); + test_comma(); test_fail(); }

1 0

Zebediah Figura : winegstreamer: Defer a seek to pause time if necessary.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 2620d649c3318132bf00b703f02994827cfffad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2620d649c3318132bf00b703… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:37 2020 -0600 winegstreamer: Defer a seek to pause time if necessary. This fixes background music in Tomb Raider II. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 2fb158d562..8b5eb928ce 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1387,6 +1387,7 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; + const SourceSeeking *seeking; GstStateChangeReturn ret; unsigned int i; @@ -1407,6 +1408,23 @@ static HRESULT gstdemux_init_stream(struct strmbase_filter *iface) if (filter->no_more_pads_event) WaitForSingleObject(filter->no_more_pads_event, INFINITE); + seeking = &filter->sources[0]->seek; + + /* GStreamer can't seek while stopped, and it resets position to the + * beginning of the stream every time it is stopped. */ + if (seeking->llCurrent) + { + GstSeekType stop_type = GST_SEEK_TYPE_NONE; + + if (seeking->llStop && seeking->llStop != seeking->llDuration) + stop_type = GST_SEEK_TYPE_SET; + + gst_pad_push_event(filter->sources[0]->my_sink, gst_event_new_seek( + seeking->dRate, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH, + GST_SEEK_TYPE_SET, seeking->llCurrent * 100, + stop_type, seeking->llStop * 100)); + } + for (i = 0; i < filter->source_count; ++i) { if (SUCCEEDED(pin_hr = BaseOutputPinImpl_Active(&filter->sources[i]->pin)))

1 0

Zebediah Figura : winegstreamer: Don't fail seeking methods if we couldn't query duration.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 7987e84229fbfc5397e6143c055b5e97df6b43ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=7987e84229fbfc5397e6143c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:36 2020 -0600 winegstreamer: Don't fail seeking methods if we couldn't query duration. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48315 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index d469f2dbbf..2fb158d562 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1601,7 +1601,8 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; @@ -1609,8 +1610,6 @@ static BOOL gstdecoder_init_gst(struct gstdemux *filter) pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; } @@ -1845,10 +1844,7 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER { *pos = This->seek.llCurrent; TRACE("Cached value\n"); - if (This->seek.llDuration) - return S_OK; - else - return E_NOTIMPL; + return S_OK; } if (!gst_pad_query_position(This->their_src, GST_FORMAT_TIME, pos)) { @@ -1889,9 +1885,6 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - if (!This->seek.llDuration) - return E_NOTIMPL; - hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); if (This->pin.pin.filter->state == State_Stopped) return hr; @@ -2377,11 +2370,10 @@ static BOOL wave_parser_init_gst(struct gstdemux *filter) return FALSE; } - gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; events[0] = pin->caps_event; events[1] = filter->error_event; @@ -2496,7 +2488,8 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) WaitForSingleObject(filter->no_more_pads_event, INFINITE); - gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(filter->sources[0]->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); for (i = 0; i < filter->source_count; ++i) { struct gstdemux_source *pin = filter->sources[i]; @@ -2504,8 +2497,6 @@ static BOOL avi_splitter_init_gst(struct gstdemux *filter) pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; } @@ -2633,11 +2624,10 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) return FALSE; - gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration); + if (!gst_pad_query_duration(pin->their_src, GST_FORMAT_TIME, &duration)) + ERR("Failed to query duration.\n"); pin->seek.llDuration = pin->seek.llStop = duration / 100; pin->seek.llCurrent = 0; - if (!pin->seek.llDuration) - pin->seek.dwCapabilities = 0; events[0] = pin->caps_event; if (WaitForMultipleObjects(2, events, FALSE, INFINITE))

1 0

Alexandre Julliard : ntdll: Allow final null in RtlNormalizeString() even if 0 is an invalid character.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 4aebd6a95fe8f274ad21963fd6ce682b2af3a61e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aebd6a95fe8f274ad21963f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 15:34:52 2020 +0100 ntdll: Allow final null in RtlNormalizeString() even if 0 is an invalid character. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 1 - dlls/ntdll/locale.c | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7cc7f5d376..1df3c0dcd6 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4521,7 +4521,6 @@ static void test_IdnToNameprepUnicode(void) int len = ARRAY_SIZE(buf); memset( buf, 0xcc, sizeof(buf) ); status = pRtlNormalizeString( 13, test_data[i].in, test_data[i].in_len, buf, &len ); - todo_wine_if (!test_data[i].status && (test_data[i].in_len == -1 || !test_data[i].in[test_data[i].in_len - 1])) ok( status == test_data[i].status || broken(status == test_data[i].broken_status), "%d: failed %x\n", i, status ); if (!status) ok( !wcsncmp(test_data[i].out, buf, len), "%d: buf = %s\n", i, wine_dbgstr_wn(buf, len)); diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 7ec8a16074..8a2b233f88 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -437,6 +437,12 @@ static NTSTATUS decompose_string( const struct norm_table *info, const WCHAR *sr props = get_char_props( info, ch ); if (!(decomp = get_decomposition( info, ch, props, buffer, &decomp_len ))) { + /* allow final null */ + if (!ch && src_pos == src_len - 1 && dst_pos < *dst_len) + { + dst[dst_pos++] = 0; + break; + } *dst_len = src_pos; return STATUS_NO_UNICODE_TRANSLATION; } @@ -1934,6 +1940,8 @@ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BO /* ignore other chars in Hangul range */ if (ch >= HANGUL_LBASE && ch < HANGUL_LBASE + 0x100) continue; if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + 0x2c00) continue; + /* allow final null */ + if (!ch && i == len - 1) continue; return STATUS_NO_UNICODE_TRANSLATION; } }

1 0

Zebediah Figura : winegstreamer: Don't query or set GStreamer duration if the filter is stopped.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 18bdaaaa2687d6423a479a968037c62b4b9cedbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18bdaaaa2687d6423a479a96… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 27 20:40:35 2020 -0600 winegstreamer: Don't query or set GStreamer duration if the filter is stopped. This check is not equivalent to the existence of "their_src" for the MPEG-1 splitter, since that always exposes a source audio pin. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 488c9bd8a1..d469f2dbbf 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1841,7 +1841,8 @@ static HRESULT WINAPI GST_Seeking_GetCurrentPosition(IMediaSeeking *iface, REFER mark_wine_thread(); - if (!This->their_src) { + if (This->pin.pin.filter->state == State_Stopped) + { *pos = This->seek.llCurrent; TRACE("Cached value\n"); if (This->seek.llDuration) @@ -1892,7 +1893,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, return E_NOTIMPL; hr = SourceSeekingImpl_SetPositions(iface, pCur, curflags, pStop, stopflags); - if (!This->their_src) + if (This->pin.pin.filter->state == State_Stopped) return hr; curtype = type_from_flags(curflags);

1 0

Michael Stefaniuc : vbscript/tests: Get rid of strcmp_wa().
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: b3fbc70291d797021c66a74b6bebb36bc40d5daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3fbc70291d797021c66a74b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Feb 27 21:17:50 2020 +0100 vbscript/tests: Get rid of strcmp_wa(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/createobj.c | 13 +++---------- dlls/vbscript/tests/run.c | 15 ++++----------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index b16be88b85..34a9def89d 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -131,13 +131,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppv) { ok(0, "unexpected call\n"); @@ -286,7 +279,7 @@ static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown static HRESULT WINAPI Test_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reportSuccess")) { + if(!lstrcmpW(bstrName, L"reportSuccess")) { ok(grfdex == fdexNameCaseInsensitive, "grfdex = %x\n", grfdex); *pid = DISPID_TEST_REPORTSUCCESS; return S_OK; @@ -342,7 +335,7 @@ static IDispatchEx testObj = { &testObjVtbl }; static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "ok")) { + if(!lstrcmpW(bstrName, L"ok")) { ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); *pid = DISPID_GLOBAL_OK; return S_OK; @@ -620,7 +613,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC { ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - ok(!strcmp_wa(pstrName, "test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); + ok(!lstrcmpW(pstrName, L"test"), "pstrName = %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&globalObj; return S_OK; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 474fe1d452..6dcd13bf75 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -179,13 +179,6 @@ static BSTR a2bstr(const char *str) return ret; } -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), 0, 0); - return lstrcmpA(buf, stra); -} - static const char *vt2a(VARIANT *v) { if(V_VT(v) == (VT_BYREF|VT_VARIANT)) { @@ -1040,7 +1033,7 @@ static IDispatchEx enumDisp = { &enumDispVtbl }; static HRESULT WINAPI collectionObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { - if(!strcmp_wa(bstrName, "reset")) { + if(!lstrcmpW(bstrName, L"reset")) { *pid = DISPID_COLLOBJ_RESET; return S_OK; } @@ -1841,7 +1834,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC ok(dwReturnMask == SCRIPTINFO_IUNKNOWN, "unexpected dwReturnMask %x\n", dwReturnMask); ok(!ppti, "ppti != NULL\n"); - if(strcmp_wa(pstrName, "test")) + if(lstrcmpW(pstrName, L"test")) ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; @@ -2190,7 +2183,7 @@ static void test_procedures(void) CHECK_CALLED(OnEnterScript); CHECK_CALLED(OnLeaveScript); ok(V_VT(&v) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&v)); - ok(!strcmp_wa(V_BSTR(&v), "foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"foobar"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatchEx_Release(proc); @@ -2789,7 +2782,7 @@ static void test_isexpression(void) hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, &var, NULL); ok(hres == S_OK, "ParseScriptText failed: %08x\n", hres); ok(V_VT(&var) == VT_BSTR, "Expected VT_BSTR, got %s\n", vt2a(&var)); - ok(!strcmp_wa(V_BSTR(&var), "foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); + ok(!lstrcmpW(V_BSTR(&var), L"foo is 42"), "Wrong string, got %s\n", wine_dbgstr_w(V_BSTR(&var))); VariantClear(&var); SysFreeString(str);

1 0

Alexandre Julliard : kernel32/tests: Add some tests for Idn functions.
by Alexandre Julliard Feb. 28, 2020

Feb. 28, 2020

Module: wine Branch: master Commit: 5d270e592dd8aaa57a1bfd66f34d99906e759465 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d270e592dd8aaa57a1bfd66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 28 15:25:22 2020 +0100 kernel32/tests: Add some tests for Idn functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 404 +++++++++++++++++++++---------------------- 1 file changed, 198 insertions(+), 206 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d270e592dd8aaa57a1b…

1 0