November 2019 - Wine-Commits

Matteo Bruni : include: Expose MinPrecision field on d3dcompiler version >= 46.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: a02667beb2363644f49c84b8d161d8de7622c011 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a02667beb2363644f49c84b8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 12 19:47:25 2019 +0100 include: Expose MinPrecision field on d3dcompiler version >= 46. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11shader.h | 3 +++ include/d3dcommon.idl | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 479020abbe..501d01ee84 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -130,6 +130,9 @@ typedef struct _D3D11_SIGNATURE_PARAMETER_DESC BYTE Mask; BYTE ReadWriteMask; UINT Stream; +#if D3D_COMPILER_VERSION >= 46 + D3D_MIN_PRECISION MinPrecision; +#endif } D3D11_SIGNATURE_PARAMETER_DESC; DEFINE_GUID(IID_ID3D11ShaderReflectionType, 0x6e6ffa6a, 0x9bae, 0x4613, 0xa5, 0x1e, 0x91, 0x65, 0x2d, 0x50, 0x8c, 0x21); diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 5e38658f89..29404efd69 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -490,6 +490,18 @@ typedef enum D3D_TESSELLATOR_OUTPUT_PRIMITIVE D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW, } D3D_TESSELLATOR_OUTPUT_PRIMITIVE; +typedef enum D3D_MIN_PRECISION +{ + D3D_MIN_PRECISION_DEFAULT = 0, + D3D_MIN_PRECISION_FLOAT_16 = 1, + D3D_MIN_PRECISION_FLOAT_2_8 = 2, + D3D_MIN_PRECISION_RESERVED = 3, + D3D_MIN_PRECISION_SINT_16 = 4, + D3D_MIN_PRECISION_UINT_16 = 5, + D3D_MIN_PRECISION_ANY_16 = 0xf0, + D3D_MIN_PRECISION_ANY_10 = 0xf1, +} D3D_MIN_PRECISION; + typedef enum D3D_CBUFFER_TYPE { D3D_CT_CBUFFER,

1 0

Matteo Bruni : d3dcompiler: Initialize MinPrecision when it exists.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: d6c6fc455d9259600f47517cb82ebd498e1fbd8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c6fc455d9259600f47517c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 12 19:47:26 2019 +0100 d3dcompiler: Initialize MinPrecision when it exists. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 9a230d8d91..ac24ba0a2d 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -475,17 +475,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetResourceBindin static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); TRACE("iface %p, index %u, desc %p\n", iface, index, desc); - if (!desc || !This->isgn || index >= This->isgn->element_count) + if (!desc || !reflection->isgn || index >= reflection->isgn->element_count) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } - *desc = This->isgn->elements[index]; + *desc = reflection->isgn->elements[index]; return S_OK; } @@ -493,17 +493,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetInputParameter static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); TRACE("iface %p, index %u, desc %p\n", iface, index, desc); - if (!desc || !This->osgn || index >= This->osgn->element_count) + if (!desc || !reflection->osgn || index >= reflection->osgn->element_count) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } - *desc = This->osgn->elements[index]; + *desc = reflection->osgn->elements[index]; return S_OK; } @@ -511,17 +511,17 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetOutputParamete static HRESULT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetPatchConstantParameterDesc( ID3D11ShaderReflection *iface, UINT index, D3D11_SIGNATURE_PARAMETER_DESC *desc) { - struct d3dcompiler_shader_reflection *This = impl_from_ID3D11ShaderReflection(iface); + struct d3dcompiler_shader_reflection *reflection = impl_from_ID3D11ShaderReflection(iface); TRACE("iface %p, index %u, desc %p\n", iface, index, desc); - if (!desc || !This->pcsg || index >= This->pcsg->element_count) + if (!desc || !reflection->pcsg || index >= reflection->pcsg->element_count) { WARN("Invalid argument specified\n"); return E_INVALIDARG; } - *desc = This->pcsg->elements[index]; + *desc = reflection->pcsg->elements[index]; return S_OK; } @@ -1621,6 +1621,10 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * UINT name_offset; DWORD mask; +#if D3D_COMPILER_VERSION >= 46 + /* FIXME */ + d[i].MinPrecision = D3D_MIN_PRECISION_DEFAULT; +#endif if (element_size == D3DCOMPILER_SIGNATURE_ELEMENT_SIZE7) { read_dword(&ptr, &d[i].Stream);

1 0

Sven Baars : gdi32/tests: Remove some Win9x workarounds from the clipping tests.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 0e1720813c34534142c6871db49d90d6cef47a6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e1720813c34534142c6871d… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 10 12:44:11 2019 +0100 gdi32/tests: Remove some Win9x workarounds from the clipping tests. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/clipping.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 8f3beb56b7..015157522d 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -182,13 +182,10 @@ static void test_ExtCreateRegion(void) HRGN hrgn; XFORM xform; - if (0) /* crashes under Win9x */ - { - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 0, NULL); - ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - } + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); rgn.data.rdh.dwSize = 0; rgn.data.rdh.iType = 0; @@ -286,9 +283,7 @@ static void test_GetClipRgn(void) /* Test calling GetClipRgn with a valid device context and NULL region. */ ret = GetClipRgn(hdc, NULL); - ok(ret == 0 || - ret == -1 /* Win9x */, - "Expected GetClipRgn to return 0, got %d\n", ret); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); /* Initialize the test regions. */ hrgn = CreateRectRgn(100, 100, 100, 100); @@ -340,9 +335,7 @@ static void test_GetClipRgn(void) "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, NULL); - ok(ret == 0 || - ret == -1 /* Win9x */, - "Expected GetClipRgn to return 0, got %d\n", ret); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); ret = GetClipRgn(hdc, hrgn3); ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret);

1 0

Matteo Bruni : d3dcompiler: Fix a couple of failure return values in >= 46 D3DReflect().
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 9fd08dbff68783e7a8ce9599cb607b3bf954c074 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd08dbff68783e7a8ce9599… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 12 19:47:27 2019 +0100 d3dcompiler: Fix a couple of failure return values in >= 46 D3DReflect(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index ac24ba0a2d..f480c72986 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2005,13 +2005,21 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void if (temp[6] != data_size) { WARN("Wrong size supplied.\n"); +#if D3D_COMPILER_VERSION >= 46 + return D3DERR_INVALIDCALL; +#else return E_FAIL; +#endif } if (!IsEqualGUID(riid, &IID_ID3D11ShaderReflection)) { WARN("Wrong riid %s, accept only %s!\n", debugstr_guid(riid), debugstr_guid(&IID_ID3D11ShaderReflection)); +#if D3D_COMPILER_VERSION >= 46 + return E_INVALIDARG; +#else return E_NOINTERFACE; +#endif } object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));

1 0

Sven Baars : gdi32/tests: Update expected ExtCreateRegion behavior to represent newer Windows.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 7979b879638dc09e3f7d239c1630a61899c6f0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=7979b879638dc09e3f7d239c… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Nov 10 12:44:10 2019 +0100 gdi32/tests: Update expected ExtCreateRegion behavior to represent newer Windows. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/clipping.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index d04ef77ca3..8f3beb56b7 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -225,7 +225,9 @@ static void test_ExtCreateRegion(void) hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); todo_wine ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), "0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); @@ -237,32 +239,12 @@ static void test_ExtCreateRegion(void) SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); - /* With a single rect this seems to work... */ - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); - ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); - verify_region(hrgn, &rc); - DeleteObject(hrgn); - SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); verify_region(hrgn, &rc); DeleteObject(hrgn); - rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) + 1; - - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 1, &rgn.data); - ok(hrgn != 0 || - broken(GetLastError() == 0xdeadbeef), /* NT4 */ - "ExtCreateRegion error %u\n", GetLastError()); - if(hrgn) - { - verify_region(hrgn, &rc); - DeleteObject(hrgn); - } - xform.eM11 = 0.5; /* 50% width */ xform.eM12 = 0.0; xform.eM21 = 0.0; @@ -270,8 +252,6 @@ static void test_ExtCreateRegion(void) xform.eDx = 20.0; xform.eDy = 40.0; - rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); - SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(&xform, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError());

1 0

Matteo Bruni : include: Define D3D_COMPILER_VERSION if it's not already defined.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: cdcbc9581e06e2b82c4c50661093ee6df0befac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdcbc9581e06e2b82c4c5066… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 12 19:47:24 2019 +0100 include: Define D3D_COMPILER_VERSION if it's not already defined. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3dcompiler.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h index 5151f94510..bd1b3d1d44 100644 --- a/include/d3dcompiler.h +++ b/include/d3dcompiler.h @@ -34,6 +34,10 @@ static const WCHAR D3DCOMPILER_DLL_W[] = {'d','3','d','c','o','m','p','i','l','e #define D3DCOMPILER_DLL_A "d3dcompiler_47.dll" #define D3DCOMPILER_DLL WINELIB_NAME_AW(D3DCOMPILER_DLL_) +#ifndef D3D_COMPILER_VERSION +#define D3D_COMPILER_VERSION 47 +#endif + #define D3DCOMPILE_DEBUG 0x00000001 #define D3DCOMPILE_SKIP_VALIDATION 0x00000002 #define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004

1 0

Matteo Bruni : d3dcompiler: Always expect D3D_COMPILER_VERSION to be defined.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 4ed07d8586fc0ad7bbfd6be1146cf1cee73a082f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed07d8586fc0ad7bbfd6be1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Nov 12 19:47:23 2019 +0100 d3dcompiler: Always expect D3D_COMPILER_VERSION to be defined. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 1 + dlls/d3dcompiler_43/reflection.c | 2 +- dlls/d3dcompiler_43/utils.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/Makefile.in b/dlls/d3d10/Makefile.in index 50807a295a..d54f6f70cb 100644 --- a/dlls/d3d10/Makefile.in +++ b/dlls/d3d10/Makefile.in @@ -1,6 +1,7 @@ MODULE = d3d10.dll IMPORTLIB = d3d10 IMPORTS = uuid d3d10core d3dcompiler dxgi +EXTRADEFS = -DD3D_COMPILER_VERSION=0 PARENTSRC = ../d3dcompiler_43 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d3d083e8d8..9a230d8d91 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1807,7 +1807,7 @@ err_out: } /* d3d10 reflection methods. */ -#ifndef D3D_COMPILER_VERSION +#if !D3D_COMPILER_VERSION static inline struct d3dcompiler_shader_reflection *impl_from_ID3D10ShaderReflection(ID3D10ShaderReflection *iface) { return CONTAINING_RECORD(iface, struct d3dcompiler_shader_reflection, ID3D10ShaderReflection_iface); diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 27c0ba8c91..1436ed6bf3 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -758,7 +758,7 @@ void compilation_message(struct compilation_messages *msg, const char *fmt, __ms } } -#ifdef D3D_COMPILER_VERSION +#if D3D_COMPILER_VERSION BOOL add_declaration(struct hlsl_scope *scope, struct hlsl_ir_var *decl, BOOL local_var) { struct hlsl_ir_var *var;

1 0

Jacek Caban : makedep: Use -Wl,-delayload option for winebuild delayimports.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 4346d68e1b6b2c5a775ce60fdc0b6fdd2fec4943 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4346d68e1b6b2c5a775ce60f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 11 19:59:13 2019 +0100 makedep: Use -Wl,-delayload option for winebuild delayimports. Also fixes winebuild to correctly handle module extensions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/Makefile.in | 2 +- tools/makedep.c | 20 +++++++++++++++++--- tools/winebuild/import.c | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index ae9bf3dce6..6c31365546 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -2,7 +2,7 @@ EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 -DELAYIMPORTS = shell32 wintrust ole32 winspool comdlg32 user32 +DELAYIMPORTS = shell32 wintrust ole32 winspool.drv comdlg32 user32 EXTRADLLFLAGS = -mno-cygwin diff --git a/tools/makedep.c b/tools/makedep.c index 13c2bd2342..65b36146ed 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -574,6 +574,19 @@ static char *get_extension( char *filename ) } +/******************************************************************* + * get_base_name + */ +static const char *get_base_name( const char *name ) +{ + char *base; + if (!strchr( name, '.' )) return name; + base = strdup( name ); + *strrchr( base, '.' ) = 0; + return base; +} + + /******************************************************************* * replace_extension */ @@ -2172,7 +2185,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (i = 0; i < imports.count; i++) { - const char *name = imports.str[i]; + const char *name = get_base_name( imports.str[i] ); const char *lib = NULL; for (j = 0; j < top_makefile->subdirs.count; j++) @@ -3211,7 +3224,8 @@ static void output_module( struct makefile *make ) if (*dll_ext) { for (i = 0; i < make->delayimports.count; i++) - strarray_add( &all_libs, strmake( "-Wb,-d%s", make->delayimports.str[i] )); + strarray_add( &all_libs, strmake( "-Wl,-delayload,%s%s", make->delayimports.str[i], + strchr( make->delayimports.str[i], '.' ) ? "" : ".dll" )); strarray_add( &make->all_targets, strmake( "%s%s", make->module, dll_ext )); strarray_add( &make->all_targets, strmake( "%s.fake", make->module )); add_install_rule( make, make->module, strmake( "%s%s", make->module, dll_ext ), @@ -4235,7 +4249,7 @@ static void load_sources( struct makefile *make ) if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) - strarray_add_uniq( &delay_import_libs, make->delayimports.str[i] ); + strarray_add_uniq( &delay_import_libs, get_base_name( make->delayimports.str[i] )); } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e2688a058a..c4dc31957d 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -371,7 +371,7 @@ void add_import_dll( const char *name, const char *filename ) imp->dll_name = spec->file_name ? spec->file_name : dll_name; imp->c_name = make_c_identifier( imp->dll_name ); - if (is_delayed_import( dll_name )) + if (is_delayed_import( imp->dll_name )) list_add_tail( &dll_delayed, &imp->entry ); else list_add_tail( &dll_imports, &imp->entry );

1 0

Jacek Caban : vbscript: Always treat keywords after dot as identifiers.
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 107bba15632eb2ae58358cf3610d5790e71da4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=107bba15632eb2ae58358cf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 12 14:26:04 2019 +0100 vbscript: Always treat keywords after dot as identifiers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 4 ++- dlls/vbscript/parser.y | 62 +++----------------------------------------- dlls/vbscript/tests/lang.vbs | 5 +++- dlls/vbscript/tests/run.c | 11 ++++---- 4 files changed, 16 insertions(+), 66 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 197285c98e..444774b434 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -358,7 +358,9 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return parse_numeric_literal(ctx, lval); if(iswalpha(c)) { - int ret = check_keywords(ctx, lval); + int ret = 0; + if(ctx->last_token != '.' && ctx->last_token != tDOT) + ret = check_keywords(ctx, lval); if(!ret) return parse_identifier(ctx, lval); if(ret != tREM) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9315b7ea39..a28717ff76 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -144,7 +144,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %type <dim_decl> DimDeclList DimDecl %type <dim_list> DimList %type <const_decl> ConstDecl ConstDeclList -%type <string> Identifier DotIdentifier +%type <string> Identifier %type <case_clausule> CaseClausules %% @@ -231,8 +231,8 @@ SimpleStatement MemberExpression : Identifier { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; } - | CallExpression '.' DotIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } - | tDOT DotIdentifier { expression_t *dot_expr = new_expression(ctx, EXPR_DOT, sizeof(*dot_expr)); CHECK_ERROR; + | CallExpression '.' tIdentifier { $$ = new_member_expression(ctx, $1, $3); CHECK_ERROR; } + | tDOT tIdentifier { expression_t *dot_expr = new_expression(ctx, EXPR_DOT, sizeof(*dot_expr)); CHECK_ERROR; $$ = new_member_expression(ctx, dot_expr, $2); CHECK_ERROR; } Preserve_opt @@ -492,62 +492,6 @@ Identifier | tPROPERTY { $$ = $1; } | tSTEP { $$ = $1; } -/* most keywords can be an identifier after a dot */ -DotIdentifier - : Identifier { $$ = $1; } - | tTRUE { $$ = $1; } - | tFALSE { $$ = $1; } - | tNOT { $$ = $1; } - | tAND { $$ = $1; } - | tOR { $$ = $1; } - | tXOR { $$ = $1; } - | tEQV { $$ = $1; } - | tIMP { $$ = $1; } - | tIS { $$ = $1; } - | tMOD { $$ = $1; } - | tCALL { $$ = $1; } - | tDIM { $$ = $1; } - | tSUB { $$ = $1; } - | tFUNCTION { $$ = $1; } - | tGET { $$ = $1; } - | tLET { $$ = $1; } - | tCONST { $$ = $1; } - | tIF { $$ = $1; } - | tELSE { $$ = $1; } - | tELSEIF { $$ = $1; } - | tEND { $$ = $1; } - | tTHEN { $$ = $1; } - | tEXIT { $$ = $1; } - | tWHILE { $$ = $1; } - | tWEND { $$ = $1; } - | tDO { $$ = $1; } - | tLOOP { $$ = $1; } - | tUNTIL { $$ = $1; } - | tFOR { $$ = $1; } - | tTO { $$ = $1; } - | tEACH { $$ = $1; } - | tIN { $$ = $1; } - | tSELECT { $$ = $1; } - | tCASE { $$ = $1; } - | tBYREF { $$ = $1; } - | tBYVAL { $$ = $1; } - | tOPTION { $$ = $1; } - | tNOTHING { $$ = $1; } - | tEMPTY { $$ = $1; } - | tNULL { $$ = $1; } - | tCLASS { $$ = $1; } - | tSET { $$ = $1; } - | tNEW { $$ = $1; } - | tPUBLIC { $$ = $1; } - | tPRIVATE { $$ = $1; } - | tNEXT { $$ = $1; } - | tON { $$ = $1; } - | tRESUME { $$ = $1; } - | tGOTO { $$ = $1; } - | tWITH { $$ = $1; } - | tREDIM { $$ = $1; } - | tPRESERVE { $$ = $1; } - /* Most statements accept both new line and ':' as separators */ StSep : tNL diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 46e2ac7ab8..6eebe287fe 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1514,7 +1514,7 @@ call test_identifiers() sub test_dotIdentifiers ' test keywords that can also be an identifier after a dot - ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") + Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10") Call ok(testObj.not = 10, "testObj.not = " & testObj.not & " expected 10") @@ -1567,6 +1567,9 @@ sub test_dotIdentifiers Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10") Call ok(testObj.redim = 10, "testObj.redim = " & testObj.redim & " expected 10") Call ok(testObj.preserve = 10, "testObj.preserve = " & testObj.preserve & " expected 10") + Call ok(testObj.property = 10, "testObj.property = " & testObj.property & " expected 10") + Call ok(testObj.me = 10, "testObj.me = " & testObj.me & " expected 10") + Call ok(testObj.stop = 10, "testObj.stop = " & testObj.stop & " expected 10") end sub call test_dotIdentifiers diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 707fd89493..5fc23707e3 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -859,7 +859,10 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"goto", DISPID_TESTOBJ_KEYWORD }, { L"redim", DISPID_TESTOBJ_KEYWORD }, { L"preserve", DISPID_TESTOBJ_KEYWORD }, - { L"with", DISPID_TESTOBJ_KEYWORD } + { L"with", DISPID_TESTOBJ_KEYWORD }, + { L"property", DISPID_TESTOBJ_KEYWORD }, + { L"me", DISPID_TESTOBJ_KEYWORD }, + { L"stop", DISPID_TESTOBJ_KEYWORD } }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -2881,12 +2884,8 @@ static void run_tests(void) parse_script_a("Option Explicit\nset test.setobj = testObj"); CHECK_CALLED(global_setobj_i); - SET_EXPECT(OnScriptError); hres = parse_script_ar("dim x\nx = testObj.rem"); - todo_wine ok(hres == S_OK, "use of 'rem' as dot identifier failed: %x08\n", hres); - todo_wine - CHECK_NOT_CALLED(OnScriptError); SET_EXPECT(testobj_propget_d); SET_EXPECT(testobj_propget_i); @@ -2948,6 +2947,8 @@ static void run_tests(void) "x(counter(), counter()) = counter\n"); CHECK_CALLED(testobj_valueput_i); + parse_script_a("dim x\nx = testObj.property(1)"); + parse_htmlscript_a(""); parse_htmlscript_a("\n");

1 0

Nikolay Sivov : ole32: Return optional name in IEnumSTATPROPSTG::Next().
by Alexandre Julliard Nov. 12, 2019

Nov. 12, 2019

Module: wine Branch: master Commit: 9b7923e4bc59a1cf703f06d62f0c62638be08062 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b7923e4bc59a1cf703f06d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 12 12:00:11 2019 +0300 ole32: Return optional name in IEnumSTATPROPSTG::Next(). Based on patch by Michael Müller. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 70b8cd3b0e..5518429b31 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -177,6 +177,7 @@ struct enum_stat_prop_stg { IEnumSTATPROPSTG IEnumSTATPROPSTG_iface; LONG refcount; + PropertyStorage_impl *storage; STATPROPSTG *stats; size_t current; size_t count; @@ -222,6 +223,7 @@ static ULONG WINAPI enum_stat_prop_stg_Release(IEnumSTATPROPSTG *iface) if (!refcount) { + IPropertyStorage_Release(&penum->storage->IPropertyStorage_iface); heap_free(penum->stats); heap_free(penum); } @@ -233,6 +235,7 @@ static HRESULT WINAPI enum_stat_prop_stg_Next(IEnumSTATPROPSTG *iface, ULONG cel { struct enum_stat_prop_stg *penum = impl_from_IEnumSTATPROPSTG(iface); ULONG count = 0; + WCHAR *name; TRACE("%p, %u, %p, %p.\n", iface, celt, ret, fetched); @@ -240,7 +243,19 @@ static HRESULT WINAPI enum_stat_prop_stg_Next(IEnumSTATPROPSTG *iface, ULONG cel penum->current = 0; while (count < celt && penum->current < penum->count) - ret[count++] = penum->stats[penum->current++]; + { + *ret = penum->stats[penum->current++]; + + if (dictionary_find(penum->storage->propid_to_name, UlongToPtr(ret->propid), (void **)&name)) + { + SIZE_T size = (lstrlenW(name) + 1) * sizeof(WCHAR); + ret->lpwstrName = CoTaskMemAlloc(size); + if (ret->lpwstrName) + memcpy(ret->lpwstrName, name, size); + } + ret++; + count++; + } if (fetched) *fetched = count; @@ -321,6 +336,8 @@ static HRESULT create_enum_stat_prop_stg(PropertyStorage_impl *storage, IEnumSTA enum_obj->IEnumSTATPROPSTG_iface.lpVtbl = &enum_stat_prop_stg_vtbl; enum_obj->refcount = 1; + enum_obj->storage = storage; + IPropertyStorage_AddRef(&storage->IPropertyStorage_iface); count = 0; dictionary_enumerate(storage->propid_to_prop, prop_enum_stat_count, &count);

1 0