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

Hugh McMaster : regedit: Accept various forms of "REGEDIT" with trailing characters.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 0a7ff8aff7dec3d955a83f5ab8d37866086cab3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a7ff8aff7dec3d955a83f5ab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 22 11:54:28 2017 +0000 regedit: Accept various forms of "REGEDIT" with trailing characters. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 24c1e35..066fb2d 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -650,6 +650,7 @@ enum reg_versions { REG_VERSION_31, REG_VERSION_40, REG_VERSION_50, + REG_VERSION_FUZZY, REG_VERSION_INVALID }; @@ -672,6 +673,14 @@ static enum reg_versions parse_file_header(WCHAR *s) if (!strcmpW(s, header_50)) return REG_VERSION_50; + /* The Windows version accepts registry file headers beginning with "REGEDIT" and ending + * with other characters, as long as "REGEDIT" appears at the start of the line. For example, + * "REGEDIT 4", "REGEDIT9" and "REGEDIT4FOO" are all treated as valid file headers. + * In all such cases, however, the contents of the registry file are not imported. + */ + if (!strncmpW(s, header_31, 7)) /* "REGEDIT" without NUL */ + return REG_VERSION_FUZZY; + return REG_VERSION_INVALID; } @@ -763,10 +772,10 @@ static BOOL processRegLinesA(FILE *fp, char *two_chars) reg_version = parse_file_header(lineW); HeapFree(GetProcessHeap(), 0, lineW); - if (reg_version == REG_VERSION_INVALID) + if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) { get_lineA(NULL); /* Reset static variables */ - return FALSE; + return reg_version == REG_VERSION_FUZZY; } while ((line = get_lineA(fp))) @@ -863,10 +872,10 @@ static BOOL processRegLinesW(FILE *fp) line = get_lineW(fp); reg_version = parse_file_header(line); - if (reg_version == REG_VERSION_INVALID) + if (reg_version == REG_VERSION_FUZZY || reg_version == REG_VERSION_INVALID) { get_lineW(NULL); /* Reset static variables */ - return FALSE; + return reg_version == REG_VERSION_FUZZY; } while ((line = get_lineW(fp)))

1 0

Akihiro Sagawa : version/tests: Check the translation resource before testing.
by Alexandre Julliard March 22, 2017

March 22, 2017

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

Daniel Lehman : mshtml: Decrement refcount in nsWeakReference::Release ( Valgrind).
by Alexandre Julliard March 22, 2017

March 22, 2017

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

Hans Leidekker : mpr/tests: Try other drive letters if J: is already assigned.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 25e78e0412685201b97bbe9df8133304e3e7dc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e78e0412685201b97bbe9df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 22 13:58:53 2017 +0100 mpr/tests: Try other drive letters if J: is already assigned. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 84 +++++++++++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 41 deletions(-) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index ee1ff3a..085ecda 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -261,54 +261,56 @@ static void test_WNetCachePassword(void) static void test_WNetUseConnection(void) { - DWORD ret; - DWORD bufSize; - DWORD outRes; + DWORD ret, bufSize, outRes; LPNETRESOURCEA netRes; - CHAR outBuf[4]; + char outBuf[4], drive[] = "J:", letter; - if (pWNetUseConnectionA) + if (!pWNetUseConnectionA) { - netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); - netRes->dwType = RESOURCETYPE_DISK; - netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; - netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; - netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); - netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); - strcpy(netRes->lpLocalName, "J:"); + win_skip("WNetUseConnection() is not supported.\n"); + return; + } + netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); + netRes->dwType = RESOURCETYPE_DISK; + netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; + netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; + netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); + netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); + + for (letter = 'J'; letter <= 'Z'; letter++) + { + drive[0] = letter; + strcpy(netRes->lpLocalName, drive); strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); bufSize = 0; ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); - todo_wine - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 0; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - todo_wine - ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); - ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 1; - todo_wine { - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); - ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - bufSize = 4; - ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); - ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); - } - ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); - if (ret == WN_SUCCESS) - WNetCancelConnectionA("J:", TRUE); - HeapFree(GetProcessHeap(), 0, netRes); - } else { - win_skip("WNetUseConnection() is not supported.\n"); + if (ret == ERROR_ALREADY_ASSIGNED) continue; } + todo_wine ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 0; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + todo_wine ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + todo_wine { + bufSize = 1; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); + ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + bufSize = 4; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + } + ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) WNetCancelConnectionA(drive, TRUE); + + HeapFree(GetProcessHeap(), 0, netRes); } START_TEST(mpr)

1 0

Hans Leidekker : odbccp32/tests: RegGetValueA is not available on Windows XP.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: 49b644d7a2b0ac60cf34dc00d1e626cf52a5f574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49b644d7a2b0ac60cf34dc00d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 22 12:32:27 2017 +0100 odbccp32/tests: RegGetValueA is not available on Windows XP. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/tests/misc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/tests/misc.c b/dlls/odbccp32/tests/misc.c index 905468c..4fdf584 100644 --- a/dlls/odbccp32/tests/misc.c +++ b/dlls/odbccp32/tests/misc.c @@ -420,7 +420,7 @@ void test_SQLInstallDriverEx(void) BOOL ret, sql_ret; DWORD cnt, error_code = 0; HKEY hkey; - DWORD reg_ret; + LONG res; GetSystemDirectoryA(syspath, MAX_PATH); @@ -441,18 +441,21 @@ void test_SQLInstallDriverEx(void) if (ret) { - reg_ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); - ok(reg_ret == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); - if (reg_ret == ERROR_SUCCESS) + res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\ODBC\\ODBCINST.INI\\WINE ODBC Driver", 0, KEY_READ, &hkey); + ok(res == ERROR_SUCCESS, "RegOpenKeyExW failed\n"); + if (res == ERROR_SUCCESS) { - DWORD type, size = MAX_PATH; + DWORD type = 0xdeadbeef, size = MAX_PATH; char driverpath[MAX_PATH]; strcpy(driverpath, syspath); strcat(driverpath, "\\sample.dll"); - reg_ret = RegGetValueA(hkey, NULL, "Driver", RRF_RT_REG_SZ, &type, &path, &size); - ok(reg_ret == ERROR_SUCCESS, "RegGetValueA failed\n"); + memset(path, 0, sizeof(path)); + res = RegQueryValueExA(hkey, "Driver", NULL, &type, (BYTE *)path, &size); + ok(res == ERROR_SUCCESS, "got %d\n", res); + ok(type == REG_SZ, "got %u\n", type); + ok(size == strlen(driverpath) + 1, "got %u\n", size); ok(!strcmp(path, driverpath), "invalid path %s\n", path); RegCloseKey(hkey);

1 0

Józef Kucia : wined3d: Do not generate FFP fragment shader when SM4 vertex shader is active.
by Alexandre Julliard March 22, 2017

March 22, 2017

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

Andrey Gusev : uiautomationcore: Add UiaLookupId stub.
by Alexandre Julliard March 22, 2017

March 22, 2017

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

Michael Stefaniuc : include: Use offsetof() instead of open coding it.
by Alexandre Julliard March 22, 2017

March 22, 2017

Module: wine Branch: master Commit: fd578822dd5dd5b1a28264cc57681512304252c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd578822dd5dd5b1a28264cc5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 21 22:57:37 2017 +0100 include: Use offsetof() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wintrust.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wintrust.h b/include/wintrust.h index 5da3720..20fb296 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -429,7 +429,7 @@ typedef struct _CRYPT_PROVUI_FUNCS { #include <poppack.h> -#define WVT_OFFSETOF(t,f) ((ULONG)((ULONG_PTR)(&((t*)0)->f))) +#define WVT_OFFSETOF(t,f) ((ULONG)(offsetof(t, f))) #define WVT_ISINSTRUCT(t,s,f) (WVT_OFFSETOF(t,f) + sizeof(((t*)0)->f) <= (s)) #define WVT_IS_CBSTRUCT_GT_MEMBEROFFSET(t,s,f) WVT_ISINSTRUCT(t,s,f)

1 0

Józef Kucia : d3d11: Make extracting input signature more robust.
by Alexandre Julliard March 22, 2017

March 22, 2017

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 magic number in d3d10_device_SOSetTargets().
by Alexandre Julliard March 22, 2017

March 22, 2017

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