August 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: d01ab5ee4b56c8284d0bd9ae9af9f257e041b54e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d01ab5ee4b56c8284d0bd9ae9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:19 2016 +0300 t2embed: Fix TTIsEmbeddingEnabled() to properly use otmpFaceName metrics field. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 48e20f5..de78b25 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -171,7 +171,7 @@ LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) return E_NOFREEMEMORY; GetOutlineTextMetricsA(hDC, len, otm); - ret = TTIsEmbeddingEnabledForFacename(otm->otmpFaceName, enabled); + ret = TTIsEmbeddingEnabledForFacename((LPCSTR)otm + (ULONG_PTR)otm->otmpFaceName, enabled); HeapFree(GetProcessHeap(), 0, otm); return ret; }

1 0

Nikolay Sivov : gdi32: Keep font tables tags defined in one place.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: cd688217808ca347b68f6929b47b7cee03b5782c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd688217808ca347b68f6929b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:49 2016 +0300 gdi32: Keep font tables tags defined in one place. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5ddfc6a..7b0ff94 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -214,6 +214,21 @@ MAKE_FUNCPTR(FcPatternGetString); #define GET_BE_WORD(x) RtlUshortByteSwap(x) #endif +#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ + ( ( (FT_ULong)_x4 << 24 ) | \ + ( (FT_ULong)_x3 << 16 ) | \ + ( (FT_ULong)_x2 << 8 ) | \ + (FT_ULong)_x1 ) + +#define MS_GASP_TAG MS_MAKE_TAG('g', 'a', 's', 'p') +#define MS_GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') +#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') +#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') + +/* 'gasp' flags */ +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 + #ifndef WINE_FONT_DIR #define WINE_FONT_DIR "fonts" #endif @@ -637,7 +652,6 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' /* These are all structures needed for the GSUB table */ -#define GSUB_TAG MS_MAKE_TAG('G', 'S', 'U', 'B') typedef struct { DWORD version; @@ -4679,13 +4693,7 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf * load the vdmx entry for the specified height */ -#define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ - ( ( (FT_ULong)_x4 << 24 ) | \ - ( (FT_ULong)_x3 << 16 ) | \ - ( (FT_ULong)_x2 << 8 ) | \ - (FT_ULong)_x1 ) -#define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') typedef struct { WORD version; @@ -5103,10 +5111,6 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 -#define GASP_TAG MS_MAKE_TAG('g','a','s','p') - static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) { DWORD size; @@ -5116,7 +5120,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) BOOL ret = FALSE; *flags = 0; - size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + size = get_font_data( font, MS_GASP_TAG, 0, NULL, 0 ); if (size == GDI_ERROR) return FALSE; if (size < 4 * sizeof(WORD)) return FALSE; if (size > sizeof(buf)) @@ -5125,7 +5129,7 @@ static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) if (!ptr) return FALSE; } - get_font_data( font, GASP_TAG, 0, ptr, size ); + get_font_data( font, MS_GASP_TAG, 0, ptr, size ); version = GET_BE_WORD( *ptr++ ); num_recs = GET_BE_WORD( *ptr++ ); @@ -5710,11 +5714,11 @@ found_face: if (face->flags & ADDFONT_VERTICAL_FONT) /* We need to try to load the GSUB table */ { - int length = get_font_data(ret, GSUB_TAG , 0, NULL, 0); + int length = get_font_data(ret, MS_GSUB_TAG , 0, NULL, 0); if (length != GDI_ERROR) { ret->GSUB_Table = HeapAlloc(GetProcessHeap(),0,length); - get_font_data(ret, GSUB_TAG , 0, ret->GSUB_Table, length); + get_font_data(ret, MS_GSUB_TAG , 0, ret->GSUB_Table, length); TRACE("Loaded GSUB table of %i bytes\n",length); ret->vert_feature = get_GSUB_vert_feature(ret); if (!ret->vert_feature) @@ -8476,7 +8480,6 @@ BOOL WINAPI GetFontFileInfo( DWORD instance_id, DWORD unknown, struct font_filei /************************************************************************* * Kerning support for TrueType fonts */ -#define MS_KERN_TAG MS_MAKE_TAG('k', 'e', 'r', 'n') struct TT_kern_table {

1 0

Alexandre Julliard : reg/tests: Avoid non-portable Unicode chars.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: ce7c4b58b20fed6bcadd37363402fd0523071a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce7c4b58b20fed6bcadd37363… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 12 12:45:16 2016 +0900 reg/tests: Avoid non-portable Unicode chars. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index bd5695f..fb5edbc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -872,36 +872,36 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFFWindows Registry Editor Version 5\n", &r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFFWINDOWS Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbfWINDOWS Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr(" \uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr(" \xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\t\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\t\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\n\uFEFFWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\n\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - test_import_wstr("\uFEFF Windows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFF\tWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - test_import_wstr("\uFEFF\nWindows Registry Editor Version 5.00\n", &r); + test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); }

1 0

Nikolay Sivov : shell32/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 79e95afbc3ccc22049af08ddcdd660502441c14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79e95afbc3ccc22049af08ddc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 03:31:21 2016 +0300 shell32/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shellole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shellole.c b/dlls/shell32/tests/shellole.c index e8cf744..04c9632 100644 --- a/dlls/shell32/tests/shellole.c +++ b/dlls/shell32/tests/shellole.c @@ -871,8 +871,8 @@ static void test_SHCreateSessionKey(void) return; } -if (0) /* crashes on native */ - hr = pSHCreateSessionKey(KEY_READ, NULL); + if (0) /* crashes on native */ + hr = pSHCreateSessionKey(KEY_READ, NULL); hkey = (HKEY)0xdeadbeef; hr = pSHCreateSessionKey(0, &hkey);

1 0

Józef Kucia : d3d11/tests: Add basic test for drawing on feature level 9.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: c61d8c2af1bca703131f19fab028ed8e53c17530 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61d8c2af1bca703131f19fab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:29 2016 +0200 d3d11/tests: Add basic test for drawing on feature level 9. 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/d3d11/tests/d3d11.c | 99 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 87 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 07a3066..330a960 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1125,13 +1125,21 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) return position; } #endif - 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, - 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, - 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, - 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, - 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x43425844, 0x4fb19b86, 0x955fa240, 0x1a630688, 0x24eb9db4, 0x00000001, 0x000001e0, 0x00000006, + 0x00000038, 0x00000084, 0x000000d0, 0x00000134, 0x00000178, 0x000001ac, 0x53414e58, 0x00000044, + 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, + 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x02000001, 0xc00f0000, 0x80e40000, + 0x0000ffff, 0x50414e58, 0x00000044, 0x00000044, 0xfffe0200, 0x00000020, 0x00000024, 0x00240000, + 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, + 0x02000001, 0xc00f0000, 0x80e40000, 0x0000ffff, 0x396e6f41, 0x0000005c, 0x0000005c, 0xfffe0200, + 0x00000034, 0x00000028, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240001, 0x00000000, + 0xfffe0200, 0x0200001f, 0x80000005, 0x900f0000, 0x04000004, 0xc0030000, 0x90ff0000, 0xa0e40000, + 0x90e40000, 0x02000001, 0xc00c0000, 0x90e40000, 0x0000ffff, 0x52444853, 0x0000003c, 0x00010040, 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, - 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x4e475349, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, + 0x49534f50, 0x4e4f4954, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, }; static const struct vec2 quad[] = { @@ -1181,12 +1189,17 @@ static void draw_color_quad_(unsigned int line, struct d3d11_test_context *conte return color; } #endif - 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, - 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + 0x43425844, 0xe7ffb369, 0x72bb84ee, 0x6f684dcd, 0xd367d788, 0x00000001, 0x00000158, 0x00000005, + 0x00000034, 0x00000080, 0x000000cc, 0x00000114, 0x00000124, 0x53414e58, 0x00000044, 0x00000044, + 0xffff0200, 0x00000014, 0x00000030, 0x00240001, 0x00300000, 0x00300000, 0x00240000, 0x00300000, + 0x00000000, 0x00000001, 0x00000000, 0xffff0200, 0x02000001, 0x800f0800, 0xa0e40000, 0x0000ffff, + 0x396e6f41, 0x00000044, 0x00000044, 0xffff0200, 0x00000014, 0x00000030, 0x00240001, 0x00300000, + 0x00300000, 0x00240000, 0x00300000, 0x00000000, 0x00000001, 0x00000000, 0xffff0200, 0x02000001, + 0x800f0800, 0xa0e40000, 0x0000ffff, 0x52444853, 0x00000040, 0x00000040, 0x00000010, 0x04000059, + 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, 0x001020f2, + 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, + 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, }; ID3D11Device *device = context->device; @@ -10386,6 +10399,67 @@ static void test_required_format_support(void) } } +static void test_fl9_draw(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i; + HRESULT hr; + + static const D3D_FEATURE_LEVEL feature_levels[] = + { + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; + static const struct vec4 color = {0.2f, 0.3f, 0.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + return float4(1.0f, 0.0f, 0.0f, 0.5f); + } +#endif + 0x43425844, 0xb70eda74, 0xc9a7f982, 0xebc31bbf, 0x952a1360, 0x00000001, 0x00000168, 0x00000005, + 0x00000034, 0x0000008c, 0x000000e4, 0x00000124, 0x00000134, 0x53414e58, 0x00000050, 0x00000050, + 0xffff0200, 0x0000002c, 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, + 0xffff0200, 0x05000051, 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, 0x02000001, + 0x800f0800, 0xa0e40000, 0x0000ffff, 0x396e6f41, 0x00000050, 0x00000050, 0xffff0200, 0x0000002c, + 0x00000024, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0xffff0200, 0x05000051, + 0xa00f0000, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, 0x02000001, 0x800f0800, 0xa0e40000, + 0x0000ffff, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, 0x03000065, 0x001020f2, 0x00000000, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f000000, + 0x0100003e, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x45475241, 0xabab0054, + }; + + for (i = 0; i < sizeof(feature_levels) / sizeof(*feature_levels); ++i) + { + if (!init_test_context(&test_context, &feature_levels[i])) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x, feature level %#x.\n", + hr, feature_levels[i]); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0x7f0000ff, 1); + ID3D11PixelShader_Release(ps); + + draw_color_quad(&test_context, &color); + todo_wine check_texture_color(test_context.backbuffer, 0xff004c33, 1); + + release_test_context(&test_context); + } +} + START_TEST(d3d11) { test_create_device(); @@ -10444,4 +10518,5 @@ START_TEST(d3d11) test_face_culling(); test_line_antialiasing_blending(); test_required_format_support(); + test_fl9_draw(); }

1 0

Pierre Schweitzer : mpr: Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A().
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: d2e68234b2d2097c2306b642329ae541f6e76d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2e68234b2d2097c2306b6423… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:22:07 2016 +0200 mpr: Implement WNetCancelConnectionA(), WNetCancelConnectionW(), WNetCancelConnection2A(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 6e865f0..5a67e5f 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1838,9 +1838,7 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource, */ DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_a(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2A(lpName, 0, fForce); } /********************************************************************* @@ -1848,9 +1846,7 @@ DWORD WINAPI WNetCancelConnectionA( LPCSTR lpName, BOOL fForce ) */ DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) { - FIXME( "(%s, %d), stub\n", debugstr_w(lpName), fForce ); - - return WN_SUCCESS; + return WNetCancelConnection2W(lpName, 0, fForce); } /********************************************************************* @@ -1858,9 +1854,15 @@ DWORD WINAPI WNetCancelConnectionW( LPCWSTR lpName, BOOL fForce ) */ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_a(lpName), dwFlags, fForce ); + DWORD ret; + WCHAR * name = strdupAtoW(lpName); + if (!name) + return ERROR_NOT_CONNECTED; - return WN_SUCCESS; + ret = WNetCancelConnection2W(name, dwFlags, fForce); + HeapFree(GetProcessHeap(), 0, name); + + return ret; } /*********************************************************************

1 0

Nikolay Sivov : shlwapi/tests: Fix indentation warning on GCC 6.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: e078c97d53eba1918902eb9cdc776b5b726f6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e078c97d53eba1918902eb9cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 03:31:20 2016 +0300 shlwapi/tests: Fix indentation warning on GCC 6. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/ordinal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 74cad7d..ad3048b 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -3224,8 +3224,8 @@ static void test_IUnknown_GetClassID(void) CLSID clsid, clsid2, clsid3; HRESULT hr; -if (0) /* crashes on native systems */ - hr = pIUnknown_GetClassID(NULL, NULL); + if (0) /* crashes on native systems */ + hr = pIUnknown_GetClassID(NULL, NULL); memset(&clsid, 0xcc, sizeof(clsid)); memset(&clsid3, 0xcc, sizeof(clsid3));

1 0

Pierre Schweitzer : mpr: Set the CONNECT_LOCALDRIVE flag in case a local redirection is made on connection.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: d6d0d96402b9c187877f11da173f8fbbf62ba072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6d0d96402b9c187877f11da1… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:24:22 2016 +0200 mpr: Set the CONNECT_LOCALDRIVE flag in case a local redirection is made on connection. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 5a67e5f..85dfca1 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1615,7 +1615,11 @@ static void use_connection_set_accessnameW(struct use_connection_context *ctxt, { WCHAR *accessname = ctxt->accessname; if (local_name) + { strcpyW(accessname, local_name); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1759,7 +1763,11 @@ static void use_connection_set_accessnameA(struct use_connection_context *ctxt, { char *accessname = ctxt->accessname; if (local_name) + { WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); + if (ctxt->result) + *ctxt->result = CONNECT_LOCALDRIVE; + } else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

1 0

Pierre Schweitzer : mpr: Implement WNetCancelConnection2W().
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 0b34924bd8cb82ba2a96e7704c1c685a07c43e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b34924bd8cb82ba2a96e7704… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Tue Aug 2 13:21:22 2016 +0200 mpr: Implement WNetCancelConnection2W(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index c44fec2..6e865f0 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -58,6 +58,7 @@ typedef struct _WNetProvider PF_NPGetResourceInformation getResourceInformation; PF_NPAddConnection addConnection; PF_NPAddConnection3 addConnection3; + PF_NPCancelConnection cancelConnection; } WNetProvider, *PWNetProvider; typedef struct _WNetProviderTable @@ -206,8 +207,10 @@ static void _tryLoadProvider(PCWSTR provider) } provider->addConnection = MPR_GETPROC(NPAddConnection); provider->addConnection3 = MPR_GETPROC(NPAddConnection3); + provider->cancelConnection = MPR_GETPROC(NPCancelConnection); TRACE("NPAddConnection %p\n", provider->addConnection); TRACE("NPAddConnection3 %p\n", provider->addConnection3); + TRACE("NPCancelConnection %p\n", provider->cancelConnection); providerTable->numProviders++; } else @@ -1865,9 +1868,26 @@ DWORD WINAPI WNetCancelConnection2A( LPCSTR lpName, DWORD dwFlags, BOOL fForce ) */ DWORD WINAPI WNetCancelConnection2W( LPCWSTR lpName, DWORD dwFlags, BOOL fForce ) { - FIXME( "(%s, %08X, %d), stub\n", debugstr_w(lpName), dwFlags, fForce ); + DWORD ret = WN_NO_NETWORK; + DWORD index; - return WN_SUCCESS; + if (providerTable != NULL) + { + for (index = 0; index < providerTable->numProviders; index++) + { + if(providerTable->table[index].getCaps(WNNC_CONNECTION) & + WNNC_CON_CANCELCONNECTION) + { + if (providerTable->table[index].cancelConnection) + ret = providerTable->table[index].cancelConnection((LPWSTR)lpName, fForce); + else + ret = WN_NO_NETWORK; + if (ret == WN_SUCCESS || ret == WN_OPEN_FILES) + break; + } + } + } + return ret; } /*****************************************************************

1 0

Józef Kucia : d3d11/tests: Add test for swapchain views.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 98adaffc55dab371c94f3fdbf276d85432f7a0b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98adaffc55dab371c94f3fdbf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:26 2016 +0200 d3d11/tests: Add test for swapchain 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/d3d11/tests/d3d11.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e412c634..05f7917 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7481,6 +7481,49 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_swapchain_views(void) +{ + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + struct d3d11_test_context test_context; + D3D11_RENDER_TARGET_VIEW_DESC rtv_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + ID3D11RenderTargetView *rtv; + ID3D11Device *device; + HRESULT hr; + + static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + draw_color_quad(&test_context, &color); + check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); + + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; + U(rtv_desc).Texture2D.MipSlice = 0; + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)test_context.backbuffer, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + + draw_color_quad(&test_context, &color); + todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); + + srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + rtv_desc.ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; + U(srv_desc).Texture2D.MostDetailedMip = 0; + U(srv_desc).Texture2D.MipLevels = 1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)test_context.backbuffer, &srv_desc, &srv); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + ID3D11RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + static void test_swapchain_flip(void) { ID3D11Texture2D *backbuffer_0, *backbuffer_1, *backbuffer_2, *offscreen; @@ -10383,6 +10426,7 @@ START_TEST(d3d11) test_buffer_data_init(); test_texture_data_init(); test_check_multisample_quality_levels(); + test_swapchain_views(); test_swapchain_flip(); test_clear_render_target_view(); test_clear_depth_stencil_view();

1 0