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

Zebediah Figura : ntoskrnl.exe: Implement IoGetRequestorProcess().
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: ca1c1534223ea58b5a0f16d5ee4fcabfcd4e6946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca1c1534223ea58b5a0f16d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:16:54 2019 -0500 ntoskrnl.exe: Implement IoGetRequestorProcess(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47623 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 2 ++ include/ddk/ntifs.h | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index a3dd7b9..18b17f8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3911,3 +3911,12 @@ ULONG WINAPI ExSetTimerResolution(ULONG time, BOOLEAN set_resolution) FIXME("stub: %u %d\n", time, set_resolution); return KeQueryTimeIncrement(); } + +/*********************************************************************** + * IoGetRequestorProcess (NTOSKRNL.EXE.@) + */ +PEPROCESS WINAPI IoGetRequestorProcess(IRP *irp) +{ + TRACE("irp %p.\n", irp); + return irp->Tail.Overlay.Thread->kthread.process; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 88c1a06..ddc3f72 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -406,7 +406,7 @@ @ stub IoGetInitialStack @ stub IoGetLowerDeviceObject @ stdcall IoGetRelatedDeviceObject(ptr) -@ stub IoGetRequestorProcess +@ stdcall IoGetRequestorProcess(ptr) @ stub IoGetRequestorProcessId @ stub IoGetRequestorSessionId @ stdcall IoGetStackLimits(ptr ptr) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 6ab3c62..0506011 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -225,6 +225,8 @@ static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) ok(!irp->UserEvent, "UserEvent = %p\n", irp->UserEvent); ok(irp->Tail.Overlay.Thread == (PETHREAD)KeGetCurrentThread(), "IRP thread is not the current thread\n"); + + ok(IoGetRequestorProcess(irp) == IoGetCurrentProcess(), "processes didn't match\n"); } static void test_mdl_map(void) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index b287b06..39636e8 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); DEVICE_OBJECT * WINAPI IoGetAttachedDevice(DEVICE_OBJECT*); +PEPROCESS WINAPI IoGetRequestorProcess(IRP*); NTSTATUS WINAPI ObOpenObjectByPointer(void*,ULONG,PACCESS_STATE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,HANDLE*); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); BOOLEAN WINAPI PsIsSystemThread(PETHREAD);

1 0

Alexandre Julliard : d2d1: Make qsort() callback functions cdecl.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 3feed5a23f51e5f1506b33ff6d845da44ead91e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3feed5a23f51e5f1506b33ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:56:00 2019 +0200 d2d1: Make qsort() callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/geometry.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index 91ce32c..23049d0 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -1272,7 +1272,7 @@ static BOOL d2d_cdt_triangulate(struct d2d_cdt *cdt, size_t start_vertex, size_t return TRUE; } -static int d2d_cdt_compare_vertices(const void *a, const void *b) +static int __cdecl d2d_cdt_compare_vertices(const void *a, const void *b) { const D2D1_POINT_2F *p0 = a; const D2D1_POINT_2F *p1 = b; @@ -1623,7 +1623,7 @@ static BOOL d2d_geometry_intersections_add(struct d2d_geometry_intersections *i, return TRUE; } -static int d2d_geometry_intersections_compare(const void *a, const void *b) +static int __cdecl d2d_geometry_intersections_compare(const void *a, const void *b) { const struct d2d_geometry_intersection *i0 = a; const struct d2d_geometry_intersection *i1 = b;

1 0

Alexandre Julliard : d3dx9: Make qsort() callback functions cdecl.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 08b569d50599328df1531f20cceb5331bf718524 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08b569d50599328df1531f20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:56:27 2019 +0200 d3dx9: Make qsort() callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/mesh.c | 6 +++--- dlls/d3dx9_36/preshader.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 355cdbd..5e0bb98 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1207,7 +1207,7 @@ struct vertex_metadata { DWORD first_shared_index; }; -static int compare_vertex_keys(const void *a, const void *b) +static int __cdecl compare_vertex_keys(const void *a, const void *b) { const struct vertex_metadata *left = a; const struct vertex_metadata *right = b; @@ -1585,7 +1585,7 @@ static void fill_attribute_table(DWORD *attrib_buffer, DWORD numfaces, void *ind attrib_table_size++; } -static int attrib_entry_compare(const void *a, const void *b) +static int __cdecl attrib_entry_compare(const void *a, const void *b) { const DWORD *ptr_a = *(const DWORD **)a; const DWORD *ptr_b = *(const DWORD **)b; @@ -5840,7 +5840,7 @@ static D3DXVECTOR2 *triangulation_get_next_point(struct triangulation *t, struct return &outline->items[i].pos; } -static int compare_vertex_indices(const void *a, const void *b) +static int __cdecl compare_vertex_indices(const void *a, const void *b) { const struct point2d_index *idx1 = a, *idx2 = b; const D3DXVECTOR2 *p1 = &idx1->outline->items[idx1->vertex].pos; diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 4680b4e..9852b9b 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -640,7 +640,7 @@ static void append_pres_const_sets_for_shader_input(struct d3dx_const_tab *const } } -static int compare_const_set(const void *a, const void *b) +static int __cdecl compare_const_set(const void *a, const void *b) { const struct d3dx_const_param_eval_output *r1 = a; const struct d3dx_const_param_eval_output *r2 = b;

1 0

Alexandre Julliard : dsound: Make a qsort() callback function cdecl.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 4c018c32ce41af31f3d0b9ebb47ea3c296d36efb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c018c32ce41af31f3d0b9eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:56:46 2019 +0200 dsound: Make a qsort() callback function cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2a328ed..dacd639 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -81,7 +81,7 @@ static ULONG WINAPI IDirectSoundNotifyImpl_Release(IDirectSoundNotify *iface) return ref; } -static int notify_compar(const void *l, const void *r) +static int __cdecl notify_compar(const void *l, const void *r) { const DSBPOSITIONNOTIFY *left = l; const DSBPOSITIONNOTIFY *right = r;

1 0

Alexandre Julliard : inetmib1: Make bsearch() callback functions cdecl.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: ea6eea0bba9119b1361d0e5bf87c6f443ad587d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6eea0bba9119b1361d0e5b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:58:00 2019 +0200 inetmib1: Make bsearch() callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetmib1/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 96e3b1f..6345573 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -318,7 +318,7 @@ static DWORD oidToIpAddr(AsnObjectIdentifier *oid) } typedef void (*oidToKeyFunc)(AsnObjectIdentifier *oid, void *dst); -typedef int (*compareFunc)(const void *key, const void *value); +typedef int (__cdecl *compareFunc)(const void *key, const void *value); /* Finds the first value in the table that matches key. Returns its 1-based * index if found, or 0 if not found. @@ -769,7 +769,7 @@ static void oidToIpAddrRow(AsnObjectIdentifier *oid, void *dst) row->dwAddr = oidToIpAddr(oid); } -static int compareIpAddrRow(const void *a, const void *b) +static int __cdecl compareIpAddrRow(const void *a, const void *b) { const MIB_IPADDRROW *key = a, *value = b; @@ -862,7 +862,7 @@ static void oidToIpForwardRow(AsnObjectIdentifier *oid, void *dst) row->dwForwardDest = oidToIpAddr(oid); } -static int compareIpForwardRow(const void *a, const void *b) +static int __cdecl compareIpForwardRow(const void *a, const void *b) { const MIB_IPFORWARDROW *key = a, *value = b; @@ -1220,7 +1220,7 @@ static void oidToUdpRow(AsnObjectIdentifier *oid, void *dst) row->dwLocalPort = oid->ids[4]; } -static int compareUdpRow(const void *a, const void *b) +static int __cdecl compareUdpRow(const void *a, const void *b) { const MIB_UDPROW *key = a, *value = b; int ret;

1 0

Alexandre Julliard : mfplat: Make bsearch() callback functions cdecl.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 631f9b8d5fe375ba7e9bab638a7e8b00c43c28a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=631f9b8d5fe375ba7e9bab63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 09:58:35 2019 +0200 mfplat: Make bsearch() callback functions cdecl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 ++-- dlls/mfplat/mediatype.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e946bc7..f8f4b50 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -606,7 +606,7 @@ struct guid_def const char *name; }; -static int debug_compare_guid(const void *a, const void *b) +static int __cdecl debug_compare_guid(const void *a, const void *b) { const GUID *guid = a; const struct guid_def *guid_def = b; @@ -946,7 +946,7 @@ struct event_id const char *name; }; -static int debug_event_id(const void *a, const void *b) +static int __cdecl debug_event_id(const void *a, const void *b) { const DWORD *id = a; const struct event_id *event_id = b; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index e23ebd1..aace04f 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1735,7 +1735,7 @@ struct uncompressed_video_format unsigned int bytes_per_pixel; }; -static int uncompressed_video_format_compare(const void *a, const void *b) +static int __cdecl uncompressed_video_format_compare(const void *a, const void *b) { const GUID *guid = a; const struct uncompressed_video_format *format = b;

1 0

Alexandre Julliard : ntdll: Run signal handlers on the signal stack on ARM64.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 59f1c98e2c524af0757c823cde64aba4fd1da5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f1c98e2c524af0757c823c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 22 10:04:32 2019 +0200 ntdll: Run signal handlers on the signal stack on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 5966259..d9a43e1 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -107,7 +107,7 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) #endif /* linux */ static const size_t teb_size = 0x2000; /* we reserve two pages for the TEB */ -static size_t signal_stack_size; +static const size_t signal_stack_size = max( MINSIGSTKSZ, 8192 ); typedef void (WINAPI *raise_func)( EXCEPTION_RECORD *rec, CONTEXT *context ); typedef int (*wine_signal_handler)(unsigned int sig); @@ -872,24 +872,13 @@ int CDECL __wine_set_signal_handler(unsigned int sig, wine_signal_handler wsh) */ NTSTATUS signal_alloc_thread( TEB **teb ) { - static size_t sigstack_alignment; SIZE_T size; NTSTATUS status; - if (!sigstack_alignment) - { - size_t min_size = teb_size + max( MINSIGSTKSZ, 8192 ); - /* find the first power of two not smaller than min_size */ - sigstack_alignment = 12; - while ((1u << sigstack_alignment) < min_size) sigstack_alignment++; - signal_stack_size = (1 << sigstack_alignment) - teb_size; - assert( sizeof(TEB) <= teb_size ); - } - - size = 1 << sigstack_alignment; + size = teb_size + max( MINSIGSTKSZ, 8192 ); *teb = NULL; if (!(status = virtual_alloc_aligned( (void **)teb, 0, &size, MEM_COMMIT | MEM_TOP_DOWN, - PAGE_READWRITE, sigstack_alignment ))) + PAGE_READWRITE, 13 ))) { (*teb)->Tib.Self = &(*teb)->Tib; (*teb)->Tib.ExceptionList = (void *)~0UL; @@ -915,6 +904,7 @@ void signal_free_thread( TEB *teb ) void signal_init_thread( TEB *teb ) { static BOOL init_done; + stack_t ss; if (!init_done) { @@ -922,6 +912,11 @@ void signal_init_thread( TEB *teb ) init_done = TRUE; } + ss.ss_sp = (char *)teb + teb_size; + ss.ss_size = signal_stack_size; + ss.ss_flags = 0; + if (sigaltstack( &ss, NULL ) == -1) perror( "sigaltstack" ); + /* Win64/ARM applications expect the TEB pointer to be in the x18 platform register. */ __asm__ __volatile__( "mov x18, %0" : : "r" (teb) ); @@ -937,7 +932,7 @@ void signal_init_process(void) struct sigaction sig_act; sig_act.sa_mask = server_block_set; - sig_act.sa_flags = SA_RESTART | SA_SIGINFO; + sig_act.sa_flags = SA_RESTART | SA_SIGINFO | SA_ONSTACK; sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error;

1 0

Jacek Caban : vbscript/tests: Fix tests on some Vista versions.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: 139b0ef3fd4147b82a2f86762ebd5f446bb08f21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=139b0ef3fd4147b82a2f8676… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:25 2019 +0200 vbscript/tests: Fix tests on some Vista versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/api.vbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 93cf7f8..0548c7b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1480,8 +1480,8 @@ sub testAscError() call Asc() Call ok(Err.number = 450, "Err.number = " & Err.number) call Err.clear() - call Asc(Chr(260)) - Call ok(Err.number = 5, "Err.number = " & Err.number) + call Asc(Chr(260)) ' some versions of vista allow it + Call ok(Err.number = 5 or Err.number = 0, "asc4 Err.number = " & Err.number) call Err.clear() call Asc("") Call ok(Err.number = 5, "Err.number = " & Err.number)

1 0

Jacek Caban : vbscript: Support arrays in VarType.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: a390b7e8702d79df3d4a4aecfb2e0a8ddade3d0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a390b7e8702d79df3d4a4aec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:35 2019 +0200 vbscript: Support arrays in VarType. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 7 +++++-- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 0797403..9b2ce3d 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -627,16 +627,19 @@ static HRESULT Global_Oct(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA static HRESULT Global_VarType(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { + VARTYPE vt; + TRACE("(%s)\n", debugstr_variant(arg)); assert(args_cnt == 1); - if(V_VT(arg) & ~VT_TYPEMASK) { + vt = V_VT(arg) & ~VT_BYREF; + if(vt & ~(VT_TYPEMASK | VT_ARRAY)) { FIXME("not supported %s\n", debugstr_variant(arg)); return E_NOTIMPL; } - return return_short(res, V_VT(arg)); + return return_short(res, vt); } static HRESULT Global_IsDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0548c7b..6cc4984 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1096,6 +1096,9 @@ Call ok(VarType(Null) = vbNull, "VarType(Null) = " & VarType(Null)) Call ok(getVT(VarType(Null)) = "VT_I2", "getVT(VarType(Null)) = " & getVT(VarType(Null))) Call ok(VarType(255) = vbInteger, "VarType(255) = " & VarType(255)) Call ok(getVT(VarType(255)) = "VT_I2", "getVT(VarType(255)) = " & getVT(VarType(255))) +set x = new EmptyClass +Call ok(VarType(x) = vbObject, "VarType(x) = " & VarType(x)) +Call ok(getVT(VarType(x)) = "VT_I2", "getVT(VarType(x)) = " & getVT(VarType(x))) Call ok(VarType(32768) = vbLong, "VarType(32768) = " & VarType(32768)) Call ok(getVT(VarType(32768)) = "VT_I2", "getVT(VarType(32768)) = " & getVT(VarType(32768))) Call ok(VarType(CSng(0.5)) = vbSingle, "VarType(CSng(0.5)) = " & VarType(CSng(0.5))) @@ -1110,6 +1113,8 @@ Call ok(VarType(CBool(0.5)) = vbBoolean, "VarType(CBool(0.5)) = " & VarType(CBoo Call ok(getVT(VarType(CBool(0.5))) = "VT_I2", "getVT(VarType(CBool(0.5))) = " & getVT(VarType(CBool(0.5)))) Call ok(VarType(CByte(255)) = vbByte, "VarType(CByte(255)) = " & VarType(CByte(255))) Call ok(getVT(VarType(CByte(255))) = "VT_I2", "getVT(VarType(CByte(255))) = " & getVT(VarType(CByte(255)))) +Call ok(VarType(arr) = (vbArray or vbVariant), "VarType(arr) = " & VarType(arr)) +Call ok(getVT(VarType(arr)) = "VT_I2", "getVT(VarType(arr)) = " & getVT(VarType(arr))) Call ok(Sgn(Empty) = 0, "Sgn(MyEmpty) = " & Sgn(Empty)) Call ok(getVT(Sgn(Empty)) = "VT_I2", "getVT(Sgn(MyEmpty)) = " & getVT(Sgn(Empty)))

1 0

Jacek Caban : vbscript: Handle long/short distinction in interpreter.
by Alexandre Julliard 22 Aug '19

22 Aug '19

Module: wine Branch: master Commit: d01d6294204f619f6794fe42f04d3bcd98ba9001 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d01d6294204f619f6794fe42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:41 2019 +0200 vbscript: Handle long/short distinction in interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 4 +--- dlls/vbscript/interp.c | 21 +++++++-------------- dlls/vbscript/lex.c | 7 +++---- dlls/vbscript/parse.h | 1 - dlls/vbscript/parser.y | 8 +++----- dlls/vbscript/vbscript.h | 1 - 6 files changed, 14 insertions(+), 28 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 3bd75c1..6fe01ab 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -536,8 +536,6 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); - case EXPR_USHORT: - return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); case EXPR_XOR: @@ -781,7 +779,7 @@ static HRESULT compile_forto_statement(compile_ctx_t *ctx, forto_statement_t *st if(!push_instr(ctx, OP_val)) return E_OUTOFMEMORY; }else { - hres = push_instr_int(ctx, OP_short, 1); + hres = push_instr_int(ctx, OP_long, 1); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 03cecd5..d9bf79a 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1322,20 +1322,13 @@ static HRESULT interp_long(exec_ctx_t *ctx) TRACE("%d\n", arg); - V_VT(&v) = VT_I4; - V_I4(&v) = arg; - return stack_push(ctx, &v); -} - -static HRESULT interp_short(exec_ctx_t *ctx) -{ - const LONG arg = ctx->instr->arg1.lng; - VARIANT v; - - TRACE("%d\n", arg); - - V_VT(&v) = VT_I2; - V_I2(&v) = arg; + if(arg == (INT16)arg) { + V_VT(&v) = VT_I2; + V_I2(&v) = arg; + }else { + V_VT(&v) = VT_I4; + V_I4(&v) = arg; + } return stack_push(ctx, &v); } diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index db00069..5c7ed25 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -334,9 +334,8 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) } if(use_int && (LONG)d == d) { - LONG l = d; - *(LONG*)ret = l; - return (short)l == l ? tShort : tLong; + *(LONG*)ret = d; + return tLong; } r = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); @@ -377,7 +376,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) ctx->ptr++; *ret = l; - return (short)l == l ? tShort : tLong; + return tLong; } static void skip_spaces(parser_ctx_t *ctx) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index f0479b5..39ebf3b 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -50,7 +50,6 @@ typedef enum { EXPR_STRING, EXPR_SUB, EXPR_ULONG, - EXPR_USHORT, EXPR_XOR } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 9b54517..8add9c9 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -119,7 +119,7 @@ static statement_t *link_statements(statement_t*,statement_t*); %token <string> tNEXT tON tRESUME tGOTO %token <string> tIdentifier tString %token <string> tDEFAULT tERROR tEXPLICIT tPROPERTY tSTEP -%token <lng> tLong tShort +%token <lng> tLong %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt @@ -381,14 +381,12 @@ LiteralExpression | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } NumericLiteralExpression - : tShort { $$ = new_long_expression(ctx, EXPR_USHORT, $1); CHECK_ERROR; } - | '0' { $$ = new_long_expression(ctx, EXPR_USHORT, 0); CHECK_ERROR; } + : '0' { $$ = new_long_expression(ctx, EXPR_ULONG, 0); CHECK_ERROR; } | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } IntegerValue - : tShort { $$ = $1; } - | '0' { $$ = 0; } + : '0' { $$ = 0; } | tLong { $$ = $1; } PrimaryExpression diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 1d9c52e..0d8b0ed 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -272,7 +272,6 @@ typedef enum { X(ret, 0, 0, 0) \ X(set_ident, 1, ARG_BSTR, ARG_UINT) \ X(set_member, 1, ARG_BSTR, ARG_UINT) \ - X(short, 1, ARG_INT, 0) \ X(step, 0, ARG_ADDR, ARG_BSTR) \ X(stop, 1, 0, 0) \ X(string, 1, ARG_STR, 0) \

1 0