July 2009 - Wine-commits - list.winehq.org

Mike Kaplinskiy : ws2_32/tests: Fix test failures on NT4/x86_64.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 83d2108126d4af8b01d9b92e3160420c3b2a374c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d2108126d4af8b01d9b92e3… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 21:02:10 2009 -0400 ws2_32/tests: Fix test failures on NT4/x86_64. --- dlls/ws2_32/tests/sock.c | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index bd672c5..21502c2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2862,8 +2862,7 @@ static void test_AcceptEx(void) /* Connect socket #1 */ iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == 0 || - (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); FD_ZERO ( &fds_accept ); FD_ZERO ( &fds_send ); @@ -2877,15 +2876,17 @@ static void test_AcceptEx(void) for (i = 0; i < 4000; ++i) { - wsa_ok ( ( select ( 0, &fds_accept, &fds_send, NULL, &timeout ) ), SOCKET_ERROR !=, - "select_server (%x): select() failed: %d\n" ); + fd_set fds_openaccept = fds_accept, fds_opensend = fds_send; + + wsa_ok ( ( select ( 0, &fds_openaccept, &fds_opensend, NULL, &timeout ) ), SOCKET_ERROR !=, + "acceptex test(%d): could not select on socket, errno %d\n" ); /* check for incoming requests */ - if ( FD_ISSET ( listener, &fds_accept ) ) { + if ( FD_ISSET ( listener, &fds_openaccept ) ) { got++; if (got == 1) { SOCKET tmp = WSAAccept(listener, NULL, NULL, (LPCONDITIONPROC) AlwaysDeferConditionFunc, 0); - ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection\n"); + ok(tmp == INVALID_SOCKET && WSAGetLastError() == WSATRY_AGAIN, "Failed to defer connection, %d\n", WSAGetLastError()); bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -2901,14 +2902,14 @@ static void test_AcceptEx(void) ok(FALSE, "Got more than 2 connections?\n"); } } - if ( conn1 && FD_ISSET ( connector2, &fds_send ) ) { + if ( conn1 && FD_ISSET ( connector2, &fds_opensend ) ) { /* Send data on second socket, and stop */ send(connector2, "2", 1, 0); FD_CLR ( connector2, &fds_send ); break; } - if ( FD_ISSET ( connector, &fds_send ) ) { + if ( FD_ISSET ( connector, &fds_opensend ) ) { /* Once #1 is connected, allow #2 to connect */ conn1 = 1; @@ -2916,13 +2917,13 @@ static void test_AcceptEx(void) FD_CLR ( connector, &fds_send ); iret = connect(connector2, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - ok(iret == 0 || - (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK), "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); FD_SET ( connector2, &fds_send ); } } - ok (got == 2, "Did not get both connections\n"); + ok (got == 2 || broken(got == 1) /* NT4 */, + "Did not get both connections, got %d\n", got); dwret = WaitForSingleObject(overlapped.hEvent, 0); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); @@ -2933,7 +2934,7 @@ static void test_AcceptEx(void) set_blocking(acceptor, TRUE); iret = recv( acceptor, buffer, 2, 0); - ok(iret == 1, "Failed to get data, %d\n", iret); + ok(iret == 1, "Failed to get data, %d, errno: %d\n", iret, WSAGetLastError()); ok(buffer[0] == '1', "The wrong first client was accepted by acceptex: %c != 1\n", buffer[0]); @@ -2942,6 +2943,10 @@ static void test_AcceptEx(void) closesocket(acceptor); acceptor = INVALID_SOCKET; + /* clean up in case of failures */ + while ((acceptor = accept(listener, NULL, NULL)) != INVALID_SOCKET) + closesocket(acceptor); + /* Disconnect during receive? */ acceptor = socket(AF_INET, SOCK_STREAM, 0);

1 0

Mike Kaplinskiy : ws2_32/tests: Test closing listener during pending AcceptEx.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 4acc8729c456e238c90afa6d677d539082111aca URL: http://source.winehq.org/git/wine.git/?a=commit;h=4acc8729c456e238c90afa6d6… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 20:52:50 2009 -0400 ws2_32/tests: Test closing listener during pending AcceptEx. --- dlls/ws2_32/tests/sock.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cecda0d..bd672c5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2972,6 +2972,25 @@ static void test_AcceptEx(void) ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + closesocket(listener); + listener = INVALID_SOCKET; + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Mike Kaplinskiy : ws2_32/tests: Test AcceptEx during pending AcceptEx call.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 98bc97f770dc1dcf5bf29e4f5519f29a9c169989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98bc97f770dc1dcf5bf29e4f5… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Jul 19 20:54:03 2009 -0400 ws2_32/tests: Test AcceptEx during pending AcceptEx call. --- dlls/ws2_32/tests/sock.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b1db361..cecda0d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2774,6 +2774,11 @@ static void test_AcceptEx(void) &bytesReturned, &overlapped); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Henri Verbeet : wined3d: Remove an unused struct member.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: e6f55c2650c87598b573f015f75e4a18f24ffc12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f55c2650c87598b573f015f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:49 2009 +0200 wined3d: Remove an unused struct member. --- dlls/wined3d/wined3d_private.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d61c6a..59b91b3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1536,7 +1536,6 @@ struct IWineD3DDeviceImpl /* Caches to avoid unneeded context changes */ IWineD3DSurface *lastActiveRenderTarget; - IWineD3DSwapChain *lastActiveSwapChain; /* palettes texture management */ UINT NumberOfPalettes;

1 0

Henri Verbeet : wined3d: Skip some unnecessary FBO binds.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 3a63552fd1880c973f28baf8f9f7a29fd24d1412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a63552fd1880c973f28baf8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:48 2009 +0200 wined3d: Skip some unnecessary FBO binds. --- dlls/wined3d/device.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a1ed4dc..cf23419 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6080,12 +6080,6 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, glClear(GL_COLOR_BUFFER_BIT); checkGLcall("glClear"); - if (This->activeContext->current_fbo) { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); - } else { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); - } - if (swapchain && surface == ((IWineD3DSwapChainImpl *)swapchain)->frontBuffer && ((IWineD3DSwapChainImpl *)swapchain)->backBuffer) { glDrawBuffer(GL_BACK); @@ -6534,12 +6528,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); - if (This->activeContext->current_fbo) { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, &This->activeContext->current_fbo->id); - } else { - context_bind_fbo(This->activeContext, GL_FRAMEBUFFER_EXT, NULL); - } - /* If we switched from GL_BACK to GL_FRONT above, we need to switch back here */ if (dst_swapchain && dst_surface == ((IWineD3DSwapChainImpl *)dst_swapchain)->frontBuffer && ((IWineD3DSwapChainImpl *)dst_swapchain)->backBuffer) {

1 0

Henri Verbeet : wined3d: Recognize the SM4 log opcode.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: dedd62c0e2aa43181ec83444803a95e68e7bf16e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dedd62c0e2aa43181ec834448… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 20 12:21:47 2009 +0200 wined3d: Recognize the SM4 log opcode. --- dlls/wined3d/shader_sm4.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8686232..4e7a69e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -52,6 +52,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, WINED3D_SM4_OP_EXP = 0x19, + WINED3D_SM4_OP_LOG = 0x2f, WINED3D_SM4_OP_MOV = 0x36, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_RET = 0x3e, @@ -102,6 +103,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, 1, 2}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, 1, 2}, {WINED3D_SM4_OP_EXP, WINED3DSIH_EXP, 1, 1}, + {WINED3D_SM4_OP_LOG, WINED3DSIH_LOG, 1, 1}, {WINED3D_SM4_OP_MOV, WINED3DSIH_MOV, 1, 1}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, 1, 2}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, 0, 0},

1 0

Vladimir Pankratov : net: Convert the Russian resources to UTF-8.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 6e3ed38f6f471954e68eceb20356da6bd17586ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e3ed38f6f471954e68eceb20… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:07 2009 +0500 net: Convert the Russian resources to UTF-8. --- programs/net/Ru.rc | 39 +++++++++++++++++++++------------------ 1 files changed, 21 insertions(+), 18 deletions(-) diff --git a/programs/net/Ru.rc b/programs/net/Ru.rc index a59394b..bf4cd65 100644 --- a/programs/net/Ru.rc +++ b/programs/net/Ru.rc @@ -21,26 +21,29 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "��:\n\nNET [ HELP | START | STOP | USE ]\n" - STRING_START_USAGE, "�� .\n" - STRING_STOP_USAGE, "�� .\n" - STRING_STOP_DEP, "�� : %s\n" - STRING_CANT_STOP, "�� %s\n" - STRING_NO_SCM, "�� .\n" - STRING_NO_SVCHANDLE, "�� .\n" - STRING_START_SVC, "�� %s.\n" - STRING_START_SVC_SUCCESS, "�� %s �� .\n" - STRING_START_SVC_FAIL, "�� %s.\n" - STRING_STOP_SVC, "�� %s.\n" - STRING_STOP_SVC_SUCCESS, "�� %s �� .\n" - STRING_STOP_SVC_FAIL, "�� %s.\n" - STRING_HELP_USAGE, "��:\n\nNET HELP ��\n -��-\nNET �� /HELP\n\n"\ - " �� :\n NET HELP NET START NET STOP NET USE\n" - STRING_NO_ENTRIES, "�� .\n" - STRING_USE_HEADER, "\n�� \n---------------------------------------------------------------\n" - STRING_USE_ENTRY, "%s %S %S �� : %lu\n" + STRING_USAGE, "Использование:\n\nNET [ HELP | START | STOP | USE ]\n" + STRING_START_USAGE, "Укажите запускаемую службу.\n" + STRING_STOP_USAGE, "Укажите останавливаемую службу.\n" + STRING_STOP_DEP, "Остановка зависимой службы: %s\n" + STRING_CANT_STOP, "Невозможно остановить службу %s\n" + STRING_NO_SCM, "Невозможно получить доступ к диспетчеру служб.\n" + STRING_NO_SVCHANDLE, "Невозможно получить доступ к службе.\n" + STRING_START_SVC, "Запуск службы %s.\n" + STRING_START_SVC_SUCCESS, "Служба %s успешно запущена.\n" + STRING_START_SVC_FAIL, "Ошибка при запуске службы %s.\n" + STRING_STOP_SVC, "Остановка службы %s.\n" + STRING_STOP_SVC_SUCCESS, "Служба %s успешно остановлена.\n" + STRING_STOP_SVC_FAIL, "Ошибка при остановке службы %s.\n" + STRING_HELP_USAGE, "Использование:\n\nNET HELP команда\n -или-\nNET команда /HELP\n\n"\ + " Доступные команды:\n NET HELP NET START NET STOP NET USE\n" + STRING_NO_ENTRIES, "Список пуст.\n" + STRING_USE_HEADER, "\nСтатус Локальный Удалённый\n---------------------------------------------------------------\n" + STRING_USE_ENTRY, "%s %S %S Открытых ресурсов: %lu\n" }

1 0

Vladimir Pankratov : reg: Convert the Russian resources to UTF-8.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 08c9f775d4cf283081e05e5f95fce8b1c3fe21d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c9f775d4cf283081e05e5f9… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:46 2009 +0500 reg: Convert the Russian resources to UTF-8. --- programs/reg/Ru.rc | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/reg/Ru.rc b/programs/reg/Ru.rc index 8e07c4c..cac53a3 100644 --- a/programs/reg/Ru.rc +++ b/programs/reg/Ru.rc @@ -20,12 +20,15 @@ #include "reg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE { - STRING_USAGE, "�� :\n\nREG [ ADD | DELETE | QUERY ]\nREG <��> /?\n" - STRING_ADD_USAGE, "REG ADD <��> [/v <��> | /ve] [/t <��>] [/s <��>] [/d ��] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE <��> [/v <��> | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY <��> [/v <��> | /ve] [/s]\n" + STRING_USAGE, "Использование программы:\n\nREG [ ADD | DELETE | QUERY ]\nREG <команда> /?\n" + STRING_ADD_USAGE, "REG ADD <ключ> [/v <параметр> | /ve] [/t <тип>] [/s <разделитель>] [/d данные] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE <ключ> [/v <параметр> | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY <ключ> [/v <параметр> | /ve] [/s]\n" }

1 0

Vladimir Pankratov : progman: Convert the Russian resources to UTF-8.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 4efecf2af5c7b71fa2d777dbdcdf7dc72755fcd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4efecf2af5c7b71fa2d777dbd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:31 2009 +0500 progman: Convert the Russian resources to UTF-8. --- programs/progman/Ru.rc | 202 ++++++++++++++++++++++++------------------------ 1 files changed, 100 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4efecf2af5c7b71fa2d77…

1 0

Vladimir Pankratov : oleview: Convert the Russian resources to UTF-8.
by Alexandre Julliard 20 Jul '09

20 Jul '09

Module: wine Branch: master Commit: 3e388b834011f667db69d610e770afa79c070019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e388b834011f667db69d610e… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Mon Jul 20 15:27:17 2009 +0500 oleview: Convert the Russian resources to UTF-8. --- programs/oleview/Ru.rc | 135 ++++++++++++++++++++++++----------------------- 1 files changed, 69 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3e388b834011f667db69d…

1 0