September 2020 - Wine-Commits

Anton Baskanov : amstream: Call ::SetFormat in AMDirectDrawStream::CreateSample.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 5f7e25c7b1d10b1f514540588014831073e27979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f7e25c7b1d10b1f51454058… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Sep 25 02:07:45 2020 +0700 amstream: Call ::SetFormat in AMDirectDrawStream::CreateSample. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 28 ++++++++++++++---- dlls/amstream/tests/amstream.c | 66 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 87 insertions(+), 7 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 0771587552..c3cb2fc49a 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -1413,6 +1413,7 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { struct ddraw_sample *object; + DDSURFACEDESC desc; HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); @@ -1434,7 +1435,6 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw } else { - DDSURFACEDESC desc; IDirectDraw *ddraw; hr = IDirectDrawMediaStream_GetDirectDraw(&parent->IDirectDrawMediaStream_iface, &ddraw); @@ -1475,14 +1475,30 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw } } + desc.dwSize = sizeof(desc); + hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); + if (FAILED(hr)) + { + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; + } + if (rect) + { object->rect = *rect; - else if (object->surface) + desc.dwWidth = rect->right - rect->left; + desc.dwHeight = rect->bottom - rect->top; + } + else { - DDSURFACEDESC desc = { sizeof(desc) }; - hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); - if (hr == S_OK) - SetRect(&object->rect, 0, 0, desc.dwWidth, desc.dwHeight); + SetRect(&object->rect, 0, 0, desc.dwWidth, desc.dwHeight); + } + + hr = IDirectDrawMediaStream_SetFormat(&parent->IDirectDrawMediaStream_iface, &desc, NULL); + if (FAILED(hr)) + { + IDirectDrawStreamSample_Release(&object->IDirectDrawStreamSample_iface); + return hr; } *ddraw_stream_sample = &object->IDirectDrawStreamSample_iface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 9b25bdd7d1..df9d148493 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6507,6 +6507,7 @@ static void get_ddrawstream_create_sample_desc_(int line, const DDSURFACEDESC *f static void test_ddrawstream_create_sample(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + DDSURFACEDESC desc2 = { sizeof(desc2) }; IDirectDrawSurface *surface, *surface2; DDSURFACEDESC desc = { sizeof(desc) }; IDirectDrawMediaStream *ddraw_stream; @@ -6603,11 +6604,74 @@ static void test_ddrawstream_create_sample(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); - IDirectDrawMediaStream_Release(ddraw_stream); ref = IDirectDrawStreamSample_Release(sample); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IDirectDrawSurface_Release(surface); ok(!ref, "Got outstanding refcount %d.\n", ref); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + desc.dwWidth = 444; + desc.dwHeight = 400; + desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_ALPHAPIXELS; + desc.ddpfPixelFormat.dwRGBBitCount = 32; + desc.ddpfPixelFormat.dwRBitMask = 0xff0000; + desc.ddpfPixelFormat.dwGBitMask = 0x00ff00; + desc.ddpfPixelFormat.dwBBitMask = 0x0000ff; + desc.ddpfPixelFormat.dwRGBAlphaBitMask = 0xff000000; + desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + SetRect(&rect, 111, 100, 333, 300); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, &rect, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + surface2 = NULL; + hr = IDirectDrawStreamSample_GetSurface(sample, &surface2, &rect); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IDirectDrawSurface_GetSurfaceDesc(surface2, &desc2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(desc2.dwWidth == 222, "Got width %u.\n", desc2.dwWidth); + ok(desc2.dwHeight == 200, "Got height %u.\n", desc2.dwHeight); + ok(memcmp(&desc2.ddpfPixelFormat, &desc.ddpfPixelFormat, sizeof(DDPIXELFORMAT)) == 0, + "Pixel format didn't match.\n"); + + ref = IDirectDrawStreamSample_Release(sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IDirectDrawSurface_Release(surface2); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_CAPS; + desc.dwWidth = 444; + desc.dwHeight = 400; + desc.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + desc.ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED4; + desc.ddpfPixelFormat.dwRGBBitCount = 4; + desc.ddsCaps.dwCaps = DDSCAPS_SYSTEMMEMORY | DDSCAPS_OFFSCREENPLAIN; + hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, surface, NULL, 0, &sample); + ok(hr == DDERR_INVALIDSURFACETYPE, "Got hr %#x.\n", hr); + + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IDirectDrawSurface_Release(surface); + ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %d.\n", ref); ref = IMediaStream_Release(stream);

1 0

Robert Wilhelm : vbscript: Fix handling zero and negative number arguments in err.raise.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 7d48c52816e170eb44dcb64a236345aaf9cad7fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d48c52816e170eb44dcb64a… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Sep 25 16:46:21 2020 +0200 vbscript: Fix handling zero and negative number arguments in err.raise. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49172 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 2 +- dlls/vbscript/tests/api.vbs | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 1231beee8e..8978077721 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -3148,7 +3148,7 @@ static HRESULT Err_Raise(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VA hres = to_int(args, &code); if(FAILED(hres)) return hres; - if(code > 0 && code > 0xffff) + if(code == 0 || code > 0xffff) return E_INVALIDARG; if(args_cnt >= 2) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 48b263334c..20798a0aac 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1856,13 +1856,29 @@ end sub sub testErrRaise() on error resume next call ok(err.number = 0, "err.number = " & err.number) + err.raise 0 + call ok(err.number = 5, "err.number = " & err.number) err.raise 1 call ok(err.number = 1, "err.number = " & err.number) err.raise call ok(err.number = 450, "err.number = " & err.number) call testErrNumber(450) + err.raise &h8000 + call ok(err.number = -32768, "err.number = " & err.number) + err.raise &hffff + call ok(err.number = -1, "err.number = " & err.number) err.raise &h10000& call ok(err.number = 5, "err.number = " & err.number) + err.raise -3000000000 + call ok(err.number = 6, "err.number = " & err.number) + err.raise -1 + call ok(err.number = -1, "err.number = " & err.number) + err.raise -20 + call ok(err.number = -20, "err.number = " & err.number) + err.raise -&hfff0 + call ok(err.number = 16, "err.number = " & err.number) + err.raise -&h8000 + call ok(err.number = 32768, "err.number = " & err.number) err.clear call ok(getVT(err.source) = "VT_BSTR", "err.source = " & err.source)

1 0

Zebediah Figura : d3d11: Use wined3d depth/stencil state objects.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 5860dd52bc82ff62c4c431bc7d06160b4dcfbd79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5860dd52bc82ff62c4c431bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:12 2020 -0500 d3d11: Use wined3d depth/stencil state objects. 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/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 23 ++++++++++---- dlls/d3d11/state.c | 75 +++++++++++++++++++++++++++++----------------- 3 files changed, 66 insertions(+), 34 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cb2b9c3aed..3248285fcd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -440,6 +440,7 @@ struct d3d_depthstencil_state LONG refcount; struct wined3d_private_store private_store; + struct wined3d_depth_stencil_state *wined3d_state; D3D11_DEPTH_STENCIL_DESC desc; struct wine_rb_entry entry; ID3D11Device2 *device; @@ -549,7 +550,6 @@ struct d3d_device struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - struct d3d_depthstencil_state *depth_stencil_state; UINT stencil_ref; }; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 2a68e02585..055e243a43 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -737,6 +737,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); const D3D11_DEPTH_STENCILOP_DESC *front, *back; + struct d3d_depthstencil_state *state_impl; const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", @@ -744,14 +745,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 wined3d_mutex_lock(); device->stencil_ref = stencil_ref; - if (!(device->depth_stencil_state = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) + if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { + wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL); set_default_depth_stencil_state(device->wined3d_device); wined3d_mutex_unlock(); return; } - desc = &device->depth_stencil_state->desc; + wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state); + desc = &state_impl->desc; front = &desc->FrontFace; back = &desc->BackFace; @@ -1904,14 +1907,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct wined3d_depth_stencil_state *wined3d_state; + struct d3d_depthstencil_state *state_impl; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); - if ((*depth_stencil_state = device->depth_stencil_state - ? &device->depth_stencil_state->ID3D11DepthStencilState_iface : NULL)) - ID3D11DepthStencilState_AddRef(*depth_stencil_state); + wined3d_mutex_lock(); + if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device))) + { + state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); + ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); + } + else + { + *depth_stencil_state = NULL; + } *stencil_ref = device->stencil_ref; + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 32ef44091c..5d4c352659 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -493,13 +493,15 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_AddRef(ID3D11DepthStenci TRACE("%p increasing refcount to %u.\n", state, refcount); - return refcount; -} + if (refcount == 1) + { + ID3D11Device2_AddRef(state->device); + wined3d_mutex_lock(); + wined3d_depth_stencil_state_incref(state->wined3d_state); + wined3d_mutex_unlock(); + } -static void d3d_depthstencil_state_cleanup(struct d3d_depthstencil_state *state) -{ - wined3d_private_store_cleanup(&state->private_store); - ID3D11Device2_Release(state->device); + return refcount; } static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStencilState *iface) @@ -511,12 +513,12 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc if (!refcount) { - struct d3d_device *device = impl_from_ID3D11Device2(state->device); + ID3D11Device2 *device = state->device; + wined3d_mutex_lock(); - wine_rb_remove(&device->depthstencil_states, &state->entry); - d3d_depthstencil_state_cleanup(state); + wined3d_depth_stencil_state_decref(state->wined3d_state); wined3d_mutex_unlock(); - heap_free(state); + ID3D11Device2_Release(device); } return refcount; @@ -695,23 +697,25 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl = d3d10_depthstencil_state_GetDesc, }; -static HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, - const D3D11_DEPTH_STENCIL_DESC *desc) +static void STDMETHODCALLTYPE d3d_depthstencil_state_wined3d_object_destroyed(void *parent) { - state->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; - state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; - state->refcount = 1; - wined3d_private_store_init(&state->private_store); - state->desc = *desc; - - ID3D11Device2_AddRef(state->device = &device->ID3D11Device2_iface); + struct d3d_depthstencil_state *state = parent; + struct d3d_device *device = impl_from_ID3D11Device2(state->device); - return S_OK; + wine_rb_remove(&device->depthstencil_states, &state->entry); + wined3d_private_store_cleanup(&state->private_store); + heap_free(parent); } +static const struct wined3d_parent_ops d3d_depthstencil_state_wined3d_parent_ops = +{ + d3d_depthstencil_state_wined3d_object_destroyed, +}; + HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc, struct d3d_depthstencil_state **state) { + struct wined3d_depth_stencil_state_desc wined3d_desc; struct d3d_depthstencil_state *object; D3D11_DEPTH_STENCIL_DESC tmp_desc; struct wine_rb_entry *entry; @@ -775,25 +779,40 @@ HRESULT d3d_depthstencil_state_create(struct d3d_device *device, const D3D11_DEP return E_OUTOFMEMORY; } - if (FAILED(hr = d3d_depthstencil_state_init(object, device, &tmp_desc))) + object->ID3D11DepthStencilState_iface.lpVtbl = &d3d11_depthstencil_state_vtbl; + object->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl; + object->refcount = 1; + wined3d_private_store_init(&object->private_store); + object->desc = tmp_desc; + + if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) { - WARN("Failed to initialize depthstencil state, hr %#x.\n", hr); + ERR("Failed to insert depth/stencil state entry.\n"); + wined3d_private_store_cleanup(&object->private_store); heap_free(object); wined3d_mutex_unlock(); - return hr; + return E_FAIL; } - if (wine_rb_put(&device->depthstencil_states, &tmp_desc, &object->entry) == -1) + wined3d_desc.depth = desc->DepthEnable; + + /* We cannot fail after creating a wined3d_depth_stencil_state object. It + * would lead to double free. */ + if (FAILED(hr = wined3d_depth_stencil_state_create(device->wined3d_device, &wined3d_desc, + object, &d3d_depthstencil_state_wined3d_parent_ops, &object->wined3d_state))) { - ERR("Failed to insert depthstencil state entry.\n"); - d3d_depthstencil_state_cleanup(object); + WARN("Failed to create wined3d depth/stencil state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&object->private_store); + wine_rb_remove(&device->depthstencil_states, &object->entry); heap_free(object); wined3d_mutex_unlock(); - return E_FAIL; + return hr; } wined3d_mutex_unlock(); - TRACE("Created depthstencil state %p.\n", object); + ID3D11Device2_AddRef(object->device = &device->ID3D11Device2_iface); + + TRACE("Created depth/stencil state %p.\n", object); *state = object; return S_OK;

1 0

Zebediah Figura : wined3d: Introduce a depth/stencil state object.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 2612381273f47a6810cd440832fee02ecf04078e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2612381273f47a6810cd4408… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:11 2020 -0500 wined3d: Introduce a depth/stencil state object. 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/adapter_vk.c | 1 + dlls/wined3d/cs.c | 29 ++++++++++++++ dlls/wined3d/device.c | 53 +++++++++++++++++++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/state.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 7 ++++ dlls/wined3d/wined3d_private.h | 22 ++++++++++- include/wine/wined3d.h | 17 ++++++++ 8 files changed, 218 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2612381273f47a6810cd…

1 0

Gijs Vermeulen : dwmapi: Implement DwmIsCompositionEnabled.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 53375d0f7a32b8b95d8c717356b7223c6d68b262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53375d0f7a32b8b95d8c7173… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Sep 22 17:56:37 2020 +0200 dwmapi: Implement DwmIsCompositionEnabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44055 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8408a2efed..eb11ecb6b7 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -51,19 +51,20 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) */ HRESULT WINAPI DwmIsCompositionEnabled(BOOL *enabled) { - static int once; - if (!once) - { - FIXME("%p\n", enabled); - once = 1; - } - else - TRACE("%p\n", enabled); + OSVERSIONINFOW version; + + TRACE("%p\n", enabled); if (!enabled) return E_INVALIDARG; - *enabled = FALSE; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW); + + if (!GetVersionExW(&version)) + *enabled = FALSE; + else + *enabled = (version.dwMajorVersion > 6 || (version.dwMajorVersion == 6 && version.dwMinorVersion >= 3)); + return S_OK; }

1 0

Ziqing Hui : kernel32/tests: Add more tests for UpdateResource.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: a9d73e97f2e42d30fe9c87bf5cc09f8af28bddbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9d73e97f2e42d30fe9c87bf… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 16 15:20:01 2020 +0800 kernel32/tests: Add more tests for UpdateResource. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/resource.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index cd3921426b..acb95249d8 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -201,6 +201,7 @@ static int build_exe( const sec_build* sec_descr ) opt->SectionAlignment = page_size; opt->FileAlignment = page_size; + opt->NumberOfRvaAndSizes = IMAGE_FILE_RESOURCE_DIRECTORY + 1; opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].VirtualAddress = rva_rsrc_start; opt->DataDirectory[IMAGE_FILE_RESOURCE_DIRECTORY].Size = page_size; @@ -357,6 +358,39 @@ static void update_resources_bigdata( void ) ok( r, "EndUpdateResource failed\n"); } +static void update_resources_name( void ) +{ + char foo[] = "resource data", res_name[] = "name", res_type[] = "type"; + HANDLE res = NULL; + HMODULE module; + HRSRC rsrc; + BOOL ret; + + res = BeginUpdateResourceA( filename, TRUE ); + ok( res != NULL, "BeginUpdateResource failed: %u\n", GetLastError() ); + if ( !res ) return; + + ret = UpdateResourceA( res, res_type, res_name, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), foo, sizeof(foo) ); + ok( ret == TRUE, "UpdateResource failed: %u\n", GetLastError() ); + + ret = EndUpdateResourceA( res, FALSE ); + ok( ret, "EndUpdateResource failed: %u\n", GetLastError() ); + if ( !ret ) return; + + module = LoadLibraryExA( filename, NULL, LOAD_LIBRARY_AS_DATAFILE ); + ok( module != NULL, "LoadLibraryEx failed: %u\n", GetLastError() ); + if ( !module ) return; + + rsrc = FindResourceA( module, res_name, res_type ); + todo_wine + ok( rsrc != NULL || + broken( GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND ) /* win2008 */, + "FindResource failed: %u\n", GetLastError() ); + + ret = FreeLibrary(module); + ok( ret, "FreeLibrary failed: %u\n", GetLastError() ); +} + static void check_exe( const sec_verify *verify ) { int i; @@ -515,6 +549,7 @@ START_TEST(resource) check_exe( &sec->chk_version ); update_resources_bigdata(); check_exe( &sec->chk_bigdata ); + update_resources_name(); DeleteFileA( filename ); } test_find_resource();

1 0

Dmitry Timoshkov : crypt32: Fix conversion of CRYPT_KEY_PROV_INFO between store and certificate property.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 7f8f424f38717d6a26a2b55e2ea7582a98dbc419 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f8f424f38717d6a26a2b55e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 15 19:00:11 2020 +0300 crypt32: Fix conversion of CRYPT_KEY_PROV_INFO between store and certificate property. Store uses relative offsets while certificate property uses pointers. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/cert.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 13d8df9258..ef871155b9 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -566,7 +566,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszContainerName) { - info.pwszContainerName = (LPWSTR)p; + info.pwszContainerName = (LPWSTR)((BYTE *)store + store->pwszContainerName); p += (lstrlenW(info.pwszContainerName) + 1) * sizeof(WCHAR); } else @@ -574,7 +574,7 @@ void CRYPT_FixKeyProvInfoPointers(PCRYPT_KEY_PROV_INFO buf) if (store->pwszProvName) { - info.pwszProvName = (LPWSTR)p; + info.pwszProvName = (LPWSTR)((BYTE *)store + store->pwszProvName); p += (lstrlenW(info.pwszProvName) + 1) * sizeof(WCHAR); } else @@ -705,6 +705,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY to->dwProvType = from->dwProvType; to->dwFlags = from->dwFlags; to->cProvParam = from->cProvParam; + to->rgProvParam = 0; to->dwKeySpec = from->dwKeySpec; for (i = 0; i < to->cProvParam; i++) @@ -713,6 +714,7 @@ static void CRYPT_CopyKeyProvInfo(store_CRYPT_KEY_PROV_INFO *to, const CRYPT_KEY p += sizeof(*param); param->dwParam = from->rgProvParam[i].dwParam; + param->pbData = 0; param->cbData = from->rgProvParam[i].cbData; param->dwFlags = from->rgProvParam[i].dwFlags; memcpy(p, from->rgProvParam[i].pbData, from->rgProvParam[i].cbData);

1 0

Zebediah Figura : wined3d: Fully move the depth buffer enable state to wined3d_depth_stencil_state.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 1acc410b10e2689850ec9537d1a419615ad91d9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1acc410b10e2689850ec9537… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:43:13 2020 -0500 wined3d: Fully move the depth buffer enable state to wined3d_depth_stencil_state. 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/d3d11/device.c | 2 -- dlls/wined3d/adapter_vk.c | 31 ++++++++++++++-------------- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/context_vk.c | 13 ++++++++++-- dlls/wined3d/cs.c | 2 +- dlls/wined3d/device.c | 46 +++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/directx.c | 1 - dlls/wined3d/state.c | 39 +---------------------------------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 10 files changed, 78 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1acc410b10e2689850ec…

1 0

Alexandre Julliard : include: Also define gethostname for msvcrt builds.
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 4b96d1c6802d0acedcf5da8355c1ca40321a6aea URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b96d1c6802d0acedcf5da83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 12:41:50 2020 +0200 include: Also define gethostname for msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winsock.h b/include/winsock.h index a8bb35a4c4..cafac1a172 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -1053,7 +1053,7 @@ int WINAPI WS(setsockopt)(SOCKET,int,int,const char*,int); int WINAPI WS(shutdown)(SOCKET,int); SOCKET WINAPI WS(socket)(int,int,int); -#if defined(__MINGW32__) || defined (_MSC_VER) +#if defined(__MINGW32__) || defined (_MSC_VER) || defined(__WINE_USE_MSVCRT) /* gethostname is not defined on Unix because of conflicts with unistd.h */ int WINAPI WS(gethostname)(char*,int); #endif

1 0

Zebediah Figura : winegstreamer: Don't set the buffer offset in request_buffer_src().
by Alexandre Julliard Sept. 25, 2020

Sept. 25, 2020

Module: wine Branch: master Commit: 622f2ce9915f1089f8e4550d6dbcfb6fb25289a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=622f2ce9915f1089f8e4550d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 24 22:22:54 2020 -0500 winegstreamer: Don't set the buffer offset in request_buffer_src(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 724ac8fd25..9a9fe01936 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -906,7 +906,6 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 return GST_FLOW_ERROR; } - GST_BUFFER_OFFSET(*buf) = ofs; return GST_FLOW_OK; }

1 0