wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Aric Stewart : hid: Implement HidP_SetUsageValue.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: a2ab55381843d642582fc9c3ae4fbdfc8a956ee2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2ab55381843d642582fc9c3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Nov 23 15:09:34 2018 -0600 hid: Implement HidP_SetUsageValue. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidp.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ddk/hidpi.h | 1 + 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index cbae14c..e4d4202 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -36,7 +36,7 @@ @ stdcall HidP_MaxUsageListLength(long long ptr) @ stub HidP_SetData @ stub HidP_SetScaledUsageValue -@ stub HidP_SetUsageValue +@ stdcall HidP_SetUsageValue(long long long long long ptr ptr long) @ stub HidP_SetUsageValueArray @ stub HidP_SetUsages @ stdcall HidP_TranslateUsagesToI8042ScanCodes(ptr long long ptr ptr ptr) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index d6d143e..f997803 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -81,6 +81,49 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } +static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, ULONG value) +{ + if ((startBit + valueSize) / 8 > reportLength) + return HIDP_STATUS_INVALID_REPORT_LENGTH; + + if (valueSize == 1) + { + ULONG byte_index = startBit / 8; + ULONG bit_index = startBit - (byte_index * 8); + if (value) + report[byte_index] |= (1 << bit_index); + else + report[byte_index] &= ~(1 << bit_index); + } + else + { + ULONG byte_index = (startBit + valueSize - 1) / 8; + ULONG data = value; + ULONG remainingBits = valueSize; + while (remainingBits) + { + BYTE subvalue = data & 0xff; + + data >>= 8; + + if (remainingBits >= 8) + { + report[byte_index] = subvalue; + byte_index --; + remainingBits -= 8; + } + else if (remainingBits > 0) + { + BYTE mask = (0xff << (8-remainingBits)) & subvalue; + report[byte_index] |= mask; + remainingBits = 0; + } + } + } + return HIDP_STATUS_SUCCESS; +} + + NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, PUSHORT ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData) { @@ -528,6 +571,28 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag return count; } +NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, + USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, + CHAR *Report, ULONG ReportLength) +{ + WINE_HID_ELEMENT *element; + NTSTATUS rc; + + TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, + PreparsedData, Report, ReportLength); + + rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element); + + if (rc == HIDP_STATUS_SUCCESS) + { + return set_report_data((BYTE*)Report, ReportLength, + element->valueStartBit, element->bitCount, UsageValue); + } + + return rc; +} + + NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, diff --git a/include/ddk/hidpi.h b/include/ddk/hidpi.h index 0f69a03..1df789f 100644 --- a/include/ddk/hidpi.h +++ b/include/ddk/hidpi.h @@ -186,6 +186,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); +NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength); NTSTATUS WINAPI HidP_TranslateUsagesToI8042ScanCodes(USAGE *ChangedUsageList, ULONG UsageListLength, HIDP_KEYBOARD_DIRECTION KeyAction, HIDP_KEYBOARD_MODIFIER_STATE *ModifierState, PHIDP_INSERT_SCANCODES InsertCodesProcedure, VOID *InsertCodesContext); NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_BUTTON_CAPS *ButtonCaps, USHORT *ButtonCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, HIDP_VALUE_CAPS *ValueCaps, USHORT *ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);

1 0

Zebediah Figura : ntdll: Avoid inline assembly in have_cpuid().
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: e6f00d69439b205bed8cfc3861497de8c197d2fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6f00d69439b205bed8cfc38… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 10:00:06 2018 -0600 ntdll: Avoid inline assembly in have_cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a0ea037..aa6f846 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -973,30 +973,26 @@ __ASM_GLOBAL_FUNC( do_cpuid, "ret" ) #endif -/* From xf86info havecpuid.c 1.11 */ -static inline BOOL have_cpuid(void) -{ #ifdef __i386__ - unsigned int f1, f2; - __asm__("pushfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "movl %0,%1\n\t" - "xorl %2,%0\n\t" - "pushl %0\n\t" - "popfl\n\t" - "pushfl\n\t" - "popl %0\n\t" - "popfl" - : "=&r" (f1), "=&r" (f2) - : "ir" (0x00200000)); - return ((f1^f2) & 0x00200000) != 0; -#elif defined(__x86_64__) - return TRUE; +extern int have_cpuid(void); +__ASM_GLOBAL_FUNC( have_cpuid, + "pushfl\n\t" + "pushfl\n\t" + "movl (%esp),%ecx\n\t" + "xorl $0x00200000,(%esp)\n\t" + "popfl\n\t" + "pushfl\n\t" + "popl %eax\n\t" + "popfl\n\t" + "xorl %ecx,%eax\n\t" + "andl $0x00200000,%eax\n\t" + "ret" ) #else - return FALSE; -#endif +static int have_cpuid(void) +{ + return 1; } +#endif /* Detect if a SSE2 processor is capable of Denormals Are Zero (DAZ) mode. *

1 0

Zebediah Figura : ntdll: Avoid inline assembly in do_cpuid().
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: b4595729105e5e5f11b8ea28ce96a7856e5eda74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4595729105e5e5f11b8ea28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 26 10:00:05 2018 -0600 ntdll: Avoid inline assembly in do_cpuid(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/nt.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 5c711ef..a0ea037 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -944,27 +944,34 @@ static SYSTEM_CPU_INFORMATION cached_sci; #define INEI 0x49656e69 /* "ineI" */ #define NTEL 0x6c65746e /* "ntel" */ -/* Calls cpuid with an eax of 'ax' and returns the 16 bytes in *p - * We are compiled with -fPIC, so we can't clobber ebx. - */ -static inline void do_cpuid(unsigned int ax, unsigned int *p) -{ +extern void do_cpuid(unsigned int ax, unsigned int *p); + #ifdef __i386__ - __asm__("pushl %%ebx\n\t" - "cpuid\n\t" - "movl %%ebx, %%esi\n\t" - "popl %%ebx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); -#elif defined(__x86_64__) - __asm__("push %%rbx\n\t" - "cpuid\n\t" - "movq %%rbx, %%rsi\n\t" - "pop %%rbx" - : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax)); +__ASM_GLOBAL_FUNC( do_cpuid, + "pushl %esi\n\t" + "pushl %ebx\n\t" + "movl 12(%esp),%eax\n\t" + "movl 16(%esp),%esi\n\t" + "cpuid\n\t" + "movl %eax,(%esi)\n\t" + "movl %ebx,4(%esi)\n\t" + "movl %ecx,8(%esi)\n\t" + "movl %edx,12(%esi)\n\t" + "popl %ebx\n\t" + "popl %esi\n\t" + "ret" ) +#else +__ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rbx\n\t" + "movl %edi,%eax\n\t" + "cpuid\n\t" + "movl %eax,(%rsi)\n\t" + "movl %ebx,4(%rsi)\n\t" + "movl %ecx,8(%rsi)\n\t" + "movl %edx,12(%rsi)\n\t" + "popq %rbx\n\t" + "ret" ) #endif -} /* From xf86info havecpuid.c 1.11 */ static inline BOOL have_cpuid(void)

1 0

Hans Leidekker : webservices: Add support for stream input.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 68504ab00c718d532eb3e82fd243e60c679718d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68504ab00c718d532eb3e82f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:11 2018 +0100 webservices: Add support for stream input. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 202 ++++++++++++++++++++++++++++------------ dlls/webservices/tests/reader.c | 106 +++++++++++++++++++++ 2 files changed, 249 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=68504ab00c718d532eb3…

1 0

Hans Leidekker : webservices: Return HRESULT from read_utf8_char.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 44cea08ac26ca7697786e38efc962381b009ce00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44cea08ac26ca7697786e38e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:10 2018 +0100 webservices: Return HRESULT from read_utf8_char. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 57 +++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ff19254..cbce1f6 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -982,41 +982,42 @@ static const unsigned char utf8_mask[4] = { 0x7f, 0x1f, 0x0f, 0x07 }; /* minimum Unicode value depending on UTF-8 sequence length */ static const unsigned int utf8_minval[4] = { 0x0, 0x80, 0x800, 0x10000 }; -static inline unsigned int read_utf8_char( struct reader *reader, unsigned int *skip ) +static inline HRESULT read_utf8_char( struct reader *reader, unsigned int *ret, unsigned int *skip ) { - unsigned int len, res; + unsigned int len; unsigned char ch = reader->read_bufptr[reader->read_pos]; const unsigned char *end; - if (reader->read_pos >= reader->read_size) return 0; + if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; if (ch < 0x80) { + *ret = ch; *skip = 1; - return ch; + return S_OK; } len = utf8_length[ch - 0x80]; - if (reader->read_pos + len >= reader->read_size) return 0; + if (reader->read_pos + len >= reader->read_size) return WS_E_INVALID_FORMAT; end = reader->read_bufptr + reader->read_pos + len + 1; - res = ch & utf8_mask[len]; + *ret = ch & utf8_mask[len]; switch (len) { case 3: if ((ch = end[-3] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 2: if ((ch = end[-2] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; + *ret = (*ret << 6) | ch; case 1: if ((ch = end[-1] ^ 0x80) >= 0x40) break; - res = (res << 6) | ch; - if (res < utf8_minval[len]) break; + *ret = (*ret << 6) | ch; + if (*ret < utf8_minval[len]) break; *skip = len + 1; - return res; + return S_OK; } - return 0; + return WS_E_INVALID_FORMAT; } static inline void read_skip( struct reader *reader, unsigned int count ) @@ -1303,14 +1304,14 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT read_skip_whitespace( reader ); if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; - quote = read_utf8_char( reader, &skip ); + if ((hr = read_utf8_char( reader, &quote, &skip )) != S_OK) return hr; read_skip( reader, 1 ); len = 0; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == quote) break; read_skip( reader, skip ); len += skip; @@ -1651,19 +1652,23 @@ static HRESULT read_attribute_text( struct reader *reader, WS_XML_ATTRIBUTE **re unsigned int len = 0, ch, skip; const unsigned char *start; WS_XML_STRING *prefix, *localname; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if ((hr = parse_qname( start, len, &prefix, &localname )) != S_OK) goto error; if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) @@ -1953,16 +1958,19 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; - hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) goto error; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) goto error; if (!read_isnamechar( ch )) break; read_skip( reader, skip ); len += skip; } - if (!len) goto error; + if (!len) + { + hr = WS_E_INVALID_FORMAT; + goto error; + } if (!(parent = find_parent( reader ))) goto error; if ((hr = parse_qname( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; @@ -2107,7 +2115,7 @@ static HRESULT read_text_text( struct reader *reader ) for (;;) { if (read_end_of_data( reader )) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '<') break; read_skip( reader, skip ); len += skip; @@ -2741,7 +2749,7 @@ static HRESULT read_endelement_text( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; if (ch == '>') { read_skip( reader, 1 ); @@ -2821,7 +2829,7 @@ static HRESULT read_comment_text( struct reader *reader ) read_skip( reader, 3 ); break; } - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; } @@ -2907,12 +2915,13 @@ static HRESULT read_cdata( struct reader *reader ) struct node *node; WS_XML_TEXT_NODE *text; WS_XML_UTF8_TEXT *utf8; + HRESULT hr; start = read_current_ptr( reader ); for (;;) { if (read_cmp( reader, "]]>", 3 ) == S_OK) break; - if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + if ((hr = read_utf8_char( reader, &ch, &skip )) != S_OK) return hr; read_skip( reader, skip ); len += skip; }

1 0

Hans Leidekker : webservices: Get rid of read_rewind.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 4fcb8baa615a0e32a0dce62678c0aea40e655428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fcb8baa615a0e32a0dce626… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:09 2018 +0100 webservices: Get rid of read_rewind. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b573153..ff19254 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -939,10 +939,10 @@ static inline const unsigned char *read_current_ptr( struct reader *reader ) return &reader->read_bufptr[reader->read_pos]; } -static inline HRESULT read_peek( struct reader *reader, unsigned char *byte ) +static inline HRESULT read_peek( struct reader *reader, unsigned char *bytes, unsigned int len ) { - if (reader->read_pos >= reader->read_size) return WS_E_INVALID_FORMAT; - *byte = reader->read_bufptr[reader->read_pos]; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; + memcpy( bytes, reader->read_bufptr + reader->read_pos, len ); return S_OK; } @@ -1025,11 +1025,6 @@ static inline void read_skip( struct reader *reader, unsigned int count ) reader->read_pos += count; } -static inline void read_rewind( struct reader *reader, unsigned int count ) -{ - reader->read_pos -= count; -} - static inline BOOL read_isnamechar( unsigned int ch ) { /* FIXME: incomplete */ @@ -1938,6 +1933,7 @@ static HRESULT read_element_text( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; + unsigned char buf[2]; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; @@ -1950,13 +1946,9 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; + if ((hr = read_peek( reader, buf, 2 )) != S_OK) return hr; + if (buf[0] != '<' || !read_isnamechar( buf[1] )) return WS_E_INVALID_FORMAT; read_skip( reader, 1 ); - if (!read_isnamechar( read_utf8_char( reader, &skip ))) - { - read_rewind( reader, 1 ); - return WS_E_INVALID_FORMAT; - } if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; @@ -2000,7 +1992,7 @@ static HRESULT read_attributes_bin( struct reader *reader, WS_XML_ELEMENT_NODE * reader->current_attr = 0; for (;;) { - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (!is_attribute_type( type )) break; if ((hr = read_attribute_bin( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) @@ -2405,7 +2397,7 @@ static HRESULT read_text_bytes( struct reader *reader, unsigned char type ) node->flags |= NODE_FLAG_TEXT_WITH_IMPLICIT_END_ELEMENT; break; } - if ((hr = read_peek( reader, &type )) != S_OK) goto error; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) goto error; if (type < RECORD_BYTES8_TEXT || type > RECORD_BYTES32_TEXT_WITH_ENDELEMENT) break; read_skip( reader, 1 ); } @@ -3008,7 +3000,7 @@ static HRESULT read_node_bin( struct reader *reader ) return S_OK; } - if ((hr = read_peek( reader, &type )) != S_OK) return hr; + if ((hr = read_peek( reader, &type, 1 )) != S_OK) return hr; if (type == RECORD_ENDELEMENT) { return read_endelement_bin( reader );

1 0

Hans Leidekker : webservices: Return HRESULT from read_cmp.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 985b59e95a8f17f368837fd8bcc60228a0aca3e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=985b59e95a8f17f368837fd8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:08 2018 +0100 webservices: Return HRESULT from read_cmp. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 8cf3f24..b573153 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1050,37 +1050,39 @@ static inline void read_skip_whitespace( struct reader *reader ) reader->read_pos++; } -static inline int read_cmp( struct reader *reader, const char *str, int len ) +static inline HRESULT read_cmp( struct reader *reader, const char *str, int len ) { const unsigned char *ptr = read_current_ptr( reader ); if (len < 0) len = strlen( str ); - if (reader->read_pos + len > reader->read_size) return -1; + if (reader->read_pos + len > reader->read_size) return WS_E_INVALID_FORMAT; while (len--) { - if (*str != *ptr) return *ptr - *str; + if (*str != *ptr) return WS_E_INVALID_FORMAT; str++; ptr++; } - return 0; + return S_OK; } static HRESULT read_xmldecl( struct reader *reader ) { + HRESULT hr; + if (!reader->read_size) return WS_E_INVALID_FORMAT; - if (read_cmp( reader, "<", 1 ) || read_cmp( reader, "<?", 2 )) + if (read_cmp( reader, "<", 1 ) != S_OK || read_cmp( reader, "<?", 2 ) != S_OK) { reader->state = READER_STATE_BOF; return S_OK; } - if (read_cmp( reader, "<?xml ", 6 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<?xml ", 6 )) != S_OK) return hr; read_skip( reader, 6 ); /* FIXME: parse attributes */ while (reader->read_pos < reader->read_size && reader->read_bufptr[reader->read_pos] != '?') reader->read_pos++; - if (read_cmp( reader, "?>", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "?>", 2 )) != S_OK) return hr; read_skip( reader, 2 ); reader->state = READER_STATE_BOF; @@ -1295,17 +1297,17 @@ static HRESULT decode_text( const unsigned char *str, ULONG len, unsigned char * static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUTE *attr ) { - WS_XML_UTF8_TEXT *utf8 = NULL; + WS_XML_UTF8_TEXT *utf8; unsigned int len, ch, skip, quote; const unsigned char *start; - HRESULT hr = E_OUTOFMEMORY; + HRESULT hr; read_skip_whitespace( reader ); - if (read_cmp( reader, "=", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "=", 1 )) != S_OK) return hr; read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "\"", 1 )) != S_OK && (hr = read_cmp( reader, "'", 1 )) != S_OK) return hr; quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); @@ -1322,27 +1324,23 @@ static HRESULT read_attribute_value_text( struct reader *reader, WS_XML_ATTRIBUT if (attr->isXmlNs) { - if (!(attr->ns = alloc_xml_string( start, len ))) goto error; - if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; - if (!(utf8 = alloc_utf8_text( NULL, 0 ))) - { - hr = E_OUTOFMEMORY; - goto error; - } + if (!(attr->ns = alloc_xml_string( start, len ))) return E_OUTOFMEMORY; + if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) return hr; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) return E_OUTOFMEMORY; } else { - if (!(utf8 = alloc_utf8_text( NULL, len ))) goto error; - if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, len ))) return E_OUTOFMEMORY; + if ((hr = decode_text( start, len, utf8->value.bytes, &utf8->value.length )) != S_OK) + { + heap_free( utf8 ); + return hr; + } } attr->value = &utf8->text; attr->singleQuote = (quote == '\''); return S_OK; - -error: - heap_free( utf8 ); - return hr; } static inline BOOL is_text_type( unsigned char type ) @@ -1924,7 +1922,7 @@ static HRESULT read_attributes_text( struct reader *reader, WS_XML_ELEMENT_NODE for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; + if (read_cmp( reader, ">", 1 ) == S_OK || read_cmp( reader, "/>", 2 ) == S_OK) break; if ((hr = read_attribute_text( reader, &attr )) != S_OK) return hr; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -1942,7 +1940,7 @@ static HRESULT read_element_text( struct reader *reader ) const unsigned char *start; struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; - HRESULT hr = WS_E_INVALID_FORMAT; + HRESULT hr; if (read_end_of_data( reader )) { @@ -1952,7 +1950,7 @@ static HRESULT read_element_text( struct reader *reader ) return S_OK; } - if (read_cmp( reader, "<", 1 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<", 1 )) != S_OK) return hr; read_skip( reader, 1 ); if (!read_isnamechar( read_utf8_char( reader, &skip ))) { @@ -1963,6 +1961,7 @@ static HRESULT read_element_text( struct reader *reader ) if (!(elem = alloc_element_pair())) return E_OUTOFMEMORY; node = (struct node *)elem; + hr = WS_E_INVALID_FORMAT; start = read_current_ptr( reader ); for (;;) { @@ -2609,7 +2608,7 @@ static HRESULT read_node_text( struct reader * ); static HRESULT read_startelement_text( struct reader *reader ) { read_skip_whitespace( reader ); - if (!read_cmp( reader, "/>", 2 )) + if (read_cmp( reader, "/>", 2 ) == S_OK) { read_skip( reader, 2 ); reader->current = LIST_ENTRY( list_tail( &reader->current->children ), struct node, entry ); @@ -2617,7 +2616,7 @@ static HRESULT read_startelement_text( struct reader *reader ) reader->state = READER_STATE_ENDELEMENT; return S_OK; } - else if (!read_cmp( reader, ">", 1 )) + else if (read_cmp( reader, ">", 1 ) == S_OK) { read_skip( reader, 1 ); return read_node_text( reader ); @@ -2744,7 +2743,7 @@ static HRESULT read_endelement_text( struct reader *reader ) WS_XML_STRING prefix, localname; HRESULT hr; - if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "</", 2 )) != S_OK) return hr; read_skip( reader, 2 ); start = read_current_ptr( reader ); @@ -2817,14 +2816,15 @@ static HRESULT read_comment_text( struct reader *reader ) const unsigned char *start; struct node *node, *parent; WS_XML_COMMENT_NODE *comment; + HRESULT hr; - if (read_cmp( reader, "", 3 )) + if (read_cmp( reader, "-->", 3 ) == S_OK) { read_skip( reader, 3 ); break; @@ -2887,8 +2887,9 @@ static HRESULT read_comment_bin( struct reader *reader ) static HRESULT read_startcdata( struct reader *reader ) { struct node *node, *endnode, *parent; + HRESULT hr; - if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "<![CDATA[", 9 )) != S_OK) return hr; read_skip( reader, 9 ); if (!(parent = find_parent( reader ))) return WS_E_INVALID_FORMAT; @@ -2918,7 +2919,7 @@ static HRESULT read_cdata( struct reader *reader ) start = read_current_ptr( reader ); for (;;) { - if (!read_cmp( reader, "]]>", 3 )) break; + if (read_cmp( reader, "]]>", 3 ) == S_OK) break; if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; read_skip( reader, skip ); len += skip; @@ -2941,8 +2942,9 @@ static HRESULT read_cdata( struct reader *reader ) static HRESULT read_endcdata( struct reader *reader ) { struct node *parent; + HRESULT hr; - if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; + if ((hr = read_cmp( reader, "]]>", 3 )) != S_OK) return hr; read_skip( reader, 3 ); if (node_type( reader->current ) == WS_XML_NODE_TYPE_TEXT) parent = reader->current->parent; @@ -2969,16 +2971,19 @@ static HRESULT read_node_text( struct reader *reader ) } if (reader->state == READER_STATE_STARTCDATA) return read_cdata( reader ); else if (reader->state == READER_STATE_CDATA) return read_endcdata( reader ); - else if (!read_cmp( reader, "<?", 2 )) + else if (read_cmp( reader, "<?", 2 ) == S_OK) { hr = read_xmldecl( reader ); if (FAILED( hr )) return hr; } - else if (!read_cmp( reader, "</", 2 )) return read_endelement_text( reader ); - else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); - else if (!read_cmp( reader, "<!--", 4 )) return read_comment_text( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_element_text( reader ); - else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement_text( reader ); + else if (read_cmp( reader, "</", 2 ) == S_OK) return read_endelement_text( reader ); + else if (read_cmp( reader, "<![CDATA[", 9 ) == S_OK) return read_startcdata( reader ); + else if (read_cmp( reader, "<!--", 4 ) == S_OK) return read_comment_text( reader ); + else if (read_cmp( reader, "<", 1 ) == S_OK) return read_element_text( reader ); + else if (read_cmp( reader, "/>", 2 ) == S_OK || read_cmp( reader, ">", 1 ) == S_OK) + { + return read_startelement_text( reader ); + } else return read_text_text( reader ); } }

1 0

Hans Leidekker : webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 0ac9f9d47015e74a05b43234f48812e092ab716a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac9f9d47015e74a05b43234… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:07 2018 +0100 webservices: Call WsReadEndElement just once in WsReadEnvelopeEnd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index a53fd92..e28baa2 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -938,13 +938,6 @@ HRESULT WINAPI WsReadEnvelopeStart( WS_MESSAGE *handle, WS_XML_READER *reader, W return hr; } -static HRESULT read_envelope_end( WS_XML_READER *reader ) -{ - HRESULT hr; - if ((hr = WsReadEndElement( reader, NULL )) != S_OK) return hr; /* </s:Body> */ - return WsReadEndElement( reader, NULL ); /* </s:Envelope> */ -} - /************************************************************************** * WsReadEnvelopeEnd [webservices.@] */ @@ -967,7 +960,7 @@ HRESULT WINAPI WsReadEnvelopeEnd( WS_MESSAGE *handle, WS_ERROR *error ) } if (msg->state != WS_MESSAGE_STATE_READING) hr = WS_E_INVALID_OPERATION; - else if ((hr = read_envelope_end( msg->reader_body )) == S_OK) + else if ((hr = WsReadEndElement( msg->reader_body, NULL )) == S_OK) msg->state = WS_MESSAGE_STATE_DONE; LeaveCriticalSection( &msg->cs );

1 0

Hans Leidekker : webservices: Use set_blocking in more places.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: a0f00bd6d710d5739f409a96cf3c01591f3c9b4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0f00bd6d710d5739f409a96… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 27 14:13:06 2018 +0100 webservices: Use set_blocking in more places. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b945c7f..5394aa6 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -2245,7 +2245,6 @@ HRESULT WINAPI WsWriteMessageEnd( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *ret ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr = S_OK; if (WSAEventSelect( socket, handles[0], FD_ACCEPT )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2256,7 +2255,7 @@ static HRESULT sock_accept( SOCKET socket, HANDLE wait, HANDLE cancel, SOCKET *r if ((*ret = accept( socket, NULL, NULL )) != -1) { WSAEventSelect( *ret, NULL, 0 ); - ioctlsocket( *ret, FIONBIO, &nonblocking ); + set_blocking( *ret, TRUE ); break; } hr = HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2296,7 +2295,6 @@ HRESULT channel_accept_tcp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) { HANDLE handles[] = { wait, cancel }; - ULONG nonblocking = 0; HRESULT hr; if (WSAEventSelect( socket, handles[0], FD_READ )) return HRESULT_FROM_WIN32( WSAGetLastError() ); @@ -2317,7 +2315,7 @@ static HRESULT sock_wait( SOCKET socket, HANDLE wait, HANDLE cancel ) } WSAEventSelect( socket, NULL, 0 ); - ioctlsocket( socket, FIONBIO, &nonblocking ); + set_blocking( socket, TRUE ); return hr; }

1 0

Huw Davies : dbghelp: Fix build failure on macOS.
by Alexandre Julliard 27 Nov '18

27 Nov '18

Module: wine Branch: master Commit: 74f425e70dfbc43da1eaf9048f45bed52ef1d66c URL: https://source.winehq.org/git/wine.git/?a=commit;h=74f425e70dfbc43da1eaf904… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 27 09:01:48 2018 +0000 dbghelp: Fix build failure on macOS. This was caused by commit 8d096fb5e262e5e87866d1a4a397da144a09b635. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/macho_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index a3f838f..a062335 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -1096,7 +1096,7 @@ static void macho_finish_stabs(struct module* module, struct hash_table* ht_symt if (ste->is_public && !(dbghelp_options & SYMOPT_NO_PUBLICS)) { - symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->addr, 0); + symt_new_public(module, ste->compiland, ste->ht_elt.name, ste->is_code, ste->addr, 0); } } }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
96
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 November 2018