wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Nikolay Sivov : xmllite/reader: Return empty string for namespace uri for some nodes.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 3697bd9acfa4a3067105af7a1b6622a5781d5320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3697bd9acfa4a3067105af7a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:09 2017 +0300 xmllite/reader: Return empty string for namespace uri for some nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 +++++++++ dlls/xmllite/tests/reader.c | 23 ++++++++++++++++++++++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4ea0a2a..36eba37 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3011,6 +3011,15 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * } } break; + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_ProcessingInstruction: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + case XmlNodeType_XmlDeclaration: + *uri = emptyW; + *len = 0; + break; default: FIXME("Unhandled node type %d\n", nodetype); return E_NOTIMPL; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8c68610..7632d63 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2116,6 +2116,18 @@ static void test_namespaceuri(void) { "defns a", "ns r", "defns a" }}, { "<a><b><c/></b></a>", { "", "", "", "", "" }}, + { "<a>text</a>", + { "", "", "" }}, + { "<a>\r\n</a>", + { "", "", "" }}, + { "<a><![CDATA[data]]></a>", + { "", "", "" }}, + { "<?xml version=\"1.0\" ?><a/>", + { "", "" }}, + { "<a><?pi ?></a>", + { "", "", "" }}, + { "<a></a>", + { "", "", "" }}, }; IXmlReader *reader; XmlNodeType type; @@ -2137,13 +2149,22 @@ static void test_namespaceuri(void) const WCHAR *uri, *local; WCHAR *uriW; - ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement, "Unexpected node type %d.\n", type); + ok(type == XmlNodeType_Element || + type == XmlNodeType_Text || + type == XmlNodeType_CDATA || + type == XmlNodeType_ProcessingInstruction || + type == XmlNodeType_Comment || + type == XmlNodeType_Whitespace || + type == XmlNodeType_EndElement || + type == XmlNodeType_XmlDeclaration, "Unexpected node type %d.\n", type); hr = IXmlReader_GetLocalName(reader, &local, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + uri = NULL; hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + ok(uri != NULL, "Unexpected NULL uri pointer\n"); uriW = a2w(uri_tests[i].uri[j]); ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri));

1 0

Nikolay Sivov : xmllite/reader: Fix GetValue() for comments.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 63c489fab5c669b5a976c33ebcc9f2ee5eb1695a URL: http://source.winehq.org/git/wine.git/?a=commit;h=63c489fab5c669b5a976c33eb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:08 2017 +0300 xmllite/reader: Fix GetValue() for comments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/reader.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a52e928..4ea0a2a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3060,7 +3060,7 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, *value = NULL; - if ((reader->nodetype == XmlNodeType_Comment && !val->str) || is_reader_pending(reader)) + if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader)) { XmlNodeType type; HRESULT hr; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ebf4f5d..8c68610 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -954,18 +954,47 @@ static struct test_entry comment_tests[] = { static void test_read_comment(void) { + static const char *teststr = "<a>text</a>"; struct test_entry *test = comment_tests; + static const XmlNodeType types[] = + { + XmlNodeType_Element, + XmlNodeType_Text, + XmlNodeType_Comment, + XmlNodeType_EndElement, + }; + unsigned int i = 0; IXmlReader *reader; + XmlNodeType type; + IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); - while (test->xml) + stream = create_stream_on_data(teststr, strlen(teststr)); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + while (IXmlReader_Read(reader, &type) == S_OK) { - XmlNodeType type; - IStream *stream; + const WCHAR *value; + ok(type == types[i], "%d: unexpected node type %d\n", i, type); + + if (type == XmlNodeType_Text || type == XmlNodeType_Comment) + { + hr = IXmlReader_GetValue(reader, &value, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(*value != 0, "Expected node value\n"); + } + i++; + } + + IStream_Release(stream); + + while (test->xml) + { stream = create_stream_on_data(test->xml, strlen(test->xml)+1); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/tests: A couple of newline normalization tests for text nodes.
by Alexandre Julliard 08 Mar '17

08 Mar '17

Module: wine Branch: master Commit: 2d3ec1247d4695b65a7f91eda6a6cafd973af89b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3ec1247d4695b65a7f91eda… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 8 07:07:07 2017 +0300 xmllite/tests: A couple of newline normalization tests for text nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 60652ee..ebf4f5d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1724,6 +1724,8 @@ static void test_read_cdata(void) static struct test_entry text_tests[] = { { "<a>simple text</a>", "", "simple text", S_OK }, { "<a>text ]]> text</a>", "", "", WC_E_CDSECTEND }, + { "<a>\n \r\n \n\n text</a>", "", "\n \n \n\n text", S_OK, S_OK, TRUE }, + { "<a>\r \r\r\n \n\n text</a>", "", "\n \n\n \n\n text", S_OK, S_OK, TRUE }, { NULL } }; @@ -1748,17 +1750,13 @@ static void test_read_text(void) type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); - /* read one more to get to CDATA */ + /* read one more to get to text node */ if (type == XmlNodeType_Element) { type = XmlNodeType_None; hr = IXmlReader_Read(reader, &type); } - - if (test->hr_broken) - ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); - else - ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); if (hr == S_OK) { const WCHAR *str;

1 0

Andrew Wesie : ntdll: Save rdi and rsi in raise_func_trampoline.
by Alexandre Julliard 07 Mar '17

07 Mar '17

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 07 Mar '17

07 Mar '17

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

Mark Jansen : msi: Use the correct type when calculating feature cost.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: b53957df2a73ae51ca6ebc1e88bb9c4ed8b8d274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b53957df2a73ae51ca6ebc1e8… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Tue Mar 7 15:48:59 2017 +0100 msi: Use the correct type when calculating feature cost. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/install.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a0f69c9..0ccc8e3 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1189,11 +1189,11 @@ UINT WINAPI MsiGetFeatureCostA(MSIHANDLE hInstall, LPCSTR szFeature, static INT feature_cost( MSIFEATURE *feature ) { INT cost = 0; - MSICOMPONENT *comp; + ComponentList *cl; - LIST_FOR_EACH_ENTRY( comp, &feature->Components, MSICOMPONENT, entry ) + LIST_FOR_EACH_ENTRY( cl, &feature->Components, ComponentList, entry ) { - cost += comp->Cost; + cost += cl->component->Cost; } return cost; }

1 0

Józef Kucia : wined3d: Make sure that "tgsm_count" is not decreased while adding TGSM declarations.
by Alexandre Julliard 07 Mar '17

07 Mar '17

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 : wined3d: Introduce wined3d_device_get_sampler() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

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 : wined3d: Introduce wined3d_device_get_shader_resource_view() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

Module: wine Branch: master Commit: 3b42d471644f73e30c4ca62844648548988eb9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b42d471644f73e30c4ca6284… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 7 09:50:21 2017 +0100 wined3d: Introduce wined3d_device_get_shader_resource_view() 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 | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5cdf402..d88a2ee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2207,18 +2207,24 @@ void CDECL wined3d_device_set_vs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx, view); } -struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, - UINT idx) +static struct wined3d_shader_resource_view *wined3d_device_get_shader_resource_view( + 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_SHADER_RESOURCE_VIEWS) { WARN("Invalid view index %u.\n", idx); return NULL; } - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_VERTEX][idx]; + return device->state.shader_resource_view[shader_type][idx]; +} + +struct wined3d_shader_resource_view * CDECL wined3d_device_get_vs_resource_view(const struct wined3d_device *device, + UINT idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_VERTEX, idx); } static void wined3d_device_set_sampler(struct wined3d_device *device, @@ -2463,13 +2469,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_ps_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_PIXEL, idx); } void CDECL wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2686,13 +2686,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_gs_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_GEOMETRY][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_GEOMETRY, idx); } void CDECL wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler) @@ -2766,13 +2760,7 @@ struct wined3d_shader_resource_view * CDECL wined3d_device_get_cs_resource_view( { TRACE("device %p, idx %u.\n", device, idx); - if (idx >= MAX_SHADER_RESOURCE_VIEWS) - { - WARN("Invalid view index %u.\n", idx); - return NULL; - } - - return device->state.shader_resource_view[WINED3D_SHADER_TYPE_COMPUTE][idx]; + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx); } void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_constant_buffer() helper function.
by Alexandre Julliard 07 Mar '17

07 Mar '17

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

← Newer
1
...
55
56
57
58
59
60
61
...
72
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 March 2017