February 2016 - Wine-Commits

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 9c526b41314359c52954f7f367cb9d7b4a26c3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c526b41314359c52954f7f36… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Feb 3 17:51:21 2016 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/po/fi.po b/po/fi.po index e3c4672..a1b4259 100644 --- a/po/fi.po +++ b/po/fi.po @@ -13010,8 +13010,6 @@ msgstr "" "järjestelmän laajuiset ja sovelluskohtaiset asetukset." #: winecfg.rc:159 -#, fuzzy -#| msgid "&Add application..." msgid "Add appli&cation..." msgstr "&Lisää sovellus..." @@ -13075,7 +13073,7 @@ msgstr "&Uusi ohitus kirjastolle:" #: winecfg.rc:196 msgid "A&dd" -msgstr "" +msgstr "&Lisää" #: winecfg.rc:197 msgid "Existing &overrides:" @@ -13102,14 +13100,12 @@ msgid "&Native (Windows)" msgstr "&Natiivi (Windows)" #: winecfg.rc:211 -#, fuzzy -#| msgid "Bui&ltin then Native" msgid "Buil&tin then Native" msgstr "S&isäinen, sitten natiivi" #: winecfg.rc:212 msgid "Nati&ve then Builtin" -msgstr "Natiivi, sitten sisäinen" +msgstr "Na&tiivi, sitten sisäinen" #: winecfg.rc:220 msgid "Select Drive Letter" @@ -13126,30 +13122,24 @@ msgid "" msgstr "Levyasemien hallintaan ei saatu yhteyttä. Asemia ei voi muokata." #: winecfg.rc:236 -#, fuzzy -#| msgid "&Add..." msgid "A&dd..." msgstr "&Lisää..." #: winecfg.rc:238 -#, fuzzy -#| msgid "Autodetect" msgid "Aut&odetect" -msgstr "Hae automaattisesti" +msgstr "&Hae automaattisesti" #: winecfg.rc:241 msgid "&Path:" -msgstr "&Polku:" +msgstr "P&olku:" #: winecfg.rc:248 winecfg.rc:38 -#, fuzzy -#| msgid "Show &Advanced" msgid "Show Advan&ced" -msgstr "Nä&ytä lisäasetukset" +msgstr "Näytä lisä&asetukset" #: winecfg.rc:249 msgid "De&vice:" -msgstr "Lai&te:" +msgstr "La&ite:" #: winecfg.rc:251 msgid "Bro&wse..." @@ -13161,13 +13151,11 @@ msgstr "&Nimi:" #: winecfg.rc:255 msgid "S&erial:" -msgstr "&Sarjanumero:" +msgstr "Sarjanumer&o:" #: winecfg.rc:258 -#, fuzzy -#| msgid "Show &dot files" msgid "&Show dot files" -msgstr "Näytä p&istetiedostot" +msgstr "N&äytä pistetiedostot" #: winecfg.rc:265 msgid "Driver diagnostics" @@ -13246,10 +13234,8 @@ msgid "Select the Unix target directory, please." msgstr "Valitse unix-kohdekansio." #: winecfg.rc:37 -#, fuzzy -#| msgid "Hide &Advanced" msgid "Hide Advan&ced" -msgstr "&Piilota lisäasetukset" +msgstr "Piilota lisä&asetukset" #: winecfg.rc:39 msgid "(No Theme)" @@ -13709,12 +13695,10 @@ msgid "Configuration error" msgstr "Virhe asetuksissa" #: wineconsole.rc:42 -#, fuzzy -#| msgid "Screen buffer size must be greater or equal to the window's one" msgid "" "The size of the screen buffer must be greater than or equal to the size of " "the window." -msgstr "Näytön puskurin on oltava suurempi tai yhtä suuri kuin ikkunan" +msgstr "Näyttöpuskurin on oltava vähintään ikkunan kokoinen" #: wineconsole.rc:37 msgid "Each character is %1!u! pixels wide and %2!u! pixels high"

1 0

Hans Leidekker : webservices: Implement WsWriteStartCData and WsWriteEndCData.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: db591a05832873436dff6f1d4178174f3f5cf789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db591a05832873436dff6f1d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:47 2016 +0100 webservices: Implement WsWriteStartCData and WsWriteEndCData. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 53 +++++++++++++++++++++++++++++++++++++-- dlls/webservices/webservices.spec | 4 +-- dlls/webservices/writer.c | 49 ++++++++++++++++++++++++++++++++++-- include/webservices.h | 2 ++ 4 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index a4d1973..2bbedf7 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -971,6 +971,54 @@ static void test_WsWriteAttribute(void) WsFreeWriter( writer ); } +static void test_WsWriteStartCData(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + WS_XML_UTF8_TEXT text; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndCData( writer, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "", __LINE__ ); + + hr = WsWriteStartCData( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><![CDATA[", __LINE__ ); + + text.text.textType = WS_XML_TEXT_TYPE_UTF8; + text.value.bytes = (BYTE *)"<data>"; + text.value.length = 6; + hr = WsWriteText( writer, &text.text, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><![CDATA[<data>", __LINE__ ); + + hr = WsWriteEndCData( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><![CDATA[<data>]]>", __LINE__ ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><![CDATA[<data>]]></t>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -980,9 +1028,10 @@ START_TEST(writer) test_WsWriteStartElement(); test_WsWriteStartAttribute(); test_WsWriteType(); + test_basic_type(); + test_simple_struct_type(); test_WsWriteElement(); test_WsWriteValue(); test_WsWriteAttribute(); - test_basic_type(); - test_simple_struct_type(); + test_WsWriteStartCData(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 699406d..ffe8bca 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -172,7 +172,7 @@ @ stub WsWriteCharsUtf8 @ stdcall WsWriteElement(ptr ptr long ptr long ptr) @ stdcall WsWriteEndAttribute(ptr ptr) -@ stub WsWriteEndCData +@ stdcall WsWriteEndCData(ptr ptr) @ stdcall WsWriteEndElement(ptr ptr) @ stdcall WsWriteEndStartElement(ptr ptr) @ stub WsWriteEnvelopeEnd @@ -182,7 +182,7 @@ @ stub WsWriteNode @ stub WsWriteQualifiedName @ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr) -@ stub WsWriteStartCData +@ stdcall WsWriteStartCData(ptr ptr) @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) @ stdcall WsWriteText(ptr ptr ptr) @ stdcall WsWriteType(ptr long long ptr long ptr long ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 95f565d..88dab77 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hans Leidekker for CodeWeavers + * Copyright 2015, 2016 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -64,9 +64,11 @@ enum writer_state WRITER_STATE_STARTELEMENT, WRITER_STATE_STARTENDELEMENT, WRITER_STATE_STARTATTRIBUTE, + WRITER_STATE_STARTCDATA, WRITER_STATE_ENDSTARTELEMENT, WRITER_STATE_TEXT, - WRITER_STATE_ENDELEMENT + WRITER_STATE_ENDELEMENT, + WRITER_STATE_ENDCDATA }; struct writer @@ -727,6 +729,49 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING return write_add_attribute( writer, prefix, localname, ns, single ); } +/************************************************************************** + * WsWriteStartCData [webservices.@] + */ +HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + /* flush current start element if necessary */ + if (writer->state == WRITER_STATE_STARTELEMENT && ((hr = write_endstartelement( writer )) != S_OK)) + return hr; + + if ((hr = write_grow_buffer( writer, 9 )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)"<![CDATA[", 9 ); + writer->state = WRITER_STATE_STARTCDATA; + return S_OK; +} + +/************************************************************************** + * WsWriteEndCData [webservices.@] + */ +HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + if (writer->state != WRITER_STATE_STARTCDATA) return WS_E_INVALID_OPERATION; + + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)"]]>", 3 ); + writer->state = WRITER_STATE_ENDCDATA; + return S_OK; +} + static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { diff --git a/include/webservices.h b/include/webservices.h index 7599c96..9ed4a18 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -590,10 +590,12 @@ HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEndCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); +HRESULT WINAPI WsWriteStartCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteText(WS_XML_WRITER*, const WS_XML_TEXT*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Parse CDATA nodes.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 48975081b8c0a260febe98a21a15fa70639d017c URL: http://source.winehq.org/git/wine.git/?a=commit;h=48975081b8c0a260febe98a21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:46 2016 +0100 webservices: Parse CDATA nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 69 +++++++++++++++++++++++++++++++++++++++-- dlls/webservices/tests/reader.c | 67 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 515ed1e..9391cf8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -329,6 +329,8 @@ void free_node( struct node *node ) heap_free( comment->value.bytes ); break; } + case WS_XML_NODE_TYPE_CDATA: + case WS_XML_NODE_TYPE_END_CDATA: case WS_XML_NODE_TYPE_END_ELEMENT: case WS_XML_NODE_TYPE_EOF: case WS_XML_NODE_TYPE_BOF: @@ -386,8 +388,11 @@ enum reader_state READER_STATE_STARTELEMENT, READER_STATE_STARTATTRIBUTE, READER_STATE_STARTENDELEMENT, + READER_STATE_STARTCDATA, + READER_STATE_CDATA, READER_STATE_TEXT, READER_STATE_ENDELEMENT, + READER_STATE_ENDCDATA, READER_STATE_COMMENT, READER_STATE_EOF }; @@ -1168,6 +1173,63 @@ static HRESULT read_comment( struct reader *reader ) return S_OK; } +static HRESULT read_startcdata( struct reader *reader ) +{ + struct node *node; + + if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; + read_skip( reader, 9 ); + + if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_STARTCDATA; + return S_OK; +} + +static HRESULT read_cdata( struct reader *reader ) +{ + unsigned int len = 0, ch, skip; + const unsigned char *start; + struct node *node; + WS_XML_TEXT_NODE *text; + WS_XML_UTF8_TEXT *utf8; + + start = read_current_ptr( reader ); + for (;;) + { + if (!read_cmp( reader, "]]>", 3 )) break; + if (!(ch = read_utf8_char( reader, &skip ))) return WS_E_INVALID_FORMAT; + read_skip( reader, skip ); + len += skip; + } + + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; + text = (WS_XML_TEXT_NODE *)node; + if (!(utf8 = alloc_utf8_text( start, len ))) + { + heap_free( node ); + return E_OUTOFMEMORY; + } + text->text = &utf8->text; + + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_CDATA; + return S_OK; +} + +static HRESULT read_endcdata( struct reader *reader ) +{ + struct node *node; + + if (read_cmp( reader, "]]>", 3 )) return WS_E_INVALID_FORMAT; + read_skip( reader, 3 ); + + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current->parent, node ); + reader->state = READER_STATE_ENDCDATA; + return S_OK; +} + static HRESULT read_node( struct reader *reader ) { HRESULT hr; @@ -1181,13 +1243,16 @@ static HRESULT read_node( struct reader *reader ) reader->state = READER_STATE_EOF; return S_OK; } - if (!read_cmp( reader, "<?", 2 )) + 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 )) { hr = read_xmldecl( reader ); if (FAILED( hr )) return hr; } else if (!read_cmp( reader, "</", 2 )) return read_endelement( reader ); - else if (!read_cmp( reader, "<!", 2 )) return read_comment( reader ); + else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); + else if (!read_cmp( reader, "<!--", 4 )) return read_comment( reader ); else if (!read_cmp( reader, "<", 1 )) return read_startelement( reader ); else return read_text( reader ); } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 958d08c..f9b2ea9 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1805,6 +1805,72 @@ static void test_simple_struct_type(void) WsFreeHeap( heap ); } +static void test_cdata(void) +{ + static const char test[] = "<t><![CDATA[<data>]]></t>"; + HRESULT hr; + WS_XML_READER *reader; + const WS_XML_NODE *node; + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_input( reader, test, sizeof(test) - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof(test) - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_CDATA, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) + { + WS_XML_TEXT_NODE *text = (WS_XML_TEXT_NODE *)node; + ok( node->nodeType == WS_XML_NODE_TYPE_TEXT, "got %u\n", node->nodeType ); + ok( text->text != NULL, "text not set\n" ); + if (text->text) + { + WS_XML_UTF8_TEXT *utf8 = (WS_XML_UTF8_TEXT *)text->text; + ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); + ok( utf8->value.length == 6, "got %u\n", utf8->value.length ); + ok( !memcmp( utf8->value.bytes, "<data>", 6 ), "wrong data\n" ); + } + } + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_CDATA, "got %u\n", node->nodeType ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + WsFreeReader( reader ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1823,4 +1889,5 @@ START_TEST(reader) test_WsAlloc(); test_WsMoveReader(); test_simple_struct_type(); + test_cdata(); }

1 0

Pierre Schweitzer : mpr/tests: Add tests for WNetUseConnectionA().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: d2ce22ba239d6ea4955e58784cf3e912920bb93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ce22ba239d6ea4955e58784… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Sun Jan 31 22:17:27 2016 +0100 mpr/tests: Add tests for WNetUseConnectionA(). Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/tests/mpr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/mpr/tests/mpr.c b/dlls/mpr/tests/mpr.c index 99b05f6..ee1ff3a 100644 --- a/dlls/mpr/tests/mpr.c +++ b/dlls/mpr/tests/mpr.c @@ -164,6 +164,7 @@ static DWORD (WINAPI *pWNetCachePassword)( LPSTR, WORD, LPSTR, WORD, BYTE, WORD static DWORD (WINAPI *pWNetGetCachedPassword)( LPSTR, WORD, LPSTR, LPWORD, BYTE ); static UINT (WINAPI *pWNetEnumCachedPasswords)( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); static UINT (WINAPI *pWNetRemoveCachedPassword)( LPSTR, WORD, BYTE ); +static DWORD (WINAPI *pWNetUseConnectionA)( HWND, LPNETRESOURCEA, LPCSTR, LPCSTR, DWORD, LPSTR, LPDWORD, LPDWORD ); #define MPR_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hmpr, #func) @@ -176,6 +177,7 @@ static void InitFunctionPtrs(void) MPR_GET_PROC(WNetGetCachedPassword); MPR_GET_PROC(WNetEnumCachedPasswords); MPR_GET_PROC(WNetRemoveCachedPassword); + MPR_GET_PROC(WNetUseConnectionA); } static const char* m_resource = "wine-test-resource"; @@ -257,9 +259,62 @@ static void test_WNetCachePassword(void) } } +static void test_WNetUseConnection(void) +{ + DWORD ret; + DWORD bufSize; + DWORD outRes; + LPNETRESOURCEA netRes; + CHAR outBuf[4]; + + if (pWNetUseConnectionA) + { + netRes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(NETRESOURCEA) + sizeof("\\\\127.0.0.1\\c$") + sizeof("J:")); + netRes->dwType = RESOURCETYPE_DISK; + netRes->dwDisplayType = RESOURCEDISPLAYTYPE_SHARE; + netRes->dwUsage = RESOURCEUSAGE_CONNECTABLE; + netRes->lpLocalName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA)); + netRes->lpRemoteName = (LPSTR)((LPBYTE)netRes + sizeof(NETRESOURCEA) + sizeof("J:")); + strcpy(netRes->lpLocalName, "J:"); + strcpy(netRes->lpRemoteName, "\\\\127.0.0.1\\c$"); + bufSize = 0; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, NULL, &bufSize, &outRes); + todo_wine + ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) + WNetCancelConnectionA("J:", TRUE); + bufSize = 0; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return: %u\n", ret); + ok(bufSize == 0, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) + WNetCancelConnectionA("J:", TRUE); + bufSize = 1; + todo_wine { + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == ERROR_MORE_DATA, "Unexpected return: %u\n", ret); + ok(bufSize == 3, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) + WNetCancelConnectionA("J:", TRUE); + bufSize = 4; + ret = pWNetUseConnectionA(NULL, netRes, NULL, NULL, 0, outBuf, &bufSize, &outRes); + ok(ret == WN_SUCCESS, "Unexpected return: %u\n", ret); + } + ok(bufSize == 4, "Unexpected buffer size: %u\n", bufSize); + if (ret == WN_SUCCESS) + WNetCancelConnectionA("J:", TRUE); + HeapFree(GetProcessHeap(), 0, netRes); + } else { + win_skip("WNetUseConnection() is not supported.\n"); + } +} + START_TEST(mpr) { test_WNetGetUniversalName(); test_WNetGetRemoteName(); test_WNetCachePassword(); + test_WNetUseConnection(); }

1 0

Józef Kucia : d3d10core/tests: Add test for SM4 sample_b instruction.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 70c081796f5d9bd0019fdeb6f5c8e2233660de40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c081796f5d9bd0019fdeb6f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:13 2016 +0100 d3d10core/tests: Add test for SM4 sample_b instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 92ae1cf..b08041e 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3415,6 +3415,35 @@ static void test_texture(void) 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, }; + static const DWORD ps_sample_b_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float bias; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.SampleBias(s, p, bias); + } +#endif + 0x43425844, 0xc39b0686, 0x8244a7fc, 0x14c0b97a, 0x2900b3b7, 0x00000001, 0x00000150, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000b4, 0x00000040, + 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300005a, 0x00106000, 0x00000000, + 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x0c00004a, + 0x001020f2, 0x00000000, 0x00100046, 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, + }; static const DWORD ps_sample_l_code[] = { #if 0 @@ -3448,6 +3477,7 @@ static void test_texture(void) static const struct shader ps_ld_sint8 = {ps_ld_sint8_code, sizeof(ps_ld_sint8_code)}; static const struct shader ps_ld_uint8 = {ps_ld_uint8_code, sizeof(ps_ld_uint8_code)}; static const struct shader ps_sample = {ps_sample_code, sizeof(ps_sample_code)}; + static const struct shader ps_sample_b = {ps_sample_b_code, sizeof(ps_sample_b_code)}; static const struct shader ps_sample_l = {ps_sample_l_code, sizeof(ps_sample_l_code)}; static const struct { @@ -3581,6 +3611,18 @@ static void test_texture(void) {&ps_sample, &bc3_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, bc_colors}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.4f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.5f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 9.0f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 2.0f, 1.0f, rgba_level_0}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 2.0f, 9.0f, level_2_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 1.0f, 9.0f, level_1_colors}, + {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 9.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, -1.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_l, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.4f, rgba_level_0},

1 0

Hans Leidekker : webservices: Implement WsReadEndAttribute.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 417ac65ef6dd4a4bc54b7cbc49e0ae840db178ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=417ac65ef6dd4a4bc54b7cbc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 15:43:43 2016 +0100 webservices: Implement WsReadEndAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 21 ++++++++++++++++++++- dlls/webservices/webservices.spec | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a0c32a9..08f2287 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1,5 +1,5 @@ /* - * Copyright 2015 Hans Leidekker for CodeWeavers + * Copyright 2015, 2016 Hans Leidekker for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1371,6 +1371,25 @@ HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERRO return S_OK; } +/************************************************************************** + * WsReadEndAttribute [webservices.@] + */ +HRESULT WINAPI WsReadEndAttribute( WS_XML_READER *handle, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + if (reader->state != READER_STATE_STARTATTRIBUTE) + return WS_E_INVALID_FORMAT; + + reader->state = READER_STATE_STARTELEMENT; + return S_OK; +} + static WCHAR *xmltext_to_widechar( WS_HEAP *heap, const WS_XML_TEXT *text ) { WCHAR *ret; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 062af8d..699406d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -108,7 +108,7 @@ @ stub WsReadChars @ stub WsReadCharsUtf8 @ stub WsReadElement -@ stub WsReadEndAttribute +@ stdcall WsReadEndAttribute(ptr ptr) @ stdcall WsReadEndElement(ptr ptr) @ stub WsReadEndpointAddressExtension @ stub WsReadEnvelopeEnd

1 0

Józef Kucia : wined3d: Implement SM4 sample_d instruction.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 9fff1694980484c69de1101167c3b180b264aa14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fff1694980484c69de110116… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:11 2016 +0100 wined3d: Implement SM4 sample_d instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e9ec4f1..1b82858 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4395,15 +4395,23 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) { + const char *lod_param_str = NULL, *dx_param_str = NULL, *dy_param_str = NULL; + struct glsl_src_param coord_param, lod_param, dx_param, dy_param; unsigned int resource_idx, sampler_idx, sampler_bind_idx; - struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - const char *lod_param_str = NULL; DWORD flags = 0; + if (ins->handler_idx == WINED3DSIH_SAMPLE_GRAD) + flags |= WINED3D_GLSL_SAMPLE_GRAD; + if (ins->handler_idx == WINED3DSIH_SAMPLE_LOD) + flags |= WINED3D_GLSL_SAMPLE_LOD; + resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; + shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); + shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); + switch (ins->handler_idx) { case WINED3DSIH_SAMPLE: @@ -4412,8 +4420,13 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); lod_param_str = lod_param.param_str; break; + case WINED3DSIH_SAMPLE_GRAD: + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[4], sample_function.coord_mask, &dy_param); + dx_param_str = dx_param.param_str; + dy_param_str = dy_param.param_str; + break; case WINED3DSIH_SAMPLE_LOD: - flags |= WINED3D_GLSL_SAMPLE_LOD; shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); lod_param_str = lod_param.param_str; break; @@ -4422,11 +4435,9 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) break; } - shader_glsl_get_sample_function(ins->ctx, resource_idx, flags, &sample_function); - shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param_str, "%s", coord_param.param_str); + dx_param_str, dy_param_str, lod_param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -8111,7 +8122,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SAMPLE_B */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, - /* WINED3DSIH_SAMPLE_GRAD */ NULL, + /* WINED3DSIH_SAMPLE_GRAD */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_glsl_compare,

1 0

Józef Kucia : wined3d: Recognize SM4 sample_c opcode.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 233dff7ca3f7501d035a6ec4508ba78890737dd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233dff7ca3f7501d035a6ec45… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 3 11:49:08 2016 +0100 wined3d: Recognize SM4 sample_c opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9c19600..54bd1a9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5316,6 +5316,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_B */ NULL, + /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index fa82196..0f2327f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8104,6 +8104,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_B */ NULL, + /* WINED3DSIH_SAMPLE_C */ NULL, /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2ae6393..e81fc4e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -144,6 +144,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", /* WINED3DSIH_SAMPLE_B */ "sample_b", + /* WINED3DSIH_SAMPLE_C */ "sample_c", /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ce1067f..2de7fc4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -147,6 +147,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ROUND_Z = 0x43, WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, + WINED3D_SM4_OP_SAMPLE_C = 0x46, WINED3D_SM4_OP_SAMPLE_C_LZ = 0x47, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, @@ -358,6 +359,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"}, + {WINED3D_SM4_OP_SAMPLE_C, WINED3DSIH_SAMPLE_C, "F", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_C_LZ, "F", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_GRAD, WINED3DSIH_SAMPLE_GRAD, "U", "FRSFF"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 965b012..84a6dc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -594,6 +594,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, WINED3DSIH_SAMPLE_B, + WINED3DSIH_SAMPLE_C, WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD,

1 0

Nikolay Sivov : dwrite: Implement SetLineSpacing() for layout.
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: b2a0fbc158eb728f47ffb9ed0e48d2f52df0e80d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2a0fbc158eb728f47ffb9ed0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 2 23:14:40 2016 +0300 dwrite: Implement SetLineSpacing() for layout. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 8c611f9..1d09460 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -410,6 +410,21 @@ static inline HRESULT format_set_flowdirection(struct dwrite_textformat_data *fo return S_OK; } +static inline HRESULT format_set_linespacing(struct dwrite_textformat_data *format, + DWRITE_LINE_SPACING_METHOD method, FLOAT spacing, FLOAT baseline, BOOL *changed) +{ + if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) + return E_INVALIDARG; + + if (changed) *changed = format->spacingmethod != method || + format->spacing != spacing || format->baseline != baseline; + + format->spacingmethod = method; + format->spacing = spacing; + format->baseline = baseline; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -3725,12 +3740,23 @@ static HRESULT WINAPI dwritetextformat1_layout_SetTrimming(IDWriteTextFormat1 *i return E_NOTIMPL; } -static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD spacing, - FLOAT line_spacing, FLOAT baseline) +static HRESULT WINAPI dwritetextformat1_layout_SetLineSpacing(IDWriteTextFormat1 *iface, DWRITE_LINE_SPACING_METHOD method, + FLOAT spacing, FLOAT baseline) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d %f %f): stub\n", This, spacing, line_spacing, baseline); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); + + hr = format_set_linespacing(&This->format, method, spacing, baseline, &changed); + if (FAILED(hr)) + return hr; + + if (changed) + This->recompute = RECOMPUTE_EVERYTHING; + + return S_OK; } static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat1_layout_GetTextAlignment(IDWriteTextFormat1 *iface) @@ -4726,16 +4752,8 @@ static HRESULT WINAPI dwritetextformat_SetLineSpacing(IDWriteTextFormat1 *iface, FLOAT spacing, FLOAT baseline) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d %f %f)\n", This, method, spacing, baseline); - - if (spacing < 0.0f || (UINT32)method > DWRITE_LINE_SPACING_METHOD_UNIFORM) - return E_INVALIDARG; - - This->format.spacingmethod = method; - This->format.spacing = spacing; - This->format.baseline = baseline; - return S_OK; + return format_set_linespacing(&This->format, method, spacing, baseline, NULL); } static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextformat_GetTextAlignment(IDWriteTextFormat1 *iface)

1 0

Henri Verbeet : wined3d: Simplify wined3d_rendertarget_view_create_from_sub_resource().
by Alexandre Julliard Feb. 3, 2016

Feb. 3, 2016

Module: wine Branch: master Commit: 8f1cf93b21977373dfa731d2862ff631dd85af64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f1cf93b21977373dfa731d28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 2 19:23:31 2016 +0100 wined3d: Simplify wined3d_rendertarget_view_create_from_sub_resource(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e621356..5f046fa 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -164,22 +164,17 @@ HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_ unsigned int sub_resource_idx, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_rendertarget_view **view) { - struct wined3d_resource *sub_resource; + struct wined3d_rendertarget_view_desc desc; TRACE("texture %p, sub_resource_idx %u, parent %p, parent_ops %p, view %p.\n", texture, sub_resource_idx, parent, parent_ops, view); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx))) - return WINED3DERR_INVALIDCALL; - - if (sub_resource->type != WINED3D_RTYPE_SURFACE) - { - FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(texture->resource.type)); - return WINED3DERR_INVALIDCALL; - } + desc.format_id = texture->resource.format->id; + desc.u.texture.level_idx = sub_resource_idx % texture->level_count; + desc.u.texture.layer_idx = sub_resource_idx / texture->level_count; + desc.u.texture.layer_count = 1; - return wined3d_rendertarget_view_create_from_surface(surface_from_resource(sub_resource), - parent, parent_ops, view); + return wined3d_rendertarget_view_create(&desc, &texture->resource, parent, parent_ops, view); } ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_view *view)

1 0