February 2019 - Wine-commits

Jacek Caban : mshtml: Add style.borderCollapse property implementation.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 957a1f0216995c14c3a3fe737358578a506af707 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957a1f0216995c14c3a3fe73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 7 18:32:22 2019 +0100 mshtml: Add style.borderCollapse property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 27 +++++++++++++++++++-------- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7b82349..d260db1 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -63,6 +63,8 @@ static const WCHAR border_bottom_styleW[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','s','t','y','l','e',0}; static const WCHAR border_bottom_widthW[] = {'b','o','r','d','e','r','-','b','o','t','t','o','m','-','w','i','d','t','h',0}; +static const WCHAR border_collapseW[] = + {'b','o','r','d','e','r','-','c','o','l','l','a','p','s','e',0}; static const WCHAR border_colorW[] = {'b','o','r','d','e','r','-','c','o','l','o','r',0}; static const WCHAR border_leftW[] = @@ -416,6 +418,11 @@ static const style_tbl_entry_t style_tbl[] = { ATTR_FIX_PX }, { + border_collapseW, + DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLLAPSE, + DISPID_IHTMLSTYLE2_BORDERCOLLAPSE + }, + { border_colorW, DISPID_IHTMLCSSSTYLEDECLARATION_BORDERCOLOR, DISPID_IHTMLSTYLE_BORDERCOLOR @@ -3629,15 +3636,19 @@ static HRESULT WINAPI HTMLStyle2_get_tableLayout(IHTMLStyle2 *iface, BSTR *p) static HRESULT WINAPI HTMLStyle2_put_borderCollapse(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + return set_style_property(This, STYLEID_BORDER_COLLAPSE, v); } static HRESULT WINAPI HTMLStyle2_get_borderCollapse(IHTMLStyle2 *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_style_property(This, STYLEID_BORDER_COLLAPSE, p); } static HRESULT WINAPI HTMLStyle2_put_direction(IHTMLStyle2 *iface, BSTR v) @@ -6258,15 +6269,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_tableLayout(IHTMLCSSStyleDecla static HRESULT WINAPI HTMLCSSStyleDeclaration_put_borderCollapse(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_BORDER_COLLAPSE, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_borderCollapse(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_BORDER_COLLAPSE, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_direction(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 8cc1b3b..971a3dc 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -49,6 +49,7 @@ typedef enum { STYLEID_BORDER_BOTTOM_COLOR, STYLEID_BORDER_BOTTOM_STYLE, STYLEID_BORDER_BOTTOM_WIDTH, + STYLEID_BORDER_COLLAPSE, STYLEID_BORDER_COLOR, STYLEID_BORDER_LEFT, STYLEID_BORDER_LEFT_COLOR, diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index ae3b2a4..44e4c83 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -516,6 +516,22 @@ static void test_style2(IHTMLStyle2 *style2) ok(hres == S_OK, "get_tableLayout failed: %08x\n", hres); ok(!strcmp_wa(str, "fixed"), "tableLayout = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + /* borderCollapse */ + str = (void*)0xdeadbeef; + hres = IHTMLStyle2_get_borderCollapse(style2, &str); + ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(!str, "borderCollapse = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("separate"); + hres = IHTMLStyle2_put_borderCollapse(style2, str); + ok(hres == S_OK, "put_borderCollapse failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle2_get_borderCollapse(style2, &str); + ok(hres == S_OK, "get_borderCollapse failed: %08x\n", hres); + ok(!strcmp_wa(str, "separate"), "borderCollapse = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } static void test_style3(IHTMLStyle3 *style3, IHTMLCSSStyleDeclaration *css_style)

1 0

Jactry Zeng : ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: bb3f6842662fce48ad417990601205dddc365672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb3f6842662fce48ad417990… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Feb 7 16:15:07 2019 +0800 ole32/tests: Test PropVariantCopy() with VT_UNKNOWN. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec..8c9f79e 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable {

1 0

Jacek Caban : ntoskrnl.exe: Set FileObject of IRP passed to driver callbacks.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 38c825598f291f99407f3f215466e7c378aac7fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c825598f291f99407f3f21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 23:34:11 2019 +0100 ntoskrnl.exe: Set FileObject of IRP passed to driver callbacks. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=20083 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 21 +++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c3276c9..448d500 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -326,6 +326,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CREATE; irpsp->DeviceObject = device; + irpsp->FileObject = file; irpsp->Parameters.Create.SecurityContext = NULL; /* FIXME */ irpsp->Parameters.Create.Options = params->create.options; irpsp->Parameters.Create.ShareAccess = params->create.sharing; @@ -370,6 +371,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->MajorFunction = IRP_MJ_CLOSE; irpsp->DeviceObject = device; + irpsp->FileObject = file; irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; @@ -417,6 +419,7 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irp->RequestorMode = UserMode; irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->FileObject = file; irpsp->Parameters.Read.Key = params->read.key; irp->Flags |= IRP_READ_OPERATION; @@ -453,6 +456,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irp->RequestorMode = UserMode; irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->FileObject = file; irpsp->Parameters.Write.Key = params->write.key; irp->Flags |= IRP_WRITE_OPERATION; @@ -467,6 +471,7 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG ULONG out_size, HANDLE irp_handle ) { IRP *irp; + IO_STACK_LOCATION *irpsp; DEVICE_OBJECT *device; FILE_OBJECT *file = wine_server_get_ptr( params->flush.file ); @@ -483,6 +488,9 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->FileObject = file; + dispatch_irp( device, irp, irp_handle ); HeapFree( GetProcessHeap(), 0, in_buff ); @@ -493,6 +501,7 @@ static NTSTATUS dispatch_flush( const irp_params_t *params, void *in_buff, ULONG static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG in_size, ULONG out_size, HANDLE irp_handle ) { + IO_STACK_LOCATION *irpsp; IRP *irp; void *out_buff = NULL; void *to_free = NULL; @@ -540,6 +549,9 @@ static NTSTATUS dispatch_ioctl( const irp_params_t *params, void *in_buff, ULONG if (out_size && (params->ioctl.code & 3) != METHOD_BUFFERED) HeapReAlloc( GetProcessHeap(), HEAP_REALLOC_IN_PLACE_ONLY, in_buff, in_size ); + irpsp = IoGetNextIrpStackLocation( irp ); + irpsp->FileObject = file; + irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; irp->AssociatedIrp.SystemBuffer = in_buff; diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index bd1070c..da316b8 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -183,6 +183,18 @@ todo_wine ok(current != NULL, "Expected current process to be non-NULL\n"); } +static FILE_OBJECT *last_created_file; + +static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + ok(last_created_file != NULL, "last_created_file = NULL\n"); + ok(irpsp->FileObject == last_created_file, "FileObject != last_created_file\n"); + ok(irpsp->DeviceObject == device, "unexpected DeviceObject\n"); + ok(irpsp->FileObject->DeviceObject == device, "unexpected FileObject->DeviceObject\n"); +} + static void test_mdl_map(void) { char buffer[20] = "test buffer"; @@ -604,7 +616,7 @@ static void test_lookaside_list(void) ExDeleteNPagedLookasideList(&list); } -static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; void *buffer = irp->AssociatedIrp.SystemBuffer; @@ -628,6 +640,7 @@ static NTSTATUS main_test(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) attr.Attributes = OBJ_KERNEL_HANDLE; /* needed to be accessible from system threads */ ZwOpenFile(&okfile, FILE_APPEND_DATA | SYNCHRONIZE, &attr, &io, 0, FILE_SYNCHRONOUS_IO_NONALERT); + test_irp_struct(irp, device); test_currentprocess(); test_mdl_map(); test_init_funcs(); @@ -686,6 +699,10 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + + last_created_file = irpsp->FileObject; + irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -702,7 +719,7 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) status = test_basic_ioctl(irp, stack, &irp->IoStatus.Information); break; case IOCTL_WINETEST_MAIN_TEST: - status = main_test(irp, stack, &irp->IoStatus.Information); + status = main_test(device, irp, stack, &irp->IoStatus.Information); break; case IOCTL_WINETEST_LOAD_DRIVER: status = test_load_driver_ioctl(irp, stack, &irp->IoStatus.Information);

1 0

Jacek Caban : ntoskrnl.exe: Add KeRevertToUserAffinityThread stub.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 4498648ec1c095f24082db6e788b89df9cc8bdc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4498648ec1c095f24082db6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 23:34:48 2019 +0100 ntoskrnl.exe: Add KeRevertToUserAffinityThread stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 448d500..c1d15cd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2276,6 +2276,16 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity) FIXME("(%lx) stub\n", Affinity); } + +/*********************************************************************** + * KeRevertToUserAffinityThread (NTOSKRNL.EXE.@) + */ +void WINAPI KeRevertToUserAffinityThread(void) +{ + FIXME("() stub\n"); +} + + /*********************************************************************** * IoRegisterFileSystem (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 19cde8c..fc162ac 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -611,7 +611,7 @@ @ stub KeRemoveSystemServiceTable @ stdcall KeResetEvent(ptr) @ stub KeRestoreFloatingPointState -@ stub KeRevertToUserAffinityThread +@ stdcall KeRevertToUserAffinityThread() @ stub KeRundownQueue @ stub KeSaveFloatingPointState @ stub KeSaveStateForHibernate diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c3e2a16..293da50 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1531,6 +1531,7 @@ LONG WINAPI KeReleaseSemaphore(PRKSEMAPHORE,KPRIORITY,LONG,BOOLEAN); void WINAPI KeReleaseSpinLock(KSPIN_LOCK*,KIRQL); void WINAPI KeReleaseSpinLockFromDpcLevel(KSPIN_LOCK*); LONG WINAPI KeResetEvent(PRKEVENT); +void WINAPI KeRevertToUserAffinityThread(void); LONG WINAPI KeSetEvent(PRKEVENT,KPRIORITY,BOOLEAN); KPRIORITY WINAPI KeSetPriorityThread(PKTHREAD,KPRIORITY); void WINAPI KeSetSystemAffinityThread(KAFFINITY);

1 0

Jacek Caban : ntoskrnl.exe/tests: Introduce get_proc_address helper.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 4505ef6cfde3eb7bc60f069e4a6db40cb67cfac2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4505ef6cfde3eb7bc60f069e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 6 23:35:00 2019 +0100 ntoskrnl.exe/tests: Introduce get_proc_address helper. Based on a patch by Michael Müller. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index da316b8..5897ac0 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -174,6 +174,23 @@ static void winetest_end_todo(void) #define todo_wine_if(is_todo) todo_if((is_todo) && running_under_wine) #define win_skip(...) win_skip_(__FILE__, __LINE__, __VA_ARGS__) +static void *get_proc_address(const char *name) +{ + UNICODE_STRING name_u; + ANSI_STRING name_a; + NTSTATUS status; + void *ret; + + RtlInitAnsiString(&name_a, name); + status = RtlAnsiStringToUnicodeString(&name_u, &name_a, TRUE); + ok (!status, "RtlAnsiStringToUnicodeString failed: %#x\n", status); + if (status) return NULL; + + ret = MmGetSystemRoutineAddress(&name_u); + RtlFreeUnicodeString(&name_u); + return ret; +} + static void test_currentprocess(void) { PEPROCESS current; @@ -555,17 +572,9 @@ 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); + pKeExpandKernelStackAndCallout = get_proc_address("KeExpandKernelStackAndCallout"); if (pKeExpandKernelStackAndCallout) { callout_cnt = 0; @@ -575,8 +584,7 @@ static void test_stack_callout(void) } else win_skip("KeExpandKernelStackAndCallout is not available\n"); - RtlInitUnicodeString(&str, KeExpandKernelStackAndCalloutExW); - pKeExpandKernelStackAndCalloutEx = MmGetSystemRoutineAddress(&str); + pKeExpandKernelStackAndCalloutEx = get_proc_address("KeExpandKernelStackAndCalloutEx"); if (pKeExpandKernelStackAndCalloutEx) { callout_cnt = 0;

1 0

Michael Müller : ntoskrnl.exe: Implement NtBuildNumber.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 88b20b2dee5dc246e481a58ddaa983b98e63831c URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b20b2dee5dc246e481a58d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 6 23:35:18 2019 +0100 ntoskrnl.exe: Implement NtBuildNumber. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1d15cd..aa569d5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -60,6 +60,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay); BOOLEAN KdDebuggerEnabled = FALSE; ULONG InitSafeBootMode = 0; +USHORT NtBuildNumber = 0; extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ); @@ -2952,6 +2953,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif KeQueryTickCount( &count ); /* initialize the global KeTickCount */ + NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber; break; case DLL_PROCESS_DETACH: if (reserved) break; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fc162ac..c274966 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -751,7 +751,7 @@ @ stdcall NtAllocateLocallyUniqueId(ptr) @ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) -@ stub NtBuildNumber +@ extern NtBuildNumber @ stdcall NtClose(long) @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall NtCreateEvent(ptr long ptr long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5897ac0..3984240 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -624,6 +624,18 @@ static void test_lookaside_list(void) ExDeleteNPagedLookasideList(&list); } +static void test_version(void) +{ + USHORT *pNtBuildNumber; + ULONG build; + + pNtBuildNumber = get_proc_address("NtBuildNumber"); + ok(!!pNtBuildNumber, "Could not get pointer to NtBuildNumber\n"); + + PsGetVersion(NULL, NULL, &build, NULL); + ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -654,6 +666,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_init_funcs(); test_load_driver(); test_sync(); + test_version(); test_stack_callout(); test_lookaside_list();

1 0

Hans Leidekker : secur32: Add support for client certificate authentication.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 16d9f62bdf37739da3d78507d9541a3658531046 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d9f62bdf37739da3d78507… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 7 10:52:11 2019 +0100 secur32: Add support for client certificate authentication. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 92 ++++++------- dlls/secur32/schannel_gnutls.c | 303 ++++++++++++++++++++++++++++++++++++++++- dlls/secur32/schannel_macosx.c | 4 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 345 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16d9f62bdf37739da3d7…

1 0

Byeongsik Jeon : gdi32: Fix vertical rotation.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 40a7c5a8a8871f0b13238ebaf9b11a62f0e34fdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a7c5a8a8871f0b13238eba… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Thu Feb 7 14:43:37 2019 +0000 gdi32: Fix vertical rotation. Missed from cf891b04a087bcbc713e704c1adbf6b88243e996. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de62425..22dfe87 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7593,7 +7593,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMat); + pFT_Outline_Transform(outline, &transMatTategaki); needed = get_bezier_glyph_outline(outline, buflen, NULL);

1 0

Byeongsik Jeon : gdi32: Add a helper function to get the transform matrices.
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: fcfbb00cb1db0e51b6744ff59a101ed2fa778647 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcfbb00cb1db0e51b6744ff5… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Thu Feb 7 14:43:38 2019 +0000 gdi32: Add a helper function to get the transform matrices. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 250 +++++++++++++++++++++++++------------------------- 1 file changed, 126 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fcfbb00cb1db0e51b674…

1 0

Paul Gofman : wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry ().
by Alexandre Julliard 07 Feb '19

07 Feb '19

Module: wine Branch: master Commit: 44f5ca7f88f96b359834d2bef670f5d84a25b86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=44f5ca7f88f96b359834d2be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 7 00:09:38 2019 +0300 wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4096673..81b1fc0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -599,7 +599,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, depth_stencil = &ds_null; } else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type - || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality) + || (ds_texture->resource.multisample_type + && ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality)) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality,

1 0