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

Michael Müller : kernel32: Set ERROR_DLL_NOT_FOUND as error code in load_library for Win 9x compatibility.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: bd17022c90466cf06392e9ffac905b8b0b7e2cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd17022c90466cf06392e9ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 31 06:04:14 2016 +0200 kernel32: Set ERROR_DLL_NOT_FOUND as error code in load_library for Win 9x compatibility. Newer operating systems return ERROR_MOD_NOT_FOUND. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index dac66c1..badfe1d 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -948,7 +948,10 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (nts != STATUS_SUCCESS) { hModule = 0; - SetLastError( RtlNtStatusToDosError( nts ) ); + if (nts == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) + SetLastError( ERROR_DLL_NOT_FOUND ); + else + SetLastError( RtlNtStatusToDosError( nts ) ); } done: HeapFree( GetProcessHeap(), 0, load_path );

1 0

Michael Müller : kernel32: Check for invalid filename pointers in CreateFileA for Win9x compatibility.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 33a368c422b8a330f1d3de25692e57b5bf63f5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a368c422b8a330f1d3de256… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 31 06:04:43 2016 +0200 kernel32: Check for invalid filename pointers in CreateFileA for Win9x compatibility. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index a518e08..e262e2f 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1631,6 +1631,7 @@ HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing, { WCHAR *nameW; + if ((GetVersion() & 0x80000000) && IsBadStringPtrA(filename, -1)) return INVALID_HANDLE_VALUE; if (!(nameW = FILE_name_AtoW( filename, FALSE ))) return INVALID_HANDLE_VALUE; return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); }

1 0

Sebastian Lackner : ntdll: Use close_handle instead of NtClose for internal memory management functions.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a697e9682324f14f2ef0db4db75bc0213ccddcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a697e9682324f14f2ef0db4db… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 06:15:30 2016 +0200 ntdll: Use close_handle instead of NtClose for internal memory management functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index c57524a..5c43d26 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1279,7 +1279,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz error: if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); - if (dup_mapping) NtClose( dup_mapping ); + if (dup_mapping) close_handle( dup_mapping ); return status; } @@ -2640,7 +2640,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p res = map_image( handle, unix_handle, base, size, mask, header_size, shared_fd, dup_mapping, map_vprot, addr_ptr ); if (shared_needs_close) close( shared_fd ); - NtClose( shared_file ); + close_handle( shared_file ); } else { @@ -2708,7 +2708,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p server_leave_uninterrupted_section( &csVirtual, &sigset ); done: - if (dup_mapping) NtClose( dup_mapping ); + if (dup_mapping) close_handle( dup_mapping ); if (needs_close) close( unix_handle ); return res; }

1 0

Bernhard Übelacker : d3drm/tests: Release two retrieved interfaces to allow proper cleanup.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 82f59928d431e8d660f679e8128b759b0839f129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f59928d431e8d660f679e81… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Wed Mar 30 23:33:19 2016 +0200 d3drm/tests: Release two retrieved interfaces to allow proper cleanup. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index d973d88..c94d31e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -994,6 +994,8 @@ static void test_Frame(void) ok(hr == D3DRM_OK, "Cannot get parent frame (hr = %x)\n", hr); ok(pFrameTmp == pFrameP1, "pFrameTmp = %p\n", pFrameTmp); CHECK_REFCOUNT(pFrameP1, 2); + IDirect3DRMFrame_Release(pFrameTmp); + CHECK_REFCOUNT(pFrameP1, 1); /* Add child to second parent */ hr = IDirect3DRM_CreateFrame(d3drm, NULL, &pFrameP2); @@ -1037,6 +1039,8 @@ static void test_Frame(void) ok(pFrameTmp == pFrameP2, "pFrameTmp = %p\n", pFrameTmp); CHECK_REFCOUNT(pFrameP2, 2); CHECK_REFCOUNT(pFrameC, 2); + IDirect3DRMFrame_Release(pFrameTmp); + CHECK_REFCOUNT(pFrameP2, 1); /* Add child again */ hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameC); @@ -1088,7 +1092,7 @@ static void test_Frame(void) hr = IDirect3DRMFrame_AddChild(pFrameP2, pFrameP1); ok(hr == D3DRM_OK, "Cannot add child frame (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); frame_array = NULL; hr = IDirect3DRMFrame_GetChildren(pFrameP2, &frame_array); @@ -1111,11 +1115,11 @@ static void test_Frame(void) /* [Add/Delete]Visual with NULL pointer */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); /* Create Visual */ hr = IDirect3DRM_CreateMeshBuilder(d3drm, &mesh_builder); @@ -1125,7 +1129,7 @@ static void test_Frame(void) /* Add Visual to first parent */ hr = IDirect3DRMFrame_AddVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot add visual (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); CHECK_REFCOUNT(visual1, 2); visual_array = NULL; @@ -1145,17 +1149,17 @@ static void test_Frame(void) /* Delete Visual */ hr = IDirect3DRMFrame_DeleteVisual(pFrameP1, visual1); ok(hr == D3DRM_OK, "Cannot delete visual (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); IDirect3DRMMeshBuilder_Release(mesh_builder); /* [Add/Delete]Light with NULL pointer */ hr = IDirect3DRMFrame_AddLight(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); hr = IDirect3DRMFrame_DeleteLight(pFrameP1, NULL); ok(hr == D3DRMERR_BADOBJECT, "Should have returned D3DRMERR_BADOBJECT (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); /* Create Light */ hr = IDirect3DRM_CreateLightRGB(d3drm, D3DRMLIGHT_SPOT, 0.1, 0.2, 0.3, &light1); @@ -1164,7 +1168,7 @@ static void test_Frame(void) /* Add Light to first parent */ hr = IDirect3DRMFrame_AddLight(pFrameP1, light1); ok(hr == D3DRM_OK, "Cannot add light (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); CHECK_REFCOUNT(light1, 2); light_array = NULL; @@ -1184,7 +1188,7 @@ static void test_Frame(void) /* Delete Light */ hr = IDirect3DRMFrame_DeleteLight(pFrameP1, light1); ok(hr == D3DRM_OK, "Cannot delete light (hr = %x)\n", hr); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameP1, 2); IDirect3DRMLight_Release(light1); /* Test SceneBackground on first parent */ @@ -1203,8 +1207,8 @@ static void test_Frame(void) /* Cleanup */ IDirect3DRMFrame_Release(pFrameP2); - CHECK_REFCOUNT(pFrameC, 2); - CHECK_REFCOUNT(pFrameP1, 3); + CHECK_REFCOUNT(pFrameC, 1); + CHECK_REFCOUNT(pFrameP1, 1); IDirect3DRMFrame_Release(pFrameC); IDirect3DRMFrame_Release(pFrameP1);

1 0

Daniel Lehman : msvcr120: Add asinh.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: e084240415f8f1b31362b1519675b4613d4afded URL: http://source.winehq.org/git/wine.git/?a=commit;h=e084240415f8f1b31362b1519… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 12:00:35 2016 -0700 msvcr120: Add asinh. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c1abf1f..27afbc0 100755 --- a/configure +++ b/configure @@ -16858,6 +16858,8 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ + asinh \ + asinhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index c89aa08..20478df 100644 --- a/configure.ac +++ b/configure.ac @@ -2516,6 +2516,8 @@ then fi AC_CHECK_FUNCS(\ + asinh \ + asinhf \ cbrt \ cbrtf \ erf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 1ea4f2d..fcfc8b4 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -129,9 +129,9 @@ @ stub acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) ucrtbase.asinh +@ cdecl asinhf(float float) ucrtbase.asinhf +@ cdecl asinhl(double double) ucrtbase.asinhl @ cdecl atan(double) ucrtbase.atan @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dee7fd5..dc0c266 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2018,9 +2018,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) MSVCR120_asinh +@ cdecl asinhf(float float) MSVCR120_asinhf +@ cdecl asinhl(double double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f5dba67..c7810cd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1684,9 +1684,9 @@ @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin @ cdecl -arch=arm,x86_64 asinf(float) msvcr120.asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) msvcr120.asinh +@ cdecl asinhf(float float) msvcr120.asinhf +@ cdecl asinhl(double double) msvcr120.asinhl @ cdecl atan(double) msvcr120.atan @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0a3f2da..4150cfc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2743,3 +2743,37 @@ double CDECL MSVCR120_fmin(double x, double y) return signbit(x) ? x : y; return x<y ? x : y; } + +/********************************************************************* + * asinh (MSVCR120.@) + */ +double CDECL MSVCR120_asinh(double x) +{ +#ifdef HAVE_ASINH + return asinh(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * asinhf (MSVCR120.@) + */ +float CDECL MSVCR120_asinhf(float x) +{ +#ifdef HAVE_ASINHF + return asinhf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * asinhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) +{ + return MSVCR120_asinh(x); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3bbab33..16bc133 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2160,9 +2160,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) MSVCR120_asinh +@ cdecl asinhf(float float) MSVCR120_asinhf +@ cdecl asinhl(double double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f diff --git a/include/config.h.in b/include/config.h.in index 86da1a5..cb0ddd6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -32,6 +32,12 @@ /* Define to 1 if you have the `asctime_r' function. */ #undef HAVE_ASCTIME_R +/* Define to 1 if you have the `asinh' function. */ +#undef HAVE_ASINH + +/* Define to 1 if you have the `asinhf' function. */ +#undef HAVE_ASINHF + /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H

1 0

Józef Kucia : wined3d: Add system value names used by tessellation shaders.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 17c07a9409d0084032ed3e4a0d4562cfce91fb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17c07a9409d0084032ed3e4a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:38 2016 +0200 wined3d: Add system value names used by tessellation shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 22 +++++++++++++++++----- include/wine/wined3d.h | 12 ++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5521939..b64b726 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -222,11 +222,23 @@ static const struct } sysval_semantic_names[] = { - {WINED3D_SV_POSITION, "SV_Position"}, - {WINED3D_SV_INSTANCEID, "SV_InstanceID"}, - {WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, - {WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, - {WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, + {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_INSTANCEID, "SV_InstanceID"}, + {WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, + {WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, + {WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, + {WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"}, + {WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"}, + {WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"}, + {WINED3D_SV_QUAD_V1_TESS_FACTOR, "finalQuadVeq1EdgeTessFactor"}, + {WINED3D_SV_QUAD_U_INNER_TESS_FACTOR, "finalQuadUInsideTessFactor"}, + {WINED3D_SV_QUAD_V_INNER_TESS_FACTOR, "finalQuadVInsideTessFactor"}, + {WINED3D_SV_TRIANGLE_U_TESS_FACTOR, "finalTriUeq0EdgeTessFactor"}, + {WINED3D_SV_TRIANGLE_V_TESS_FACTOR, "finalTriVeq0EdgeTessFactor"}, + {WINED3D_SV_TRIANGLE_W_TESS_FACTOR, "finalTriWeq0EdgeTessFactor"}, + {WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR, "finalTriInsideTessFactor"}, + {WINED3D_SV_LINE_DETAIL_TESS_FACTOR, "finalLineDetailTessFactor"}, + {WINED3D_SV_LINE_DENSITY_TESS_FACTOR, "finalLineDensityTessFactor"}, }; static void shader_dump_src_param(struct wined3d_string_buffer *buffer, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index cb057ab..7fbfe9d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -752,6 +752,18 @@ enum wined3d_sysval_semantic WINED3D_SV_INSTANCEID = 8, WINED3D_SV_ISFRONTFACE = 9, WINED3D_SV_SAMPLEINDEX = 10, + WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, + WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, + WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, + WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, + WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, + WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, + WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, + WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, + WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, + WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, + WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, + WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, }; enum wined3d_scanline_ordering

1 0

Józef Kucia : wined3d: Improve wined3d_sysval_semantic enum values naming.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: e2f4aaa65abc44b173d865fa12fb032b6fe7a246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f4aaa65abc44b173d865fa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:39 2016 +0200 wined3d: Improve wined3d_sysval_semantic enum values naming. 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 | 2 +- dlls/wined3d/shader.c | 8 ++++---- include/wine/wined3d.h | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5af7ae8..6bb0a2a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1898,7 +1898,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_INSTANCEID) + if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b64b726..6347fa0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -223,10 +223,10 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, - {WINED3D_SV_INSTANCEID, "SV_InstanceID"}, - {WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, - {WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, - {WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, + {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, + {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, + {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"}, + {WINED3D_SV_SAMPLE_INDEX, "SV_SampleIndex"}, {WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7fbfe9d..9bdd16d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -747,23 +747,23 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { - WINED3D_SV_POSITION = 1, - WINED3D_SV_PRIMITIVEID = 7, - WINED3D_SV_INSTANCEID = 8, - WINED3D_SV_ISFRONTFACE = 9, - WINED3D_SV_SAMPLEINDEX = 10, - WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, - WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, - WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, - WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, - WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, - WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, - WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, - WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, - WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, - WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, - WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, - WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, + WINED3D_SV_POSITION = 1, + WINED3D_SV_PRIMITIVE_ID = 7, + WINED3D_SV_INSTANCE_ID = 8, + WINED3D_SV_IS_FRONT_FACE = 9, + WINED3D_SV_SAMPLE_INDEX = 10, + WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, + WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, + WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, + WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, + WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, + WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, + WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, + WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, + WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, + WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, + WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, + WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, }; enum wined3d_scanline_ordering

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_hs_fork_phase_instance_count opcode.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a302a16aaa666093f220dafca463e9acf79b98ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=a302a16aaa666093f220dafca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:40 2016 +0200 wined3d: Recognize SM5 dcl_hs_fork_phase_instance_count opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 2 + dlls/wined3d/shader_sm4.c | 393 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 203 insertions(+), 195 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a302a16aaa666093f220d…

1 0

Józef Kucia : wined3d: Avoid abbreviations in SM5 opcode names.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a87f09bb4d621318237960e7ab54362d17ecc0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a87f09bb4d621318237960e7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:41 2016 +0200 wined3d: Avoid abbreviations in SM5 opcode names. 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/shader_sm4.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9a52437..7804016 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -61,8 +61,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) -#define WINED3D_SM5_CPOINT_COUNT_SHIFT 11 -#define WINED3D_SM5_CPOINT_COUNT_MASK (0xffu << WINED3D_SM5_CPOINT_COUNT_SHIFT) +#define WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT 11 +#define WINED3D_SM5_CONTROL_POINT_COUNT_MASK (0xffu << WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT) #define WINED3D_SM4_OPCODE_MASK 0xff @@ -193,8 +193,8 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, - WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT = 0x93, - WINED3D_SM5_OP_DCL_OUTPUT_CPOINT_COUNT = 0x94, + WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, + WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -410,8 +410,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, - {WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, - {WINED3D_SM5_OP_DCL_OUTPUT_CPOINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, + {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, + {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, @@ -1031,10 +1031,11 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; } } - else if (opcode == WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT - || opcode == WINED3D_SM5_OP_DCL_OUTPUT_CPOINT_COUNT) + else if (opcode == WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT + || opcode == WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT) { - ins->declaration.count = (opcode_token & WINED3D_SM5_CPOINT_COUNT_MASK) >> WINED3D_SM5_CPOINT_COUNT_SHIFT; + ins->declaration.count = (opcode_token & WINED3D_SM5_CONTROL_POINT_COUNT_MASK) + >> WINED3D_SM5_CONTROL_POINT_COUNT_SHIFT; } else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) {

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_hs_max_tessfactor opcode.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: f21d1b19b5a10a0a1927bc79c5ef96a1d7775959 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f21d1b19b5a10a0a1927bc79c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:42 2016 +0200 wined3d: Recognize SM5 dcl_hs_max_tessfactor opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/shader_sm4.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 16 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 51c2512..1800f94 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5231,6 +5231,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45e3a76..3041eef 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8125,6 +8125,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b5a3e84..dbaf33f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -57,6 +57,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", + /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", @@ -2011,6 +2012,11 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_global_flags(&buffer, ins.flags); } + else if (ins.handler_idx == WINED3DSIH_DCL_HS_MAX_TESSFACTOR) + { + shader_addline(&buffer, "%s %.8e", shader_opcode_names[ins.handler_idx], + ins.declaration.max_tessellation_factor); + } else if (ins.handler_idx == WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER) { shader_addline(&buffer, "%s {\n", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7804016..0e12fce 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -195,6 +195,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, + WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, @@ -412,6 +413,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT, "", ""}, + {WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, "", ""}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, @@ -1009,6 +1011,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi if (opcode_token & WINED3D_SM4_INDEX_TYPE_MASK) ins->flags |= WINED3DSI_INDEXED_DYNAMIC; } + else if (opcode == WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR) + { + ins->declaration.max_tessellation_factor = *(float *)p++; + } else if (opcode == WINED3D_SM4_OP_DCL_SAMPLER) { ins->flags = (opcode_token & WINED3D_SM4_SAMPLER_MODE_MASK) >> WINED3D_SM4_SAMPLER_MODE_SHIFT; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b011ccf..d7502cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -513,6 +513,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, + WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, @@ -855,6 +856,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + float max_tessellation_factor; } declaration; };

1 0