wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Zebediah Figura : strmbase: Add a callback to expose renderer pin interfaces.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 5757a07fc20d95d146617377700aaff96d0fb6b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5757a07fc20d95d146617377… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:12 2019 -0500 strmbase: Add a callback to expose renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 5 +++++ include/wine/strmbase.h | 1 + 2 files changed, 6 insertions(+) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1de974a909..25534154e9 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -220,6 +220,11 @@ static HRESULT sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE * static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { BaseRenderer *filter = impl_from_IPin(&iface->IPin_iface); + HRESULT hr; + + if (filter->pFuncsTable->renderer_pin_query_interface + && SUCCEEDED(hr = filter->pFuncsTable->renderer_pin_query_interface(filter, iid, out))) + return hr; if (IsEqualGUID(iid, &IID_IMemInputPin)) *out = &filter->sink.IMemInputPin_iface; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6a358decfc..5eaf204f47 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -574,6 +574,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_EndFlush pfnEndFlush; void (*renderer_destroy)(BaseRenderer *iface); HRESULT (*renderer_query_interface)(BaseRenderer *iface, REFIID iid, void **out); + HRESULT (*renderer_pin_query_interface)(BaseRenderer *iface, REFIID iid, void **out); } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample);

1 0

Zebediah Figura : quartz/tests: Add some tests for IPin::EndOfStream() on the video renderer.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: ad48f308c85c197ff2bc35e67ed370b36c0ddd07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad48f308c85c197ff2bc35e6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:10 2019 -0500 quartz/tests: Add some tests for IPin::EndOfStream() on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 139 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 3919b419e1..54275cc234 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -991,6 +991,144 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *grap IMediaControl_Release(control); } +static unsigned int check_ec_complete(IMediaEvent *eventsrc, DWORD timeout) +{ + LONG_PTR param1, param2; + unsigned int ret = 0; + HRESULT hr; + LONG code; + + while ((hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, timeout)) == S_OK) + { + if (code == EC_COMPLETE) + { + ok(param1 == S_OK, "Got param1 %#lx.\n", param1); + ok(!param2, "Got param2 %#lx.\n", param2); + ret++; + } + IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); + timeout = 0; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + return ret; +} + +static void test_eos(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + IMediaEvent *eventsrc; + OAFilterState state; + HRESULT hr; + BOOL ret; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + IFilterGraph2_QueryInterface(graph, &IID_IMediaEvent, (void **)&eventsrc); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_UNEXPECTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* We do not receive an EC_COMPLETE notification until the last sample is + * done rendering. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + ret = check_ec_complete(eventsrc, 1600); + todo_wine ok(ret == 1, "Expected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS while flushing. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + /* Test sending EOS and then flushing or stopping. */ + + hr = IMediaControl_Run(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + todo_wine ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ret = check_ec_complete(eventsrc, 0); + ok(!ret, "Got unexpected EC_COMPLETE.\n"); + + IMediaEvent_Release(eventsrc); + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1097,6 +1235,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); test_sample_time(pin, input, graph); + test_eos(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : strmbase: Don't send EC_COMPLETE in IBaseFilter::Run().
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 94efc8b25b96262a527272117406dbf73cccad5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=94efc8b25b96262a52727211… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Oct 1 22:43:11 2019 -0500 strmbase: Don't send EC_COMPLETE in IBaseFilter::Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 038cb48b57..1de974a909 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -420,7 +420,6 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { - HRESULT hr = S_OK; BaseRenderer *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%s)\n", This, wine_dbgstr_longlong(tStart)); @@ -435,30 +434,18 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { This->sink.end_of_stream = FALSE; } - else if (This->filter.filterInfo.pGraph) - { - IMediaEventSink *pEventSink; - hr = IFilterGraph_QueryInterface(This->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); - if (SUCCEEDED(hr)) - { - hr = IMediaEventSink_Notify(pEventSink, EC_COMPLETE, S_OK, (LONG_PTR)This); - IMediaEventSink_Release(pEventSink); - } - hr = S_OK; - } - if (SUCCEEDED(hr)) - { - QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); - if (This->sink.pin.peer && This->pFuncsTable->renderer_start_stream) - This->pFuncsTable->renderer_start_stream(This); - if (This->filter.state == State_Stopped) - BaseRendererImpl_ClearPendingSample(This); - This->filter.state = State_Running; - } + + QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart); + if (This->sink.pin.peer && This->pFuncsTable->renderer_start_stream) + This->pFuncsTable->renderer_start_stream(This); + if (This->filter.state == State_Stopped) + BaseRendererImpl_ClearPendingSample(This); + This->filter.state = State_Running; + out: LeaveCriticalSection(&This->csRenderLock); - return hr; + return S_OK; } HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface)

1 0

Christian Costa : d3dx9: Correctly align texture dimensions to block size in D3DXCheckTextureRequirements().
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: f6f90daa3117cf493e0815c42bb0fa1740d31308 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f90daa3117cf493e0815c4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 2 20:22:09 2019 +0200 d3dx9: Correctly align texture dimensions to block size in D3DXCheckTextureRequirements(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/texture.c | 9 +++++++++ dlls/d3dx9_36/texture.c | 15 +++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index 229c857ac2..3416a3318b 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -448,6 +448,15 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(width == 4, "Got unexpected width %d.\n", width); ok(height == 4, "Got unexpected height %d.\n", height); ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); + + width = 9; + height = 9; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(width == 12, "Got unexpected width %u.\n", width); + ok(height == 12, "Got unexpected height %u.\n", height); + ok(mipmaps == 1, "Got unexpected level count %u.\n", mipmaps); + ok(format == D3DFMT_DXT5, "Got unexpected format %u.\n", format); } else { diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 8708ed702f..6ee7d72e38 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - +#include <assert.h> #include "d3dx9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dx); @@ -337,13 +337,12 @@ HRESULT WINAPI D3DXCheckTextureRequirements(struct IDirect3DDevice9 *device, UIN else if (h == D3DX_DEFAULT) h = (width ? w : 256); - if (fmt->block_width != 1 || fmt->block_height != 1) - { - if (w < fmt->block_width) - w = fmt->block_width; - if (h < fmt->block_height) - h = fmt->block_height; - } + assert(!(fmt->block_width & (fmt->block_width - 1))); + assert(!(fmt->block_height & (fmt->block_height - 1))); + if (w & (fmt->block_width - 1)) + w = (w + fmt->block_width) & ~(fmt->block_width - 1); + if (h & (fmt->block_height - 1)) + h = (h + fmt->block_height) & ~(fmt->block_height - 1); if ((caps.TextureCaps & D3DPTEXTURECAPS_POW2) && (!is_pow2(w))) w = make_pow2(w);

1 0

Matteo Bruni : d3dx9: Fix pitch passed to DXTn [de]compression functions.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 9069913dbba0914b80544ce4afb9e7285efad2a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9069913dbba0914b80544ce4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 2 20:22:08 2019 +0200 d3dx9: Fix pitch passed to DXTn [de]compression functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47862 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b47509aa38..29325d5c0a 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1972,6 +1972,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, int i, int j, void *texel); unsigned int x, y; + src_pitch = src_pitch * srcformatdesc->block_width / srcformatdesc->block_byte_count; + src_uncompressed = heap_alloc(src_size.width * src_size.height * sizeof(DWORD)); if (!src_uncompressed) { @@ -2003,8 +2005,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD *ptr = &src_uncompressed[y * src_size.width]; for (x = 0; x < src_size.width; ++x) { - fetch_dxt_texel(src_pitch / sizeof(DWORD), src_memory, - x + src_rect->left, y + src_rect->top, ptr); + fetch_dxt_texel(src_pitch, src_memory, x + src_rect->left, y + src_rect->top, ptr); ++ptr; } } @@ -2080,7 +2081,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, ERR("Unexpected destination compressed format %u.\n", surfdesc.Format); } tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, - dst_uncompressed, gl_format, lockrect.pBits, lockrect.Pitch); + dst_uncompressed, gl_format, lockrect.pBits, + lockrect.Pitch * destformatdesc->block_width / destformatdesc->block_byte_count); heap_free(dst_uncompressed); } }

1 0

Matteo Bruni : maintainers: Drop Sebastian Lackner as a maintainer.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 99719dff1f16604cf6b69a1813806a2c4e58a847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99719dff1f16604cf6b69a18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 2 20:22:10 2019 +0200 maintainers: Drop Sebastian Lackner as a maintainer. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 344282727f..6606d30ca7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -205,10 +205,6 @@ P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/oleaut32/typelib.c -OpenMP -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: dlls/vcomp*/ - Postscript Driver M: Huw Davies <huw(a)codeweavers.com> F: dlls/wineps.drv/ @@ -229,14 +225,6 @@ P: Huw Davies <huw(a)codeweavers.com> F: dlls/rpcrt4 F: tools/widl -Threadpool -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: dlls/ntdll/threadpool.c - -Timezone database -M: Sebastian Lackner <sebastian(a)fds-team.de> -F: loader/wine.inf.in - TWAIN P: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/twain_32/ @@ -278,7 +266,6 @@ F: dlls/wmiutils/ Wine server, IPC M: Alexandre Julliard <julliard(a)winehq.org> -P: Sebastian Lackner <sebastian(a)fds-team.de> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: server/ @@ -314,7 +301,6 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: *

1 0

Alistair Leslie-Hughes : dmime: Always set a minimum timeout in IDirectMusicPerformance8::SetNotificationHandle.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 955ac888496fe4514e383638a219251e827b97b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=955ac888496fe4514e383638… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Oct 2 22:10:11 2019 +0200 dmime: Always set a minimum timeout in IDirectMusicPerformance8::SetNotificationHandle. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/performance.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b4d01017..399b9b9919 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -519,12 +519,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph(IDirectMusicPerforma static HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle(IDirectMusicPerformance8 *iface, HANDLE hNotification, REFERENCE_TIME rtMinimum) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s): stub\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); - This->hNotification = hNotification; - if (rtMinimum) This->rtMinimum = rtMinimum; - return S_OK; + TRACE("(%p, %p, 0x%s)\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); + + This->hNotification = hNotification; + if (rtMinimum) + This->rtMinimum = rtMinimum; + else if (!This->rtMinimum) + This->rtMinimum = 20000000; /* 2 seconds */ + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetNotificationPMsg(IDirectMusicPerformance8 *iface,

1 0

Hans Leidekker : winhttp: Propagate request errors in request_wait.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 8de2369dcfcc6888772ad7b3fb730a780e92df87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de2369dcfcc6888772ad7b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:43:36 2019 +0200 winhttp: Propagate request errors in request_wait. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 409ef68b5a..46a47f3bc2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3799,7 +3799,9 @@ static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, request->error = result->dwError; break; } - default: break; + default: + request->error = ERROR_SUCCESS; + break; } SetEvent( request->wait ); } @@ -4012,18 +4014,17 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) switch (err) { case WAIT_OBJECT_0: - ret = ERROR_SUCCESS; + ret = request->error; break; case WAIT_TIMEOUT: ret = ERROR_TIMEOUT; break; - case WAIT_FAILED: default: ret = GetLastError(); break; } EnterCriticalSection( &request->cs ); - if (!ret) request->proc_running = FALSE; + if (err == WAIT_OBJECT_0) request->proc_running = FALSE; return ret; } @@ -4547,11 +4548,9 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( err = ERROR_SUCCESS; break; - case ERROR_SUCCESS: + default: if (succeeded) *succeeded = VARIANT_TRUE; break; - - default: break; } LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( err );

1 0

Hans Leidekker : winhttp/tests: Fix some test failures.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 310620c07295d8a76826c21ef24603ef1056516f URL: https://source.winehq.org/git/wine.git/?a=commit;h=310620c07295d8a76826c21e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:43:35 2019 +0200 winhttp/tests: Fix some test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index b005514dfa..552f6ce778 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1139,7 +1139,7 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_SECURE_FAILURE || err == ERROR_WINHTTP_CANNOT_CONNECT || - err == ERROR_WINHTTP_TIMEOUT)) + err == ERROR_WINHTTP_TIMEOUT || err == SEC_E_ILLEGAL_MESSAGE)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; @@ -1172,6 +1172,11 @@ static void test_secure_connection(void) } ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_CONNECTION_ERROR) + { + skip("connection error, skipping remaining secure tests\n"); + goto cleanup; + } ok(ret, "failed to receive response %u\n", GetLastError()); available_size = 0; @@ -3780,9 +3785,9 @@ static void test_IWinHttpRequest(int port) V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( test_dataW ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), - "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); + if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -4250,14 +4255,14 @@ static void test_IWinHttpRequest(int port) SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); - if (hr == S_OK) - { - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); - } + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); IWinHttpRequest_Release( req ); @@ -4294,8 +4299,8 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); +done: IWinHttpRequest_Release( req ); - CoUninitialize(); }

1 0

Nikolay Sivov : include: Move DWRITE_GLYPH_IMAGE_FORMATS definition to dcommon.h.
by Alexandre Julliard 02 Oct '19

02 Oct '19

Module: wine Branch: master Commit: 729c920325ef826f31c6ef1c291ef9d7e647588a URL: https://source.winehq.org/git/wine.git/?a=commit;h=729c920325ef826f31c6ef1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 2 16:12:51 2019 +0300 include: Move DWRITE_GLYPH_IMAGE_FORMATS definition to dcommon.h. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dcommon.idl | 13 +++++++++++++ include/dwrite_3.idl | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/dcommon.idl b/include/dcommon.idl index 88f97c56a4..53281bd487 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -33,6 +33,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE; +typedef enum DWRITE_GLYPH_IMAGE_FORMATS +{ + DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, + DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, + DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, + DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, + DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, + DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, + DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 +} DWRITE_GLYPH_IMAGE_FORMATS; + typedef enum D2D1_ALPHA_MODE { D2D1_ALPHA_MODE_UNKNOWN = 0, diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index dc8bf0e959..b148bd725b 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -733,19 +733,6 @@ interface IDWriteFactory3 : IDWriteFactory2 HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); } -typedef enum DWRITE_GLYPH_IMAGE_FORMATS -{ - DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, - DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, - DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, - DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, - DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, - DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, - DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, - DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, - DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 -} DWRITE_GLYPH_IMAGE_FORMATS; - typedef struct DWRITE_GLYPH_IMAGE_DATA { void const *imageData;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019