May 2008 - Wine-Commits - list.winehq.org

Francois Gouget : winetest: Remove unneeded files.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: tools Branch: master Commit: 12d375e60c3c8fdea165291ab1ac1bcce5452eca URL: http://source.winehq.org/git/tools.git/?a=commit;h=12d375e60c3c8fdea165291a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 28 10:56:11 2008 +0200 winetest: Remove unneeded files. --- winetest/builds.txt | 1 - winetest/winetest.builds | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/winetest/builds.txt b/winetest/builds.txt deleted file mode 100644 index 20b9cc4..0000000 --- a/winetest/builds.txt +++ /dev/null @@ -1 +0,0 @@ -# List of Perl regexps matching acceptable build tags. diff --git a/winetest/winetest.builds b/winetest/winetest.builds deleted file mode 100644 index 20b9cc4..0000000 --- a/winetest/winetest.builds +++ /dev/null @@ -1 +0,0 @@ -# List of Perl regexps matching acceptable build tags.

1 0

Francois Gouget : winetest: Remove the legacy CSS styles.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: tools Branch: master Commit: 625a9f264658a25d008108e7b8c9b5a1027155d9 URL: http://source.winehq.org/git/tools.git/?a=commit;h=625a9f264658a25d008108e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 28 10:54:36 2008 +0200 winetest: Remove the legacy CSS styles. --- winetest/summary.css | 92 -------------------------------------------------- 1 files changed, 0 insertions(+), 92 deletions(-) diff --git a/winetest/summary.css b/winetest/summary.css index a7b4e31..0542564 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -39,98 +39,6 @@ h3, p.legend { .also-skip { border-right-color: #0070ff; } - -/* Styles kept for compatibility with old reports */ -.vis_pass { - background-color: #60ff60; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #60ff60; - border-right-color: #0070ff; -} -.vis_fail { - background-color: #ff5050; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff5050; - border-right-color: #0070ff; -} -.skip_pass { - background-color: #60ff60; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #60ff60; - border-right-color: #0070ff; -} -.skip_mixed { - background-color: #ffff40; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ffff40; - border-right-color: #0070ff; -} -.skip_fail { - background-color: #ff5050; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff5050; - border-right-color: #0070ff; -} -.todo_pass { - background-color: #60ff60; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #60ff60; -} -.todo_mixed { - background-color: #ffff40; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #ffff40; -} -.todo_fail { - background-color: #ff5050; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #ff5050; -} -.todo_skip_pass { - background-color: #60ff60; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #0070ff; -} -.todo_skip_mixed { - background-color: #ffff40; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #0070ff; -} -.todo_skip_fail { - background-color: #ff5050; - border-right-style: solid; - border-left-style: solid; - border-width: thick; - border-left-color: #ff9b49; - border-right-color: #0070ff; -} -/* End of legacy styles */ - td { text-align: center; }

1 0

Francois Gouget : winetest: There' s no reason to make everything non-wrappable.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: tools Branch: master Commit: 96659f577c6233ee15f06ab1701c1d8d1101ee45 URL: http://source.winehq.org/git/tools.git/?a=commit;h=96659f577c6233ee15f06ab1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed May 28 10:55:23 2008 +0200 winetest: There's no reason to make everything non-wrappable. --- winetest/summary.css | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/winetest/summary.css b/winetest/summary.css index 0542564..38fa00b 100644 --- a/winetest/summary.css +++ b/winetest/summary.css @@ -1,6 +1,3 @@ -body { - white-space: nowrap; -} :link, :visited { text-decoration: none; }

1 0

Alistair Leslie-Hughes : netapi32: Fix tests when the machine is on DOMAIN.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 4ece5deeeffa22b66e0a5777b6f700251a0fb691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ece5deeeffa22b66e0a5777b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 28 18:04:37 2008 +1000 netapi32: Fix tests when the machine is on DOMAIN. --- dlls/netapi32/tests/access.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b1036a9..eae713f 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -296,7 +296,8 @@ static void run_userhandling_tests(void) ret = pNetUserChangePassword(NULL, sNonexistentUser, sTestUserOldPass, sTestUserNewPass); - ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD, + ok(ret == NERR_UserNotFound || ret == ERROR_INVALID_PASSWORD || + ret == ERROR_CANT_ACCESS_DOMAIN_INFO, "Changing password for nonexistent user returned 0x%08x.\n", ret); ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, @@ -304,12 +305,13 @@ static void run_userhandling_tests(void) /* Apparently NERR_PasswordTooShort can be returned on windows xp if a * strict password policy is enforced */ - ok(ret == NERR_Success || ret == NERR_PasswordTooShort, + ok(ret == NERR_Success || ret == NERR_PasswordTooShort || + ret == ERROR_CANT_ACCESS_DOMAIN_INFO || ret == ERROR_INVALID_PASSWORD, "Changing old password to old password returned 0x%08x.\n", ret); ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserNewPass, sTestUserOldPass); - ok(ret == ERROR_INVALID_PASSWORD, + ok(ret == ERROR_INVALID_PASSWORD || ret == ERROR_CANT_ACCESS_DOMAIN_INFO, "Trying to change password giving an invalid password returned 0x%08x.\n", ret); ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, @@ -319,7 +321,8 @@ static void run_userhandling_tests(void) ret = pNetUserChangePassword(NULL, sTestUserName, sTestUserOldPass, sTestUserNewPass); - ok(ret == NERR_Success, "Changing the password correctly returned 0x%08x.\n", ret); + ok(ret == NERR_Success || ret == ERROR_CANT_ACCESS_DOMAIN_INFO || + ret == ERROR_INVALID_PASSWORD, "Changing the password correctly returned 0x%08x.\n", ret); ret = pNetUserDel(NULL, sTestUserName); ok(ret == NERR_Success, "Deleting the user failed.\n");

1 0

Eric Pouech : winedump: Fully dump the compiland (V3) structure out of . pdb files.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 13585ddd710b2efc12822e5a8f72876b39782d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13585ddd710b2efc12822e5a8… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue May 27 21:43:26 2008 +0200 winedump: Fully dump the compiland (V3) structure out of .pdb files. --- tools/winedump/msc.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 7fb77c4..60814c9 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1189,13 +1189,19 @@ int codeview_dump_symbols(const void* root, unsigned long size) break; case S_MSTOOL_V3: /* info about tool used to create CU */ { - const unsigned short* ptr = ((const unsigned short*)sym) + 2; - + const unsigned short* ptr = ((const unsigned short*)sym) + 2; + const char* x1; + const char* x2 = (const char*)&ptr[9]; /* FIXME: what are all those values for ? */ printf("\tTool V3 ??? %x-%x-%x-%x-%x-%x-%x-%x-%x %s\n", ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], - ptr[8], (const char*)(&ptr[9])); - dump_data((const void*)sym, sym->generic.len + 2, "\t\t"); + ptr[8], x2); + while (*(x1 = x2 + strlen(x2) + 1)) + { + x2 = x1 + strlen(x1) + 1; + if (!*x2) break; + printf("\t\t%s: %s\n", x1, x2); + } } break;

1 0

Kai Blin : ws2_32: Change back magic 127.12.34.56 to loopback on connect().
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 36d63105991abef1612433e18207624f2f9e429e URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d63105991abef1612433e18… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed May 28 10:24:12 2008 +0200 ws2_32: Change back magic 127.12.34.56 to loopback on connect(). --- dlls/ws2_32/socket.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ab57388..889f88f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1492,6 +1492,19 @@ int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) } else { + if (name->sa_family == WS_AF_INET) + { + struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; + if (memcmp(&in4->sin_addr, &magic_loopback_addr, 4) == 0) + { + /* Trying to connect to magic replace-loopback address, + * assuming we really want to connect to localhost */ + TRACE("Trying to connect to magic IP address, using " + "INADDR_LOOPBACK instead.\n"); + in4->sin_addr.s_addr = htonl(WS_INADDR_LOOPBACK); + } + } + if (connect(fd, &uaddr.addr, uaddrlen) == 0) goto connect_success; }

1 0

Paul Vriens : ddraw/tests: Don't crash on win9x.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: f076d79c6c8d1d057c4a47df346f115bf7e21de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f076d79c6c8d1d057c4a47df3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 28 11:18:15 2008 +0200 ddraw/tests: Don't crash on win9x. --- dlls/ddraw/tests/ddrawmodes.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index ea8939b..95e8657 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -286,7 +286,7 @@ static void testcooperativelevels_normal(void) rc = IDirectDraw_CreateSurface(lpDD, &surfacedesc, &surface, NULL); ok(rc == DDERR_NOEXCLUSIVEMODE, "IDirectDraw_CreateSurface returned %08x\n", rc); ok(surface == NULL, "Returned surface pointer is %p\n", surface); - if(surface) IDirectDrawSurface_Release(surface); + if(surface && surface != (IDirectDrawSurface *)0xdeadbeef) IDirectDrawSurface_Release(surface); /* Set the focus window */ rc = IDirectDraw_SetCooperativeLevel(lpDD,

1 0

Paul Vriens : ws2_32/tests: Fix crash on win98.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 9d566032bbc40d6dfc4537d17a556facfa4d3440 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d566032bbc40d6dfc4537d17… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed May 28 10:05:02 2008 +0200 ws2_32/tests: Fix crash on win98. --- dlls/ws2_32/tests/sock.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8aaa72f..8ee5c37 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1123,6 +1123,10 @@ static void test_WSASocket(void) int ret, err; UINT pi_size; + /* Set pi_size explicitly to a value below 2*sizeof(WSAPROTOCOL_INFOA) + * to avoid a crash on win98. + */ + pi_size = 0; ret = WSAEnumProtocolsA(providers, NULL, &pi_size); ok(ret == SOCKET_ERROR, "WSAEnumProtocolsA({6,0}, NULL, 0) returned %d\n", ret);

1 0

Michael Stefaniuc : notepad: Fix the Chinese (Simplified) translation.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: d874e5c97241fb723a5c215e66bd8596ab94207f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d874e5c97241fb723a5c215e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 28 00:05:34 2008 +0200 notepad: Fix the Chinese (Simplified) translation. --- programs/notepad/Zh.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/notepad/Zh.rc b/programs/notepad/Zh.rc index 090ac0c..09c5e67 100644 --- a/programs/notepad/Zh.rc +++ b/programs/notepad/Zh.rc @@ -25,6 +25,7 @@ MAIN_MENU MENU LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED MENUITEM "�򿪣�&O��...\tCtrl+O", CMD_OPEN MENUITEM "��棨&S��\tCtrl+S", CMD_SAVE MENUITEM "��Ϊ(&A)...", CMD_SAVE_AS + MENUITEM SEPARATOR MENUITEM "��ӡ��&P��...\tCtrl+P", CMD_PRINT MENUITEM "ҳ��ã�&T��...", CMD_PAGE_SETUP MENUITEM "��ӡ��ã�&R��...", CMD_PRINTER_SETUP

1 0

Michael Stefaniuc : winecfg: Fix the Chinese (Traditional) translation.
by Alexandre Julliard May 28, 2008

May 28, 2008

Module: wine Branch: master Commit: 4671cbc0b19302073d9a384a06265b87657fb52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4671cbc0b19302073d9a384a0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed May 28 00:06:00 2008 +0200 winecfg: Fix the Chinese (Traditional) translation. --- programs/winecfg/Zh.rc | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 4740862..daa3b99 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -298,5 +298,4 @@ BEGIN IDC_SYSPARAMS_ACTIVE_TITLE_TEXT "Active Title Text" IDC_SYSPARAMS_INACTIVE_TITLE "Inactive Title Bar" IDC_SYSPARAMS_INACTIVE_TITLE_TEXT "Inactive Title Text" - IDC_SYSPARAMS_MSGBOX_TEXT "Message Box Text" END

1 0