February 2018 - Wine-Devel - list.winehq.org

[PATCH] ntdll: Support TokenLogonSid in NtQueryInformationToken.
by Alistair Leslie-Hughes Feb. 5, 2018

Feb. 5, 2018

Based off patch by Andrew Wesie. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/tests/security.c | 4 ++-- dlls/ntdll/nt.c | 21 +++++++++++++++++++++ server/token.c | 11 ++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 57889dc..bc14a80 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1843,11 +1843,11 @@ static void test_token_attr(void) todo_wine win_skip("TokenLogonSid not supported. Skipping tests\n"); else { - todo_wine ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + ok(!ret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); Groups = HeapAlloc(GetProcessHeap(), 0, Size); ret = GetTokenInformation(Token, TokenLogonSid, Groups, Size, &Size); - todo_wine ok(ret, + ok(ret, "GetTokenInformation(TokenLogonSid) failed with error %d\n", GetLastError()); if (ret) { diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 8938d5d..8995c36 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -552,6 +552,27 @@ NTSTATUS WINAPI NtQueryInformationToken( *(DWORD*)tokeninfo = 0; break; } + case TokenLogonSid: + SERVER_START_REQ( get_token_sid ) + { + TOKEN_GROUPS * groups = tokeninfo; + PSID sid = groups + 1; + DWORD sid_len = tokeninfolength < sizeof(TOKEN_GROUPS) ? 0 : tokeninfolength - sizeof(TOKEN_GROUPS); + + req->handle = wine_server_obj_handle( token ); + req->which_sid = tokeninfoclass; + wine_server_set_reply( req, sid, sid_len ); + status = wine_server_call( req ); + if (retlen) *retlen = reply->sid_len + sizeof(TOKEN_GROUPS); + if (status == STATUS_SUCCESS) + { + groups->GroupCount = 1; + groups->Groups[0].Sid = sid; + groups->Groups[0].Attributes = 0; + } + } + SERVER_END_REQ; + break; default: { ERR("Unhandled Token Information class %d!\n", tokeninfoclass); diff --git a/server/token.c b/server/token.c index 532d7b7..8e93492 100644 --- a/server/token.c +++ b/server/token.c @@ -92,7 +92,13 @@ static const struct /* same fields as struct SID */ SID_IDENTIFIER_AUTHORITY IdentifierAuthority; DWORD SubAuthority[2]; } builtin_users_sid = { SID_REVISION, 2, { SECURITY_NT_AUTHORITY }, { SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_USERS } }; - +static const struct /* same fields as struct SID */ +{ + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + DWORD SubAuthority[SECURITY_LOGON_IDS_RID_COUNT]; +} builtin_logon_sid = { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, {SECURITY_NT_AUTHORITY}, {SECURITY_LOGON_IDS_RID, 0, 0} }; const PSID security_world_sid = (PSID)&world_sid; static const PSID security_local_sid = (PSID)&local_sid; static const PSID security_interactive_sid = (PSID)&interactive_sid; @@ -1436,6 +1442,9 @@ DECL_HANDLER(get_token_sid) } break; } + case TokenLogonSid: + sid = (const SID *)&builtin_logon_sid; + break; default: set_error( STATUS_INVALID_PARAMETER ); break; -- 1.9.1

1 0

[PATCH] testbot/web: Add the job's remarks as a tooltip on the activity page.
by Francois Gouget Feb. 5, 2018

Feb. 5, 2018

This allows getting a quick sense of what the task is about without having to change page or bloating the content of the table. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Activity.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 6ca3199a..13c77c68 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -228,7 +228,9 @@ EOF $Label .= "/64" if ($Bitness); } } - $Label = "<a href='/JobDetails.pl?Key=". $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No) ."'>$Label</a>"; + my $Key = $VMStatus->{job}->Id ."#k". ($VMStatus->{step}->No * 100 + $VMStatus->{task}->No); + my $Title = $self->escapeHTML($VMStatus->{job}->Remarks); + $Label = "<a href='/JobDetails.pl?Key=$Key' title='$Title'>$Label</a>"; } elsif ($VMStatus->{status} eq "dirty") { -- 2.15.1

1 0

[PATCH] testbot: Simplify computing the min and max activity values.
by Francois Gouget Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index 2c21d9fd..a2bd1b00 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -38,6 +38,17 @@ require Exporter; @EXPORT = qw(&GetActivity &GetStatistics); +sub _UpdateMin($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[1] < $_[0]); +} + +sub _UpdateMax($$) +{ + $_[0] = $_[1] if (!defined $_[0] or $_[0] < $_[1]); +} + + =pod =over 12 @@ -110,7 +121,7 @@ sub GetActivity($;$) start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; - $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); + _UpdateMin($MinId, $RecordGroup->Id); } if (!defined $MinId) { @@ -375,14 +386,8 @@ sub GetStatistics($) _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; - if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) - { - $GlobalStats->{start} = $Job->Submitted; - } - if (!exists $GlobalStats->{end} or $GlobalStats->{end} < $Job->Ended) - { - $GlobalStats->{end} = $Job->Ended; - } + _UpdateMin($GlobalStats->{start}, $Job->Submitted); + _UpdateMax($GlobalStats->{end}, $Job->Ended); } } @@ -401,14 +406,8 @@ sub GetStatistics($) $GlobalStats->{"records.count"} = $Counters->{records}; foreach my $Group (@$Activity) { - if (!$VMsStats->{start} or $VMsStats->{start} > $Group->{start}) - { - $VMsStats->{start} = $Group->{start}; - } - if (!$VMsStats->{end} or $VMsStats->{end} < $Group->{end}) - { - $VMsStats->{end} = $Group->{end}; - } + _UpdateMin($VMsStats->{start}, $Group->{start}); + _UpdateMax($VMsStats->{end}, $Group->{end}); next if (!$Group->{statusvms}); my ($IsGroupBusy, %IsHostBusy); -- 2.15.1

1 0

[PATCH] wininet: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/internet.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 4cd1856bd6..498a79b080 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -24,6 +24,7 @@ #define _WINE_INTERNET_H_ #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #include <time.h> @@ -89,31 +90,11 @@ typedef struct BOOL is_valid_netconn(netconn_t *) DECLSPEC_HIDDEN; void close_netconn(netconn_t *) DECLSPEC_HIDDEN; -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

1 0

[PATCH] wer: Use the global HeapAlloc() wrappers
by Michael Stefaniuc Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wer/main.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/wer/main.c b/dlls/wer/main.c index da44aa7d0d..75a22a51d0 100644 --- a/dlls/wer/main.c +++ b/dlls/wer/main.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winreg.h" #include "werapi.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -56,20 +57,6 @@ static const WCHAR regpath_exclude[] = 'W','i','n','d','o','w','s',' ','E','r','r','o','r',' ','R','e','p','o','r','t','i','n','g','\\', 'E','x','c','l','u','d','e','d','A','p','p','l','i','c','a','t','i','o','n','s',0}; -/*********************************************************************** - * Memory allocation helper - */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); -- 2.14.3

1 0

[PATCH 5/5] dxgi: Use the global memory allocation helpers.
by Henri Verbeet Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/dxgi/adapter.c | 4 ++-- dlls/dxgi/device.c | 10 +++++----- dlls/dxgi/dxgi_main.c | 11 +++++------ dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/factory.c | 6 +++--- dlls/dxgi/output.c | 4 ++-- dlls/dxgi/surface.c | 2 +- dlls/dxgi/swapchain.c | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 64a18e6..ed2375a 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -73,7 +73,7 @@ static ULONG STDMETHODCALLTYPE dxgi_adapter_Release(IWineDXGIAdapter *iface) { wined3d_private_store_cleanup(&adapter->private_store); IDXGIFactory4_Release(&adapter->factory->IDXGIFactory4_iface); - HeapFree(GetProcessHeap(), 0, adapter); + heap_free(adapter); } return refcount; @@ -356,7 +356,7 @@ static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory HRESULT dxgi_adapter_create(struct dxgi_factory *factory, UINT ordinal, struct dxgi_adapter **adapter) { - if (!(*adapter = HeapAlloc(GetProcessHeap(), 0, sizeof(**adapter)))) + if (!(*adapter = heap_alloc(sizeof(**adapter)))) return E_OUTOFMEMORY; dxgi_adapter_init(*adapter, factory, ordinal); diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 6015bbe..b4f36dc 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -87,7 +87,7 @@ static ULONG STDMETHODCALLTYPE dxgi_device_Release(IWineDXGIDevice *iface) wined3d_mutex_unlock(); IWineDXGIAdapter_Release(device->adapter); wined3d_private_store_cleanup(&device->private_store); - HeapFree(GetProcessHeap(), 0, device); + heap_free(device); } return refcount; @@ -287,7 +287,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa TRACE("iface %p, wined3d_texture %p, usage %#x, shared_resource %p, outer %p, surface %p.\n", iface, wined3d_texture, usage, shared_resource, outer, surface); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI surface object memory\n"); return E_OUTOFMEMORY; @@ -296,7 +296,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_surface(IWineDXGIDevice *ifa if (FAILED(hr = dxgi_surface_init(object, (IDXGIDevice *)iface, outer, wined3d_texture))) { WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -316,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i TRACE("iface %p, desc %p, wined3d_swapchain %p.\n", iface, desc, wined3d_swapchain); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) { ERR("Failed to allocate DXGI swapchain object memory\n"); return E_OUTOFMEMORY; @@ -325,7 +325,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_create_swapchain(IWineDXGIDevice *i if (FAILED(hr = dxgi_swapchain_init(object, device, desc, implicit))) { WARN("Failed to initialize swapchain, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 36cf73b..df8761b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -35,7 +35,7 @@ static struct dxgi_main dxgi_main; static void dxgi_main_cleanup(void) { - HeapFree(GetProcessHeap(), 0, dxgi_main.device_layers); + heap_free(dxgi_main.device_layers); FreeLibrary(dxgi_main.d3d10core); } @@ -188,8 +188,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I device_size = d3d10_layer.get_size(d3d10_layer.id, &get_size_args, 0); device_size += sizeof(*dxgi_device); - dxgi_device = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, device_size); - if (!dxgi_device) + if (!(dxgi_device = heap_alloc_zero(device_size))) { ERR("Failed to allocate device memory.\n"); return E_OUTOFMEMORY; @@ -199,7 +198,7 @@ HRESULT WINAPI DXGID3D10CreateDevice(HMODULE d3d10core, IDXGIFactory *factory, I if (FAILED(hr)) { WARN("Failed to initialize device, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, dxgi_device); + heap_free(dxgi_device); *device = NULL; return hr; } @@ -220,9 +219,9 @@ HRESULT WINAPI DXGID3D10RegisterLayers(const struct dxgi_device_layer *layers, U wined3d_mutex_lock(); if (!dxgi_main.layer_count) - new_layers = HeapAlloc(GetProcessHeap(), 0, layer_count * sizeof(*new_layers)); + new_layers = heap_alloc(layer_count * sizeof(*new_layers)); else - new_layers = HeapReAlloc(GetProcessHeap(), 0, dxgi_main.device_layers, + new_layers = heap_realloc(dxgi_main.device_layers, (dxgi_main.layer_count + layer_count) * sizeof(*new_layers)); if (!new_layers) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index 19c880b..ed79ca2 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -20,6 +20,7 @@ #define __WINE_DXGI_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 832e2cb..50b7941 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_factory_Release(IDXGIFactory4 *iface) wined3d_decref(factory->wined3d); wined3d_mutex_unlock(); wined3d_private_store_cleanup(&factory->private_store); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -547,13 +547,13 @@ HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) struct dxgi_factory *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = dxgi_factory_init(object, extended))) { WARN("Failed to initialize factory, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c index 9659c85..2b168fb 100644 --- a/dlls/dxgi/output.c +++ b/dlls/dxgi/output.c @@ -81,7 +81,7 @@ static ULONG STDMETHODCALLTYPE dxgi_output_Release(IDXGIOutput4 *iface) { wined3d_private_store_cleanup(&output->private_store); IWineDXGIAdapter_Release(&output->adapter->IWineDXGIAdapter_iface); - HeapFree(GetProcessHeap(), 0, output); + heap_free(output); } return refcount; @@ -447,7 +447,7 @@ static void dxgi_output_init(struct dxgi_output *output, struct dxgi_adapter *ad HRESULT dxgi_output_create(struct dxgi_adapter *adapter, struct dxgi_output **output) { - if (!(*output = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**output)))) + if (!(*output = heap_alloc_zero(sizeof(**output)))) return E_OUTOFMEMORY; dxgi_output_init(*output, adapter); diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 36fc1e6..ad72a2c 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -74,7 +74,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) if (!refcount) { wined3d_private_store_cleanup(&surface->private_store); - HeapFree(GetProcessHeap(), 0, surface); + heap_free(surface); } return refcount; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e5d06c3..1f88d71 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -645,7 +645,7 @@ static void STDMETHODCALLTYPE dxgi_swapchain_wined3d_object_released(void *paren struct dxgi_swapchain *swapchain = parent; wined3d_private_store_cleanup(&swapchain->private_store); - HeapFree(GetProcessHeap(), 0, parent); + heap_free(parent); } static const struct wined3d_parent_ops dxgi_swapchain_wined3d_parent_ops = -- 2.1.4

1 0

[PATCH 4/5] d3d9: Use wined3d_buffer_create() in indexbuffer_init().
by Henri Verbeet Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 56a58bc..635483c 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -564,25 +564,25 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 3/5] d3d8: Use wined3d_buffer_create() in d3d8_device_prepare_index_buffer().
by Henri Verbeet Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7faf8e7..590ab45 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2196,15 +2196,22 @@ static HRESULT d3d8_device_prepare_index_buffer(struct d3d8_device *device, UINT if (device->index_buffer_size < min_size || !device->index_buffer) { UINT size = max(device->index_buffer_size * 2, min_size); + struct wined3d_buffer_desc desc; struct wined3d_buffer *buffer; TRACE("Growing index buffer to %u bytes\n", size); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, - WINED3D_POOL_DEFAULT, NULL, &d3d8_null_wined3d_parent_ops, &buffer); - if (FAILED(hr)) + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) { - ERR("(%p) wined3d_buffer_create_ib failed with hr = %08x\n", device, hr); + ERR("Failed to create index buffer, hr %#x.\n", hr); return hr; } -- 2.1.4

1 0

[PATCH 2/5] d3d8: Use wined3d_buffer_create() in indexbuffer_init().
by Henri Verbeet Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 43855f2..10ba302 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -565,25 +565,25 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { - enum wined3d_pool wined3d_pool; - DWORD wined3d_usage; + struct wined3d_buffer_desc desc; HRESULT hr; - wined3d_pool = pool; - wined3d_usage = usage & WINED3DUSAGE_MASK; + desc.byte_width = size; + desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) - { - wined3d_pool = WINED3D_POOL_SYSTEM_MEM; - wined3d_usage |= WINED3DUSAGE_SCRATCH; - } + desc.usage |= WINED3DUSAGE_SCRATCH; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = wined3daccess_from_d3dpool(pool); + desc.misc_flags = 0; + desc.structure_byte_stride = 0; buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, - buffer, &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create(device->wined3d_device, &desc, NULL, buffer, + &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { -- 2.1.4

1 0

[PATCH 1/5] ddraw: Use wined3d_buffer_create() in d3d_execute_buffer_execute().
by Henri Verbeet Feb. 5, 2018

Feb. 5, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/executebuffer.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index ea5a55c..6ce77e3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -124,13 +124,19 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (buffer->index_size < index_count) { - struct wined3d_buffer *new_buffer; unsigned int new_size = max(buffer->index_size * 2, index_count); + struct wined3d_buffer *new_buffer; + struct wined3d_buffer_desc desc; + + desc.byte_width = new_size * sizeof(*indices); + desc.usage = WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_STATICDECL; + desc.bind_flags = WINED3D_BIND_INDEX_BUFFER; + desc.access = WINED3D_RESOURCE_ACCESS_GPU; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; - hr = wined3d_buffer_create_ib(device->wined3d_device, new_size * sizeof(*indices), - WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_WRITEONLY, WINED3D_POOL_DEFAULT, - NULL, &ddraw_null_wined3d_parent_ops, &new_buffer); - if (FAILED(hr)) + if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, + NULL, NULL, &ddraw_null_wined3d_parent_ops, &new_buffer))) return hr; buffer->index_size = new_size; -- 2.1.4

1 0