wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Józef Kucia : d3d11/tests: Add test for swapchain views.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 98adaffc55dab371c94f3fdbf276d85432f7a0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98adaffc55dab371c94f3fdbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:26 2016 +0200 d3d11/tests: Add test for swapchain views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e412c634..05f7917 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7481,6 +7481,49 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_swapchain_views(void) +{ + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + struct d3d11_test_context test_context; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + HRESULT hr; + + static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + draw_color_quad(&test_context, &color); + check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)test_context.backbuffer, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + draw_color_quad(&test_context, &color); + todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); + + srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + U(srv_desc).Texture2D.MostDetailedMip = 0; + U(srv_desc).Texture2D.MipLevels = 1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)test_context.backbuffer, &srv_desc, &srv); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D11RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + static void test_swapchain_flip(void) { ID3D11Texture2D *backbuffer_0, *backbuffer_1, *backbuffer_2, *offscreen; @@ -10383,6 +10426,7 @@ START_TEST(d3d11) test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); + test_swapchain_views(); test_swapchain_flip(); test_clear_render_target_view(); test_clear_depth_stencil_view();

1 0

Józef Kucia : d3d11/tests: Add initial test for required formats.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: ea8dd85ba9a1f6ac5be1e90efa455fabcb5907d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8dd85ba9a1f6ac5be1e90ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:25 2016 +0200 d3d11/tests: Add initial test for required formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0760917..e412c634 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10247,6 +10247,106 @@ static void test_line_antialiasing_blending(void) release_test_context(&test_context); } +struct format_support +{ + DXGI_FORMAT format; + D3D_FEATURE_LEVEL fl_required; + D3D_FEATURE_LEVEL fl_optional; +}; + +static void check_format_support(const unsigned int *format_support, D3D_FEATURE_LEVEL feature_level, + const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, + const char *feature_name) +{ + unsigned int i; + + for (i = 0; i < format_count; ++i) + { + DXGI_FORMAT format = formats[i].format; + unsigned int supported = format_support[format] & feature_flag; + + if (formats[i].fl_required <= feature_level) + { + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); + continue; + } + + if (formats[i].fl_optional <= feature_level) + continue; + + ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); + } +} + +static void test_required_format_support(void) +{ + unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; + ID3D11Device *device; + DXGI_FORMAT format; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct format_support index_buffers[] = + { + {DXGI_FORMAT_R32_UINT, D3D_FEATURE_LEVEL_9_2}, + {DXGI_FORMAT_R16_UINT, D3D_FEATURE_LEVEL_9_1}, + }; + + static const struct format_support display[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10A2_UNORM, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0}, + }; + + for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) + { + D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; + struct device_desc device_desc; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + continue; + } + + memset(format_support, 0, sizeof(format_support)); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + hr = ID3D11Device_CheckFormatSupport(device, format, &format_support[format]); + todo_wine ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), + "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", + format, hr, format_support[format]); + } + if (hr == E_NOTIMPL) + { + skip("CheckFormatSupport not implemented.\n"); + ID3D11Device_Release(device); + continue; + } + + check_format_support(format_support, feature_level, + index_buffers, sizeof(index_buffers) / sizeof(*index_buffers), + D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + + check_format_support(format_support, feature_level, + display, sizeof(display) / sizeof(*display), + D3D11_FORMAT_SUPPORT_DISPLAY, "display"); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + START_TEST(d3d11) { test_create_device(); @@ -10303,4 +10403,5 @@ START_TEST(d3d11) test_index_buffer_offset(); test_face_culling(); test_line_antialiasing_blending(); + test_required_format_support(); }

1 0

Józef Kucia : wined3d: Add few missing formats.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 4323924b2de57d1c04cf8ecdd2957519fbd7a551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4323924b2de57d1c04cf8ecdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:24 2016 +0200 wined3d: Add few missing formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 12 ++++++++++++ dlls/dxgi/utils.c | 12 ++++++++++++ dlls/wined3d/utils.c | 4 ++++ include/wine/wined3d.h | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 36cad41..370858e 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -139,10 +139,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_D3D_TO_STR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_UF16); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_SF16); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); @@ -255,10 +259,14 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM; case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS; + case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16; + case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16; case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; @@ -361,10 +369,14 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM; case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS; + case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16; + case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16; case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 9371de1..b9be4a5 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -137,10 +137,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_DXGI_TO_STR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_TYPELESS); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_UF16); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_SF16); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); @@ -245,10 +249,14 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM; case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS; + case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16; + case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16; case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; @@ -351,10 +359,14 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM; case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS; + case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16; + case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16; case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 31d5014..f02220c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3671,6 +3671,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R10G10B10A2_UNORM); FMT_TO_STR(WINED3DFMT_R10G10B10A2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10A2_SNORM); + FMT_TO_STR(WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM); FMT_TO_STR(WINED3DFMT_R11G11B10_FLOAT); FMT_TO_STR(WINED3DFMT_R8G8B8A8_TYPELESS); FMT_TO_STR(WINED3DFMT_R8G8B8A8_UNORM); @@ -3738,6 +3739,9 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB); FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_BC6H_TYPELESS); + FMT_TO_STR(WINED3DFMT_BC6H_UF16); + FMT_TO_STR(WINED3DFMT_BC6H_SF16); FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); FMT_TO_STR(WINED3DFMT_BC7_UNORM); FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1e50020..1c9b262 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -151,6 +151,7 @@ enum wined3d_format_id WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_SNORM, + WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM, WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_R8G8B8A8_TYPELESS, WINED3DFMT_R8G8B8A8_UNORM, @@ -218,6 +219,9 @@ enum wined3d_format_id WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, WINED3DFMT_B8G8R8X8_UNORM_SRGB, + WINED3DFMT_BC6H_TYPELESS, + WINED3DFMT_BC6H_UF16, + WINED3DFMT_BC6H_SF16, WINED3DFMT_BC7_TYPELESS, WINED3DFMT_BC7_UNORM, WINED3DFMT_BC7_UNORM_SRGB,

1 0

Aaryaman Vasishta : d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 3987417688a5e5e9c2d38b79683e55bfeb726679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987417688a5e5e9c2d38b796… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Aug 10 21:25:02 2016 +0530 d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index a8d646b..57fd7c0 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -213,7 +213,7 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID { IDirectDraw *ddraw; IDirectDrawSurface *surface; - IDirect3DDevice2 *d3d_device2; + IDirect3DDevice2 *d3d_device2 = NULL; DDSURFACEDESC desc; HRESULT hr; @@ -223,9 +223,6 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID IDirect3DRM_AddRef(device->d3drm); IDirect3DDevice_AddRef(d3d_device); - if (device->ddraw) - return D3DRMERR_BADOBJECT; - /* Fetch render target and get width/height from there */ if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) { @@ -237,16 +234,26 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID return hr; } + if (device->ddraw) + { + if (d3d_device2) + IDirectDrawSurface_Release(surface); + return D3DRMERR_BADOBJECT; + } + desc.dwSize = sizeof(desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - IDirectDrawSurface_Release(surface); if (FAILED(hr)) + { + IDirectDrawSurface_Release(surface); return hr; + } device->ddraw = ddraw; device->width = desc.dwWidth; device->height = desc.dwHeight; device->device = d3d_device; + device->render_target = surface; return hr; }

1 0

Bruno Jesus : odbc32: Upgrade a WARN into ERR when the library is not found.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: dca0e38d82c737cd8aeab63e08cf1990d05d9671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca0e38d82c737cd8aeab63e0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 9 18:06:47 2016 -0300 odbc32: Upgrade a WARN into ERR when the library is not found. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d7ebf10..aca0792 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -520,7 +520,7 @@ static BOOL ODBC_LoadDriverManager(void) return TRUE; } failed: - WARN("failed to open library %s: %s\n", debugstr_a(s), error); + ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), error); nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; }

1 0

Michael Stefaniuc : mmdevapi: Another use case for todo_wine_if().
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 4f06fd1490a759824ee27456df07b8103d7d72a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f06fd1490a759824ee27456d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:28:37 2016 +0200 mmdevapi: Another use case for todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 749272a..99da296 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -309,19 +309,13 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { /* FIXME: Some drivers fail */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); - }else{ ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next);

1 0

Hugh McMaster : server: Get and set the console pop-up color attributes.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: f592f931b2fe0eead1e136f7a087babc7efe23ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f592f931b2fe0eead1e136f7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:57 2016 +0000 server: Get and set the console pop-up color attributes. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 24 +++++++++++++----------- programs/wineconsole/wineconsole.c | 3 ++- server/console.c | 9 ++++++++- server/protocol.def | 23 +++++++++++++---------- server/request.h | 34 ++++++++++++++++++---------------- server/trace.c | 2 ++ 6 files changed, 56 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f592f931b2fe0eead1e13…

1 0

Hugh McMaster : wineconsole: Add 'PopupColors' support to the registry.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b9a79c095e3410ada90d4f04308d97aa9e4e43cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a79c095e3410ada90d4f043… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:45 2016 +0000 wineconsole: Add 'PopupColors' support to the registry. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/registry.c | 20 +++++++++++++++----- programs/wineconsole/winecon_private.h | 3 ++- programs/wineconsole/wineconsole.c | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/registry.c b/programs/wineconsole/registry.c index f5fa433..e537a86 100644 --- a/programs/wineconsole/registry.c +++ b/programs/wineconsole/registry.c @@ -44,6 +44,7 @@ static const WCHAR wszHistoryBufferSize[] = {'H','i','s','t','o','r','y','B','u' static const WCHAR wszHistoryNoDup[] = {'H','i','s','t','o','r','y','N','o','D','u','p',0}; static const WCHAR wszInsertMode[] = {'I','n','s','e','r','t','M','o','d','e',0}; static const WCHAR wszMenuMask[] = {'M','e','n','u','M','a','s','k',0}; +static const WCHAR wszPopupColors[] = {'P','o','p','u','p','C','o','l','o','r','s',0}; static const WCHAR wszQuickEdit[] = {'Q','u','i','c','k','E','d','i','t',0}; static const WCHAR wszScreenBufferSize[] = {'S','c','r','e','e','n','B','u','f','f','e','r','S','i','z','e',0}; static const WCHAR wszScreenColors[] = {'S','c','r','e','e','n','C','o','l','o','r','s',0}; @@ -55,12 +56,13 @@ static const WCHAR color_name_fmt[] = {'%','s','%','0','2','d',0}; void WINECON_DumpConfig(const char* pfx, const struct config_data* cfg) { - WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x font=%s/%u hist=%u/%d flags=%c%c%c msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", + WINE_TRACE("%s cell=(%u,%u) cursor=(%d,%d) attr=%02x pop-up=%02x font=%s/%u hist=%u/%d flags=%c%c%c " + "msk=%08x sb=(%u,%u) win=(%u,%u)x(%u,%u) edit=%u registry=%s\n", pfx, cfg->cell_width, cfg->cell_height, cfg->cursor_size, cfg->cursor_visible, cfg->def_attr, - wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, cfg->history_nodup ? 1 : 2, - cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', cfg->exit_on_die ? 'X' : 'x', - cfg->menu_mask, cfg->sb_width, cfg->sb_height, cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, - cfg->edition_mode, + cfg->popup_attr, wine_dbgstr_w(cfg->face_name), cfg->font_weight, cfg->history_size, + cfg->history_nodup ? 1 : 2, cfg->insert_mode ? 'I' : 'i', cfg->quick_edit ? 'Q' : 'q', + cfg->exit_on_die ? 'X' : 'x', cfg->menu_mask, cfg->sb_width, cfg->sb_height, + cfg->win_pos.X, cfg->win_pos.Y, cfg->win_width, cfg->win_height, cfg->edition_mode, wine_dbgstr_w(cfg->registry)); } @@ -149,6 +151,10 @@ static void WINECON_RegLoadHelper(HKEY hConKey, struct config_data* cfg) cfg->menu_mask = val; count = sizeof(val); + if (!RegQueryValueExW(hConKey, wszPopupColors, 0, &type, (LPBYTE)&val, &count)) + cfg->popup_attr = val; + + count = sizeof(val); if (!RegQueryValueExW(hConKey, wszQuickEdit, 0, &type, (LPBYTE)&val, &count)) cfg->quick_edit = val; @@ -209,6 +215,7 @@ void WINECON_RegLoad(const WCHAR* appname, struct config_data* cfg) cfg->history_nodup = 0; cfg->insert_mode = 1; cfg->menu_mask = 0; + cfg->popup_attr = 0xF5; cfg->quick_edit = 0; cfg->sb_height = 25; cfg->sb_width = 80; @@ -293,6 +300,9 @@ static void WINECON_RegSaveHelper(HKEY hConKey, const struct config_data* cfg) val = cfg->menu_mask; RegSetValueExW(hConKey, wszMenuMask, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->popup_attr; + RegSetValueExW(hConKey, wszPopupColors, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); + val = cfg->quick_edit; RegSetValueExW(hConKey, wszQuickEdit, 0, REG_DWORD, (LPBYTE)&val, sizeof(val)); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 7236879..d556299 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -32,7 +32,8 @@ struct config_data { unsigned cell_height; /* height in pixels of a character */ int cursor_size; /* in % of cell height */ int cursor_visible; - DWORD def_attr; + DWORD def_attr; /* default fill attributes (screen colors) */ + DWORD popup_attr; /* pop-up color attributes */ WCHAR face_name[32]; /* name of font (size is LF_FACESIZE) */ DWORD font_weight; DWORD history_size; /* number of commands in history buffer */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index b9da7b6..babc3ef 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -214,13 +214,14 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) /****************************************************************** * WINECON_SetColors * - * + * Sets ColorTable and Pop-up menu colors */ static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) { size_t color_map_size = sizeof(data->curcfg.color_map); memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + data->curcfg.popup_attr = cfg->popup_attr; SERVER_START_REQ( set_console_output_info ) {

1 0

Hugh McMaster : server: Get and set the console color table.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 2d7c73d802f7a8c09cf8896609c1c8c66acb1bb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d7c73d802f7a8c09cf889660… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:34 2016 +0000 server: Get and set the console color table. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 5 ++++- programs/wineconsole/wineconsole.c | 23 ++++++++++++++++++++++- server/console.c | 9 +++++++++ server/protocol.def | 3 +++ server/trace.c | 20 ++++++++++++++------ 5 files changed, 52 insertions(+), 8 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b221570..5a6e277 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1947,6 +1947,7 @@ struct set_console_output_info_request short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_50[6]; }; struct set_console_output_info_reply @@ -1960,6 +1961,7 @@ struct set_console_output_info_reply #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 @@ -1986,6 +1988,7 @@ struct get_console_output_info_reply short int max_height; short int font_width; short int font_height; + /* VARARG(colors,uints); */ char __pad_38[2]; }; @@ -6245,6 +6248,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 507 +#define SERVER_PROTOCOL_VERSION 508 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e5e2823..b9da7b6 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -212,6 +212,27 @@ static BOOL WINECON_SetEditionMode(HANDLE hConIn, int edition_mode) } /****************************************************************** + * WINECON_SetColors + * + * + */ +static void WINECON_SetColors(struct inner_data *data, const struct config_data* cfg) +{ + size_t color_map_size = sizeof(data->curcfg.color_map); + + memcpy(data->curcfg.color_map, cfg->color_map, color_map_size); + + SERVER_START_REQ( set_console_output_info ) + { + req->handle = wine_server_obj_handle( data->hConOut ); + req->mask = SET_CONSOLE_OUTPUT_INFO_COLORTABLE; + wine_server_add_data( req, cfg->color_map, color_map_size ); + wine_server_call( req ); + } + SERVER_END_REQ; +} + +/****************************************************************** * WINECON_GrabChanges * * A change occurs, try to figure out which @@ -449,6 +470,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); SetConsoleTextAttribute(data->hConOut, cfg->def_attr); } + WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... * since the server checks that sb is always bigger than window, * we have to take care of doing the operations in the right order @@ -703,7 +725,6 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* fall through */ case init_success: WINECON_GetServerConfig(data); - memcpy(data->curcfg.color_map, cfg.color_map, sizeof(data->curcfg.color_map)); data->cells = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, data->curcfg.sb_width * data->curcfg.sb_height * sizeof(CHAR_INFO)); if (!data->cells) WINECON_Fatal("OOM\n"); diff --git a/server/console.c b/server/console.c index 93f785a..ab764dc 100644 --- a/server/console.c +++ b/server/console.c @@ -147,6 +147,7 @@ struct screen_buffer int max_height; char_info_t *data; /* the data for each cell - a width x height matrix */ unsigned short attr; /* default attribute for screen buffer */ + unsigned int color_map[16]; /* color table */ rectangle_t win; /* current visible window on the screen buffer * * as seen in wineconsole */ struct font_info font; /* console font information */ @@ -426,6 +427,7 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->data = NULL; screen_buffer->font.width = 0; screen_buffer->font.height = 0; + memset( screen_buffer->color_map, 0, sizeof(screen_buffer->color_map) ); list_add_head( &screen_buffer_list, &screen_buffer->entry ); if (fd == -1) @@ -1032,6 +1034,11 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, screen_buffer->font.width = req->font_width; screen_buffer->font.height = req->font_height; } + if (req->mask & SET_CONSOLE_OUTPUT_INFO_COLORTABLE) + { + memcpy( screen_buffer->color_map, get_req_data(), + min( sizeof(screen_buffer->color_map), get_req_data_size() )); + } return 1; } @@ -1690,6 +1697,8 @@ DECL_HANDLER(get_console_output_info) reply->max_height = screen_buffer->max_height; reply->font_width = screen_buffer->font.width; reply->font_height = screen_buffer->font.height; + set_reply_data( screen_buffer->color_map, + min( sizeof(screen_buffer->color_map), get_reply_max_size() )); release_object( screen_buffer ); } } diff --git a/server/protocol.def b/server/protocol.def index 5917212..c11b679 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1537,6 +1537,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END #define SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM 0x01 #define SET_CONSOLE_OUTPUT_INFO_CURSOR_POS 0x02 @@ -1545,6 +1546,7 @@ struct console_renderer_event #define SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW 0x10 #define SET_CONSOLE_OUTPUT_INFO_MAX_SIZE 0x20 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x40 +#define SET_CONSOLE_OUTPUT_INFO_COLORTABLE 0x80 /* Get info about a console (output only) */ @@ -1566,6 +1568,7 @@ struct console_renderer_event short int max_height; short int font_width; /* font size (width x height) */ short int font_height; + VARARG(colors,uints); /* color table */ @END /* Add input records to a console input queue */ diff --git a/server/trace.c b/server/trace.c index 9e64b4c..d17564f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -58,9 +58,9 @@ static inline void remove_data( data_size_t size ) cur_size -= size; } -static void dump_uints( const int *ptr, int len ) +static void dump_uints( const char *prefix, const unsigned int *ptr, int len ) { - fputc( '{', stderr ); + fprintf( stderr, "%s{", prefix ); while (len > 0) { fprintf( stderr, "%08x", *ptr++ ); @@ -407,6 +407,14 @@ static void dump_varargs_ints( const char *prefix, data_size_t size ) remove_data( size ); } +static void dump_varargs_uints( const char *prefix, data_size_t size ) +{ + const unsigned int *data = cur_data; + + dump_uints( prefix, data, size / sizeof(*data) ); + remove_data( size ); +} + static void dump_varargs_uints64( const char *prefix, data_size_t size ) { const unsigned __int64 *data = cur_data; @@ -574,10 +582,8 @@ static void dump_varargs_context( const char *prefix, data_size_t size ) } } if (ctx.flags & SERVER_CTX_EXTENDED_REGISTERS) - { - fprintf( stderr, ",extended=" ); - dump_uints( (const int *)ctx.ext.i386_regs, sizeof(ctx.ext.i386_regs) / sizeof(int) ); - } + dump_uints( ",extended=", (const unsigned int *)ctx.ext.i386_regs, + sizeof(ctx.ext.i386_regs) / sizeof(int) ); break; case CPU_x86_64: if (ctx.flags & SERVER_CTX_CONTROL) @@ -2035,6 +2041,7 @@ static void dump_set_console_output_info_request( const struct set_console_outpu fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_get_console_output_info_request( const struct get_console_output_info_request *req ) @@ -2059,6 +2066,7 @@ static void dump_get_console_output_info_reply( const struct get_console_output_ fprintf( stderr, ", max_height=%d", req->max_height ); fprintf( stderr, ", font_width=%d", req->font_width ); fprintf( stderr, ", font_height=%d", req->font_height ); + dump_varargs_uints( ", colors=", cur_size ); } static void dump_write_console_input_request( const struct write_console_input_request *req )

1 0

Huw Davies : riched20: Update the auto url detection after a StreamIn.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: adb43b91922404f76a3952d8be1c2608fe2479ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb43b91922404f76a3952d8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 11 11:32:04 2016 +0100 riched20: Update the auto url detection after a StreamIn. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ec72e2..fb77a67 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1559,8 +1559,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { + ME_Cursor start; + from = ME_GetCursorOfs(&editor->pCursors[0]); if (format & SF_RTF) { - from = ME_GetCursorOfs(&editor->pCursors[0]); /* setup the RTF parser */ memset(&parser, 0, sizeof parser); @@ -1662,12 +1663,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre style = parser.style; } else if (format & SF_TEXT) + { num_read = ME_StreamInText(editor, format, &inStream, style); + to = ME_GetCursorOfs(&editor->pCursors[0]); + } else ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) ME_SetSelection(editor, 0, 0); + ME_CursorFromCharOfs(editor, from, &start); + ME_UpdateLinkAttribute(editor, &start, to - from); } /* Restore saved undo mode */

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
78
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 August 2016