June 2019 - Wine-commits - list.winehq.org

Paul Gofman : wined3d: Do not zero 'w' with zero norm for 'nrm' opcode in GLSL backend.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: c13351c05af43aa542938e0c0935b154a8166905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c13351c05af43aa542938e0c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 13 16:57:01 2019 +0300 wined3d: Do not zero 'w' with zero norm for 'nrm' opcode in GLSL backend. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9202fb6..326733d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4117,16 +4117,8 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); - if (mask_size > 1) - { - shader_addline(buffer, "tmp0.x == 0.0 ? vec%u(0.0) : (%s * inversesqrt(tmp0.x)));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(buffer, "tmp0.x == 0.0 ? 0.0 : (%s * inversesqrt(tmp0.x)));\n", - src_param.param_str); - } + shader_addline(buffer, "tmp0.x == 0.0 ? %s : (%s * inversesqrt(tmp0.x)));\n", + src_param.param_str, src_param.param_str); } static void shader_glsl_scalar_op(const struct wined3d_shader_instruction *ins)

1 0

Alexandre Julliard : msnet32: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 8997127c11f3a1d12c220773aafa9c4d253f7370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8997127c11f3a1d12c220773… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:07 2019 +0200 msnet32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msnet32/Makefile.in | 2 ++ dlls/msnet32/msnet_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msnet32/Makefile.in b/dlls/msnet32/Makefile.in index 8cbb8c6..4ec8226 100644 --- a/dlls/msnet32/Makefile.in +++ b/dlls/msnet32/Makefile.in @@ -1,3 +1,5 @@ MODULE = msnet32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msnet_main.c diff --git a/dlls/msnet32/msnet_main.c b/dlls/msnet32/msnet_main.c index 1ffef50..8303b8f 100644 --- a/dlls/msnet32/msnet_main.c +++ b/dlls/msnet32/msnet_main.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : mspatcha: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: a8732ce6383b61f1608d9385e45bd0e4c9468f7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8732ce6383b61f1608d9385… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:28 2019 +0200 mspatcha: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/Makefile.in | 2 ++ dlls/mspatcha/lzxd_dec.c | 2 -- dlls/mspatcha/mspatcha_main.c | 2 -- dlls/mspatcha/pa19.c | 8 +++----- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/mspatcha/Makefile.in b/dlls/mspatcha/Makefile.in index 935e645..a380f3f 100644 --- a/dlls/mspatcha/Makefile.in +++ b/dlls/mspatcha/Makefile.in @@ -1,6 +1,8 @@ MODULE = mspatcha.dll IMPORTLIB = mspatcha +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ lzxd_dec.c \ mspatcha_main.c \ diff --git a/dlls/mspatcha/lzxd_dec.c b/dlls/mspatcha/lzxd_dec.c index 0be5553..f21e1ed 100644 --- a/dlls/mspatcha/lzxd_dec.c +++ b/dlls/mspatcha/lzxd_dec.c @@ -21,8 +21,6 @@ * - Implememnt interleaved decoding */ -#include "config.h" - #include <stdarg.h> #include <assert.h> diff --git a/dlls/mspatcha/mspatcha_main.c b/dlls/mspatcha/mspatcha_main.c index 9695a7a..167c3fd 100644 --- a/dlls/mspatcha/mspatcha_main.c +++ b/dlls/mspatcha/mspatcha_main.c @@ -29,8 +29,6 @@ * solution to the above 32-bit exe problem. */ -#include "config.h" - #include <stdarg.h> #include "windef.h" diff --git a/dlls/mspatcha/pa19.c b/dlls/mspatcha/pa19.c index 3a0fd55..633915e 100644 --- a/dlls/mspatcha/pa19.c +++ b/dlls/mspatcha/pa19.c @@ -32,8 +32,6 @@ * but not all, of the positions listed in the PE .reloc table. */ -#include "config.h" - #include <stdarg.h> #include <stdlib.h> @@ -297,7 +295,7 @@ static INT64 read_svli(struct patch_file_header *ph) return n; } -static int compare_ignored_range(const void *a, const void *b) +static int __cdecl compare_ignored_range(const void *a, const void *b) { LONG delta = ((PATCH_IGNORE_RANGE*)a)->OffsetInOldFile - ((PATCH_IGNORE_RANGE*)b)->OffsetInOldFile; if (delta > 0) @@ -307,7 +305,7 @@ static int compare_ignored_range(const void *a, const void *b) return 0; } -static int compare_retained_range_old(const void *a, const void *b) +static int __cdecl compare_retained_range_old(const void *a, const void *b) { LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInOldFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInOldFile; if (delta > 0) @@ -317,7 +315,7 @@ static int compare_retained_range_old(const void *a, const void *b) return 0; } -static int compare_retained_range_new(const void *a, const void *b) +static int __cdecl compare_retained_range_new(const void *a, const void *b) { LONG delta = ((PATCH_RETAIN_RANGE*)a)->OffsetInNewFile - ((PATCH_RETAIN_RANGE*)b)->OffsetInNewFile; if (delta > 0)

1 0

Alexandre Julliard : msports: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 1a74ff30dbe85d69a28988e8cb0007f24f1cafb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a74ff30dbe85d69a28988e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:41 2019 +0200 msports: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msports/Makefile.in | 2 ++ dlls/msports/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msports/Makefile.in b/dlls/msports/Makefile.in index d4e8593..f3795c9 100644 --- a/dlls/msports/Makefile.in +++ b/dlls/msports/Makefile.in @@ -1,4 +1,6 @@ MODULE = msports.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/msports/main.c b/dlls/msports/main.c index fe2c153..0ad2d1d 100644 --- a/dlls/msports/main.c +++ b/dlls/msports/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : msrle32: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: fb3cca30a67a9bff319fbeaa12bb00ea1b127dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb3cca30a67a9bff319fbeaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:45:57 2019 +0200 msrle32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index 6368cd8..fd5c6e3 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -1,6 +1,8 @@ MODULE = msrle32.dll IMPORTS = winmm user32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = msrle32.c RC_SRCS = msrle32.rc

1 0

Alexandre Julliard : msscript.ocx: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: e7ed15a16ad53ade1ec649f3a88fcb1293c7402d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7ed15a16ad53ade1ec649f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:04 2019 +0200 msscript.ocx: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/Makefile.in | 2 ++ dlls/msscript.ocx/msscript.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msscript.ocx/Makefile.in b/dlls/msscript.ocx/Makefile.in index 7d76896..304b924 100644 --- a/dlls/msscript.ocx/Makefile.in +++ b/dlls/msscript.ocx/Makefile.in @@ -3,5 +3,7 @@ RC_SRCS = msscript.rc IDL_SRCS = msscript.idl IMPORTS = gdi32 user32 ole32 oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ msscript.c diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 459c35a..fb3ad08 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -192,7 +192,7 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam struct named_item *item; LIST_FOR_EACH_ENTRY(item, &host->named_items, struct named_item, entry) { - if (!lstrcmpW(item->name, nameW)) + if (!wcscmp(item->name, nameW)) return item; }

1 0

Alexandre Julliard : mssign32: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: b514903cff444c43907387716d12de73cd297f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b514903cff444c4390738771… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:20 2019 +0200 mssign32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssign32/Makefile.in | 2 ++ dlls/mssign32/mssign32_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mssign32/Makefile.in b/dlls/mssign32/Makefile.in index ea66c51..1ca4697 100644 --- a/dlls/mssign32/Makefile.in +++ b/dlls/mssign32/Makefile.in @@ -1,4 +1,6 @@ MODULE = mssign32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mssign32_main.c diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 8b0720e..da7551e 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : mssip32: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 39c9a451738be148d02a63560fcc9d1d2d93e7f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39c9a451738be148d02a6356… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:46:42 2019 +0200 mssip32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mssip32/Makefile.in | 2 ++ dlls/mssip32/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mssip32/Makefile.in b/dlls/mssip32/Makefile.in index 84e01b7..665cbc9 100644 --- a/dlls/mssip32/Makefile.in +++ b/dlls/mssip32/Makefile.in @@ -1,4 +1,6 @@ MODULE = mssip32.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/mssip32/main.c b/dlls/mssip32/main.c index a72c346..abefdd0 100644 --- a/dlls/mssip32/main.c +++ b/dlls/mssip32/main.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : mstask: Build with msvcrt.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: da15e5cb37a4951baf44627750622f950a384532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da15e5cb37a4951baf446277… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 08:47:12 2019 +0200 mstask: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/Makefile.in | 2 ++ dlls/mstask/mstask_private.h | 3 +-- dlls/mstask/task.c | 6 +++--- dlls/mstask/task_scheduler.c | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in index 086d3c0..7febde2 100644 --- a/dlls/mstask/Makefile.in +++ b/dlls/mstask/Makefile.in @@ -1,6 +1,8 @@ MODULE = mstask.dll IMPORTS = rpcrt4 ole32 oleaut32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ factory.c \ mstask_main.c \ diff --git a/dlls/mstask/mstask_private.h b/dlls/mstask/mstask_private.h index dbaf543..aed4c80 100644 --- a/dlls/mstask/mstask_private.h +++ b/dlls/mstask/mstask_private.h @@ -20,7 +20,6 @@ #define __MSTASK_PRIVATE_H__ #include "wine/heap.h" -#include "wine/unicode.h" extern LONG dll_ref DECLSPEC_HIDDEN; @@ -38,7 +37,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *src) WCHAR *dst; unsigned len; if (!src) return NULL; - len = (strlenW(src) + 1) * sizeof(WCHAR); + len = (lstrlenW(src) + 1) * sizeof(WCHAR); if ((dst = heap_alloc(len))) memcpy(dst, src, len); return dst; } diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 6ab9263..a15e016 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1813,10 +1813,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLES TRACE("(%p, %p)\n", iface, file_name); - *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR)); + *file_name = CoTaskMemAlloc((lstrlenW(This->task_name) + 1) * sizeof(WCHAR)); if (!*file_name) return E_OUTOFMEMORY; - strcpyW(*file_name, This->task_name); + lstrcpyW(*file_name, This->task_name); return S_OK; } @@ -1893,7 +1893,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) TRACE("(%s, %p)\n", debugstr_w(name), task); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW); diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index ebf25d0..54ca360 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -423,7 +423,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Delete(ITaskScheduler *iface, LPCWST TRACE("%p, %s\n", iface, debugstr_w(name)); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW); @@ -467,7 +467,7 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, L TRACE("%p, %s, %p\n", iface, debugstr_w(name), item); - if (strchrW(name, '.')) return E_INVALIDARG; + if (wcschr(name, '.')) return E_INVALIDARG; GetWindowsDirectoryW(task_name, MAX_PATH); lstrcatW(task_name, tasksW);

1 0

Alexandre Julliard : jscript: Consistently use wcscmp() instead of lstrcmpW().
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 784b3f611a2bb89072650e264b5346feeb7751d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=784b3f611a2bb89072650e26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 13 14:47:56 2019 +0200 jscript: Consistently use wcscmp() instead of lstrcmpW(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 8 ++++---- dlls/jscript/dispex.c | 4 ++-- dlls/jscript/engine.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7746744..e38e5c5 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -1419,7 +1419,7 @@ static HRESULT compile_continue_statement(compiler_ctx_t *ctx, branch_statement_ for(iter = ctx->stat_ctx; iter; iter = iter->next) { if(iter->continue_label) pop_ctx = iter; - if(iter->labelled_stat && !lstrcmpW(iter->labelled_stat->identifier, stat->identifier)) + if(iter->labelled_stat && !wcscmp(iter->labelled_stat->identifier, stat->identifier)) break; } @@ -1465,7 +1465,7 @@ static HRESULT compile_break_statement(compiler_ctx_t *ctx, branch_statement_t * if(stat->identifier) { for(pop_ctx = ctx->stat_ctx; pop_ctx; pop_ctx = pop_ctx->next) { - if(pop_ctx->labelled_stat && !lstrcmpW(pop_ctx->labelled_stat->identifier, stat->identifier)) { + if(pop_ctx->labelled_stat && !wcscmp(pop_ctx->labelled_stat->identifier, stat->identifier)) { assert(pop_ctx->break_label); break; } @@ -1549,7 +1549,7 @@ static HRESULT compile_labelled_statement(compiler_ctx_t *ctx, labelled_statemen HRESULT hres; for(iter = ctx->stat_ctx; iter; iter = iter->next) { - if(iter->labelled_stat && !lstrcmpW(iter->labelled_stat->identifier, stat->identifier)) { + if(iter->labelled_stat && !wcscmp(iter->labelled_stat->identifier, stat->identifier)) { WARN("Label %s redefined\n", debugstr_w(stat->identifier)); return JS_E_LABEL_REDEFINED; } @@ -1825,7 +1825,7 @@ static HRESULT compile_statement(compiler_ctx_t *ctx, statement_ctx_t *stat_ctx, static int function_local_cmp(const void *key, const struct wine_rb_entry *entry) { function_local_t *local = WINE_RB_ENTRY_VALUE(entry, function_local_t, entry); - return CompareStringOrdinal(key, -1, local->name, -1, FALSE) - 2; + return wcscmp(key, local->name); } static inline function_local_t *find_local(compiler_ctx_t *ctx, const WCHAR *name) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 032facd..b1f2914 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -93,7 +93,7 @@ static const builtin_prop_t *find_builtin_prop(jsdisp_t *This, const WCHAR *name while(min <= max) { i = (min+max)/2; - r = CompareStringOrdinal(name, -1, This->builtin_info->props[i].name, -1, FALSE) - 2; + r = wcscmp(name, This->builtin_info->props[i].name); if(!r) { /* Skip prop if it's available only in higher compatibility mode. */ unsigned version = (This->builtin_info->props[i].flags & PROPF_VERSION_MASK) @@ -203,7 +203,7 @@ static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; while(pos != 0) { - if(!lstrcmpW(name, This->props[pos].name)) { + if(!wcscmp(name, This->props[pos].name)) { if(prev != 0) { This->props[prev].bucket_next = This->props[pos].bucket_next; This->props[pos].bucket_next = This->props[bucket].bucket_head; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 7d3eb13..0a68a51 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -612,9 +612,9 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -static int local_ref_cmp(const void *key, const void *ref) +static int __cdecl local_ref_cmp(const void *key, const void *ref) { - return CompareStringOrdinal((const WCHAR*)key, -1, ((const local_ref_t*)ref)->name, -1, FALSE) - 2; + return wcscmp((const WCHAR*)key, ((const local_ref_t*)ref)->name); } local_ref_t *lookup_local(const function_code_t *function, const WCHAR *identifier) @@ -646,7 +646,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } - if(!lstrcmpW(identifier, argumentsW)) { + if(!wcscmp(identifier, argumentsW)) { hres = detach_variable_object(ctx, scope->frame, FALSE); if(FAILED(hres)) return hres; @@ -670,7 +670,7 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } for(item = ctx->named_items; item; item = item->next) { - if((item->flags & SCRIPTITEM_ISVISIBLE) && !lstrcmpW(item->name, identifier)) { + if((item->flags & SCRIPTITEM_ISVISIBLE) && !wcscmp(item->name, identifier)) { if(!item->disp) { IUnknown *unk;

1 0