April 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Implement GetFontFamily() for IDWriteFontCollection1.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 54b89a2942d455190a2e38a99df573a06bf43a5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b89a2942d455190a2e38a99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 09:39:26 2016 +0300 dwrite: Implement GetFontFamily() for IDWriteFontCollection1. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 26 ++++++++++++++++---------- dlls/dwrite/tests/font.c | 5 +---- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4120cf6..fef11e6 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -133,7 +133,7 @@ struct dwrite_fontfamily { struct dwrite_fontfamily_data *data; - IDWriteFontCollection* collection; + IDWriteFontCollection1 *collection; }; struct dwrite_font { @@ -1715,7 +1715,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface) if (!ref) { - IDWriteFontCollection_Release(This->collection); + IDWriteFontCollection1_Release(This->collection); release_fontfamily_data(This->data); heap_free(This); } @@ -1726,10 +1726,11 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily1 *iface) static HRESULT WINAPI dwritefontfamily_GetFontCollection(IDWriteFontFamily1 *iface, IDWriteFontCollection **collection) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily1(iface); + TRACE("(%p)->(%p)\n", This, collection); - *collection = This->collection; - IDWriteFontCollection_AddRef(This->collection); + *collection = (IDWriteFontCollection*)This->collection; + IDWriteFontCollection_AddRef(*collection); return S_OK; } @@ -1971,7 +1972,7 @@ static const IDWriteFontFamily1Vtbl fontfamilyvtbl = { dwritefontfamily1_GetFontFaceReference }; -static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection *collection, IDWriteFontFamily1 **family) +static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFontCollection1 *collection, IDWriteFontFamily1 **family) { struct dwrite_fontfamily *This; @@ -1983,7 +1984,7 @@ static HRESULT create_fontfamily(struct dwrite_fontfamily_data *data, IDWriteFon This->IDWriteFontFamily1_iface.lpVtbl = &fontfamilyvtbl; This->ref = 1; This->collection = collection; - IDWriteFontCollection_AddRef(collection); + IDWriteFontCollection1_AddRef(collection); This->data = data; InterlockedIncrement(&This->data->ref); @@ -2082,7 +2083,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection1 return E_FAIL; } - return create_fontfamily(This->family_data[index], (IDWriteFontCollection*)iface, (IDWriteFontFamily1**)family); + return create_fontfamily(This->family_data[index], iface, (IDWriteFontFamily1**)family); } static UINT32 collection_find_family(struct dwrite_fontcollection *collection, const WCHAR *name) @@ -2176,7 +2177,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec if (!found_font) return DWRITE_E_NOFONT; - hr = create_fontfamily(found_family, (IDWriteFontCollection*)iface, &family); + hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) return hr; @@ -2198,9 +2199,14 @@ static HRESULT WINAPI dwritefontcollection1_GetFontFamily(IDWriteFontCollection1 { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); - FIXME("(%p)->(%p): stub\n", This, family); + TRACE("(%p)->(%u %p)\n", This, index, family); - return E_NOTIMPL; + if (index >= This->family_count) { + *family = NULL; + return E_FAIL; + } + + return create_fontfamily(This->family_data[index], iface, family); } static const IDWriteFontCollection1Vtbl fontcollectionvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index a57b9ae..515ece4 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2073,14 +2073,11 @@ static void test_system_fontcollection(void) family1 = (void*)0xdeadbeef; hr = IDWriteFontCollection1_GetFontFamily(collection1, ~0u, &family1); - todo_wine { ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(family1 == NULL, "got %p\n", family1); - } + hr = IDWriteFontCollection1_GetFontFamily(collection1, 0, &family1); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) IDWriteFontFamily1_Release(family1); IDWriteFontCollection1_Release(collection1); }

1 0

Henri Verbeet : wined3d: Reject sub-resource types in wined3d_check_device_format().
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: f519aca8b3109f529a77c0a4ef8baa182fdd66da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f519aca8b3109f529a77c0a4e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:31 2016 +0200 wined3d: Reject sub-resource types in wined3d_check_device_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/directx.c | 19 ++++++------------- dlls/d3d9/directx.c | 19 ++++++------------- dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/device.c | 6 +++--- dlls/ddraw/surface.c | 12 +++--------- dlls/wined3d/directx.c | 41 +++++++++++++++++++++++------------------ 6 files changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f519aca8b3109f529a77c…

1 0

Henri Verbeet : wined3d: Properly check for 3D/ volume textures in wined3d_device_update_texture().
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: e5a7d5465b2fffdd0e68d6e490c4e8f9fe4113d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a7d5465b2fffdd0e68d6e49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:29 2016 +0200 wined3d: Properly check for 3D/volume textures in wined3d_device_update_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f3fb732..f00c906 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3641,7 +3641,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, src_size = max(src_texture->resource.width, src_texture->resource.height); dst_size = max(dst_texture->resource.width, dst_texture->resource.height); - if (type == WINED3D_RTYPE_VOLUME) + if (type == WINED3D_RTYPE_TEXTURE_3D) { src_size = max(src_size, src_texture->resource.depth); dst_size = max(dst_size, dst_texture->resource.depth);

1 0

Henri Verbeet : wined3d: Store renderbuffer IDs in struct wined3d_texture.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: feb86895b4f0b1a9b43a4e47f7169e27fd5e3e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=feb86895b4f0b1a9b43a4e47f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:26 2016 +0200 wined3d: Store renderbuffer IDs in struct wined3d_texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +- dlls/wined3d/surface.c | 94 ++---------------------------------------- dlls/wined3d/swapchain.c | 12 ++---- dlls/wined3d/texture.c | 81 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 7 +++- 5 files changed, 94 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=feb86895b4f0b1a9b43a4…

1 0

Nikolay Sivov : comctl32/monthcal: Remove commented block.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: af7f8d536b3d12c014f5ff3a3a3538eede383271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af7f8d536b3d12c014f5ff3a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 19 13:07:17 2016 +0300 comctl32/monthcal: Remove commented block. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/monthcal.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 6cdcfca..9d5b42e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1805,18 +1805,6 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) if (lpht->cbSize == sizeof(MCHITTESTINFO)) memcpy(&htinfo.rc, &lpht->rc, sizeof(MCHITTESTINFO) - MCHITTESTINFO_V1_SIZE); - /* Comment in for debugging... - TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, - infoPtr->wdays.left, infoPtr->wdays.right, - infoPtr->wdays.top, infoPtr->wdays.bottom, - infoPtr->days.left, infoPtr->days.right, - infoPtr->days.top, infoPtr->days.bottom, - infoPtr->todayrect.left, infoPtr->todayrect.right, - infoPtr->todayrect.top, infoPtr->todayrect.bottom, - infoPtr->weeknums.left, infoPtr->weeknums.right, - infoPtr->weeknums.top, infoPtr->weeknums.bottom); - */ - /* guess in what calendar we are */ calIdx = MONTHCAL_GetCalendarFromPoint(infoPtr, &lpht->pt); if (calIdx == -1)

1 0

Francois Gouget : advapi32/tests: Some spelling fixes for the security ok( ) messages.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 0beaaa6bc2561daf6f918587379ee83f1dced53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0beaaa6bc2561daf6f9185873… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Apr 19 06:11:41 2016 +0200 advapi32/tests: Some spelling fixes for the security ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 775e708..3639ebd 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3474,7 +3474,7 @@ static void test_CreateDirectoryA(void) GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); GetTempPathA(MAX_PATH, tmpdir); lstrcatA(tmpdir, "Please Remove Me"); @@ -3521,7 +3521,7 @@ static void test_CreateDirectoryA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor\n"); + ok(bret, "Failed to add ACL to security descriptor\n"); strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3595,7 +3595,7 @@ static void test_CreateDirectoryA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor\n"); + ok(bret, "Failed to add ACL to security descriptor\n"); strcpy(tmpfile, tmpdir); lstrcatA(tmpfile, "/tmpfile"); @@ -3778,7 +3778,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); GetTempFileNameA(".", "foo", 0, tmpfile); hTemp = CreateFileA(tmpfile, WRITE_DAC|GENERIC_WRITE, FILE_SHARE_DELETE|FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL); @@ -3887,7 +3887,7 @@ static void test_GetNamedSecurityInfoA(void) bret = InitializeAcl(pDacl, sizeof(ACL), ACL_REVISION); ok(bret, "Failed to initialize ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -3923,7 +3923,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessDeniedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -3939,7 +3939,7 @@ static void test_GetNamedSecurityInfoA(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, user_sid); ok(bret, "Failed to add Current User to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); status = pNtSetSecurityObject(hTemp, DACL_SECURITY_INFORMATION, pSD); ok(status == ERROR_SUCCESS, "NtSetSecurityObject returned %x\n", status); @@ -4589,7 +4589,7 @@ static void test_GetSecurityInfo(void) bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, 0, GENERIC_ALL, admin_sid); ok(bret, "Failed to add Administrator Group to ACL.\n"); bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); - ok(bret, "Failed to add ACL to security desciptor.\n"); + ok(bret, "Failed to add ACL to security descriptor.\n"); ret = pSetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, NULL, NULL, pDacl, NULL); ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret);

1 0

Henri Verbeet : wined3d: Merge surface_unload() and volume_unload().
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 9cdcc3e120d5d76166f18ecc4b1bf9d9397885e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cdcc3e120d5d76166f18ecc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:28 2016 +0200 wined3d: Merge surface_unload() and volume_unload(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++-- dlls/wined3d/surface.c | 44 +------------------------------------------ dlls/wined3d/texture.c | 51 +++++++++++++++++++++++++++++++++++++++++--------- dlls/wined3d/volume.c | 27 +------------------------- 4 files changed, 50 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 149234b..f3fb732 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1138,8 +1138,10 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { - TRACE("Unloading resource %p.\n", resource); + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + TRACE("Unloading resource %p.\n", resource); resource->resource_ops->resource_unload(resource); } @@ -4532,8 +4534,10 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { - TRACE("Unloading resource %p.\n", resource); + if (resource->type == WINED3D_RTYPE_SURFACE || resource->type == WINED3D_RTYPE_VOLUME) + continue; + TRACE("Unloading resource %p.\n", resource); resource->resource_ops->resource_unload(resource); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9e8fddb..f43b186 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -845,49 +845,7 @@ static ULONG surface_resource_decref(struct wined3d_resource *resource) static void surface_unload(struct wined3d_resource *resource) { - struct wined3d_surface *surface = surface_from_resource(resource); - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; - struct wined3d_renderbuffer_entry *entry, *entry2; - struct wined3d_device *device = resource->device; - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - TRACE("surface %p.\n", surface); - - context = context_acquire(device, NULL); - gl_info = context->gl_info; - - if (resource->pool == WINED3D_POOL_DEFAULT) - { - /* We should only get here on device reset/teardown for implicit - * resources. */ - wined3d_texture_validate_location(texture, sub_resource_idx, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~WINED3D_LOCATION_DISCARDED); - } - else - { - surface_load_location(surface, context, texture->resource.map_binding); - wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); - } - - /* Destroy fbo render buffers. This is needed for implicit render targets, for - * all application-created targets the application has to release the surface - * before calling _Reset - */ - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) - { - context_gl_resource_released(device, entry->id, TRUE); - gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); - list_remove(&entry->entry); - HeapFree(GetProcessHeap(), 0, entry); - } - list_init(&surface->renderbuffers); - surface->current_renderbuffer = NULL; - - context_release(context); - - resource_unload(resource); + ERR("Not supported on sub-resources.\n"); } static HRESULT surface_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f89b5c9..e4ff67c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1358,26 +1358,59 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); UINT sub_count = texture->level_count * texture->layer_count; - struct wined3d_context *context = NULL; + struct wined3d_device *device = resource->device; + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; UINT i; TRACE("texture %p.\n", texture); + context = context_acquire(device, NULL); + gl_info = context->gl_info; + for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; - - sub_resource->resource_ops->resource_unload(sub_resource); + struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[i]; - if (texture->sub_resources[i].buffer_object) + if (resource->pool != WINED3D_POOL_DEFAULT + && texture->texture_ops->texture_load_location(texture, i, context, resource->map_binding)) { - if (!context) - context = context_acquire(texture->resource.device, NULL); + wined3d_texture_invalidate_location(texture, i, ~resource->map_binding); + } + else + { + /* We should only get here on device reset/teardown for implicit + * resources. */ + if (resource->pool != WINED3D_POOL_DEFAULT || resource->type != WINED3D_RTYPE_TEXTURE_2D) + ERR("Discarding %s %p sub-resource %u in the %s pool.\n", debug_d3dresourcetype(resource->type), + resource, i, debug_d3dpool(resource->pool)); + wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_DISCARDED); + wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); + } + + if (sub_resource->buffer_object) wined3d_texture_remove_buffer_object(texture, i, context->gl_info); + + if (resource->type == WINED3D_RTYPE_TEXTURE_2D) + { + struct wined3d_surface *surface = sub_resource->u.surface; + struct wined3d_renderbuffer_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &surface->renderbuffers, struct wined3d_renderbuffer_entry, entry) + { + context_gl_resource_released(device, entry->id, TRUE); + gl_info->fbo_ops.glDeleteRenderbuffers(1, &entry->id); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + } + list_init(&surface->renderbuffers); + surface->current_renderbuffer = NULL; } + + resource_unload(sub_resource->resource); } - if (context) - context_release(context); + + context_release(context); wined3d_texture_force_reload(texture); wined3d_texture_unload_gl_texture(texture); diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 262bbac..89d5ead 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -366,32 +366,7 @@ void wined3d_volume_cleanup(struct wined3d_volume *volume) static void volume_unload(struct wined3d_resource *resource) { - struct wined3d_volume *volume = volume_from_resource(resource); - struct wined3d_texture *texture = volume->container; - struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context; - - if (texture->resource.pool == WINED3D_POOL_DEFAULT) - ERR("Unloading DEFAULT pool volume.\n"); - - TRACE("texture %p.\n", resource); - - context = context_acquire(device, NULL); - if (wined3d_volume_load_location(volume, context, WINED3D_LOCATION_SYSMEM)) - { - wined3d_texture_invalidate_location(texture, volume->texture_level, ~WINED3D_LOCATION_SYSMEM); - } - else - { - ERR("Out of memory when unloading volume %p.\n", volume); - wined3d_texture_validate_location(texture, volume->texture_level, WINED3D_LOCATION_DISCARDED); - wined3d_texture_invalidate_location(texture, volume->texture_level, ~WINED3D_LOCATION_DISCARDED); - } - context_release(context); - - /* The texture name is managed by the container. */ - - resource_unload(resource); + ERR("Not supported on sub-resources.\n"); } static ULONG volume_resource_incref(struct wined3d_resource *resource)

1 0

Henri Verbeet : wined3d: Track the map binding per-texture.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 16ff4e7cf6c1879219b3daa61cf8dae682a35449 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16ff4e7cf6c1879219b3daa61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 18 19:06:27 2016 +0200 wined3d: Track the map binding per-texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 54 +++++++++++++----------- dlls/wined3d/texture.c | 95 +++++++++++++++++++++++++++++------------- dlls/wined3d/volume.c | 9 ++-- dlls/wined3d/wined3d_private.h | 6 +-- 4 files changed, 102 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=16ff4e7cf6c1879219b3d…

1 0

Józef Kucia : wined3d: Create dummy 2D array textures.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 7eac961454dc502f08b76d32851a15571a508111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eac961454dc502f08b76d328… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 19 00:01:26 2016 +0200 wined3d: Create dummy 2D array textures. 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/context.c | 12 +++++++++++- dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++---- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 94522ba..50456b4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1507,6 +1507,12 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_CUBE_MAP, device->dummy_texture_cube[i]); checkGLcall("glBindTexture"); } + + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + { + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_texture_2d_array[i]); + checkGLcall("glBindTexture"); + } } } @@ -2343,6 +2349,10 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, device->dummy_texture_2d[unit]); checkGLcall("glBindTexture"); break; + case GL_TEXTURE_2D_ARRAY: + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_texture_2d_array[unit]); + checkGLcall("glBindTexture"); + break; case GL_TEXTURE_RECTANGLE_ARB: gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_RECTANGLE_ARB, device->dummy_texture_rect[unit]); checkGLcall("glBindTexture"); @@ -2356,7 +2366,7 @@ void context_bind_texture(struct wined3d_context *context, GLenum target, GLuint checkGLcall("glBindTexture"); break; default: - ERR("Unexpected texture target %#x\n", old_texture_type); + ERR("Unexpected texture target %#x.\n", old_texture_type); } context->texture_type[unit] = target; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f00c906..de8af34 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -690,6 +690,7 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); for (i = 0; i < count; ++i) { + static const DWORD d3d10_color = 0x00000000; static const DWORD color = 0x000000ff; /* Make appropriate texture active */ @@ -749,6 +750,20 @@ static void create_dummy_textures(struct wined3d_device *device, struct wined3d_ checkGLcall("glTexImage2D"); } } + + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + { + gl_info->gl_ops.gl.p_glGenTextures(1, &device->dummy_texture_2d_array[i]); + checkGLcall("glGenTextures"); + TRACE("Dummy 2D array texture %u given name %u.\n", i, device->dummy_texture_2d_array[i]); + + gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D_ARRAY, device->dummy_texture_2d_array[i]); + checkGLcall("glBindTexture"); + + GL_EXTCALL(glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, GL_RGBA8, 1, 1, 1, 0, + GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, &d3d10_color)); + checkGLcall("glTexImage3D"); + } } } @@ -757,6 +772,12 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w { unsigned int count = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + { + gl_info->gl_ops.gl.p_glDeleteTextures(count, device->dummy_texture_2d_array); + checkGLcall("glDeleteTextures(count, device->dummy_texture_2d_array)"); + } + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { gl_info->gl_ops.gl.p_glDeleteTextures(count, device->dummy_texture_cube); @@ -778,6 +799,7 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w gl_info->gl_ops.gl.p_glDeleteTextures(count, device->dummy_texture_2d); checkGLcall("glDeleteTextures(count, device->dummy_texture_2d)"); + memset(device->dummy_texture_2d_array, 0, count * sizeof(*device->dummy_texture_2d_array)); memset(device->dummy_texture_cube, 0, count * sizeof(*device->dummy_texture_cube)); memset(device->dummy_texture_3d, 0, count * sizeof(*device->dummy_texture_3d)); memset(device->dummy_texture_rect, 0, count * sizeof(*device->dummy_texture_rect)); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e1cda1c..5623a62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2305,10 +2305,11 @@ struct wined3d_device struct wined3d_texture *logo_texture; /* Textures for when no other textures are mapped */ - UINT dummy_texture_2d[MAX_COMBINED_SAMPLERS]; - UINT dummy_texture_rect[MAX_COMBINED_SAMPLERS]; - UINT dummy_texture_3d[MAX_COMBINED_SAMPLERS]; - UINT dummy_texture_cube[MAX_COMBINED_SAMPLERS]; + GLuint dummy_texture_2d[MAX_COMBINED_SAMPLERS]; + GLuint dummy_texture_rect[MAX_COMBINED_SAMPLERS]; + GLuint dummy_texture_3d[MAX_COMBINED_SAMPLERS]; + GLuint dummy_texture_cube[MAX_COMBINED_SAMPLERS]; + GLuint dummy_texture_2d_array[MAX_COMBINED_SAMPLERS]; /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ GLuint default_sampler;

1 0

Sebastian Lackner : services: Hold a reference to process in svcctl_ControlService.
by Alexandre Julliard April 19, 2016

April 19, 2016

Module: wine Branch: master Commit: 168af6e7501202088cd6105ea798f97e145a06fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=168af6e7501202088cd6105ea… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 18 17:08:37 2016 +0200 services: Hold a reference to process in svcctl_ControlService. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 15 ++++++++++----- programs/services/services.c | 7 +++++++ programs/services/services.h | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 59bbe7f..babb2b5 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -1086,9 +1086,9 @@ DWORD __cdecl svcctl_ControlService( { DWORD access_required; struct sc_service_handle *service; + struct process_entry *process; DWORD result; BOOL ret; - HANDLE control_mutex; WINE_TRACE("(%p, %d, %p)\n", hService, dwControl, lpServiceStatus); @@ -1169,14 +1169,18 @@ DWORD __cdecl svcctl_ControlService( if (dwControl == SERVICE_CONTROL_STOP) service->service_entry->force_shutdown = TRUE; - control_mutex = service->service_entry->process->control_mutex; + /* Hold a reference to the process while sending the command. */ + process = grab_process(service->service_entry->process); service_unlock(service->service_entry); - ret = WaitForSingleObject(control_mutex, 30000); + ret = WaitForSingleObject(process->control_mutex, 30000); if (ret != WAIT_OBJECT_0) + { + release_process(process); return ERROR_SERVICE_REQUEST_TIMEOUT; + } - process_send_control(service->service_entry->process, service->service_entry->name, dwControl, &result); + process_send_control(process, service->service_entry->name, dwControl, &result); if (lpServiceStatus) { @@ -1191,7 +1195,8 @@ DWORD __cdecl svcctl_ControlService( service_unlock(service->service_entry); } - ReleaseMutex(control_mutex); + ReleaseMutex(process->control_mutex); + release_process(process); return result; } diff --git a/programs/services/services.c b/programs/services/services.c index 5be6f5c..234c0ac 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -457,6 +457,13 @@ struct service_entry *scmdatabase_find_service_by_displayname(struct scmdatabase return NULL; } +struct process_entry *grab_process(struct process_entry *process) +{ + if (process) + InterlockedIncrement(&process->ref_count); + return process; +} + void release_process(struct process_entry *process) { if (InterlockedDecrement(&process->ref_count) == 0) diff --git a/programs/services/services.h b/programs/services/services.h index b8f4774..3d6c486 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -88,6 +88,7 @@ void service_terminate(struct service_entry *service); /* Process functions */ +struct process_entry *grab_process(struct process_entry *process); void release_process(struct process_entry *process); BOOL process_send_command(struct process_entry *process, const void *data, DWORD size, DWORD *result);

1 0