wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Huw Davies : riched20: Add linefeeds after the colortbl and generator groups.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 6bcf4d60371fba3fa357943a985236047e18f1d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bcf4d60371fba3fa357943a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:43 2017 +0000 riched20: Add linefeeds after the colortbl and generator groups. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index fe768fa..d579084 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -390,7 +390,7 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, (pStream->colortbl[i] >> 8) & 0xFF, (pStream->colortbl[i] >> 16) & 0xFF)) return FALSE; } - if (!ME_StreamOutPrint(pStream, "}")) return FALSE; + if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; return TRUE; } @@ -1017,7 +1017,7 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, /* TODO: stylesheet table */ - if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}")) + if (!ME_StreamOutPrint(pStream, "{\\*\\generator Wine Riched20 2.0;}\r\n")) return FALSE; /* TODO: information group */

1 0

Huw Davies : riched20: Remove a hack that should be longer be needed.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 8b79854d701741c50182bc8af77fb66f57dc5452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b79854d701741c50182bc8af… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:42 2017 +0000 riched20: Remove a hack that should be longer be needed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/writer.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 809b93e..fe768fa 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -382,14 +382,6 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; - /* It seems like Open Office ignores \deff0 tag at RTF-header. - As result it can't correctly parse text before first \fN tag, - so we can put \f0 immediately after font table. This forces - parser to use the same font, that \deff0 specifies. - It makes OOffice happy */ - if (!ME_StreamOutPrint(pStream, "\\f0")) - return FALSE; - /* Output the color table */ if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ for (i = 1; i < pStream->nColorTblLen; i++)

1 0

Huw Davies : riched20: Write the char format for the end-of-paragraph marker.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 3d291dd7eed2524e857ae2075f550441b694abb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d291dd7eed2524e857ae2075… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 3 10:10:41 2017 +0000 riched20: Write the char format for the end-of-paragraph marker. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- dlls/riched20/writer.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 5e71e51..ef53c56 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3951,7 +3951,7 @@ static void test_EM_STREAMOUT_empty_para(void) SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es); ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n"); - todo_wine ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); + ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); DestroyWindow(hwnd); } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index baa2886..809b93e 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1074,6 +1074,9 @@ static BOOL ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, } nChars--; } else if (cursor.pRun->member.run.nFlags & MERF_ENDPARA) { + if (!ME_StreamOutRTFCharProps(pStream, &cursor.pRun->member.run.style->fmt)) + return FALSE; + if (cursor.pPara->member.para.fmt.dwMask & PFM_TABLE && cursor.pPara->member.para.fmt.wEffects & PFE_TABLE && !(cursor.pPara->member.para.nFlags & (MEPF_ROWSTART|MEPF_ROWEND|MEPF_CELL)))

1 0

Bruno Jesus : ws2_32: Fix WSAStringToAddress parsing for IPv6.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: b60cd6830848431e359196bb1d801e93d0952fdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b60cd6830848431e359196bb1… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:44 2017 -0300 ws2_32: Fix WSAStringToAddress parsing for IPv6. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++------------------ dlls/ws2_32/tests/sock.c | 4 ---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 451c505..d13fbf4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -8255,10 +8255,6 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN)lpAddress)->sin_port = htons(atoi(ptrPort+1)); *ptrPort = '\0'; } - else - { - ((LPSOCKADDR_IN)lpAddress)->sin_port = 0; - } if(inet_aton(workBuffer, &inetaddr) > 0) { @@ -8269,11 +8265,12 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, res = WSAEINVAL; break; - } case WS_AF_INET6: { struct in6_addr inetaddr; + char *ptrAddr = workBuffer; + /* If lpAddressLength is too small, tell caller the size we need */ if (*lpAddressLength < sizeof(SOCKADDR_IN6)) { @@ -8287,24 +8284,27 @@ INT WINAPI WSAStringToAddressA(LPSTR AddressString, ((LPSOCKADDR_IN6)lpAddress)->sin6_family = WS_AF_INET6; - /* This one is a bit tricky. An IPv6 address contains colons, so the - * check from IPv4 doesn't work like that. However, IPv6 addresses that - * contain a port are written with braces like [fd12:3456:7890::1]:12345 - * so what we will do is to look for ']', check if the next char is a - * colon, and if it is, parse the port as in IPv4. */ + /* Valid IPv6 addresses can also be surrounded by [ ], and in this case + * a port number may follow after like in [fd12:3456:7890::1]:12345 + * We need to cut the brackets and find the port if any. */ - ptrPort = strchr(workBuffer, ']'); - if(ptrPort && *(++ptrPort) == ':') + if(*workBuffer == '[') { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort+1)); + ptrPort = strchr(workBuffer, ']'); + if (!ptrPort) + { + SetLastError(WSAEINVAL); + return SOCKET_ERROR; + } + + if (ptrPort[1] == ':') + ((LPSOCKADDR_IN6)lpAddress)->sin6_port = htons(atoi(ptrPort + 2)); + *ptrPort = '\0'; - } - else - { - ((LPSOCKADDR_IN6)lpAddress)->sin6_port = 0; + ptrAddr = workBuffer + 1; } - if(inet_pton(AF_INET6, workBuffer, &inetaddr) > 0) + if(inet_pton(AF_INET6, ptrAddr, &inetaddr) > 0) { memcpy(&((LPSOCKADDR_IN6)lpAddress)->sin6_addr, &inetaddr, sizeof(struct in6_addr)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bf90ce5..c77f43b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3426,7 +3426,6 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3436,7 +3435,6 @@ todo_wine ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); @@ -3568,7 +3566,6 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); @@ -3578,7 +3575,6 @@ todo_wine ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); -todo_wine ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE);

1 0

Bruno Jesus : ws2_32/tests: Rework WSAStringToAddress tests.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 49a2d1b80230cbd6e4c1c645a85ef1dc080484a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49a2d1b80230cbd6e4c1c645a… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 22:21:43 2017 -0300 ws2_32/tests: Rework WSAStringToAddress tests. Current IPv6 tests were hiddenly failing in wine due to overly acceptive ok calls. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b61905e..bf90ce5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3397,15 +3397,27 @@ static void test_WSAStringToAddressA(void) (ret == SOCKET_ERROR && (GLE == ERROR_INVALID_PARAMETER || GLE == WSAEINVAL)), "WSAStringToAddressA() failed unexpectedly: %d\n", GLE ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressA() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressA( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3414,8 +3426,8 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3424,16 +3436,23 @@ static void test_WSAStringToAddressA(void) ret = WSAStringToAddressA( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressA() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressA( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressA( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressA() should have failed with %d\n", GLE ); + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressA( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); } static void test_WSAStringToAddressW(void) @@ -3520,15 +3539,27 @@ static void test_WSAStringToAddressW(void) broken(len == sizeof(SOCKADDR_STORAGE)) /* NT4/2k */, "unexpected length %d\n", len ); + len = sizeof(sockaddr); + + ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); sockaddr6.sin6_family = AF_INET6; ret = WSAStringToAddressW( address6, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); + if (ret == SOCKET_ERROR) + { + win_skip("IPv6 not supported\n"); + return; + } + GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3537,8 +3568,8 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address7, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( ret == 0 || (ret == SOCKET_ERROR && GLE == WSAEINVAL), - "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); +todo_wine + ok( ret == 0, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); len = sizeof(sockaddr6); memset(&sockaddr6, 0, len); @@ -3547,13 +3578,20 @@ static void test_WSAStringToAddressW(void) ret = WSAStringToAddressW( address8, AF_INET6, NULL, (SOCKADDR*)&sockaddr6, &len ); GLE = WSAGetLastError(); - ok( (ret == 0 && sockaddr6.sin6_port == 0xffff) || - (ret == SOCKET_ERROR && GLE == WSAEINVAL), +todo_wine + ok( ret == 0 && sockaddr6.sin6_port == 0xffff, "WSAStringToAddressW() failed for IPv6 address: %d\n", GLE); - len = sizeof(sockaddr); + len = sizeof(sockaddr6); - ret = WSAStringToAddressW( address9, AF_INET, NULL, (SOCKADDR*)&sockaddr, &len ); + ret = WSAStringToAddressW( address7 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); + GLE = WSAGetLastError(); + ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), + "WSAStringToAddressW() should have failed with %d\n", GLE ); + + len = sizeof(sockaddr6); + + ret = WSAStringToAddressW( address8 + 1, AF_INET6, NULL, (SOCKADDR*)&sockaddr, &len ); GLE = WSAGetLastError(); ok( (ret == SOCKET_ERROR && GLE == WSAEINVAL), "WSAStringToAddressW() should have failed with %d\n", GLE );

1 0

Nikolay Sivov : xmllite/reader: Fix writing back resolved character reference value.
by Alexandre Julliard 03 Mar '17

03 Mar '17

Module: wine Branch: master Commit: 107615da7f07cfbc69c8f23c3c416c60fc27a9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=107615da7f07cfbc69c8f23c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 3 00:11:28 2017 +0300 xmllite/reader: Fix writing back resolved character reference value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9bb0d56..a880bee 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2054,8 +2054,12 @@ static HRESULT reader_parse_reference(xmlreader *reader) /* normalize */ if (is_wchar_space(ch)) ch = ' '; - len = buffer->written - ((char*)ptr - buffer->data) - sizeof(WCHAR); - memmove(start+1, ptr+1, len); + ptr = reader_get_ptr(reader); + start = reader_get_ptr2(reader, cur); + len = buffer->written - ((char *)ptr - buffer->data); + memmove(start + 1, ptr + 1, len); + + buffer->written -= (reader_get_cur(reader) - cur) * sizeof(WCHAR); buffer->cur = cur + 1; *start = ch;

1 0

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: e918c6fd8b426e8298eca5951d917960e4236d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e918c6fd8b426e8298eca5951… Author: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Date: Sun Feb 26 14:20:18 2017 +0100 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <marcin123407(a)vivaldi.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 360 ++++++++++++++++++++++++--------------------------------------- 1 file changed, 135 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e918c6fd8b426e8298eca…

1 0

Hans Leidekker : riched20/tests: Add a test to show that empty paragraphs get a font size declaration.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 5ac4766476161a01524ea86b507c6c8646a3a160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac4766476161a01524ea86b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 2 11:46:53 2017 +0100 riched20/tests: Add a test to show that empty paragraphs get a font size declaration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index bfc61ea..5e71e51 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3936,6 +3936,25 @@ static void test_EM_STREAMOUT_FONTTBL(void) DestroyWindow(hwndRichEdit); } +static void test_EM_STREAMOUT_empty_para(void) +{ + HWND hwnd = new_richedit(NULL); + char buf[1024], *p = buf; + EDITSTREAM es; + + SendMessageA(hwnd, WM_SETTEXT, 0, (LPARAM)""); + + memset(buf, 0, sizeof(buf)); + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_WM_SETTEXT_esCallback; + + SendMessageA(hwnd, EM_STREAMOUT, SF_RTF, (LPARAM)&es); + ok((p = strstr(buf, "\\pard")) != NULL, "missing \\pard\n"); + todo_wine ok(((p = strstr(p, "\\fs")) && isdigit(p[3])), "missing \\fs\n"); + + DestroyWindow(hwnd); +} static void test_EM_SETTEXTEX(void) { @@ -8720,6 +8739,7 @@ START_TEST( editor ) test_EM_STREAMIN(); test_EM_STREAMOUT(); test_EM_STREAMOUT_FONTTBL(); + test_EM_STREAMOUT_empty_para(); test_EM_StreamIn_Undo(); test_EM_FORMATRANGE(); test_unicode_conversions();

1 0

Bruno Jesus : ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: 914e401aa9d5401893c3807d51e3f19fc7a7ab38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=914e401aa9d5401893c3807d5… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Thu Mar 2 02:38:15 2017 -0300 ws2_32: Turn SIO_GET_EXTENSION_FUNCTION_POINTER into a table. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 94 ++++++++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 32f187a..451c505 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4908,68 +4908,54 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID break; } - case WS_SIO_FLUSH: - FIXME("SIO_FLUSH: stub.\n"); - break; + case WS_SIO_FLUSH: + FIXME("SIO_FLUSH: stub.\n"); + break; - case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: - { - static const GUID connectex_guid = WSAID_CONNECTEX; - static const GUID disconnectex_guid = WSAID_DISCONNECTEX; - static const GUID acceptex_guid = WSAID_ACCEPTEX; - static const GUID getaccepexsockaddrs_guid = WSAID_GETACCEPTEXSOCKADDRS; - static const GUID transmitfile_guid = WSAID_TRANSMITFILE; - static const GUID transmitpackets_guid = WSAID_TRANSMITPACKETS; - static const GUID wsarecvmsg_guid = WSAID_WSARECVMSG; - static const GUID wsasendmsg_guid = WSAID_WSASENDMSG; - - if ( IsEqualGUID(&connectex_guid, in_buff) ) - { - *(LPFN_CONNECTEX *)out_buff = WS2_ConnectEx; - break; - } - else if ( IsEqualGUID(&disconnectex_guid, in_buff) ) - { - *(LPFN_DISCONNECTEX *)out_buff = WS2_DisconnectEx; - break; - } - else if ( IsEqualGUID(&acceptex_guid, in_buff) ) - { - *(LPFN_ACCEPTEX *)out_buff = WS2_AcceptEx; - break; - } - else if ( IsEqualGUID(&getaccepexsockaddrs_guid, in_buff) ) - { - *(LPFN_GETACCEPTEXSOCKADDRS *)out_buff = WS2_GetAcceptExSockaddrs; - break; - } - else if ( IsEqualGUID(&transmitfile_guid, in_buff) ) - { - *(LPFN_TRANSMITFILE *)out_buff = WS2_TransmitFile; - break; - } - else if ( IsEqualGUID(&transmitpackets_guid, in_buff) ) - { - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER: unimplemented TransmitPackets\n"); - } - else if ( IsEqualGUID(&wsarecvmsg_guid, in_buff) ) - { - *(LPFN_WSARECVMSG *)out_buff = WS2_WSARecvMsg; - break; + case WS_SIO_GET_EXTENSION_FUNCTION_POINTER: + { +#define EXTENSION_FUNCTION(x, y) { x, y, #y }, + static const struct + { + GUID guid; + void *func_ptr; + const char *name; + } guid_funcs[] = { + EXTENSION_FUNCTION(WSAID_CONNECTEX, WS2_ConnectEx) + EXTENSION_FUNCTION(WSAID_DISCONNECTEX, WS2_DisconnectEx) + EXTENSION_FUNCTION(WSAID_ACCEPTEX, WS2_AcceptEx) + EXTENSION_FUNCTION(WSAID_GETACCEPTEXSOCKADDRS, WS2_GetAcceptExSockaddrs) + EXTENSION_FUNCTION(WSAID_TRANSMITFILE, WS2_TransmitFile) + /* EXTENSION_FUNCTION(WSAID_TRANSMITPACKETS, WS2_TransmitPackets) */ + EXTENSION_FUNCTION(WSAID_WSARECVMSG, WS2_WSARecvMsg) + EXTENSION_FUNCTION(WSAID_WSASENDMSG, WSASendMsg) + }; +#undef EXTENSION_FUNCTION + BOOL found = FALSE; + unsigned int i; + + for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + { + if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) + { + found = TRUE; + break; + } } - else if ( IsEqualGUID(&wsasendmsg_guid, in_buff) ) + + if (found) { - *(LPFN_WSASENDMSG *)out_buff = WSASendMsg; + TRACE("-> got %s\n", guid_funcs[i].name); + *(void **)out_buff = guid_funcs[i].func_ptr; break; } - else - FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); + FIXME("SIO_GET_EXTENSION_FUNCTION_POINTER %s: stub\n", debugstr_guid(in_buff)); status = WSAEOPNOTSUPP; break; - } - case WS_SIO_KEEPALIVE_VALS: - { + } + case WS_SIO_KEEPALIVE_VALS: + { struct tcp_keepalive *k; int keepalive, keepidle, keepintvl;

1 0

Paul Gofman : ntdll: NtFlushBuffersFile should fail if the file handle has no write access.
by Alexandre Julliard 02 Mar '17

02 Mar '17

Module: wine Branch: master Commit: f7d40d45da7a1bc0accd58bca6d6da4e34861937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d40d45da7a1bc0accd58bca… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 1 14:05:54 2017 +0300 ntdll: NtFlushBuffersFile should fail if the file handle has no write access. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index fd7f3dd..3f38c6f 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3423,7 +3423,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK* IoStatusBlock { ret = COMM_FlushBuffersFile( fd ); } - else + else if (ret != STATUS_ACCESS_DENIED) { SERVER_START_REQ( flush ) { diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index bc1afdf..3d91cb1 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4429,7 +4429,6 @@ static void test_flush_buffers_file(void) ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#x.\n", status); status = pNtFlushBuffersFile(hfileread, &io_status_block); - todo_wine ok(status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %#x.\n", status); status = pNtFlushBuffersFile(NULL, &io_status_block);

1 0

← Newer
1
...
65
66
67
68
69
70
71
72
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 March 2017