March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Send sub-resource copy calls through the command stream.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 95abd3c924c6486a26ccc647ad560f85f6281503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95abd3c924c6486a26ccc647a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:03 2017 +0100 wined3d: Send sub-resource copy calls through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 41 +++++++++++----- dlls/wined3d/device.c | 132 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 113 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95abd3c924c6486a26ccc…

1 0

Henri Verbeet : wined3d: Send resource copy calls through the command stream.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 0cdae5686464d07140cf2cfc63ee1b1100e7bc26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cdae5686464d07140cf2cfc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 8 10:53:04 2017 +0100 wined3d: Send resource copy calls through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 43a30c8..34421a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3819,9 +3819,8 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, struct wined3d_resource *dst_resource, struct wined3d_resource *src_resource) { struct wined3d_texture *dst_texture, *src_texture; - RECT dst_rect, src_rect; + struct wined3d_box box; unsigned int i, j; - HRESULT hr; TRACE("device %p, dst_resource %p, src_resource %p.\n", device, dst_resource, src_resource); @@ -3859,10 +3858,15 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, if (dst_resource->type == WINED3D_RTYPE_BUFFER) { - if (FAILED(hr = wined3d_buffer_copy(buffer_from_resource(dst_resource), 0, - buffer_from_resource(src_resource), 0, - dst_resource->size))) - ERR("Failed to copy buffer, hr %#x.\n", hr); + box.left = 0; + box.top = 0; + box.right = src_resource->size; + box.bottom = 1; + box.front = 0; + box.back = 1; + + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, 0, &box, + src_resource, 0, &box, 0, NULL, WINED3D_TEXF_POINT); return; } @@ -3886,19 +3890,19 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, for (i = 0; i < dst_texture->level_count; ++i) { - SetRect(&dst_rect, 0, 0, - wined3d_texture_get_level_width(dst_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); - SetRect(&src_rect, 0, 0, - wined3d_texture_get_level_width(src_texture, i), - wined3d_texture_get_level_height(dst_texture, i)); + box.left = 0; + box.top = 0; + box.right = wined3d_texture_get_level_width(dst_texture, i); + box.bottom = wined3d_texture_get_level_height(dst_texture, i); + box.front = 0; + box.back = wined3d_texture_get_level_depth(dst_texture, i); + for (j = 0; j < dst_texture->layer_count; ++j) { unsigned int idx = j * dst_texture->level_count + i; - if (FAILED(hr = wined3d_texture_blt(dst_texture, idx, &dst_rect, - src_texture, idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) - ERR("Failed to blit, sub-resource %u, hr %#x.\n", idx, hr); + wined3d_cs_emit_blt_sub_resource(device->cs, dst_resource, idx, &box, + src_resource, idx, &box, 0, NULL, WINED3D_TEXF_POINT); } } }

1 0

Nikolay Sivov : xmllite/reader: Return local element names from the stack, instead of input buffer.
by Alexandre Julliard March 8, 2017

March 8, 2017

Module: wine Branch: master Commit: 3ae1043fc1ab55f0c52d32ce7f23892b87664f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae1043fc1ab55f0c52d32ce7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:10 2017 +0300 xmllite/reader: Return local element names from the stack, instead of input buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 37 +++++++++++++++++++++++++++++++------ dlls/xmllite/tests/reader.c | 12 +++++++++++- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 36eba37..9c7d0f1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2260,7 +2260,7 @@ static HRESULT reader_parse_element(xmlreader *reader) static HRESULT reader_parse_endtag(xmlreader *reader) { strval prefix, local, qname; - struct element *elem; + struct element *element; HRESULT hr; /* skip '</' */ @@ -2278,12 +2278,12 @@ static HRESULT reader_parse_endtag(xmlreader *reader) /* Element stack should never be empty at this point, cause we shouldn't get to content parsing if it's empty. */ - elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); - if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; + element = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + if (!strval_eq(reader, &element->qname, &qname)) return WC_E_ELEMENTMATCH; reader->nodetype = XmlNodeType_EndElement; + reader->is_empty_element = FALSE; reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); return S_OK; @@ -3031,10 +3031,35 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; + UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); - *name = This->strvalues[StringValue_LocalName].str; - if (len) *len = This->strvalues[StringValue_LocalName].len; + + if (!len) + len = &length; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Element: + case XmlNodeType_EndElement: + /* empty elements are not added to the stack */ + if (!This->is_empty_element) + { + struct element *element; + + element = LIST_ENTRY(list_head(&This->elements), struct element, entry); + *name = element->localname.str; + *len = element->localname.len; + break; + } + /* fallthrough */ + default: + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + break; + } + return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 7632d63..08905d0 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2148,6 +2148,7 @@ static void test_namespaceuri(void) while (IXmlReader_Read(reader, &type) == S_OK) { const WCHAR *uri, *local; WCHAR *uriW; + UINT length; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2158,8 +2159,17 @@ static void test_namespaceuri(void) type == XmlNodeType_EndElement || type == XmlNodeType_XmlDeclaration, "Unexpected node type %d.\n", type); - hr = IXmlReader_GetLocalName(reader, &local, NULL); + local = NULL; + length = 0; + hr = IXmlReader_GetLocalName(reader, &local, &length); ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(local != NULL, "Unexpected NULL local name pointer\n"); + + if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) + { + ok(*local != 0, "Unexpected empty local name\n"); + ok(length > 0, "Unexpected local name length\n"); + } uri = NULL; hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL);

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_sampler() helper function.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 287c1851731070b5b6b2e2fe6f0ae9e48db7aff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=287c1851731070b5b6b2e2fe6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:22 2017 +0100 wined3d: Introduce wined3d_device_get_sampler() helper function. 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/wined3d/device.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d88a2ee..cb68f3c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2258,17 +2258,23 @@ void CDECL wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx, sampler); } -struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +static struct wined3d_sampler *wined3d_device_get_sampler(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) { WARN("Invalid sampler index %u.\n", idx); return NULL; } - return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.sampler[shader_type][idx]; +} + +struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_VERTEX, idx); } HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, @@ -2483,13 +2489,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_ps_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_PIXEL, idx); } HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -2700,13 +2700,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_gs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_compute_shader(struct wined3d_device *device, struct wined3d_shader *shader) @@ -2775,13 +2769,7 @@ struct wined3d_sampler * CDECL wined3d_device_get_cs_sampler(const struct wined3 { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SAMPLER_OBJECTS) - { - WARN("Invalid sampler index %u.\n", idx); - return NULL; - } - - return device->state.sampler[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetSamplers().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 1170a04a2bcff32c39d811304aa006ae9a6d19bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1170a04a2bcff32c39d811304… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:19 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetSamplers(). 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5ebe8ff..336692e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2048,8 +2048,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_cs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Make sure that "tgsm_count" is not decreased while adding TGSM declarations.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: d4443bdc2974d9933daf2a94a99231d14d8269e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4443bdc2974d9933daf2a94a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:23 2017 +0100 wined3d: Make sure that "tgsm_count" is not decreased while adding TGSM declarations. Suggested by Sebastian Lackner. 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/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f867766..7186fdf 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -884,7 +884,7 @@ static HRESULT shader_reg_maps_add_tgsm(struct wined3d_shader_reg_maps *reg_maps register_idx + 1, sizeof(*reg_maps->tgsm))) return E_OUTOFMEMORY; - reg_maps->tgsm_count = register_idx + 1; + reg_maps->tgsm_count = max(register_idx + 1, reg_maps->tgsm_count); tgsm = &reg_maps->tgsm[register_idx]; tgsm->size = size; tgsm->stride = stride;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSGetShaderResources().
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 3fe9488812b995c7a9c55af4ce50f4a4a324319a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe9488812b995c7a9c55af4c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:17 2017 +0100 d3d11: Implement d3d11_immediate_context_CSGetShaderResources(). 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/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 43e61c0..5ebe8ff 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1990,7 +1990,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_cs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + ID3D11ShaderResourceView_AddRef(views[i] = &view_impl->ID3D11ShaderResourceView_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSGetUnorderedAccessViews(ID3D11DeviceContext *iface,

1 0

Andrew Wesie : ntdll: Save rdi and rsi in raise_func_trampoline.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 9eecacbeb1561218d4870c83f89a233cabbf7e0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eecacbeb1561218d4870c83f… Author: Andrew Wesie <awesie(a)gmail.com> Date: Tue Mar 7 19:11:11 2017 +0100 ntdll: Save rdi and rsi in raise_func_trampoline. Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index f33fe4c..61bb2dd 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2066,9 +2066,11 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); __ASM_GLOBAL_FUNC( raise_func_trampoline, __ASM_CFI(".cfi_signal_frame\n\t") - __ASM_CFI(".cfi_def_cfa %rbp,144\n\t") /* red zone + rip + rbp */ - __ASM_CFI(".cfi_rel_offset %rip,8\n\t") - __ASM_CFI(".cfi_rel_offset %rbp,0\n\t") + __ASM_CFI(".cfi_def_cfa %rbp,160\n\t") /* red zone + rip + rbp + rdi + rsi */ + __ASM_CFI(".cfi_rel_offset %rip,24\n\t") + __ASM_CFI(".cfi_rel_offset %rbp,16\n\t") + __ASM_CFI(".cfi_rel_offset %rdi,8\n\t") + __ASM_CFI(".cfi_rel_offset %rsi,0\n\t") "call *%rdx\n\t" "int $3") @@ -2085,6 +2087,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun { CONTEXT context; EXCEPTION_RECORD rec; + ULONG64 rsi; + ULONG64 rdi; ULONG64 rbp; ULONG64 rip; ULONG64 red_zone[16]; @@ -2154,6 +2158,8 @@ static EXCEPTION_RECORD *setup_exception( ucontext_t *sigcontext, raise_func fun rsp_ptr = (ULONG64 *)RSP_sig(sigcontext) - 16; *(--rsp_ptr) = RIP_sig(sigcontext); *(--rsp_ptr) = RBP_sig(sigcontext); + *(--rsp_ptr) = RDI_sig(sigcontext); + *(--rsp_ptr) = RSI_sig(sigcontext); /* now modify the sigcontext to return to the raise function */ RIP_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0

Sebastian Lackner : ntdll: Implement FileAccessInformation class in NtQueryInformationFile.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 2c733057e9e7e3b482fd52c86506dcd53949bf22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c733057e9e7e3b482fd52c86… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Mar 7 17:01:52 2017 +0100 ntdll: Implement FileAccessInformation class in NtQueryInformationFile. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 13 +++++++++++++ dlls/ntdll/tests/file.c | 24 ++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e2cfe7f..c2678d5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2446,6 +2446,19 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->EaSize = 0; } break; + case FileAccessInformation: + { + FILE_ACCESS_INFORMATION *info = ptr; + SERVER_START_REQ( get_object_info ) + { + req->handle = wine_server_obj_handle( hFile ); + io->u.Status = wine_server_call( req ); + if (io->u.Status == STATUS_SUCCESS) + info->AccessFlags = reply->access; + } + SERVER_END_REQ; + } + break; case FileEndOfFileInformation: if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 09bf688..091142a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3433,6 +3433,29 @@ static void test_file_id_information(void) CloseHandle( h ); } +static void test_file_access_information(void) +{ + FILE_ACCESS_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE h; + + if (!(h = create_temp_file(0))) return; + + status = pNtQueryInformationFile( h, &io, &info, sizeof(info) - 1, FileAccessInformation ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + + status = pNtQueryInformationFile( (HANDLE)0xdeadbeef, &io, &info, sizeof(info), FileAccessInformation ); + ok( status == STATUS_INVALID_HANDLE, "expected STATUS_INVALID_HANDLE, got %08x\n", status ); + + memset(&info, 0x11, sizeof(info)); + status = pNtQueryInformationFile( h, &io, &info, sizeof(info), FileAccessInformation ); + ok( status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status ); + ok( info.AccessFlags == 0x13019f, "got %08x\n", info.AccessFlags ); + + CloseHandle( h ); +} + static void test_query_volume_information_file(void) { NTSTATUS status; @@ -4506,6 +4529,7 @@ START_TEST(file) test_file_disposition_information(); test_file_completion_information(); test_file_id_information(); + test_file_access_information(); test_query_volume_information_file(); test_query_attribute_information_file(); test_ioctl();

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_constant_buffer() helper function.
by Alexandre Julliard March 7, 2017

March 7, 2017

Module: wine Branch: master Commit: 9265d5515153bf7c7e02e2b2dd6537a44cd4c2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9265d5515153bf7c7e02e2b2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:20 2017 +0100 wined3d: Introduce wined3d_device_get_constant_buffer() helper function. 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/wined3d/device.c | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d8ac697..5cdf402 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2156,17 +2156,23 @@ void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, str wined3d_device_set_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx, buffer); } -struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +static struct wined3d_buffer *wined3d_device_get_constant_buffer(const struct wined3d_device *device, + enum wined3d_shader_type shader_type, unsigned int idx) { - TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) { WARN("Invalid constant buffer index %u.\n", idx); return NULL; } - return device->state.cb[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.cb[shader_type][idx]; +} + +struct wined3d_buffer * CDECL wined3d_device_get_vs_cb(const struct wined3d_device *device, UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_VERTEX, idx); } static void wined3d_device_set_shader_resource_view(struct wined3d_device *device, @@ -2441,13 +2447,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_ps_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_PIXEL, idx); } void CDECL wined3d_device_set_ps_resource_view(struct wined3d_device *device, @@ -2670,13 +2670,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_gs_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_gs_resource_view(struct wined3d_device *device, @@ -2756,13 +2750,7 @@ struct wined3d_buffer * CDECL wined3d_device_get_cs_cb(const struct wined3d_devi { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_CONSTANT_BUFFERS) - { - WARN("Invalid constant buffer index %u.\n", idx); - return NULL; - } - - return device->state.cb[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_constant_buffer(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device,

1 0