wine-commits July 2015

wine-commits@winehq.org

2 participants
567 discussions

Sebastian Lackner : vcomp: Implement omp_{get,set}_nested.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 800ca050dfeea9f08bb35b5aac87ca7856ef2218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=800ca050dfeea9f08bb35b5aa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:39:46 2015 +0200 vcomp: Implement omp_{get,set}_nested. --- dlls/vcomp/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 5a50486..b827920 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); static int vcomp_max_threads; static int vcomp_num_threads; +static BOOL vcomp_nested_fork = FALSE; int CDECL omp_get_dynamic(void) { @@ -47,7 +48,7 @@ int CDECL omp_get_max_threads(void) int CDECL omp_get_nested(void) { TRACE("stub\n"); - return 0; + return vcomp_nested_fork; } int CDECL omp_get_num_procs(void) @@ -81,7 +82,8 @@ void CDECL omp_set_dynamic(int val) void CDECL omp_set_nested(int nested) { - TRACE("(%d): stub\n", nested); + TRACE("(%d)\n", nested); + vcomp_nested_fork = (nested != 0); } void CDECL omp_set_num_threads(int num_threads)

1 0

Sebastian Lackner : vcomp: Implement omp_get_max_threads and omp_set_num_threads.
by Alexandre Julliard 15 Jul '15

15 Jul '15

Module: wine Branch: master Commit: 4dea3e071d8de2742862009e021bce7504f92646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dea3e071d8de2742862009e0… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Jul 14 21:39:33 2015 +0200 vcomp: Implement omp_get_max_threads and omp_set_num_threads. --- dlls/vcomp/main.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab2a372..5a50486 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +static int vcomp_max_threads; +static int vcomp_num_threads; + int CDECL omp_get_dynamic(void) { TRACE("stub\n"); @@ -37,8 +40,8 @@ int CDECL omp_get_dynamic(void) int CDECL omp_get_max_threads(void) { - TRACE("stub\n"); - return 1; + TRACE("()\n"); + return vcomp_max_threads; } int CDECL omp_get_nested(void) @@ -83,7 +86,9 @@ void CDECL omp_set_nested(int nested) void CDECL omp_set_num_threads(int num_threads) { - TRACE("(%d): stub\n", num_threads); + TRACE("(%d)\n", num_threads); + if (num_threads >= 1) + vcomp_num_threads = num_threads; } void CDECL _vcomp_barrier(void) @@ -107,17 +112,25 @@ void CDECL _vcomp_single_end(void) TRACE("stub\n"); } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %d, %p)\n", instance, reason, reserved); - switch (fdwReason) + switch (reason) { case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); + { + SYSTEM_INFO sysinfo; + DisableThreadLibraryCalls(instance); + + GetSystemInfo(&sysinfo); + vcomp_max_threads = sysinfo.dwNumberOfProcessors; + vcomp_num_threads = sysinfo.dwNumberOfProcessors; break; + } } return TRUE;

1 0

Henri Verbeet : d2d1: Implement d2d_geometry_sink_AddLines().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: a8f45dff604058d419bd6c2e070f65a13a6ddfdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f45dff604058d419bd6c2e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:43 2015 +0200 d2d1: Implement d2d_geometry_sink_AddLines(). --- dlls/d2d1/d2d1_private.h | 7 +- dlls/d2d1/geometry.c | 983 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 135 +++++++ 3 files changed, 1118 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8f45dff604058d419bd6…

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_FillGeometry().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: b92a05c84ed92f8ebe618991315f95af3189a47b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92a05c84ed92f8ebe6189913… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:42 2015 +0200 d2d1: Implement d2d_d3d_render_target_FillGeometry(). --- dlls/d2d1/d2d1_private.h | 2 + dlls/d2d1/geometry.c | 9 +++ dlls/d2d1/render_target.c | 190 ++++++++++++++++++++++++++++------------------ 3 files changed, 126 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b92a05c84ed92f8ebe618…

1 0

Henri Verbeet : d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 3bb382aabbbb6cc95df05ef359a6fce4124754f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bb382aabbbb6cc95df05ef35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:41 2015 +0200 d2d1: Introduce a separate function to construct pixel shader constant buffers for brushes. --- dlls/d2d1/brush.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/d2d1_private.h | 14 ++++++++ dlls/d2d1/render_target.c | 72 ++------------------------------------- 3 files changed, 103 insertions(+), 70 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index edce7a2..762d201 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,6 +709,93 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) +{ + D3D10_SUBRESOURCE_DATA buffer_data; + D3D10_BUFFER_DESC buffer_desc; + struct + { + float _11, _21, _31, pad0; + float _12, _22, _32, pad1; + } transform; + D2D1_COLOR_F color; + HRESULT hr; + + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + buffer_data.SysMemPitch = 0; + buffer_data.SysMemSlicePitch = 0; + + if (brush->type == D2D_BRUSH_TYPE_SOLID) + { + color = brush->u.solid.color; + color.a *= brush->opacity; + + buffer_desc.ByteWidth = sizeof(color); + buffer_data.pSysMem = &color; + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + struct d2d_bitmap *bitmap = brush->u.bitmap.bitmap; + D2D_MATRIX_3X2_F w, b; + float dpi_scale, d; + + /* Scale for dpi. */ + w = render_target->drawing_state.transform; + dpi_scale = render_target->dpi_x / 96.0f; + w._11 *= dpi_scale; + w._21 *= dpi_scale; + w._31 *= dpi_scale; + dpi_scale = render_target->dpi_y / 96.0f; + w._12 *= dpi_scale; + w._22 *= dpi_scale; + w._32 *= dpi_scale; + + /* Scale for bitmap size and dpi. */ + b = brush->transform; + dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + b._11 *= dpi_scale; + b._21 *= dpi_scale; + dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + b._12 *= dpi_scale; + b._22 *= dpi_scale; + + d2d_matrix_multiply(&b, &w); + + /* Invert the matrix. (Because the matrix is applied to the sampling + * coordinates. I.e., to scale the bitmap by 2 we need to divide the + * coordinates by 2.) */ + d = b._11 * b._22 - b._21 * b._12; + if (d != 0.0f) + { + transform._11 = b._22 / d; + transform._21 = -b._21 / d; + transform._31 = (b._21 * b._32 - b._31 * b._22) / d; + transform._12 = -b._12 / d; + transform._22 = b._11 / d; + transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; + } + transform.pad1 = brush->opacity; + + buffer_desc.ByteWidth = sizeof(transform); + buffer_data.pSysMem = &transform; + } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + return E_NOTIMPL; + } + + if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, ps_cb))) + ERR("Failed to create constant buffer, hr %#x.\n", hr); + + return hr; +} + void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 91ebd9f..2e9f741 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -142,6 +142,8 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_tar ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; +HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, + ID3D10Buffer **ps_cb) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style @@ -233,4 +235,16 @@ struct d2d_geometry void d2d_path_geometry_init(struct d2d_geometry *geometry) DECLSPEC_HIDDEN; HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, const D2D1_RECT_F *rect) DECLSPEC_HIDDEN; +static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) +{ + D2D_MATRIX_3X2_F tmp = *a; + + a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; + a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; + a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; + a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; + a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; + a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; +} + #endif /* __WINE_D2D1_PRIVATE_H */ diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index fa98b5b..01b484e 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -32,18 +32,6 @@ struct d2d_draw_text_layout_ctx D2D1_DRAW_TEXT_OPTIONS options; }; -static void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) -{ - D2D_MATRIX_3X2_F tmp = *a; - - a->_11 = tmp._11 * b->_11 + tmp._12 * b->_21; - a->_12 = tmp._11 * b->_12 + tmp._12 * b->_22; - a->_21 = tmp._21 * b->_11 + tmp._22 * b->_21; - a->_22 = tmp._21 * b->_12 + tmp._22 * b->_22; - a->_31 = tmp._31 * b->_11 + tmp._32 * b->_21 + b->_31; - a->_32 = tmp._31 * b->_12 + tmp._32 * b->_22 + b->_32; -} - static void d2d_point_set(D2D1_POINT_2F *dst, float x, float y) { dst->x = x; @@ -550,7 +538,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; struct @@ -609,64 +596,9 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - if (brush_impl->type == D2D_BRUSH_TYPE_BITMAP) - { - struct d2d_bitmap *bitmap = brush_impl->u.bitmap.bitmap; - D2D_MATRIX_3X2_F w, b; - float dpi_scale, d; - - /* Scale for dpi. */ - w = render_target->drawing_state.transform; - dpi_scale = render_target->dpi_x / 96.0f; - w._11 *= dpi_scale; - w._21 *= dpi_scale; - w._31 *= dpi_scale; - dpi_scale = render_target->dpi_y / 96.0f; - w._12 *= dpi_scale; - w._22 *= dpi_scale; - w._32 *= dpi_scale; - - /* Scale for bitmap size and dpi. */ - b = brush_impl->transform; - dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); - b._11 *= dpi_scale; - b._21 *= dpi_scale; - dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); - b._12 *= dpi_scale; - b._22 *= dpi_scale; - - d2d_matrix_multiply(&b, &w); - - /* Invert the matrix. (Because the matrix is applied to the sampling - * coordinates. I.e., to scale the bitmap by 2 we need to divide the - * coordinates by 2.) */ - d = b._11 * b._22 - b._21 * b._12; - if (d != 0.0f) - { - transform._11 = b._22 / d; - transform._21 = -b._21 / d; - transform._31 = (b._21 * b._32 - b._31 * b._22) / d; - transform._12 = -b._12 / d; - transform._22 = b._11 / d; - transform._32 = -(b._11 * b._32 - b._31 * b._12) / d; - } - transform.pad1 = brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(transform); - buffer_data.pSysMem = &transform; - } - else - { - color = brush_impl->u.solid.color; - color.a *= brush_impl->opacity; - - buffer_desc.ByteWidth = sizeof(color); - buffer_data.pSysMem = &color; - } - - if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ps_cb))) + if (FAILED(hr = d2d_brush_get_ps_cb(brush_impl, render_target, &ps_cb))) { - WARN("Failed to create constant buffer, hr %#x.\n", hr); + WARN("Failed to get ps constant buffer, hr %#x.\n", hr); ID3D10Buffer_Release(vs_cb); return; }

1 0

Henri Verbeet : d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 1f4e37659c5d7e713d605696d8bb64a25c97aea7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4e37659c5d7e713d605696d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:40 2015 +0200 d2d1: Also bind the pixel shader and blend state in d2d_brush_bind_resources(). --- dlls/d2d1/brush.c | 16 ++++++++++++++-- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 20 ++++++-------------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cd5476a..edce7a2 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -709,12 +709,20 @@ static D3D10_TEXTURE_ADDRESS_MODE texture_addres_mode_from_extend_mode(D2D1_EXTE } } -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) { + static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D10Device *device = render_target->device; HRESULT hr; - if (brush->type == D2D_BRUSH_TYPE_BITMAP) + ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + if (brush->type == D2D_BRUSH_TYPE_SOLID) { + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); + } + else if (brush->type == D2D_BRUSH_TYPE_BITMAP) + { + ID3D10Device_PSSetShader(device, render_target->rect_bitmap_ps); ID3D10Device_PSSetShaderResources(device, 0, 1, &brush->u.bitmap.bitmap->view); if (!brush->u.bitmap.sampler_state) { @@ -743,4 +751,8 @@ void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) } ID3D10Device_PSSetSamplers(device, 0, 1, &brush->u.bitmap.sampler_state); } + else + { + FIXME("Unhandled brush type %#x.\n", brush->type); + } } diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8ddee9e..91ebd9f 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -141,7 +141,7 @@ void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1RenderTarget * HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; -void d2d_brush_bind_resources(struct d2d_brush *brush, ID3D10Device *device) DECLSPEC_HIDDEN; +void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target) DECLSPEC_HIDDEN; struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) DECLSPEC_HIDDEN; struct d2d_stroke_style diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index b7ca78c..fa98b5b 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -140,13 +140,12 @@ static void d2d_clip_stack_pop(struct d2d_clip_stack *stack) } static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer *vs_cb, - ID3D10PixelShader *ps, ID3D10Buffer *ps_cb, struct d2d_brush *brush) + ID3D10Buffer *ps_cb, struct d2d_brush *brush) { ID3D10Device *device = render_target->device; unsigned int offset; D3D10_VIEWPORT vp; HRESULT hr; - static const float blend_factor[] = {1.0f, 1.0f, 1.0f, 1.0f}; vp.TopLeftX = 0; vp.TopLeftY = 0; @@ -171,7 +170,6 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * ID3D10Device_VSSetConstantBuffers(device, 0, 1, &vs_cb); ID3D10Device_VSSetShader(device, render_target->vs); ID3D10Device_PSSetConstantBuffers(device, 0, 1, &ps_cb); - ID3D10Device_PSSetShader(device, ps); ID3D10Device_RSSetViewports(device, 1, &vp); if (render_target->clip_stack.count) { @@ -188,10 +186,9 @@ static void d2d_draw(struct d2d_d3d_render_target *render_target, ID3D10Buffer * } ID3D10Device_OMSetRenderTargets(device, 1, &render_target->view, NULL); if (brush) - { - ID3D10Device_OMSetBlendState(device, render_target->bs, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); - d2d_brush_bind_resources(brush, device); - } + d2d_brush_bind_resources(brush, render_target); + else + ID3D10Device_PSSetShader(device, render_target->rect_solid_ps); ID3D10Device_Draw(device, 4, 0); @@ -553,7 +550,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D3D10_SUBRESOURCE_DATA buffer_data; D3D10_BUFFER_DESC buffer_desc; ID3D10Buffer *vs_cb, *ps_cb; - ID3D10PixelShader *ps; D2D1_COLOR_F color; float tmp_x, tmp_y; HRESULT hr; @@ -619,8 +615,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar D2D_MATRIX_3X2_F w, b; float dpi_scale, d; - ps = render_target->rect_bitmap_ps; - /* Scale for dpi. */ w = render_target->drawing_state.transform; dpi_scale = render_target->dpi_x / 96.0f; @@ -663,8 +657,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar } else { - ps = render_target->rect_solid_ps; - color = brush_impl->u.solid.color; color.a *= brush_impl->opacity; @@ -679,7 +671,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillRectangle(ID2D1RenderTar return; } - d2d_draw(render_target, vs_cb, ps, ps_cb, brush_impl); + d2d_draw(render_target, vs_cb, ps_cb, brush_impl); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb); @@ -1145,7 +1137,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_Clear(ID2D1RenderTarget *ifa return; } - d2d_draw(render_target, vs_cb, render_target->rect_solid_ps, ps_cb, NULL); + d2d_draw(render_target, vs_cb, ps_cb, NULL); ID3D10Buffer_Release(ps_cb); ID3D10Buffer_Release(vs_cb);

1 0

Henri Verbeet : d2d1: Implement d2d_factory_CreateRectangleGeometry().
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 391fda7599fb803048104165a54e35d8e781f07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=391fda7599fb803048104165a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 14 15:57:39 2015 +0200 d2d1: Implement d2d_factory_CreateRectangleGeometry(). --- dlls/d2d1/d2d1_private.h | 29 ++++- dlls/d2d1/factory.c | 20 ++- dlls/d2d1/geometry.c | 324 +++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 332 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=391fda7599fb803048104…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 35ec7abe3248bdf766c2305c74ed62c5543a1a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=35ec7abe3248bdf766c2305c7… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue Jul 14 16:37:14 2015 +0300 po: Update Lithuanian translation. --- po/lt.po | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/po/lt.po b/po/lt.po index 38ae021..6a2e351 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-05-21 20:22+0300\n" +"PO-Revision-Date: 2015-07-14 16:31+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -13512,16 +13512,12 @@ msgid "Command history" msgstr "Komandų istorija" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Buferio dydis" +msgstr "&Buferio dydis:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Šalinti vienodas" +msgstr "&Šalinti dublikatus" #: wineconsole.rc:74 msgid "Popup menu" @@ -13536,22 +13532,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "Už&daryti pultą" +msgstr "Pultas" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Greitas redagavimas" +msgstr "&Greitas redagavimas" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "&Eksperto režimas" +msgstr "Į&terpimo režimas" #: wineconsole.rc:88 msgid "&Font"

1 0

Nikolay Sivov : dwrite/tests: Fix trimming sign instance leak (Valgrind).
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: a32168bc499e154642a0093755367b5bfb742cf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a32168bc499e154642a009375… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 11:03:30 2015 +0300 dwrite/tests: Fix trimming sign instance leak (Valgrind). --- dlls/dwrite/tests/layout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index a2150d9..2423f8b 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1482,6 +1482,7 @@ static void test_Draw(void) ok_sequence(sequences, RENDERER_ID, draw_single_run_seq, "draw test 10", FALSE); IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(inlineobj); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Make sure explicit levels are always initialized ( Valgrind).
by Alexandre Julliard 14 Jul '15

14 Jul '15

Module: wine Branch: master Commit: 0b64f24030531f5f56115c77d4da273bd365fb24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b64f24030531f5f56115c77d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 14 10:55:23 2015 +0300 dwrite: Make sure explicit levels are always initialized (Valgrind). --- dlls/dwrite/bidi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 69eae5a..273d100 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -445,8 +445,9 @@ static void bidi_resolve_explicit(UINT8 baselevel, UINT8 *classes, UINT8 *levels pop_stack(); break; - /* X8: Nothing */ + /* X8 */ default: + levels[i] = baselevel; break; } }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
57
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 July 2015