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

André Hentschel : kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64.
by Alexandre Julliard Aug. 23, 2019

Aug. 23, 2019

Module: wine Branch: stable Commit: b692b9def175b812a466429daec737a9453ae98c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b692b9def175b812a466429d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 6 14:36:03 2019 +0200 kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 63352b5cce74eff0b7e9e5ed8e10f49bb126d755) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index ae7bc88..41fdc1a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1292,7 +1292,7 @@ @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader

1 0

Zebediah Figura : http.sys: Create a stub request queue device.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: d3658f262e950222938907713c1b8d295d7ff615 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3658f262e95022293890771… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:12 2019 -0500 http.sys: Create a stub request queue device. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index ed19c00..aca2940 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -23,14 +23,61 @@ #include "ntstatus.h" #define WIN32_NO_STATUS #include "winternl.h" +#include "winioctl.h" #include "ddk/wdm.h" #include "wine/debug.h" +static HANDLE directory_obj; +static DEVICE_OBJECT *device_obj; + WINE_DEFAULT_DEBUG_CHANNEL(http); +static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) +{ + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) +{ + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +static void WINAPI unload(DRIVER_OBJECT *driver) +{ + IoDeleteDevice(device_obj); + NtClose(directory_obj); +} + NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) { + static const WCHAR device_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p','\\','R','e','q','Q','u','e','u','e',0}; + static const WCHAR directory_nameW[] = {'\\','D','e','v','i','c','e','\\','H','t','t','p',0}; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + NTSTATUS ret; + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + RtlInitUnicodeString(&string, directory_nameW); + attr.ObjectName = &string; + if ((ret = NtCreateDirectoryObject(&directory_obj, 0, &attr)) && ret != STATUS_OBJECT_NAME_COLLISION) + ERR("Failed to create \\Device\\Http directory, status %#x.\n", ret); + + RtlInitUnicodeString(&string, device_nameW); + if ((ret = IoCreateDevice(driver, 0, &string, FILE_DEVICE_UNKNOWN, 0, FALSE, &device_obj))) + { + ERR("Failed to create request queue device, status %#x.\n", ret); + NtClose(directory_obj); + return ret; + } + + driver->MajorFunction[IRP_MJ_CREATE] = dispatch_create; + driver->MajorFunction[IRP_MJ_CLOSE] = dispatch_close; + driver->DriverUnload = unload; + return STATUS_SUCCESS; }

1 0

Zebediah Figura : http.sys: Create a skeletal request_queue object for each file opened.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 2ab696d63809e5f0b214d38a2aa7c8161734692e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ab696d63809e5f0b214d38a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:13 2019 -0500 http.sys: Create a skeletal request_queue object for each file opened. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/http.sys/http.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index aca2940..3a8aa39 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -26,21 +26,67 @@ #include "winioctl.h" #include "ddk/wdm.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" static HANDLE directory_obj; static DEVICE_OBJECT *device_obj; WINE_DEFAULT_DEBUG_CHANNEL(http); +#define DECLARE_CRITICAL_SECTION(cs) \ + static CRITICAL_SECTION cs; \ + static CRITICAL_SECTION_DEBUG cs##_debug = \ + { 0, 0, &cs, { &cs##_debug.ProcessLocksList, &cs##_debug.ProcessLocksList }, \ + 0, 0, { (DWORD_PTR)(__FILE__ ": " # cs) }}; \ + static CRITICAL_SECTION cs = { &cs##_debug, -1, 0, 0, 0, 0 }; + +DECLARE_CRITICAL_SECTION(http_cs); + +struct request_queue +{ + struct list entry; +}; + +static struct list request_queues = LIST_INIT(request_queues); + static NTSTATUS WINAPI dispatch_create(DEVICE_OBJECT *device, IRP *irp) { + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct request_queue *queue; + + if (!(queue = heap_alloc_zero(sizeof(*queue)))) + return STATUS_NO_MEMORY; + stack->FileObject->FsContext = queue; + + EnterCriticalSection(&http_cs); + list_add_head(&request_queues, &queue->entry); + LeaveCriticalSection(&http_cs); + + TRACE("Created queue %p.\n", queue); + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } +static void close_queue(struct request_queue *queue) +{ + EnterCriticalSection(&http_cs); + list_remove(&queue->entry); + LeaveCriticalSection(&http_cs); + + heap_free(queue); +} + static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) { + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + struct request_queue *queue = stack->FileObject->FsContext; + + TRACE("Closing queue %p.\n", queue); + close_queue(queue); + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -48,6 +94,13 @@ static NTSTATUS WINAPI dispatch_close(DEVICE_OBJECT *device, IRP *irp) static void WINAPI unload(DRIVER_OBJECT *driver) { + struct request_queue *queue, *queue_next; + + LIST_FOR_EACH_ENTRY_SAFE(queue, queue_next, &request_queues, struct request_queue, entry) + { + close_queue(queue); + } + IoDeleteDevice(device_obj); NtClose(directory_obj); }

1 0

Alexandre Julliard : d2d1: Make qsort() callback functions cdecl.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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

Zebediah Figura : hidclass.sys: Avoid freeing pool memory with HeapFree().
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 6a6081fc9333632b2f22406e3d17a5a6f2192f62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a6081fc9333632b2f22406e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:16:50 2019 -0500 hidclass.sys: Avoid freeing pool memory with HeapFree(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b5c9987..5db9c47 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -285,7 +285,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) break; case BusQueryDeviceSerialNumber: FIXME("BusQueryDeviceSerialNumber not implemented\n"); - HeapFree(GetProcessHeap(), 0, id); + ExFreePool(id); break; } break;

1 0

Daniel Lehman : wininet/tests: Fix typo in error message.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 36bbea9e20391a7687b45d89ca05aeebc94100df URL: https://source.winehq.org/git/wine.git/?a=commit;h=36bbea9e20391a7687b45d89… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Aug 21 23:57:15 2019 -0700 wininet/tests: Fix typo in error message. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c91b806..6db33e4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -3976,7 +3976,7 @@ static void test_head_request(int port) len = sizeof(content_length); content_length = -1; ret = HttpQueryInfoA(req.request, HTTP_QUERY_FLAG_NUMBER|HTTP_QUERY_CONTENT_LENGTH, &content_length, &len, 0); - ok(ret, "HttpQueryInfo dailed: %u\n", GetLastError()); + ok(ret, "HttpQueryInfo failed: %u\n", GetLastError()); ok(len == sizeof(DWORD), "len = %u\n", len); ok(content_length == 100, "content_length = %u\n", content_length);

1 0

Zebediah Figura : ntoskrnl.exe: Stub IoRegisterBootDriverReinitialization( ).
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 8ce1c66b5eccfff4dfdb47be087bd93921d66566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ce1c66b5eccfff4dfdb47be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:16:52 2019 -0500 ntoskrnl.exe: Stub IoRegisterBootDriverReinitialization(). 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 | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntddk.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e2c746..258c769 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1794,6 +1794,13 @@ void WINAPI IoRegisterDriverReinitialization( PDRIVER_OBJECT obj, PDRIVER_REINIT FIXME( "stub: %p %p %p\n", obj, reinit, context ); } +/*********************************************************************** + * IoRegisterBootDriverReinitialization (NTOSKRNL.EXE.@) + */ +void WINAPI IoRegisterBootDriverReinitialization(DRIVER_OBJECT *driver, PDRIVER_REINITIALIZE proc, void *ctx) +{ + FIXME("driver %p, proc %p, ctx %p, stub!\n", driver, proc, ctx); +} /*********************************************************************** * IoRegisterShutdownNotification (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 230c8d6..88c1a06 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -438,7 +438,7 @@ @ stub IoReadOperationCount @ stub IoReadPartitionTableEx @ stub IoReadTransferCount -@ stub IoRegisterBootDriverReinitialization +@ stdcall IoRegisterBootDriverReinitialization(ptr ptr ptr) @ stdcall IoRegisterDeviceInterface(ptr ptr ptr ptr) @ stdcall IoRegisterDriverReinitialization(ptr ptr ptr) @ stdcall IoRegisterFileSystem(ptr) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 8c7ead7..32f9a6f 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ typedef GUID UUID; NTSTATUS WINAPI ExUuidCreate(UUID*); NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); +void WINAPI IoRegisterBootDriverReinitialization(DRIVER_OBJECT*,PDRIVER_REINITIALIZE,void*); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); BOOLEAN WINAPI KeAreApcsDisabled(void);

1 0

Alexandre Julliard : d3dx9: Make qsort() callback functions cdecl.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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

Jacek Caban : vbscript: Rename OP_long expression to OP_int.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 9b18772c0b8de4b14a165d254551dbdbcfd0f1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b18772c0b8de4b14a165d25… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:49 2019 +0200 vbscript: Rename OP_long expression to OP_int. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 6 +++--- dlls/vbscript/interp.c | 2 +- dlls/vbscript/lex.c | 4 ++-- dlls/vbscript/parse.h | 2 +- dlls/vbscript/parser.y | 10 +++++----- dlls/vbscript/vbscript.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 6fe01ab..1f4a7d3 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -536,8 +536,8 @@ 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_ULONG: - return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); + case EXPR_INT: + return push_instr_int(ctx, OP_int, ((int_expression_t*)expr)->value); case EXPR_XOR: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_xor); default: @@ -779,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_long, 1); + hres = push_instr_int(ctx, OP_int, 1); if(FAILED(hres)) return hres; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d9bf79a..629e833 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1315,7 +1315,7 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } -static HRESULT interp_long(exec_ctx_t *ctx) +static HRESULT interp_int(exec_ctx_t *ctx) { const LONG arg = ctx->instr->arg1.lng; VARIANT v; diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 5c7ed25..c628934 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -335,7 +335,7 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) if(use_int && (LONG)d == d) { *(LONG*)ret = d; - return tLong; + return tInt; } r = exp>=0 ? d*pow(10, exp) : d/pow(10, -exp); @@ -376,7 +376,7 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) ctx->ptr++; *ret = l; - return tLong; + return tInt; } static void skip_spaces(parser_ctx_t *ctx) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 39ebf3b..867d45f 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -32,6 +32,7 @@ typedef enum { EXPR_GTEQ, EXPR_IDIV, EXPR_IMP, + EXPR_INT, EXPR_IS, EXPR_LT, EXPR_LTEQ, @@ -49,7 +50,6 @@ typedef enum { EXPR_OR, EXPR_STRING, EXPR_SUB, - EXPR_ULONG, EXPR_XOR } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 8add9c9..4c8c6e3 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -97,7 +97,7 @@ static statement_t *link_statements(statement_t*,statement_t*); const_decl_t *const_decl; case_clausule_t *case_clausule; unsigned uint; - LONG lng; + LONG integer; BOOL boolean; double dbl; } @@ -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 +%token <integer> tInt %token <dbl> tDouble %type <statement> Statement SimpleStatement StatementNl StatementsNl StatementsNl_opt IfStatement Else_opt @@ -381,13 +381,13 @@ LiteralExpression | tNOTHING { $$ = new_expression(ctx, EXPR_NOTHING, 0); CHECK_ERROR; } NumericLiteralExpression - : '0' { $$ = new_long_expression(ctx, EXPR_ULONG, 0); CHECK_ERROR; } - | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } + : '0' { $$ = new_long_expression(ctx, EXPR_INT, 0); CHECK_ERROR; } + | tInt { $$ = new_long_expression(ctx, EXPR_INT, $1); CHECK_ERROR; } | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } IntegerValue : '0' { $$ = 0; } - | tLong { $$ = $1; } + | tInt { $$ = $1; } PrimaryExpression : '(' Expression ')' { $$ = new_unary_expression(ctx, EXPR_BRACKETS, $2); } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0d8b0ed..2d78d5a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -248,11 +248,11 @@ typedef enum { X(idiv, 1, 0, 0) \ X(imp, 1, 0, 0) \ X(incc, 1, ARG_BSTR, 0) \ + X(int, 1, ARG_INT, 0) \ X(is, 1, 0, 0) \ X(jmp, 0, ARG_ADDR, 0) \ X(jmp_false, 0, ARG_ADDR, 0) \ X(jmp_true, 0, ARG_ADDR, 0) \ - X(long, 1, ARG_INT, 0) \ X(lt, 1, 0, 0) \ X(lteq, 1, 0, 0) \ X(mcall, 1, ARG_BSTR, ARG_UINT) \

1 0

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

Aug. 22, 2019

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