wine-commits February 2019

1 participants
672 discussions

Matteo Bruni : d3dcompiler: Actually define the correct ID3D11ShaderReflection GUIDs.

by Alexandre Julliard

Module: wine Branch: master Commit: 293e2b55ad3949dd81ea3b63603339bb5fc5ad06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=293e2b55ad3949dd81ea3b63… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 30 16:26:03 2019 +0100 d3dcompiler: Actually define the correct ID3D11ShaderReflection GUIDs. Spotted by Andrey Gusev. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 1 + dlls/d3dcompiler_43/tests/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index b36631b..d10d0b1 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -21,6 +21,7 @@ #include "config.h" #include "wine/port.h" +#include "initguid.h" #include "d3dcompiler_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); diff --git a/dlls/d3dcompiler_43/tests/Makefile.in b/dlls/d3dcompiler_43/tests/Makefile.in index 55b14ad..3b4b7a5 100644 --- a/dlls/d3dcompiler_43/tests/Makefile.in +++ b/dlls/d3dcompiler_43/tests/Makefile.in @@ -1,5 +1,6 @@ TESTDLL = d3dcompiler_43.dll IMPORTS = d3d9 d3dx9 user32 +EXTRADEFS = -DD3D_COMPILER_VERSION=43 C_SRCS = \ asm.c \

5 years, 3 months

Zhiyi Zhang : d3d8: Fix building on Mac.

by Alexandre Julliard

Module: wine Branch: master Commit: 13cca44d20239612a23fa9b3fe51e072a2073a60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13cca44d20239612a23fa9b3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 30 22:25:07 2019 +0800 d3d8: Fix building on Mac. bool is a reserved word in c99. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/d3d8_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index a6c6700..5fbd165 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -61,16 +61,16 @@ IDirect3D8 * WINAPI DECLSPEC_HOTPATCH Direct3DCreate8(UINT sdk_version) * ValidateVertexShader (D3D8.@) * * I've seen reserved1 and reserved2 always passed as 0's - * bool seems always passed as 0 or 1, but other values work as well... + * boolean seems always passed as 0 or 1, but other values work as well... * toto result? */ -HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD* reserved2, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, bool, toto); + FIXME("(%p %p %p %d %p): stub\n", vertexshader, reserved1, reserved2, boolean, toto); warned = TRUE; } @@ -99,13 +99,13 @@ HRESULT WINAPI ValidateVertexShader(DWORD* vertexshader, DWORD* reserved1, DWORD * PARAMS * toto result? */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL bool, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) { HRESULT ret; static BOOL warned; if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, bool, toto); + FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); warned = TRUE; }

5 years, 3 months

Alistair Leslie-Hughes : mfreadwrite: Register MFReadWriteClassFactory interface.

by Alexandre Julliard

Module: wine Branch: master Commit: 46911cf90a526ef3207ff9e396687ba8ab1b05a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46911cf90a526ef3207ff9e3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 07:53:50 2019 +0000 mfreadwrite: Register MFReadWriteClassFactory interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 3 +++ dlls/mfreadwrite/main.c | 16 +++++++++++++++- dlls/mfreadwrite/mf_classes.idl | 25 +++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 2 ++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 4b8ee82..afefdb5 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,5 +1,8 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite +IMPORTS = mfuuid uuid C_SRCS = \ main.c + +IDL_SRCS = mf_classes.idl diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 2a5e29a..666e5ae 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -24,13 +24,16 @@ #include "windef.h" #include "winbase.h" -#include "initguid.h" +#include "ole2.h" +#include "rpcproxy.h" #include "mfreadwrite.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +static HINSTANCE mfinstance; + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { switch (reason) @@ -38,6 +41,7 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) case DLL_WINE_PREATTACH: return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: + mfinstance = instance; DisableThreadLibraryCalls(instance); break; } @@ -65,6 +69,16 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } +HRESULT WINAPI DllRegisterServer(void) +{ + return __wine_register_resources( mfinstance ); +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + return __wine_unregister_resources( mfinstance ); +} + typedef struct _srcreader { IMFSourceReader IMFSourceReader_iface; diff --git a/dlls/mfreadwrite/mf_classes.idl b/dlls/mfreadwrite/mf_classes.idl new file mode 100644 index 0000000..99dbd80 --- /dev/null +++ b/dlls/mfreadwrite/mf_classes.idl @@ -0,0 +1,25 @@ +/* + * + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#pragma makedep register + +[ + threading(both), + uuid(48e2ed0f-98c2-4a37-bed5-166312ddd83f) +] +coclass MFReadWriteClassFactory { interface IMFReadWriteClassFactory; } diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index f46c592..ad61646 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -1,5 +1,7 @@ @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr)

5 years, 3 months

Alistair Leslie-Hughes : mfreadwrite: Add DllGetClassObject/ DllCanUnloadNow functions.

by Alexandre Julliard

Module: wine Branch: master Commit: 7f6ffbfc67b68beb89878f378292e6753722ff43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f6ffbfc67b68beb89878f37… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 07:53:49 2019 +0000 mfreadwrite: Add DllGetClassObject/DllCanUnloadNow functions. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 11 +++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e09120d..2a5e29a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -54,6 +54,17 @@ HRESULT WINAPI MFCreateSourceReaderFromMediaSource(IMFMediaSource *source, IMFAt return E_NOTIMPL; } +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) +{ + FIXME("(%s,%s,%p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} + +HRESULT WINAPI DllCanUnloadNow(void) +{ + return S_FALSE; +} + typedef struct _srcreader { IMFSourceReader IMFSourceReader_iface; diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec index 4272b71..f46c592 100644 --- a/dlls/mfreadwrite/mfreadwrite.spec +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -1,5 +1,5 @@ -@ stub DllCanUnloadNow -@ stub DllGetClassObject +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stub MFCreateSinkWriterFromMediaSink @ stub MFCreateSinkWriterFromURL @ stdcall MFCreateSourceReaderFromByteStream(ptr ptr ptr)

5 years, 3 months

Isira Seneviratne : po: Update Sinhala translation.

by Alexandre Julliard

Module: wine Branch: master Commit: c0a503c3548362b179fc4a90f248c29d83fdbb09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a503c3548362b179fc4a90… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Sun Jan 27 07:36:55 2019 +0530 po: Update Sinhala translation. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/si.po | 206 +++++++++++++++++++++++++++++++++------------------------------ 1 file changed, 108 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a503c3548362b179fc…

5 years, 3 months

Julien D'ascenzio : ntdll: Correct space/mark parity.

by Alexandre Julliard

Module: wine Branch: master Commit: 257850e7ec6fd25b859c40ef1949c3cd19f218f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=257850e7ec6fd25b859c40ef… Author: Julien D'ascenzio <Julien.Dascenzio(a)paratronic.fr> Date: Mon Feb 4 08:08:06 2019 +0000 ntdll: Correct space/mark parity. When CMSPAR is defined, the space and mark parity is reversed: the flag PARODD isn't set correctly. Signed-off-by: Julien D'ascenzio <Julien.Dascenzio(a)paratronic.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 29e9faf..830137c 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -280,8 +280,8 @@ static NTSTATUS get_line_control(int fd, SERIAL_LINE_CONTROL* slc) case PARENB: slc->Parity = EVENPARITY; break; case PARENB|PARODD: slc->Parity = ODDPARITY; break; #ifdef CMSPAR - case PARENB|CMSPAR: slc->Parity = MARKPARITY; break; - case PARENB|PARODD|CMSPAR: slc->Parity = SPACEPARITY; break; + case PARENB|PARODD|CMSPAR: slc->Parity = MARKPARITY; break; + case PARENB|CMSPAR: slc->Parity = SPACEPARITY; break; #endif } switch (port.c_cflag & CSIZE) @@ -676,8 +676,8 @@ static NTSTATUS set_line_control(int fd, const SERIAL_LINE_CONTROL* slc) case EVENPARITY: port.c_cflag |= PARENB; break; #ifdef CMSPAR /* Linux defines mark/space (stick) parity */ - case MARKPARITY: port.c_cflag |= PARENB | CMSPAR; break; - case SPACEPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case MARKPARITY: port.c_cflag |= PARENB | PARODD | CMSPAR; break; + case SPACEPARITY: port.c_cflag |= PARENB | CMSPAR; break; #else /* try the POSIX way */ case MARKPARITY:

5 years, 3 months

Jacek Caban : ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx.

by Alexandre Julliard

Module: wine Branch: master Commit: 5bfbcb735bd05a5df9a8d7e96d832b3c1205b45f URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bfbcb735bd05a5df9a8d7e9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 1 16:28:16 2019 +0100 ntoskrnl.exe: Implement KeExpandKernelStackAndCallout and KeExpandKernelStackAndCalloutEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 19 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 + dlls/ntoskrnl.exe/tests/driver.c | 84 +++++++++++++++++++++++++++++++++++-- include/ddk/ntddk.h | 3 ++ 4 files changed, 105 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 298247b..f21d6f7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2308,6 +2308,25 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) } /*********************************************************************** + * KeExpandKernelStackAndCalloutEx (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeExpandKernelStackAndCalloutEx(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size, + BOOLEAN wait, void *context) +{ + WARN("(%p %p %lu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context); + callout(parameter); + return STATUS_SUCCESS; +} + +/*********************************************************************** + * KeExpandKernelStackAndCallout (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size) +{ + return KeExpandKernelStackAndCalloutEx(callout, parameter, size, TRUE, NULL); +} + +/*********************************************************************** * IoUnregisterFileSystem (NTOSKRNL.EXE.@) */ VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index df2f15b..40f5b27 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -44,6 +44,8 @@ @ stdcall -arch=arm,arm64,x86_64 KeAcquireInStackQueuedSpinLock(ptr ptr) @ stdcall -norelay KeAcquireInStackQueuedSpinLockAtDpcLevel(ptr ptr) @ stdcall KeEnterGuardedRegion() +@ stdcall KeExpandKernelStackAndCallout(ptr ptr long) +@ stdcall KeExpandKernelStackAndCalloutEx(ptr ptr long long ptr) @ stdcall KeLeaveGuardedRegion() @ stdcall -arch=arm,arm64,x86_64 KeReleaseInStackQueuedSpinLock(ptr) @ stdcall -norelay KeReleaseInStackQueuedSpinLockFromDpcLevel(ptr) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5c34b41..cbf8bdc 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -28,6 +28,7 @@ #include "winbase.h" #include "winternl.h" #include "winioctl.h" +#include "ddk/ntddk.h" #include "ddk/wdm.h" #include "driver.h" @@ -68,10 +69,9 @@ static void WINAPIV kprintf(const char *format, ...) __ms_va_end(valist); } -static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +static void WINAPIV vok_(const char *file, int line, int condition, const char *msg, __ms_va_list args) { const char *current_file; - __ms_va_list args; if (!(current_file = drv_strrchr(file, '/')) && !(current_file = drv_strrchr(file, '\\'))) @@ -79,7 +79,6 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m else current_file++; - __ms_va_start(args, msg); if (todo_level) { if (condition) @@ -113,6 +112,39 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m InterlockedIncrement(&successes); } } +} + +static void WINAPIV ok_(const char *file, int line, int condition, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + vok_(file, line, condition, msg, args); + __ms_va_end(args); +} + +void vskip_(const char *file, int line, const char *msg, __ms_va_list args) +{ + const char *current_file; + + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) + current_file = file; + else + current_file++; + + kprintf("%s:%d: Tests skipped: ", current_file, line); + kvprintf(msg, args); + skipped++; +} + +void WINAPIV win_skip_(const char *file, int line, const char *msg, ...) +{ + __ms_va_list args; + __ms_va_start(args, msg); + if (running_under_wine) + vok_(file, line, 0, msg, args); + else + vskip_(file, line, msg, args); __ms_va_end(args); } @@ -140,6 +172,7 @@ static void winetest_end_todo(void) winetest_end_todo()) #define todo_wine todo_if(running_under_wine) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) +#define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) static void test_currentprocess(void) { @@ -498,6 +531,50 @@ static void test_sync(void) KeCancelTimer(&timer); } +static int callout_cnt; + +static void WINAPI callout(void *parameter) +{ + ok(parameter == (void*)0xdeadbeef, "parameter = %p\n", parameter); + callout_cnt++; +} + +static void test_stack_callout(void) +{ + NTSTATUS (WINAPI *pKeExpandKernelStackAndCallout)(PEXPAND_STACK_CALLOUT,void*,SIZE_T); + NTSTATUS (WINAPI *pKeExpandKernelStackAndCalloutEx)(PEXPAND_STACK_CALLOUT,void*,SIZE_T,BOOLEAN,void*); + UNICODE_STRING str; + NTSTATUS ret; + + static const WCHAR KeExpandKernelStackAndCalloutW[] = + {'K','e','E','x','p','a','n','d','K','e','r','n','e','l','S','t','a','c','k','A','n','d','C','a','l','l','o','u','t',0}; + static const WCHAR KeExpandKernelStackAndCalloutExW[] = + {'K','e','E','x','p','a','n','d','K','e','r','n','e','l','S','t','a','c','k','A','n','d','C','a','l','l','o','u','t','E','x',0}; + + + RtlInitUnicodeString(&str, KeExpandKernelStackAndCalloutW); + pKeExpandKernelStackAndCallout = MmGetSystemRoutineAddress(&str); + if (pKeExpandKernelStackAndCallout) + { + callout_cnt = 0; + ret = pKeExpandKernelStackAndCallout(callout, (void*)0xdeadbeef, 4096); + ok(ret == STATUS_SUCCESS, "KeExpandKernelStackAndCallout failed: %#x\n", ret); + ok(callout_cnt == 1, "callout_cnt = %u\n", callout_cnt); + } + else win_skip("KeExpandKernelStackAndCallout is not available\n"); + + RtlInitUnicodeString(&str, KeExpandKernelStackAndCalloutExW); + pKeExpandKernelStackAndCalloutEx = MmGetSystemRoutineAddress(&str); + if (pKeExpandKernelStackAndCalloutEx) + { + callout_cnt = 0; + ret = pKeExpandKernelStackAndCalloutEx(callout, (void*)0xdeadbeef, 4096, FALSE, NULL); + ok(ret == STATUS_SUCCESS, "KeExpandKernelStackAndCalloutEx failed: %#x\n", ret); + ok(callout_cnt == 1, "callout_cnt = %u\n", callout_cnt); + } + else win_skip("KeExpandKernelStackAndCalloutEx is not available\n"); +} + static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -527,6 +604,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) test_init_funcs(); test_load_driver(); test_sync(); + test_stack_callout(); /* print process report */ if (test_input->winetest_debug) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index dc051e1..452e510 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -200,11 +200,14 @@ typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); typedef NTSTATUS (WINAPI *PIO_QUERY_DEVICE_ROUTINE)(PVOID,PUNICODE_STRING,INTERFACE_TYPE,ULONG, PKEY_VALUE_FULL_INFORMATION*,CONFIGURATION_TYPE,ULONG,PKEY_VALUE_FULL_INFORMATION*); +typedef void (NTAPI EXPAND_STACK_CALLOUT)(void*); +typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_TYPE,PULONG, PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +NTSTATUS WINAPI KeExpandKernelStackAndCallout(PEXPAND_STACK_CALLOUT,void*,SIZE_T); void WINAPI KeSetTargetProcessorDpc(PRKDPC,CCHAR); BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE);

5 years, 3 months

Hans Leidekker : crypt32: Add support for PFX objects in CryptQueryObject.

by Alexandre Julliard

Module: wine Branch: master Commit: 962aed51205d9ee8245904a107d79b6c5aa3cdb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=962aed51205d9ee8245904a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 1 15:30:31 2019 +0100 crypt32: Add support for PFX objects in CryptQueryObject. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/object.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/store.c | 34 +++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 3dc28af..1993a0a 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -696,6 +696,48 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType, return ret; } +static BOOL CRYPT_QueryPFXObject(DWORD dwObjectType, const void *pvObject, + DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, + DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, DWORD *pdwFormatType, + HCERTSTORE *phCertStore, HCRYPTMSG *phMsg) +{ + CRYPT_DATA_BLOB blob = {0}, *ptr; + BOOL ret; + + TRACE("(%d, %p, %08x, %08x, %p, %p, %p, %p, %p)\n", dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, phCertStore, + phMsg); + + switch (dwObjectType) + { + case CERT_QUERY_OBJECT_FILE: + if (!CRYPT_ReadBlobFromFile(pvObject, &blob)) return FALSE; + ptr = &blob; + break; + + case CERT_QUERY_OBJECT_BLOB: + ptr = (CRYPT_DATA_BLOB *)pvObject; + break; + + default: + return FALSE; + } + + ret = PFXIsPFXBlob(ptr); + if (ret) + { + if (pdwMsgAndCertEncodingType) *pdwMsgAndCertEncodingType = X509_ASN_ENCODING; + if (pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_PFX; + if (pdwFormatType) *pdwFormatType = CERT_QUERY_FORMAT_BINARY; + if (phCertStore) *phCertStore = NULL; + if (phMsg) *phMsg = NULL; + } + + CryptMemFree(blob.pbData); + return ret; +} + BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, DWORD dwExpectedContentTypeFlags, DWORD dwExpectedFormatTypeFlags, DWORD dwFlags, DWORD *pdwMsgAndCertEncodingType, DWORD *pdwContentType, @@ -703,8 +745,7 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, const void **ppvContext) { static const DWORD unimplementedTypes = - CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_PFX | - CERT_QUERY_CONTENT_FLAG_CERT_PAIR; + CERT_QUERY_CONTENT_FLAG_PKCS10 | CERT_QUERY_CONTENT_FLAG_CERT_PAIR; BOOL ret = TRUE; TRACE("(%08x, %p, %08x, %08x, %08x, %p, %p, %p, %p, %p, %p)\n", @@ -779,6 +820,14 @@ BOOL WINAPI CryptQueryObject(DWORD dwObjectType, const void *pvObject, dwExpectedContentTypeFlags, pdwMsgAndCertEncodingType, pdwContentType, phCertStore, phMsg); } + if (!ret && + (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PFX)) + { + ret = CRYPT_QueryPFXObject(dwObjectType, pvObject, + dwExpectedContentTypeFlags, dwExpectedFormatTypeFlags, + pdwMsgAndCertEncodingType, pdwContentType, pdwFormatType, + phCertStore, phMsg); + } if (!ret) SetLastError(CRYPT_E_NO_MATCH); TRACE("returning %d\n", ret); diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index b13fee6..f3fb420 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -3326,6 +3326,39 @@ static void test_PFXImportCertStore(void) CertCloseStore( store, 0 ); } +static void test_CryptQueryObject(void) +{ + CRYPT_DATA_BLOB pfx; + DWORD encoding_type, content_type, format_type; + HCERTSTORE store; + HCRYPTMSG msg; + const void *ctx; + BOOL ret; + + SetLastError( 0xdeadbeef ); + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, NULL, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL ); + ok( !ret, "success\n" ); + ok( GetLastError() == E_INVALIDARG, "got %u\n", GetLastError() ); + + pfx.pbData = (BYTE *)pfxdata; + pfx.cbData = sizeof(pfxdata); + encoding_type = content_type = format_type = 0xdeadbeef; + store = (HCERTSTORE *)0xdeadbeef; + msg = (HCRYPTMSG *)0xdeadbeef; + ctx = (void *)0xdeadbeef; + ret = CryptQueryObject( CERT_QUERY_OBJECT_BLOB, &pfx, CERT_QUERY_CONTENT_FLAG_ALL, + CERT_QUERY_FORMAT_FLAG_BINARY, 0, &encoding_type, &content_type, &format_type, + &store, &msg, &ctx ); + ok( ret, "got %u\n", GetLastError() ); + ok( encoding_type == X509_ASN_ENCODING, "got %08x\n", encoding_type ); + ok( content_type == CERT_QUERY_CONTENT_PFX, "got %08x\n", content_type ); + ok( format_type == CERT_QUERY_FORMAT_BINARY, "got %08x\n", format_type ); + ok( store == NULL, "got %p\n", store ); + ok( msg == NULL, "got %p\n", msg ); + ok( ctx == NULL, "got %p\n", ctx ); +} + START_TEST(store) { /* various combinations of CertOpenStore */ @@ -3357,4 +3390,5 @@ START_TEST(store) test_I_UpdateStore(); test_PFXImportCertStore(); + test_CryptQueryObject(); }

5 years, 3 months

Hans Leidekker : secur32: Ignore spurious callbacks on macOS.

by Alexandre Julliard

Module: wine Branch: master Commit: 4782b283d8eddf315773bbde3e2857b1e31c7dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4782b283d8eddf315773bbde… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 1 11:09:50 2019 +0100 secur32: Ignore spurious callbacks on macOS. For unknown reasons Mojave will sometimes call the schan_push_adapter callback during an SSLRead call. This confuses our code which is only prepared to handle schan_pull_adapter callbacks in this context. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index bd080dc..29d2f65 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -181,10 +181,17 @@ enum { }; #endif +enum schan_mode { + schan_mode_NONE, + schan_mode_READ, + schan_mode_WRITE, + schan_mode_HANDSHAKE, +}; struct mac_session { SSLContextRef context; struct schan_transport *transport; + enum schan_mode mode; CRITICAL_SECTION cs; }; @@ -634,6 +641,12 @@ static OSStatus schan_pull_adapter(SSLConnectionRef transport, void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_READ && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_pull(s->transport, buff, buff_len); if (status == 0) { @@ -693,6 +706,12 @@ static OSStatus schan_push_adapter(SSLConnectionRef transport, const void *buff, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->transport, buff, buff_len, *buff_len); + if (s->mode != schan_mode_WRITE && s->mode != schan_mode_HANDSHAKE) + { + WARN("called in mode %u\n", s->mode); + return noErr; + } + status = schan_push(s->transport, buff, buff_len); if (status == 0) { @@ -787,6 +806,8 @@ BOOL schan_imp_create_session(schan_imp_session *session, schan_credentials *cre goto fail; } + s->mode = schan_mode_NONE; + TRACE(" -> %p/%p\n", s, s->context); *session = (schan_imp_session)s; @@ -837,7 +858,10 @@ SECURITY_STATUS schan_imp_handshake(schan_imp_session session) TRACE("(%p/%p)\n", s, s->context); + s->mode = schan_mode_HANDSHAKE; status = SSLHandshake(s->context); + s->mode = schan_mode_NONE; + if (status == noErr) { TRACE("Handshake completed\n"); @@ -1096,8 +1120,13 @@ SECURITY_STATUS schan_imp_send(schan_imp_session session, const void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_WRITE; + status = SSLWrite(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr) TRACE("Wrote %lu bytes\n", *length); else if (status == errSSLWouldBlock) @@ -1128,8 +1157,13 @@ SECURITY_STATUS schan_imp_recv(schan_imp_session session, void *buffer, TRACE("(%p/%p, %p, %p/%lu)\n", s, s->context, buffer, length, *length); EnterCriticalSection(&s->cs); + s->mode = schan_mode_READ; + status = SSLRead(s->context, buffer, *length, length); + + s->mode = schan_mode_NONE; LeaveCriticalSection(&s->cs); + if (status == noErr || status == errSSLClosedGraceful) TRACE("Read %lu bytes\n", *length); else if (status == errSSLWouldBlock)

5 years, 3 months

Alistair Leslie-Hughes : uiautomationcore: Update spec file.

by Alexandre Julliard

Module: wine Branch: master Commit: f6738761c3f7a076c39c2a48a9804265258cd0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6738761c3f7a076c39c2a48… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jan 31 23:12:57 2019 +0000 uiautomationcore: Update spec file. File version: 7.2.16299.15 (windows 10). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uiautomationcore.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 48a06b2..28eefc9 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -6,6 +6,7 @@ @ stub ExpandCollapsePattern_Collapse @ stub ExpandCollapsePattern_Expand @ stub GridPattern_GetItem +#@ stub IgnoreLeaksInCurrentlyTrackedMemory @ stub InvokePattern_Invoke @ stub ItemContainerPattern_FindItemByProperty @ stub LegacyIAccessiblePattern_DoDefaultAction @@ -14,6 +15,7 @@ @ stub LegacyIAccessiblePattern_SetValue @ stub MultipleViewPattern_GetViewName @ stub MultipleViewPattern_SetCurrentView +#@ stub PostTestCheckForLeaks @ stub RangeValuePattern_SetValue @ stub ScrollItemPattern_ScrollIntoView @ stub ScrollPattern_Scroll @@ -53,6 +55,8 @@ @ stub TransformPattern_Rotate @ stub UiaAddEvent @ stdcall UiaClientsAreListening() +#@ stub UiaDisconnectAllProviders +#@ stub UiaDisconnectProvider @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind @@ -69,6 +73,7 @@ @ stub UiaHUiaNodeFromVariant @ stub UiaHasServerSideProvider @ stub UiaHostProviderFromHwnd +#@ stub UiaIAccessibleFromProvider @ stdcall UiaLookupId(long ptr) @ stub UiaNavigate @ stub UiaNodeFromFocus @@ -77,15 +82,21 @@ @ stub UiaNodeFromProvider @ stub UiaNodeRelease @ stub UiaPatternRelease +#@ stub UiaProviderForNonClient +#@ stub UiaProviderFromIAccessible @ stub UiaRaiseAsyncContentLoadedEvent @ stdcall UiaRaiseAutomationEvent(ptr long) @ stub UiaRaiseAutomationPropertyChangedEvent +#@ stub UiaRaiseChangesEvent +#@ stub UiaRaiseNotificationEvent @ stub UiaRaiseStructureChangedEvent +#@ stub UiaRaiseTextEditTextChangedEvent @ stub UiaRegisterProviderCallback @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease +#@ stub UpdateErrorLoggingCallback @ stub ValuePattern_SetValue @ stub VirtualizedItemPattern_Realize @ stub WindowPattern_Close

5 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2019