January 2021 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the "UseGLSL" setting.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 92dacb1d68fd1ebb702280700bf0c0e517c7a77c URL: https://source.winehq.org/git/wine.git/?a=commit;h=92dacb1d68fd1ebb70228070… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:54 2021 +0100 wined3d: Get rid of the "UseGLSL" setting. This was deprecated in Wine 5.0, use the "shader_backend" setting instead. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_main.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 7118d4b4b71..5ad390d9f56 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -294,10 +294,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE; } } - else if (!get_config_key(hkey, appkey, "UseGLSL", buffer, size) && !strcmp(buffer, "disabled")) - { - wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; - } if (wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_ARB || wined3d_settings.shader_backend == WINED3D_SHADER_BACKEND_NONE) {

1 0

Henri Verbeet : wined3d: Add some barriers between resource usage on different bind points.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 82a9e8006321f5957963c4accc2f08887f724dd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82a9e8006321f5957963c4ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:57 2021 +0100 wined3d: Add some barriers between resource usage on different bind points. A typical case would be between using a texture as render target and using it as a shader resource. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/context_vk.c | 34 ++++++++++++++++++++++++++-------- dlls/wined3d/resource.c | 24 +++++++++++++++++++++++- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/texture.c | 37 ++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 34 ++++++++++++++++++++++++++++++++++ 6 files changed, 137 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82a9e8006321f5957963…

1 0

Henri Verbeet : wined3d: Implement the "precise" flag in the GLSL shader backend.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 7a54209d4bb5df18ac8fcdf26d8aa73e770403c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a54209d4bb5df18ac8fcdf2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:53 2021 +0100 wined3d: Implement the "precise" flag in the GLSL shader backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1fea6f92be0..6ce9178c561 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2540,6 +2540,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c /* Temporary variables for matrix operations */ shader_addline(buffer, "vec4 tmp0;\n"); shader_addline(buffer, "vec4 tmp1;\n"); + if (gl_info->supported[ARB_GPU_SHADER5]) + shader_addline(buffer, "precise vec4 tmp_precise;\n"); + else + shader_addline(buffer, "/* precise */ vec4 tmp_precise;\n"); if (!shader->load_local_constsF) { @@ -3273,6 +3277,9 @@ static DWORD shader_glsl_append_dst_ext(struct wined3d_string_buffer *buffer, if ((mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst))) { + if (ins->flags & WINED3DSI_PRECISE_XYZW) + sprintf(glsl_dst.reg_name, "tmp_precise"); + switch (data_type) { case WINED3D_DATA_FLOAT: @@ -3316,6 +3323,13 @@ static void shader_glsl_add_instruction_modifiers(const struct wined3d_shader_in if (!ins->dst_count) return; + if (ins->flags & WINED3DSI_PRECISE_XYZW) + { + shader_glsl_add_dst_param(ins, &ins->dst[0], &dst_param); + shader_addline(ins->ctx->buffer, "%s%s = tmp_precise%s;\n", + dst_param.reg_name, dst_param.mask_str, dst_param.mask_str); + } + modifiers = ins->dst[0].modifiers; if (!modifiers) return;

1 0

Henri Verbeet : ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 4ce1d7f93a35322d149cbde29d619e2580159a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ce1d7f93a35322d149cbde2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 19 14:34:55 2021 +0100 ddraw: Use BitBlt() for exclusive mode frontbuffer updates if the swapchain window is not in the foreground. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index fd788a96ac0..0ca19d4f8a5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -39,6 +39,16 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) && (surface->ddraw->device_state != DDRAW_DEVICE_STATE_OK || surface->is_lost); } +static BOOL ddraw_gdi_is_front(struct ddraw *ddraw) +{ + struct ddraw_surface *surface; + + if (!ddraw->gdi_surface || !(surface = wined3d_texture_get_sub_resource_parent(ddraw->gdi_surface, 0))) + return FALSE; + + return surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER; +} + /* This is slow, of course. Also, in case of locks, we can't prevent other * applications from drawing to the screen while we've locked the frontbuffer. * We'd like to do this in wined3d instead, but for that to work wined3d needs @@ -46,6 +56,7 @@ static BOOL ddraw_surface_is_lost(const struct ddraw_surface *surface) HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read, unsigned int swap_interval) { + struct ddraw *ddraw = surface->ddraw; struct wined3d_texture *dst_texture; HDC surface_dc, screen_dc; int x, y, w, h; @@ -53,9 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; - if (surface->ddraw->flags & DDRAW_SWAPPED && !read) + if (ddraw->flags & DDRAW_SWAPPED && !read) { - surface->ddraw->flags &= ~DDRAW_SWAPPED; + ddraw->flags &= ~DDRAW_SWAPPED; rect = NULL; } @@ -73,7 +84,23 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; - if (surface->ddraw->swapchain_window) + /* The interaction between ddraw and GDI drawing is not all that well + * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws + * seemingly go to the *original* frontbuffer/primary surface, while ddraw + * draws/flips go to the *current* frontbuffer surface. The bottom line is + * that if the current frontbuffer is not the GDI frontbuffer, and there's + * e.g. a popup window in front of the ddraw swapchain window, we can't + * use wined3d_swapchain_present() to get the ddraw contents to the screen + * while in exclusive mode, since it would get obscured by the popup + * window. On the other hand, if the current frontbuffer *is* the GDI + * frontbuffer, that's what's supposed to happen; the popup should obscure + * (oart of) the ddraw swapchain window. + * + * This affects the "Deer Hunter" demo, which uses a popup window and GDI + * draws to draw part of the user interface. See also the "fswindow" + * sample is the DirectX 7 SDK. */ + if (ddraw->swapchain_window && (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) + || ddraw->swapchain_window == GetForegroundWindow() || ddraw_gdi_is_front(ddraw))) { /* Nothing to do, we control the frontbuffer, or at least the parts we * care about. */ @@ -81,15 +108,15 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, return DD_OK; if (swap_interval) - dst_texture = wined3d_swapchain_get_back_buffer(surface->ddraw->wined3d_swapchain, 0); + dst_texture = wined3d_swapchain_get_back_buffer(ddraw->wined3d_swapchain, 0); else - dst_texture = surface->ddraw->wined3d_frontbuffer; + dst_texture = ddraw->wined3d_frontbuffer; if (SUCCEEDED(hr = wined3d_texture_blt(dst_texture, 0, rect, surface->wined3d_texture, surface->sub_resource_idx, rect, 0, NULL, WINED3D_TEXF_POINT)) && swap_interval) { - hr = wined3d_swapchain_present(surface->ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); - surface->ddraw->flags |= DDRAW_SWAPPED; + hr = wined3d_swapchain_present(ddraw->wined3d_swapchain, rect, rect, NULL, swap_interval, 0); + ddraw->flags |= DDRAW_SWAPPED; } return hr; }

1 0

Hans Leidekker : wldap32: Properly initialize the context in ldap_sslinitW.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: be34e08a875431df144d2cebd02fcb01987f9bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be34e08a875431df144d2ceb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 15:55:31 2021 +0100 wldap32: Properly initialize the context in ldap_sslinitW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index afaef3b52f2..0072ede6772 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -567,9 +567,9 @@ WLDAP32_LDAP * CDECL ldap_sslinitW( PWCHAR hostname, ULONG portnumber, int secur url = urlify_hostnames( "ldaps://", hostnameU, portnumber ); else url = urlify_hostnames( "ldap://", hostnameU, portnumber ); - if (!url) goto exit; - ldap_initialize( &ld->ld, url ); + + ld = create_context( url ); exit: strfreeU( hostnameU );

1 0

Hans Leidekker : winhttp: Avoid a crash when the connection is closed while handling a redirect.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 83afd177b3735f88e38f926aaf3aa0a20178e458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83afd177b3735f88e38f926a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 19 16:52:08 2021 +0100 winhttp: Avoid a crash when the connection is closed while handling a redirect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48870 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 31296cd02ba..2ff211255ee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2739,7 +2739,7 @@ static DWORD receive_response( struct request *request, BOOL async ) break; } - netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); + if (request->netconn) netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); if (request->content_length) ret = refill_buffer( request, FALSE ); if (async)

1 0

Zebediah Figura : include: Move InterlockedCompareExchange128 next to the other InterlockedCompareExchange* functions.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 04a9c9eba77f56d61d615f1147590c67b466bdf8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a9c9eba77f56d61d615f11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jan 19 11:29:23 2021 -0600 include: Move InterlockedCompareExchange128 next to the other InterlockedCompareExchange* functions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 62 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 7bbe0185139..e48c884cd4c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6898,6 +6898,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) +#ifdef _WIN64 +#pragma intrinsic(_InterlockedCompareExchange128) +#endif #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) @@ -6905,6 +6908,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); +#ifdef _WIN64 +unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +#endif long _InterlockedDecrement(long volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); @@ -6920,6 +6926,13 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { return _InterlockedExchange( (long volatile *)dest, val ); @@ -6982,6 +6995,23 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } +#ifdef _WIN64 +static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ +#ifdef __x86_64__ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +#else + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +#endif +} +#endif + static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; @@ -7024,38 +7054,6 @@ static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *des #endif /* __GNUC__ */ -#ifdef _WIN64 - -#if defined(_MSC_VER) - -#define InterlockedCompareExchange128 _InterlockedCompareExchange128 -unsigned char _InterlockedCompareExchange128(volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare); -#pragma intrinsic(_InterlockedCompareExchange128) - -#elif defined(__x86_64__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - unsigned char ret; - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); - return ret; -} - -#elif defined(__GNUC__) - -static inline unsigned char InterlockedCompareExchange128(__int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare) -{ - return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); -} - -#endif - -#endif /* _WIN64 */ - #ifdef __cplusplus } #endif

1 0

Alistair Leslie-Hughes : include: Add more sal.h macros.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: c8ad4650b8995b82f474a09f0b90c1aa8f79e249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8ad4650b8995b82f474a09f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Jan 17 18:23:46 2021 +1100 include: Add more sal.h macros. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sal.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/sal.h b/include/sal.h index ca8b824f1bf..5e51719d35b 100644 --- a/include/sal.h +++ b/include/sal.h @@ -19,10 +19,15 @@ #ifndef __WINE_SAL_H__ #define __WINE_SAL_H__ +/* These belong in driverspecs.h */ +#define __drv_allocatesMem(ptr) +#define __drv_freesMem(ptr) #define _Always_(exp) -#define _At_ +#define _Analysis_noreturn_ + +#define _At_(a, b) #define _At_buffer_(a, b, c, d) #define _Check_return_ @@ -31,10 +36,12 @@ #define _COM_Outptr_ #define _COM_Outptr_result_maybenull_ +#define _Deref_in_range_(cnt) #define _Deref_out_ #define _Deref_out_z_ #define _Deref_out_opt_ #define _Deref_out_opt_z_ +#define _Deref_out_range_(x, y) #define _Deref_post_maybenull_ #define _Deref_post_opt_cap_(count) #define _Deref_post_opt_valid_ @@ -48,6 +55,8 @@ #define _Field_range_(min, max) +#define _Frees_ptr_opt_ + #define __in #define __in_opt #define _In_ @@ -106,6 +115,9 @@ #define _Inout_z_cap_(count) #define _Inout_z_cap_c_(count) +#define _Must_inspect_result_ + +#define _Null_ #define _Null_terminated_ #define __out @@ -168,7 +180,11 @@ #define _Out_z_cap_post_count_(count1, count2) #define _Outptr_opt_ +#define _Outptr_opt_result_buffer_(count) +#define _Outptr_opt_result_maybenull_ +#define _Outptr_opt_result_z_ #define _Outptr_result_buffer_(count) +#define _Outptr_result_buffer_all_maybenull_(ptr) #define _Outptr_result_buffer_maybenull_(count) #define _Outptr_result_maybenull_ #define _Outptr_result_maybenull_z_

1 0

Daniel Lehman : ntdll/tests: Fix error messages for mutant test.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 37e00a8743053808a852fb314f726b6e19bd0c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e00a8743053808a852fb31… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jan 19 07:47:16 2021 -0800 ntdll/tests: Fix error messages for mutant test. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 1bc94f984b5..ff0b9c939e4 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1984,13 +1984,13 @@ static void test_mutant(void) prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - ok( prev == -1, "NtQueryRelease failed, expected -1, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == -1, "NtReleaseMutant failed, expected -1, got %d\n", prev ); prev = 0xdeadbeef; status = pNtReleaseMutant(mutant, &prev); - ok( status == STATUS_SUCCESS, "NtQueryRelease failed %08x\n", status ); - ok( prev == 0, "NtQueryRelease failed, expected 0, got %d\n", prev ); + ok( status == STATUS_SUCCESS, "NtReleaseMutant failed %08x\n", status ); + ok( prev == 0, "NtReleaseMutant failed, expected 0, got %d\n", prev ); memset(&info, 0xcc, sizeof(info)); status = pNtQueryMutant(mutant, MutantBasicInformation, &info, sizeof(info), NULL);

1 0

Jacek Caban : jscript: Support VARIANT type in jsval_strict_equal.
by Alexandre Julliard Jan. 19, 2021

Jan. 19, 2021

Module: wine Branch: master Commit: 7e4f254bbde8b7604375999ccd9aae5483139fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e4f254bbde8b7604375999c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 19 14:34:03 2021 +0100 jscript: Support VARIANT type in jsval_strict_equal. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 5 +++-- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5635e3aa996..0fdcb13f142 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -522,8 +522,9 @@ HRESULT jsval_strict_equal(jsval_t lval, jsval_t rval, BOOL *ret) *ret = !get_bool(lval) == !get_bool(rval); break; case JSV_VARIANT: - FIXME("VARIANT not implemented\n"); - return E_NOTIMPL; + WARN("VARIANT type, returning false\n"); + *ret = FALSE; + return S_OK; } return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 7bcb121131e..6b3640bfa0b 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -201,6 +201,7 @@ ok(tmp === 3, "tmp = " + tmp); ok(getVT(d / d) === "VT_I4", "vt v_date(0) / v_date(0) = " + getVT(d / d)); ok((+d) === e, "+v_date(0) = " + (+d) + " expected " + e); ok(("" + d).match(/^Sat Dec 30 00:00:00 .* 1899$/) != null, "+v_date(0) = " + d); + ok(d != d, "date d == d"); d = v_date(2.5); e = Date.parse("Mon Jan 1 12:00:00 1900"); @@ -211,6 +212,7 @@ ok(tmp === 3, "tmp = " + tmp); e = Date.parse("Sat Mar 28 00:00:00 2015"); ok((+d) === e, "+v_date(2015y) = " + (+d) + " expected " + e); ok(("" + d).match(/^Sat Mar 28 00:00:00 .* 2015$/) != null, "+v_date(2015y) = " + d); + ok(d != d, "date d == d"); })(); function testRecFunc(x) {

1 0