wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Derek Lesho : ntoskrnl.exe: Implement PsLookupProcessByProcessId.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: ae6ae91d1abf87847f2d9218512f29c94a101a76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae6ae91d1abf87847f2d9218… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:54 2019 +0200 ntoskrnl.exe: Implement PsLookupProcessByProcessId. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 +++++++++++++++++++----------- include/ddk/ntifs.h | 1 + 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d31082b..7f3ca05 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2482,6 +2482,25 @@ PEPROCESS WINAPI IoGetCurrentProcess(void) return NULL; } +/*********************************************************************** + * PsLookupProcessByProcessId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupProcessByProcessId( HANDLE processid, PEPROCESS *process ) +{ + NTSTATUS status; + HANDLE handle; + + TRACE( "(%p %p)\n", processid, process ); + + if (!(handle = OpenProcess( PROCESS_ALL_ACCESS, FALSE, HandleToUlong(processid) ))) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( handle, PROCESS_ALL_ACCESS, PsProcessType, KernelMode, (void**)process, NULL ); + + NtClose( handle ); + return status; +} + static void *create_thread_object( HANDLE handle ) { @@ -3255,17 +3274,6 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) } /***************************************************** - * PsLookupProcessByProcessId (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) -{ - static int once; - if (!once++) FIXME("(%p %p) stub\n", processid, process); - return STATUS_NOT_IMPLEMENTED; -} - - -/***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index 9b57ae7..ec4d1d5 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); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE,PEPROCESS*); NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void);

1 0

Derek Lesho : ntoskrnl.exe: Implement process object constructor.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: e5bbb5e6ca152782e4c43dcb8368fbae87db2322 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5bbb5e6ca152782e4c43dcb… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:39 2019 +0200 ntoskrnl.exe: Implement process object constructor. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2c0b51d..d31082b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2451,11 +2451,23 @@ NTSTATUS WINAPI FsRtlRegisterUncProvider(PHANDLE MupHandle, PUNICODE_STRING Redi } +static void *create_process_object( HANDLE handle ) +{ + PEPROCESS process; + + if (!(process = alloc_kernel_object( PsProcessType, handle, sizeof(*process), 0 ))) return NULL; + + process->header.Type = 3; + process->header.WaitListHead.Blink = INVALID_HANDLE_VALUE; /* mark as kernel object */ + return process; +} + static const WCHAR process_type_name[] = {'P','r','o','c','e','s','s',0}; static struct _OBJECT_TYPE process_type = { - process_type_name + process_type_name, + create_process_object }; POBJECT_TYPE PsProcessType = &process_type; diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index f5a7628..5f30961 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -28,6 +28,10 @@ struct _OBJECT_TYPE void (*release)(void*); /* called when the last reference is released */ }; +struct _EPROCESS { + DISPATCHER_HEADER header; +}; + struct _KTHREAD { DISPATCHER_HEADER header;

1 0

Derek Lesho : server: Allow creating process kernel objects.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: f534fbd3e3c83df49c7c6b8e608a99f2af65adc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f534fbd3e3c83df49c7c6b8e… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:30 2019 +0200 server: Allow creating process kernel objects. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/process.c | 10 +++++++++- server/process.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/process.c b/server/process.c index 1260baf..4a1cebf 100644 --- a/server/process.c +++ b/server/process.c @@ -64,6 +64,7 @@ static struct object_type *process_get_type( struct object *obj ); static int process_signaled( struct object *obj, struct wait_queue_entry *entry ); static unsigned int process_map_access( struct object *obj, unsigned int access ); static void process_poll_event( struct fd *fd, int event ); +static struct list *process_get_kernel_obj_list( struct object *obj ); static void process_destroy( struct object *obj ); static void terminate_process( struct process *process, struct thread *skip, int exit_code ); @@ -85,7 +86,7 @@ static const struct object_ops process_ops = no_link_name, /* link_name */ NULL, /* unlink_name */ no_open_file, /* open_file */ - no_kernel_obj_list, /* get_kernel_obj_list */ + process_get_kernel_obj_list, /* get_kernel_obj_list */ no_close_handle, /* close_handle */ process_destroy /* destroy */ }; @@ -526,6 +527,7 @@ struct process *create_process( int fd, struct process *parent, int inherit_all, process->trace_data = 0; process->rawinput_mouse = NULL; process->rawinput_kbd = NULL; + list_init( &process->kernel_object ); list_init( &process->thread_list ); list_init( &process->locks ); list_init( &process->asyncs ); @@ -661,6 +663,12 @@ static unsigned int process_map_access( struct object *obj, unsigned int access return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL); } +static struct list *process_get_kernel_obj_list( struct object *obj ) +{ + struct process *process = (struct process *)obj; + return &process->kernel_object; +} + static void process_poll_event( struct fd *fd, int event ) { struct process *process = get_fd_user( fd ); diff --git a/server/process.h b/server/process.h index 4566a04..d9d29f0 100644 --- a/server/process.h +++ b/server/process.h @@ -96,6 +96,7 @@ struct process struct list rawinput_devices;/* list of registered rawinput devices */ const struct rawinput_device *rawinput_mouse; /* rawinput mouse device, if any */ const struct rawinput_device *rawinput_kbd; /* rawinput keyboard device, if any */ + struct list kernel_object; /* list of kernel object pointers */ }; struct process_snapshot

1 0

Derek Lesho : ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 7498c15b0d3276c539b5854ffbb93642076b3782 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7498c15b0d3276c539b5854f… Author: Derek Lesho <dereklesho52(a)gmail.com> Date: Fri Apr 19 18:24:14 2019 +0200 ntoskrnl.exe: Implement PsLookupThreadByThreadId. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3789abd..2c0b51d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2522,6 +2522,26 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) return thread; } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId( HANDLE threadid, PETHREAD *thread ) +{ + NTSTATUS status; + HANDLE handle; + + TRACE( "(%p %p)\n", threadid, thread ); + + if (!(handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, HandleToUlong(threadid) ))) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( handle, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (void**)thread, NULL ); + + NtClose( handle ); + return status; +} + + /*********************************************************************** * KeInsertQueue (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 141c8aa..f965ff5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -914,7 +914,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c3839da..d7083f7 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "driver.h" @@ -1167,6 +1168,20 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + if (thread) ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1210,6 +1225,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_lookaside_list(); test_ob_reference(test_input->path); test_resource(); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357f..9b57ae7 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); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif

1 0

Jacek Caban : mshtml: Support VT_R8 in variant_to_nsstr.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 2c389667295f014168a9b0bfa72a9511801eae15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c389667295f014168a9b0bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:32 2019 +0200 mshtml: Support VT_R8 in variant_to_nsstr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsembed.c | 15 +++++++++++++++ dlls/mshtml/tests/elements.js | 2 ++ dlls/mshtml/tests/style.c | 10 ++++++++++ 3 files changed, 27 insertions(+) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 08e6507..35e9bf0 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -962,6 +962,21 @@ HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) nsAString_Init(nsstr, buf); break; + case VT_R8: { + VARIANT strv; + HRESULT hres; + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), + 0, VT_BSTR); + if(FAILED(hres)) + return hres; + + nsAString_Init(nsstr, V_BSTR(&strv)); + SysFreeString(V_BSTR(&strv)); + break; + } + default: FIXME("not implemented for %s\n", debugstr_variant(v)); return E_NOTIMPL; diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 4f0c802..320a2f6 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -81,6 +81,8 @@ function test_textContent() { ok(div.textContent === "", "div.textContent = " + div.textContent); div.textContent = 11; ok(div.textContent === "11", "div.textContent = " + div.textContent); + div.textContent = 10.5; + ok(div.textContent === "10.5", "div.textContent = " + div.textContent); ok(document.textContent === null, "document.textContent = " + document.textContent); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index a7b4506..52a3a5c 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -852,6 +852,16 @@ static void test_css_style_declaration(IHTMLCSSStyleDeclaration *css_style) test_var_bstr(&v, "0"); VariantClear(&v); + V_VT(&v) = VT_R8; + V_R8(&v) = 0.5; + hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v); + ok(hres == S_OK, "put_opacity failed: %08x\n", hres); + + hres = IHTMLCSSStyleDeclaration_get_opacity(css_style, &v); + ok(hres == S_OK, "get_opacity failed: %08x\n", hres); + test_var_bstr(&v, "0.5"); + VariantClear(&v); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = a2bstr("1"); hres = IHTMLCSSStyleDeclaration_put_opacity(css_style, v);

1 0

Jacek Caban : mshtml: Use variant_to_nsstr in IHTMLDOMNode3:: put_textContent.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: d538e86a60c8c8776dc2989309200d7c3abcb8ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=d538e86a60c8c8776dc29893… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:23 2019 +0200 mshtml: Use variant_to_nsstr in IHTMLDOMNode3::put_textContent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlnode.c | 7 +------ dlls/mshtml/tests/elements.js | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 36cfc80..32f6efd 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1245,12 +1245,7 @@ static HRESULT WINAPI HTMLDOMNode3_put_textContent(IHTMLDOMNode3 *iface, VARIANT TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - if(V_VT(&v) != VT_BSTR) { - FIXME("unsupported argument %s\n", debugstr_variant(&v)); - return E_NOTIMPL; - } - - nsAString_Init(&nsstr, V_BSTR(&v)); + variant_to_nsstr(&v, FALSE, &nsstr); nsres = nsIDOMNode_SetTextContent(This->nsnode, &nsstr); nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { diff --git a/dlls/mshtml/tests/elements.js b/dlls/mshtml/tests/elements.js index 4c647d6..4f0c802 100644 --- a/dlls/mshtml/tests/elements.js +++ b/dlls/mshtml/tests/elements.js @@ -77,6 +77,11 @@ function test_textContent() { ok(div.textContent === "", "div.textContent = " + div.textContent); ok(div.childNodes.length === 0, "div.childNodes.length = " + div.childNodes.length); + div.textContent = null; + ok(div.textContent === "", "div.textContent = " + div.textContent); + div.textContent = 11; + ok(div.textContent === "11", "div.textContent = " + div.textContent); + ok(document.textContent === null, "document.textContent = " + document.textContent); next_test();

1 0

Jacek Caban : mshtml: Factor out variant_to_nsstr from var_to_styleval.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 1593364466b195571c3be71650d113645895aa57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1593364466b195571c3be716… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:16 2019 +0200 mshtml: Factor out variant_to_nsstr from var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 37 ++++--------------------------------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 2d045db..7f50cb4 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -933,43 +933,14 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ static HRESULT var_to_styleval(CSSStyle *style, VARIANT *v, const style_tbl_entry_t *entry, nsAString *nsstr) { + HRESULT hres; unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? entry->flags : 0; - switch(V_VT(v)) { - case VT_NULL: - nsAString_InitDepend(nsstr, NULL); - return S_OK; - - case VT_BSTR: - nsAString_InitDepend(nsstr, V_BSTR(v)); - break; - - case VT_BSTR|VT_BYREF: - nsAString_InitDepend(nsstr, *V_BSTRREF(v)); - break; - - case VT_I4: { - static const WCHAR formatW[] = {'%','d',0}; - static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; - WCHAR buf[14]; - - if(flags & ATTR_HEX_INT) - wsprintfW(buf, hex_formatW, V_I4(v)); - else - wsprintfW(buf, formatW, V_I4(v)); - - nsAString_Init(nsstr, buf); - break; - } - default: - FIXME("not implemented for %s\n", debugstr_variant(v)); - return E_NOTIMPL; - - } - if(flags & ATTR_FIX_PX) + hres = variant_to_nsstr(v, !!(flags & ATTR_HEX_INT), nsstr); + if(SUCCEEDED(hres) && (flags & ATTR_FIX_PX)) fix_px_value(nsstr); - return S_OK; + return hres; } static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a44eaf5..f4bbe76 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -975,6 +975,7 @@ void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; HRESULT map_nsresult(nsresult) DECLSPEC_HIDDEN; HRESULT return_nsstr(nsresult,nsAString*,BSTR*) DECLSPEC_HIDDEN; HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) DECLSPEC_HIDDEN; +HRESULT variant_to_nsstr(VARIANT*,BOOL,nsAString*) DECLSPEC_HIDDEN; HRESULT return_nsform(nsresult,nsIDOMHTMLFormElement*,IHTMLFormElement**) DECLSPEC_HIDDEN; nsICommandParams *create_nscommand_params(void) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index bcfc437..08e6507 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -932,6 +932,44 @@ HRESULT return_nsstr_variant(nsresult nsres, nsAString *nsstr, VARIANT *p) return S_OK; } +/* + * Converts VARIANT to string and stores the result in nsAString. To avoid useless + * allocations, the function uses an existing string if available, so caller must + * ensure that passed VARIANT is unchanged as long as its string representation is used + */ +HRESULT variant_to_nsstr(VARIANT *v, BOOL hex_int, nsAString *nsstr) +{ + WCHAR buf[32]; + + static const WCHAR d_formatW[] = {'%','d',0}; + static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; + + switch(V_VT(v)) { + case VT_NULL: + nsAString_InitDepend(nsstr, NULL); + return S_OK; + + case VT_BSTR: + nsAString_InitDepend(nsstr, V_BSTR(v)); + break; + + case VT_BSTR|VT_BYREF: + nsAString_InitDepend(nsstr, *V_BSTRREF(v)); + break; + + case VT_I4: + wsprintfW(buf, hex_int ? hex_formatW : d_formatW, V_I4(v)); + nsAString_Init(nsstr, buf); + break; + + default: + FIXME("not implemented for %s\n", debugstr_variant(v)); + return E_NOTIMPL; + + } + return S_OK; +} + nsICommandParams *create_nscommand_params(void) { nsICommandParams *ret = NULL;

1 0

Jacek Caban : mshtml: Return nsAString from var_to_styleval.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: f0497aac0b506951229340c5d256d56b07fe4ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0497aac0b506951229340c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:37:05 2019 +0200 mshtml: Return nsAString from var_to_styleval. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 57 ++++++++++++++++++++++++++--------------------- dlls/mshtml/tests/style.c | 18 ++++++++++++++- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index aa065dd..2d045db 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -931,41 +931,45 @@ static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_ return map_nsresult(nsres); } -static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tbl_entry_t *entry, WCHAR *buf, const WCHAR **ret) +static HRESULT var_to_styleval(CSSStyle *style, VARIANT *v, const style_tbl_entry_t *entry, nsAString *nsstr) { + unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 + ? entry->flags : 0; + switch(V_VT(v)) { case VT_NULL: - *ret = emptyW; + nsAString_InitDepend(nsstr, NULL); return S_OK; case VT_BSTR: - *ret = V_BSTR(v); - return S_OK; + nsAString_InitDepend(nsstr, V_BSTR(v)); + break; case VT_BSTR|VT_BYREF: - *ret = *V_BSTRREF(v); - return S_OK; + nsAString_InitDepend(nsstr, *V_BSTRREF(v)); + break; case VT_I4: { - unsigned flags = entry && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9 ? entry->flags : 0; static const WCHAR formatW[] = {'%','d',0}; static const WCHAR hex_formatW[] = {'#','%','0','6','x',0}; + WCHAR buf[14]; if(flags & ATTR_HEX_INT) wsprintfW(buf, hex_formatW, V_I4(v)); - else if(flags & ATTR_FIX_PX) - wsprintfW(buf, px_formatW, V_I4(v)); else wsprintfW(buf, formatW, V_I4(v)); - *ret = buf; - return S_OK; + nsAString_Init(nsstr, buf); + break; } default: FIXME("not implemented for %s\n", debugstr_variant(v)); return E_NOTIMPL; } + if(flags & ATTR_FIX_PX) + fix_px_value(nsstr); + return S_OK; } static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) @@ -1008,15 +1012,16 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W static HRESULT set_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *value) { - const WCHAR *val; - WCHAR buf[14]; + nsAString val; HRESULT hres; - hres = var_to_styleval(style, value, &style_tbl[sid], buf, &val); + hres = var_to_styleval(style, value, &style_tbl[sid], &val); if(FAILED(hres)) return hres; - return set_style_property(style, sid, val); + hres = set_nsstyle_property(style->nsstyle, sid, &val); + nsAString_Finish(&val); + return hres; } static HRESULT get_nsstyle_attr_nsval(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, nsAString *value) @@ -5038,21 +5043,20 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); nsAString priority_str, name_str, value_str; const style_tbl_entry_t *style_entry; - const WCHAR *val; - WCHAR buf[14]; nsresult nsres; HRESULT hres; TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(name), debugstr_variant(value), debugstr_variant(priority)); style_entry = lookup_style_tbl(name); - hres = var_to_styleval(This, value, style_entry, buf, &val); + hres = var_to_styleval(This, value, style_entry, &value_str); if(FAILED(hres)) return hres; if(priority) { if(V_VT(priority) != VT_BSTR) { WARN("invalid priority type %s\n", debugstr_variant(priority)); + nsAString_Finish(&value_str); return S_OK; } nsAString_InitDepend(&priority_str, V_BSTR(priority)); @@ -5061,7 +5065,6 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_setProperty(IHTMLCSSStyleDeclarati } nsAString_InitDepend(&name_str, style_entry ? style_entry->name : name); - nsAString_InitDepend(&value_str, val); nsres = nsIDOMCSSStyleDeclaration_SetProperty(This->nsstyle, &name_str, &value_str, &priority_str); nsAString_Finish(&name_str); nsAString_Finish(&value_str); @@ -5263,18 +5266,19 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundPosition(IHTMLCSSSty static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionX(IHTMLCSSStyleDeclaration *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - WCHAR buf[14], *pos_val; - nsAString pos_str; + nsAString pos_str, val_str; const WCHAR *val; + WCHAR *pos_val; DWORD val_len; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION_X], buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION_X], &val_str); if(FAILED(hres)) return hres; + nsAString_GetData(&val_str, &val); val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); @@ -5305,6 +5309,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionX(IHTMLCSSSt } } nsAString_Finish(&pos_str); + nsAString_Finish(&val_str); if(FAILED(hres)) return hres; @@ -5356,18 +5361,19 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_backgroundPositionX(IHTMLCSSSt static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionY(IHTMLCSSStyleDeclaration *iface, VARIANT v) { CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - WCHAR buf[14], *pos_val; - nsAString pos_str; + nsAString pos_str, val_str; const WCHAR *val; + WCHAR *pos_val; DWORD val_len; HRESULT hres; TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION], buf, &val); + hres = var_to_styleval(This, &v, &style_tbl[STYLEID_BACKGROUND_POSITION], &val_str); if(FAILED(hres)) return hres; + nsAString_GetData(&val_str, &val); val_len = val ? strlenW(val) : 0; nsAString_Init(&pos_str, NULL); @@ -5401,6 +5407,7 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_put_backgroundPositionY(IHTMLCSSSt } } nsAString_Finish(&pos_str); + nsAString_Finish(&val_str); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 788b784..a7b4506 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -918,6 +918,22 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("5"); + hres = IHTMLStyle_put_marginRight(style, v); + ok(hres == S_OK, "put_marginRight failed: %08x\n", hres); + + V_VT(&v) = VT_NULL; + hres = IHTMLStyle_get_marginRight(style, &v); + ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); + if(compat_mode < COMPAT_IE9) + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + else + ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); if(css_style) { V_VT(&v) = VT_NULL; @@ -925,7 +941,7 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_marginRight failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v)); if(compat_mode < COMPAT_IE9) - ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", + ok(!strcmp_wa(V_BSTR(&v), "5px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v))); else ok(!V_BSTR(&v), "mariginRight = %s\n", wine_dbgstr_w(V_BSTR(&v)));

1 0

Jacek Caban : mshtml: Use nsAString in fix_px_value.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 983774e3fa2ee64db3db72746eb4c32930211e06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=983774e3fa2ee64db3db7274… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:36:55 2019 +0200 mshtml: Use nsAString in fix_px_value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 +++++++++++++--------- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsembed.c | 5 +++++ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index c205d67..aa065dd 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -858,9 +858,12 @@ static const style_tbl_entry_t *lookup_style_tbl(const WCHAR *name) return NULL; } -static LPWSTR fix_px_value(LPCWSTR val) +static void fix_px_value(nsAString *nsstr) { - LPCWSTR ptr = val; + const WCHAR *val, *ptr; + + nsAString_GetData(nsstr, &val); + ptr = val; while(*ptr) { while(*ptr && isspaceW(*ptr)) @@ -884,14 +887,14 @@ static LPWSTR fix_px_value(LPCWSTR val) TRACE("fixed %s -> %s\n", debugstr_w(val), debugstr_w(ret)); - return ret; + nsAString_SetData(nsstr, ret); + heap_free(ret); + break; } while(*ptr && !isspaceW(*ptr)) ptr++; } - - return NULL; } static LPWSTR fix_url_value(LPCWSTR val) @@ -968,11 +971,12 @@ static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tb static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) { nsAString value_str; + unsigned flags = 0; WCHAR *val = NULL; HRESULT hres; if(value && *value && dispex_compat_mode(&style->dispex) < COMPAT_MODE_IE9) { - unsigned flags = style_tbl[sid].flags; + flags = style_tbl[sid].flags; if(style_tbl[sid].allowed_values) { const WCHAR **iter; @@ -989,13 +993,13 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W } } - if(flags & ATTR_FIX_PX) - val = fix_px_value(value); - else if(flags & ATTR_FIX_URL) + if(flags & ATTR_FIX_URL) val = fix_url_value(value); } nsAString_InitDepend(&value_str, val ? val : value); + if(flags & ATTR_FIX_PX) + fix_px_value(&value_str); hres = set_nsstyle_property(style->nsstyle, sid, &value_str); nsAString_Finish(&value_str); heap_free(val); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fadea6b..a44eaf5 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -968,6 +968,7 @@ void nsACString_Finish(nsACString*) DECLSPEC_HIDDEN; BOOL nsAString_Init(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; void nsAString_InitDepend(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; +void nsAString_SetData(nsAString*,const PRUnichar*) DECLSPEC_HIDDEN; UINT32 nsAString_GetData(const nsAString*,const PRUnichar**) DECLSPEC_HIDDEN; void nsAString_Finish(nsAString*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 6aa2812..bcfc437 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -843,6 +843,11 @@ UINT32 nsAString_GetData(const nsAString *str, const PRUnichar **data) return NS_StringGetData(str, data, NULL); } +void nsAString_SetData(nsAString *str, const PRUnichar *data) +{ + NS_StringSetData(str, data, PR_UINT32_MAX); +} + void nsAString_Finish(nsAString *str) { NS_StringContainerFinish(str);

1 0

Jacek Caban : mshtml: Pass style value as nsAString to set_nsstyle_property.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 6b74a99da28024cd9a412681a5c8d956358613ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b74a99da28024cd9a412681… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 19 16:36:44 2019 +0200 mshtml: Pass style value as nsAString to set_nsstyle_property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 003ef8f..c205d67 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -913,17 +913,15 @@ static LPWSTR fix_url_value(LPCWSTR val) return ret; } -static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const WCHAR *value) +static HRESULT set_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, const nsAString *value) { - nsAString str_name, str_value, str_empty; + nsAString str_name, str_empty; nsresult nsres; nsAString_InitDepend(&str_name, style_tbl[sid].name); - nsAString_InitDepend(&str_value, value); nsAString_InitDepend(&str_empty, emptyW); - nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, &str_value, &str_empty); + nsres = nsIDOMCSSStyleDeclaration_SetProperty(nsstyle, &str_name, value, &str_empty); nsAString_Finish(&str_name); - nsAString_Finish(&str_value); nsAString_Finish(&str_empty); if(NS_FAILED(nsres)) WARN("SetProperty failed: %08x\n", nsres); @@ -969,6 +967,7 @@ static HRESULT var_to_styleval(CSSStyle *style, const VARIANT *v, const style_tb static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const WCHAR *value) { + nsAString value_str; WCHAR *val = NULL; HRESULT hres; @@ -983,7 +982,9 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W } if(!*iter) { WARN("invalid value %s\n", debugstr_w(value)); - set_nsstyle_property(style->nsstyle, sid, emptyW); + nsAString_InitDepend(&value_str, emptyW); + set_nsstyle_property(style->nsstyle, sid, &value_str); + nsAString_Finish(&value_str); return E_INVALIDARG; } } @@ -994,7 +995,9 @@ static inline HRESULT set_style_property(CSSStyle *style, styleid_t sid, const W val = fix_url_value(value); } - hres = set_nsstyle_property(style->nsstyle, sid, val ? val : value); + nsAString_InitDepend(&value_str, val ? val : value); + hres = set_nsstyle_property(style->nsstyle, sid, &value_str); + nsAString_Finish(&value_str); heap_free(val); return hres; } @@ -10291,13 +10294,16 @@ HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) HRESULT set_elem_style(HTMLElement *elem, styleid_t styleid, const WCHAR *val) { nsIDOMCSSStyleDeclaration *style; + nsAString value_str; HRESULT hres; hres = get_style_from_elem(elem, &style); if(FAILED(hres)) return hres; - hres = set_nsstyle_property(style, styleid, val); + nsAString_InitDepend(&value_str, val); + hres = set_nsstyle_property(style, styleid, &value_str); + nsAString_Finish(&value_str); nsIDOMCSSStyleDeclaration_Release(style); return hres; }

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
81
Older →

Jump to page:

2025

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 April 2019