September 2016 - Wine-commits

Hugh McMaster : reg/tests: Exclude the null terminating character from MultiByteToWideChar conversion.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 6d72a0cca355444070f3b5eae96f865a9efcf9f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d72a0cca355444070f3b5eae… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Sep 1 13:37:06 2016 +0000 reg/tests: Exclude the null terminating character from MultiByteToWideChar conversion. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 715cdbd..1e3d1d2 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -727,17 +727,19 @@ static BOOL test_import_str_(unsigned line, const char *file_contents, DWORD *rc #define test_import_wstr(c,r) test_import_wstr_(__LINE__,c,r) static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *rc) { - int len, memsize; + int lenA, len, memsize; WCHAR *wstr; HANDLE regfile; DWORD written; BOOL ret; - len = MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, NULL, 0); + lenA = strlen(file_contents); + + len = MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, NULL, 0); memsize = len * sizeof(WCHAR); wstr = HeapAlloc(GetProcessHeap(), 0, memsize); if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, -1, wstr, memsize); + MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, memsize); regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Alexandre Julliard : Release 1.9.18.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 7baaab5b53011c3a593e1ff32538c9ca706db212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baaab5b53011c3a593e1ff32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 3 01:39:28 2016 +0900 Release 1.9.18. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 824 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 406 insertions(+), 439 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7baaab5b53011c3a593e1…

1 0

Sebastian Lackner : wintrust/tests: Fix test for pfnAddSgnr2Chain.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: f9e5c96e5e9d8a25f7fc131a9bcb214c750f47c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e5c96e5e9d8a25f7fc131a9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 1 15:53:52 2016 +0200 wintrust/tests: Fix test for pfnAddSgnr2Chain. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 436de47..624371d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -176,16 +176,15 @@ static void test_utils(SAFE_PROVIDER_FUNCTIONS *funcs) ok(data.csSigners == 2, "Expected 2 signers, got %d\n", data.csSigners); ok(!memcmp(&data.pasSigners[1], &sgnr, sizeof(sgnr)), "Unexpected data in signer\n"); - /* This also adds, but the data aren't copied */ + /* This also adds, but the index is ignored */ sgnr.cbStruct = sizeof(DWORD); ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr); ok(ret, "pfnAddSgnr2Chain failed: %08x\n", GetLastError()); ok(data.csSigners == 3, "Expected 3 signers, got %d\n", data.csSigners); - ok(data.pasSigners[0].cbStruct == 0, "Unexpected data size %d\n", - data.pasSigners[0].cbStruct); - ok(data.pasSigners[0].sftVerifyAsOf.dwLowDateTime == 0, - "Unexpected verify time %d\n", - data.pasSigners[0].sftVerifyAsOf.dwLowDateTime); + sgnr.sftVerifyAsOf.dwLowDateTime = 0; + todo_wine + ok(!memcmp(&data.pasSigners[2], &sgnr, sizeof(sgnr)), + "Unexpected data in signer\n"); /* But too large a thing isn't added */ sgnr.cbStruct = sizeof(sgnr) + sizeof(DWORD); SetLastError(0xdeadbeef);

1 0

Jacek Caban : d3dcompiler_43: Removed no longer needed wine_rb_init error handling.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 907854d4a26d015df038ab43f5ec3a32cd06c9d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=907854d4a26d015df038ab43f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 30 21:31:35 2016 +0200 d3dcompiler_43: Removed no longer needed wine_rb_init error handling. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 6 +----- dlls/d3dcompiler_43/utils.c | 24 ++++-------------------- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index e2955f0..ff67d7b 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1686,11 +1686,7 @@ static HRESULT d3dcompiler_shader_reflection_init(struct d3dcompiler_shader_refl reflection->ID3D11ShaderReflection_iface.lpVtbl = &d3dcompiler_shader_reflection_vtbl; reflection->refcount = 1; - if (wine_rb_init(&reflection->types, &d3dcompiler_shader_reflection_type_rb_functions) == -1) - { - ERR("Failed to initialize type rbtree.\n"); - return E_FAIL; - } + wine_rb_init(&reflection->types, &d3dcompiler_shader_reflection_type_rb_functions); hr = dxbc_parse(data, data_size, &src_dxbc); if (FAILED(hr)) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index e131d99..ddf64e4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1734,12 +1734,7 @@ void push_scope(struct hlsl_parse_ctx *ctx) } TRACE("Pushing a new scope\n"); list_init(&new_scope->vars); - if (wine_rb_init(&new_scope->types, &hlsl_type_rb_funcs) == -1) - { - ERR("Failed to initialize types rbtree.\n"); - d3dcompiler_free(new_scope); - return; - } + wine_rb_init(&new_scope->types, &hlsl_type_rb_funcs); new_scope->upper = ctx->cur_scope; ctx->cur_scope = new_scope; list_add_tail(&ctx->scopes, &new_scope->entry); @@ -1875,8 +1870,7 @@ static const struct wine_rb_functions function_rb_funcs = void init_functions_tree(struct wine_rb_tree *funcs) { - if (wine_rb_init(&hlsl_ctx.functions, &function_rb_funcs) == -1) - ERR("Failed to initialize functions rbtree.\n"); + wine_rb_init(&hlsl_ctx.functions, &function_rb_funcs); } static const char *debug_base_type(const struct hlsl_type *type) @@ -2513,11 +2507,7 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu TRACE("Function %s redeclared as a user defined function.\n", debugstr_a(name)); func->intrinsic = intrinsic; wine_rb_destroy(&func->overloads, free_function_decl_rb, NULL); - if (wine_rb_init(&func->overloads, &hlsl_ir_function_decl_rb_funcs) == -1) - { - ERR("Failed to initialize function rbtree.\n"); - return; - } + wine_rb_init(&func->overloads, &hlsl_ir_function_decl_rb_funcs); } decl->func = func; if ((old_entry = wine_rb_get(&func->overloads, decl->parameters))) @@ -2540,13 +2530,7 @@ void add_function_decl(struct wine_rb_tree *funcs, char *name, struct hlsl_ir_fu } func = d3dcompiler_alloc(sizeof(*func)); func->name = name; - if (wine_rb_init(&func->overloads, &hlsl_ir_function_decl_rb_funcs) == -1) - { - ERR("Failed to initialize function rbtree.\n"); - d3dcompiler_free(name); - d3dcompiler_free(func); - return; - } + wine_rb_init(&func->overloads, &hlsl_ir_function_decl_rb_funcs); decl->func = func; wine_rb_put(&func->overloads, decl->parameters, &decl->entry); func->intrinsic = intrinsic;

1 0

Huw Davies : rpcrt4/tests: Mark Win 8.1 behaviour of UuidCreateSequential( ) as broken.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 76ddf58c44bc4fd1ed7b0c9cd0a8470042c1713f URL: http://source.winehq.org/git/wine.git/?a=commit;h=76ddf58c44bc4fd1ed7b0c9cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 1 17:08:00 2016 +0100 rpcrt4/tests: Mark Win 8.1 behaviour of UuidCreateSequential() as broken. Some versions of Win 8.1 provide a randomised node ID (with the multicast bit set) but return S_OK instead of RPC_S_UUID_LOCAL_ONLY. This is despite having access to a valid MAC address. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/rpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index 23b9e36..3f6cf91 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -809,7 +809,7 @@ static void test_UuidCreateSequential(void) /* If the call succeeded, there's a valid (non-multicast) MAC * address in the uuid: */ - ok(!(guid1.Data4[2] & 0x01), + ok(!(guid1.Data4[2] & 0x01) || broken(guid1.Data4[2] & 0x01), /* Win 8.1 */ "GUID does not appear to contain a MAC address: %s\n", wine_dbgstr_guid(&guid1)); }

1 0

Henri Verbeet : d3d9: Use resource mapping functions in d3d9_device_DrawPrimitiveUP().
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 5505e1ae762f9a26eab0b64d8519b85a57a6cf2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5505e1ae762f9a26eab0b64d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:44 2016 +0200 d3d9: Use resource mapping functions in d3d9_device_DrawPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5d1d292..cb67fe6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2362,9 +2362,11 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; + struct wined3d_resource *vb; UINT vb_pos, align; - BYTE *buffer_data; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2396,12 +2398,14 @@ static HRESULT WINAPI d3d9_device_DrawPrimitiveUP(IDirect3DDevice9Ex *iface, else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, data, size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, data, size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, stride);

1 0

Henri Verbeet : d3d9: Use resource mapping functions in d3d9_device_DrawIndexedPrimitiveUP().
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 4987ef49bd6ea73dc35c1a8d2edaa74c2abf18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4987ef49bd6ea73dc35c1a8d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:45 2016 +0200 d3d9: Use resource mapping functions in d3d9_device_DrawIndexedPrimitiveUP(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 29 +++++++++++++++++------------ dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/wined3d.spec | 2 -- include/wine/wined3d.h | 2 -- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cb67fe6..c3f3007 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2458,11 +2458,12 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); HRESULT hr; - BYTE *buffer_data; - UINT idx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); UINT idx_fmt_size = index_format == D3DFMT_INDEX16 ? 2 : 4; UINT idx_size = idx_count * idx_fmt_size; + struct wined3d_map_desc wined3d_map_desc; + struct wined3d_box wined3d_box = {0}; + struct wined3d_resource *ib, *vb; UINT ib_pos; UINT vtx_size = vertex_count * vertex_stride; @@ -2500,12 +2501,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa else vb_pos += align; - hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, vtx_size, &buffer_data, - vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = vb_pos; + wined3d_box.right = vb_pos + vtx_size; + vb = wined3d_buffer_get_resource(device->vertex_buffer); + if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, vertex_data, vtx_size); - wined3d_buffer_unmap(device->vertex_buffer); + memcpy(wined3d_map_desc.data, vertex_data, vtx_size); + wined3d_resource_unmap(vb, 0); device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d9_device_prepare_index_buffer(device, idx_size); @@ -2520,12 +2523,14 @@ static HRESULT WINAPI d3d9_device_DrawIndexedPrimitiveUP(IDirect3DDevice9Ex *ifa else ib_pos += align; - hr = wined3d_buffer_map(device->index_buffer, ib_pos, idx_size, &buffer_data, - ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); - if (FAILED(hr)) + wined3d_box.left = ib_pos; + wined3d_box.right = ib_pos + idx_size; + ib = wined3d_buffer_get_resource(device->index_buffer); + if (FAILED(hr = wined3d_resource_map(ib, 0, &wined3d_map_desc, &wined3d_box, + ib_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD))) goto done; - memcpy(buffer_data, index_data, idx_size); - wined3d_buffer_unmap(device->index_buffer); + memcpy(wined3d_map_desc.data, index_data, idx_size); + wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, vertex_stride); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 56bfdfe..fdecb04 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -935,7 +935,7 @@ struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffe return &buffer->resource; } -HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) +static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags) { LONG count; BYTE *base; @@ -1037,7 +1037,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN return WINED3D_OK; } -void CDECL wined3d_buffer_unmap(struct wined3d_buffer *buffer) +static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) { ULONG i; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0db371d..b034ba8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -29,8 +29,6 @@ @ cdecl wined3d_buffer_get_parent(ptr) @ cdecl wined3d_buffer_get_resource(ptr) @ cdecl wined3d_buffer_incref(ptr) -@ cdecl wined3d_buffer_map(ptr long long ptr long) -@ cdecl wined3d_buffer_unmap(ptr) @ cdecl wined3d_device_acquire_focus_window(ptr ptr) @ cdecl wined3d_device_begin_scene(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 81dffea..f2900a9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2139,8 +2139,6 @@ ULONG __cdecl wined3d_buffer_decref(struct wined3d_buffer *buffer); void * __cdecl wined3d_buffer_get_parent(const struct wined3d_buffer *buffer); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer); ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); -HRESULT __cdecl wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags); -void __cdecl wined3d_buffer_unmap(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_device_acquire_focus_window(struct wined3d_device *device, HWND window); HRESULT __cdecl wined3d_device_begin_scene(struct wined3d_device *device);

1 0

Henri Verbeet : wined3d: Send resource maps through the command stream.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 9f85b5f867ed5ba6fe04be54774de1dc10ff2619 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f85b5f867ed5ba6fe04be547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:46 2016 +0200 wined3d: Send resource maps 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 | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 05487e4..d86213b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -57,6 +57,7 @@ enum wined3d_cs_op WINED3D_CS_OP_QUERY_ISSUE, WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, + WINED3D_CS_OP_MAP, }; struct wined3d_cs_present @@ -289,6 +290,17 @@ struct wined3d_cs_unload_resource struct wined3d_resource *resource; }; +struct wined3d_cs_map +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; + unsigned int sub_resource_idx; + struct wined3d_map_desc *map_desc; + const struct wined3d_box *box; + DWORD flags; + HRESULT *hr; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1301,6 +1313,35 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou cs->ops->submit(cs); } +static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_map *op = data; + struct wined3d_resource *resource = op->resource; + + *op->hr = resource->resource_ops->resource_sub_resource_map(resource, + op->sub_resource_idx, op->map_desc, op->box, op->flags); +} + +HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) +{ + struct wined3d_cs_map *op; + HRESULT hr; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_MAP; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->map_desc = map_desc; + op->box = box; + op->flags = flags; + op->hr = &hr; + + cs->ops->submit(cs); + + return hr; +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1334,6 +1375,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_QUERY_ISSUE */ wined3d_cs_exec_query_issue, /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, + /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 70474c6..2285c3c 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -317,7 +317,7 @@ HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned i TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); - return resource->resource_ops->resource_sub_resource_map(resource, sub_resource_idx, map_desc, box, flags); + return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); } HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e329962..48f613f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3096,6 +3096,8 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; +HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

Henri Verbeet : wined3d: Send resource unmaps through the command stream.
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 66e54fd682f494265b6059d2f04d766ec085f149 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e54fd682f494265b6059d2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:47 2016 +0200 wined3d: Send resource unmaps 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 | 34 ++++++++++++++++++++++++++++++++++ dlls/wined3d/resource.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d86213b..7af0b81 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -58,6 +58,7 @@ enum wined3d_cs_op WINED3D_CS_OP_PRELOAD_RESOURCE, WINED3D_CS_OP_UNLOAD_RESOURCE, WINED3D_CS_OP_MAP, + WINED3D_CS_OP_UNMAP, }; struct wined3d_cs_present @@ -301,6 +302,14 @@ struct wined3d_cs_map HRESULT *hr; }; +struct wined3d_cs_unmap +{ + enum wined3d_cs_op opcode; + struct wined3d_resource *resource; + unsigned int sub_resource_idx; + HRESULT *hr; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1342,6 +1351,30 @@ HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, return hr; } +static void wined3d_cs_exec_unmap(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_unmap *op = data; + struct wined3d_resource *resource = op->resource; + + *op->hr = resource->resource_ops->resource_sub_resource_unmap(resource, op->sub_resource_idx); +} + +HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx) +{ + struct wined3d_cs_unmap *op; + HRESULT hr; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_UNMAP; + op->resource = resource; + op->sub_resource_idx = sub_resource_idx; + op->hr = &hr; + + cs->ops->submit(cs); + + return hr; +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1376,6 +1409,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_PRELOAD_RESOURCE */ wined3d_cs_exec_preload_resource, /* WINED3D_CS_OP_UNLOAD_RESOURCE */ wined3d_cs_exec_unload_resource, /* WINED3D_CS_OP_MAP */ wined3d_cs_exec_map, + /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 2285c3c..6484174 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -324,7 +324,7 @@ HRESULT CDECL wined3d_resource_unmap(struct wined3d_resource *resource, unsigned { TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); - return resource->resource_ops->resource_sub_resource_unmap(resource, sub_resource_idx); + return wined3d_cs_unmap(resource->device->cs, resource, sub_resource_idx); } void CDECL wined3d_resource_preload(struct wined3d_resource *resource) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48f613f..1f59f60 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3098,6 +3098,8 @@ void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_vi void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; +HRESULT wined3d_cs_unmap(struct wined3d_cs *cs, struct wined3d_resource *resource, + unsigned int sub_resource_idx) DECLSPEC_HIDDEN; static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants)

1 0

Henri Verbeet : wined3d: Sanitise resource map flags in wined3d_resource_map().
by Alexandre Julliard 02 Sep '16

02 Sep '16

Module: wine Branch: master Commit: 8232f371d82fb1068416e1f6c9bde792f12e137c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8232f371d82fb1068416e1f6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 1 20:34:48 2016 +0200 wined3d: Sanitise resource map flags in wined3d_resource_map(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 1 - dlls/wined3d/resource.c | 68 ++++++++++++++++++++++-------------------- dlls/wined3d/texture.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index fdecb04..7dc33c7 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -942,7 +942,6 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); - flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture * fill rate test seems to depend on this. When we map a buffer with * GL_MAP_INVALIDATE_BUFFER_BIT, the driver is free to discard the diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6484174..611c61f 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -311,12 +311,47 @@ void CDECL wined3d_resource_get_desc(const struct wined3d_resource *resource, st desc->size = resource->size; } +static DWORD wined3d_resource_sanitise_map_flags(const struct wined3d_resource *resource, DWORD flags) +{ + /* Not all flags make sense together, but Windows never returns an error. + * Catch the cases that could cause issues. */ + if (flags & WINED3D_MAP_READONLY) + { + if (flags & WINED3D_MAP_DISCARD) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); + return 0; + } + if (flags & WINED3D_MAP_NOOVERWRITE) + { + WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); + return 0; + } + } + else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) + { + WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); + return 0; + } + else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) + && !(resource->usage & WINED3DUSAGE_DYNAMIC)) + { + WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); + return 0; + } + + return flags; +} + HRESULT CDECL wined3d_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, DWORD flags) { TRACE("resource %p, sub_resource_idx %u, map_desc %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_desc, debug_box(box), flags); + flags = wined3d_resource_sanitise_map_flags(resource, flags); + return wined3d_cs_map(resource->device->cs, resource, sub_resource_idx, map_desc, box, flags); } @@ -360,39 +395,6 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) resource->heap_memory = NULL; } -DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) -{ - /* Not all flags make sense together, but Windows never returns an error. - * Catch the cases that could cause issues. */ - if (flags & WINED3D_MAP_READONLY) - { - if (flags & WINED3D_MAP_DISCARD) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_DISCARD, ignoring flags.\n"); - return 0; - } - if (flags & WINED3D_MAP_NOOVERWRITE) - { - WARN("WINED3D_MAP_READONLY combined with WINED3D_MAP_NOOVERWRITE, ignoring flags.\n"); - return 0; - } - } - else if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - == (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - { - WARN("WINED3D_MAP_DISCARD and WINED3D_MAP_NOOVERWRITE used together, ignoring.\n"); - return 0; - } - else if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE) - && !(resource->usage & WINED3DUSAGE_DYNAMIC)) - { - WARN("DISCARD or NOOVERWRITE map on non-dynamic buffer, ignoring.\n"); - return 0; - } - - return flags; -} - GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d2b1be5..cf5fc93 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1700,8 +1700,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - flags = wined3d_resource_sanitize_map_flags(resource, flags); - if (device->d3d_initialized) { context = context_acquire(device, NULL); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1f59f60..b57b971 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2605,7 +2605,6 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; -DWORD wined3d_resource_sanitize_map_flags(const struct wined3d_resource *resource, DWORD flags) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN; /* Tests show that the start address of resources is 32 byte aligned */

1 0