December 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 7c9dbd789aed14100fb4d6eb4db1859ce5921dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9dbd789aed14100fb4d6eb4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:35 2016 +0100 wined3d: Add support for WINED3DFMT_D32_FLOAT_S8X24_UINT format. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/utils.c | 144 ++++++++++++++++++++++-------------------- 3 files changed, 78 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9dbd789aed14100fb4d…

1 0

Józef Kucia : wined3d: Introduce get_format_internal( ) helper function.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: e59ad5d1362d9aba2e07ed357cd70b7a7f4e2717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59ad5d1362d9aba2e07ed357… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:37 2016 +0100 wined3d: Introduce get_format_internal() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 173 +++++++++++++-------------------------------------- 1 file changed, 43 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e59ad5d1362d9aba2e07e…

1 0

Andrew Eikum : imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 1a6d3c15830cb69a756fdaeda64d1fd8f6cc89c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6d3c15830cb69a756fdaeda… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Dec 2 08:09:01 2016 -0600 imaadpcm32: Fix source offsets when converting stereo PCM to IMAADPCM. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 4684f30..78a0ac4 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -431,29 +431,27 @@ static void cvtSS16imaK(PACMDRVSTREAMINSTANCE adsi, /* generate header */ sampleL = R16(src); src += 2; W16(dst, sampleL); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexL; - dst += 2; + W16(dst, stepIndexL); dst += 2; sampleR = R16(src); src += 2; W16(dst, sampleR); dst += 2; - *dst = (unsigned char)(unsigned)stepIndexR; - dst += 2; + W16(dst, stepIndexR); dst += 2; for (nsamp = nsamp_blk; nsamp > 0; nsamp -= 8) { for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 0), + code1 = generate_nibble(R16(src + (4 * i + 0) * 2), &stepIndexL, &sampleL); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 0), + code2 = generate_nibble(R16(src + (4 * i + 2) * 2), &stepIndexL, &sampleL); *dst++ = (code1 << 4) | code2; } for (i = 0; i < 4; i++) { - code1 = generate_nibble(R16(src + (2 * i + 0) * 2 + 1), + code1 = generate_nibble(R16(src + (4 * i + 1) * 2), &stepIndexR, &sampleR); - code2 = generate_nibble(R16(src + (2 * i + 1) * 2 + 1), + code2 = generate_nibble(R16(src + (4 * i + 3) * 2), &stepIndexR, &sampleR); *dst++ = (code1 << 4) | code2; }

1 0

Hugh McMaster : regedit/tests: Fix line concatenation test.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: b897c9b13de9503afafb4d2f8d9776f314d1e219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b897c9b13de9503afafb4d2f8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:10 2016 +0000 regedit/tests: Fix line concatenation test. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 482940c..e9bf082 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -251,8 +251,8 @@ static void test_basic_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1\"=dword:00000782\n\n" "\"Wine2\"=\"Test Value\"\n" - "\"Wine3\"=hex(7):4c,69,6e,65,20,\ - 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "#comment\n" "@=\"Test\"\n" ";comment\n\n"

1 0

Józef Kucia : wined3d: Record sampler usage for sample_c instruction.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: dc7db9852a2f66aaddc8a7ed022356ee0b2debcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc7db9852a2f66aaddc8a7ed0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:32 2016 +0100 wined3d: Record sampler usage for sample_c instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 765c682..bf4b421 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1282,6 +1282,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_SAMPLE || ins.handler_idx == WINED3DSIH_SAMPLE_B + || ins.handler_idx == WINED3DSIH_SAMPLE_C || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ || ins.handler_idx == WINED3DSIH_SAMPLE_GRAD || ins.handler_idx == WINED3DSIH_SAMPLE_LOD)

1 0

Hugh McMaster : regedit/tests: Test whether comments ending in a backslash affect the next line.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 750358fc44087926c606623f6a27f93a5328ada3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=750358fc44087926c606623f6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Dec 2 11:41:33 2016 +0000 regedit/tests: Test whether comments ending in a backslash affect the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e9bf082..23ea4f9 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -278,6 +278,14 @@ static void test_basic_import(void) verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); todo_wine verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "#comment\\\n" + "\"Wine8\"=\"Line 1\"\n" + ";comment \\\n" + "\"Wine9\"=\"Line 2\"\n\n"); + verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Ken Thomases : winemac: Set the parent of Cocoa views for child windows when they are created.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: b5194d6f8300ee3114e848d1bc28207c7d4e4a7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5194d6f8300ee3114e848d1b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Dec 1 19:38:41 2016 -0600 winemac: Set the parent of Cocoa views for child windows when they are created. This fixes an oversight in commit d91e56863. Some of the views created for Win32 child windows were being left out of any view hierarchy. OpenGL contexts attached to such child windows and views were not able to render to screen, leaving blank areas. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/window.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 07d0f23..40aa439 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -786,6 +786,25 @@ static void destroy_cocoa_view(struct macdrv_win_data *data) /*********************************************************************** + * set_cocoa_view_parent + */ +static void set_cocoa_view_parent(struct macdrv_win_data *data, HWND parent) +{ + struct macdrv_win_data *parent_data = get_win_data(parent); + macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; + macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; + + TRACE("win %p/%p parent %p/%p\n", data->hwnd, data->cocoa_view, parent, cocoa_window ? (void*)cocoa_window : (void*)superview); + + if (!cocoa_window && !superview) + WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", data->hwnd, parent); + + macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); + release_win_data(parent_data); +} + + +/*********************************************************************** * macdrv_create_win_data * * Create a Mac data window structure for an existing window. @@ -825,6 +844,8 @@ static struct macdrv_win_data *macdrv_create_win_data(HWND hwnd, const RECT *win TRACE("win %p/%p window %s whole %s client %s\n", hwnd, data->cocoa_view, wine_dbgstr_rect(&data->window_rect), wine_dbgstr_rect(&data->whole_rect), wine_dbgstr_rect(&data->client_rect)); + + set_cocoa_view_parent(data, parent); } return data; @@ -1574,18 +1595,8 @@ void CDECL macdrv_SetParent(HWND hwnd, HWND parent, HWND old_parent) destroy_cocoa_window(data); create_cocoa_view(data); } - else - { - struct macdrv_win_data *parent_data = get_win_data(parent); - macdrv_window cocoa_window = parent_data ? parent_data->cocoa_window : NULL; - macdrv_view superview = parent_data ? parent_data->client_cocoa_view : NULL; - - if (!cocoa_window && !superview) - WARN("hwnd %p new parent %p has no Cocoa window or view in this process\n", hwnd, parent); - macdrv_set_view_superview(data->cocoa_view, superview, cocoa_window, NULL, NULL); - release_win_data(parent_data); - } + set_cocoa_view_parent(data, parent); } else /* new top level window */ {

1 0

Vincent Povirk : gdiplus: Don' t include rotated fonts in the installed font collection.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 0d6a4b06f96da1027e564e99e37f773b0975803b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d6a4b06f96da1027e564e99e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:11 2016 -0600 gdiplus: Don't include rotated fonts in the installed font collection. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 63eaed2..ed0499d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1604,6 +1604,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (type == RASTER_FONTTYPE) return 1; + /* skip rotated fonts */ + if (lfw->lfFaceName[0] == '@') + return 1; + /* skip duplicates */ for (i=0; i<fonts->count; i++) if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0)

1 0

Vincent Povirk : gdiplus: Create the FontFamily before checking for duplicates.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 50185949d8d41c78fe52ba7c6fc1e5de39491f03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50185949d8d41c78fe52ba7c6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Dec 1 13:08:12 2016 -0600 gdiplus: Create the FontFamily before checking for duplicates. Sometimes GdipCreateFontFamilyFromName stores a different name in the GpFontFamily object, which breaks the duplicate check. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index ed0499d..1068a47 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1599,6 +1599,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { GpFontCollection* fonts = (GpFontCollection*)lParam; + GpFontFamily* family; int i; if (type == RASTER_FONTTYPE) @@ -1608,10 +1609,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if (lfw->lfFaceName[0] == '@') return 1; - /* skip duplicates */ - for (i=0; i<fonts->count; i++) - if (strcmpiW(lfw->lfFaceName, fonts->FontFamilies[i]->FamilyName) == 0) - return 1; + if (fonts->count && strcmpiW(lfw->lfFaceName, fonts->FontFamilies[fonts->count-1]->FamilyName) == 0) + return 1; if (fonts->allocated == fonts->count) { @@ -1627,11 +1626,21 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &fonts->FontFamilies[fonts->count]) == Ok) - fonts->count++; - else + if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) return 0; + /* skip duplicates */ + for (i=0; i<fonts->count; i++) + { + if (strcmpiW(family->FamilyName, fonts->FontFamilies[i]->FamilyName) == 0) + { + GdipDeleteFontFamily(family); + return 1; + } + } + + fonts->FontFamilies[fonts->count++] = family; + return 1; }

1 0

Józef Kucia : wined3d: Implement stencil shader resource views.
by Alexandre Julliard Dec. 2, 2016

Dec. 2, 2016

Module: wine Branch: master Commit: 85c8c3eea8a5ac31deb52dda7d3e28d2c8f11a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c8c3eea8a5ac31deb52dda7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 1 13:56:34 2016 +0100 wined3d: Implement stencil shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/view.c | 28 +++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fabd69c..5787c22 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3904,6 +3904,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE("Disabling ARB_clip_control because ARB_viewport_array is not supported.\n"); gl_info->supported[ARB_CLIP_CONTROL] = FALSE; } + if (gl_info->supported[ARB_STENCIL_TEXTURING] && !gl_info->supported[ARB_TEXTURE_SWIZZLE]) + { + /* The stencil value needs to be placed in the green channel. */ + TRACE("Disabling ARB_stencil_texturing because ARB_texture_swizzle is not supported.\n"); + gl_info->supported[ARB_STENCIL_TEXTURING] = FALSE; + } if (!gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] && gl_info->supported[EXT_TEXTURE_MIRROR_CLAMP]) { TRACE(" IMPLIED: ATI_texture_mirror_once support (by EXT_texture_mirror_clamp).\n"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 86d3ebb..2e728ac 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -24,6 +24,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static BOOL is_stencil_view_format(const struct wined3d_format *format) +{ + return format->id == WINED3DFMT_X24_TYPELESS_G8_UINT + || format->id == WINED3DFMT_X32_TYPELESS_G8X24_UINT; +} + ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *view) { ULONG refcount = InterlockedIncrement(&view->refcount); @@ -320,6 +326,25 @@ static void wined3d_shader_resource_view_create_texture_view(struct wined3d_shad desc->u.texture.layer_idx, desc->u.texture.layer_count)); checkGLcall("Create texture view"); + if (is_stencil_view_format(view_format)) + { + static const GLint swizzle[] = {GL_ZERO, GL_RED, GL_ZERO, GL_ZERO}; + + if (!gl_info->supported[ARB_STENCIL_TEXTURING]) + { + context_release(context); + FIXME("OpenGL implementation does not support stencil texturing.\n"); + return; + } + + context_bind_texture(context, view->target, view->object); + gl_info->gl_ops.gl.p_glTexParameteriv(view->target, GL_TEXTURE_SWIZZLE_RGBA, swizzle); + gl_info->gl_ops.gl.p_glTexParameteri(view->target, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX); + checkGLcall("Initialize stencil view"); + + context_invalidate_state(context, STATE_SHADER_RESOURCE_BINDING); + } + context_release(context); } @@ -391,7 +416,8 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ if (resource->format->id == view_format->id && texture->target == view->target && !desc->u.texture.level_idx && desc->u.texture.level_count == texture->level_count - && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count) + && !desc->u.texture.layer_idx && desc->u.texture.layer_count == texture->layer_count + && !is_stencil_view_format(view_format)) { TRACE("Creating identity shader resource view.\n"); }

1 0