wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Alexandre Julliard : Wine release 3.5
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: website Branch: master Commit: d6c747175b59ce90672745e24dbe1a5acc386551 URL: https://source.winehq.org/git/website.git/?a=commit;h=d6c747175b59ce9067274… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:32:54 2018 +0200 Wine release 3.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018033001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018033001.xml b/news/en/2018033001.xml new file mode 100644 index 0000000..09c3caa --- /dev/null +++ b/news/en/2018033001.xml @@ -0,0 +1,16 @@ +<news> +<date>March 30, 2018</date> +<title>Wine 3.5 Released</title> +<body> + The Wine development release 3.5 is now available. + <a href="{$root}/announce/3.5">What's new</a> in this release: +<ul> + <li>More Vulkan support, including the vulkan-1 loader.</li> + <li>Support for RSA and ECDSA cryptographic keys.</li> + <li>Improved manifest file parser.</li> + <li>Support for the Places toolbar in file dialogs.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.5 : Alexandre Julliard : Release 3.5
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: refs/tags/wine-3.5 Tag: 8fa5be285ea45fe330326245064a2dce2065ffef URL: https://source.winehq.org/git/wine.git/?a=tag;h=8fa5be285ea45fe330326245064… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:30:27 2018 +0200 Release 3.5

1 0

Alexandre Julliard : Release 3.5.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 79f93ecf429f42db15bc14f276045fdad35cef13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79f93ecf429f42db15bc14f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 30 19:30:27 2018 +0200 Release 3.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .mailmap | 1 + ANNOUNCE | 829 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 436 insertions(+), 418 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=79f93ecf429f42db15bc…

1 0

Jacek Caban : windowscodecs: Cache component info objects.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 8a763d9e2952d2d58078c37bf722b033c9d4109f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a763d9e2952d2d58078c37b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 20:50:35 2018 +0200 windowscodecs: Cache component info objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 47 +++++++++++++++++++++++++++++++++- dlls/windowscodecs/main.c | 3 +++ dlls/windowscodecs/tests/info.c | 31 +++++++++++++++++++--- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 78 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 6d3272e..6114eef 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -33,6 +33,7 @@ #include "wine/debug.h" #include "wine/unicode.h" #include "wine/list.h" +#include "wine/rbtree.h" WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); @@ -60,6 +61,7 @@ typedef struct { IWICComponentInfo IWICComponentInfo_iface; LONG ref; CLSID clsid; + struct wine_rb_entry entry; } ComponentInfo; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, @@ -1923,8 +1925,26 @@ static const struct category categories[] = { {0} }; +static int ComponentInfo_Compare(const void *key, const struct wine_rb_entry *entry) +{ + ComponentInfo *info = WINE_RB_ENTRY_VALUE(entry, ComponentInfo, entry); + return memcmp(key, &info->clsid, sizeof(info->clsid)); +} + +static struct wine_rb_tree component_info_cache = { ComponentInfo_Compare }; + +static CRITICAL_SECTION component_info_cache_cs; +static CRITICAL_SECTION_DEBUG component_info_cache_cs_dbg = +{ + 0, 0, &component_info_cache_cs, + { &component_info_cache_cs_dbg.ProcessLocksList, &component_info_cache_cs_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": component_info_cache") } +}; +static CRITICAL_SECTION component_info_cache_cs = { &component_info_cache_cs_dbg, -1, 0, 0, 0, 0 }; + HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) { + struct wine_rb_entry *cache_entry; ComponentInfo *info; HKEY clsidkey; HKEY classkey; @@ -1936,9 +1956,23 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) BOOL found = FALSE; HRESULT hr; + EnterCriticalSection(&component_info_cache_cs); + + cache_entry = wine_rb_get(&component_info_cache, clsid); + if(cache_entry) + { + info = WINE_RB_ENTRY_VALUE(cache_entry, ComponentInfo, entry); + IWICComponentInfo_AddRef(*ppIInfo = &info->IWICComponentInfo_iface); + LeaveCriticalSection(&component_info_cache_cs); + return S_OK; + } + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, KEY_READ, &clsidkey); if (res != ERROR_SUCCESS) + { + LeaveCriticalSection(&component_info_cache_cs); return HRESULT_FROM_WIN32(res); + } for (category=categories; category->type; category++) { @@ -1980,10 +2014,21 @@ HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) RegCloseKey(clsidkey); if (SUCCEEDED(hr)) - *ppIInfo = &info->IWICComponentInfo_iface; + { + wine_rb_put(&component_info_cache, clsid, &info->entry); + IWICComponentInfo_AddRef(*ppIInfo = &info->IWICComponentInfo_iface); + } + LeaveCriticalSection(&component_info_cache_cs); return hr; } +void ReleaseComponentInfos(void) +{ + ComponentInfo *info, *next_info; + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(info, next_info, &component_info_cache, ComponentInfo, entry) + IWICComponentInfo_Release(&info->IWICComponentInfo_iface); +} + typedef struct { IEnumUnknown IEnumUnknown_iface; LONG ref; diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 3bed565..6f781b8 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -42,6 +42,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); break; + case DLL_PROCESS_DETACH: + ReleaseComponentInfos(); + break; } return WIC_DllMain(hinstDLL, fdwReason, lpvReserved); diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 4a9c9c6..d00e9d8 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -139,7 +139,6 @@ static void test_decoder_info(void) decoder_info2 = NULL; hr = IWICBitmapDecoder_GetDecoderInfo(decoder, &decoder_info2); ok(hr == S_OK, "Failed to get decoder info, hr %#x.\n", hr); - todo_wine ok(decoder_info == decoder_info2, "Unexpected decoder info instance.\n"); hr = IWICBitmapDecoderInfo_QueryInterface(decoder_info, &IID_IWICBitmapDecoder, (void **)&decoder2); @@ -470,17 +469,38 @@ static void test_pixelformat_info(void) IWICComponentInfo_Release(info); } +static DWORD WINAPI cache_across_threads_test(void *arg) +{ + IWICComponentInfo *info; + HRESULT hr; + + CoInitialize(NULL); + + hr = get_component_info(&CLSID_WICUnknownMetadataReader, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + ok(info == arg, "unexpected info pointer %p\n", info); + IWICComponentInfo_Release(info); + + CoUninitialize(); + return 0; +} + static void test_reader_info(void) { IWICImagingFactory *factory; - IWICComponentInfo *info; + IWICComponentInfo *info, *info2; IWICMetadataReaderInfo *reader_info; HRESULT hr; CLSID clsid; GUID container_formats[10]; - UINT count, size; + UINT count, size, tid; + HANDLE thread; WICMetadataPattern *patterns; + hr = get_component_info(&CLSID_WICUnknownMetadataReader, &info2); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + IWICComponentInfo_Release(info2); + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); @@ -488,6 +508,11 @@ static void test_reader_info(void) hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICUnknownMetadataReader, &info); ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + ok(info == info2, "info != info2\n"); + + thread = CreateThread(NULL, 0, cache_across_threads_test, info, 0, &tid); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); hr = IWICComponentInfo_QueryInterface(info, &IID_IWICMetadataReaderInfo, (void**)&reader_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index c2c5ce4..037bde2 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -124,6 +124,7 @@ extern HRESULT CreatePropertyBag2(const PROPBAG2 *options, UINT count, IPropertyBag2 **property) DECLSPEC_HIDDEN; extern HRESULT CreateComponentInfo(REFCLSID clsid, IWICComponentInfo **ppIInfo) DECLSPEC_HIDDEN; +extern void ReleaseComponentInfos(void) DECLSPEC_HIDDEN; extern HRESULT CreateComponentEnumerator(DWORD componentTypes, DWORD options, IEnumUnknown **ppIEnumUnknown) DECLSPEC_HIDDEN; typedef struct BmpDecoder BmpDecoder;

1 0

Jacek Caban : windowscodecs: Use common base structure for component info implementations.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 0c8dc2bfba843b0be72c0d592d82e94dafce05d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8dc2bfba843b0be72c0d59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 29 20:50:23 2018 +0200 windowscodecs: Use common base structure for component info implementations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/info.c | 148 ++++++++++++++++++++++------------------------ 1 file changed, 71 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0c8dc2bfba843b0be72c…

1 0

Henri Verbeet : wined3d: Add some traces to arbfp_blitter_blit().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: dcbbddf0cd0640b9d57ad54a015e0c9ec6589f4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcbbddf0cd0640b9d57ad54a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:15 2018 +0430 wined3d: Add some traces to arbfp_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2c0a46f..d29264d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7814,12 +7814,24 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), color_key, debug_d3dtexturefiltertype(filter)); + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, &dst_texture->resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, color_key, filter); } arbfp_blitter = CONTAINING_RECORD(blitter, struct wined3d_arbfp_blitter, blitter);

1 0

Henri Verbeet : wined3d: Add some traces to fbo_blitter_blit().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: 267a154be7ee0223d6cb74151b034d2f687c480f URL: https://source.winehq.org/git/wine.git/?a=commit;h=267a154be7ee0223d6cb7415… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:14 2018 +0430 wined3d: Add some traces to fbo_blitter_blit(). For easier debugging. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d7aaf2..ee325a1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2192,6 +2192,12 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit struct wined3d_device *device; struct wined3d_blitter *next; + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); + src_resource = &src_texture->resource; dst_resource = &dst_texture->resource; @@ -2208,9 +2214,15 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (!fbo_blitter_supported(blit_op, context->gl_info, src_resource, src_location, dst_resource, dst_location)) { - if ((next = blitter->next)) - return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, - src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); } if (blit_op == WINED3D_BLIT_OP_COLOR_BLIT)

1 0

Henri Verbeet : wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: e7af1ea387f0133d12ccc979c13854c1040eb274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7af1ea387f0133d12ccc979… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:13 2018 +0430 wined3d: Avoid a FIXME about 0 back-buffer usage in wined3d_device_reset(). Since we use this for ddraw now. 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 b17effe..adaa4f1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,7 +4778,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, TRACE("refresh_rate %u\n", swapchain_desc->refresh_rate); TRACE("auto_restore_display_mode %#x\n", swapchain_desc->auto_restore_display_mode); - if (swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) + if (swapchain_desc->backbuffer_usage && swapchain_desc->backbuffer_usage != WINED3DUSAGE_RENDERTARGET) FIXME("Got unexpected backbuffer usage %#x.\n", swapchain_desc->backbuffer_usage); if (swapchain_desc->swap_effect != WINED3D_SWAP_EFFECT_DISCARD

1 0

Henri Verbeet : wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm().
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: f93691dca23b8ecce9a3a7af8c6650d3487385e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93691dca23b8ecce9a3a7af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:12 2018 +0430 wined3d: Get rid of convert_p8_uint_b8g8r8a8_unorm(). Perhaps this made sense when we still pretended to support P8 textures, but currently this should never get used, and certainly not in the colour-keying path. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +----- dlls/wined3d/utils.c | 57 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 8 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b94b07b..8d7aaf2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2091,9 +2091,6 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->locations); if (conversion) { - /* This code is only entered for color keying fixups */ - struct wined3d_palette *palette = NULL; - wined3d_format_calculate_pitch(format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -2105,10 +2102,8 @@ BOOL texture2d_load_texture(struct wined3d_texture *texture, unsigned int sub_re context_release(context); return FALSE; } - if (texture->swapchain && texture->swapchain->palette) - palette = texture->swapchain->palette; conversion->convert(src_mem, src_row_pitch, dst_mem, dst_row_pitch, - width, height, palette, &texture->async.gl_color_key); + width, height, &texture->async.gl_color_key); src_row_pitch = dst_row_pitch; src_slice_pitch = dst_slice_pitch; context_unmap_bo_address(context, &data, GL_PIXEL_UNPACK_BUFFER); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 95f26a3..8b2019d 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -895,45 +895,9 @@ static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD colo && color <= color_key->color_space_high_value; } -static void convert_p8_uint_b8g8r8a8_unorm(const BYTE *src, unsigned int src_pitch, - BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) -{ - const BYTE *src_row; - unsigned int x, y; - DWORD *dst_row; - - if (!palette) - { - /* FIXME: This should probably use the system palette. */ - FIXME("P8 surface loaded without a palette.\n"); - - for (y = 0; y < height; ++y) - { - memset(&dst[dst_pitch * y], 0, width * 4); - } - - return; - } - - for (y = 0; y < height; ++y) - { - src_row = &src[src_pitch * y]; - dst_row = (DWORD *)&dst[dst_pitch * y]; - for (x = 0; x < width; ++x) - { - BYTE src_color = src_row[x]; - dst_row[x] = 0xff000000 - | (palette->colors[src_color].rgbRed << 16) - | (palette->colors[src_color].rgbGreen << 8) - | palette->colors[src_color].rgbBlue; - } - } -} - static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -956,7 +920,7 @@ static void convert_b5g6r5_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsig static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const WORD *src_row; unsigned int x, y; @@ -979,7 +943,7 @@ static void convert_b5g5r5x1_unorm_b5g5r5a1_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const BYTE *src_row; unsigned int x, y; @@ -1000,7 +964,7 @@ static void convert_b8g8r8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsig static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1023,7 +987,7 @@ static void convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, uns static void convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, unsigned int height, - const struct wined3d_palette *palette, const struct wined3d_color_key *color_key) + const struct wined3d_color_key *color_key) { const DWORD *src_row; unsigned int x, y; @@ -1062,10 +1026,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers {WINED3DFMT_B8G8R8X8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8x8_unorm_b8g8r8a8_unorm_color_key }}, {WINED3DFMT_B8G8R8A8_UNORM, {WINED3DFMT_B8G8R8A8_UNORM, convert_b8g8r8a8_unorm_b8g8r8a8_unorm_color_key }}, }; - static const struct wined3d_color_key_conversion convert_p8 = - { - WINED3DFMT_B8G8R8A8_UNORM, convert_p8_uint_b8g8r8a8_unorm - }; if (need_alpha_ck && (texture->async.flags & WINED3D_TEXTURE_ASYNC_COLOR_KEY)) { @@ -1078,13 +1038,6 @@ const struct wined3d_color_key_conversion * wined3d_format_get_color_key_convers FIXME("Color-keying not supported with format %s.\n", debug_d3dformat(format->id)); } - /* FIXME: This should check if the blitter backend can do P8 conversion, - * instead of checking for ARB_fragment_program. */ - if (format->id == WINED3DFMT_P8_UINT - && !(texture->resource.device->adapter->gl_info.supported[ARB_FRAGMENT_PROGRAM] - && texture->swapchain && texture == texture->swapchain->front_buffer)) - return &convert_p8; - return NULL; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 080134d..a25d984 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4214,8 +4214,8 @@ struct wined3d_rational struct wined3d_color_key_conversion { enum wined3d_format_id dst_format; - void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, unsigned int width, - unsigned int height, const struct wined3d_palette *palette, const struct wined3d_color_key *color_key); + void (*convert)(const BYTE *src, unsigned int src_pitch, BYTE *dst, unsigned int dst_pitch, + unsigned int width, unsigned int height, const struct wined3d_color_key *colour_key); }; struct wined3d_format

1 0

Henri Verbeet : ddraw: Copy the entire front-buffer surface after a buffer swap.
by Alexandre Julliard 30 Mar '18

30 Mar '18

Module: wine Branch: master Commit: a362daeaf56e054c96d463edb2ae87e8956a6875 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a362daeaf56e054c96d463ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Mar 30 17:39:11 2018 +0430 ddraw: Copy the entire front-buffer surface after a buffer swap. wined3d_swapchain_present() will invalidate everything except WINED3D_LOCATION_DRAWABLE, which means a partial blit to the front-buffer afterwards might need to read the drawable contents back to the texture. For P8 front-buffers that's problematic, because the original palette indices are lost. We may want to improve the wined3d side of this to avoid reading back the drawable, but copying the entire surface in ddraw in this situation seems like a good idea regardless. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/surface.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a9632de..b8552af 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -59,6 +59,7 @@ struct FvfToDecl #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 #define DDRAW_SCL_RECURSIVE 0x00000020 +#define DDRAW_SWAPPED 0x00000040 #define DDRAW_STRIDE_ALIGNMENT 8 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 2d20049..cb837b1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -50,6 +50,12 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; + if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + { + surface->ddraw->flags &= ~DDRAW_SWAPPED; + rect = NULL; + } + if (!rect) { SetRect(&r, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight); @@ -78,7 +84,10 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) + { hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + surface->ddraw->flags |= DDRAW_SWAPPED; + } return hr; }

1 0

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 2018