wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Akihiro Sagawa : version: Add support for FILE_VER_GET_LOCALISED flag.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 7811de1b7334ab97b0701bfc5683649d63dc12ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7811de1b7334ab97b0701bfc5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:01:01 2017 +0900 version: Add support for FILE_VER_GET_LOCALISED flag. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 82 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 9c6869d..ed060c8 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -127,22 +127,30 @@ static inline int push_language( WORD *list, int pos, WORD lang ) * find_entry_language */ static const IMAGE_RESOURCE_DIRECTORY *find_entry_language( const IMAGE_RESOURCE_DIRECTORY *dir, - const void *root ) + const void *root, DWORD flags ) { const IMAGE_RESOURCE_DIRECTORY *ret; WORD list[9]; int i, pos = 0; - /* cf. LdrFindResource_U */ - pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); - pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); - pos = push_language( list, pos, GetUserDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, GetSystemDefaultLangID() ); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); - pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); - pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + if (flags & FILE_VER_GET_LOCALISED) + { + /* cf. LdrFindResource_U */ + pos = push_language( list, pos, MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL ) ); + pos = push_language( list, pos, LANGIDFROMLCID( NtCurrentTeb()->CurrentLocale ) ); + pos = push_language( list, pos, GetUserDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetUserDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, GetSystemDefaultLangID() ); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_NEUTRAL )); + pos = push_language( list, pos, MAKELANGID( PRIMARYLANGID(GetSystemDefaultLangID()), SUBLANG_DEFAULT )); + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } + else + { + /* FIXME: resolve LN file here */ + pos = push_language( list, pos, MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ) ); + } for (i = 0; i < pos; i++) if ((ret = find_entry_by_id( dir, list[i], root ))) return ret; return find_entry_default( dir, root ); @@ -254,7 +262,7 @@ static BOOL find_ne_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_pe_resource [internal] */ -static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) +static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff, DWORD flags ) { union { @@ -356,7 +364,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) TRACE("No resid entry found\n" ); goto done; } - resPtr = find_entry_language( resPtr, resDir ); + resPtr = find_entry_language( resPtr, resDir, flags ); if ( !resPtr ) { TRACE("No default language entry found\n" ); @@ -393,7 +401,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /*********************************************************************** * find_version_resource [internal] */ -static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) +static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset, DWORD flags ) { DWORD magic = read_xx_header( lzfd ); @@ -403,7 +411,7 @@ static DWORD find_version_resource( HFILE lzfd, DWORD *reslen, DWORD *offset ) if (!find_ne_resource( lzfd, reslen, offset )) magic = 0; break; case IMAGE_NT_SIGNATURE: - if (!find_pe_resource( lzfd, reslen, offset )) magic = 0; + if (!find_pe_resource( lzfd, reslen, offset, flags )) magic = 0; break; } return magic; @@ -607,7 +615,7 @@ typedef struct */ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExW( 0, filename, handle ); + return GetFileVersionInfoSizeExW( FILE_VER_GET_LOCALISED, filename, handle ); } /*********************************************************************** @@ -615,7 +623,7 @@ DWORD WINAPI GetFileVersionInfoSizeW( LPCWSTR filename, LPDWORD handle ) */ DWORD WINAPI GetFileVersionInfoSizeA( LPCSTR filename, LPDWORD handle ) { - return GetFileVersionInfoSizeExA( 0, filename, handle ); + return GetFileVersionInfoSizeExA( FILE_VER_GET_LOCALISED, filename, handle ); } /****************************************************************************** @@ -642,19 +650,27 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD h SetLastError(ERROR_BAD_PATHNAME); return 0; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - magic = find_version_resource( lzfd, &len, &offset ); + magic = find_version_resource( lzfd, &len, &offset, flags ); LZClose( lzfd ); } if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { magic = IMAGE_NT_SIGNATURE; @@ -736,12 +752,12 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, SetLastError(ERROR_INVALID_DATA); return FALSE; } - if (flags) - FIXME("flags 0x%x ignored\n", flags); + if (flags & ~FILE_VER_GET_LOCALISED) + FIXME("flags 0x%x ignored\n", flags & ~FILE_VER_GET_LOCALISED); if ((lzfd = LZOpenFileW( (LPWSTR)filename, &ofs, OF_READ )) != HFILE_ERROR) { - if ((magic = find_version_resource( lzfd, &len, &offset )) > 1) + if ((magic = find_version_resource( lzfd, &len, &offset, flags )) > 1) { LZSeek( lzfd, offset, 0 /* SEEK_SET */ ); len = LZRead( lzfd, data, min( len, datasize ) ); @@ -751,8 +767,16 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD handle, if ((magic == 1) && (hModule = LoadLibraryExW( filename, 0, LOAD_LIBRARY_AS_DATAFILE ))) { - HRSRC hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO ); + HRSRC hRsrc = NULL; + if (!(flags & FILE_VER_GET_LOCALISED)) + { + LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); + hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO, english ); + } + if (!hRsrc) + hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), + (LPWSTR)VS_FILE_INFO ); if (hRsrc) { HGLOBAL hMem = LoadResource( hModule, hRsrc ); @@ -820,7 +844,7 @@ BOOL WINAPI GetFileVersionInfoExA( DWORD flags, LPCSTR filename, DWORD handle, D */ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExW(0, filename, handle, datasize, data); + return GetFileVersionInfoExW(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /*********************************************************************** @@ -828,7 +852,7 @@ BOOL WINAPI GetFileVersionInfoW( LPCWSTR filename, DWORD handle, DWORD datasize, */ BOOL WINAPI GetFileVersionInfoA( LPCSTR filename, DWORD handle, DWORD datasize, LPVOID data ) { - return GetFileVersionInfoExA(0, filename, handle, datasize, data); + return GetFileVersionInfoExA(FILE_VER_GET_LOCALISED, filename, handle, datasize, data); } /***********************************************************************

1 0

Akihiro Sagawa : version/tests: Check the translation resource before testing.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: e0b4a3527b3862c3aaaac32237e3b43a4d6f8573 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0b4a3527b3862c3aaaac3223… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:00:59 2017 +0900 version/tests: Check the translation resource before testing. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/tests/info.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/version/tests/info.c b/dlls/version/tests/info.c index c033aa9..e49671e 100644 --- a/dlls/version/tests/info.c +++ b/dlls/version/tests/info.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "winnls.h" +#include "winuser.h" #include "winver.h" #include "verrsrc.h" #include "wine/test.h" @@ -646,6 +647,17 @@ static void test_GetFileVersionInfoEx(void) }; char desc[MAX_PATH]; + mod = GetModuleHandleA("kernel32.dll"); + assert(mod); + + if (!FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, lang) && + !FindResourceExA(mod, (LPCSTR)RT_VERSION, (LPCSTR)VS_VERSION_INFO, + MAKELANGID(PRIMARYLANGID(lang),SUBLANG_NEUTRAL))) + { + skip("Translation is not available\n"); + return; + } + size = GetFileVersionInfoSizeW(kernel32W, NULL); ok(size, "GetFileVersionInfoSize(kernel32) error %u\n", GetLastError());

1 0

Akihiro Sagawa : wrc: Add support for translating version info through po files.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 52931c7523309e79b66e57cc1617ae3f2a401989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52931c7523309e79b66e57cc1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 23 00:00:57 2017 +0900 wrc: Add support for translating version info through po files. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/po.c | 247 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 247 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52931c7523309e79b66e5…

1 0

Akihiro Sagawa : winemac.drv: Use neutral language for the version resource.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 2680971ef4a175916ed6c8385d82b7e147170d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2680971ef4a175916ed6c8385… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Mar 20 21:44:01 2017 +0900 winemac.drv: Use neutral language for the version resource. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/winemac.rc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/winemac.rc b/dlls/winemac.drv/winemac.rc index 863551e..629441b 100644 --- a/dlls/winemac.drv/winemac.rc +++ b/dlls/winemac.drv/winemac.rc @@ -43,6 +43,8 @@ STRINGTABLE STRING_MENU_ITEM_BRING_ALL_TO_FRONT "Bring All to Front" } +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + #define WINE_FILEDESCRIPTION_STR "Wine Mac driver" #define WINE_FILENAME_STR "winemac.drv"

1 0

Andrey Gusev : uiautomationcore: Add UiaLookupId stub.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: c9fcbf14ae25c241ac470c0df4d129233263cb2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fcbf14ae25c241ac470c0df… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon Mar 20 15:15:07 2017 +0200 uiautomationcore: Add UiaLookupId stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 11 ++++++++++- dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 10 ++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 994d8e6..ceb2d1d 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "uiautomationcore.h" +#include "uiautomation.h" #include "wine/debug.h" @@ -45,3 +45,12 @@ BOOL WINAPI UiaClientsAreListening(void) FIXME("()\n"); return FALSE; } + +/*********************************************************************** + * UiaLookupId (uiautomationcore.@) + */ +int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) +{ + FIXME("(%d, %s) stub!\n", type, debugstr_guid(guid)); + return 1; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 3026001..39af30a 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -69,7 +69,7 @@ @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider @ stub UiaHostProviderFromHwnd -@ stub UiaLookupId +@ stdcall UiaLookupId(long ptr) @ stub UiaNavigate @ stub UiaNodeFromFocus @ stub UiaNodeFromHandle diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 340f500..7d9fdba 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -39,6 +39,16 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT); DECLARE_HANDLE(HUIATEXTRANGE); DECLARE_HANDLE(HUIAEVENT); +enum AutomationIdentifierType +{ + AutomationIdentifierType_Property, + AutomationIdentifierType_Pattern, + AutomationIdentifierType_Event, + AutomationIdentifierType_ControlType, + AutomationIdentifierType_TextAttribute +}; + +int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Daniel Lehman : mshtml: Decrement refcount in nsWeakReference::Release ( Valgrind).
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: f21ec7f170950b610c5fbd36c8eda74a530cfe22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21ec7f170950b610c5fbd36c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Mar 20 22:56:50 2017 -0700 mshtml: Decrement refcount in nsWeakReference::Release (Valgrind). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index e343dde..aee00e6 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1204,7 +1204,7 @@ static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) { nsWeakReference *This = impl_from_nsIWeakReference(iface); - LONG ref = InterlockedIncrement(&This->ref); + LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref);

1 0

Józef Kucia : wined3d: Do not generate FFP fragment shader when SM4 vertex shader is active.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 56ce1d3dec4b7a699a910983f1e255ee1c0c138d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56ce1d3dec4b7a699a910983f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:57 2017 +0100 wined3d: Do not generate FFP fragment shader when SM4 vertex shader is active. We should not ever generate fixed-function replacement shaders in D3D10+. It is perfectly valid to draw with NULL pixel shader, e.g. for stream output. 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/glsl_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b24f512..3385d83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8869,7 +8869,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; } - else if (priv->fragment_pipe == &glsl_fragment_pipe) + else if (priv->fragment_pipe == &glsl_fragment_pipe + && !(vshader && vshader->reg_maps.shader_version.major >= 4)) { struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings;

1 0

Józef Kucia : d3d11: Avoid magic number in d3d10_device_SOSetTargets().
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: a1ef2347b16e17f4a3ac8a1fcf1e5a5de4844e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1ef2347b16e17f4a3ac8a1fc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:56 2017 +0100 d3d11: Avoid magic number in d3d10_device_SOSetTargets(). 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/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c641ccf..b0b4045 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3706,7 +3706,7 @@ static void STDMETHODCALLTYPE d3d10_device_SOSetTargets(ID3D10Device1 *iface, TRACE("iface %p, target_count %u, targets %p, offsets %p.\n", iface, target_count, targets, offsets); - count = min(target_count, 4); + count = min(target_count, D3D10_SO_BUFFER_SLOT_COUNT); wined3d_mutex_lock(); for (i = 0; i < count; ++i) {

1 0

Józef Kucia : d3d11: Make extracting input signature more robust.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: 0362b418fcda520a724ab888c65b4d432547502a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0362b418fcda520a724ab888c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:55 2017 +0100 d3d11: Make extracting input signature more robust. 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/inputlayout.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 620e663..3d7135a 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -31,6 +31,11 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * if (tag != TAG_ISGN) return S_OK; + if (is->elements) + { + FIXME("Multiple input signatures.\n"); + shader_free_signature(is); + } return shader_parse_signature(data, data_size, is); } @@ -42,6 +47,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME unsigned int i; HRESULT hr; + memset(&is, 0, sizeof(is)); if (FAILED(hr = parse_dxbc(shader_byte_code, shader_byte_code_length, isgn_handler, &is))) { ERR("Failed to parse input signature.\n");

1 0

Józef Kucia : d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks.
by Alexandre Julliard 22 Mar '17

22 Mar '17

Module: wine Branch: master Commit: cac8f8dc42864eae7f28322790f1c94958b045dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac8f8dc42864eae7f2832279… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 22 09:40:54 2017 +0100 d3d11: Avoid spurious FIXME messages about unhandled DXBC chunks. 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/inputlayout.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 7604f05..620e663 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -28,15 +28,10 @@ static HRESULT isgn_handler(const char *data, DWORD data_size, DWORD tag, void * { struct wined3d_shader_signature *is = ctx; - switch(tag) - { - case TAG_ISGN: - return shader_parse_signature(data, data_size, is); + if (tag != TAG_ISGN) + return S_OK; - default: - FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); - return S_OK; - } + return shader_parse_signature(data, data_size, is); } static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEMENT_DESC *element_descs,

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
72
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 March 2017