March 2017 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Properly handle back-buffers in surface_translate_drawable_coords().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: bedb40e5af4c6d858b609a45314c5275763d2002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bedb40e5af4c6d858b609a453… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:26 2017 +0100 wined3d: Properly handle back-buffers in surface_translate_drawable_coords(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94ec035..2a3fbc9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2078,13 +2078,16 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW struct wined3d_texture *texture = surface->container; UINT drawable_height; - if (texture->swapchain && texture == texture->swapchain->front_buffer) + if (texture->swapchain) { POINT offset = {0, 0}; RECT windowsize; - ScreenToClient(window, &offset); - OffsetRect(rect, offset.x, offset.y); + if (texture == texture->swapchain->front_buffer) + { + ScreenToClient(window, &offset); + OffsetRect(rect, offset.x, offset.y); + } GetClientRect(window, &windowsize); drawable_height = windowsize.bottom - windowsize.top;

1 0

Andrey Gusev : api-ms-win-core-quirks-l1-1-0: Add dll.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: ec8485ec10e3c27b89ec5f1289bc8a3cdad5f3f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8485ec10e3c27b89ec5f128… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Mar 23 17:12:57 2017 +0200 api-ms-win-core-quirks-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-quirks-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 6d38e34..2c94936 100755 --- a/configure +++ b/configure @@ -945,6 +945,7 @@ enable_api_ms_win_core_processthreads_l1_1_2 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_psapi_l1_1_0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +enable_api_ms_win_core_quirks_l1_1_0 enable_api_ms_win_core_realtime_l1_1_0 enable_api_ms_win_core_registry_l1_1_0 enable_api_ms_win_core_registryuserspecific_l1_1_0 @@ -17679,6 +17680,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-2 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-l1-1-0 enable_api_ms_win_core_psapi_l1_1_0 wine_fn_config_dll api-ms-win-core-psapi-obsolete-l1-1-0 enable_api_ms_win_core_psapi_obsolete_l1_1_0 +wine_fn_config_dll api-ms-win-core-quirks-l1-1-0 enable_api_ms_win_core_quirks_l1_1_0 wine_fn_config_dll api-ms-win-core-realtime-l1-1-0 enable_api_ms_win_core_realtime_l1_1_0 wine_fn_config_dll api-ms-win-core-registry-l1-1-0 enable_api_ms_win_core_registry_l1_1_0 wine_fn_config_dll api-ms-win-core-registryuserspecific-l1-1-0 enable_api_ms_win_core_registryuserspecific_l1_1_0 diff --git a/configure.ac b/configure.ac index 22cb7e2..bd3f876 100644 --- a/configure.ac +++ b/configure.ac @@ -2733,6 +2733,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-psapi-obsolete-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-realtime-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0) diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in new file mode 100644 index 0000000..9486e8b --- /dev/null +++ b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-quirks-l1-1-0.dll diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec new file mode 100644 index 0000000..761120f --- /dev/null +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stub QuirkGetData +@ stub QuirkGetData2 +@ stub QuirkIsEnabled +@ stub QuirkIsEnabled2 +@ stub QuirkIsEnabled3 +@ stub QuirkIsEnabledForPackage +@ stub QuirkIsEnabledForPackage2 +@ stub QuirkIsEnabledForProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index 383ab07..bd0314f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -255,6 +255,10 @@ my @dll_groups = "api-ms-win-core-bem-l1-1-0", ], [ + "kernelbase", + "api-ms-win-core-quirks-l1-1-0", + ], + [ "ole32", "api-ms-win-downlevel-ole32-l1-1-0", "api-ms-win-core-com-l1-1-0",

1 0

Henri Verbeet : wined3d: Properly handle back-buffers in context_get_rt_size().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 4f027e627e9a790639116ec7a023d3f0e4f01d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f027e627e9a790639116ec7a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:27 2017 +0100 wined3d: Properly handle back-buffers in context_get_rt_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c1803a4..426d697 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2142,7 +2142,7 @@ static void context_get_rt_size(const struct wined3d_context *context, SIZE *siz const struct wined3d_texture *rt = context->current_rt.texture; unsigned int level; - if (rt->swapchain && rt->swapchain->front_buffer == rt) + if (rt->swapchain) { RECT window_size;

1 0

Can Taşan : po: Turkish translation update.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 2715f19ec3a31c51d194092d8e905d495c45b4d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2715f19ec3a31c51d194092d8… Author: Can Taşan <betax34(a)hotmail.com> Date: Thu Mar 23 15:26:47 2017 +0100 po: Turkish translation update. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/tr.po | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/po/tr.po b/po/tr.po index 165b8ac..ec311fd 100644 --- a/po/tr.po +++ b/po/tr.po @@ -126,9 +126,9 @@ msgid "" "href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for " "details." msgstr "" -"Wine, HTML'yi gömülü kullanan uygulamaların düzgün çalışması için " -"gerekliolan Gecko paketini bulamadı. Wine, paketi sizin için otomatik " -"indirip yükleyebilir.\n" +"Wine, HTML'yi gömülü kullanan uygulamaların düzgün çalışması için gerekli " +"olan Gecko paketini bulamadı. Wine, paketi sizin için otomatik indirip " +"yükleyebilir.\n" "\n" "Not: kendi dağıtımınızın paketlerini kullanmanız önerilir. Ayrıntılar için " "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " @@ -3702,7 +3702,7 @@ msgstr "Beklenen dizi nesnesi" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "Wine çekirdek DLL'si" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -9135,7 +9135,7 @@ msgid "" "until the device is free, and then try again." msgstr "" "Geçerli dalga aygıtı kullanımda olduğundan yürütme için açılamıyor. Aygıt " -"lana kadar bekleyin ve yeniden deneyin." +"boşalana kadar bekleyin ve yeniden deneyin." #: winmm.rc:114 msgid "" @@ -9350,10 +9350,8 @@ msgid "Confidentiality Required" msgstr "Gizlilik Gerekli" #: wldap32.rc:46 -#, fuzzy -#| msgid "Shutdown in progress.\n" msgid "SASL Bind in Progress" -msgstr "Kapatılıyor.\n" +msgstr "SASL İlişkilendirmesi Yürütülüyor" #: wldap32.rc:48 msgid "No Such Attribute" @@ -11961,16 +11959,14 @@ msgstr "Seçilen kayıt değeri yeniden adlandırılamıyor." msgid "" "The keys and values contained in %1 were successfully added to the registry." msgstr "" +"%1 dosyasında bulunan kayıt anahtarları ve değerleri, kayıt defterine " +"başarıyla eklendi." #: regedit.rc:223 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"'%1' anahtarı yeniden adlandırılamıyor.\n" -"Belirtilen anahtar adı zaten var." +"%1 dosyası alınamıyor. Belirtilen dosya geçerli bir kayıt defteri dosyası " +"değil." #: regedit.rc:375 msgid "" @@ -12251,17 +12247,15 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Sistem kaydının seçilen kısmını metin dosyasına aktarır" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Değer Silmeyi Onayla" +msgstr "Anahtar Silmeyi Onayla" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "'%1' kayıt defteri anahtarını silmek istediğinizden emin misiniz?" +msgstr "" +"'%1' kayıt defteri anahtarını ve bütün alt anahtarlarını silmek " +"istediğinizden emin misiniz?" #: regsvr32.rc:32 msgid ""

1 0

Henri Verbeet : wined3d: Do not return GL_COLOR_ATTACHMENT0 for the back-buffer in wined3d_texture_get_gl_buffer ().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 067f32384449d54a2be73e49fc25ac1d4f19f3e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=067f32384449d54a2be73e49f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:25 2017 +0100 wined3d: Do not return GL_COLOR_ATTACHMENT0 for the back-buffer in wined3d_texture_get_gl_buffer(). This should no longer be needed. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d4436d9..349f98b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -68,11 +68,6 @@ GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) if (texture == swapchain->back_buffers[0]) { - if (swapchain->render_to_fbo) - { - TRACE("Returning GL_COLOR_ATTACHMENT0.\n"); - return GL_COLOR_ATTACHMENT0; - } TRACE("Returning GL_BACK.\n"); return GL_BACK; }

1 0

Henri Verbeet : wined3d: Use draw_textured_quad() in swapchain_blit().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 012f9b03f886adc4ff401769dc91776434a03353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=012f9b03f886adc4ff401769d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:28 2017 +0100 wined3d: Use draw_textured_quad() in swapchain_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 74 +++++++++--------------------------------------- 1 file changed, 14 insertions(+), 60 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dff1354..a52edf6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -310,6 +310,7 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; const struct wined3d_gl_info *gl_info = context->gl_info; + enum wined3d_texture_filter_type filter; RECT win_rect; UINT win_h; @@ -317,9 +318,15 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, swapchain, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) + { + filter = WINED3D_TEXF_NONE; gl_filter = GL_NEAREST; + } else + { + filter = WINED3D_TEXF_LINEAR; gl_filter = GL_LINEAR; + } GetClientRect(swapchain->win_handle, &win_rect); win_h = win_rect.bottom - win_rect.top; @@ -361,75 +368,22 @@ static void swapchain_blit(const struct wined3d_swapchain *swapchain, { struct wined3d_device *device = swapchain->device; struct wined3d_context *context2; - float tex_left = src_rect->left; - float tex_top = src_rect->top; - float tex_right = src_rect->right; - float tex_bottom = src_rect->bottom; + RECT r; context2 = context_acquire(device, texture, 0); context_apply_blit_state(context2, device); - if (texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) - { - tex_left /= texture->pow2_width; - tex_right /= texture->pow2_width; - tex_top /= texture->pow2_height; - tex_bottom /= texture->pow2_height; - } + r = *dst_rect; + surface_translate_drawable_coords(back_buffer, swapchain->win_handle, &r); if (is_complex_fixup(texture->resource.format->color_fixup)) - gl_filter = GL_NEAREST; - - context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, front_buffer, NULL, WINED3D_LOCATION_DRAWABLE); - context_bind_texture(context2, back_buffer->texture_target, texture->texture_rgb.name); - - /* Set up the texture. The surface is not in a wined3d_texture - * container, so there are no D3D texture settings to dirtify. */ - device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); - gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MIN_FILTER, gl_filter); - gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, GL_TEXTURE_MAG_FILTER, gl_filter); - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - gl_info->gl_ops.gl.p_glTexParameteri(back_buffer->texture_target, - GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + filter = WINED3D_TEXF_NONE; + context_apply_fbo_state_blit(context2, GL_FRAMEBUFFER, back_buffer, NULL, WINED3D_LOCATION_DRAWABLE); context_set_draw_buffer(context, GL_BACK); - /* Set the viewport to the destination rectandle, disable any projection - * transformation set up by context_apply_blit_state(), and draw a - * (-1,-1)-(1,1) quad. - * - * Back up viewport and matrix to avoid breaking last_was_blit - * - * Note that context_apply_blit_state() set up viewport and ortho to - * match the surface size - we want the GL drawable(=window) size. */ - gl_info->gl_ops.gl.p_glPushAttrib(GL_VIEWPORT_BIT); - gl_info->gl_ops.gl.p_glViewport(dst_rect->left, win_h - dst_rect->bottom, - dst_rect->right, win_h - dst_rect->top); - gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); - gl_info->gl_ops.gl.p_glPushMatrix(); - gl_info->gl_ops.gl.p_glLoadIdentity(); - - gl_info->gl_ops.gl.p_glBegin(GL_QUADS); - /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(tex_left, tex_bottom); - gl_info->gl_ops.gl.p_glVertex2i(-1, -1); - - /* top left */ - gl_info->gl_ops.gl.p_glTexCoord2f(tex_left, tex_top); - gl_info->gl_ops.gl.p_glVertex2i(-1, 1); - - /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f(tex_right, tex_top); - gl_info->gl_ops.gl.p_glVertex2i(1, 1); - - /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f(tex_right, tex_bottom); - gl_info->gl_ops.gl.p_glVertex2i(1, -1); - gl_info->gl_ops.gl.p_glEnd(); - - gl_info->gl_ops.gl.p_glPopMatrix(); - gl_info->gl_ops.gl.p_glPopAttrib(); - + device->blitter->set_shader(device->blit_priv, context2, back_buffer, NULL); + draw_textured_quad(back_buffer, context2, src_rect, &r, filter); device->blitter->unset_shader(context->gl_info); checkGLcall("Swapchain present blit(manual)\n");

1 0

Alexandre Julliard : po: Regenerate the po files.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: 130febe09268e22fd42c05f02f1ac38fd0368efb URL: http://source.winehq.org/git/wine.git/?a=commit;h=130febe09268e22fd42c05f02… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 23 15:29:42 2017 +0100 po: Regenerate the po files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 123 +++++++++++++++++++++++++------------------------- po/bg.po | 123 +++++++++++++++++++++++++------------------------- po/ca.po | 123 +++++++++++++++++++++++++------------------------- po/cs.po | 123 +++++++++++++++++++++++++------------------------- po/da.po | 123 +++++++++++++++++++++++++------------------------- po/de.po | 123 +++++++++++++++++++++++++------------------------- po/el.po | 125 ++++++++++++++++++++++++++------------------------- po/en.po | 123 +++++++++++++++++++++++++------------------------- po/en_US.po | 123 +++++++++++++++++++++++++------------------------- po/eo.po | 123 +++++++++++++++++++++++++------------------------- po/es.po | 123 +++++++++++++++++++++++++------------------------- po/fa.po | 123 +++++++++++++++++++++++++------------------------- po/fi.po | 123 +++++++++++++++++++++++++------------------------- po/fr.po | 123 +++++++++++++++++++++++++------------------------- po/he.po | 123 +++++++++++++++++++++++++------------------------- po/hi.po | 123 +++++++++++++++++++++++++------------------------- po/hr.po | 123 +++++++++++++++++++++++++------------------------- po/hu.po | 123 +++++++++++++++++++++++++------------------------- po/it.po | 123 +++++++++++++++++++++++++------------------------- po/ja.po | 123 +++++++++++++++++++++++++------------------------- po/ko.po | 123 +++++++++++++++++++++++++------------------------- po/lt.po | 123 +++++++++++++++++++++++++------------------------- po/ml.po | 123 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 123 +++++++++++++++++++++++++------------------------- po/nl.po | 123 +++++++++++++++++++++++++------------------------- po/or.po | 123 +++++++++++++++++++++++++------------------------- po/pa.po | 123 +++++++++++++++++++++++++------------------------- po/pl.po | 123 +++++++++++++++++++++++++------------------------- po/pt_BR.po | 123 +++++++++++++++++++++++++------------------------- po/pt_PT.po | 123 +++++++++++++++++++++++++------------------------- po/rm.po | 123 +++++++++++++++++++++++++------------------------- po/ro.po | 123 +++++++++++++++++++++++++------------------------- po/ru.po | 123 +++++++++++++++++++++++++------------------------- po/sk.po | 123 +++++++++++++++++++++++++------------------------- po/sl.po | 123 +++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 123 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 123 +++++++++++++++++++++++++------------------------- po/sv.po | 123 +++++++++++++++++++++++++------------------------- po/te.po | 123 +++++++++++++++++++++++++------------------------- po/th.po | 125 ++++++++++++++++++++++++++------------------------- po/tr.po | 123 +++++++++++++++++++++++++------------------------- po/uk.po | 123 +++++++++++++++++++++++++------------------------- po/wa.po | 123 +++++++++++++++++++++++++------------------------- po/wine.pot | 123 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 123 +++++++++++++++++++++++++------------------------- po/zh_TW.po | 123 +++++++++++++++++++++++++------------------------- 46 files changed, 2854 insertions(+), 2808 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=130febe09268e22fd42c0…

1 0

Daniel Lehman : msxml3/tests: Free ready state BSTR (Valgrind).
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: cf08ea1b3a206e37e47350e0be7050877d2ced2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf08ea1b3a206e37e47350e0b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Thu Mar 23 07:34:51 2017 -0700 msxml3/tests: Free ready state BSTR (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/xmlview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/xmlview.c b/dlls/msxml3/tests/xmlview.c index 3c1d8d9..dc8ab7d 100644 --- a/dlls/msxml3/tests/xmlview.c +++ b/dlls/msxml3/tests/xmlview.c @@ -130,6 +130,7 @@ static HRESULT WINAPI HTMLEvents_Invoke(IDispatch *iface, DISPID dispIdMember, R ok(hr == S_OK, "got 0x%08x\n", hr); if(!memcmp(state, completeW, sizeof(completeW))) loaded = TRUE; + SysFreeString(state); } return S_OK;

1 0

Henri Verbeet : wined3d: Pass the destination location to blit_shader.blit_surface().
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: dbd8c89ea8cd1d887e9999d203da3e79c4ffbd1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbd8c89ea8cd1d887e9999d20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 22 23:11:29 2017 +0100 wined3d: Pass the destination location to blit_shader.blit_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 24 ++++++++++++++++++++++-- dlls/wined3d/surface.c | 34 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b23f2c0..8d1ca8a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7791,7 +7791,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture *src_texture = src_surface->container; @@ -7823,13 +7823,33 @@ static void arbfp_blit_surface(struct wined3d_device *device, enum wined3d_blit_ context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_texture->resource)) + if (dst_location == WINED3D_LOCATION_DRAWABLE) { d = *dst_rect; surface_translate_drawable_coords(dst_surface, context->win_handle, &d); dst_rect = &d; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GLenum buffer; + + if (dst_location == WINED3D_LOCATION_DRAWABLE) + { + TRACE("Destination surface %p is onscreen.\n", dst_surface); + buffer = wined3d_texture_get_gl_buffer(dst_texture); + } + else + { + TRACE("Destination surface %p is offscreen.\n", dst_surface); + buffer = GL_COLOR_ATTACHMENT0; + } + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_set_draw_buffer(context, buffer); + context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); + } + if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST) { const struct wined3d_format *fmt = src_texture->resource.format; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a3fbc9..4829e84 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2345,8 +2345,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, surface_get_rect(surface, NULL, &r); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, - surface, &r, surface, &r, NULL, WINED3D_TEXF_POINT); + device->blitter->blit_surface(device, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, &r, + surface, WINED3D_LOCATION_DRAWABLE, &r, NULL, WINED3D_TEXF_POINT); if (restore_rt) context_restore(context, restore_rt); @@ -2718,7 +2718,7 @@ static HRESULT ffp_blit_depth_fill(struct wined3d_device *device, static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { struct wined3d_texture *src_texture = src_surface->container; @@ -2742,13 +2742,33 @@ static void ffp_blit_blit_surface(struct wined3d_device *device, enum wined3d_bl /* Activate the destination context, set it up for blitting. */ context_apply_blit_state(context, device); - if (!wined3d_resource_is_offscreen(&dst_texture->resource)) + if (dst_location == WINED3D_LOCATION_DRAWABLE) { r = *dst_rect; surface_translate_drawable_coords(dst_surface, context->win_handle, &r); dst_rect = &r; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GLenum buffer; + + if (dst_location == WINED3D_LOCATION_DRAWABLE) + { + TRACE("Destination surface %p is onscreen.\n", dst_surface); + buffer = wined3d_texture_get_gl_buffer(dst_texture); + } + else + { + TRACE("Destination surface %p is offscreen.\n", dst_surface); + buffer = GL_COLOR_ATTACHMENT0; + } + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, dst_surface, NULL, dst_location); + context_set_draw_buffer(context, buffer); + context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); + } + ffp_blit_set(device->blit_priv, context, src_surface, NULL); if (op == WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST || color_key) @@ -3437,7 +3457,7 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter) { /* FIXME: Remove error returns from surface_blt_cpu. */ @@ -3733,8 +3753,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst struct wined3d_context *context; context = context_acquire(device, dst_texture, dst_sub_resource_idx); - blitter->blit_surface(device, blit_op, context, src_surface, - src_rect, dst_surface, dst_rect, color_key, filter); + blitter->blit_surface(device, blit_op, context, src_surface, src_rect, dst_surface, + dst_texture->resource.draw_binding, dst_rect, color_key, filter); context_release(context); wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb8823d..f154db3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1881,7 +1881,7 @@ struct blit_shader const RECT *rect, DWORD clear_flags, float depth, DWORD stencil); void (*blit_surface)(struct wined3d_device *device, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *color_key, enum wined3d_texture_filter_type filter); };

1 0

Andrey Gusev : api-ms-win-security-systemfunctions-l1-1-0: Add dll.
by Alexandre Julliard March 23, 2017

March 23, 2017

Module: wine Branch: master Commit: a077d098b6c54506887291399e8032a6cc845b48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a077d098b6c54506887291399… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Mar 21 16:37:24 2017 +0200 api-ms-win-security-systemfunctions-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-systemfunctions-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-systemfunctions-l1-1-0.spec | 3 +++ tools/make_specfiles | 1 + 5 files changed, 8 insertions(+) diff --git a/configure b/configure index ec5783a..b9619dc 100755 --- a/configure +++ b/configure @@ -1027,6 +1027,7 @@ enable_api_ms_win_security_lsalookup_l1_1_1 enable_api_ms_win_security_lsalookup_l2_1_1 enable_api_ms_win_security_lsapolicy_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 +enable_api_ms_win_security_systemfunctions_l1_1_0 enable_api_ms_win_service_core_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17759,6 +17760,7 @@ wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-1 enable_api_ms_win_securi wine_fn_config_dll api-ms-win-security-lsalookup-l2-1-1 enable_api_ms_win_security_lsalookup_l2_1_1 wine_fn_config_dll api-ms-win-security-lsapolicy-l1-1-0 enable_api_ms_win_security_lsapolicy_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 +wine_fn_config_dll api-ms-win-security-systemfunctions-l1-1-0 enable_api_ms_win_security_systemfunctions_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index cdef9e6..d4f2ff4 100644 --- a/configure.ac +++ b/configure.ac @@ -2815,6 +2815,7 @@ WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l2-1-1) WINE_CONFIG_DLL(api-ms-win-security-lsapolicy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-security-systemfunctions-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-systemfunctions-l1-1-0/Makefile.in b/dlls/api-ms-win-security-systemfunctions-l1-1-0/Makefile.in new file mode 100644 index 0000000..3470a88 --- /dev/null +++ b/dlls/api-ms-win-security-systemfunctions-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-systemfunctions-l1-1-0.dll diff --git a/dlls/api-ms-win-security-systemfunctions-l1-1-0/api-ms-win-security-systemfunctions-l1-1-0.spec b/dlls/api-ms-win-security-systemfunctions-l1-1-0/api-ms-win-security-systemfunctions-l1-1-0.spec new file mode 100644 index 0000000..b9376e3 --- /dev/null +++ b/dlls/api-ms-win-security-systemfunctions-l1-1-0/api-ms-win-security-systemfunctions-l1-1-0.spec @@ -0,0 +1,3 @@ +@ stdcall SystemFunction036(ptr long) advapi32.SystemFunction036 +@ stdcall SystemFunction040(ptr long long) advapi32.SystemFunction040 +@ stdcall SystemFunction041(ptr long long) advapi32.SystemFunction041 diff --git a/tools/make_specfiles b/tools/make_specfiles index 404af76..b39e02b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -128,6 +128,7 @@ my @dll_groups = "api-ms-win-security-lsalookup-l2-1-1", "api-ms-win-security-lsapolicy-l1-1-0", "api-ms-win-security-sddl-l1-1-0", + "api-ms-win-security-systemfunctions-l1-1-0", "api-ms-win-service-core-l1-1-0", "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0",

1 0