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

Nikolay Sivov : include: Fix IShellFolderView method macros.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 16d21d94c182b0a5ce3b9b22a5049e2eb1d425e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16d21d94c182b0a5ce3b9b22a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:51:44 2017 +0300 include: Fix IShellFolderView method macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index 0f754d0..ccbf008 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -662,11 +662,11 @@ DECLARE_INTERFACE_(IShellFolderView, IUnknown) #define IShellFolderView_GetDropPoint(p,a) (p)->lpVtbl->GetDropPoint(p,a) #define IShellFolderView_MoveIcons(p,a) (p)->lpVtbl->MoveIcons(p,a) #define IShellFolderView_SetItemPos(p,a,b) (p)->lpVtbl->SetItemPos(p,a,b) -#define IShellFolderView_DropTarget(p,a) (p)->lpVtbl->DropTarget(p,a) +#define IShellFolderView_IsBkDropTarget(p,a) (p)->lpVtbl->IsBkDropTarget(p,a) #define IShellFolderView_SetClipboard(p,a) (p)->lpVtbl->SetClipboard(p,a) #define IShellFolderView_SetPoints(p,a) (p)->lpVtbl->SetPoints(p,a) #define IShellFolderView_GetItemSpacing(p,a) (p)->lpVtbl->GetItemSpacing(p,a) -#define IShellFolderView_SetCallback(p,a) (p)->lpVtbl->SetCallback(p,a) +#define IShellFolderView_SetCallback(p,a,b) (p)->lpVtbl->SetCallback(p,a,b) #define IShellFolderView_Select(p,a) (p)->lpVtbl->Select(p,a) #define IShellFolderView_QuerySupport(p,a) (p)->lpVtbl->QuerySupport(p,a) #define IShellFolderView_SetAutomationObject(p,a) (p)->lpVtbl->SetAutomationObject(p,a)

1 0

Nikolay Sivov : dwrite: Look for 'SVG ' table too when checking supported formats.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 1b1488fda7e3cecae028c1198f00d1dcf2fc40dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1488fda7e3cecae028c1198… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:50:46 2017 +0300 dwrite: Look for 'SVG ' table too when checking supported formats. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 6 +++++- dlls/dwrite/tests/font.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index b7e9d87..99531a6 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -2069,6 +2070,9 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface) if (opentype_has_font_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (opentype_has_font_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; } diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4d5780c..9fd8258 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -45,6 +45,7 @@ #define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f') #define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ') #define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R') +#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -7436,7 +7437,10 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface) if (face_has_table(fontface, MS_COLR_TAG)) ret |= DWRITE_GLYPH_IMAGE_FORMATS_COLR; - /* TODO: handle SVG and bitmap data */ + if (face_has_table(fontface, MS_SVG__TAG)) + ret |= DWRITE_GLYPH_IMAGE_FORMATS_SVG; + + /* TODO: handle embedded bitmaps tables */ return ret; }

1 0

Henri Verbeet : wined3d: Get rid of the "Multisampling" setting.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: c09bb22c81cd391998cae632380d3a50504d0d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09bb22c81cd391998cae6323… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:27 2017 +0200 wined3d: Get rid of the "Multisampling" setting. There should be no reason to set this anymore. Note that "SampleCount" can be used to force a specific sample count. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 +-- dlls/wined3d/wined3d_main.c | 9 --------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b5a8e47..e89cd6d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3710,8 +3710,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) else gl_info->limits.shininess = 128.0f; - if ((gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) - && wined3d_settings.allow_multisampling) + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_MULTISAMPLE]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_SAMPLES, &gl_max); gl_info->limits.samples = gl_max; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f662c3a..1a4e2f2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -80,7 +80,6 @@ struct wined3d_settings wined3d_settings = PCI_DEVICE_NONE,/* PCI Device ID */ 0, /* The default of memory is set in init_driver_info */ NULL, /* No wine logo by default */ - TRUE, /* Multisampling enabled by default. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* No strict draw ordering. */ FALSE, /* Don't range check relative addressing indices in float constants. */ @@ -289,14 +288,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (!wined3d_settings.logo) ERR("Failed to allocate logo path memory.\n"); else memcpy(wined3d_settings.logo, buffer, len); } - if ( !get_config_key( hkey, appkey, "Multisampling", buffer, size) ) - { - if (!strcmp(buffer, "disabled")) - { - TRACE("Multisampling disabled.\n"); - wined3d_settings.allow_multisampling = FALSE; - } - } if (!get_config_key_dword(hkey, appkey, "SampleCount", &wined3d_settings.sample_count)) ERR_(winediag)("Forcing sample count to %u. This may not be compatible with all applications.\n", wined3d_settings.sample_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bab0fea..829360c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -388,7 +388,6 @@ struct wined3d_settings /* Memory tracking and object counting. */ UINT64 emulated_textureram; char *logo; - int allow_multisampling; unsigned int sample_count; BOOL strict_draw_ordering; BOOL check_float_constants;

1 0

Henri Verbeet : wined3d: Use vector types in wined3d_format_convert_from_float().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: fa6dba885c495f92f8e1a72fdb706c214b645a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6dba885c495f92f8e1a72fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:25 2017 +0200 wined3d: Use vector types in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++--------------------------- include/wine/wined3d.h | 8 +++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0eacc82..8c53f45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4971,38 +4971,32 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static const struct { enum wined3d_format_id format_id; - float r_mul; - float g_mul; - float b_mul; - float a_mul; - BYTE r_shift; - BYTE g_shift; - BYTE b_shift; - BYTE a_shift; + struct wined3d_vec4 mul; + struct wined3d_uvec4 shift; } conv[] = { - {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, - {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, - {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, - {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_S1_UINT_D15_UNORM, 32767.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D16_UNORM, 65535.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D24_UNORM_S8_UINT, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_X8D24_UNORM, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D32_UNORM, 4294967295.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B5G6R5_UNORM, { 31.0f, 63.0f, 31.0f, 0.0f}, {11, 5, 0, 0}}, + {WINED3DFMT_B5G5R5A1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_B5G5R5X1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_R8_UNORM, { 255.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_A8_UNORM, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_B4G4R4A4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B4G4R4X4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B2G3R3_UNORM, { 7.0f, 7.0f, 3.0f, 0.0f}, { 5, 2, 0, 0}}, + {WINED3DFMT_R8G8B8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_R8G8B8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_B10G10R10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, {20, 10, 0, 30}}, + {WINED3DFMT_R10G10B10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, { 0, 10, 20, 30}}, + {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, }; unsigned int i; @@ -5014,10 +5008,10 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con if (format->id != conv[i].format_id) continue; - ret = ((DWORD)((color->r * conv[i].r_mul) + 0.5f)) << conv[i].r_shift; - ret |= ((DWORD)((color->g * conv[i].g_mul) + 0.5f)) << conv[i].g_shift; - ret |= ((DWORD)((color->b * conv[i].b_mul) + 0.5f)) << conv[i].b_shift; - ret |= ((DWORD)((color->a * conv[i].a_mul) + 0.5f)) << conv[i].a_shift; + ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; + ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; + ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; + ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 29a8431..9c3246b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1567,6 +1567,14 @@ struct wined3d_ivec4 int w; }; +struct wined3d_uvec4 +{ + unsigned int x; + unsigned int y; + unsigned int z; + unsigned int w; +}; + struct wined3d_matrix { float _11, _12, _13, _14;

1 0

Henri Verbeet : wined3d: Avoid touching the output value on failure in get_config_key_dword(); .
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 449308ec5d2025058d46b17352c9fa05dbe0889e URL: http://source.winehq.org/git/wine.git/?a=commit;h=449308ec5d2025058d46b1735… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:28 2017 +0200 wined3d: Avoid touching the output value on failure in get_config_key_dword();. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1a4e2f2..8f5da3c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -127,13 +127,20 @@ static DWORD get_config_key(HKEY defkey, HKEY appkey, const char *name, char *bu return ERROR_FILE_NOT_FOUND; } -static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *data) +static DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char *name, DWORD *value) { - DWORD type; - DWORD size = sizeof(DWORD); - if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; - if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)data, &size) && (type == REG_DWORD)) return 0; + DWORD type, data, size; + + size = sizeof(data); + if (appkey && !RegQueryValueExA(appkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + size = sizeof(data); + if (defkey && !RegQueryValueExA(defkey, name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; + return ERROR_FILE_NOT_FOUND; + +success: + *value = data; + return 0; } static BOOL wined3d_dll_init(HINSTANCE hInstDLL)

1 0

Stefan Dösinger : d3d8/tests: Accept alpha channel differences in shadow_test.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 688493bb3ceef292a7a607decb008ed0d63f8e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=688493bb3ceef292a7a607dec… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Apr 21 17:01:52 2017 +0200 d3d8/tests: Accept alpha channel differences in shadow_test. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 4f0c397..14eb6ea 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4069,7 +4069,11 @@ static void shadow_test(void) for (j = 0; j < sizeof(expected_colors) / sizeof(*expected_colors); ++j) { D3DCOLOR color = get_readback_color(&rb, expected_colors[j].x, expected_colors[j].y); - ok(color_match(color, expected_colors[j].color, 0), + /* Geforce 7 on Windows returns 1.0 in alpha when the depth format is D24S8 or D24X8, + * whereas other GPUs (all AMD, newer Nvidia) return the same value they return in .rgb. + * Accept alpha mismatches as broken but make sure to check the color channels. */ + ok(color_match(color, expected_colors[j].color, 0) + || broken(color_match(color & 0x00ffffff, expected_colors[j].color & 0x00ffffff, 0)), "Expected color 0x%08x at (%u, %u) for format %s, got 0x%08x.\n", expected_colors[j].color, expected_colors[j].x, expected_colors[j].y, formats[i].name, color);

1 0

Józef Kucia : d3d10core/tests: Check device refcount after CreateInputLayout().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 69961bc2410fb3710046cfa63ed2eb4d81e9fd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69961bc2410fb3710046cfa63… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 24 12:02:26 2017 +0200 d3d10core/tests: Check device refcount after CreateInputLayout(). 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 49de3f8..f6621e8 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -9271,9 +9271,9 @@ static void test_create_input_layout(void) { {"POSITION", 0, DXGI_FORMAT_UNKNOWN, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, }; + ULONG refcount, expected_refcount; ID3D10InputLayout *input_layout; ID3D10Device *device; - ULONG refcount; unsigned int i; HRESULT hr; @@ -9318,11 +9318,15 @@ static void test_create_input_layout(void) for (i = 0; i < ARRAY_SIZE(vertex_formats); ++i) { + expected_refcount = get_refcount(device) + 1; layout_desc->Format = vertex_formats[i]; hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), vs_code, sizeof(vs_code), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n", vertex_formats[i], hr); + refcount = get_refcount(device); + todo_wine ok(refcount >= expected_refcount, "Got refcount %u, expected >= %u.\n", + refcount, expected_refcount); ID3D10InputLayout_Release(input_layout); }

1 0

Michael Müller : ntdll: Mark LDR data as initialized.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: a3452656147cb5cf74d2f7380d83200e001eaffb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3452656147cb5cf74d2f7380… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Apr 23 23:17:00 2017 +0200 ntdll: Mark LDR data as initialized. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 7 +++++-- dlls/ntdll/thread.c | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 4f72c3e..2587a97 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2991,10 +2991,13 @@ static void test_ResolveDelayLoadedAPI(void) static void test_InMemoryOrderModuleList(void) { - LIST_ENTRY *entry1, *mark1 = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList; - LIST_ENTRY *entry2, *mark2 = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + PEB_LDR_DATA *ldr = NtCurrentTeb()->Peb->LdrData; + LIST_ENTRY *entry1, *mark1 = &ldr->InLoadOrderModuleList; + LIST_ENTRY *entry2, *mark2 = &ldr->InMemoryOrderModuleList; LDR_MODULE *module1, *module2; + ok(ldr->Initialized == TRUE, "expected TRUE, got %u\n", ldr->Initialized); + for (entry1 = mark1->Flink, entry2 = mark2->Flink; entry1 != mark1 && entry2 != mark2; entry1 = entry1->Flink, entry2 = entry2->Flink) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index c9a5da6..0506f6b 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -259,6 +259,7 @@ HANDLE thread_init(void) params.CurrentDirectory.DosPath.MaximumLength = sizeof(current_dir); params.wShowWindow = 1; /* SW_SHOWNORMAL */ ldr.Length = sizeof(ldr); + ldr.Initialized = TRUE; RtlInitializeBitMap( &tls_bitmap, peb->TlsBitmapBits, sizeof(peb->TlsBitmapBits) * 8 ); RtlInitializeBitMap( &tls_expansion_bitmap, peb->TlsExpansionBitmapBits, sizeof(peb->TlsExpansionBitmapBits) * 8 );

1 0

Henri Verbeet : ddraw/tests: Introduce a helper function to create windows.
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: a86af72270e61cafb37454bbdc8020681dd49b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86af72270e61cafb37454bbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:29 2017 +0200 ddraw/tests: Introduce a helper function to create windows. Mostly for consistency with other D3D tests. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 151 ++++++++++++------------------ dlls/ddraw/tests/ddraw2.c | 173 +++++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 216 +++++++++++++++--------------------------- dlls/ddraw/tests/ddraw7.c | 232 ++++++++++++++++------------------------------ 4 files changed, 273 insertions(+), 499 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a86af72270e61cafb3745…

1 0

Henri Verbeet : wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float ().
by Alexandre Julliard April 24, 2017

April 24, 2017

Module: wine Branch: master Commit: 546be1b80bc1e44b9ed1ad5c159cdbd9f945e7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546be1b80bc1e44b9ed1ad5c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:26 2017 +0200 wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 46 +++++++++++++++++++++++++++++++++++----------- include/wine/wined3d.h | 8 ++++++++ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8c53f45..bd83446 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4974,7 +4974,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con struct wined3d_vec4 mul; struct wined3d_uvec4 shift; } - conv[] = + float_conv[] = { {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, @@ -4994,24 +4994,48 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + }; + static const struct + { + enum wined3d_format_id format_id; + struct wined3d_dvec4 mul; + struct wined3d_uvec4 shift; + } + double_conv[] = + { + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, }; unsigned int i; + DWORD ret; TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); - for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) + for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { - DWORD ret; + if (format->id != float_conv[i].format_id) + continue; - if (format->id != conv[i].format_id) continue; + ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; + ret |= ((DWORD)((color->g * float_conv[i].mul.y) + 0.5f)) << float_conv[i].shift.y; + ret |= ((DWORD)((color->b * float_conv[i].mul.z) + 0.5f)) << float_conv[i].shift.z; + ret |= ((DWORD)((color->a * float_conv[i].mul.w) + 0.5f)) << float_conv[i].shift.w; + + TRACE("Returning 0x%08x.\n", ret); + + return ret; + } + + for (i = 0; i < ARRAY_SIZE(double_conv); ++i) + { + if (format->id != double_conv[i].format_id) + continue; - ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; - ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; - ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; - ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; + ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; + ret |= ((DWORD)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; + ret |= ((DWORD)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; + ret |= ((DWORD)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c3246b..e0929ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1559,6 +1559,14 @@ struct wined3d_vec4 float w; }; +struct wined3d_dvec4 +{ + double x; + double y; + double z; + double w; +}; + struct wined3d_ivec4 { int x;

1 0