wine-commits January 2018

wine-commits@winehq.org

2 participants
638 discussions

Lucian Poston : d2d1: Implement ID2D1Factory1.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 9d9fbc0e4adbaadf92d740cf588db412ea2f633d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9fbc0e4adbaadf92d740cf… Author: Lucian Poston <lucian.poston(a)gmail.com> Date: Mon Jan 22 15:58:45 2018 +0330 d2d1: Implement ID2D1Factory1. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/Makefile.in | 1 + include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 5 files changed, 279 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d9fbc0e4adbaadf92d7…

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetFullscreenDesc().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 05b11380e8fa3e11f8b8813f048e1aa1e820c459 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05b11380e8fa3e11f8b8813f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:55 2018 +0100 dxgi: Implement dxgi_swapchain_GetFullscreenDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 25 +++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fe7e5cc..8e7dccb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -465,9 +465,30 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_FULLSCREEN_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); + + desc->RefreshRate.Numerator = wined3d_desc.refresh_rate; + desc->RefreshRate.Denominator = 1; + desc->ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc->Windowed = wined3d_desc.windowed; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index ea10ff5..899a063 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; @@ -978,6 +979,12 @@ static void test_create_swapchain(void) "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetFullscreenDesc(swapchain1, &fullscreen_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(fullscreen_desc.Windowed == creation_desc.Windowed, + "Got unexpected windowed %#x.\n", fullscreen_desc.Windowed); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Józef Kucia : dxgi: Implement dxgi_swapchain_GetDesc1 ().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 0e4250c59581b2d6e893b6f4c3bbbe93eabd134f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e4250c59581b2d6e893b6f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:54 2018 +0100 dxgi: Implement dxgi_swapchain_GetDesc1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 32 ++++++++++++++++++++++++++++++-- dlls/dxgi/tests/device.c | 10 ++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ec9b2b4..fe7e5cc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -429,9 +429,37 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetLastPresentCount(IDXGISwapCha static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, DXGI_SWAP_CHAIN_DESC1 *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc wined3d_desc; - return E_NOTIMPL; + TRACE("iface %p, desc %p.\n", iface, desc); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return E_INVALIDARG; + } + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + FIXME("Ignoring Stereo, BufferUsage, Scaling, SwapEffect and AlphaMode.\n"); + + desc->Width = wined3d_desc.backbuffer_width; + desc->Height = wined3d_desc.backbuffer_height; + desc->Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); + desc->Stereo = FALSE; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, + wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferCount = wined3d_desc.backbuffer_count; + desc->Scaling = DXGI_SCALING_STRETCH; + desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; + desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetFullscreenDesc(IDXGISwapChain1 *iface, diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 18306db..ea10ff5 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -868,6 +868,7 @@ static void test_create_swapchain(void) struct swapchain_fullscreen_state initial_state, expected_state; unsigned int i, expected_width, expected_height; DXGI_SWAP_CHAIN_DESC creation_desc, result_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; IDXGIDevice *device, *bgra_device; ULONG refcount, expected_refcount; IUnknown *obj, *obj2, *parent; @@ -968,6 +969,15 @@ static void test_create_swapchain(void) "Failed to query IDXGISwapChain1 interface, hr %#x.\n", hr); if (SUCCEEDED(hr)) { + hr = IDXGISwapChain1_GetDesc1(swapchain1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain1_GetDesc1(swapchain1, &swapchain_desc); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!swapchain_desc.Stereo, "Got unexpected stereo %#x.\n", swapchain_desc.Stereo); + ok(swapchain_desc.Scaling == DXGI_SCALING_STRETCH, + "Got unexpected scaling %#x.\n", swapchain_desc.Scaling); + ok(swapchain_desc.AlphaMode == DXGI_ALPHA_MODE_IGNORE, + "Got unexpected alpha mode %#x.\n", swapchain_desc.AlphaMode); hr = IDXGISwapChain1_GetHwnd(swapchain1, &window); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(window == creation_desc.OutputWindow, "Got unexpected window %p.\n", window);

1 0

Józef Kucia : dxgi/tests: Zero swapchain descriptions.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 90db63ab2de48bb3869d6de66701ad88fc1c0ca4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90db63ab2de48bb3869d6de6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:53 2018 +0100 dxgi/tests: Zero swapchain descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 77b7cb7..18306db 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -2604,6 +2604,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, @@ -2668,6 +2669,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 640, @@ -2738,6 +2740,7 @@ static void test_swapchain_resize(void) ok(EqualRect(&r, &client_rect), "Got unexpected rect %s, expected %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&client_rect)); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == 320, @@ -2800,6 +2803,7 @@ static void test_swapchain_resize(void) hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); ok(SUCCEEDED(hr), "Failed to resize buffers, hr %#x.\n", hr); + memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); ok(SUCCEEDED(hr), "Failed to get swapchain desc, hr %#x.\n", hr); ok(swapchain_desc.BufferDesc.Width == client_rect.right - client_rect.left,

1 0

Józef Kucia : dxgi: Set BufferUsage in dxgi_swapchain_GetDesc().
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 6141647a52a32c5efb0322d388e12944068ecf63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6141647a52a32c5efb0322d3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:52 2018 +0100 dxgi: Set BufferUsage in dxgi_swapchain_GetDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/dxgi/swapchain.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 47c7c86..2b18110 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -189,7 +189,7 @@ static void test_create_device(void) "Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count); ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality); - todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, + ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, "Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage); ok(obtained_desc.BufferCount == swapchain_desc.BufferCount, "Got unexpected BufferCount %u.\n", obtained_desc.BufferCount); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dca2515..19e428c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1548,7 +1548,7 @@ static void test_create_device(void) "Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count); ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality); - todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, + ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage, "Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage); ok(obtained_desc.BufferCount == swapchain_desc.BufferCount, "Got unexpected BufferCount %u.\n", obtained_desc.BufferCount); diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index eca68c3..ec9b2b4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering, Scaling, BufferUsage and SwapEffect.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -295,6 +295,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed;

1 0

Józef Kucia : d3d11: Prefer D3D11 interfaces.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: bb5c90d9671a0b736ea74287e9ab2dd3382f4152 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb5c90d9671a0b736ea74287… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 22 14:11:51 2018 +0100 d3d11: Prefer D3D11 interfaces. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 20 ++++++++++---------- dlls/d3d11/texture.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e7fd3a7..a184b93 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -126,9 +126,9 @@ struct d3d_texture2d ID3D11Device *device; }; -static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) { - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); } HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b2a40b3..86778f3 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5767,8 +5767,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct d3d_texture2d *texture; - ID3D10Texture2D *texture_iface; - D3D10_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture_iface; + D3D11_TEXTURE2D_DESC desc; HRESULT hr; FIXME("device_parent %p, container_parent %p, wined3d_desc %p, texture flags %#x, " @@ -5784,32 +5784,32 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.Format = dxgi_format_from_wined3dformat(wined3d_desc->format); desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; - desc.Usage = D3D10_USAGE_DEFAULT; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; if (texture_flags & WINED3D_TEXTURE_CREATE_GET_DC) { - desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; texture_flags &= ~WINED3D_TEXTURE_CREATE_GET_DC; } if (texture_flags) FIXME("Unhandled flags %#x.\n", texture_flags); - if (FAILED(hr = d3d10_device_CreateTexture2D(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &desc, NULL, &texture_iface))) { - WARN("CreateTexture2D failed, returning %#x.\n", hr); + WARN("Failed to create 2D texture, hr %#x.\n", hr); return hr; } - texture = impl_from_ID3D10Texture2D(texture_iface); + texture = impl_from_ID3D11Texture2D(texture_iface); *wined3d_texture = texture->wined3d_texture; wined3d_texture_incref(*wined3d_texture); - ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); + ID3D11Texture2D_Release(&texture->ID3D11Texture2D_iface); return S_OK; } @@ -5823,7 +5823,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - if (FAILED(hr = d3d10_device_QueryInterface(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device_iface, &IID_IWineDXGIDevice, (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 17fb4b1..2644b52 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11Texture2D methods */ -static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); @@ -251,6 +246,11 @@ struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) /* IUnknown methods */ +static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D10Texture2D(iface);

1 0

Alexandre Julliard : ntdll: Move suspending a thread on startup back to the platform-specific files.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 9d911a5736e12fbafdfb4df9870dfb386dd8e888 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d911a5736e12fbafdfb4df9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:17:25 2018 +0100 ntdll: Move suspending a thread on startup back to the platform-specific files. This partially reverts f64d2688d20952fb0085deeba98c952fd8bf1497. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 3 ++- dlls/ntdll/signal_i386.c | 2 +- dlls/ntdll/signal_powerpc.c | 3 ++- dlls/ntdll/signal_x86_64.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fe02b6c..2b0fefc 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2963,14 +2963,12 @@ PIMAGE_NT_HEADERS WINAPI RtlImageNtHeader(HMODULE hModule) * Attach to all the loaded dlls. * If this is the first time, perform the full process initialization. */ -NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) +NTSTATUS attach_dlls( CONTEXT *context ) { NTSTATUS status; WINE_MODREF *wm; LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; - if (suspend) wait_suspend( context ); - pthread_sigmask( SIG_UNBLOCK, &server_block_set, NULL ); if (process_detaching) return STATUS_SUCCESS; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 32a385f..e32ea61 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -106,7 +106,7 @@ extern NTSTATUS validate_open_object_attributes( const OBJECT_ATTRIBUTES *attr ) /* module handling */ extern LIST_ENTRY tls_links DECLSPEC_HIDDEN; -extern NTSTATUS attach_dlls( CONTEXT *context, BOOL suspend ) DECLSPEC_HIDDEN; +extern NTSTATUS attach_dlls( CONTEXT *context ) DECLSPEC_HIDDEN; extern FARPROC RELAY_GetProcAddress( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, FARPROC proc, DWORD ordinal, const WCHAR *user ) DECLSPEC_HIDDEN; extern FARPROC SNOOP_GetProcAddress( HMODULE hmod, const IMAGE_EXPORT_DIRECTORY *exports, DWORD exp_size, diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 355817b..d60c2a9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1286,7 +1286,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; } diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 57ec13a..d6ec376 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1016,7 +1016,8 @@ static void thread_startup( void *param ) context.Sp = (DWORD_PTR)NtCurrentTeb()->Tib.StackBase; context.Pc = (DWORD_PTR)info->start; - attach_dlls( &context, info->suspend ); + if (info->suspend) wait_suspend( &context ); + attach_dlls( &context ); ((thread_start_func)context.Pc)( (LPTHREAD_START_ROUTINE)context.u.s.X0, (void *)context.u.s.X1 ); } diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 9bf36c1..8b91019 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -2996,7 +2996,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; } diff --git a/dlls/ntdll/signal_powerpc.c b/dlls/ntdll/signal_powerpc.c index 3182a13..d69c616 100644 --- a/dlls/ntdll/signal_powerpc.c +++ b/dlls/ntdll/signal_powerpc.c @@ -1178,7 +1178,8 @@ static void thread_startup( void *param ) context.Gpr4 = (DWORD)info->arg; context.Iar = (DWORD)info->start; - attach_dlls( &context, info->suspend ); + if (info->suspend) wait_suspend( &context ); + attach_dlls( &context ); ((thread_start_func)context.Iar)( (LPTHREAD_START_ROUTINE)context.Gpr3, (void *)context.Gpr4 ); } diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 946c0f1..abd3174 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -4169,7 +4169,7 @@ PCONTEXT DECLSPEC_HIDDEN attach_thread( LPTHREAD_START_ROUTINE entry, void *arg, init_thread_context( ctx, entry, arg, relay ); } ctx->ContextFlags = CONTEXT_FULL; - attach_dlls( ctx, FALSE ); + attach_dlls( ctx ); return ctx; }

1 0

Alexandre Julliard : ntdll: Store the context on the thread stack after the initial suspend.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: a83532d8dd5e99226dbccf0398083b052f033b9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a83532d8dd5e99226dbccf03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 15:14:56 2018 +0100 ntdll: Store the context on the thread stack after the initial suspend. The initial stack pointer may have been modified during suspend. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 22 ++++++++---- dlls/ntdll/signal_arm.c | 63 ++++++++++++++++++++++++-------- dlls/ntdll/signal_i386.c | 84 ++++++++++++++++++++++++++++++------------- dlls/ntdll/signal_x86_64.c | 68 ++++++++++++++++++++++++++--------- 4 files changed, 174 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a83532d8dd5e99226dbc…

1 0

Alexandre Julliard : ntdll: Implement RtlPushFrame, RtlPopFrame and RtlGetFrame.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: 3e80093410bee590fe3ffdf730e7ac2368f223a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e80093410bee590fe3ffdf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 16:25:22 2018 +0100 ntdll: Implement RtlPushFrame, RtlPopFrame and RtlGetFrame. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 6 +++--- dlls/ntdll/thread.c | 28 ++++++++++++++++++++++++++++ include/winternl.h | 3 +++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 097140f..035fad2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -649,7 +649,7 @@ @ stub RtlGetElementGenericTable # @ stub RtlGetElementGenericTableAvl # @ stub RtlGetFirstRange -# @ stub RtlGetFrame +@ stdcall RtlGetFrame() @ stdcall RtlGetFullPathName_U(wstr long ptr ptr) @ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr) @ stdcall RtlGetLastNtStatus() @@ -796,12 +796,12 @@ @ stdcall RtlOpenCurrentUser(long ptr) @ stdcall RtlPcToFileHeader(ptr ptr) @ stdcall RtlPinAtomInAtomTable(ptr long) -# @ stub RtlPopFrame +@ stdcall RtlPopFrame(ptr) @ stdcall RtlPrefixString(ptr ptr long) @ stdcall RtlPrefixUnicodeString(ptr ptr long) @ stub RtlPropertySetNameToGuid @ stub RtlProtectHeap -# @ stub RtlPushFrame +@ stdcall RtlPushFrame(ptr) @ stdcall RtlQueryAtomInAtomTable(ptr long ptr ptr ptr ptr) @ stdcall RtlQueryDepthSList(ptr) @ stdcall RtlQueryDynamicTimeZoneInformation(ptr) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 66beeb0..b36b265 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -804,6 +804,34 @@ NTSTATUS WINAPI NtQueueApcThread( HANDLE handle, PNTAPCFUNC func, ULONG_PTR arg1 } +/****************************************************************************** + * RtlPushFrame (NTDLL.@) + */ +void WINAPI RtlPushFrame( TEB_ACTIVE_FRAME *frame ) +{ + frame->Previous = NtCurrentTeb()->ActiveFrame; + NtCurrentTeb()->ActiveFrame = frame; +} + + +/****************************************************************************** + * RtlPopFrame (NTDLL.@) + */ +void WINAPI RtlPopFrame( TEB_ACTIVE_FRAME *frame ) +{ + NtCurrentTeb()->ActiveFrame = frame->Previous; +} + + +/****************************************************************************** + * RtlGetFrame (NTDLL.@) + */ +TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void) +{ + return NtCurrentTeb()->ActiveFrame; +} + + /*********************************************************************** * set_thread_context */ diff --git a/include/winternl.h b/include/winternl.h index 52b19c2..4c02873 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2592,6 +2592,7 @@ NTSYSAPI NTSTATUS WINAPI RtlGetControlSecurityDescriptor(PSECURITY_DESCRIPTOR, NTSYSAPI ULONG WINAPI RtlGetCurrentDirectory_U(ULONG, LPWSTR); NTSYSAPI PEB * WINAPI RtlGetCurrentPeb(void); NTSYSAPI NTSTATUS WINAPI RtlGetDaclSecurityDescriptor(PSECURITY_DESCRIPTOR,PBOOLEAN,PACL *,PBOOLEAN); +NTSYSAPI TEB_ACTIVE_FRAME * WINAPI RtlGetFrame(void); NTSYSAPI ULONG WINAPI RtlGetFullPathName_U(PCWSTR,ULONG,PWSTR,PWSTR*); NTSYSAPI NTSTATUS WINAPI RtlGetGroupSecurityDescriptor(PSECURITY_DESCRIPTOR,PSID *,PBOOLEAN); NTSYSAPI NTSTATUS WINAPI RtlGetLastNtStatus(void); @@ -2659,8 +2660,10 @@ NTSYSAPI NTSTATUS WINAPI RtlOemToUnicodeN(LPWSTR,DWORD,LPDWORD,LPCSTR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlOpenCurrentUser(ACCESS_MASK,PHANDLE); NTSYSAPI PVOID WINAPI RtlPcToFileHeader(PVOID,PVOID*); NTSYSAPI NTSTATUS WINAPI RtlPinAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM); +NTSYSAPI void WINAPI RtlPopFrame(TEB_ACTIVE_FRAME*); NTSYSAPI BOOLEAN WINAPI RtlPrefixString(const STRING*,const STRING*,BOOLEAN); NTSYSAPI BOOLEAN WINAPI RtlPrefixUnicodeString(const UNICODE_STRING*,const UNICODE_STRING*,BOOLEAN); +NTSYSAPI void WINAPI RtlPushFrame(TEB_ACTIVE_FRAME*); NTSYSAPI NTSTATUS WINAPI RtlQueryAtomInAtomTable(RTL_ATOM_TABLE,RTL_ATOM,ULONG*,ULONG*,WCHAR*,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlQueryDynamicTimeZoneInformation(RTL_DYNAMIC_TIME_ZONE_INFORMATION*); NTSYSAPI NTSTATUS WINAPI RtlQueryEnvironmentVariable_U(PWSTR,PUNICODE_STRING,PUNICODE_STRING);

1 0

Alexandre Julliard : include: Add a few more TEB structure definitions.
by Alexandre Julliard 22 Jan '18

22 Jan '18

Module: wine Branch: master Commit: bd4f6f45413a26122ef2ca90097da93e55a81f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd4f6f45413a26122ef2ca90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 22 16:24:50 2018 +0100 include: Add a few more TEB structure definitions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winternl.h | 45 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index 21353d8..52b19c2 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -230,6 +230,34 @@ typedef struct _ACTIVATION_CONTEXT_STACK LIST_ENTRY FrameListCache; } ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; +typedef struct _TEB_ACTIVE_FRAME_CONTEXT +{ + ULONG Flags; + const char *FrameName; +} TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT; + +typedef struct _TEB_ACTIVE_FRAME_CONTEXT_EX +{ + TEB_ACTIVE_FRAME_CONTEXT BasicContext; + const char *SourceLocation; +} TEB_ACTIVE_FRAME_CONTEXT_EX, *PTEB_ACTIVE_FRAME_CONTEXT_EX; + +typedef struct _TEB_ACTIVE_FRAME +{ + ULONG Flags; + struct _TEB_ACTIVE_FRAME *Previous; + TEB_ACTIVE_FRAME_CONTEXT *Context; +} TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME; + +typedef struct _TEB_ACTIVE_FRAME_EX +{ + TEB_ACTIVE_FRAME BasicFrame; + void *ExtensionIdentifier; +} TEB_ACTIVE_FRAME_EX, *PTEB_ACTIVE_FRAME_EX; + +#define TEB_ACTIVE_FRAME_CONTEXT_FLAG_EXTENDED 0x00000001 +#define TEB_ACTIVE_FRAME_FLAG_EXTENDED 0x00000001 + /*********************************************************************** * PEB data structure */ @@ -368,16 +396,17 @@ typedef struct _TEB ULONG WaitingOnLoaderLock; /* f84/1760 */ PVOID Reserved5[3]; /* f88/1768 */ PVOID *TlsExpansionSlots; /* f94/1780 */ - ULONG ImpersonationLocale; /* f98/1788 */ - ULONG IsImpersonating; /* f9c/178c */ - PVOID NlsCache; /* fa0/1790 */ - PVOID ShimData; /* fa4/1798 */ - ULONG HeapVirtualAffinity; /* fa8/17a0 */ - PVOID CurrentTransactionHandle; /* fac/17a8 */ - PVOID ActiveFrame; /* fb0/17b0 */ #ifdef _WIN64 - PVOID unknown[2]; /* 17b8 */ + PVOID DeallocationBStore; /* /1788 */ + PVOID BStoreLimit; /* /1790 */ #endif + ULONG ImpersonationLocale; /* f98/1798 */ + ULONG IsImpersonating; /* f9c/179c */ + PVOID NlsCache; /* fa0/17a0 */ + PVOID ShimData; /* fa4/17a8 */ + ULONG HeapVirtualAffinity; /* fa8/17b0 */ + PVOID CurrentTransactionHandle; /* fac/17b8 */ + TEB_ACTIVE_FRAME *ActiveFrame; /* fb0/17c0 */ PVOID *FlsSlots; /* fb4/17c8 */ } TEB, *PTEB;

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
64
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 January 2018