August 2021 - Wine-devel - list.winehq.org

[PATCH 4/4] webservices: Add support for RECORD_BYTES32_TEXT in write_text_bin().
by Hans Leidekker 31 Aug '21

31 Aug '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 68f43a7cdb4..c9e443b0e80 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2766,6 +2766,26 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U } return S_OK; } + case RECORD_BYTES32_TEXT: + { + const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; + UINT32 rem = text_base64->length % 3, len = text_base64->length - rem; + if (len) + { + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, rem ? RECORD_BYTES32_TEXT : RECORD_BYTES32_TEXT_WITH_ENDELEMENT ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + } + if (rem) + { + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_char( writer, RECORD_BYTES8_TEXT_WITH_ENDELEMENT ); + write_char( writer, rem ); + write_bytes( writer, (const BYTE *)text_base64->bytes + len, rem ); + } + return S_OK; + } case RECORD_ZERO_TEXT_WITH_ENDELEMENT: case RECORD_ONE_TEXT_WITH_ENDELEMENT: case RECORD_FALSE_TEXT_WITH_ENDELEMENT: -- 2.30.2

1 0

[PATCH 3/4] webservices: Increase the size of the writer heap.
by Hans Leidekker 31 Aug '21

31 Aug '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 28df4a3c4ef..68f43a7cdb4 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -220,15 +220,7 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c } } - hr = prop_get( writer->prop, writer->prop_count, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, - &max_size, sizeof(max_size) ); - if (hr != S_OK) - { - free_writer( writer ); - return hr; - } - - hr = WsCreateHeap( max_size, 0, NULL, 0, &writer->output_heap, NULL ); + hr = WsCreateHeap( 1 << 20, 0, NULL, 0, &writer->output_heap, NULL ); if (hr != S_OK) { free_writer( writer ); -- 2.30.2

1 0

[PATCH 2/4] webservices: Add support for WS_XML_TEXT_TYPE_INT64 in text_to_uint32().
by Hans Leidekker 31 Aug '21

31 Aug '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index c30abf5acd8..69c4f2a3007 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4992,6 +4992,14 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) hr = S_OK; break; } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + if (text_int64->value < 0 || text_int64->value > MAX_UINT32) return WS_E_NUMERIC_OVERFLOW; + *val = text_int64->value; + hr = S_OK; + break; + } case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; -- 2.30.2

1 0

[PATCH 1/4] webservices: Return an error when the record value is too large for the description type.
by Hans Leidekker 31 Aug '21

31 Aug '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 19 +++++------ dlls/webservices/tests/reader.c | 60 +++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ffa789fb6e6..c30abf5acd8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -4495,8 +4495,7 @@ static HRESULT text_to_int8( const WS_XML_TEXT *text, INT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= MIN_INT8 ); - assert( text_int32->value <= MAX_INT8 ); + if (text_int32->value < MIN_INT8 || text_int32->value > MAX_INT8) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4577,8 +4576,7 @@ static HRESULT text_to_int16( const WS_XML_TEXT *text, INT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= MIN_INT16 ); - assert( text_int32->value <= MAX_INT16 ); + if (text_int32->value < MIN_INT16 || text_int32->value > MAX_INT16) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4819,7 +4817,7 @@ static HRESULT text_to_uint8( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT8 ); + if (text_uint64->value > MAX_UINT8) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -4900,8 +4898,7 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= 0 ); - assert( text_int32->value <= MAX_UINT16 ); + if (text_int32->value < 0 || text_int32->value > MAX_UINT16) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4909,7 +4906,7 @@ static HRESULT text_to_uint16( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT16 ); + if (text_uint64->value > MAX_UINT16) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -4990,7 +4987,7 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; - assert( text_int32->value >= 0 ); + if (text_int32->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -4998,7 +4995,7 @@ static HRESULT text_to_uint32( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_UINT64: { const WS_XML_UINT64_TEXT *text_uint64 = (const WS_XML_UINT64_TEXT *)text; - assert( text_uint64->value <= MAX_UINT32 ); + if (text_uint64->value > MAX_UINT32) return WS_E_NUMERIC_OVERFLOW; *val = text_uint64->value; hr = S_OK; break; @@ -5079,6 +5076,7 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT32: { const WS_XML_INT32_TEXT *text_int32 = (const WS_XML_INT32_TEXT *)text; + if (text_int32->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int32->value; hr = S_OK; break; @@ -5086,6 +5084,7 @@ static HRESULT text_to_uint64( const WS_XML_TEXT *text, UINT64 *val ) case WS_XML_TEXT_TYPE_INT64: { const WS_XML_INT64_TEXT *text_int64 = (const WS_XML_INT64_TEXT *)text; + if (text_int64->value < 0) return WS_E_NUMERIC_OVERFLOW; *val = text_int64->value; hr = S_OK; break; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 7d56ebccd53..7ecb77fe6cd 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4937,6 +4937,8 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0x08,0x02,'n','s',0x01}; static const char test31[] = {0x40,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; + static const char test32[] = + {0x40,0x01,'t',0xb3,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const char test100[] = {0x40,0x01,'t',0x04,0x01,'t',0x98,0x00,0x01}; static const char test101[] = @@ -4973,6 +4975,14 @@ static void test_binary_encoding(void) { WS_BYTES data; } *typetest; + struct typetest2 + { + UINT32 val; + } *typetest2; + struct typetest3 + { + UINT64 val; + } *typetest3; hr = WsGetDictionary( WS_ENCODING_XML_BINARY_1, &dict, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -5629,6 +5639,56 @@ static void test_binary_encoding(void) ok( typetest->data.length == 2, "got %u\n", typetest->data.length ); ok( !memcmp( typetest->data.bytes, "ab", 2 ), "wrong data\n" ); + /* record value too large for description type */ + hr = set_input_bin( reader, test32, sizeof(test32), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &localname; + f.ns = &ns; + f.type = WS_UINT32_TYPE; + f.offset = FIELD_OFFSET(struct typetest2, val); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct typetest2); + s.alignment = TYPE_ALIGNMENT(struct typetest2); + s.fields = fields; + s.fieldCount = 1; + + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &typetest2, sizeof(typetest2), NULL ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + + /* record value too small for description type */ + hr = set_input_bin( reader, test16, sizeof(test16), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 8, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_ELEMENT_FIELD_MAPPING; + f.localName = &localname; + f.ns = &ns; + f.type = WS_UINT64_TYPE; + f.offset = FIELD_OFFSET(struct typetest3, val); + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct typetest3); + s.alignment = TYPE_ALIGNMENT(struct typetest3); + s.fields = fields; + s.fieldCount = 1; + + hr = WsReadType( reader, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_READ_REQUIRED_POINTER, heap, &typetest3, sizeof(typetest3), NULL ); + ok( hr == WS_E_NUMERIC_OVERFLOW, "got %08x\n", hr ); + WsFreeHeap( heap ); WsFreeReader( reader ); } -- 2.30.2

1 0

[PATCH 0/3 v2] Let 64bit dbghelp handle a 32bit target
by Eric Pouech 31 Aug '21

31 Aug '21

Allow 64bit dbghelp handle a 32bit target on WOW64 context. The good news is that the serie is rather small. Changes in v2: - rebased because of conflict with Michael Stefaniuc patch - in third patch, just offset PEB64 address to get to PEB32 A+ --- Eric Pouech (3): dbghelp: split storage of PE header dbghelp: now storing the IMAGE_OPTIONAL_HEADER in either 32bit or 64bit form dbghelp: fix failing SymInitialize for a live 32bit target from a 64bit caller in WOW64 dlls/dbghelp/dbghelp.c | 14 ++++++++++---- dlls/dbghelp/image_private.h | 6 +++++- dlls/dbghelp/pe_module.c | 37 ++++++++++++++++++++++++++---------- 3 files changed, 42 insertions(+), 15 deletions(-)

1 3

[PATCH 1/2] kernelbase: Add stub for SetProcessGroupAffinity().
by Guillaume Charifi 31 Aug '21

31 Aug '21

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e1fb19eceb0..dd9f4a8ddce 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1460,7 +1460,7 @@ @ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) # @ stub SetProcessDefaultCpuSets -# @ stub SetProcessGroupAffinity +@ stdcall SetProcessGroupAffinity(long ptr ptr) # @ stub SetProcessInformation @ stdcall SetProcessMitigationPolicy(long ptr long) @ stdcall SetProcessPreferredUILanguages(long ptr ptr) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 101d3fa3213..46b8087b885 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1133,6 +1133,18 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetProcessAffinityUpdateMode( HANDLE process, DWOR } +/*********************************************************************** + * SetProcessGroupAffinity (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH SetProcessGroupAffinity( HANDLE process, const GROUP_AFFINITY *new, + GROUP_AFFINITY *old ) +{ + FIXME( "(%p,%p,%p): stub\n", process, new, old ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + + /********************************************************************** * SetProcessMitigationPolicy (kernelbase.@) */ -- 2.33.0

2 2

[PATCH 8/8] gdi32: Use NtGdiCreateDIBSection for CreateDIBSection.
by Jacek Caban 31 Aug '21

31 Aug '21

1 0

[PATCH 6/8] gdi32: Use NtGdiGetDIBitsInternal for GetDIBits.
by Jacek Caban 31 Aug '21

31 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/dib.c | 17 ++++------------- dlls/gdi32/objects.c | 9 +++++++++ include/ntgdi.h | 3 +++ 3 files changed, 16 insertions(+), 13 deletions(-)

1 0

[PATCH 5/8] gdi32: Use NtGdiGetAndSetDCDword for SetGraphicsMode.
by Jacek Caban 31 Aug '21

31 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 9 ++++----- dlls/gdi32/dc.c | 49 +++++++++++++++++++++------------------------ dlls/gdi32/gdidc.c | 9 +++++++++ include/ntgdi.h | 1 + 4 files changed, 37 insertions(+), 31 deletions(-)

1 0

[PATCH 4/8] gdi32: Use NtGdiCreateCompatibleBitmap for CreateCompatibleBitmap.
by Jacek Caban 31 Aug '21

31 Aug '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 8 ++++---- dlls/gdi32/bitmap.c | 30 ++++++++++++------------------ dlls/gdi32/objects.c | 13 +++++++++++++ include/ntgdi.h | 1 + 4 files changed, 30 insertions(+), 22 deletions(-)

1 0