April 2018 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Invalidate the texture's U/ V address modes in draw_textured_quad().
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 7155c451a570f48a2e0ef05099606234cf57d323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7155c451a570f48a2e0ef050… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 16:46:11 2018 +0430 wined3d: Invalidate the texture's U/V address modes in draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6c7d6df..099368d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -223,6 +223,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour texture->texture_rgb.sampler_desc.mag_filter = WINED3D_TEXF_POINT; texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; + texture->texture_rgb.sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; + texture->texture_rgb.sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; texture->texture_rgb.sampler_desc.srgb_decode = FALSE; texture->texture_rgb.base_level = level; }

1 0

Matteo Bruni : wined3d: Disable sRGB writes in context_apply_blit_state().
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 4573903c068e49cdde8cce185aedc72239725a9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4573903c068e49cdde8cce18… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:12 2018 +0430 wined3d: Disable sRGB writes in context_apply_blit_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4b2f263..d2231d1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2828,6 +2828,11 @@ void context_apply_blit_state(struct wined3d_context *context, const struct wine gl_info->gl_ops.gl.p_glDisable(GL_POINT_SPRITE_ARB); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE)); } + if (gl_info->supported[ARB_FRAMEBUFFER_SRGB]) + { + gl_info->gl_ops.gl.p_glDisable(GL_FRAMEBUFFER_SRGB); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } gl_info->gl_ops.gl.p_glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE)); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_COLORWRITEENABLE1));

1 0

Matteo Bruni : wined3d: Move draw_textured_quad() to context.c.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 9100fce2ba65dff71fbe009b92e3b86d51ce87c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9100fce2ba65dff71fbe009b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:13 2018 +0430 wined3d: Move draw_textured_quad() to context.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 60 ++++++++++++ dlls/wined3d/surface.c | 195 +------------------------------------- dlls/wined3d/texture.c | 124 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 15 ++- 5 files changed, 197 insertions(+), 199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9100fce2ba65dff71fbe…

1 0

Matteo Bruni : wined3d: Introduce a function for drawing shaded quads.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: f1ad8bab5184b29eebf7cc793854632596500242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ad8bab5184b29eebf7cc79… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:14 2018 +0430 wined3d: Introduce a function for drawing shaded quads. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 104 ++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 86 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccf7777..e85e20d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4987,6 +4987,88 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s context_release(context); } +static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, + GLenum target, unsigned int level, enum wined3d_texture_filter_type filter) +{ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(filter)); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, + wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, level); + + /* We changed the filtering settings on the texture. Make sure they get + * reset on subsequent draws. */ + texture->sampler_desc.mag_filter = WINED3D_TEXF_POINT; + texture->sampler_desc.min_filter = WINED3D_TEXF_POINT; + texture->sampler_desc.mip_filter = WINED3D_TEXF_NONE; + texture->sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; + texture->sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; + texture->sampler_desc.srgb_decode = FALSE; + texture->base_level = level; +} + +/* Context activation is done by the caller. */ +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_blt_info info; + unsigned int level, w, h, i; + SIZE dst_size; + struct blit_vertex + { + float x, y; + struct wined3d_vec3 texcoord; + } + quad[4]; + + texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); + + level = sub_resource_idx % texture->level_count; + context_bind_texture(context, info.bind_target, texture->texture_rgb.name); + apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); + + context_get_rt_size(context, &dst_size); + w = dst_size.cx; + h = dst_size.cy; + + quad[0].x = dst_rect->left * 2.0f / w - 1.0f; + quad[0].y = dst_rect->top * 2.0f / h - 1.0f; + quad[0].texcoord = info.texcoords[0]; + + quad[1].x = dst_rect->right * 2.0f / w - 1.0f; + quad[1].y = dst_rect->top * 2.0f / h - 1.0f; + quad[1].texcoord = info.texcoords[1]; + + quad[2].x = dst_rect->left * 2.0f / w - 1.0f; + quad[2].y = dst_rect->bottom * 2.0f / h - 1.0f; + quad[2].texcoord = info.texcoords[2]; + + quad[3].x = dst_rect->right * 2.0f / w - 1.0f; + quad[3].y = dst_rect->bottom * 2.0f / h - 1.0f; + quad[3].texcoord = info.texcoords[3]; + + /* Draw a quad. */ + gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); + + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); + GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + } + + gl_info->gl_ops.gl.p_glEnd(); + checkGLcall("draw"); + + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + context_bind_texture(context, info.bind_target, 0); +} + /* Context activation is done by the caller. */ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, @@ -5003,17 +5085,7 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); - - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(filter)); - checkGLcall("glTexParameteri"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MIN_FILTER, - wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); - checkGLcall("glTexParameteri"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_BASE_LEVEL, level); + apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -5035,14 +5107,4 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); context_bind_texture(context, info.bind_target, 0); - - /* We changed the filtering settings on the texture. Make sure they get - * reset on subsequent draws. */ - texture->texture_rgb.sampler_desc.mag_filter = WINED3D_TEXF_POINT; - texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; - texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; - texture->texture_rgb.sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; - texture->texture_rgb.sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; - texture->texture_rgb.sampler_desc.srgb_decode = FALSE; - texture->texture_rgb.base_level = level; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e2f7ab..1e2b6ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2154,6 +2154,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0

Matteo Bruni : wined3d: Introduce a GLSL-based blitter.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 2f0777b8aae007e34a2869a8b1f5ffe24b3012fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f0777b8aae007e34a2869a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:15 2018 +0430 wined3d: Introduce a GLSL-based blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 1 + dlls/wined3d/glsl_shader.c | 416 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 419 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f0777b8aae007e34a28…

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: fa1fd466b31857a230355703a0a9401e7f3db871 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1fd466b31857a230355703… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 12 17:08:02 2018 +0300 po: Update Ukrainian translation. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/uk.po | 40 +++++++++++++++------------------------- 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/po/uk.po b/po/uk.po index 8b31964..70e3191 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-12-15 16:20+0200\n" +"PO-Revision-Date: 2018-04-12 17:02+0300\n" "Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: Ukrainian\n" "Language: uk\n" @@ -6666,7 +6666,7 @@ msgstr "У з'єднанні відмовлено.\n" #: winerror.mc:3760 msgid "No Signature found in file.\n" -msgstr "" +msgstr "Відсутній підпис файла.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -9183,67 +9183,57 @@ msgstr "Існує принаймні одна невизначена пробл #: winineterror.mc:26 msgid "The request has timed out.\n" -msgstr "" +msgstr "Зупинка запиту.\n" #: winineterror.mc:31 -#, fuzzy -#| msgid "A printer error occurred." msgid "An internal error has occurred.\n" -msgstr "Виникла помилка принтера." +msgstr "Виникла внутрішня помилка.\n" #: winineterror.mc:36 -#, fuzzy -#| msgid "Path is invalid.\n" msgid "The URL is invalid.\n" -msgstr "Невірний шлях.\n" +msgstr "Невірна URL-адреса.\n" #: winineterror.mc:41 msgid "The URL scheme could not be recognized or is not supported.\n" -msgstr "" +msgstr "Схема URL-адреси не може бути розпізнана або не підтримується.\n" #: winineterror.mc:46 -#, fuzzy -#| msgid "The username could not be found.\n" msgid "The server name could not be resolved.\n" -msgstr "Ім'я користувача не знайдено.\n" +msgstr "Не вдається встановити ім'я сервера.\n" #: winineterror.mc:51 -#, fuzzy -#| msgid "The user profile is invalid.\n" msgid "The requested operation is invalid.\n" -msgstr "Невірний профіль користувача.\n" +msgstr "Запитана операція невірна.\n" #: winineterror.mc:56 msgid "" "The operation was canceled, usually because the handle on which the request " "was operating was closed before the operation completed.\n" msgstr "" +"Операція була скасована. Як правило, таке трапляється, тому що індекс, до " +"якого був запит, був закритий до закінчення операції.\n" #: winineterror.mc:61 -#, fuzzy -#| msgid "The profile could not be added.\n" msgid "The requested item could not be located.\n" -msgstr "Профіль не може бути доданий.\n" +msgstr "Не вдається знайти запитаний елемент.\n" #: winineterror.mc:66 -#, fuzzy -#| msgid "Can't connect to the LDAP server" msgid "The attempt to connect to the server failed.\n" -msgstr "Неможливо підключитись до LDAP сервера" +msgstr "Помилка спроби підключення до сервера.\n" #: winineterror.mc:71 msgid "The connection with the server has been terminated.\n" -msgstr "" +msgstr "З'єднання з сервером було припинено.\n" #: winineterror.mc:76 msgid "" "SSL certificate date that was received from the server is bad. The " "certificate is expired.\n" -msgstr "" +msgstr "Строк дії сертифіката SSL, надісланого сервером, закінчився.\n" #: winineterror.mc:81 msgid "SSL certificate common name (host name field) is incorrect.\n" -msgstr "" +msgstr "Загальне ім'я сертифіката SSL (поле імені сервера) невірне.\n" #: winmm.rc:32 msgid "The specified command was carried out."

1 0

Sebastian Lackner : rpcrt4: Hold CS while iterating through protseqs list.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: ce2080ac6059ac7ccdd252f2cdcb9c6dbd65052d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce2080ac6059ac7ccdd252f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 9 02:18:00 2018 +0000 rpcrt4: Hold CS while iterating through protseqs list. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index c350c59..d1b5d64 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -806,8 +806,10 @@ static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen) if (stop_listen) { RpcServerProtseq *cps; + EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) RPCRT4_sync_with_server_thread(cps); + LeaveCriticalSection(&server_cs); } if (!auto_listen)

1 0

Alistair Leslie-Hughes : fltmgr.sys: Implement FltGetRoutineAddress.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: a7b33a6a428c9920d8130819373b1554bbd206c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b33a6a428c9920d8130819… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:22 2018 +0000 fltmgr.sys: Implement FltGetRoutineAddress. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ include/ddk/fltkernel.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index c217ad3..7b1ba29 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -79,7 +79,7 @@ @ stub FltGetLowerInstance @ stub FltGetRequestorProcess @ stub FltGetRequestorProcessId -@ stub FltGetRoutineAddress +@ stdcall FltGetRoutineAddress(str) @ stub FltGetStreamContext @ stub FltGetStreamHandleContext @ stub FltGetSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 2ffde97..16ca284 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -64,3 +64,18 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) { FIXME( "(%p): stub\n", filter ); } + +void* WINAPI FltGetRoutineAddress(LPCSTR name) +{ + static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; + HMODULE mod = GetModuleHandleW(fltmgrW); + void *func; + + func = GetProcAddress(mod, name); + if (func) + TRACE( "%s -> %p\n", debugstr_a(name), func ); + else + FIXME( "%s not found\n", debugstr_a(name) ); + + return func; +} diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 00b7dc5..8ebebfa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -654,6 +654,7 @@ typedef struct _FLT_REGISTRATION } FLT_REGISTRATION, *PFLT_REGISTRATION; +void* WINAPI FltGetRoutineAddress(LPCSTR name); NTSTATUS WINAPI FltRegisterFilter(PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); NTSTATUS WINAPI FltStartFiltering(PFLT_FILTER); void WINAPI FltUnregisterFilter(PFLT_FILTER);

1 0

Piotr Caban : dwrite: Fix features dumping in analyzer_dump_user_features.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 71b3ba57f76dca83666fa4f8d69103cc81a5c393 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71b3ba57f76dca83666fa4f8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 6 17:12:27 2018 +0200 dwrite: Fix features dumping in analyzer_dump_user_features. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Nikolay Sivov<nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index b20bafa..8d553c6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1140,7 +1140,7 @@ static void analyzer_dump_user_features(DWRITE_TYPOGRAPHIC_FEATURES const **feat if (!TRACE_ON(dwrite) || !features) return; - for (i = 0, start = 0; i < feature_ranges; i++, start += feature_range_lengths[i]) { + for (i = 0, start = 0; i < feature_ranges; start += feature_range_lengths[i++]) { TRACE("feature range [%u,%u)\n", start, start + feature_range_lengths[i]); for (j = 0; j < features[i]->featureCount; j++) TRACE("feature %s, parameter %u\n", debugstr_an((char *)&features[i]->features[j].nameTag, 4),

1 0

Zebediah Figura : widl: Generate correct alignment for encapsulated union tags.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 6c942496a9f4388f28591d8e583de30d0389dbba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c942496a9f4388f28591d8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 10 20:30:26 2018 -0500 widl: Generate correct alignment for encapsulated union tags. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e63600c..27855cc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3276,6 +3276,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, { const var_t *sv = type_union_get_switch_value(type); const type_t *st = sv->type; + unsigned int align = 0; unsigned char fc; if (type_get_type(st) == TYPE_BASIC) @@ -3303,9 +3304,16 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, else error("union switch type must be an integer, char, or enum\n"); + type_memsize_and_alignment(st, &align); + if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) + { + if (f->type) + type_memsize_and_alignment(f->type, &align); + } + print_file(file, 2, "0x%x,\t/* FC_ENCAPSULATED_UNION */\n", RPC_FC_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", - 0x40 | fc, string_of_type(fc)); + (align << 4) | fc, string_of_type(fc)); *tfsoff += 2; } else if (is_attr(type->attrs, ATTR_SWITCHTYPE))

1 0