May 2016 - Wine-commits - list.winehq.org

Józef Kucia : wined3d: Simplify buffer_is_fully_dirty ().
by Alexandre Julliard 27 May '16

27 May '16

Module: wine Branch: master Commit: d39560f33f5074f2baec355f0b19b036d0da1412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d39560f33f5074f2baec355f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 27 11:03:53 2016 +0200 wined3d: Simplify buffer_is_fully_dirty(). The buffer_invalidate_bo_range() ensures that if the whole buffer was invalidated the dirty areas array contains exactly one element. 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/buffer.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5ddf67d..c82bfdb 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -89,14 +89,8 @@ static BOOL buffer_is_dirty(const struct wined3d_buffer *buffer) static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) { - unsigned int i; - - for (i = 0; i < buffer->modified_areas; ++i) - { - if (!buffer->maps[i].offset && buffer->maps[i].size == buffer->resource.size) - return TRUE; - } - return FALSE; + return buffer->modified_areas == 1 + && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } /* Context activation is done by the caller. */ @@ -1348,10 +1342,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } } - buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)); - if (!buffer->maps) + if (!(buffer->maps = HeapAlloc(GetProcessHeap(), 0, sizeof(*buffer->maps)))) { - ERR("Out of memory\n"); + ERR("Out of memory.\n"); buffer_unload(&buffer->resource); resource_cleanup(&buffer->resource); return E_OUTOFMEMORY;

1 0

Alexandre Julliard : winex11: Subtract the tray window from the work area in desktop mode.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 6c6814056f067f863a4cf47f756c9336dcdf8afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6814056f067f863a4cf47f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 26 21:47:51 2016 +0900 winex11: Subtract the tray window from the work area in desktop mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 7e28726..0419535 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -87,6 +87,20 @@ static void query_work_area( RECT *rc_work ) } } +static void query_desktop_work_area( RECT *rc_work ) +{ + static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; + RECT rect; + HWND hwnd = FindWindowW( trayW, NULL ); + + if (!hwnd || !IsWindowVisible( hwnd )) return; + if (!GetWindowRect( hwnd, &rect )) return; + if (rect.top) rc_work->bottom = rect.top; + else rc_work->top = rect.bottom; + TRACE( "found tray %p %s work area %s\n", hwnd, + wine_dbgstr_rect( &rect ), wine_dbgstr_rect( rc_work )); +} + #ifdef SONAME_LIBXINERAMA #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -198,6 +212,8 @@ void xinerama_init( unsigned int width, unsigned int height ) default_monitor.rcWork = default_monitor.rcMonitor = rect; if (root_window == DefaultRootWindow( gdi_display )) query_work_area( &default_monitor.rcWork ); + else + query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; }

1 0

Alex Henrie : ncrypt: Add stub dll.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 084827e90154f3c534d50979f606c88f997ee669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=084827e90154f3c534d50979f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed May 25 23:21:09 2016 -0600 ncrypt: Add stub dll. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/ncrypt/Makefile.in | 4 ++ dlls/ncrypt/main.c | 45 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 4 ++ 6 files changed, 194 insertions(+) diff --git a/configure b/configure index 5abf6ae..c1d1bf8 100755 --- a/configure +++ b/configure @@ -1246,6 +1246,7 @@ enable_msxml2 enable_msxml3 enable_msxml4 enable_msxml6 +enable_ncrypt enable_nddeapi enable_ndis_sys enable_netapi32 @@ -17882,6 +17883,7 @@ wine_fn_config_dll msxml3 enable_msxml3 clean wine_fn_config_test dlls/msxml3/tests msxml3_test clean wine_fn_config_dll msxml4 enable_msxml4 clean wine_fn_config_dll msxml6 enable_msxml6 clean +wine_fn_config_dll ncrypt enable_ncrypt wine_fn_config_dll nddeapi enable_nddeapi implib wine_fn_config_dll ndis.sys enable_ndis_sys wine_fn_config_dll netapi32 enable_netapi32 implib diff --git a/configure.ac b/configure.ac index f25c965..e42e35d 100644 --- a/configure.ac +++ b/configure.ac @@ -3129,6 +3129,7 @@ WINE_CONFIG_DLL(msxml3,,[clean]) WINE_CONFIG_TEST(dlls/msxml3/tests,[clean]) WINE_CONFIG_DLL(msxml4,,[clean]) WINE_CONFIG_DLL(msxml6,,[clean]) +WINE_CONFIG_DLL(ncrypt) WINE_CONFIG_DLL(nddeapi,,[implib]) WINE_CONFIG_DLL(ndis.sys) WINE_CONFIG_DLL(netapi32,,[implib]) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in new file mode 100644 index 0000000..d54b921 --- /dev/null +++ b/dlls/ncrypt/Makefile.in @@ -0,0 +1,4 @@ +MODULE = ncrypt.dll + +C_SRCS = \ + main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c new file mode 100644 index 0000000..9c09600 --- /dev/null +++ b/dlls/ncrypt/main.c @@ -0,0 +1,45 @@ +/* + * New cryptographic library (ncrypt.dll) + * + * Copyright 2016 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ncrypt); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec new file mode 100644 index 0000000..1322f1e --- /dev/null +++ b/dlls/ncrypt/ncrypt.spec @@ -0,0 +1,138 @@ +@ stub BCryptAddContextFunction +@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider +@ stub BCryptConfigureContext +@ stub BCryptConfigureContextFunction +@ stub BCryptCreateContext +@ stdcall BCryptCreateHash(ptr ptr ptr long ptr long long) bcrypt.BCryptCreateHash +@ stub BCryptDecrypt +@ stub BCryptDeleteContext +@ stub BCryptDeriveKey +@ stub BCryptDeriveKeyCapi +@ stub BCryptDeriveKeyPBKDF2 +@ stdcall BCryptDestroyHash(ptr) bcrypt.BCryptDestroyHash +@ stub BCryptDestroyKey +@ stub BCryptDestroySecret +@ stub BCryptDuplicateHash +@ stub BCryptDuplicateKey +@ stub BCryptEncrypt +@ stdcall BCryptEnumAlgorithms(long ptr ptr long) bcrypt.BCryptEnumAlgorithms +@ stub BCryptEnumContextFunctionProviders +@ stub BCryptEnumContextFunctions +@ stub BCryptEnumContexts +@ stub BCryptEnumProviders +@ stub BCryptEnumRegisteredProviders +@ stub BCryptExportKey +@ stub BCryptFinalizeKeyPair +@ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash +@ stub BCryptFreeBuffer +@ stdcall BCryptGenRandom(ptr ptr long long) bcrypt.BCryptGenRandom +@ stub BCryptGenerateKeyPair +@ stub BCryptGenerateSymmetricKey +@ stdcall BCryptGetFipsAlgorithmMode(ptr) bcrypt.BCryptGetFipsAlgorithmMode +@ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty +@ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash +@ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData +@ stub BCryptImportKey +@ stub BCryptImportKeyPair +@ stub BCryptKeyDerivation +@ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider +@ stub BCryptQueryContextConfiguration +@ stub BCryptQueryContextFunctionConfiguration +@ stub BCryptQueryContextFunctionProperty +@ stub BCryptQueryProviderRegistration +@ stub BCryptRegisterConfigChangeNotify +@ stub BCryptRegisterProvider +@ stub BCryptRemoveContextFunction +@ stub BCryptRemoveContextFunctionProvider +@ stub BCryptResolveProviders +@ stub BCryptSecretAgreement +@ stub BCryptSetAuditingInterface +@ stub BCryptSetContextFunctionProperty +@ stub BCryptSetProperty +@ stub BCryptSignHash +@ stub BCryptUnregisterConfigChangeNotify +@ stub BCryptUnregisterProvider +@ stub BCryptVerifySignature +@ stub GetIsolationServerInterface +@ stub GetKeyStorageInterface +@ stub GetSChannelInterface +@ stub NCryptCloseKeyProtector +@ stub NCryptCloseProtectionDescriptor +@ stub NCryptCreateClaim +@ stub NCryptCreatePersistedKey +@ stub NCryptCreateProtectionDescriptor +@ stub NCryptDecrypt +@ stub NCryptDeleteKey +@ stub NCryptDeriveKey +@ stub NCryptDuplicateKeyProtectorHandle +@ stub NCryptEncrypt +@ stub NCryptEnumAlgorithms +@ stub NCryptEnumKeys +@ stub NCryptEnumStorageProviders +@ stub NCryptExportKey +@ stub NCryptFinalizeKey +@ stub NCryptFreeBuffer +@ stub NCryptFreeObject +@ stub NCryptGetProperty +@ stub NCryptGetProtectionDescriptorInfo +@ stub NCryptImportKey +@ stub NCryptIsAlgSupported +@ stub NCryptIsKeyHandle +@ stub NCryptKeyDerivation +@ stub NCryptNotifyChangeKey +@ stub NCryptOpenKey +@ stub NCryptOpenKeyProtector +@ stub NCryptOpenStorageProvider +@ stub NCryptProtectKey +@ stub NCryptProtectSecret +@ stub NCryptQueryProtectionDescriptorName +@ stub NCryptRegisterProtectionDescriptorName +@ stub NCryptSecretAgreement +@ stub NCryptSetAuditingInterface +@ stub NCryptSetProperty +@ stub NCryptSignHash +@ stub NCryptStreamClose +@ stub NCryptStreamOpenToProtect +@ stub NCryptStreamOpenToUnprotect +@ stub NCryptStreamOpenToUnprotectEx +@ stub NCryptStreamUpdate +@ stub NCryptTranslateHandle +@ stub NCryptUnprotectKey +@ stub NCryptUnprotectSecret +@ stub NCryptVerifyClaim +@ stub NCryptVerifySignature +@ stub SslChangeNotify +@ stub SslComputeClientAuthHash +@ stub SslComputeEapKeyBlock +@ stub SslComputeFinishedHash +@ stub SslComputeSessionHash +@ stub SslCreateClientAuthHash +@ stub SslCreateEphemeralKey +@ stub SslCreateHandshakeHash +@ stub SslDecrementProviderReferenceCount +@ stub SslDecryptPacket +@ stub SslEncryptPacket +@ stub SslEnumCipherSuites +@ stub SslEnumEccCurves +@ stub SslEnumProtocolProviders +@ stub SslExportKey +@ stub SslExportKeyingMaterial +@ stub SslFreeBuffer +@ stub SslFreeObject +@ stub SslGenerateMasterKey +@ stub SslGeneratePreMasterKey +@ stub SslGenerateSessionKeys +@ stub SslGetCipherSuitePRFHashAlgorithm +@ stub SslGetKeyProperty +@ stub SslGetProviderProperty +@ stub SslHashHandshake +@ stub SslImportKey +@ stub SslImportMasterKey +@ stub SslIncrementProviderReferenceCount +@ stub SslLookupCipherLengths +@ stub SslLookupCipherSuiteInfo +@ stub SslOpenPrivateKey +@ stub SslOpenProvider +@ stub SslSignHash +@ stub SslVerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 774687e..feb65b4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -289,6 +289,10 @@ my @dll_groups = "sfc_os", "sfc", ], + [ + "bcrypt", + "ncrypt", + ], ); my $update_flags = 0;

1 0

Hans Leidekker : webservices: Implement WsDecodeUrl.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 24bdad63e4c94a671367b7885ff341185143a7c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24bdad63e4c94a671367b7885… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 26 10:56:47 2016 +0200 webservices: Implement WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/tests/Makefile.in | 1 + dlls/webservices/tests/url.c | 194 +++++++++++++++++++++++++++++++++ dlls/webservices/url.c | 214 +++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 67 ++++++++++++ 6 files changed, 478 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24bdad63e4c94a671367b…

1 0

Hans Leidekker : webservices: Implement WsEncodeUrl.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 57e69a6b485906e1bec8e93538f149f95723270d URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e69a6b485906e1bec8e9353… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 26 10:56:48 2016 +0200 webservices: Implement WsEncodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 110 ++++++++++++++++ dlls/webservices/url.c | 269 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 380 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57e69a6b485906e1bec8e…

1 0

Józef Kucia : d3d11/tests: Add test for SM4 breakc instruction.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: a4b7e3ac93c69e102e3e31aa77d0e24563802ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4b7e3ac93c69e102e3e31aa7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:22 2016 +0200 d3d11/tests: Add test for SM4 breakc instruction. 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 | 94 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index e17114e..0b73b2c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6973,6 +6973,99 @@ static void test_sm4_if_instruction(void) release_test_context(&test_context); } +static void test_sm4_breakc_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_breakc_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x065ac80a, 0x24369e7e, 0x218d5dc1, 0x3532868c, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0a00001e, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x00000001, 0x00000001, + 0x00000000, 0x00000000, 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x000000ff, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const DWORD ps_breakc_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (int i = 0, j = 254; i < 255 && j >= 0; ++i, --j) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x687406ef, 0x7bdeb7d1, 0xb3282292, 0x934a9101, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000148, 0x00000040, 0x00000052, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100072, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x000000fe, 0x00000000, 0x01000030, 0x07000022, 0x00100082, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x07000021, 0x00100012, 0x00000001, + 0x0010002a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x0010000a, 0x00000001, 0x03000003, 0x0010003a, 0x00000000, 0x0a00001e, 0x00100072, + 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0xffffffff, 0x00000000, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_breakc_nz_code, sizeof(ps_breakc_nz_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_nz pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_breakc_z_code, sizeof(ps_breakc_z_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_z pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -7015,4 +7108,5 @@ START_TEST(d3d11) test_getdc(); test_shader_stage_input_output_matching(); test_sm4_if_instruction(); + test_sm4_breakc_instruction(); }

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 breakc instruction.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 58774533a3c2d32da99df033ed7e7864f336c3c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58774533a3c2d32da99df033e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:23 2016 +0200 d3d10core/tests: Add test for SM4 breakc instruction. 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/d3d10core/tests/device.c | 92 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ebd3325..6f3f047 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6822,6 +6822,97 @@ static void test_sm4_if_instruction(void) release_test_context(&test_context); } +static void test_sm4_breakc_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps; + ID3D10Device *device; + HRESULT hr; + + static const DWORD ps_breakc_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (uint i = 0; i < 255; ++i) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x065ac80a, 0x24369e7e, 0x218d5dc1, 0x3532868c, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000110, 0x00000040, 0x00000044, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01000030, 0x07000050, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0a00001e, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x00000001, 0x00000001, + 0x00000000, 0x00000000, 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x00004001, 0x000000ff, 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, + 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + 0x01000015, 0x0100003e, + }; + static const DWORD ps_breakc_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + + for (int i = 0, j = 254; i < 255 && j >= 0; ++i, --j) + ++counter; + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x687406ef, 0x7bdeb7d1, 0xb3282292, 0x934a9101, 0x00000001, 0x000001c0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000148, 0x00000040, 0x00000052, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100072, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x000000fe, 0x00000000, 0x01000030, 0x07000022, 0x00100082, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x07000021, 0x00100012, 0x00000001, + 0x0010002a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100082, 0x00000000, 0x0010003a, + 0x00000000, 0x0010000a, 0x00000001, 0x03000003, 0x0010003a, 0x00000000, 0x0a00001e, 0x00100072, + 0x00000000, 0x00100246, 0x00000000, 0x00004002, 0x00000001, 0x00000001, 0xffffffff, 0x00000000, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x0304001f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_breakc_nz_code, sizeof(ps_breakc_nz_code), &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_nz pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + hr = ID3D10Device_CreatePixelShader(device, ps_breakc_z_code, sizeof(ps_breakc_z_code), &ps); + ok(SUCCEEDED(hr), "Failed to create breakc_z pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D10PixelShader_Release(ps); + + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -6861,4 +6952,5 @@ START_TEST(device) test_draw_depth_only(); test_shader_stage_input_output_matching(); test_sm4_if_instruction(); + test_sm4_breakc_instruction(); }

1 0

Józef Kucia : wined3d: Simplify match_apple().
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 1cf142e6e7d46c0dacfe2f9f021bad36ecaad37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf142e6e7d46c0dacfe2f9f0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:24 2016 +0200 wined3d: Simplify match_apple(). 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/directx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4de3990..e1438d3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -517,11 +517,7 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, const char *gl_re * * This test has been moved into wined3d_guess_gl_vendor() */ - if (gl_vendor == GL_VENDOR_APPLE) - { - return TRUE; - } - return FALSE; + return gl_vendor == GL_VENDOR_APPLE; } /* Context activation is done by the caller. */ @@ -1634,7 +1630,6 @@ static DWORD wined3d_parse_gl_version(const char *gl_version) static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_info *gl_info, const char *gl_vendor_string, const char *gl_renderer) { - /* MacOS has various specialities in the extensions it advertises. Some have to be loaded from * the opengl 1.2+ core, while other extensions are advertised, but software emulated. So try to * detect the Apple OpenGL implementation to apply some extension fixups afterwards. @@ -1646,8 +1641,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in * is specific to the Mac OS X window management, and GL_APPLE_ycbcr_422 is QuickTime specific. So * the chance that other implementations support them is rather small since Win32 QuickTime uses * DirectDraw, not OpenGL. */ - if (gl_info->supported[APPLE_FENCE] - && gl_info->supported[APPLE_YCBCR_422]) + if (gl_info->supported[APPLE_FENCE] && gl_info->supported[APPLE_YCBCR_422]) return GL_VENDOR_APPLE; if (strstr(gl_vendor_string, "NVIDIA"))

1 0

Józef Kucia : wined3d: Prefer sized GL internal formats.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: c7aa915a15d8795693434400faa7255ba36d10f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7aa915a15d8795693434400f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:25 2016 +0200 wined3d: Prefer sized GL internal formats. GL_ARB_texture_storage requires sized formats. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f85fcc9..4145bf5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1006,7 +1006,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_UYVY, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0, + {WINED3DFMT_UYVY, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE8_ALPHA8, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1018,7 +1018,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_YUY2, GL_LUMINANCE_ALPHA, GL_LUMINANCE_ALPHA, 0, + {WINED3DFMT_YUY2, GL_LUMINANCE8_ALPHA8, GL_LUMINANCE8_ALPHA8, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1030,7 +1030,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_YV12, GL_ALPHA, GL_ALPHA, 0, + {WINED3DFMT_YV12, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL}, @@ -1038,7 +1038,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = GL_RED, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, ARB_TEXTURE_RG, NULL}, - {WINED3DFMT_NV12, GL_ALPHA, GL_ALPHA, 0, + {WINED3DFMT_NV12, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_FILTERING, WINED3D_GL_LEGACY_CONTEXT, NULL},

1 0

Józef Kucia : wined3d: Add ARB_texture_storage extension.
by Alexandre Julliard 26 May '16

26 May '16

Module: wine Branch: master Commit: 266528e244da3ddfa4f5efd59ea5cc1e4fdafc0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=266528e244da3ddfa4f5efd59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 26 00:08:26 2016 +0200 wined3d: Add ARB_texture_storage extension. 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/directx.c | 12 ++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e1438d3..140c6a7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,6 +156,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, + {"GL_ARB_texture_storage", ARB_TEXTURE_STORAGE }, {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, @@ -2691,6 +2692,10 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glCompressedTexSubImage2DARB) USE_GL_FUNC(glCompressedTexSubImage3DARB) USE_GL_FUNC(glGetCompressedTexImageARB) + /* GL_ARB_texture_storage */ + USE_GL_FUNC(glTexStorage1D) + USE_GL_FUNC(glTexStorage2D) + USE_GL_FUNC(glTexStorage3D) /* GL_ARB_timer_query */ USE_GL_FUNC(glQueryCounter) USE_GL_FUNC(glGetQueryObjectui64v) @@ -3515,6 +3520,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, + {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, @@ -3773,6 +3779,12 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD TRACE(" IMPLIED: ARB_texture_mirror_clamp_to_edge support (by ATI_texture_mirror_once).\n"); gl_info->supported[ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE] = TRUE; } + if (gl_info->supported[ARB_TEXTURE_STORAGE] && gl_info->supported[APPLE_YCBCR_422]) + { + /* AFAIK APPLE_ycbcr_422 is only available in legacy contexts so we shouldn't ever hit this. */ + FIXME("Disabling APPLE_ycbcr_422 because of ARB_texture_storage.\n"); + gl_info->supported[APPLE_YCBCR_422] = FALSE; + } wined3d_adapter_init_limits(gl_info); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 356ee7c..46df6ee 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -92,6 +92,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, + ARB_TEXTURE_STORAGE, ARB_TEXTURE_SWIZZLE, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT,

1 0