wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Alexandre Julliard : Release 1.7.53.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 65d699eb5f7fc151197f3dc9f36499ee3e43f8e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d699eb5f7fc151197f3dc9f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 16 23:02:06 2015 +0900 Release 1.7.53. --- ANNOUNCE | 960 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 502 insertions(+), 478 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=65d699eb5f7fc151197f3…

1 0

Austin English : wine.inf: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\Winlogon registry key.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 27926d3a8dd7f4140c7f925449edc97cf8362e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=27926d3a8dd7f4140c7f92544… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 15 06:00:44 2015 -0500 wine.inf: Add HKLM\Software\Microsoft\Windows NT\CurrentVersion\Winlogon registry key. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3e512d6..0cb7a02 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -449,6 +449,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" [CurrentVersion] +HKCU,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" HKLM,%CurrentVersion%,"FirstInstallDateTime",1,21,81,7c,23 HKLM,%CurrentVersion%,"ProductId",,"12345-oem-0000001-54321" @@ -468,12 +469,12 @@ HKLM,%CurrentVersion%\Group Policy,,16 HKLM,%CurrentVersion%\Installer,"InstallerLocation",,"%11%" HKLM,%CurrentVersion%\Policies\System,"EnableLUA",0x10003,0 HKLM,%CurrentVersion%\PreviewHandlers,,16 +HKLM,%CurrentVersion%\Run,,16 HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 HKLM,%CurrentVersion%\Uninstall,,16 -HKCU,%CurrentVersion%\Run,,16 -HKLM,%CurrentVersion%\Run,,16 +HKLM,%CurrentVersion%\Winlogon,,16 HKLM,%CurrentVersionNT%,"InstallDate",0x10003,1273299354 HKLM,%CurrentVersionNT%,"ProductId",,"12345-oem-0000001-54321" HKLM,%CurrentVersionNT%,"RegisteredOrganization",2,""

1 0

Bernhard Übelacker : d3drm/tests: Add missing DestroyWindow.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 669a49e1a2e647c059fc0a7de1298b23aceb868c URL: http://source.winehq.org/git/wine.git/?a=commit;h=669a49e1a2e647c059fc0a7de… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Oct 15 21:54:15 2015 +0200 d3drm/tests: Add missing DestroyWindow. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index f565cfc..06c2c54 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2075,6 +2075,7 @@ static void test_device_qi(void) IDirect3DRM3_Release(d3drm3); IDirect3DRM2_Release(d3drm2); IDirect3DRM_Release(d3drm1); + DestroyWindow(window); } static HRESULT CALLBACK surface_callback(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context)

1 0

André Hentschel : comdlg32/tests: Disable test which crashes on Win10.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 03bf3cac66726cd7b0d8825f66b5f8316cfe9d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=03bf3cac66726cd7b0d8825f6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Oct 16 13:40:43 2015 +0200 comdlg32/tests: Disable test which crashes on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/tests/printdlg.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 7e06c97..4c6a473 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -379,14 +379,16 @@ static void test_PrintDlgExW(void) return; } - /* Set CommDlgExtendedError != 0 */ - PrintDlgA(NULL); - SetLastError(0xdeadbeef); - res = pPrintDlgExW(NULL); - ok( (res == E_INVALIDARG), - "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", - res, GetLastError(), CommDlgExtendedError()); - + if (0) /* Crashes on Win10 */ + { + /* Set CommDlgExtendedError != 0 */ + PrintDlgA(NULL); + SetLastError(0xdeadbeef); + res = pPrintDlgExW(NULL); + ok( (res == E_INVALIDARG), + "got 0x%x with %u and %u (expected 'E_INVALIDARG')\n", + res, GetLastError(), CommDlgExtendedError() ); + } pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGEXW)) + 8); if (!pDlg) return;

1 0

Jacek Caban : advapi32: Added FIXME about an unsupported argument and initialize its value.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: a754579159e9c59a39bd9e7809e0c54598f7556d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a754579159e9c59a39bd9e780… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 16 12:59:41 2015 +0200 advapi32: Added FIXME about an unsupported argument and initialize its value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4820b33..8d97af9 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -902,6 +902,12 @@ LSTATUS WINAPI RegQueryInfoKeyW( HKEY hkey, LPWSTR class, LPDWORD class_len, LPD if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; + if (security) + { + FIXME( "security argument not supported.\n"); + *security = 0; + } + done: if (buf_ptr != buffer) heap_free( buf_ptr ); return RtlNtStatusToDosError( status ); @@ -1091,6 +1097,12 @@ LSTATUS WINAPI RegQueryInfoKeyA( HKEY hkey, LPSTR class, LPDWORD class_len, LPDW if (max_data) *max_data = info->MaxValueDataLen; if (modif) *modif = *(FILETIME *)&info->LastWriteTime; + if (security) + { + FIXME( "security argument not supported.\n"); + *security = 0; + } + done: if (buf_ptr != buffer) heap_free( buf_ptr ); return RtlNtStatusToDosError( status );

1 0

Jacek Caban : advapi32/tests: Properly test sdlen value.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 5935e9509b264e39fcb0b2c6a54e020fe3b25c85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5935e9509b264e39fcb0b2c6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 16 12:59:25 2015 +0200 advapi32/tests: Properly test sdlen value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index a8e783c..8808822 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1803,6 +1803,7 @@ static void test_reg_query_info(void) ok(classbufferW[0] == 0x5555, "classbufferW[0] = 0x%x\n", classbufferW[0]); /* empty key */ + sdlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1812,10 +1813,11 @@ static void test_reg_query_info(void) ok(values == 0, "values = %u\n", values); ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == 0, "maxvaluelen = %u\n", maxvaluelen); - ok(sdlen != 0, "sdlen = %u\n", sdlen); + todo_wine ok(sdlen != 0, "sdlen = %u\n", sdlen); ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + sdlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1825,7 +1827,7 @@ static void test_reg_query_info(void) ok(values == 0, "values = %u\n", values); ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == 0, "maxvaluelen = %u\n", maxvaluelen); - ok(sdlen != 0, "sdlen = %u\n", sdlen); + todo_wine ok(sdlen != 0, "sdlen = %u\n", sdlen); ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); @@ -1836,6 +1838,7 @@ static void test_reg_query_info(void) ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); /* with subkey & default value */ + sdlen = 0; ret = RegQueryInfoKeyA(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1845,10 +1848,11 @@ static void test_reg_query_info(void) ok(values == 1, "values = %u\n", values); ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); - ok(sdlen != 0, "sdlen = %u\n", sdlen); + todo_wine ok(sdlen != 0, "sdlen = %u\n", sdlen); ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime); + sdlen = 0; ret = RegQueryInfoKeyW(subkey, NULL, &classlen, NULL, &subkeys, &maxsubkeylen, &maxclasslen, &values, &maxvaluenamelen, &maxvaluelen, &sdlen, &lastwrite); ok(ret == ERROR_SUCCESS, "ret = %d\n", ret); ok(classlen == strlen(subkey_class), "classlen = %u\n", classlen); @@ -1858,7 +1862,7 @@ static void test_reg_query_info(void) ok(values == 1, "values = %u\n", values); ok(maxvaluenamelen == 0, "maxvaluenamelen = %u\n", maxvaluenamelen); ok(maxvaluelen == sizeof("data") * sizeof(WCHAR), "maxvaluelen = %u\n", maxvaluelen); - ok(sdlen != 0, "sdlen = %u\n", sdlen); + todo_wine ok(sdlen != 0, "sdlen = %u\n", sdlen); ok(lastwrite.dwLowDateTime != 0, "lastwrite.dwLowDateTime = %u\n", lastwrite.dwLowDateTime); ok(lastwrite.dwHighDateTime != 0, "lastwrite.dwHighDateTime = %u\n", lastwrite.dwHighDateTime);

1 0

Matteo Bruni : wined3d: Use non-deprecated texture sample builtins in shaders on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 78bd9c9811a268fd805c88b6526c5f7a7c942998 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bd9c9811a268fd805c88b65… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:06 2015 +0200 wined3d: Use non-deprecated texture sample builtins in shaders on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9373486..34abe5e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -66,6 +66,7 @@ struct glsl_sample_function struct wined3d_string_buffer *name; DWORD coord_mask; enum wined3d_data_type data_type; + BOOL output_single_component; }; enum heap_node_op @@ -2657,21 +2658,24 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) projected = FALSE; - if (shadow) - base = "shadow"; + if (needs_legacy_glsl_syntax(gl_info)) + { + if (shadow) + base = "shadow"; - type_part = resource_types[resource_type].type_part; - if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) - type_part = "2DRect"; - if (!type_part[0]) - FIXME("Unhandled resource type %#x.\n", resource_type); + type_part = resource_types[resource_type].type_part; + if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2D && texrect) + type_part = "2DRect"; + if (!type_part[0]) + FIXME("Unhandled resource type %#x.\n", resource_type); - if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) - { - if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) - suffix = "ARB"; - else - FIXME("Unsupported grad function.\n"); + if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) + { + if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) + suffix = "ARB"; + else + FIXME("Unsupported grad function.\n"); + } } sample_function->name = string_buffer_get(priv->string_buffers); @@ -2682,6 +2686,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) ++coord_size; sample_function->coord_mask = (1u << coord_size) - 1; + sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } static void shader_glsl_release_sample_function(const struct wined3d_shader_context *ctx, @@ -2828,6 +2833,9 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], sample_function->data_type); + if (sample_function->output_single_component) + shader_addline(ins->ctx->buffer, "vec4("); + shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name->buffer, shader_glsl_get_prefix(version->type), sampler); @@ -2874,6 +2882,9 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s else shader_addline(ins->ctx->buffer, ")"); + if (sample_function->output_single_component) + shader_addline(ins->ctx->buffer, ")"); + shader_addline(ins->ctx->buffer, "%s);\n", dst_swizzle); if (!is_identity_fixup(fixup))

1 0

Matteo Bruni : wined3d: Avoid the builtin color varyings on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 9be8d0a9f4e1f09feffaef7d6dc2d37f9ff2d383 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9be8d0a9f4e1f09feffaef7d6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:05 2015 +0200 wined3d: Avoid the builtin color varyings on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 118 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9be8d0a9f4e1f09feffae…

1 0

Matteo Bruni : wined3d: Avoid the builtin texture coordinate varyings on core profile.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: ad2fc9397e859067ced0fc7314e2c73425e6c270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2fc9397e859067ced0fc731… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:04 2015 +0200 wined3d: Avoid the builtin texture coordinate varyings on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 70 +++++++++++++++++++++++++++++++--------------- 1 file changed, 47 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad2fc9397e859067ced0f…

1 0

Matteo Bruni : wined3d: Don' t output the fogcoord varying when not necessary.
by Alexandre Julliard 16 Oct '15

16 Oct '15

Module: wine Branch: master Commit: 5b8be5550e967e37df44a735ef493f5d81b2e47e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8be5550e967e37df44a735e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 15 22:01:03 2015 +0200 wined3d: Don't output the fogcoord varying when not necessary. Signed-off-by: Matteo Bruni <mbruni(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 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b5b6e8..22c75b1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1827,7 +1827,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "} ffp_point;\n"); } - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && version->major < 3) { declare_out_varying(gl_info, buffer, FALSE, "float ffp_varying_fogcoord;\n"); } @@ -5234,12 +5234,15 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context * the fog frag coord is thrown away. If the fog frag coord is used, but not written by * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ - if (args->fog_src == VS_FOG_Z) - shader_addline(buffer, "%s = gl_Position.z;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); - else if (!reg_maps->fog) - shader_addline(buffer, "%s = 0.0;\n", - legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + if (reg_maps->shader_version.major < 3) + { + if (args->fog_src == VS_FOG_Z) + shader_addline(buffer, "%s = gl_Position.z;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + else if (!reg_maps->fog) + shader_addline(buffer, "%s = 0.0;\n", + legacy_context ? "gl_FogFragCoord" : "ffp_varying_fogcoord"); + } /* We always store the clipplanes without y inversion */ if (args->clip_enabled)

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015