September 2018 - Wine-Commits

Henri Verbeet : wined3d: Set a feature level for NO3D adapters.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: b04220a21d315e4f2f75eee4410435deec0c40c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b04220a21d315e4f2f75eee4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 01:02:35 2018 +0330 wined3d: Set a feature level for NO3D adapters. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c25d847..2d1368a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2465,6 +2465,7 @@ static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, d3d_info->wined3d_creation_flags = wined3d_creation_flags; d3d_info->texture_npot = TRUE; + d3d_info->feature_level = WINED3D_FEATURE_LEVEL_5; } static BOOL wined3d_adapter_no3d_init(struct wined3d_adapter *adapter, DWORD wined3d_creation_flags)

1 0

Austin English : winscard: Add SCardCancel stub.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: eb68dc963325607dc38d469ff637babaf58676f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb68dc963325607dc38d469f… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Sep 25 15:46:46 2018 -0500 winscard: Add SCardCancel stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45880 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/winscard.c | 7 +++++++ dlls/winscard/winscard.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index a8a1735..91fdfd3 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -141,3 +141,10 @@ LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR * FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); return SCARD_E_NO_READERS_AVAILABLE; } + +LONG WINAPI SCardCancel(SCARDCONTEXT context) +{ + FIXME("(%lx) stub\n", context); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return SCARD_F_INTERNAL_ERROR; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index d2ae62a..037d3be 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -6,7 +6,7 @@ @ stdcall SCardAddReaderToGroupA(long str str) @ stdcall SCardAddReaderToGroupW(long wstr wstr) @ stub SCardBeginTransaction -@ stub SCardCancel +@ stdcall SCardCancel(long) @ stub SCardConnectA @ stub SCardConnectW @ stub SCardControl

1 0

Zebediah Figura : quartz/filtergraph: Check for AM_FILTER_MISC_FLAGS_IS_RENDERER or IMediaSeeking to count renderers.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 783c2d66a41021d6c01c6bdf2440ab256f073db6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=783c2d66a41021d6c01c6bdf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:23 2018 -0500 quartz/filtergraph: Check for AM_FILTER_MISC_FLAGS_IS_RENDERER or IMediaSeeking to count renderers. Instead of using IPin_QueryInternalConnections(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 49 +++++++++++++++++++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 5 ----- 2 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4dfe5c0..c859564 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2084,8 +2084,34 @@ static HRESULT WINAPI MediaControl_Invoke(IMediaControl *iface, DISPID dispIdMem typedef HRESULT(WINAPI *fnFoundFilter)(IBaseFilter *, DWORD_PTR data); +static BOOL has_output_pins(IBaseFilter *filter) +{ + IEnumPins *enumpins; + PIN_DIRECTION dir; + IPin *pin; + + if (FAILED(IBaseFilter_EnumPins(filter, &enumpins))) + return FALSE; + + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) + { + IPin_QueryDirection(pin, &dir); + IPin_Release(pin); + if (dir == PINDIR_OUTPUT) + { + IEnumPins_Release(enumpins); + return TRUE; + } + } + + IEnumPins_Release(enumpins); + return FALSE; +} + static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundFilter FoundFilter, DWORD_PTR data) { + IAMFilterMiscFlags *flags; + IMediaSeeking *seeking; HRESULT hr; IPin* pInputPin; IPin** ppPins; @@ -2108,13 +2134,7 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF if (SUCCEEDED(hr)) { - if (nb == 0) - { - TRACE("Reached a renderer\n"); - /* Count renderers for end of stream notification */ - pGraph->nRenderers++; - } - else + if (nb) { for(i = 0; i < nb; i++) { @@ -2129,6 +2149,21 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF } TRACE("Doing stuff with filter %p\n", PinInfo.pFilter); + if (SUCCEEDED(IBaseFilter_QueryInterface(PinInfo.pFilter, + &IID_IAMFilterMiscFlags, (void **)&flags))) + { + if (IAMFilterMiscFlags_GetMiscFlags(flags) & AM_FILTER_MISC_FLAGS_IS_RENDERER) + pGraph->nRenderers++; + IAMFilterMiscFlags_Release(flags); + } + else if (SUCCEEDED(IBaseFilter_QueryInterface(PinInfo.pFilter, + &IID_IMediaSeeking, (void **)&seeking))) + { + if (!has_output_pins(PinInfo.pFilter)) + pGraph->nRenderers++; + IMediaSeeking_Release(seeking); + } + FoundFilter(PinInfo.pFilter, data); } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1345e41..74a3b68 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3080,10 +3080,8 @@ static void test_ec_complete(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, 0); -todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); ok(code == EC_COMPLETE, "Got code %#x.\n", code); -} ok(param1 == S_OK, "Got param1 %#lx.\n", param1); ok(!param2, "Got param2 %#lx.\n", param2); hr = IMediaEvent_FreeEventParams(eventsrc, code, param1, param2); @@ -3096,7 +3094,6 @@ todo_wine { ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IMediaEvent_GetEvent(eventsrc, &code, &param1, &param2, 50); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IMediaControl_Stop(control); @@ -3156,7 +3153,6 @@ todo_wine IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IFilterGraph2_RemoveFilter(graph, &filter1.IBaseFilter_iface); @@ -3185,7 +3181,6 @@ todo_wine IFilterGraph2_ConnectDirect(graph, &source_pins[0].IPin_iface, &filter1_pin.IPin_iface, NULL); hr = check_ec_complete(graph, &filter1.IBaseFilter_iface); -todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); IMediaControl_Release(control);

1 0

Zebediah Figura : quartz/tests/filtergraph: Add some tests for EC_COMPLETE.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: d65586ea95625a7d367c767c6bd088375b622021 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65586ea95625a7d367c767c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:22 2018 -0500 quartz/tests/filtergraph: Add some tests for EC_COMPLETE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 430 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 430 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65586ea95625a7d367c…

1 0

Zebediah Figura : quartz/filtergraph: Implement IMediaControl state functions on top of IMediaFilter.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 093a32ec7b45dca8043b53e118ac896fb67f7b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=093a32ec7b45dca8043b53e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:21 2018 -0500 quartz/filtergraph: Implement IMediaControl state functions on top of IMediaFilter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 211 ++++++++++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 2 - 2 files changed, 108 insertions(+), 105 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index f173c12..4dfe5c0 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2228,114 +2228,34 @@ static HRESULT SendFilterMessage(IFilterGraphImpl *This, fnFoundFilter FoundFilt return S_FALSE; } -/*** IMediaControl methods ***/ static HRESULT WINAPI MediaControl_Run(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->cs); - if (This->state == State_Running) - goto out; - This->EcCompleteCount = 0; - - if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - if (This->refClock) - { - REFERENCE_TIME now; - IReferenceClock_GetTime(This->refClock, &now); - if (This->state == State_Stopped) - This->start_time = now + 500000; - else if (This->pause_time >= 0) - This->start_time += now - This->pause_time; - else - This->start_time = now; - } - else This->start_time = 0; - - SendFilterMessage(This, SendRun, (DWORD_PTR)&This->start_time); - This->state = State_Running; -out: - LeaveCriticalSection(&This->cs); - return S_FALSE; + return IMediaFilter_Run(&graph->IMediaFilter_iface, 0); } static HRESULT WINAPI MediaControl_Pause(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->cs); - if (This->state == State_Paused) - goto out; - - if (This->defaultclock && !This->refClock) - IFilterGraph2_SetDefaultSyncSource(&This->IFilterGraph2_iface); - - if (This->state == State_Running && This->refClock && This->start_time >= 0) - IReferenceClock_GetTime(This->refClock, &This->pause_time); - else - This->pause_time = -1; - - SendFilterMessage(This, SendPause, 0); - This->state = State_Paused; -out: - LeaveCriticalSection(&This->cs); - return S_FALSE; + return IMediaFilter_Pause(&graph->IMediaFilter_iface); } static HRESULT WINAPI MediaControl_Stop(IMediaControl *iface) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - TRACE("(%p/%p)->()\n", This, iface); - - if (This->state == State_Stopped) return S_OK; - - EnterCriticalSection(&This->cs); - if (This->state == State_Running) SendFilterMessage(This, SendPause, 0); - SendFilterMessage(This, SendStop, 0); - This->state = State_Stopped; - LeaveCriticalSection(&This->cs); - return S_OK; + return IMediaFilter_Stop(&graph->IMediaFilter_iface); } -static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG msTimeout, - OAFilterState *pfs) +static HRESULT WINAPI MediaControl_GetState(IMediaControl *iface, LONG timeout, OAFilterState *state) { - IFilterGraphImpl *This = impl_from_IMediaControl(iface); - DWORD end; - - TRACE("(%p/%p)->(%d, %p)\n", This, iface, msTimeout, pfs); - - if (!pfs) - return E_POINTER; - - EnterCriticalSection(&This->cs); + IFilterGraphImpl *graph = impl_from_IMediaControl(iface); - *pfs = This->state; - if (msTimeout > 0) - { - end = GetTickCount() + msTimeout; - } - else if (msTimeout < 0) - { - end = INFINITE; - } - else - { - end = 0; - } - if (end) - SendFilterMessage(This, SendGetState, end); + if (timeout < 0) timeout = INFINITE; - LeaveCriticalSection(&This->cs); - - return S_OK; + return IMediaFilter_GetState(&graph->IMediaFilter_iface, timeout, (FILTER_STATE *)state); } static HRESULT WINAPI MediaControl_RenderFile(IMediaControl *iface, BSTR strFilename) @@ -5454,34 +5374,119 @@ static HRESULT WINAPI MediaFilter_GetClassID(IMediaFilter *iface, CLSID * pClass static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); - return MediaControl_Stop(&This->IMediaControl_iface); + TRACE("graph %p.\n", graph); + + EnterCriticalSection(&graph->cs); + + if (graph->state == State_Stopped) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + + if (graph->state == State_Running) + SendFilterMessage(graph, SendPause, 0); + SendFilterMessage(graph, SendStop, 0); + graph->state = State_Stopped; + + LeaveCriticalSection(&graph->cs); + return S_OK; } static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); - return MediaControl_Pause(&This->IMediaControl_iface); + TRACE("graph %p.\n", graph); + + EnterCriticalSection(&graph->cs); + + if (graph->state == State_Paused) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + + if (graph->defaultclock && !graph->refClock) + IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); + + if (graph->state == State_Running && graph->refClock && graph->start_time >= 0) + IReferenceClock_GetTime(graph->refClock, &graph->pause_time); + else + graph->pause_time = -1; + + SendFilterMessage(graph, SendPause, 0); + graph->state = State_Paused; + + LeaveCriticalSection(&graph->cs); + return S_FALSE; } -static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME tStart) +static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); + + TRACE("graph %p, start %s.\n", graph, wine_dbgstr_longlong(start)); - if (tStart) - FIXME("Run called with non-null tStart: %s\n", wine_dbgstr_longlong(tStart)); + EnterCriticalSection(&graph->cs); - return MediaControl_Run(&This->IMediaControl_iface); + if (graph->state == State_Running) + { + LeaveCriticalSection(&graph->cs); + return S_OK; + } + graph->EcCompleteCount = 0; + + if (graph->defaultclock && !graph->refClock) + IFilterGraph2_SetDefaultSyncSource(&graph->IFilterGraph2_iface); + + if (!start && graph->refClock) + { + REFERENCE_TIME now; + IReferenceClock_GetTime(graph->refClock, &now); + if (graph->state == State_Stopped) + graph->start_time = now + 500000; + else if (graph->pause_time >= 0) + graph->start_time += now - graph->pause_time; + else + graph->start_time = now; + } + else + graph->start_time = start; + + SendFilterMessage(graph, SendRun, (DWORD_PTR)&graph->start_time); + graph->state = State_Running; + + LeaveCriticalSection(&graph->cs); + return S_FALSE; } -static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD dwMsTimeout, - FILTER_STATE *pState) +static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, FILTER_STATE *state) { - IFilterGraphImpl *This = impl_from_IMediaFilter(iface); + IFilterGraphImpl *graph = impl_from_IMediaFilter(iface); + DWORD end; + + TRACE("graph %p, timeout %u, state %p.\n", graph, timeout, state); + + if (!state) + return E_POINTER; + + EnterCriticalSection(&graph->cs); - return MediaControl_GetState(&This->IMediaControl_iface, dwMsTimeout, (OAFilterState*)pState); + *state = graph->state; + if (timeout > 0) + end = GetTickCount() + timeout; + else if (timeout == INFINITE) + end = INFINITE; + else + end = 0; + if (end) + SendFilterMessage(graph, SendGetState, end); + + LeaveCriticalSection(&graph->cs); + return S_OK; } static HRESULT WINAPI MediaFilter_SetSyncSource(IMediaFilter *iface, IReferenceClock *pClock) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 8dc7341..6838c02 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2698,10 +2698,8 @@ todo_wine todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); check_filter_state(graph, State_Running); -todo_wine { ok(source.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(source.start_time)); ok(sink.start_time == 0xdeadbeef, "Got time %s.\n", wine_dbgstr_longlong(sink.start_time)); -} hr = IMediaFilter_Pause(filter); todo_wine

1 0

Zebediah Figura : quartz/tests: Add some tests for filter states.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 0c0606cd1bacf24e0cce6a83c17a8efbf17a4dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0606cd1bacf24e0cce6a83… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 25 23:30:20 2018 -0500 quartz/tests: Add some tests for filter states. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 276 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 268 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c0606cd1bacf24e0cce…

1 0

Henri Verbeet : wined3d: Move "texture_size" from struct wined3d_gl_limits to struct wined3d_d3d_limits.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: a470045506b432ccbf80d4e72ad87f7a20ee79c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a470045506b432ccbf80d4e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 01:02:37 2018 +0330 wined3d: Move "texture_size" from struct wined3d_gl_limits to struct wined3d_d3d_limits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/directx.c | 6 +++--- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index ba6c457..87418e1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2853,7 +2853,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_SIZE, &gl_max); - gl_info->limits.texture_size = gl_max; + d3d_info->limits.texture_size = gl_max; TRACE("Maximum texture size support - max texture size %d.\n", gl_max); gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] @@ -3143,8 +3143,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct } else { - gl_info->limits.framebuffer_width = gl_info->limits.texture_size; - gl_info->limits.framebuffer_height = gl_info->limits.texture_size; + gl_info->limits.framebuffer_width = d3d_info->limits.texture_size; + gl_info->limits.framebuffer_height = d3d_info->limits.texture_size; } gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL] = diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2d1368a..a618486 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2136,8 +2136,8 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * idea how generating the smoothing alpha values works; the result is different */ - caps->MaxTextureWidth = gl_info->limits.texture_size; - caps->MaxTextureHeight = gl_info->limits.texture_size; + caps->MaxTextureWidth = d3d_info->limits.texture_size; + caps->MaxTextureHeight = d3d_info->limits.texture_size; if (gl_info->supported[EXT_TEXTURE3D]) caps->MaxVolumeExtent = gl_info->limits.texture3d_size; @@ -2145,7 +2145,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->MaxVolumeExtent = 0; caps->MaxTextureRepeat = 32768; - caps->MaxTextureAspectRatio = gl_info->limits.texture_size; + caps->MaxTextureAspectRatio = d3d_info->limits.texture_size; caps->MaxVertexW = 1.0f; caps->GuardBandLeft = 0.0f; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fdf2651..c0bdddc 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2687,7 +2687,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_width = pow2_width; texture->pow2_height = pow2_height; - if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) + if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size) && (desc->usage & WINED3DUSAGE_TEXTURE)) { /* One of four options: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 46b47dd..941bfa6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -166,6 +166,7 @@ struct wined3d_d3d_limits unsigned int max_rt_count; unsigned int max_clip_distances; + unsigned int texture_size; float pointsize_max; }; @@ -2540,7 +2541,6 @@ struct wined3d_gl_limits unsigned int combined_samplers; UINT general_combiners; UINT user_clip_distances; - UINT texture_size; UINT texture3d_size; UINT anisotropy; float shininess;

1 0

Henri Verbeet : wined3d: Get rid of the "pointsize_min" and "pointsize_max " fields from struct wined3d_gl_limits.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 8aa30cd7934edde06c7f3eb1e5147fe2c3852a8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8aa30cd7934edde06c7f3eb1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 26 01:02:36 2018 +0330 wined3d: Get rid of the "pointsize_min" and "pointsize_max" fields from struct wined3d_gl_limits. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 8 +++----- dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 1722438..ba6c457 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -2811,7 +2811,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) #undef MAP_GL_FUNCTION_CAST } -static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) +static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info, struct wined3d_d3d_info *d3d_info) { unsigned int i, sampler_count; GLfloat gl_floatv[2]; @@ -2858,8 +2858,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, gl_floatv); - gl_info->limits.pointsize_min = gl_floatv[0]; - gl_info->limits.pointsize_max = gl_floatv[1]; + d3d_info->limits.pointsize_max = gl_floatv[1]; TRACE("Maximum point size support - max point size %f.\n", gl_floatv[1]); if (gl_info->supported[ARB_MAP_BUFFER_ALIGNMENT]) @@ -3630,7 +3629,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, gl_info->supported[ARB_TEXTURE_MULTISAMPLE] = FALSE; } - wined3d_adapter_init_limits(gl_info); + wined3d_adapter_init_limits(gl_info, d3d_info); if (gl_info->supported[ARB_VERTEX_PROGRAM] && test_arb_vs_offset_limit(gl_info)) gl_info->quirks |= WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT; @@ -3657,7 +3656,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; - d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 40a27ff..46b47dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2542,8 +2542,6 @@ struct wined3d_gl_limits UINT user_clip_distances; UINT texture_size; UINT texture3d_size; - float pointsize_max; - float pointsize_min; UINT anisotropy; float shininess; UINT samples;

1 0

Nikolay Sivov : crypt32: Fix output buffer handling for CRYPT_STRING_BINARY case.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 5652a19110caa451f1ba0d1c8252fc278d81f7e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5652a19110caa451f1ba0d1c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 26 13:09:53 2018 +0300 crypt32: Fix output buffer handling for CRYPT_STRING_BINARY case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/base64.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c index e25e4c1..5caab97 100644 --- a/dlls/crypt32/base64.c +++ b/dlls/crypt32/base64.c @@ -77,23 +77,20 @@ static BOOL EncodeBinaryToBinaryA(const BYTE *pbBinary, { BOOL ret = TRUE; - if (*pcchString < cbBinary) + if (pszString) { - if (!pszString) - *pcchString = cbBinary; - else + if (*pcchString < cbBinary) { SetLastError(ERROR_INSUFFICIENT_BUFFER); - *pcchString = cbBinary; ret = FALSE; } - } - else - { - if (cbBinary) + else if (cbBinary) memcpy(pszString, pbBinary, cbBinary); - *pcchString = cbBinary; } + else + + *pcchString = cbBinary; + return ret; }

1 0

Hans Leidekker : msi/tests: Drop workarounds for Windows 2000.
by Alexandre Julliard Sept. 26, 2018

Sept. 26, 2018

Module: wine Branch: master Commit: 6a3e79b00225a1186a01101cd5614141748e6a53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a3e79b00225a1186a01101c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 26 15:17:18 2018 +0200 msi/tests: Drop workarounds for Windows 2000. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/Makefile.in | 2 +- dlls/msi/tests/action.c | 14 +++---------- dlls/msi/tests/automation.c | 10 ++------- dlls/msi/tests/install.c | 6 +----- dlls/msi/tests/msi.c | 51 +++++++++++++++++++-------------------------- dlls/msi/tests/package.c | 45 +++++++++------------------------------ dlls/msi/tests/patch.c | 7 +------ dlls/msi/tests/source.c | 25 +++------------------- 8 files changed, 42 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a3e79b00225a1186a01…

1 0