wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Pierre Schweitzer : mpr: Implement WNetCancelConnection2W().
by Alexandre Julliard 12 Aug '16

12 Aug '16

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

Nikolay Sivov : gdi32: Support special 'ttcf' tag in GetFontData().
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 7e50116b52f37a3a191cb207c1543ffdd3941c8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e50116b52f37a3a191cb207c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 13:14:50 2016 +0300 gdi32: Support special 'ttcf' tag in GetFontData(). 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 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7b0ff94..2e3b29a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -210,8 +210,10 @@ MAKE_FUNCPTR(FcPatternGetString); #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) #else #define GET_BE_WORD(x) RtlUshortByteSwap(x) +#define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif #define MS_MAKE_TAG( _x1, _x2, _x3, _x4 ) \ @@ -223,6 +225,7 @@ MAKE_FUNCPTR(FcPatternGetString); #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_TTCF_TAG MS_MAKE_TAG('t', 't', 'c', 'f') #define MS_VDMX_TAG MS_MAKE_TAG('V', 'D', 'M', 'X') /* 'gasp' flags */ @@ -424,6 +427,7 @@ struct tagGdiFont { GdiFont *base_font; VOID *GSUB_Table; const VOID *vert_feature; + ULONG ttc_item_offset; /* 0 if font is not a part of TrueType collection */ DWORD cache_num; DWORD instance_id; struct font_fileinfo *fileinfo; @@ -4549,6 +4553,9 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) font->ft_face = ft_face; if(FT_IS_SCALABLE(ft_face)) { + FT_ULong len; + DWORD header; + /* load the VDMX table if we have one */ font->ppem = load_VDMX(font, height); if(font->ppem == 0) @@ -4557,6 +4564,20 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); + + /* see if it's a TTC */ + len = sizeof(header); + if (!pFT_Load_Sfnt_Table(ft_face, 0, 0, (void*)&header, &len)) { + if (header == MS_TTCF_TAG) + { + len = sizeof(font->ttc_item_offset); + if (pFT_Load_Sfnt_Table(ft_face, 0, (3 + face->face_index) * sizeof(DWORD), + (void*)&font->ttc_item_offset, &len)) + font->ttc_item_offset = 0; + else + font->ttc_item_offset = GET_BE_DWORD(font->ttc_item_offset); + } + } } else { font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) @@ -4666,6 +4687,16 @@ static DWORD get_font_data( GdiFont *font, DWORD table, DWORD offset, LPVOID buf else len = cbData; + /* if font is a member of TTC, 'ttcf' tag allows reading from beginning of TTC file, + 0 tag means to read from start of collection member data. */ + if (font->ttc_item_offset) + { + if (table == MS_TTCF_TAG) + table = 0; + else if (table == 0) + offset += font->ttc_item_offset; + } + table = RtlUlongByteSwap( table ); /* MS tags differ in endianness from FT ones */ /* make sure value of len is the value freetype says it needs */

1 0

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

12 Aug '16

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 12 Aug '16

12 Aug '16

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 12 Aug '16

12 Aug '16

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

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

12 Aug '16

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

Nikolay Sivov : t2embed: Add some traces for fsType and exclusion list test results.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 9df16935c81fc76207ddb60a36f4ccbad2915c76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9df16935c81fc76207ddb60a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 12 01:45:20 2016 +0300 t2embed: Add some traces for fsType and exclusion list test results. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/t2embed/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index de78b25..766926f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -75,6 +75,7 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { OUTLINETEXTMETRICW otm; + WORD fsType; TRACE("(%p %p)\n", hDC, status); @@ -88,7 +89,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) if (!status) return E_PERMISSIONSINVALID; - otm.otmfsType &= 0xf; + otm.otmfsType = (fsType = otm.otmfsType) & 0xf; if (otm.otmfsType == LICENSE_INSTALLABLE) *status = EMBED_INSTALLABLE; else if (otm.otmfsType & LICENSE_EDITABLE) @@ -103,6 +104,7 @@ LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) *status = EMBED_INSTALLABLE; } + TRACE("fsType 0x%04x, status %u\n", fsType, *status); return E_NONE; } @@ -124,7 +126,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) *enabled = TRUE; if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, exclusionlistW, 0, GENERIC_READ, &hkey)) - return E_NONE; + goto out; *enabled = TRUE; ret = ERROR_SUCCESS; @@ -148,6 +150,8 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) } RegCloseKey(hkey); +out: + TRACE("embedding %s for %s\n", *enabled ? "enabled" : "disabled", debugstr_a(facename)); return E_NONE; }

1 0

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

12 Aug '16

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

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

12 Aug '16

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

Józef Kucia : d3d11: Add support for feature level 9 shaders.
by Alexandre Julliard 12 Aug '16

12 Aug '16

Module: wine Branch: master Commit: 74eace2a379da2f80df51af12bcc5d77404ff192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74eace2a379da2f80df51af12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:28 2016 +0200 d3d11: Add support for feature level 9 shaders. 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/d3d11_private.h | 1 + dlls/d3d11/shader.c | 90 +++++++++++++++++++++++++++++++++++++++------- dlls/d3d11/tests/d3d11.c | 10 ++---- 3 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e9837cc..4af0faa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -45,6 +45,7 @@ #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') +#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9f618e4..dab2b9b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -24,47 +24,113 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +struct aon9_header { - struct wined3d_shader_desc *desc = ctx; + DWORD chunk_size; + DWORD shader_version; + DWORD unknown; + DWORD byte_code_offset; +}; + +struct shader_handler_context +{ + D3D_FEATURE_LEVEL feature_level; + struct wined3d_shader_desc *desc; +}; + +static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *context) +{ + const struct shader_handler_context *ctx = context; + struct wined3d_shader_desc *desc = ctx->desc; HRESULT hr; switch (tag) { case TAG_ISGN: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping shader input signature on feature level %#x.\n", ctx->feature_level); + break; + } if (FAILED(hr = shader_parse_signature(data, data_size, &desc->input_signature))) return hr; break; case TAG_OSGN: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping shader output signature on feature level %#x.\n", ctx->feature_level); + break; + } if (FAILED(hr = shader_parse_signature(data, data_size, &desc->output_signature))) return hr; break; case TAG_SHDR: case TAG_SHEX: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping SM4+ shader code on feature level %#x.\n", ctx->feature_level); + break; + } if (desc->byte_code) - FIXME("Multiple SHDR/SHEX chunks.\n"); + FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)data; break; + case TAG_AON9: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + const struct aon9_header *header = (const struct aon9_header *)data; + unsigned int unknown_dword_count; + const char *byte_code; + + if (data_size < sizeof(*header)) + { + WARN("Invalid Aon9 data size %#x.\n", data_size); + return E_FAIL; + } + byte_code = data + header->byte_code_offset; + unknown_dword_count = (header->byte_code_offset - sizeof(*header)) / sizeof(DWORD); + + if (data_size - 2 * sizeof(DWORD) < header->byte_code_offset) + { + WARN("Invalid byte code offset %#x (size %#x).\n", header->byte_code_offset, data_size); + return E_FAIL; + } + FIXME("Skipping %u unknown DWORDs.\n", unknown_dword_count); + + if (desc->byte_code) + FIXME("Multiple shader code chunks.\n"); + desc->byte_code = (const DWORD *)byte_code; + TRACE("Feature level 9 shader version 0%08x, 0%08x.\n", header->shader_version, *desc->byte_code); + } + else + { + TRACE("Skipping feature level 9 shader code on feature level %#x.\n", ctx->feature_level); + break; + } + break; + default: - FIXME("Unhandled chunk %s\n", debugstr_an((const char *)&tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); break; } return S_OK; } -static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct wined3d_shader_desc *desc) +static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct wined3d_shader_desc *desc, + D3D_FEATURE_LEVEL feature_level) { + struct shader_handler_context ctx = {feature_level, desc}; HRESULT hr; desc->byte_code = NULL; memset(&desc->input_signature, 0, sizeof(desc->input_signature)); memset(&desc->output_signature, 0, sizeof(desc->output_signature)); - hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, desc); + hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, &ctx); if (!desc->byte_code) hr = E_INVALIDARG; @@ -431,7 +497,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -637,7 +703,7 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -824,7 +890,7 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1115,7 +1181,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1432,7 +1498,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1636,7 +1702,7 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 05f7917..07a3066 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3717,7 +3717,6 @@ static void test_create_shader(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; - BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; struct device_desc device_desc; device_desc.feature_level = &feature_level; @@ -3730,20 +3729,17 @@ static void test_create_shader(void) /* level_9 shaders */ hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_0, sizeof(ps_4_0_level_9_0), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_1, sizeof(ps_4_0_level_9_1), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_3, sizeof(ps_4_0_level_9_3), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps);

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016