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

Jeff Latimer : ws2_32: IPv6 functionality for WSAAddressToStringW.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 4a8e36548dfb503bc0536f2dfd0d61be9b0b1dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a8e36548dfb503bc0536f2df… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jul 17 20:25:59 2009 +1000 ws2_32: IPv6 functionality for WSAAddressToStringW. --- dlls/ws2_32/socket.c | 34 +++++++++++----------------------- dlls/ws2_32/tests/sock.c | 15 +++------------ 2 files changed, 14 insertions(+), 35 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0df61c7..96be7ca 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5001,42 +5001,30 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, * * NOTES * The 'info' parameter is ignored. - * - * BUGS - * Only supports AF_INET addresses. */ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, LPWSAPROTOCOL_INFOW info, LPWSTR string, LPDWORD lenstr ) { - DWORD size; - WCHAR buffer[22]; /* 12 digits + 3 dots + ':' + 5 digits + '\0' */ - static const WCHAR format[] = { '%','u','.','%','u','.','%','u','.','%','u',':','%','u',0 }; - WCHAR *p; + INT ret; + DWORD size, sizew; + WCHAR buffer[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + CHAR bufAddr[54]; - TRACE( "(%p, %x, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - - if (!sockaddr || len < sizeof(SOCKADDR_IN)) return SOCKET_ERROR; - if (!string || !lenstr) return SOCKET_ERROR; - - /* sin_family is guaranteed to be the first u_short */ - if (((SOCKADDR_IN *)sockaddr)->sin_family != AF_INET) return SOCKET_ERROR; + TRACE( "(%p, %d, %p, %p, %p)\n", sockaddr, len, info, string, lenstr ); - sprintfW( buffer, format, - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 24 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 16 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) >> 8 & 0xff), - (unsigned int)(ntohl( ((SOCKADDR_IN *)sockaddr)->sin_addr.WS_s_addr ) & 0xff), - ntohs( ((SOCKADDR_IN *)sockaddr)->sin_port ) ); + size = *lenstr; + ret = WSAAddressToStringA(sockaddr, len, NULL, bufAddr, &size); - p = strchrW( buffer, ':' ); - if (!((SOCKADDR_IN *)sockaddr)->sin_port) *p = 0; + if (ret) return ret; - size = strlenW( buffer ) + 1; + sizew = sizeof( buffer ); + MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizew ); if (*lenstr < size) { *lenstr = size; + WSASetLastError(WSAEFAULT); return SOCKET_ERROR; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2e3729d..b1db361 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1575,13 +1575,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_1 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_1)/sizeof(WCHAR), "Got %d\n", len); - } /* Test a longer IPv6 address */ len = sizeof(address6)/sizeof(WCHAR); @@ -1592,13 +1588,10 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); - todo_wine - { ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address6, expect6_2 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_2)/sizeof(WCHAR), "Got %d\n", len); - } /* Test IPv6 address and port number */ len = sizeof(address6)/sizeof(WCHAR); @@ -1609,10 +1602,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); } @@ -1626,9 +1618,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); } @@ -1642,10 +1634,9 @@ static void test_WSAAddressToStringW(void) memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); todo_wine { - ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); }

1 0

Rein Klazes : user32/tests: Show that Windows avoids creating loops in a menu tree, probably by limiting the depth of such tree.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 5b4b1e6a67474317181e689aa0d6587758d5dcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b4b1e6a67474317181e689aa… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 16 12:30:29 2009 +0200 user32/tests: Show that Windows avoids creating loops in a menu tree, probably by limiting the depth of such tree. --- dlls/user32/tests/menu.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 0948f69..868fd9a 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2932,6 +2932,63 @@ static void test_menu_cancelmode(void) DestroyWindow( hwnd); } +/* show menu trees have a maximum depth */ +static void test_menu_maxdepth(void) +{ +#define NR_MENUS 100 + HMENU hmenus[ NR_MENUS]; + int i; + DWORD ret; + + for( i = 0; i < NR_MENUS; i++) { + hmenus[i] = CreatePopupMenu(); + if( !hmenus[i]) break; + } + ok( i == NR_MENUS, "could not create more then %d menu's\n", i); + for( i = 1; i < NR_MENUS; i++) { + ret = AppendMenuA( hmenus[i], MF_POPUP, (UINT_PTR)hmenus[i-1],"test"); + if( !ret) break; + } + trace("Maximum depth is %d\n", i); +todo_wine + ok( i < NR_MENUS || + broken( i == NR_MENUS), /* win98, NT */ + "no ( or very large) limit on menu depth!\n"); + + for( i = 0; i < NR_MENUS; i++) + DestroyMenu( hmenus[i]); +} + +/* bug #12171 */ +static void test_menu_circref(void) +{ + HMENU menu1, menu2; + DWORD ret; + + menu1 = CreatePopupMenu(); + menu2 = CreatePopupMenu(); + ok( menu1 && menu2, "error creating menus.\n"); + ret = AppendMenuA( menu1, MF_POPUP, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + ret = AppendMenuA( menu1, MF_STRING | MF_HILITE, 123, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* app chooses an id that happens to clash with its own hmenu */ + ret = AppendMenuA( menu2, MF_STRING, (UINT_PTR)menu2, "winetest"); + ok( ret, "AppendMenu failed, error is %d\n", GetLastError()); + /* now attempt to change the string of the first item of menu1 */ + ret = ModifyMenuA( menu1, (UINT_PTR)menu2, MF_POPUP, (UINT_PTR)menu2, "menu 2"); +todo_wine + ok( !ret || + broken( 0), /* win98, NT */ + "ModifyMenu should have failed.\n"); + if( !ret) { /* will probably stack fault if the ModifyMenu succeeded */ + ret = GetMenuState( menu1, 123, 0); + ok( ret == MF_HILITE, "GetMenuState returned %x\n",ret); + } + DestroyMenu( menu2); + DestroyMenu( menu1); +} + START_TEST(menu) { init_function_pointers(); @@ -2970,4 +3027,6 @@ START_TEST(menu) test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); test_menu_cancelmode(); + test_menu_maxdepth(); + test_menu_circref(); }

1 0

Jeff Latimer : ws2_32/tests: IPv6 tests for WSAAddressToStringW.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: c620ec8f725cb750f601787ad115c616ddc436c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c620ec8f725cb750f601787ad… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Jul 17 20:25:07 2009 +1000 ws2_32/tests: IPv6 tests for WSAAddressToStringW. --- dlls/ws2_32/tests/sock.c | 112 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 672c96e..2e3729d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1474,6 +1474,7 @@ end: static void test_WSAAddressToStringW(void) { + SOCKET v6 = INVALID_SOCKET; INT ret; DWORD len; int GLE; @@ -1486,6 +1487,19 @@ static void test_WSAAddressToStringW(void) WCHAR expect4[] = { '2','5','5','.','2','5','5','.','2','5','5','.','2','5','5', ':', '6', '5', '5', '3', '5', 0 }; + SOCKADDR_IN6 sockaddr6; + WCHAR address6[54]; /* 32 digits + 7':' + '[' + '%" + 5 digits + ']:' + 5 digits + '\0' */ + + CHAR addr6_1[] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_2[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; + CHAR addr6_3[] = {0x20,0xab,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x01}; + + WCHAR expect6_1[] = {':',':','1',0}; + WCHAR expect6_2[] = {'2','0','a','b',':',':','1',0}; + WCHAR expect6_3[] = {'[','2','0','a','b',':',':','2','0','0','1',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_2[] = {'[','2','0','a','b',':',':','2','0','0','1','%','4','6','6','0',']',':','3','3','2','7','4',0}; + WCHAR expect6_3_3[] = {'2','0','a','b',':',':','2','0','0','1','%','6','5','5','3','4',0}; + len = 0; sockaddr.sin_family = AF_INET; @@ -1542,7 +1556,103 @@ static void test_WSAAddressToStringW(void) ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); ok( !lstrcmpW( address, expect4 ), "Expected different address string\n" ); - ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Got size %d\n", len); + ok( len == sizeof( expect4 )/sizeof( WCHAR ), "Got %d\n", len); + + /*check to see it IPv6 is available */ + v6 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + if (v6 == INVALID_SOCKET) { + skip("Could not create IPv6 socket (LastError: %d; %d expected if IPv6 not available).\n", + WSAGetLastError(), WSAEAFNOSUPPORT); + goto end; + } + + /* Test a short IPv6 address */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_1, sizeof(addr6_1)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_1 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_1)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test a longer IPv6 address */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_2, sizeof(addr6_2)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_2 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_2)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address and port number */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address, port number and scope_id */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0xfa81; + sockaddr6.sin6_scope_id = 0x1234; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); + } + + /* Test IPv6 address and scope_id */ + len = sizeof(address6)/sizeof(WCHAR); + + sockaddr6.sin6_family = AF_INET6; + sockaddr6.sin6_port = 0x0000; + sockaddr6.sin6_scope_id = 0xfffe; + memcpy (sockaddr6.sin6_addr.s6_addr, addr6_3, sizeof(addr6_3)); + + ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); + todo_wine + { + ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); + + ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); + ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); + } + +end: + if (v6 != INVALID_SOCKET) + closesocket(v6); } static void test_WSAStringToAddressA(void)

1 0

André Hentschel : winecfg: Add the codepage pragma for German translation.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: cb7c72f8f1825b49580d7ea07e5c78ea8c50d9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7c72f8f1825b49580d7ea07… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 12:22:10 2009 +0200 winecfg: Add the codepage pragma for German translation. --- programs/winecfg/De.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index f3ba328..53c412c 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -23,6 +23,8 @@ #include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDR_WINECFG MENU DISCARDABLE

1 0

André Hentschel : appwiz.cpl: Fix German translation.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 58cabeea2bb533b7e8b1fa7696cabc00df56a567 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58cabeea2bb533b7e8b1fa769… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jul 17 12:16:41 2009 +0200 appwiz.cpl: Fix German translation. --- dlls/appwiz.cpl/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index c851d46..c266d8f 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -28,7 +28,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { IDS_CPL_TITLE, "Software" - IDS_CPL_DESC, "Erlaubt ihnen neue Software hinzuzufügen, oder vorhandene zu entfernen." + IDS_CPL_DESC, "Erlaubt ihnen neue Software hinzuzufügen oder zu entfernen." IDS_TAB1_TITLE, "Anwendungen" IDS_UNINSTALL_FAILED, "Der Uninstaller konnte nicht gestartet werden, '%s'. Möchten Sie den Uninstall-Eintrag für dieses Programm aus der Registrierung entfernen?"

1 0

Huw Davies : gdi32/tests: Add a broken case for some versions of winxp.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 1d66e20ead4c106fde9a7e126ba2b1de15dc9ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d66e20ead4c106fde9a7e126… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 17 10:57:03 2009 +0100 gdi32/tests: Add a broken case for some versions of winxp. --- dlls/gdi32/tests/metafile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 4a081d6..15a2c63 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2357,7 +2357,9 @@ static void getwinmetafilebits(UINT mode, int scale, RECT *rc) ok(EqualRect((RECT*)&enh_header->rclFrame, rc), "Frame rectangles differ\n"); size = GetWinMetaFileBits(emf, 0, NULL, mode, display_dc); - ok(size, "GetWinMetaFileBits returns 0\n"); + ok(size || + broken(size == 0), /* some versions of winxp fail for some reason */ + "GetWinMetaFileBits returns 0\n"); if(!size) goto end; mh = HeapAlloc(GetProcessHeap(), 0, size); GetWinMetaFileBits(emf, size, (BYTE*)mh, mode, display_dc);

1 0

David Adam : d3dx9: Fix D3DXQuaternionNormalize to make tests pass in Windows.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 0788ac38ab10b44278ab8da5432b3ffb44089f98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0788ac38ab10b44278ab8da54… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 11:32:38 2009 +0200 d3dx9: Fix D3DXQuaternionNormalize to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 21 +++++++-------------- dlls/d3dx9_36/tests/math.c | 4 ---- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index bcb2006..30f7ec9 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1241,21 +1241,14 @@ D3DXQUATERNION* WINAPI D3DXQuaternionNormalize(D3DXQUATERNION *pout, CONST D3DXQ FLOAT norm; norm = D3DXQuaternionLength(pq); - if ( !norm ) - { - out.x = 0.0f; - out.y = 0.0f; - out.z = 0.0f; - out.w = 0.0f; - } - else - { - out.x = pq->x / norm; - out.y = pq->y / norm; - out.z = pq->z / norm; - out.w = pq->w / norm; - } + + out.x = pq->x / norm; + out.y = pq->y / norm; + out.z = pq->z / norm; + out.w = pq->w / norm; + *pout=out; + return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index cdbfc1d..6e9f25d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -762,10 +762,6 @@ static void D3DXQuaternionTest(void) expectedquat.x = 1.0f/11.0f; expectedquat.y = 2.0f/11.0f; expectedquat.z = 4.0f/11.0f; expectedquat.w = 10.0f/11.0f; D3DXQuaternionNormalize(&gotquat,&q); expect_vec4(expectedquat,gotquat); - /* Test the nul quaternion */ - expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - D3DXQuaternionNormalize(&gotquat,&nul); - expect_vec4(expectedquat,gotquat); /*_______________D3DXQuaternionRotationAxis___________________*/ axis.x = 2.0f; axis.y = 7.0; axis.z = 13.0f;

1 0

David Adam : d3dx9: Fix D3DXQuaternionInverse to make tests pass in Windows .
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: 831d6b588663b355ccbefcffc239f818d85b98e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831d6b588663b355ccbefcffc… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 17 11:30:29 2009 +0200 d3dx9: Fix D3DXQuaternionInverse to make tests pass in Windows. --- dlls/d3dx9_36/math.c | 22 ++++++++-------------- dlls/d3dx9_36/tests/math.c | 7 ++++--- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index f80a5db..bcb2006 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1182,23 +1182,17 @@ D3DXQUATERNION* WINAPI D3DXQuaternionExp(D3DXQUATERNION *pout, CONST D3DXQUATERN D3DXQUATERNION* WINAPI D3DXQuaternionInverse(D3DXQUATERNION *pout, CONST D3DXQUATERNION *pq) { + D3DXQUATERNION out; FLOAT norm; norm = D3DXQuaternionLengthSq(pq); - if ( !norm ) - { - pout->x = 0.0f; - pout->y = 0.0f; - pout->z = 0.0f; - pout->w = 0.0f; - } - else - { - pout->x = -pq->x / norm; - pout->y = -pq->y / norm; - pout->z = -pq->z / norm; - pout->w = pq->w / norm; - } + + out.x = -pq->x / norm; + out.y = -pq->y / norm; + out.z = -pq->z / norm; + out.w = pq->w / norm; + + *pout =out; return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 722198a..cdbfc1d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -699,11 +699,12 @@ static void D3DXQuaternionTest(void) expectedquat.x = -1.0f/121.0f; expectedquat.y = -2.0f/121.0f; expectedquat.z = -4.0f/121.0f; expectedquat.w = 10.0f/121.0f; D3DXQuaternionInverse(&gotquat,&q); expect_vec4(expectedquat,gotquat); - /* test the null quaternion */ - expectedquat.x = 0.0f; expectedquat.y = 0.0f; expectedquat.z = 0.0f; expectedquat.w = 0.0f; - D3DXQuaternionInverse(&gotquat,&nul); + + expectedquat.x = 1.0f; expectedquat.y = 2.0f; expectedquat.z = 4.0f; expectedquat.w = 10.0f; + D3DXQuaternionInverse(&gotquat,&gotquat); expect_vec4(expectedquat,gotquat); + /*_______________D3DXQuaternionIsIdentity________________*/ s.x = 0.0f; s.y = 0.0f; s.z = 0.0f; s.w = 1.0f; expectedbool = TRUE;

1 0

Dylan Smith : richedit: Initially disable scrollbars for ES_DISABLENOSCROLL .
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: eddccdd1f2f5bff7bd5105e64ce4795653fc9786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eddccdd1f2f5bff7bd5105e64… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 16 18:45:59 2009 -0400 richedit: Initially disable scrollbars for ES_DISABLENOSCROLL. Previously after initial window creation of a richedit control with the ES_DISABLENOSCROLL window style flag the scrollbar would be shown but not disabled. This patch fixes this issue by explicitly disabling and showing the scrollbar. --- dlls/riched20/editor.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4cd72c8..7ffb7cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3842,23 +3842,29 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case WM_CREATE: { - SCROLLINFO si; + INT max; ME_SetDefaultFormatRect(editor); - si.cbSize = sizeof(si); - si.fMask = SIF_PAGE | SIF_RANGE; + max = (editor->styleFlags & ES_DISABLENOSCROLL) ? 1 : 0; + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_VSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, 0, max, TRUE); + + if (~editor->styleFlags & ES_DISABLENOSCROLL || editor->styleFlags & WS_HSCROLL) + ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, 0, max, TRUE); + if (editor->styleFlags & ES_DISABLENOSCROLL) - si.fMask |= SIF_DISABLENOSCROLL; - si.nMax = (si.fMask & SIF_DISABLENOSCROLL) ? 1 : 0; - si.nMin = 0; - si.nPage = 0; - if (editor->hWnd) { - SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); - SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); - } else { - ITextHost_TxSetScrollRange(editor->texthost, SB_VERT, si.nMin, si.nMax, TRUE); - ITextHost_TxSetScrollRange(editor->texthost, SB_HORZ, si.nMin, si.nMax, TRUE); + { + if (editor->styleFlags & WS_VSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_VERT, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, TRUE); + } + if (editor->styleFlags & WS_HSCROLL) + { + ITextHost_TxEnableScrollBar(editor->texthost, SB_HORZ, ESB_DISABLE_BOTH); + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, TRUE); + } } ME_CommitUndo(editor);

1 0

Dylan Smith : richedit: Keep scrollbars hidden without WS_HSCROLL & WS_VSCROLL.
by Alexandre Julliard 17 Jul '09

17 Jul '09

Module: wine Branch: master Commit: f59e41e8d5ea18c4190c983d4a5e85cd1c96f2cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59e41e8d5ea18c4190c983d4… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Thu Jul 16 18:46:04 2009 -0400 richedit: Keep scrollbars hidden without WS_HSCROLL & WS_VSCROLL. --- dlls/riched20/paint.c | 90 +++++++++++++++++++++++++++--------------------- 1 files changed, 51 insertions(+), 39 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index bc62bdb..2c1c9b9 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1061,22 +1061,28 @@ void ME_ScrollAbs(ME_TextEditor *editor, int x, int y) if (editor->hWnd) { LONG winStyle = GetWindowLongW(editor->hWnd, GWL_STYLE); - bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx - && (editor->styleFlags & WS_HSCROLL)) - || (editor->styleFlags & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, - bScrollBarWillBeVisible); + if (editor->styleFlags & WS_HSCROLL) + { + bScrollBarIsVisible = (winStyle & WS_HSCROLL) != 0; + bScrollBarWillBeVisible = (editor->nTotalWidth > editor->sizeWindow.cx + && (editor->styleFlags & WS_HSCROLL)) + || (editor->styleFlags & ES_DISABLENOSCROLL); + if (bScrollBarIsVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, + bScrollBarWillBeVisible); + } - bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; - bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy - && (editor->styleFlags & WS_VSCROLL) - && (editor->styleFlags & ES_MULTILINE)) - || (editor->styleFlags & ES_DISABLENOSCROLL); - if (bScrollBarIsVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + if (editor->styleFlags & WS_VSCROLL) + { + bScrollBarIsVisible = (winStyle & WS_VSCROLL) != 0; + bScrollBarWillBeVisible = (editor->nTotalLength > editor->sizeWindow.cy + && (editor->styleFlags & WS_VSCROLL) + && (editor->styleFlags & ES_MULTILINE)) + || (editor->styleFlags & ES_DISABLENOSCROLL); + if (bScrollBarIsVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + bScrollBarWillBeVisible); + } } ME_UpdateScrollBar(editor); } @@ -1136,6 +1142,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.cbSize = sizeof(si); si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; + si.nMin = 0; if (editor->styleFlags & ES_DISABLENOSCROLL) si.fMask |= SIF_DISABLENOSCROLL; @@ -1150,20 +1157,19 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) return; } - si.nMin = 0; si.nMax = editor->nTotalWidth; si.nPos = editor->horz_si.nPos; si.nPage = editor->sizeWindow.cx; - if (si.nMin != editor->horz_si.nMin || - si.nMax != editor->horz_si.nMax || + if (si.nMax != editor->horz_si.nMax || si.nPage != editor->horz_si.nPage) { TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->horz_si.nMin = si.nMin; editor->horz_si.nMax = si.nMax; editor->horz_si.nPage = si.nPage; - if (bScrollBarWillBeVisible || bScrollBarWasVisible) { + if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && + editor->styleFlags & WS_HSCROLL) + { if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_HORZ, &si, TRUE); } else { @@ -1175,14 +1181,17 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_HSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (editor->styleFlags & WS_HSCROLL) + { + if (si.fMask & SIF_DISABLENOSCROLL) { + bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_HSCROLL)) { + bScrollBarWillBeVisible = FALSE; + } - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); + if (bScrollBarWasVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_HORZ, bScrollBarWillBeVisible); + } /* Update vertical scrollbar */ bScrollBarWasVisible = editor->vert_si.nMax > editor->vert_si.nPage; @@ -1201,15 +1210,15 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.nPos = editor->vert_si.nPos; si.nPage = editor->sizeWindow.cy; - if (si.nMin != editor->vert_si.nMin || - si.nMax != editor->vert_si.nMax || + if (si.nMax != editor->vert_si.nMax || si.nPage != editor->vert_si.nPage) { TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); - editor->vert_si.nMin = si.nMin; editor->vert_si.nMax = si.nMax; editor->vert_si.nPage = si.nPage; - if (bScrollBarWillBeVisible || bScrollBarWasVisible) { + if ((bScrollBarWillBeVisible || bScrollBarWasVisible) && + editor->styleFlags & WS_VSCROLL) + { if (editor->hWnd) { SetScrollInfo(editor->hWnd, SB_VERT, &si, TRUE); } else { @@ -1221,15 +1230,18 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) } } - if (si.fMask & SIF_DISABLENOSCROLL) { - bScrollBarWillBeVisible = TRUE; - } else if (!(editor->styleFlags & WS_VSCROLL)) { - bScrollBarWillBeVisible = FALSE; - } + if (editor->styleFlags & WS_VSCROLL) + { + if (si.fMask & SIF_DISABLENOSCROLL) { + bScrollBarWillBeVisible = TRUE; + } else if (!(editor->styleFlags & WS_VSCROLL)) { + bScrollBarWillBeVisible = FALSE; + } - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, - bScrollBarWillBeVisible); + if (bScrollBarWasVisible != bScrollBarWillBeVisible) + ITextHost_TxShowScrollBar(editor->texthost, SB_VERT, + bScrollBarWillBeVisible); + } } void ME_EnsureVisible(ME_TextEditor *editor, ME_Cursor *pCursor)

1 0