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

Huw Davies : user32/tests: Fix a few failures in DPI scaling mode.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: bfcf92f148dfd4f5030f86658d11773e49464787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfcf92f148dfd4f5030f86658… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:52 2017 +0100 user32/tests: Fix a few failures in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 6f607d4..055060e 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -1424,7 +1424,7 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ #define test_reg_font( KEY, VAL, LF) \ { LOGFONTA lfreg;\ lffromreg( KEY, VAL, &lfreg);\ - ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == lfreg.lfHeight :\ + ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == MulDiv( lfreg.lfHeight, dpi, real_dpi ) : \ MulDiv( -(LF).lfHeight , 72, dpi) == lfreg.lfHeight )&&\ (LF).lfWidth == lfreg.lfWidth &&\ (LF).lfWeight == lfreg.lfWeight &&\

1 0

Huw Davies : user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: e352b29d12a72e9a616d71b7a504e939c307f1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e352b29d12a72e9a616d71b7a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:53 2017 +0100 user32/tests: Fix tests for minimium icon spacing when not in DPI scaling mode. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 055060e..96b1581 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -884,7 +884,7 @@ static void test_SPI_SETKEYBOARDSPEED( void ) /* 10 */ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONHORIZONTALSPACING, curr_val, 0, @@ -892,7 +892,7 @@ static BOOL dotest_spi_iconhorizontalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONHORIZONTALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONHORIZONTALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */ @@ -1053,7 +1053,7 @@ static void test_SPI_SETKEYBOARDDELAY( void ) /* 23 */ static BOOL dotest_spi_iconverticalspacing( INT curr_val) { BOOL rc; - INT spacing, regval; + INT spacing, regval, min_val = MulDiv( 32, dpi, USER_DEFAULT_SCREEN_DPI ); ICONMETRICSA im; rc=SystemParametersInfoA( SPI_ICONVERTICALSPACING, curr_val, 0, @@ -1061,7 +1061,7 @@ static BOOL dotest_spi_iconverticalspacing( INT curr_val) if (!test_error_msg(rc,"SPI_ICONVERTICALSPACING")) return FALSE; ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_ICONVERTICALSPACING, 0 ); - if( curr_val < 32) curr_val = 32; + curr_val = max( curr_val, min_val ); /* The registry keys depend on the Windows version and the values too * let's test (works on win95,ME,NT4,2k,XP) */

1 0

Alistair Leslie-Hughes : include: Add interfaces IWMHeaderInfo/2/3.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: fbe53db498f256b9001cbee0b21a94b28a58123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe53db498f256b9001cbee0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 30 22:06:53 2017 +0000 include: Add interfaces IWMHeaderInfo/2/3. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0606be1..5ce849f 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -183,6 +183,13 @@ typedef enum tagWMT_OFFSET_FORMAT WMT_OFFSET_FORMAT_100NS_APPROXIMATE } WMT_OFFSET_FORMAT; +typedef enum WMT_CODEC_INFO_TYPE +{ + WMT_CODECINFO_AUDIO = 0, + WMT_CODECINFO_VIDEO = 1, + WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, +} WMT_CODEC_INFO_TYPE; + typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ @@ -1016,6 +1023,157 @@ interface IWMWriterAdvanced3 : IWMWriterAdvanced2 HRESULT SetNonBlocking(); } +[ + object, + uuid(96406bda-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMHeaderInfo : IUnknown +{ + HRESULT GetAttributeCount( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeByIndex( + [in] WORD index, + [in, out] WORD *stream_num, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT GetAttributeByName( + [in, out] WORD *stream_num, + [in] LPCWSTR name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT SetAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + + HRESULT GetMarkerCount( + [out] WORD *markers ); + + HRESULT GetMarker( + [in] WORD index, + [out, size_is( *marker_len )] WCHAR *marker_name, + [in, out] WORD *marker_len, + [out] QWORD *marker_time ); + + HRESULT AddMarker( + [in] LPCWSTR_WMSDK_TYPE_SAFE marker_name, + [in] QWORD marker_time ); + + HRESULT RemoveMarker( + [in] WORD index ); + + HRESULT GetScriptCount( + [out] WORD *scripts ); + + HRESULT GetScript( + [in] WORD index, + [out, size_is( *type_len )] WCHAR *type, + [in, out] WORD *type_len, + [out, size_is( *command_len )] WCHAR *command, + [in, out] WORD *command_len, + [out] QWORD *script_time ); + + HRESULT AddScript( + [in] LPCWSTR_WMSDK_TYPE_SAFE type, + [in] LPCWSTR_WMSDK_TYPE_SAFE command, + [in] QWORD script_time ); + + HRESULT RemoveScript( + [in] WORD index ); +}; + +[ + object, + uuid(15cf9781-454e-482e-b393-85fae487a810), + pointer_default(unique), + local +] +interface IWMHeaderInfo2 : IWMHeaderInfo +{ + HRESULT GetCodecInfoCount( + [out] DWORD *codec_infos ); + + HRESULT GetCodecInfo( + [in] DWORD index, + [in, out] WORD *name_len, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *description_len, + [out, size_is( *description_len )] WCHAR *description, + [out] WMT_CODEC_INFO_TYPE *codec_type, + [in, out] WORD *codec_info_cnt, + [out, size_is( *codec_info_cnt )] BYTE *codec_info ); +}; + +[ + object, + uuid(15cc68e3-27cc-4ecd-b222-3f5d02d80bd5), + pointer_default(unique), + local +] +interface IWMHeaderInfo3 : IWMHeaderInfo2 +{ + HRESULT GetAttributeCountEx( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeIndices( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WORD *lang_index, + [out, size_is( *count )] WORD *indices, + [in, out] WORD *count ); + + HRESULT GetAttributeByIndexEx( + [in] WORD stream_num, + [in] WORD index, + [out, size_is( *name_len )] LPWSTR name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out] WORD *lang_index, + [out, size_is( *data_len )] BYTE *value, + [in, out] DWORD *data_len ); + + HRESULT ModifyAttribute( + [in] WORD stream_num, + [in] WORD index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT AddAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [out] WORD *index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT DeleteAttribute( + [in] WORD stream_num, + [in] WORD index ); + + HRESULT AddCodecInfo( + [in] LPCWSTR_WMSDK_TYPE_SAFE name, + [in] LPCWSTR_WMSDK_TYPE_SAFE description, + [in] WMT_CODEC_INFO_TYPE codec_type, + [in] WORD codec_info_cnt, + [in, size_is( codec_info_cnt )] BYTE *codec_info ); +}; + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Alistair Leslie-Hughes : odbccp32: Look in LOCAL_MACHINE for the driver.
by Alexandre Julliard 11 Apr '17

11 Apr '17

Module: wine Branch: master Commit: 3b5a8707e6c1c8ea94df59372aac7bc34c47925d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5a8707e6c1c8ea94df59372… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 10 04:30:36 2017 +0000 odbccp32: Look in LOCAL_MACHINE for the driver. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 666d8c0..f28d464 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -260,7 +260,7 @@ static HMODULE load_config_driver(const WCHAR *driver) DWORD size = 0, type; HKEY hkey; - if ((ret = RegOpenKeyW(HKEY_CURRENT_USER, odbcini, &hkey)) == ERROR_SUCCESS) + if ((ret = RegOpenKeyW(HKEY_LOCAL_MACHINE, odbcini, &hkey)) == ERROR_SUCCESS) { HKEY hkeydriver;

1 0

Hugh McMaster : reg/tests: Add tests for importing DWORD values.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 47f506a1e1b50d56e4892912c1a89ef4a2cb584f URL: http://source.winehq.org/git/wine.git/?a=commit;h=47f506a1e1b50d56e4892912c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Apr 10 09:50:02 2017 +0000 reg/tests: Add tests for importing DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 124 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 90d4a46..9799815 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1220,6 +1220,59 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=dword:1\n" + "\"Wine32b\"=dword:4444\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1; + todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=dword:\n" + "\"Wine33b\"=dword:hello\n" + "\"Wine33c\"=dword:123456789\n" + "\"Wine33d\"=dword:012345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=dword:12345678abc\n" + "\"Wine34b\"=dword:12345678 abc\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine35a\"=dword:0x123\n" + "\"Wine35b\"=dword:123 456\n" + "\"Wine35c\"=dword:1234 5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine35a"); + todo_wine verify_reg_nonexist(hkey, "Wine35b"); + todo_wine verify_reg_nonexist(hkey, "Wine35c"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine36a\"=dword:1234;5678\n" + "\"Wine36b\"=dword:1234 ;5678\n" + "\"Wine36c\"=dword:1234#5678\n" + "\"Wine36d\"=dword:1234 #5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine36c"); + todo_wine verify_reg_nonexist(hkey, "Wine36d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -1589,6 +1642,59 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine32a\"=dword:1\n" + "\"Wine32b\"=dword:4444\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1; + todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine33a\"=dword:\n" + "\"Wine33b\"=dword:hello\n" + "\"Wine33c\"=dword:123456789\n" + "\"Wine33d\"=dword:012345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine33a"); + todo_wine verify_reg_nonexist(hkey, "Wine33b"); + todo_wine verify_reg_nonexist(hkey, "Wine33c"); + todo_wine verify_reg_nonexist(hkey, "Wine33d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine34a\"=dword:12345678abc\n" + "\"Wine34b\"=dword:12345678 abc\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine34a"); + todo_wine verify_reg_nonexist(hkey, "Wine34b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine35a\"=dword:0x123\n" + "\"Wine35b\"=dword:123 456\n" + "\"Wine35c\"=dword:1234 5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine35a"); + todo_wine verify_reg_nonexist(hkey, "Wine35b"); + todo_wine verify_reg_nonexist(hkey, "Wine35c"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine36a\"=dword:1234;5678\n" + "\"Wine36b\"=dword:1234 ;5678\n" + "\"Wine36c\"=dword:1234#5678\n" + "\"Wine36d\"=dword:1234 #5678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine36c"); + todo_wine verify_reg_nonexist(hkey, "Wine36d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n" @@ -1822,6 +1928,15 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); @@ -1941,6 +2056,15 @@ static void test_import_with_whitespace(void) todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err);

1 0

Józef Kucia : wined3d: Use register mask for SV_IsFrontFace pixel shader inputs.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: f8e05f5f0559e1216f0cc1210fe2252b55a38e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e05f5f0559e1216f0cc1210… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:37 2017 +0200 wined3d: Use register mask for SV_IsFrontFace pixel shader inputs. 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 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8a970f..1130b20 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6440,9 +6440,8 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w } else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) { - shader_addline(buffer, "ps_in[%u] = vec4(" - "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", - input->register_idx); + shader_addline(buffer, "ps_in[%u]%s = uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u);\n", + input->register_idx, reg_mask); } else if (input->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) {

1 0

Józef Kucia : wined3d: Allow copying 3D texture resources.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 291146b1477aac931b5e9750f1f40b9876518291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=291146b1477aac931b5e9750f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:38 2017 +0200 wined3d: Allow copying 3D texture resources. 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/device.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ce02af4..8c3cd16 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3887,12 +3887,6 @@ void CDECL wined3d_device_copy_resource(struct wined3d_device *device, return; } - if (dst_resource->type != WINED3D_RTYPE_TEXTURE_2D) - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); - return; - } - dst_texture = texture_from_resource(dst_resource); src_texture = texture_from_resource(src_resource);

1 0

Józef Kucia : wined3d: Reuse view validation function for render target views.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 9e1d7a0fc3435703a5f88c648f710ebdfec85572 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e1d7a0fc3435703a5f88c648… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:39 2017 +0200 wined3d: Reuse view validation function for render target 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/wined3d/view.c | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 22fd7de..beb5853 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -70,7 +70,7 @@ static GLenum get_texture_view_target(const struct wined3d_gl_info *gl_info, return texture->target; } -static const struct wined3d_format *validate_shader_resource_view(const struct wined3d_view_desc *desc, +static const struct wined3d_format *validate_resource_view(const struct wined3d_view_desc *desc, struct wined3d_resource *resource, BOOL mip_slice) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; @@ -386,20 +386,13 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - view->refcount = 1; view->parent = parent; view->parent_ops = parent_ops; - view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - view->format_flags = view->format->flags[resource->gl_type]; - - if (wined3d_format_is_typeless(view->format)) - { - WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); + if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; - } + view->format_flags = view->format->flags[resource->gl_type]; if (resource->type == WINED3D_RTYPE_BUFFER) { @@ -412,19 +405,6 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * else { struct wined3d_texture *texture = texture_from_resource(resource); - unsigned int depth_or_layer_count; - - if (resource->type == WINED3D_RTYPE_TEXTURE_3D) - depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); - else - depth_or_layer_count = texture->layer_count; - - if (desc->u.texture.level_idx >= texture->level_count - || desc->u.texture.level_count != 1 - || desc->u.texture.layer_idx >= depth_or_layer_count - || !desc->u.texture.layer_count - || desc->u.texture.layer_count > depth_or_layer_count - desc->u.texture.layer_idx) - return E_INVALIDARG; view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D) @@ -600,7 +580,7 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ view->parent = parent; view->parent_ops = parent_ops; - if (!(view->format = validate_shader_resource_view(desc, resource, FALSE))) + if (!(view->format = validate_resource_view(desc, resource, FALSE))) return E_INVALIDARG; view->desc = *desc; @@ -797,7 +777,7 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent = parent; view->parent_ops = parent_ops; - if (!(view->format = validate_shader_resource_view(desc, resource, TRUE))) + if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; view->desc = *desc;

1 0

Józef Kucia : wined3d: Create texture views for render target views.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: d394a6b728366444f5226f0cbc79ec364ab0cbdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d394a6b728366444f5226f0cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:40 2017 +0200 wined3d: Create texture views for render target 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/wined3d/view.c | 64 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 26 +++++++++-------- 2 files changed, 75 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index beb5853..4e503e8 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -281,7 +281,23 @@ ULONG CDECL wined3d_rendertarget_view_incref(struct wined3d_rendertarget_view *v static void wined3d_rendertarget_view_destroy_object(void *object) { - HeapFree(GetProcessHeap(), 0, object); + struct wined3d_rendertarget_view *view = object; + struct wined3d_device *device = view->resource->device; + + if (view->gl_view.name) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(device, NULL, 0); + gl_info = context->gl_info; + context_gl_resource_released(device, view->gl_view.name, FALSE); + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->gl_view.name); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); } ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *view) @@ -382,6 +398,46 @@ void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarg } } +static void wined3d_render_target_view_cs_init(void *object) +{ + struct wined3d_rendertarget_view *view = object; + struct wined3d_resource *resource = view->resource; + const struct wined3d_view_desc *desc = &view->desc; + + if (resource->type == WINED3D_RTYPE_BUFFER) + { + FIXME("Not implemented for resources %s.\n", debug_d3dresourcetype(resource->type)); + } + else + { + struct wined3d_texture *texture = texture_from_resource(resource); + unsigned int depth_or_layer_count; + + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + depth_or_layer_count = wined3d_texture_get_level_depth(texture, desc->u.texture.level_idx); + else + depth_or_layer_count = texture->layer_count; + + if (resource->format->id != view->format->id + || (desc->u.texture.layer_count != 1 && desc->u.texture.layer_count != depth_or_layer_count)) + { + if (resource->format->gl_view_class != view->format->gl_view_class) + { + FIXME("Render target view not supported, resource format %s, view format %s.\n", + debug_d3dformat(resource->format->id), debug_d3dformat(view->format->id)); + return; + } + if (texture->swapchain && texture->swapchain->desc.backbuffer_count > 1) + { + FIXME("Swapchain views not supported.\n"); + return; + } + + create_texture_view(&view->gl_view, texture->target, desc, texture, view->format); + } + } +} + static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, const struct wined3d_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) @@ -393,11 +449,11 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * if (!(view->format = validate_resource_view(desc, resource, TRUE))) return E_INVALIDARG; view->format_flags = view->format->flags[resource->gl_type]; + view->desc = *desc; if (resource->type == WINED3D_RTYPE_BUFFER) { view->sub_resource_idx = 0; - view->buffer_offset = desc->u.buffer.start_idx; view->width = desc->u.buffer.count; view->height = 1; view->depth = 1; @@ -409,13 +465,15 @@ static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view * view->sub_resource_idx = desc->u.texture.level_idx; if (resource->type != WINED3D_RTYPE_TEXTURE_3D) view->sub_resource_idx += desc->u.texture.layer_idx * texture->level_count; - view->buffer_offset = 0; view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx); view->depth = desc->u.texture.layer_count; } + wined3d_resource_incref(view->resource = resource); + wined3d_cs_init_object(resource->device->cs, wined3d_render_target_view_cs_init, view); + return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 761ef18..a2f6e1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3375,6 +3375,12 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN; +struct wined3d_gl_view +{ + GLenum target; + GLuint name; +}; + struct wined3d_rendertarget_view { LONG refcount; @@ -3383,14 +3389,16 @@ struct wined3d_rendertarget_view void *parent; const struct wined3d_parent_ops *parent_ops; + struct wined3d_gl_view gl_view; const struct wined3d_format *format; unsigned int format_flags; unsigned int sub_resource_idx; - unsigned int buffer_offset; unsigned int width; unsigned int height; unsigned int depth; + + struct wined3d_view_desc desc; }; static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( @@ -3409,12 +3417,6 @@ static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( void wined3d_rendertarget_view_get_drawable_size(const struct wined3d_rendertarget_view *view, const struct wined3d_context *context, unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; -struct wined3d_gl_view -{ - GLenum target; - GLuint name; -}; - struct wined3d_shader_resource_view { LONG refcount; @@ -3423,10 +3425,10 @@ struct wined3d_shader_resource_view void *parent; const struct wined3d_parent_ops *parent_ops; + struct wined3d_gl_view gl_view; const struct wined3d_format *format; - struct wined3d_view_desc desc; - struct wined3d_gl_view gl_view; + struct wined3d_view_desc desc; }; void wined3d_shader_resource_view_bind(struct wined3d_shader_resource_view *view, unsigned int unit, @@ -3440,11 +3442,11 @@ struct wined3d_unordered_access_view void *parent; const struct wined3d_parent_ops *parent_ops; - const struct wined3d_format *format; - struct wined3d_view_desc desc; - struct wined3d_gl_view gl_view; + const struct wined3d_format *format; GLuint counter_bo; + + struct wined3d_view_desc desc; }; void wined3d_unordered_access_view_invalidate_location(struct wined3d_unordered_access_view *view,

1 0

Józef Kucia : wined3d: Change GL internal format for R32_TYPELESS.
by Alexandre Julliard 10 Apr '17

10 Apr '17

Module: wine Branch: master Commit: 73d57ce7a9a40359a485ba441c5322d6ed91da34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d57ce7a9a40359a485ba441… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 10 12:27:41 2017 +0200 wined3d: Change GL internal format for R32_TYPELESS. 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/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 959635b..0eacc82 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -238,9 +238,9 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16G16_SINT, WINED3DFMT_R16G16_TYPELESS, "II"}, {WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16_TYPELESS, "FF"}, {WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_TYPELESS, "D"}, + {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, - {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"},

1 0