wine-commits July 2017

wine-commits@winehq.org

2 participants
632 discussions

Hans Leidekker : webservices: Add support for 16-bit length text records in the writer.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 7018ccd4bcfcd2221cbf75e78d7c500a2756ee5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7018ccd4bcfcd2221cbf75e78… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:30 2017 +0200 webservices: Add support for 16-bit length text records in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 13 ---- dlls/webservices/webservices_private.h | 13 ++++ dlls/webservices/writer.c | 121 +++++++++++++++++++++++---------- 3 files changed, 98 insertions(+), 49 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 88ad498..4aacaf7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3505,19 +3505,6 @@ static HRESULT str_to_bool( const unsigned char *str, ULONG len, BOOL *ret ) return S_OK; } -#define MAX_INT8 0x7f -#define MIN_INT8 (-MAX_INT8 - 1) -#define MAX_INT16 0x7fff -#define MIN_INT16 (-MAX_INT16 - 1) -#define MAX_INT32 0x7fffffff -#define MIN_INT32 (-MAX_INT32 - 1) -#define MAX_INT64 (((INT64)0x7fffffff << 32) | 0xffffffff) -#define MIN_INT64 (-MAX_INT64 - 1) -#define MAX_UINT8 0xff -#define MAX_UINT16 0xffff -#define MAX_UINT32 0xffffffff -#define MAX_UINT64 (((UINT64)0xffffffff << 32) | 0xffffffff) - static HRESULT str_to_int64( const unsigned char *str, ULONG len, INT64 min, INT64 max, INT64 *ret ) { BOOL negative = FALSE; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 38d5786..ddaf59e 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -338,6 +338,19 @@ enum record_type /* 0xbe ... 0xff reserved */ }; +#define MAX_INT8 0x7f +#define MIN_INT8 (-MAX_INT8 - 1) +#define MAX_INT16 0x7fff +#define MIN_INT16 (-MAX_INT16 - 1) +#define MAX_INT32 0x7fffffff +#define MIN_INT32 (-MAX_INT32 - 1) +#define MAX_INT64 (((INT64)0x7fffffff << 32) | 0xffffffff) +#define MIN_INT64 (-MAX_INT64 - 1) +#define MAX_UINT8 0xff +#define MAX_UINT16 0xffff +#define MAX_UINT32 0xffffffff +#define MAX_UINT64 (((UINT64)0xffffffff << 32) | 0xffffffff) + #define TICKS_PER_SEC 10000000 #define TICKS_PER_MIN (60 * (ULONGLONG)TICKS_PER_SEC) #define TICKS_PER_HOUR (3600 * (ULONGLONG)TICKS_PER_SEC) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8ce59a1..5f16623 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -649,17 +649,27 @@ static HRESULT write_dict_string( struct writer *writer, ULONG id ) return S_OK; } -static enum record_type get_text_record_type( const WS_XML_TEXT *text, BOOL attr ) +static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text ) { - const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; - if (!utf8 || utf8->value.length <= 0xff) return attr ? RECORD_CHARS8_TEXT : RECORD_CHARS8_TEXT_WITH_ENDELEMENT; - return 0; -}; + if (!text) return RECORD_CHARS8_TEXT; + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT; + if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; + return RECORD_CHARS32_TEXT; + } + default: + FIXME( "unhandled text type %u\n", text->textType ); + return 0; + } +} static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TEXT *text ) { - WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text; - enum record_type type = get_text_record_type( text, TRUE ); + enum record_type type = get_attr_text_record_type( text ); HRESULT hr; if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; @@ -668,19 +678,31 @@ static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TE switch (type) { case RECORD_CHARS8_TEXT: - if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; - if (!utf8 || !utf8->value.length) write_char( writer, 0 ); - else + { + WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; + if (!text_utf8) { - write_char( writer, utf8->value.length ); - if ((hr = write_grow_buffer( writer, utf8->value.length )) != S_OK) return hr; - write_bytes( writer, utf8->value.bytes, utf8->value.length ); + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, 0 ); + return S_OK; } + if ((hr = write_grow_buffer( writer, 1 + text_utf8->value.length )) != S_OK) return hr; + write_char( writer, text_utf8->value.length ); + write_bytes( writer, text_utf8->value.bytes, text_utf8->value.length ); return S_OK; - + } + case RECORD_CHARS16_TEXT: + { + WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; + UINT16 len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_utf8->value.bytes, len ); + return S_OK; + } default: ERR( "unhandled record type %02x\n", type ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } } @@ -2040,15 +2062,16 @@ static HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, UL case WS_XML_TEXT_TYPE_UTF16: { const WS_XML_UTF16_TEXT *utf16 = (const WS_XML_UTF16_TEXT *)text; - const WS_XML_UTF16_TEXT *utf16_old = (const WS_XML_UTF16_TEXT *)old; - WS_XML_UTF16_TEXT *new; - ULONG len = utf16->byteCount / sizeof(WCHAR); - ULONG len_old = utf16_old ? utf16_old->byteCount / sizeof(WCHAR) : 0; - - if (len % sizeof(WCHAR)) return E_INVALIDARG; - if (!(new = alloc_utf16_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( new->bytes, utf16_old->bytes, len_old ); - memcpy( new->bytes + len_old, utf16->bytes, len ); + const WS_XML_UTF8_TEXT *utf8_old = (const WS_XML_UTF8_TEXT *)old; + WS_XML_UTF8_TEXT *new; + const WCHAR *str = (const WCHAR *)utf16->bytes; + ULONG len = utf16->byteCount / sizeof(WCHAR), len_utf8, len_old = utf8_old ? utf8_old->value.length : 0; + + if (utf16->byteCount % sizeof(WCHAR)) return E_INVALIDARG; + len_utf8 = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); + if (!(new = alloc_utf8_text( NULL, len_old + len_utf8 ))) return E_OUTOFMEMORY; + if (old) memcpy( new->value.bytes, utf8_old->value.bytes, len_old ); + WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)new->value.bytes + len_old, len_utf8, NULL, NULL ); if (offset) *offset = len_old; *ret = &new->text; return S_OK; @@ -2266,35 +2289,61 @@ static HRESULT write_text_text( struct writer *writer, const WS_XML_TEXT *text, return WS_E_INVALID_FORMAT; } +static enum record_type get_text_record_type( const WS_XML_TEXT *text ) +{ + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (text_utf8->value.length <= MAX_UINT8) return RECORD_CHARS8_TEXT_WITH_ENDELEMENT; + if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; + return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; + } + default: + FIXME( "unhandled text type %u\n", text->textType ); + return 0; + } +} + static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, ULONG offset ) { - const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; - enum record_type type = get_text_record_type( text, FALSE ); + enum record_type type = get_text_record_type( text ); HRESULT hr; if (offset) { FIXME( "no support for appending text in binary mode\n" ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } switch (type) { case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: - if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + UINT8 len = text_utf8->value.length; + + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; write_char( writer, type ); - if (!utf8 || !utf8->value.length) write_char( writer, 0 ); - else - { - write_char( writer, utf8->value.length ); - if ((hr = write_grow_buffer( writer, utf8->value.length )) != S_OK) return hr; - write_bytes( writer, utf8->value.bytes, utf8->value.length ); - } + write_char( writer, len ); + write_bytes( writer, text_utf8->value.bytes, len ); return S_OK; + } + case RECORD_CHARS16_TEXT_WITH_ENDELEMENT: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + UINT16 len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + write_char( writer, type ); + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_utf8->value.bytes, len ); + return S_OK; + } default: FIXME( "unhandled record type %02x\n", type ); - return WS_E_NOT_SUPPORTED; + return E_NOTIMPL; } }

1 0

Hans Leidekker : webservices: Handle all supported native text types in the reader type conversion.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: f1f510d947e8261ef3f094247fe48f5ee98bb804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f510d947e8261ef3f094247… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 12 15:34:29 2017 +0200 webservices: Handle all supported native text types in the reader type conversion. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 674 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 516 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1f510d947e8261ef3f09…

1 0

Piotr Caban : msvcp90: Remove special handling of directories in tr2::sys: :_File_size.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 86b00a5aa208530b2ff9e36c811ba390e61a560d URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b00a5aa208530b2ff9e36c8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 12 11:28:30 2017 +0200 msvcp90: Remove special handling of directories in tr2::sys::_File_size. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 9d62454..9b0b7fe 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14673,8 +14673,6 @@ ULONGLONG __cdecl tr2_sys__File_size(char const* path) TRACE("(%s)\n", debugstr_a(path)); if(!GetFileAttributesExA(path, GetFileExInfoStandard, &fad)) return 0; - if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - return 0; return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; } @@ -15465,8 +15463,6 @@ ULONGLONG __cdecl tr2_sys__File_size_wchar(WCHAR const* path) TRACE("(%s)\n", debugstr_w(path)); if(!GetFileAttributesExW(path, GetFileExInfoStandard, &fad)) return 0; - if(fad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) - return 0; return ((ULONGLONG)(fad.nFileSizeHigh) << 32) + fad.nFileSizeLow; }

1 0

Jacek Caban : winhttp/tests: Make notification tests more strict.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: bbb2f363a0d8a1503d1faebe67c294fe0bc07847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb2f363a0d8a1503d1faebe6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 11 15:09:17 2017 +0200 winhttp/tests: Make notification tests more strict. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/notification.c | 200 +++++++++++++++++++------------------- 1 file changed, 101 insertions(+), 99 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bbb2f363a0d8a1503d1fa…

1 0

Kimmo Myllyvirta : ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 32334704e882eb225b4738a34d46c6407af12514 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32334704e882eb225b4738a34… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Wed Jul 12 03:17:18 2017 +0000 ws2_32: Set return size when calling WSAIoctl with WS_SIO_GET_EXTENSION_FUNCTION_POINTER. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 1 + dlls/ws2_32/tests/sock.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f212ec2..3f4691f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4907,6 +4907,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID { TRACE("-> got %s\n", guid_funcs[i].name); *(void **)out_buff = guid_funcs[i].func_ptr; + total = sizeof(void *); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index efe10b3..e975ea4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7677,6 +7677,7 @@ static void test_ConnectEx(void) goto end; } + bytesReturned = 0xdeadbeef; iret = WSAIoctl(connector, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectExGuid, sizeof(connectExGuid), &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); if (iret) { @@ -7684,6 +7685,8 @@ static void test_ConnectEx(void) goto end; } + ok(bytesReturned == sizeof(pConnectEx), "expected sizeof(pConnectEx), got %u\n", bytesReturned); + bret = pConnectEx(INVALID_SOCKET, (struct sockaddr*)&address, addrlen, NULL, 0, &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == WSAENOTSOCK, "ConnectEx on invalid socket " "returned %d + errno %d\n", bret, WSAGetLastError());

1 0

Alistair Leslie-Hughes : mfplat/tests: Add MFCreateAttributes tests.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: a324786b9e2aab5fce13238b59cdc01c2ce596b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a324786b9e2aab5fce13238b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 05:22:19 2017 +0000 mfplat/tests: Add MFCreateAttributes tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index edbce46..13853c5 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -32,11 +32,14 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "mfreadwrite.h" #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); + DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x87,0x47,0x75,0x6f); DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); @@ -217,6 +220,30 @@ if(0) MFShutdown(); } +static void test_MFCreateAttributes(void) +{ + IMFAttributes *attributes; + HRESULT hr; + UINT32 count; + + hr = MFCreateAttributes( &attributes, 3 ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 88; + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFAttributes_GetCount(attributes, &count); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(count == 1, "got %d\n", count); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { @@ -227,6 +254,7 @@ START_TEST(mfplat) test_register(); test_source_resolver(); test_MFCreateMediaType(); + test_MFCreateAttributes(); CoUninitialize(); }

1 0

Alistair Leslie-Hughes : wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 465feb7a9ef971717f338fec9ae2682ac8723fe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=465feb7a9ef971717f338fec9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jul 12 06:48:14 2017 +0000 wmvcore: Support IWMReaderTypeNegotiation interface in IWMReader. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 2 +- dlls/wmvcore/wmvcore_main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index c4d8115..4369748 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -136,7 +136,7 @@ static void test_wmreader_interfaces(void) ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMReaderTypeNegotiation, (void **)&negotiation); - todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + ok(hr == S_OK, "Failed 0x%08x\n", hr); hr = IWMReader_QueryInterface(reader, &IID_IWMDRMReader, (void **)&drmreader); ok(hr == E_NOINTERFACE, "Failed 0x%08x\n", hr); diff --git a/dlls/wmvcore/wmvcore_main.c b/dlls/wmvcore/wmvcore_main.c index f7fa6e9..2969668 100644 --- a/dlls/wmvcore/wmvcore_main.c +++ b/dlls/wmvcore/wmvcore_main.c @@ -69,6 +69,7 @@ typedef struct { IWMReaderAccelerator IWMReaderAccelerator_iface; IWMReaderNetworkConfig2 IWMReaderNetworkConfig2_iface; IWMReaderStreamClock IWMReaderStreamClock_iface; + IWMReaderTypeNegotiation IWMReaderTypeNegotiation_iface; LONG ref; } WMReader; @@ -117,6 +118,9 @@ static HRESULT WINAPI WMReader_QueryInterface(IWMReader *iface, REFIID riid, voi }else if(IsEqualGUID(riid, &IID_IWMReaderStreamClock)) { TRACE("(%p)->(IWMReaderStreamClock %p)\n", This, ppv); *ppv = &This->IWMReaderStreamClock_iface; + }else if(IsEqualGUID(riid, &IID_IWMReaderTypeNegotiation)) { + TRACE("(%p)->(IWMReaderTypeNegotiation %p)\n", This, ppv); + *ppv = &This->IWMReaderTypeNegotiation_iface; }else { *ppv = NULL; FIXME("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -1190,6 +1194,44 @@ static const IWMReaderStreamClockVtbl WMReaderStreamClockVtbl = readclock_KillTimer }; +static inline WMReader *impl_from_IWMReaderTypeNegotiation(IWMReaderTypeNegotiation *iface) +{ + return CONTAINING_RECORD(iface, WMReader, IWMReaderTypeNegotiation_iface); +} + +static HRESULT WINAPI negotiation_QueryInterface(IWMReaderTypeNegotiation *iface, REFIID riid, void **ppv) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_QueryInterface(&This->IWMReader_iface, riid, ppv); +} + +static ULONG WINAPI negotiation_AddRef(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_AddRef(&This->IWMReader_iface); +} + +static ULONG WINAPI negotiation_Release(IWMReaderTypeNegotiation *iface) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + return IWMReader_Release(&This->IWMReader_iface); +} + +static HRESULT WINAPI negotiation_TryOutputProps(IWMReaderTypeNegotiation *iface, DWORD output, IWMOutputMediaProps *props) +{ + WMReader *This = impl_from_IWMReaderTypeNegotiation(iface); + FIXME("%p, %d, %p\n", This, output, props); + return E_NOTIMPL; +} + +static const IWMReaderTypeNegotiationVtbl WMReaderTypeNegotiationVtbl = +{ + negotiation_QueryInterface, + negotiation_AddRef, + negotiation_Release, + negotiation_TryOutputProps +}; + HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_reader) { WMReader *reader; @@ -1205,6 +1247,7 @@ HRESULT WINAPI WMCreateReader(IUnknown *reserved, DWORD rights, IWMReader **ret_ reader->IWMReaderAccelerator_iface.lpVtbl = &WMReaderAcceleratorVtbl; reader->IWMReaderNetworkConfig2_iface.lpVtbl = &WMReaderNetworkConfig2Vtbl; reader->IWMReaderStreamClock_iface.lpVtbl = &WMReaderStreamClockVtbl; + reader->IWMReaderTypeNegotiation_iface.lpVtbl = &WMReaderTypeNegotiationVtbl; reader->ref = 1; *ret_reader = &reader->IWMReader_iface;

1 0

Alexandre Julliard : gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt.
by Alexandre Julliard 12 Jul '17

12 Jul '17

Module: wine Branch: master Commit: 474f9ff1fa2ebf4ae6c4ef3b0d4987062b30d838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=474f9ff1fa2ebf4ae6c4ef3b0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 12 11:43:50 2017 +0200 gdi32: Avoid having the source alpha channel interfere with color comparisons in GdiTransparentBlt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 3d8c128..1b057f7 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -857,7 +857,19 @@ BOOL WINAPI GdiTransparentBlt( HDC hdcDest, int xDest, int yDest, int widthDest, if(oldStretchMode == BLACKONWHITE || oldStretchMode == WHITEONBLACK) SetStretchBltMode(hdcSrc, COLORONCOLOR); hdcWork = CreateCompatibleDC(hdcDest); - bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); + if (GetObjectType( hdcDest ) != OBJ_MEMDC && GetDeviceCaps( hdcDest, BITSPIXEL ) == 32) + { + /* screen DCs are not supposed to have an alpha channel, so use a 24-bpp bitmap as copy */ + BITMAPINFO info; + info.bmiHeader.biSize = sizeof(info.bmiHeader); + info.bmiHeader.biWidth = widthDest; + info.bmiHeader.biHeight = heightDest; + info.bmiHeader.biPlanes = 1; + info.bmiHeader.biBitCount = 24; + info.bmiHeader.biCompression = BI_RGB; + bmpWork = CreateDIBSection( 0, &info, DIB_RGB_COLORS, NULL, NULL, 0 ); + } + else bmpWork = CreateCompatibleBitmap(hdcDest, widthDest, heightDest); oldWork = SelectObject(hdcWork, bmpWork); if(!StretchBlt(hdcWork, 0, 0, widthDest, heightDest, hdcSrc, xSrc, ySrc, widthSrc, heightSrc, SRCCOPY)) { TRACE("Failed to stretch\n");

1 0

Rosanne DiMesio : Change distribution to operating system in places visible to users
by Jeremy Newman 12 Jul '17

12 Jul '17

Module: appdb Branch: master Commit: d4907a77b42b72cbce5e49f0d4bde6007ec36d39 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=d4907a77b42b72cbce5e49f0… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 14:47:47 2017 -0500 Change distribution to operating system in places visible to users Distribution is a Linuxism that makes no sense for users of other operating systems, and even many new Linux users are unfamiliar with the term: some users try to add the name of a distributor or version to the distribution field. Operating system is more accurate and less likely to confuse users. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/distribution.php | 60 +++++++++++++++++++++++----------------------- include/sidebar.php | 2 +- include/testData.php | 8 +++---- include/testData_queue.php | 4 ++-- 4 files changed, 37 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=d4907a77b42b72cbce5e…

1 0

Rosanne DiMesio : Favor distributions selected from list over textboxes
by Jeremy Newman 12 Jul '17

12 Jul '17

Module: appdb Branch: master Commit: c3635c89ab31de3a272aab97bda350d65f224837 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c3635c89ab31de3a272aab97… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Wed Jul 12 10:07:59 2017 -0500 Favor distributions selected from list over textboxes When a distribution has been selected from the dropdown list, anything typed in the add distribution textboxes is a mistake. Also corrects a typo that prevented the notice that the user had added a new distribution from displaying fully. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/testData.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/testData.php b/include/testData.php index 051ef65..8dac819 100644 --- a/include/testData.php +++ b/include/testData.php @@ -814,7 +814,7 @@ class testData{ "please add it using the form below."; } else { - $sDistributionHelp = "The user added a new distribution; "; + $sDistributionHelp = "The user added a new distribution; ". "review it in the form below or replace ". "it with one from the list."; } @@ -825,7 +825,7 @@ class testData{ echo '<td class=color0>',"\n"; echo $sDistributionHelp; - distribution::make_distribution_list("iDistributionId", $this->iDistributionId); + distribution::make_distribution_list("iTestDistributionId", $this->iDistributionId); echo '</td></tr>',"\n"; // Version List @@ -927,7 +927,7 @@ class testData{ } // No Distribution entered, and nothing in the list is selected - if (empty($aValues['sDistribution']) && !$aValues['iDistributionId']) + if (empty($aValues['sDistribution']) && !$aValues['iTestDistributionId']) $errors .= "<li>Please enter a distribution.</li>\n"; if (empty($aValues['sInstalls'])) @@ -973,7 +973,13 @@ class testData{ $this->shWhatDoesnt = $aValues['shWhatDoesnt']; $this->shWhatNotTested = $aValues['shWhatNotTested']; $this->sTestedDate = $aValues['sTestedDate']; - $this->iDistributionId = $aValues['iDistributionId']; + + //Favor distribution dropdown list selections over textboxes. + if($aValues['iTestDistributionId']) + $this->iDistributionId = $aValues['iTestDistributionId']; + else + $this->iDistributionId = $aValues['iDistributionId']; + $this->sTestedRelease = $aValues['sTestedRelease']; $this->iStaging = intval($aValues['iStaging']); $this->sInstalls = $aValues['sInstalls'];

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
64
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 July 2017