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

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

Aug. 22, 2019

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 Aug. 22, 2019

Aug. 22, 2019

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

Zebediah Figura : ntoskrnl.exe: Allocate pool memory from an executable heap.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: da23da395244392234792814bbaaa780d620065a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da23da395244392234792814… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:16:51 2019 -0500 ntoskrnl.exe: Allocate pool memory from an executable heap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45843 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++-- dlls/ntoskrnl.exe/tests/driver.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 91bd7da..2e2c746 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -78,6 +78,8 @@ static DWORD request_thread; /* tid of the client thread */ static DWORD client_tid; +static HANDLE ntoskrnl_heap; + struct wine_driver { DRIVER_OBJECT driver_obj; @@ -1998,7 +2000,7 @@ PVOID WINAPI ExAllocatePoolWithQuota( POOL_TYPE type, SIZE_T size ) PVOID WINAPI ExAllocatePoolWithTag( POOL_TYPE type, SIZE_T size, ULONG tag ) { /* FIXME: handle page alignment constraints */ - void *ret = HeapAlloc( GetProcessHeap(), 0, size ); + void *ret = HeapAlloc( ntoskrnl_heap, 0, size ); TRACE( "%lu pool %u -> %p\n", size, type, ret ); return ret; } @@ -2040,7 +2042,7 @@ void WINAPI ExFreePool( void *ptr ) void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) { TRACE( "%p\n", ptr ); - HeapFree( GetProcessHeap(), 0, ptr ); + HeapFree( ntoskrnl_heap, 0, ptr ); } static void initialize_lookaside_list( GENERAL_LOOKASIDE *lookaside, PALLOCATE_FUNCTION allocate, PFREE_FUNCTION free, @@ -3067,9 +3069,11 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) #endif KeQueryTickCount( &count ); /* initialize the global KeTickCount */ NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber; + ntoskrnl_heap = HeapCreate( HEAP_CREATE_ENABLE_EXECUTE, 0, 0 ); break; case DLL_PROCESS_DETACH: if (reserved) break; + HeapDestroy( ntoskrnl_heap ); RtlRemoveVectoredExceptionHandler( handler ); break; } diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 2b3a32b..dc583f9 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1685,6 +1685,26 @@ static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) IoCompleteRequest(irp, IO_NO_INCREMENT); } +#if defined(__i386__) || defined(__x86_64__) +static void test_executable_pool(void) +{ + static const unsigned char bytes[] = + { 0xb8, 0xef, 0xbe, 0xad, 0xde, 0xc3 }; /* mov $0xdeadbeef,%eax ; ret */ + static const ULONG tag = 0x74736574; /* test */ + int (*func)(void); + int ret; + + func = ExAllocatePoolWithTag(NonPagedPool, sizeof(bytes), tag); + ok(!!func, "Got NULL memory.\n"); + + memcpy(func, bytes, sizeof(bytes)); + ret = func(); + ok(ret == 0xdeadbeef, "Got %#x.\n", ret); + + ExFreePoolWithTag(func, tag); +} +#endif + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1735,6 +1755,9 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_lookup_thread(); test_IoAttachDeviceToDeviceStack(); test_object_name(); +#if defined(__i386__) || defined(__x86_64__) + test_executable_pool(); +#endif if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR;

1 0

Zebediah Figura : http.sys: New stub driver.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 128dd3be7536f4869b51be1958d01c7ed1e6441d URL: https://source.winehq.org/git/wine.git/?a=commit;h=128dd3be7536f4869b51be19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:30:11 2019 -0500 http.sys: New stub driver. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/http.sys/Makefile.in | 6 ++++++ dlls/http.sys/http.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/http.sys/http.sys.spec | 1 + loader/wine.inf.in | 11 +++++++++++ 6 files changed, 57 insertions(+) diff --git a/configure b/configure index a87fef5..c64dc5a 100755 --- a/configure +++ b/configure @@ -1340,6 +1340,7 @@ enable_hid enable_hidclass_sys enable_hlink enable_hnetcfg +enable_http_sys enable_httpapi enable_iccvid enable_icmp @@ -20307,6 +20308,7 @@ wine_fn_config_makefile dlls/hlink enable_hlink wine_fn_config_makefile dlls/hlink/tests enable_tests wine_fn_config_makefile dlls/hnetcfg enable_hnetcfg wine_fn_config_makefile dlls/hnetcfg/tests enable_tests +wine_fn_config_makefile dlls/http.sys enable_http_sys wine_fn_config_makefile dlls/httpapi enable_httpapi wine_fn_config_makefile dlls/httpapi/tests enable_tests wine_fn_config_makefile dlls/iccvid enable_iccvid diff --git a/configure.ac b/configure.ac index 1711c01..0d0ba2f 100644 --- a/configure.ac +++ b/configure.ac @@ -3290,6 +3290,7 @@ WINE_CONFIG_MAKEFILE(dlls/hlink) WINE_CONFIG_MAKEFILE(dlls/hlink/tests) WINE_CONFIG_MAKEFILE(dlls/hnetcfg) WINE_CONFIG_MAKEFILE(dlls/hnetcfg/tests) +WINE_CONFIG_MAKEFILE(dlls/http.sys) WINE_CONFIG_MAKEFILE(dlls/httpapi) WINE_CONFIG_MAKEFILE(dlls/httpapi/tests) WINE_CONFIG_MAKEFILE(dlls/iccvid) diff --git a/dlls/http.sys/Makefile.in b/dlls/http.sys/Makefile.in new file mode 100644 index 0000000..449ebae --- /dev/null +++ b/dlls/http.sys/Makefile.in @@ -0,0 +1,6 @@ +MODULE = http.sys +IMPORTS = ntoskrnl +EXTRADLLFLAGS = -Wl,--subsystem,native -mno-cygwin + +C_SRCS = \ + http.c diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c new file mode 100644 index 0000000..ed19c00 --- /dev/null +++ b/dlls/http.sys/http.c @@ -0,0 +1,36 @@ +/* + * HTTP server driver + * + * Copyright 2019 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(http); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("driver %p, path %s.\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/http.sys/http.sys.spec b/dlls/http.sys/http.sys.spec new file mode 100644 index 0000000..76421d7 --- /dev/null +++ b/dlls/http.sys/http.sys.spec @@ -0,0 +1 @@ +# nothing to export diff --git a/loader/wine.inf.in b/loader/wine.inf.in index ea647f6..e835466 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -119,6 +119,7 @@ AddReg=\ [DefaultInstall.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -135,6 +136,7 @@ AddService=Winmgmt,0,WinmgmtService [DefaultInstall.NT.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -151,6 +153,7 @@ AddService=Winmgmt,0,WinmgmtService [DefaultInstall.ntamd64.Services] AddService=BITS,0,BITSService +AddService=HTTP,0,HTTPService AddService=MSIServer,0,MSIService AddService=MountMgr,0x800,MountMgrService AddService=RpcSs,0,RpcSsService @@ -3434,6 +3437,14 @@ ServiceType=16 StartType=3 ErrorControl=1 +[HTTPService] +Description="HTTP server" +DisplayName="HTTP" +ServiceBinary="%12%\http.sys" +ServiceType=1 +StartType=3 +ErrorControl=1 + [MSIService] Description="MSI Installer Server" DisplayName="MSIServer"

1 0

Alexandre Julliard : ntdll: Run signal handlers on the signal stack on ARM64.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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: Support unary + expressions.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 17c5a25091dba697fff2b02e1ac34c48124c8485 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17c5a25091dba697fff2b02e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 22 19:31:55 2019 +0200 vbscript: Support unary + expressions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/parser.y | 1 + dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4c8c6e3..11a8f9d 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -366,6 +366,7 @@ UnaryExpression | CallExpression { $$ = $1; } | tNEW Identifier { $$ = new_new_expression(ctx, $2); CHECK_ERROR; } | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } + | '+' UnaryExpression { $$ = $2; } CallExpression : PrimaryExpression { $$ = $1; } diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index afd7c24..49c673a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1093,6 +1093,14 @@ Call ok(getVT(cs) = "VT_BSTR", "getVT(cs) = " & getVT(cs)) Call ok(isNull(cnull), "cnull = " & cnull) Call ok(getVT(cnull) = "VT_NULL", "getVT(cnull) = " & getVT(cnull)) +Call ok(+1 = 1, "+1 != 1") +Call ok(+true = true, "+1 != 1") +Call ok(getVT(+true) = "VT_BOOL", "getVT(+true) = " & getVT(+true)) +Call ok(+"true" = "true", """+true"" != true") +Call ok(getVT(+"true") = "VT_BSTR", "getVT(+""true"") = " & getVT(+"true")) +Call ok(+obj is obj, "+obj != obj") +Call ok(+--+-+1 = -1, "+--+-+1 != -1") + if false then Const conststr = "str" Call ok(conststr = "str", "conststr = " & conststr) Call ok(getVT(conststr) = "VT_BSTR", "getVT(conststr) = " & getVT(conststr))

1 0

Alexandre Julliard : mfplat: Make bsearch() callback functions cdecl.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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 : dsound: Make a qsort() callback function cdecl.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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

Zebediah Figura : ntoskrnl.exe: Implement IoGetRequestorProcess().
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

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

Zebediah Figura : ntoskrnl.exe: Set the IRP thread also for create and close requests.
by Alexandre Julliard Aug. 22, 2019

Aug. 22, 2019

Module: wine Branch: master Commit: 37652d5cc4aed514581e2b3579520c955a0436e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37652d5cc4aed514581e2b35… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 21 23:16:53 2019 -0500 ntoskrnl.exe: Set the IRP thread also for create and close requests. 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 | 2 ++ dlls/ntoskrnl.exe/tests/driver.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 258c769..a3dd7b9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -528,6 +528,7 @@ static NTSTATUS dispatch_create( struct dispatch_context *context ) irpsp->Parameters.Create.EaLength = 0; irp->Tail.Overlay.OriginalFileObject = file; + irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = NULL; irp->UserBuffer = NULL; @@ -565,6 +566,7 @@ static NTSTATUS dispatch_close( struct dispatch_context *context ) irpsp->FileObject = file; irp->Tail.Overlay.OriginalFileObject = file; + irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = NULL; irp->UserBuffer = NULL; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index dc583f9..6ab3c62 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -60,6 +60,8 @@ static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pI static PEPROCESS *pPsInitialSystemProcess; static void *create_caller_thread; +static PETHREAD create_irp_thread; + void WINAPI ObfReferenceObject( void *obj ); NTSTATUS WINAPI ZwQueryInformationProcess(HANDLE,PROCESSINFOCLASS,void*,ULONG,ULONG*); @@ -342,7 +344,10 @@ static void test_current_thread(BOOL is_system) ok(PsGetThreadId((PETHREAD)KeGetCurrentThread()) == PsGetCurrentThreadId(), "thread IDs don't match\n"); ok(PsIsSystemThread((PETHREAD)KeGetCurrentThread()) == is_system, "unexpected system thread\n"); if (!is_system) + { ok(create_caller_thread == KeGetCurrentThread(), "thread is not create caller thread\n"); + ok(create_irp_thread == (PETHREAD)KeGetCurrentThread(), "thread of create request is not current thread\n"); + } ret = ObOpenObjectByPointer(current, OBJ_KERNEL_HANDLE, NULL, PROCESS_QUERY_INFORMATION, NULL, KernelMode, &process_handle); ok(!ret, "ObOpenObjectByPointer failed: %#x\n", ret); @@ -1864,6 +1869,7 @@ static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) *context = create_count; irpsp->FileObject->FsContext = context; create_caller_thread = KeGetCurrentThread(); + create_irp_thread = irp->Tail.Overlay.Thread; irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT);

1 0