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

Nikolay Sivov : mf: Add MFEnumDeviceSources() stub.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 136312e2dcc5660693061c3b0654a5ccc2280e74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=136312e2dcc5660693061c3b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 30 14:26:28 2019 +0300 mf: Add MFEnumDeviceSources() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 15 +++++++++++++++ dlls/mf/mf.spec | 2 +- include/mfidl.idl | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 1b00ea5..8500cd9 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -328,3 +328,18 @@ HRESULT WINAPI MFShutdownObject(IUnknown *object) return S_OK; } + +/*********************************************************************** + * MFEnumDeviceSources (mf.@) + */ +HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count) +{ + FIXME("%p, %p, %p.\n", attributes, sources, count); + + if (!attributes || !sources || !count) + return E_INVALIDARG; + + *count = 0; + + return S_OK; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index dd3d6d0..9e3f6ca 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -70,7 +70,7 @@ @ stub MFCreateVideoRendererActivate @ stub MFCreateWMAEncoderActivate @ stub MFCreateWMVEncoderActivate -@ stub MFEnumDeviceSources +@ stdcall MFEnumDeviceSources(ptr ptr ptr) @ stub MFGetMultipleServiceProviders @ stdcall MFGetService(ptr ptr ptr ptr) @ stdcall MFGetSupportedMimeTypes(ptr) diff --git a/include/mfidl.idl b/include/mfidl.idl index 2bdb339..64d39db 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -480,6 +480,7 @@ cpp_quote("HRESULT WINAPI MFCreateSystemTimeSource(IMFPresentationTimeSource **t cpp_quote("HRESULT WINAPI MFCreateTopology(IMFTopology **topology);") cpp_quote("HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode **node);") cpp_quote("HRESULT WINAPI MFCreateTopoLoader(IMFTopoLoader **loader);") +cpp_quote("HRESULT WINAPI MFEnumDeviceSources(IMFAttributes *attributes, IMFActivate ***sources, UINT32 *count);") cpp_quote("HRESULT WINAPI MFGetSupportedMimeTypes(PROPVARIANT *array);") cpp_quote("HRESULT WINAPI MFGetService(IUnknown *object, REFGUID service, REFIID iid, void **obj);") cpp_quote("MFTIME WINAPI MFGetSystemTime(void);")

1 0

Jacek Caban : ntoskrnl.exe: Implement ObOpenObjectByPointer.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: bfe3dfb5356d5944e0d9ff9d659eac6c77075bd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfe3dfb5356d5944e0d9ff9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:37 2019 +0200 ntoskrnl.exe: Implement ObOpenObjectByPointer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 34 ++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 19 +++++++++++++++++-- include/ddk/ntifs.h | 1 + 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d8756a8..f0dff14 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -511,6 +511,40 @@ POBJECT_TYPE WINAPI ObGetObjectType( void *object ) return header->type; } +/*********************************************************************** + * ObOpenObjectByPointer (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *access_state, + ACCESS_MASK access, POBJECT_TYPE type, + KPROCESSOR_MODE mode, HANDLE *handle ) +{ + NTSTATUS status; + + TRACE( "%p %x %p %x %p %d %p\n", obj, attr, access_state, access, type, mode, handle ); + + if (mode != KernelMode) + { + FIXME( "UserMode access not implemented\n" ); + return STATUS_NOT_IMPLEMENTED; + } + + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "access %x not supported\n", access ); + if (access_state) FIXME( "access_state not implemented\n" ); + + if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH; + + SERVER_START_REQ( get_kernel_object_handle ) + { + req->manager = wine_server_obj_handle( get_device_manager() ); + req->user_ptr = wine_server_client_ptr( obj ); + req->access = access; + if (!(status = wine_server_call( req ))) + *handle = wine_server_ptr_handle( reply->handle ); + } + SERVER_END_REQ; + return status; +} + static void *create_file_object( HANDLE handle ); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 53070f3..1e46de3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -822,7 +822,7 @@ @ stub ObLogSecurityDescriptor @ stub ObMakeTemporaryObject @ stub ObOpenObjectByName -@ stub ObOpenObjectByPointer +@ stdcall ObOpenObjectByPointer(ptr long ptr long ptr long ptr) @ stdcall ObQueryNameString(ptr ptr long ptr) @ stub ObQueryObjectAuditingByHandle @ stdcall ObReferenceObjectByHandle(long long ptr long ptr ptr) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 4bbaa79..e5d5dd8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -773,7 +773,7 @@ static void test_ob_reference(const WCHAR *test_path) { POBJECT_TYPE (WINAPI *pObGetObjectType)(void*); OBJECT_ATTRIBUTES attr = { sizeof(attr) }; - HANDLE event_handle, file_handle, file_handle2, thread_handle; + HANDLE event_handle, file_handle, file_handle2, thread_handle, handle; DISPATCHER_HEADER *header; FILE_OBJECT *file; void *obj1, *obj2; @@ -878,9 +878,24 @@ static void test_ob_reference(const WCHAR *test_path) status = wait_single(header, 0); ok(status == 0 || status == STATUS_TIMEOUT, "got %#x\n", status); - ObDereferenceObject(obj1); ObDereferenceObject(obj2); + status = ObOpenObjectByPointer(obj1, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle); + ok(status == STATUS_SUCCESS, "ObOpenObjectByPointer failed: %#x\n", status); + + status = ZwClose(handle); + ok(!status, "ZwClose failed: %#x\n", status); + + status = ObReferenceObjectByHandle(thread_handle, SYNCHRONIZE, *pPsThreadType, KernelMode, &obj2, NULL); + ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status); + ok(obj1 == obj2, "obj1 != obj2\n"); + ObDereferenceObject(obj2); + + status = ObOpenObjectByPointer(obj1, OBJ_KERNEL_HANDLE, NULL, 0, *pIoFileObjectType, KernelMode, &handle); + ok(status == STATUS_OBJECT_TYPE_MISMATCH, "ObOpenObjectByPointer returned: %#x\n", status); + + ObDereferenceObject(obj1); + status = ZwClose(thread_handle); ok(!status, "ZwClose failed: %#x\n", status); diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 2c61329..acdd232 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -130,6 +130,7 @@ typedef struct _FS_FILTER_CALLBACKS } FS_FILTER_CALLBACKS, *PFS_FILTER_CALLBACKS; BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); +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); NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*);

1 0

Jacek Caban : ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel object.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 332035fb9432a5af74cc944b87d1410efab563d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=332035fb9432a5af74cc944b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 30 16:36:48 2019 +0200 ntoskrnl.exe: Use ObOpenObjectByPointer to get handle for kernel object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 23 ++++++----------------- dlls/ntoskrnl.exe/ntoskrnl_private.h | 1 - dlls/ntoskrnl.exe/sync.c | 7 ++++--- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f0dff14..4b6c79d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -366,20 +366,6 @@ static void ObReferenceObject( void *obj ) LeaveCriticalSection( &obref_cs ); } -HANDLE kernel_object_handle( void *obj, unsigned int access ) -{ - HANDLE handle = NULL; - SERVER_START_REQ( get_kernel_object_handle ) - { - req->manager = wine_server_obj_handle( get_device_manager() ); - req->user_ptr = wine_server_client_ptr( obj ); - req->access = access; - if (!wine_server_call( req )) handle = wine_server_ptr_handle( reply->handle ); - } - SERVER_END_REQ; - return handle; -} - static const POBJECT_TYPE *known_types[] = { &ExEventObjectType, @@ -1870,9 +1856,12 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP OBJECT_NAME_INFORMATION *name = HeapAlloc(GetProcessHeap(), 0, len); HANDLE handle; - handle = kernel_object_handle( device, 0 ); - status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); - NtClose( handle ); + status = ObOpenObjectByPointer( device, OBJ_KERNEL_HANDLE, NULL, 0, NULL, KernelMode, &handle ); + if (!status) + { + status = NtQueryObject( handle, ObjectNameInformation, name, len, &used_len ); + NtClose( handle ); + } if (status == STATUS_SUCCESS) { /* Ensure room for NULL termination */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index 295ff73..c2ea91c 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -47,7 +47,6 @@ struct _ETHREAD }; void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG ref ) DECLSPEC_HIDDEN; -HANDLE kernel_object_handle( void *obj, unsigned int access ) DECLSPEC_HIDDEN; NTSTATUS kernel_object_from_handle( HANDLE handle, POBJECT_TYPE type, void **ret ) DECLSPEC_HIDDEN; extern POBJECT_TYPE ExEventObjectType; diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 6976b9e..8ea103b 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "ddk/ntddk.h" #include "ddk/wdm.h" +#include "ddk/ntifs.h" #include "wine/debug.h" #include "wine/heap.h" @@ -80,7 +81,7 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], { if (objs[i]->WaitListHead.Blink == INVALID_HANDLE_VALUE) { - handles[i] = kernel_object_handle( objs[i], SYNCHRONIZE ); + ObOpenObjectByPointer( objs[i], OBJ_KERNEL_HANDLE, NULL, SYNCHRONIZE, NULL, KernelMode, &handles[i] ); continue; } @@ -266,7 +267,7 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) } else { - if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + if (!ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_MODIFY_STATE, NULL, KernelMode, &handle )) { NtSetEvent( handle, &ret ); NtClose( handle ); @@ -297,7 +298,7 @@ LONG WINAPI KeResetEvent( PRKEVENT event ) } else { - if ((handle = kernel_object_handle( event, EVENT_MODIFY_STATE ))) + if (!ObOpenObjectByPointer( event, OBJ_KERNEL_HANDLE, NULL, EVENT_MODIFY_STATE, NULL, KernelMode, &handle )) { NtResetEvent( handle, &ret ); NtClose( handle );

1 0

Alistair Leslie-Hughes : wintab32/tests: Improve WTInfoA tests.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 911e9dad0283a9893054a673811f9272b284f6ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=911e9dad0283a9893054a673… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 29 23:02:23 2019 +0000 wintab32/tests: Improve WTInfoA tests. Some older WACOM tables dont support DVC_Z, DVC_TPRESSURE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/tests/context.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 3eb1315..a88e4bb 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -160,6 +160,9 @@ static void test_WTInfoA(void) ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); trace("DVC_NAME %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_HARDWARE, name ); + trace("DVC_HARDWARE %s\n", name); + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); @@ -169,16 +172,20 @@ static void test_WTInfoA(void) trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); - trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_Z not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); - todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); - trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + if(ret) + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + else + trace("DVC_TPRESSURE not supported\n"); ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret);

1 0

Erich E. Hoover : iphlpapi: Implement AllocateAndGetTcpExTableFromStack.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 05fca48ebc1321984a74ed11dc9c1f13a2cfd1ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=05fca48ebc1321984a74ed11… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Apr 28 03:13:46 2019 +0200 iphlpapi: Implement AllocateAndGetTcpExTableFromStack. Based on a patch by Ralf Habacker. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34372 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/ipstats.c | 36 ++++++++++++++++++++++++++++++++++++ include/iphlpapi.h | 1 + 3 files changed, 38 insertions(+) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index b4f77be..2a4b3d8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -5,6 +5,7 @@ @ stdcall AllocateAndGetIpAddrTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpForwardTableFromStack( ptr long long long ) @ stdcall AllocateAndGetIpNetTableFromStack( ptr long long long ) +@ stdcall AllocateAndGetTcpExTableFromStack( ptr long long long long ) @ stdcall AllocateAndGetTcpTableFromStack( ptr long long long ) @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index b4ed542..0b762eb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2320,6 +2320,42 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bO return build_tcp_table( TCP_TABLE_BASIC_ALL, (void **)ppTcpTable, bOrder, heap, flags, NULL ); } +/****************************************************************** + * AllocateAndGetTcpExTableFromStack (IPHLPAPI.@) + * + * Get the TCP connection table. + * Like GetTcpTable(), but allocate the returned table from heap. + * + * PARAMS + * ppTcpTable [Out] pointer into which the MIB_TCPTABLE_EX is + * allocated and returned. + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * family [In] address family [AF_INET|AF_INET6] + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() + * returns otherwise. + */ +DWORD WINAPI AllocateAndGetTcpExTableFromStack( VOID **ppTcpTable, BOOL bOrder, + HANDLE heap, DWORD flags, DWORD family ) +{ + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x, family %u\n", + ppTcpTable, bOrder, heap, flags, family); + + if (!ppTcpTable || !family) + return ERROR_INVALID_PARAMETER; + + if (family != WS_AF_INET) + { + FIXME( "family = %u not supported\n", family ); + return ERROR_NOT_SUPPORTED; + } + + return build_tcp_table( TCP_TABLE_OWNER_PID_ALL, ppTcpTable, bOrder, heap, flags, NULL ); +} + static DWORD get_udp_table_sizes( UDP_TABLE_CLASS class, DWORD row_count, DWORD *row_size ) { DWORD table_size; diff --git a/include/iphlpapi.h b/include/iphlpapi.h index 86507df..f52387a 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -158,6 +158,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpExTableFromStack(VOID **ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags, DWORD family); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags);

1 0

Alexandre Julliard : ntdll: Check for time conversion error to silence a compiler warning.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 7c0385bdb49f28472b63b3dab823732fabda6707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0385bdb49f28472b63b3da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 30 20:24:52 2019 +0200 ntdll: Check for time conversion error to silence a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/time.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index a4762fa..443d8b2 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -1006,9 +1006,8 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old if (!OldTime) OldTime = &tm; NtQuerySystemTime( OldTime ); - RtlTimeToSecondsSince1970( OldTime, &oldsec ); - - RtlTimeToSecondsSince1970( NewTime, &sec ); + if (!RtlTimeToSecondsSince1970( OldTime, &oldsec )) return STATUS_INVALID_PARAMETER; + if (!RtlTimeToSecondsSince1970( NewTime, &sec )) return STATUS_INVALID_PARAMETER; /* fake success if time didn't change */ if (oldsec == sec)

1 0

Alexandre Julliard : iexplore: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: d47770e5031c2baaf111950fc321dd6a57c57263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47770e5031c2baaf111950f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:49:15 2019 +0200 iexplore: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/iexplore/Makefile.in | 3 ++- programs/iexplore/main.c | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/programs/iexplore/Makefile.in b/programs/iexplore/Makefile.in index 7e74867..b965b5b 100644 --- a/programs/iexplore/Makefile.in +++ b/programs/iexplore/Makefile.in @@ -1,8 +1,9 @@ MODULE = iexplore.exe -APPMODE = -mwindows -municode -Wl,--large-address-aware IMPORTS = ieframe DELAYIMPORTS = advpack version user32 +EXTRADLLFLAGS = -mwindows -municode -mno-cygwin -Wl,--large-address-aware + C_SRCS = \ main.c diff --git a/programs/iexplore/main.c b/programs/iexplore/main.c index b881443..01ad9d0 100644 --- a/programs/iexplore/main.c +++ b/programs/iexplore/main.c @@ -23,7 +23,6 @@ #include <ole2.h> #include <rpcproxy.h> -#include "wine/unicode.h" #include "wine/debug.h" extern DWORD WINAPI IEWinMain(const WCHAR*, int); @@ -57,7 +56,7 @@ static BOOL check_native_ie(void) if (VerQueryValueW(buf, translationW, (void **)&translation, &bytes)) { wsprintfW(file_desc_strW, file_desc_fmtW, translation[0], translation[1]); - ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !strstrW(file_desc, wineW); + ret = !VerQueryValueW(buf, file_desc_strW, (void**)&file_desc, &bytes) || !wcsstr(file_desc, wineW); } HeapFree(GetProcessHeap(), 0, buf); @@ -83,9 +82,9 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE prev, WCHAR *cmdline, int sho static const WCHAR unregserverW[] = {'u','n','r','e','g','s','e','r','v','e','r',0}; if(*cmdline == '-' || *cmdline == '/') { - if(!strcmpiW(cmdline+1, regserverW)) + if(!wcsicmp(cmdline+1, regserverW)) return register_iexplore(TRUE); - if(!strcmpiW(cmdline+1, unregserverW)) + if(!wcsicmp(cmdline+1, unregserverW)) return register_iexplore(FALSE); }

1 0

Alexandre Julliard : hostname: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: fdc124c1c6c92e7b85e53557cd00869bee96c8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdc124c1c6c92e7b85e53557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:53 2019 +0200 hostname: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hostname/Makefile.in | 3 ++- programs/hostname/hostname.c | 25 ++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/hostname/Makefile.in b/programs/hostname/Makefile.in index e1a2487..0e8341a 100644 --- a/programs/hostname/Makefile.in +++ b/programs/hostname/Makefile.in @@ -1,7 +1,8 @@ MODULE = hostname.exe -APPMODE = -mconsole -municode DELAYIMPORTS = user32 +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + C_SRCS = hostname.c RC_SRCS = hostname.rc diff --git a/programs/hostname/hostname.c b/programs/hostname/hostname.c index e3abc16..627d182 100644 --- a/programs/hostname/hostname.c +++ b/programs/hostname/hostname.c @@ -20,23 +20,22 @@ */ #include <stdarg.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> #include <wincon.h> #include <winnls.h> #include <winuser.h> -#include <wine/unicode.h> - #include "hostname.h" -static int hostname_vprintfW(const WCHAR *msg, va_list va_args) +static int hostname_vprintfW(const WCHAR *msg, __ms_va_list va_args) { int wlen; DWORD count, ret; WCHAR msg_buffer[8192]; - wlen = vsprintfW(msg_buffer, msg, va_args); + wlen = vswprintf(msg_buffer, ARRAY_SIZE(msg_buffer), msg, va_args); ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); if (!ret) @@ -63,29 +62,29 @@ static int hostname_vprintfW(const WCHAR *msg, va_list va_args) return count; } -static int hostname_printfW(const WCHAR *msg, ...) +static int WINAPIV hostname_printfW(const WCHAR *msg, ...) { - va_list va_args; + __ms_va_list va_args; int len; - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = hostname_vprintfW(msg, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } -static int hostname_message_printfW(int msg, ...) +static int WINAPIV hostname_message_printfW(int msg, ...) { - va_list va_args; + __ms_va_list va_args; WCHAR msg_buffer[8192]; int len; LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, ARRAY_SIZE(msg_buffer)); - va_start(va_args, msg); + __ms_va_start(va_args, msg); len = hostname_vprintfW(msg_buffer, va_args); - va_end(va_args); + __ms_va_end(va_args); return len; } @@ -127,7 +126,7 @@ int wmain(int argc, WCHAR *argv[]) unsigned int i; - if (!strncmpW(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) + if (!wcsncmp(argv[1], slashHelpW, ARRAY_SIZE(slashHelpW) - 1)) { hostname_message(STRING_USAGE); return 1;

1 0

Alexandre Julliard : hh: Build with msvcrt.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: cc47be73c9cd7f8625e67036cfa5faacf71867d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc47be73c9cd7f8625e67036… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 29 10:47:21 2019 +0200 hh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/hh/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/hh/Makefile.in b/programs/hh/Makefile.in index 4ab60b2..7d90409 100644 --- a/programs/hh/Makefile.in +++ b/programs/hh/Makefile.in @@ -1,5 +1,6 @@ MODULE = hh.exe -APPMODE = -mwindows + +EXTRADLLFLAGS = -mwindows -mno-cygwin C_SRCS = \ main.c

1 0

Dmitry Timoshkov : crypt32: CryptMsgUpdate should skip broken certificates.
by Alexandre Julliard April 30, 2019

April 30, 2019

Module: wine Branch: master Commit: 1875620466d178faead9d0ccea08bd2eee7c7722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1875620466d178faead9d0cc… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 30 17:55:24 2019 +0800 crypt32: CryptMsgUpdate should skip broken certificates. CertOpenStore() already verifies the certificate before adding it to the memory store from the file, this patch makes CryptMsgUpdate() behave in a similar way. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45757 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/decode.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index ce068f3..aa697e3 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -683,6 +683,13 @@ static BOOL CRYPT_AsnDecodeArray(const struct AsnArrayDescriptor *arrayDesc, &itemDecoded); if (ret) { + /* Ignore an item that failed to decode but the decoder doesn't want to fail the whole process */ + if (!size) + { + ptr += itemEncoded; + continue; + } + cItems++; if (itemSizes != &itemSize) itemSizes = CryptMemRealloc(itemSizes, @@ -5628,6 +5635,25 @@ static BOOL WINAPI CRYPT_AsnDecodePKCSSignerInfo(DWORD dwCertEncodingType, return ret; } +static BOOL verify_and_copy_certificate(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + PCCERT_CONTEXT cert; + + cert = CertCreateCertificateContext(X509_ASN_ENCODING, pbEncoded, cbEncoded); + if (!cert) + { + WARN("CertCreateCertificateContext error %#x\n", GetLastError()); + *pcbStructInfo = 0; + *pcbDecoded = 0; + return TRUE; + } + + CertFreeCertificateContext(cert); + + return CRYPT_AsnDecodeCopyBytes(pbEncoded, cbEncoded, dwFlags, pvStructInfo, pcbStructInfo, pcbDecoded); +} + static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -5637,7 +5663,7 @@ static BOOL CRYPT_AsnDecodeCMSCertEncoded(const BYTE *pbEncoded, offsetof(CRYPT_SIGNED_INFO, cCertEncoded), offsetof(CRYPT_SIGNED_INFO, rgCertEncoded), MEMBERSIZE(CRYPT_SIGNED_INFO, cCertEncoded, cCrlEncoded), - CRYPT_AsnDecodeCopyBytes, + verify_and_copy_certificate, sizeof(CRYPT_DER_BLOB), TRUE, offsetof(CRYPT_DER_BLOB, pbData) }; TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags,

1 0