October 2016 - Wine-Commits

Huw Davies : riched20: Emit RTF for paragraph numbering.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: c69e60efbcb8746dafa668d26728941a35f017dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69e60efbcb8746dafa668d26… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:52 2016 +0100 riched20: Emit RTF for paragraph numbering. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index e7d340a..77f50e3 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -456,6 +456,76 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, return TRUE; } +static BOOL stream_out_para_num( ME_OutStream *stream, ME_Paragraph *para, BOOL pn_dest ) +{ + static const char fmt_label[] = "{\\*\\pn\\pnlvlbody\\pnf%u\\pnindent%d\\pnstart%d%s%s}"; + static const char fmt_bullet[] = "{\\*\\pn\\pnlvlblt\\pnf%u\\pnindent%d{\\pntxtb\\'b7}}"; + static const char dec[] = "\\pndec"; + static const char lcltr[] = "\\pnlcltr"; + static const char ucltr[] = "\\pnucltr"; + static const char lcrm[] = "\\pnlcrm"; + static const char ucrm[] = "\\pnucrm"; + static const char period[] = "{\\pntxta.}"; + static const char paren[] = "{\\pntxta)}"; + static const char parens[] = "{\\pntxtb(}{\\pntxta)}"; + const char *type, *style = ""; + unsigned int idx; + + find_font_in_fonttbl( stream, &para->para_num.style->fmt, &idx ); + + if (!ME_StreamOutPrint( stream, "{\\pntext\\f%u ", idx )) return FALSE; + if (!ME_StreamOutRTFText( stream, para->para_num.text->szData, para->para_num.text->nLen )) + return FALSE; + if (!ME_StreamOutPrint( stream, "\\tab}" )) return FALSE; + + if (!pn_dest) return TRUE; + + if (para->fmt.wNumbering == PFN_BULLET) + { + if (!ME_StreamOutPrint( stream, fmt_bullet, idx, para->fmt.wNumberingTab )) + return FALSE; + } + else + { + switch (para->fmt.wNumbering) + { + case PFN_ARABIC: + default: + type = dec; + break; + case PFN_LCLETTER: + type = lcltr; + break; + case PFN_UCLETTER: + type = ucltr; + break; + case PFN_LCROMAN: + type = lcrm; + break; + case PFN_UCROMAN: + type = ucrm; + break; + } + switch (para->fmt.wNumberingStyle & 0xf00) + { + case PFNS_PERIOD: + style = period; + break; + case PFNS_PAREN: + style = paren; + break; + case PFNS_PARENS: + style = parens; + break; + } + + if (!ME_StreamOutPrint( stream, fmt_label, idx, para->fmt.wNumberingTab, + para->fmt.wNumberingStart, type, style )) + return FALSE; + } + return TRUE; +} + static BOOL ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, ME_DisplayItem *para) @@ -501,11 +571,18 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, } if (prev_para && !memcmp( fmt, &prev_para->fmt, sizeof(*fmt) )) + { + if (fmt->wNumbering) + return stream_out_para_num( pStream, &para->member.para, FALSE ); return TRUE; + } if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE; + if (fmt->wNumbering) + if (!stream_out_para_num( pStream, &para->member.para, TRUE )) return FALSE; + if (!editor->bEmulateVersion10) { /* v4.1 */ if (pStream->nNestingLevel > 0) strcat(props, "\\intbl"); @@ -515,7 +592,7 @@ ME_StreamOutRTFParaProps(ME_TextEditor *editor, ME_OutStream *pStream, if (fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE) strcat(props, "\\intbl"); } - + /* TODO: PFM_BORDER. M$ does not emit any keywords for these properties, and * when streaming border keywords in, PFM_BORDER is set, but wBorder field is * set very different from the documentation.

1 0

Jacek Caban : ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 86b5ec3fd1fb8c42f7e79b29647c59cd698aa236 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b5ec3fd1fb8c42f7e79b296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 12 17:13:52 2016 +0200 ntdll/tests: Added a test of using NtCancelIoEx on iosb associated with pipe listening. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 90ba950..dffd3f3 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -75,6 +75,7 @@ static NTSTATUS (WINAPI *pNtCreateNamedPipeFile) (PHANDLE handle, ULONG access, static NTSTATUS (WINAPI *pNtQueryInformationFile) (IN HANDLE FileHandle, OUT PIO_STATUS_BLOCK IoStatusBlock, OUT PVOID FileInformation, IN ULONG Length, IN FILE_INFORMATION_CLASS FileInformationClass); static NTSTATUS (WINAPI *pNtSetInformationFile) (HANDLE handle, PIO_STATUS_BLOCK io, PVOID ptr, ULONG len, FILE_INFORMATION_CLASS class); static NTSTATUS (WINAPI *pNtCancelIoFile) (HANDLE hFile, PIO_STATUS_BLOCK io_status); +static NTSTATUS (WINAPI *pNtCancelIoFileEx) (HANDLE hFile, IO_STATUS_BLOCK *iosb, IO_STATUS_BLOCK *io_status); static void (WINAPI *pRtlInitUnicodeString) (PUNICODE_STRING target, PCWSTR source); static HANDLE (WINAPI *pOpenThread)(DWORD dwDesiredAccess, BOOL bInheritHandle, DWORD dwThreadId); @@ -95,6 +96,7 @@ static BOOL init_func_ptrs(void) loadfunc(NtQueryInformationFile) loadfunc(NtSetInformationFile) loadfunc(NtCancelIoFile) + loadfunc(NtCancelIoFileEx) loadfunc(RtlInitUnicodeString) /* not fatal */ @@ -498,6 +500,21 @@ static void test_cancelio(void) ok(ioapc_called, "IOAPC didn't run\n"); + CloseHandle(hPipe); + + res = create_pipe(&hPipe, FILE_SHARE_READ | FILE_SHARE_WRITE, 0 /* OVERLAPPED */); + ok(!res, "NtCreateNamedPipeFile returned %x\n", res); + + memset(&iosb, 0x55, sizeof(iosb)); + res = listen_pipe(hPipe, hEvent, &iosb, FALSE); + ok(res == STATUS_PENDING, "NtFsControlFile returned %x\n", res); + + res = pNtCancelIoFileEx(hPipe, &iosb, &cancel_sb); + ok(!res, "NtCancelIoFileEx returned %x\n", res); + + ok(U(iosb).Status == STATUS_CANCELLED, "Wrong iostatus %x\n", U(iosb).Status); + ok(WaitForSingleObject(hEvent, 0) == 0, "hEvent not signaled\n"); + CloseHandle(hEvent); CloseHandle(hPipe); }

1 0

Hans Leidekker : webservices: Determine field size from write options and type size.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: ad57c7c72ad278dca2b3575bb6e4015f21d62abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad57c7c72ad278dca2b3575bb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:23 2016 +0200 webservices: Determine field size from write options and type size. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 ++++++ dlls/webservices/writer.c | 68 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c0710de..c364cff 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3775,12 +3775,18 @@ ULONG get_type_size( WS_TYPE type, const WS_STRUCT_DESCRIPTION *desc ) case WS_GUID_TYPE: return sizeof(GUID); + case WS_STRING_TYPE: + return sizeof(WS_STRING); + case WS_WSZ_TYPE: return sizeof(WCHAR *); case WS_BYTES_TYPE: return sizeof(WS_BYTES); + case WS_XML_STRING_TYPE: + return sizeof(WS_XML_STRING); + case WS_STRUCT_TYPE: return desc->size; @@ -3813,7 +3819,9 @@ static WS_READ_OPTION get_field_read_option( WS_TYPE type, ULONG options ) case WS_DOUBLE_TYPE: case WS_DATETIME_TYPE: case WS_GUID_TYPE: + case WS_STRING_TYPE: case WS_BYTES_TYPE: + case WS_XML_STRING_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_READ_NILLABLE_VALUE; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b59e903..26ab726 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2023,10 +2023,70 @@ static HRESULT write_type_struct_field( struct writer *writer, const WS_FIELD_DE return S_OK; } -static ULONG get_field_size( const WS_STRUCT_DESCRIPTION *desc, ULONG index ) +static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) { - if (index < desc->fieldCount - 1) return desc->fields[index + 1]->offset - desc->fields[index]->offset; - return desc->size - desc->fields[index]->offset; + if (options & WS_FIELD_POINTER) + { + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + return WS_WRITE_REQUIRED_POINTER; + } + + switch (type) + { + case WS_BOOL_TYPE: + case WS_INT8_TYPE: + case WS_INT16_TYPE: + case WS_INT32_TYPE: + case WS_INT64_TYPE: + case WS_UINT8_TYPE: + case WS_UINT16_TYPE: + case WS_UINT32_TYPE: + case WS_UINT64_TYPE: + case WS_DOUBLE_TYPE: + case WS_DATETIME_TYPE: + case WS_GUID_TYPE: + case WS_STRING_TYPE: + case WS_BYTES_TYPE: + case WS_XML_STRING_TYPE: + case WS_STRUCT_TYPE: + case WS_ENUM_TYPE: + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_VALUE; + return WS_WRITE_REQUIRED_VALUE; + + case WS_WSZ_TYPE: + case WS_DESCRIPTION_TYPE: + if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_POINTER; + return WS_WRITE_REQUIRED_POINTER; + + default: + FIXME( "unhandled type %u\n", type ); + return 0; + } +} + +static ULONG get_field_size( const WS_FIELD_DESCRIPTION *desc ) +{ + WS_WRITE_OPTION option; + ULONG size; + + switch ((option = get_field_write_option( desc->type, desc->options ))) + { + case WS_WRITE_REQUIRED_POINTER: + case WS_WRITE_NILLABLE_POINTER: + size = sizeof(const void *); + break; + + case WS_WRITE_REQUIRED_VALUE: + case WS_WRITE_NILLABLE_VALUE: + size = get_type_size( desc->type, desc->typeDescription ); + break; + + default: + WARN( "unhandled option %u\n", option ); + return 0; + } + + return size; } static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping, @@ -2045,7 +2105,7 @@ static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping for (i = 0; i < desc->fieldCount; i++) { field_ptr = (const char *)ptr + desc->fields[i]->offset; - field_size = get_field_size( desc, i ); + field_size = get_field_size( desc->fields[i] ); if ((hr = write_type_struct_field( writer, desc->fields[i], field_ptr, field_size )) != S_OK) return hr; }

1 0

Hans Leidekker : webservices: Strip trailing zeros from time fraction.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 6cd80610c871ce1fbcd0e9b0fede9fac66dd1669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cd80610c871ce1fbcd0e9b0f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:19 2016 +0200 webservices: Strip trailing zeros from time fraction. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 5 ++++- dlls/webservices/writer.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3bed673..7e65da3 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -2588,6 +2588,8 @@ static void test_datetime(void) { 1, WS_DATETIME_FORMAT_UTC, S_OK, "<t>0001-01-01T00:00:00.0000001Z</t>" }, { 1, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>0001-01-01T00:00:00.0000001+00:00</t>" }, { 1, WS_DATETIME_FORMAT_NONE, S_OK, "<t>0001-01-01T00:00:00.0000001</t>" }, + { 10, WS_DATETIME_FORMAT_NONE, S_OK, "<t>0001-01-01T00:00:00.000001</t>" }, + { 1000000, WS_DATETIME_FORMAT_NONE, S_OK, "<t>0001-01-01T00:00:00.1</t>" }, { 0x23c34600, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>0001-01-01T00:01:00+00:00</t>" }, { 0x861c46800, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>0001-01-01T01:00:00+00:00</t>" }, { 0x430e234000, WS_DATETIME_FORMAT_LOCAL, S_OK, "<t>0001-01-01T08:00:00+00:00</t>" }, @@ -2636,7 +2638,8 @@ static void test_datetime(void) ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); if (hr == S_OK) { - ok( check_result( writer, tests[i].result ) || broken(check_result( writer, tests[i].result2 )), + ok( check_result( writer, tests[i].result ) || + (tests[i].result2 && broken(check_result( writer, tests[i].result2 ))), "%u: wrong result\n", i ); } } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 619ec2b..36bf65b 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1235,6 +1235,7 @@ static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf ) { static const char fmt_frac[] = ".%07u"; len += sprintf( (char *)buf + len, fmt_frac, sec_frac ); + while (buf[len - 1] == '0') len--; } if (ptr->format == WS_DATETIME_FORMAT_UTC) {

1 0

Hans Leidekker : webservices: Handle nil elements in the reader.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: b2fe675791b0ad0aa462da85ad99fbecdc06be28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2fe675791b0ad0aa462da85a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:21 2016 +0200 webservices: Handle nil elements in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a6f5d6b..c0710de 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4052,6 +4052,24 @@ static HRESULT read_type_struct( struct reader *reader, WS_TYPE_MAPPING mapping, } } +static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) +{ + static const WS_XML_STRING localname = {3, (BYTE *)"nil"}; + static const WS_XML_STRING ns = {41, (BYTE *)"http://www.w3.org/2001/XMLSchema-instance"}; + ULONG i; + + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)elem->attributes[i]->value; + + if (elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->localName, &localname, NULL ) == S_OK && + WsXmlStringEquals( elem->attributes[i]->ns, &ns, NULL ) == S_OK && + text->value.length == 4 && !memcmp( text->value.bytes, "true", 4 )) return TRUE; + } + return FALSE; +} + static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYPE type, const WS_XML_STRING *localname, const WS_XML_STRING *ns, const void *desc, WS_READ_OPTION option, WS_HEAP *heap, @@ -4064,6 +4082,8 @@ static HRESULT read_type( struct reader *reader, WS_TYPE_MAPPING mapping, WS_TYP case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: if ((hr = read_type_next_element_node( reader, localname, ns )) != S_OK) return hr; + if ((option == WS_READ_NILLABLE_POINTER || option == WS_READ_NILLABLE_VALUE) && + is_nil_element( &reader->current->hdr )) return read_type_next_node( reader ); break; case WS_ANY_ELEMENT_TYPE_MAPPING:

1 0

Hans Leidekker : webservices/tests: Add more text type tests.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 9599479ed338616f3e7c16df5e5ddaacdc8f92fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9599479ed338616f3e7c16df5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 15:30:20 2016 +0200 webservices/tests: Add more text type tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 7e65da3..465bc5a 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1980,6 +1980,9 @@ static void test_text_types(void) static const WS_XML_INT32_TEXT val_int32 = { {WS_XML_TEXT_TYPE_INT32}, -2147483647 - 1 }; static const WS_XML_INT64_TEXT val_int64 = { {WS_XML_TEXT_TYPE_INT64}, -9223372036854775807 - 1 }; static const WS_XML_UINT64_TEXT val_uint64 = { {WS_XML_TEXT_TYPE_UINT64}, ~0 }; + static const WS_XML_DATETIME_TEXT val_datetime = { {WS_XML_TEXT_TYPE_DATETIME}, {0, WS_DATETIME_FORMAT_UTC} }; + static const WS_XML_DOUBLE_TEXT val_double = { {WS_XML_TEXT_TYPE_DOUBLE}, 1.1 }; + static const WS_XML_BASE64_TEXT val_base64 = { {WS_XML_TEXT_TYPE_BASE64}, (BYTE *)"test", 4 }; static const struct { const WS_XML_TEXT *text; @@ -1995,6 +1998,9 @@ static void test_text_types(void) { &val_int32.text, "<t>-2147483648</t>" }, { &val_int64.text, "<t>-9223372036854775808</t>" }, { &val_uint64.text, "<t>18446744073709551615</t>" }, + { &val_datetime.text, "<t>0001-01-01T00:00:00Z</t>" }, + { &val_double.text, "<t>1.1</t>" }, + { &val_base64.text, "<t>dGVzdA==</t>" }, }; HRESULT hr; ULONG i;

1 0

Sebastian Lackner : ntoskrnl.exe: Don' t transfer back input buffer for IRP_MJ_WRITE requests.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 8d799ea57bf607dc5e44089efdfd61f9511c657b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d799ea57bf607dc5e44089ef… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Oct 12 18:53:55 2016 +0200 ntoskrnl.exe: Don't transfer back input buffer for IRP_MJ_WRITE requests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 13 ++++++++++--- include/ddk/wdm.h | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 909bf6f..5d423e0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -176,12 +176,15 @@ static HANDLE get_device_manager(void) static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { FILE_OBJECT *file = irp->Tail.Overlay.OriginalFileObject; + HANDLE irp_handle = context; void *out_buff = irp->UserBuffer; - HANDLE handle = context; + + if (irp->Flags & IRP_WRITE_OPERATION) + out_buff = NULL; /* do not transfer back input buffer */ SERVER_START_REQ( set_irp_result ) { - req->handle = wine_server_obj_handle( handle ); + req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->file_ptr = wine_server_client_ptr( file ); if (irp->IoStatus.u.Status >= 0) @@ -193,7 +196,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - HeapFree( GetProcessHeap(), 0, out_buff ); + HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); return STATUS_SUCCESS; } @@ -248,6 +251,7 @@ static NTSTATUS dispatch_create( const irp_params_t *params, void *in_buff, ULON irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CREATE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -285,6 +289,7 @@ static NTSTATUS dispatch_close( const irp_params_t *params, void *in_buff, ULONG irp->UserIosb = NULL; irp->UserEvent = NULL; + irp->Flags |= IRP_CLOSE_OPERATION; dispatch_irp( device, irp, irp_handle ); HeapFree( GetProcessHeap(), 0, file ); /* FIXME: async close processing not supported */ @@ -325,6 +330,7 @@ static NTSTATUS dispatch_read( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Read.Key = params->read.key; + irp->Flags |= IRP_READ_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; @@ -358,6 +364,7 @@ static NTSTATUS dispatch_write( const irp_params_t *params, void *in_buff, ULONG irpsp = IoGetNextIrpStackLocation( irp ); irpsp->Parameters.Write.Key = params->write.key; + irp->Flags |= IRP_WRITE_OPERATION; dispatch_irp( device, irp, irp_handle ); return STATUS_SUCCESS; diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 5602f7d..d6ee235 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -457,6 +457,23 @@ typedef struct _IRP { } IRP; typedef struct _IRP *PIRP; +#define IRP_NOCACHE 0x0001 +#define IRP_PAGING_IO 0x0002 +#define IRP_MOUNT_COMPLETION 0x0002 +#define IRP_SYNCHRONOUS_API 0x0004 +#define IRP_ASSOCIATED_IRP 0x0008 +#define IRP_BUFFERED_IO 0x0010 +#define IRP_DEALLOCATE_BUFFER 0x0020 +#define IRP_INPUT_OPERATION 0x0040 +#define IRP_SYNCHRONOUS_PAGING_IO 0x0040 +#define IRP_CREATE_OPERATION 0x0080 +#define IRP_READ_OPERATION 0x0100 +#define IRP_WRITE_OPERATION 0x0200 +#define IRP_CLOSE_OPERATION 0x0400 +#define IRP_DEFER_IO_COMPLETION 0x0800 +#define IRP_OB_QUERY_NAME 0x1000 +#define IRP_HOLD_DEVICE_QUEUE 0x2000 + typedef VOID (WINAPI *PINTERFACE_REFERENCE)( PVOID Context);

1 0

Huw Davies : riched20: Add a helper to find a colour in the colour table.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 3e9a31ed26c1dd82b5f2a25873ff94f023b1baea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e9a31ed26c1dd82b5f2a2587… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:51 2016 +0100 riched20: Add a helper to find a colour in the colour table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 62 ++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 838168e..e7d340a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -277,6 +277,23 @@ static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) } } +static BOOL find_color_in_colortbl( ME_OutStream *stream, COLORREF color, unsigned int *idx ) +{ + int i; + + *idx = 0; + for (i = 1; i < stream->nColorTblLen; i++) + { + if (stream->colortbl[i] == color) + { + *idx = i; + break; + } + } + + return i < stream->nFontTblLen; +} + static BOOL ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, ME_DisplayItem *pLastRun) @@ -391,17 +408,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - unsigned int j; + unsigned int idx; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\clbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); - for (j = 1; j < pStream->nColorTblLen; j++) { - if (pStream->colortbl[j] == crColor) { - sprintf(props + strlen(props), "\\brdrcf%u", j); - break; - } - } + if (find_color_in_colortbl( pStream, crColor, &idx )) + sprintf(props + strlen(props), "\\brdrcf%u", idx); } } sprintf(props + strlen(props), "\\cellx%d", cell->member.cell.nRightBoundary); @@ -423,17 +436,13 @@ ME_StreamOutRTFTableProps(ME_TextEditor *editor, ME_OutStream *pStream, { if (borders[i]->width) { - unsigned int j; + unsigned int idx; COLORREF crColor = borders[i]->colorRef; sprintf(props + strlen(props), "\\trbrdr%c", sideChar[i]); sprintf(props + strlen(props), "\\brdrs"); sprintf(props + strlen(props), "\\brdrw%d", borders[i]->width); - for (j = 1; j < pStream->nColorTblLen; j++) { - if (pStream->colortbl[j] == crColor) { - sprintf(props + strlen(props), "\\brdrcf%u", j); - break; - } - } + if (find_color_in_colortbl( pStream, crColor, &idx )) + sprintf(props + strlen(props), "\\brdrcf%u", idx); } } for (i = 0; i < pFmt->cTabCount; i++) @@ -642,26 +651,15 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) strcat(props, "\\caps"); if (fmt->dwMask & CFM_ANIMATION) sprintf(props + strlen(props), "\\animtext%u", fmt->bAnimation); - if (fmt->dwMask & CFM_BACKCOLOR) { - if (!(fmt->dwEffects & CFE_AUTOBACKCOLOR)) { - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == fmt->crBackColor) { - sprintf(props + strlen(props), "\\cb%u", i); - break; - } - } - } + if ((fmt->dwMask & CFM_BACKCOLOR) && !(fmt->dwEffects & CFE_AUTOBACKCOLOR)) + if (find_color_in_colortbl( pStream, fmt->crBackColor, &i )) + sprintf(props + strlen(props), "\\cb%u", i); if (fmt->dwMask & CFM_BOLD && fmt->dwEffects & CFE_BOLD) strcat(props, "\\b"); - if (fmt->dwMask & CFM_COLOR) { - if (!(fmt->dwEffects & CFE_AUTOCOLOR)) { - for (i = 1; i < pStream->nColorTblLen; i++) - if (pStream->colortbl[i] == fmt->crTextColor) { - sprintf(props + strlen(props), "\\cf%u", i); - break; - } - } - } + if ((fmt->dwMask & CFM_COLOR) && !(fmt->dwEffects & CFE_AUTOCOLOR)) + if (find_color_in_colortbl( pStream, fmt->crTextColor, &i )) + sprintf(props + strlen(props), "\\cf%u", i); + /* TODO: CFM_DISABLED */ if (fmt->dwMask & CFM_EMBOSS && fmt->dwEffects & CFE_EMBOSS) strcat(props, "\\embo");

1 0

Huw Davies : riched20: Add a helper to find a font in the font table.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: 48c0c6648bc1657da3ac2b565b1efa313275bb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c0c6648bc1657da3ac2b565… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 12 12:58:50 2016 +0100 riched20: Add a helper to find a font in the font table. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index c3359c1..838168e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -237,6 +237,31 @@ static void add_font_to_fonttbl( ME_OutStream *stream, ME_Style *style ) } } +static BOOL find_font_in_fonttbl( ME_OutStream *stream, CHARFORMAT2W *fmt, unsigned int *idx ) +{ + WCHAR *facename; + int i; + + *idx = 0; + if (fmt->dwMask & CFM_FACE) + facename = fmt->szFaceName; + else + facename = stream->fonttbl[0].szFaceName; + for (i = 0; i < stream->nFontTblLen; i++) + { + if (facename == stream->fonttbl[i].szFaceName + || !lstrcmpW(facename, stream->fonttbl[i].szFaceName)) + if (!(fmt->dwMask & CFM_CHARSET) + || fmt->bCharSet == stream->fonttbl[i].bCharSet) + { + *idx = i; + break; + } + } + + return i < stream->nFontTblLen; +} + static void add_color_to_colortbl( ME_OutStream *stream, COLORREF color ) { int i; @@ -713,21 +738,9 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) } /* FIXME: How to emit CFM_WEIGHT? */ - if (fmt->dwMask & CFM_FACE || fmt->dwMask & CFM_CHARSET) { - WCHAR *szFaceName; - - if (fmt->dwMask & CFM_FACE) - szFaceName = fmt->szFaceName; - else - szFaceName = pStream->fonttbl[0].szFaceName; - for (i = 0; i < pStream->nFontTblLen; i++) { - if (szFaceName == pStream->fonttbl[i].szFaceName - || !lstrcmpW(szFaceName, pStream->fonttbl[i].szFaceName)) - if (!(fmt->dwMask & CFM_CHARSET) - || fmt->bCharSet == pStream->fonttbl[i].bCharSet) - break; - } - if (i < pStream->nFontTblLen) + if (fmt->dwMask & CFM_FACE || fmt->dwMask & CFM_CHARSET) + { + if (find_font_in_fonttbl( pStream, fmt, &i )) { if (i != pStream->nDefaultFont) sprintf(props + strlen(props), "\\f%u", i);

1 0

Hans Leidekker : include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR.
by Alexandre Julliard Oct. 12, 2016

Oct. 12, 2016

Module: wine Branch: master Commit: c185757993095382cc7580ac78d27f08c523e9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c185757993095382cc7580ac7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 12 11:53:41 2016 +0200 include: Avoid redefinition of EVENT_FILTER_DESCRIPTOR. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/evntrace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/evntrace.h b/include/evntrace.h index 6ebcfba..b54cd11 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -248,7 +248,7 @@ typedef struct _EVENT_TRACE_PROPERTIES ULONG LoggerNameOffset; } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; -typedef struct _EVENT_FILTER_DESCRIPTOR EVENT_FILTER_DESCRIPTOR, *PEVENT_FILTER_DESCRIPTOR; +typedef struct _EVENT_FILTER_DESCRIPTOR *PEVENT_FILTER_DESCRIPTOR; typedef struct _ENABLE_TRACE_PARAMETERS {

1 0