wine-commits April 2018

wine-commits@winehq.org

2 participants
542 discussions

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

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

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

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: 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: 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

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

Henri Verbeet : wined3d: Select the correct texture level in draw_textured_quad().
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: e2a0a939bad89a502696618af3f235d14b0bdd76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a0a939bad89a502696618a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 16:46:10 2018 +0430 wined3d: Select the correct texture level 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c01bd32..6c7d6df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -173,12 +173,14 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; + unsigned int level; texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); + level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); /* Filtering for StretchRect */ @@ -191,6 +193,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); if (context->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); + 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"); @@ -209,6 +213,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + /* Unbind the texture */ context_bind_texture(context, info.bind_target, 0); @@ -218,6 +224,7 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour 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.srgb_decode = FALSE; + texture->texture_rgb.base_level = level; } /* Works correctly only for <= 4 bpp formats. */

1 0

Alexandre Julliard : gdi32: Scale stock fonts based on the DPI awareness.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 60085f4e36d97938a1e7365161eb8f8b09140824 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60085f4e36d97938a1e73651… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:50:01 2018 +0200 gdi32: Scale stock fonts based on the DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 41 +++++++++++++++++++++------------------ dlls/user32/tests/sysparams.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index db03f49..819d24a 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -108,6 +108,7 @@ static const LOGPEN DCPen = { PS_SOLID, { 0, 0 }, RGB(0,0,0) }; #define NB_STOCK_OBJECTS (STOCK_LAST+2) static HGDIOBJ stock_objects[NB_STOCK_OBJECTS]; +static HGDIOBJ scaled_stock_objects[NB_STOCK_OBJECTS]; static CRITICAL_SECTION gdi_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -662,7 +663,6 @@ DWORD get_system_dpi(void) static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; - LONG height; static DWORD dpi; if (!dpi) @@ -672,9 +672,7 @@ static HFONT create_scaled_font( const LOGFONTW *deffont ) } lf = *deffont; - height = abs(lf.lfHeight) * dpi / 96; - lf.lfHeight = deffont->lfHeight < 0 ? -height : height; - + lf.lfHeight = MulDiv( lf.lfHeight, dpi, 96 ); return CreateFontIndirectW( &lf ); } @@ -716,10 +714,15 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* language-dependent stock fonts */ deffonts = get_default_fonts(get_default_charset()); - stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); - stock_objects[DEVICE_DEFAULT_FONT] = create_scaled_font( &deffonts->DeviceDefaultFont ); + stock_objects[SYSTEM_FONT] = CreateFontIndirectW( &deffonts->SystemFont ); + stock_objects[DEVICE_DEFAULT_FONT] = CreateFontIndirectW( &deffonts->DeviceDefaultFont ); stock_objects[SYSTEM_FIXED_FONT] = CreateFontIndirectW( &deffonts->SystemFixedFont ); - stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); + stock_objects[DEFAULT_GUI_FONT] = CreateFontIndirectW( &deffonts->DefaultGuiFont ); + + scaled_stock_objects[OEM_FIXED_FONT] = create_scaled_font( &OEMFixedFont ); + scaled_stock_objects[SYSTEM_FONT] = create_scaled_font( &deffonts->SystemFont ); + scaled_stock_objects[SYSTEM_FIXED_FONT] = create_scaled_font( &deffonts->SystemFixedFont ); + scaled_stock_objects[DEFAULT_GUI_FONT] = create_scaled_font( &deffonts->DefaultGuiFont ); stock_objects[DC_BRUSH] = CreateBrushIndirect( &DCBrush ); stock_objects[DC_PEN] = CreatePenIndirect( &DCPen ); @@ -727,15 +730,9 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) /* clear the NOSYSTEM bit on all stock objects*/ for (i = 0; i < NB_STOCK_OBJECTS; i++) { - if (!stock_objects[i]) - { - if (i == 9) continue; /* there's no stock object 9 */ - ERR( "could not create stock object %d\n", i ); - return FALSE; - } - __wine_make_gdi_object_system( stock_objects[i], TRUE ); + if (stock_objects[i]) __wine_make_gdi_object_system( stock_objects[i], TRUE ); + if (scaled_stock_objects[i]) __wine_make_gdi_object_system( scaled_stock_objects[i], TRUE ); } - return TRUE; } @@ -1061,11 +1058,17 @@ void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) */ HGDIOBJ WINAPI GetStockObject( INT obj ) { - HGDIOBJ ret; if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0; - ret = stock_objects[obj]; - TRACE("returning %p\n", ret ); - return ret; + switch (obj) + { + case OEM_FIXED_FONT: + case SYSTEM_FONT: + case SYSTEM_FIXED_FONT: + case DEFAULT_GUI_FONT: + if (get_system_dpi() != 96) return scaled_stock_objects[obj]; + break; + } + return stock_objects[obj]; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 4d60ea5..780cfbb 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3001,6 +3001,50 @@ static void test_GetSysColorBrush(void) win_skip("COLOR_MENUBAR unsupported\n"); } +static void test_dpi_stock_objects( HDC hdc ) +{ + DPI_AWARENESS_CONTEXT context; + HGDIOBJ obj[STOCK_LAST + 1], obj2[STOCK_LAST + 1]; + LOGFONTW lf, lf2; + UINT i, dpi; + + context = pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_UNAWARE ); + dpi = GetDeviceCaps( hdc, LOGPIXELSX ); + ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); + ok( !pIsProcessDPIAware(), "not aware\n" ); + for (i = 0; i <= STOCK_LAST; i++) obj[i] = GetStockObject( i ); + + pSetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_SYSTEM_AWARE ); + dpi = GetDeviceCaps( hdc, LOGPIXELSX ); + ok( dpi == real_dpi, "wrong dpi %u\n", dpi ); + ok( pIsProcessDPIAware(), "not aware\n" ); + for (i = 0; i <= STOCK_LAST; i++) obj2[i] = GetStockObject( i ); + + for (i = 0; i <= STOCK_LAST; i++) + { + switch (i) + { + case OEM_FIXED_FONT: + case SYSTEM_FIXED_FONT: + ok( obj[i] != obj2[i], "%u: same object\n", i ); + break; + case SYSTEM_FONT: + case DEFAULT_GUI_FONT: + ok( obj[i] != obj2[i], "%u: same object\n", i ); + GetObjectW( obj[i], sizeof(lf), &lf ); + GetObjectW( obj2[i], sizeof(lf2), &lf2 ); + ok( lf.lfHeight == MulDiv( lf2.lfHeight, USER_DEFAULT_SCREEN_DPI, real_dpi ), + "%u: wrong height %d / %d\n", i, lf.lfHeight, lf2.lfHeight ); + break; + default: + ok( obj[i] == obj2[i], "%u: different object\n", i ); + break; + } + } + + pSetThreadDpiAwarenessContext( context ); +} + static void test_dpi_aware(void) { BOOL ret; @@ -3181,6 +3225,7 @@ static void test_dpi_aware(void) break; } } + if (real_dpi != USER_DEFAULT_SCREEN_DPI) test_dpi_stock_objects( hdc ); ReleaseDC( 0, hdc ); } else win_skip( "SetProcessDpiAwarenessContext not supported\n" );

1 0

Alexandre Julliard : gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps.
by Alexandre Julliard 12 Apr '18

12 Apr '18

Module: wine Branch: master Commit: 31967ef51df71994ab9b273353ea4937b8231b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31967ef51df71994ab9b2733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:25:16 2018 +0200 gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 +---- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 18 ++++++++++++++++++ dlls/user32/tests/sysparams.c | 1 - 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fcf016b..c81a2e1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -298,7 +298,6 @@ static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffe static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { - static int screen_dpi; int bpp; switch (cap) @@ -351,9 +350,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case SHADEBLENDCAPS: return 0; case COLORMGMTCAPS: return 0; case LOGPIXELSX: - case LOGPIXELSY: - if (!screen_dpi && !(screen_dpi = get_dpi())) screen_dpi = 96; - return screen_dpi; + case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); return (bpp > 8) ? -1 : (1 << bpp); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cf904d6..c5e4231 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -304,6 +304,7 @@ extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern DWORD get_dpi(void) DECLSPEC_HIDDEN; +extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16b82a3..db03f49 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,6 +641,24 @@ DWORD get_dpi(void) return 0; } +/****************************************************************************** + * get_system_dpi + * + * Get the system DPI, based on the DPI awareness mode. + */ +DWORD get_system_dpi(void) +{ + static UINT (WINAPI *pGetDpiForSystem)(void); + + if (!pGetDpiForSystem) + { + static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + HMODULE user = GetModuleHandleW( user32W ); + if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); + } + return pGetDpiForSystem ? pGetDpiForSystem() : 96; +} + static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5b185b9..4d60ea5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3091,7 +3091,6 @@ static void test_dpi_aware(void) dpi = pGetDpiForSystem(); ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); dpi = GetDeviceCaps( hdc, LOGPIXELSX ); - todo_wine_if (real_dpi != USER_DEFAULT_SCREEN_DPI) ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); ok( !pIsProcessDPIAware(), "still aware\n" ); context = pGetThreadDpiAwarenessContext();

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
55
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 April 2018