February 2006 - Wine-Commits

Mike McCormack : kernel32: Add a short test for GetOverlappedResult.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: f4b447aee7546c9921dd3a9c8d81ccdc6b1b1fae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f4b447aee7546c9921dd3a9… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 21 16:59:29 2006 +0900 kernel32: Add a short test for GetOverlappedResult. --- dlls/kernel/tests/file.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index 093a893..e946413 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1425,6 +1425,63 @@ static void test_OpenFile_exists(void) ok( hFile == HFILE_ERROR, "hFile != HFILE_ERROR : %ld\n", GetLastError()); } +static void test_overlapped(void) +{ + OVERLAPPED ov; + DWORD r, result; + + /* GetOverlappedResult crashes if the 2nd or 3rd param are NULL */ + + memset( &ov, 0, sizeof ov ); + result = 1; + r = GetOverlappedResult(0, &ov, &result, 0); + ok( r == TRUE, "should return false\n"); + ok( result == 0, "result wrong\n"); + + result = 0; + ov.Internal = 0; + ov.InternalHigh = 0xabcd; + r = GetOverlappedResult(0, &ov, &result, 0); + ok( r == TRUE, "should return false\n"); + ok( result == 0xabcd, "result wrong\n"); + + SetLastError( 0xb00 ); + result = 0; + ov.Internal = STATUS_INVALID_HANDLE; + ov.InternalHigh = 0xabcd; + r = GetOverlappedResult(0, &ov, &result, 0); + ok (GetLastError() == ERROR_INVALID_HANDLE, "error wrong\n"); + ok( r == FALSE, "should return false\n"); + ok( result == 0xabcd, "result wrong\n"); + + result = 0; + ov.Internal = STATUS_PENDING; + ov.InternalHigh = 0xabcd; + r = GetOverlappedResult(0, &ov, &result, 0); + todo_wine { + ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + } + ok( r == FALSE, "should return false\n"); + ok( result == 0, "result wrong\n"); + + ov.hEvent = CreateEvent( NULL, 1, 1, NULL ); + ov.Internal = STATUS_PENDING; + ov.InternalHigh = 0xabcd; + r = GetOverlappedResult(0, &ov, &result, 0); + ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + ok( r == FALSE, "should return false\n"); + + ResetEvent( ov.hEvent ); + + ov.Internal = STATUS_PENDING; + ov.InternalHigh = 0; + r = GetOverlappedResult(0, &ov, &result, 0); + ok (GetLastError() == ERROR_IO_INCOMPLETE, "error wrong\n"); + ok( r == FALSE, "should return false\n"); + + r = CloseHandle( ov.hEvent ); + ok( r == TRUE, "close handle failed\n"); +} START_TEST(file) { @@ -1455,4 +1512,5 @@ START_TEST(file) test_async_file_errors(); test_read_write(); test_OpenFile_exists(); + test_overlapped(); }

1 0

Mike McCormack : server: Track created and removed directories in the tree of inodes for inotify.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: e4faabfa64aa0c89db482fc780ed1a7f51efa53e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e4faabfa64aa0c89db482fc… Author: Mike McCormack <mike(a)codeweavers.com> Date: Tue Feb 21 16:58:19 2006 +0900 server: Track created and removed directories in the tree of inodes for inotify. Add them to or remove them from existing recursive watches. --- dlls/ntdll/directory.c | 8 + include/wine/server_protocol.h | 3 server/change.c | 275 ++++++++++++++++++++++++++++++++++------ server/protocol.def | 1 server/trace.c | 1 5 files changed, 244 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=e4faabfa64aa0c89db4…

1 0

Detlef Riekenberg : ntdll: Avoid compile error caused by a single quote.
by Alexandre Julliard Feb. 21, 2006

Feb. 21, 2006

Module: wine Branch: refs/heads/master Commit: 43a0f0c85aa2504e144e8f0afc4c556fc02b7930 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=43a0f0c85aa2504e144e8f0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Tue Feb 21 06:37:35 2006 +0100 ntdll: Avoid compile error caused by a single quote. --- dlls/ntdll/signal_i386.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index bfc9c45..727223d 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -105,7 +105,7 @@ struct kernel_sigaction #ifndef SYS_sigaction # ifndef __NR_sigaction -# error The sigaction syscall is part of the Linux i386 ABI, but your headers don't define it. Please raise a bug with your distribution. +# error The sigaction syscall is part of the Linux i386 ABI, but your headers does not define it. Please raise a bug with your distribution. # endif # define SYS_sigaction __NR_sigaction #endif

1 0

Hans Leidekker : winsock: Implement getnameinfo.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: c0e6bb2df7923d2f39cfcae6bb3edd71f6e18b5b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c0e6bb2df7923d2f39cfcae… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Feb 20 14:16:38 2006 +0100 winsock: Implement getnameinfo. --- configure | 2 ++ configure.ac | 1 + dlls/winsock/socket.c | 27 +++++++++++++++++++++++++++ dlls/winsock/ws2_32.spec | 2 +- include/config.h.in | 3 +++ include/ws2tcpip.h | 2 +- 6 files changed, 35 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 66335f0..30aff74 100755 --- a/configure +++ b/configure @@ -14713,6 +14713,7 @@ fi + for ac_func in \ _lwp_create \ _lwp_self \ @@ -14737,6 +14738,7 @@ for ac_func in \ futimes \ futimesat \ getaddrinfo \ + getnameinfo \ getnetbyname \ getopt_long \ getpagesize \ diff --git a/configure.ac b/configure.ac index 8fc5519..652de1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1156,6 +1156,7 @@ AC_CHECK_FUNCS(\ futimes \ futimesat \ getaddrinfo \ + getnameinfo \ getnetbyname \ getopt_long \ getpagesize \ diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index a86249d..a07c5b4 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -3235,6 +3235,33 @@ int WINAPI GetAddrInfoW(LPCWSTR nodename return EAI_FAIL; } +int WINAPI WS_getnameinfo(const struct WS_sockaddr *sa, socklen_t salen, char *host, + DWORD hostlen, char *serv, DWORD servlen, int flags) +{ +#if HAVE_GETNAMEINFO + int ret; + const struct sockaddr* sa_u; + unsigned int size; + + TRACE("%s %d %p %ld %p %ld %d\n", debugstr_sockaddr(sa), salen, host, hostlen, + serv, servlen, flags); + + sa_u = ws_sockaddr_ws2u(sa, salen, &size); + if (!sa_u) + { + WSASetLastError(WSAEFAULT); + return WSA_NOT_ENOUGH_MEMORY; + } + ret = getnameinfo(sa_u, size, host, hostlen, serv, servlen, flags); + + ws_sockaddr_free(sa_u, sa); + return convert_eai_u2w(ret); +#else + FIXME("getnameinfo() failed, not found during buildtime.\n"); + return EAI_FAIL; +#endif +} + /*********************************************************************** * getservbyport (WS2_32.56) */ diff --git a/dlls/winsock/ws2_32.spec b/dlls/winsock/ws2_32.spec index b36b854..bbcafc0 100644 --- a/dlls/winsock/ws2_32.spec +++ b/dlls/winsock/ws2_32.spec @@ -116,4 +116,4 @@ @ stdcall WSCWriteProviderOrder(ptr long) @ stdcall freeaddrinfo(ptr) WS_freeaddrinfo @ stdcall getaddrinfo(str str ptr ptr) WS_getaddrinfo -@ stub getnameinfo +@ stdcall getnameinfo(ptr long ptr long ptr long long) WS_getnameinfo diff --git a/include/config.h.in b/include/config.h.in index c057314..8d25021 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -161,6 +161,9 @@ /* Define to 1 if you have the `gethostbyname' function. */ #undef HAVE_GETHOSTBYNAME +/* Define to 1 if you have the `getnameinfo' function. */ +#undef HAVE_GETNAMEINFO + /* Define to 1 if you have the `getnetbyname' function. */ #undef HAVE_GETNETBYNAME diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 90a224b..16efab6 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -215,7 +215,7 @@ int WINAPI WS(getaddrinfo)(const char*, #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); #define GetAddrInfo WINELIB_NAME_AW(GetAddrInfo) -int WINAPI WS(getnameinfo)(const struct sockaddr*,socklen_t,char*,DWORD,char*,DWORD,int); +int WINAPI WS(getnameinfo)(const struct WS(sockaddr)*,socklen_t,char*,DWORD,char*,DWORD,int); #define GetNameInfoA WS(getnameinfo) INT WINAPI GetNameInfoW(const SOCKADDR*,socklen_t,PWCHAR,DWORD,PWCHAR,DWORD,INT); #define GetNameInfo WINELIB_NAME_AW(GetNameInfo)

1 0

Rein Klazes : menu: Take the MF_DEFAULT flag in to account in MENU_CalcItemSize.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 3a0b40fffb2894be48bfa36f72afe0b4821b074b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a0b40fffb2894be48bfa36… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Feb 20 19:19:36 2006 +0100 menu: Take the MF_DEFAULT flag in to account in MENU_CalcItemSize. --- dlls/user/menu.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user/menu.c b/dlls/user/menu.c index 2f58cb0..a72e922 100644 --- a/dlls/user/menu.c +++ b/dlls/user/menu.c @@ -1026,10 +1026,14 @@ static void MENU_CalcItemSize( HDC hdc, /* it must be a text item - unless it's the system menu */ if (!(lpitem->fType & MF_SYSMENU) && lpitem->text) { + HFONT hfontOld = NULL; RECT rc = lpitem->rect; LONG txtheight, txtwidth; lpitem->xTab = 0; + if ( lpitem->fState & MFS_DEFAULT ) { + hfontOld = SelectObject( hdc, get_menu_font(TRUE) ); + } if (menuBar) { txtheight = DrawTextW( hdc, lpitem->text, -1, &rc, DT_SINGLELINE|DT_CALCRECT); @@ -1071,6 +1075,7 @@ static void MENU_CalcItemSize( HDC hdc, itemheight = max( itemheight, max( txtheight + 2, menucharsize.cy + 4)); } + if (hfontOld) SelectObject (hdc, hfontOld); } else if( menuBar) { itemheight = max( itemheight, GetSystemMetrics(SM_CYMENU)-1); }

1 0

Robert Shearman : ntdll: Add a define for SYS_sigaction to __NR_sigaction.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 3e47c82e025afcb868ac547a5bd4050fc43a5e52 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3e47c82e025afcb868ac547… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Feb 20 13:29:31 2006 +0000 ntdll: Add a define for SYS_sigaction to __NR_sigaction. Print an error if __NR_sigaction doesn't exist as this means the wrong syscall header is being used. --- dlls/ntdll/signal_i386.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 46f9fa6..bfc9c45 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -103,6 +103,13 @@ struct kernel_sigaction void *ksa_restorer; }; +#ifndef SYS_sigaction +# ifndef __NR_sigaction +# error The sigaction syscall is part of the Linux i386 ABI, but your headers don't define it. Please raise a bug with your distribution. +# endif +# define SYS_sigaction __NR_sigaction +#endif + /* Similar to the sigaction function in libc, except it leaves alone the restorer field, which is used to specify the signal stack address */ static inline int wine_sigaction( int sig, struct kernel_sigaction *new,

1 0

Vitaly Lipatov : winsock: Add check for sin6_scope_id.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 40a6a74ac88902320bb3c15a52a6ea9b1994c45b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=40a6a74ac88902320bb3c15… Author: Vitaly Lipatov <lav(a)etersoft.ru> Date: Mon Feb 20 15:33:09 2006 +0300 winsock: Add check for sin6_scope_id. --- configure | 121 +++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 9 ++++ dlls/winsock/socket.c | 38 +++++---------- include/config.h.in | 3 + 4 files changed, 145 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 7ce6ed6..66335f0 100755 --- a/configure +++ b/configure @@ -18550,6 +18550,127 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5 +echo $ECHO_N "checking for struct sockaddr_in6.sin6_scope_id... $ECHO_C" >&6 +if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +int +main () +{ +static struct sockaddr_in6 ac_aggr; +if (ac_aggr.sin6_scope_id) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif + +int +main () +{ +static struct sockaddr_in6 ac_aggr; +if (sizeof ac_aggr.sin6_scope_id) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5 +echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6 +if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1 +_ACEOF + + +fi + + echo "$as_me:$LINENO: checking for timezone variable" >&5 echo $ECHO_N "checking for timezone variable... $ECHO_C" >&6 if test "${ac_cv_have_timezone+set}" = set; then diff --git a/configure.ac b/configure.ac index 2f2fcd5..8fc5519 100644 --- a/configure.ac +++ b/configure.ac @@ -1367,6 +1367,15 @@ AC_CHECK_MEMBERS([struct option.name],,, dnl Check for stat.st_blocks AC_CHECK_MEMBERS([struct stat.st_blocks]) +dnl Check for sin6_scope_id +AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif]) + dnl Check for the external timezone variables timezone and daylight AC_CACHE_CHECK([for timezone variable], ac_cv_have_timezone, AC_TRY_LINK([#include <time.h>],[timezone;], diff --git a/dlls/winsock/socket.c b/dlls/winsock/socket.c index ea730b8..a86249d 100644 --- a/dlls/winsock/socket.c +++ b/dlls/winsock/socket.c @@ -930,28 +930,20 @@ static struct sockaddr* ws_sockaddr_ws2u case WS_AF_INET6: { struct sockaddr_in6* uin6; const struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; - const struct WS_sockaddr_in6_old* win6old = (struct WS_sockaddr_in6_old*)wsaddr; /* Note: Windows has 2 versions of the sockaddr_in6 struct, one with * scope_id, one without. Check: * http://msdn.microsoft.com/library/en-us/winsock/winsock/sockaddr_2.asp */ - if (wsaddrlen==sizeof(struct WS_sockaddr_in6_old)) { - *uaddrlen=sizeof(struct sockaddr_in6); - uin6=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *uaddrlen); - uin6->sin6_family = AF_INET6; - uin6->sin6_port = win6old->sin6_port; - uin6->sin6_flowinfo = win6old->sin6_flowinfo; - memcpy(&uin6->sin6_addr,&win6old->sin6_addr,16); /* 16 bytes = 128 address bits */ - return (struct sockaddr*)uin6; - } - if (wsaddrlen>=sizeof(struct WS_sockaddr_in6)) { + if (wsaddrlen >= sizeof(struct WS_sockaddr_in6_old)) { *uaddrlen=sizeof(struct sockaddr_in6); uin6=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *uaddrlen); uin6->sin6_family = AF_INET6; uin6->sin6_port = win6->sin6_port; uin6->sin6_flowinfo = win6->sin6_flowinfo; - uin6->sin6_scope_id = win6->sin6_scope_id; +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + if (wsaddrlen >= sizeof(struct WS_sockaddr_in6)) uin6->sin6_scope_id = win6->sin6_scope_id; +#endif memcpy(&uin6->sin6_addr,&win6->sin6_addr,16); /* 16 bytes = 128 address bits */ return (struct sockaddr*)uin6; } @@ -1066,28 +1058,22 @@ static int ws_sockaddr_u2ws(const struct #endif case AF_INET6: { const struct sockaddr_in6* uin6 = (struct sockaddr_in6*)uaddr; - struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; struct WS_sockaddr_in6_old* win6old = (struct WS_sockaddr_in6_old*)wsaddr; if (*wsaddrlen < sizeof(struct WS_sockaddr_in6_old)) return -1; - if (*wsaddrlen == sizeof(struct WS_sockaddr_in6_old)) { - win6old->sin6_family = WS_AF_INET6; - win6old->sin6_port = uin6->sin6_port; - win6old->sin6_flowinfo = uin6->sin6_flowinfo; - memcpy(&win6old->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ - *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); - return 0; - } + win6old->sin6_family = WS_AF_INET6; + win6old->sin6_port = uin6->sin6_port; + win6old->sin6_flowinfo = uin6->sin6_flowinfo; + memcpy(&win6old->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ + *wsaddrlen = sizeof(struct WS_sockaddr_in6_old); +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID if (*wsaddrlen >= sizeof(struct WS_sockaddr_in6)) { - win6->sin6_family = WS_AF_INET6; - win6->sin6_port = uin6->sin6_port; - win6->sin6_flowinfo = uin6->sin6_flowinfo; - memcpy(&win6->sin6_addr,&uin6->sin6_addr,16); /* 16 bytes = 128 address bits */ + struct WS_sockaddr_in6* win6 = (struct WS_sockaddr_in6*)wsaddr; win6->sin6_scope_id = uin6->sin6_scope_id; *wsaddrlen = sizeof(struct WS_sockaddr_in6); - return 0; } +#endif return 0; } case AF_INET: { diff --git a/include/config.h.in b/include/config.h.in index ed6fc4c..c057314 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -629,6 +629,9 @@ /* Define to 1 if `name' is member of `struct option'. */ #undef HAVE_STRUCT_OPTION_NAME +/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */ +#undef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + /* Define to 1 if `sa_len' is member of `struct sockaddr'. */ #undef HAVE_STRUCT_SOCKADDR_SA_LEN

1 0

Jeff Latimer : usp10: Add ScriptShape functionality.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 334e191175f6dfba5f2163fed8f806e7ec2a6a14 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=334e191175f6dfba5f2163f… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Mon Feb 20 20:19:32 2006 +1100 usp10: Add ScriptShape functionality. --- dlls/usp10/Makefile.in | 2 + dlls/usp10/tests/usp10.c | 35 +++++++++--------- dlls/usp10/usp10.c | 88 ++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 99 insertions(+), 26 deletions(-) diff --git a/dlls/usp10/Makefile.in b/dlls/usp10/Makefile.in index 72facbc..a232524 100644 --- a/dlls/usp10/Makefile.in +++ b/dlls/usp10/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = usp10.dll IMPORTLIB = libusp10.$(IMPLIBEXT) -IMPORTS = kernel32 +IMPORTS = gdi32 kernel32 C_SRCS = \ usp10.c diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0b55991..5a0cc7d 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -126,28 +126,29 @@ START_TEST(usp10) if (hr == 0) { psc = NULL; /* must be null on first call */ cChars = cInChars; - cMaxGlyphs = 4; + cMaxGlyphs = cInChars; hr = ScriptShape(NULL, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs, pwLogClust, psva, &pcGlyphs); - todo_wine ok (hr == E_OUTOFMEMORY, "If not enough output area cChars (%d) is > than CMaxGlyphs (%d) but not E_OUTOFMEMORY\n", - cChars, cMaxGlyphs); - cMaxGlyphs = 256; - hr = ScriptShape(NULL, &psc, TestItem1, cChars, + ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", + (unsigned int) hr); + cMaxGlyphs = 4; + hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs, pwLogClust, psva, &pcGlyphs); - todo_wine ok (hr == E_PENDING, "If psc is NULL (%08x) the E_PENDING should be returned\n", - (unsigned int) hr); + ok (hr == E_OUTOFMEMORY, "If not enough output area cChars (%d) is > than CMaxGlyphs (%d) but not E_OUTOFMEMORY\n", + cChars, cMaxGlyphs); + cMaxGlyphs = 256; hr = ScriptShape(hdc, &psc, TestItem1, cChars, cMaxGlyphs, &pItem[0].a, pwOutGlyphs, pwLogClust, psva, &pcGlyphs); - todo_wine ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); - todo_wine ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - todo_wine ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", (unsigned int) hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); if (hr ==0) { hr = ScriptPlace(NULL, &psc, pwOutGlyphs, pcGlyphs, psva, &pItem[0].a, piAdvance, pGoffset, pABC); - ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); + todo_wine ok (hr == 0, "Should return 0 not (%08x)\n", (unsigned int) hr); } /* This test will check to make sure that SCRIPT_CACHE is reused and that not translation * @@ -171,16 +172,16 @@ START_TEST(usp10) cMaxGlyphs, &pItem[0].a, pwOutGlyphs, pwLogClust, psva, &pcGlyphs); ok (hr != E_PENDING, "If psc should not be NULL (%08x) and the E_PENDING should be returned\n", - (unsigned int) hr); - todo_wine ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", (unsigned int) hr); - todo_wine ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - todo_wine ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); + (unsigned int) hr); + ok (hr == 0, "ScriptShape should return 0 not (%08x)\n", (unsigned int) hr); + ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); + ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); for (cnt=0; cnt < cChars && TestItem2[cnt] == pwOutGlyphs[cnt]; cnt++) {} - todo_wine ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", + ok (cnt == cChars, "Translation to place when told not to. WCHAR %d - %04x != %04x\n", cnt, TestItem2[cnt], pwOutGlyphs[cnt]); if (hr ==0) { hr = ScriptPlace(NULL, &psc, pwOutGlyphs, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); + pGoffset, pABC); todo_wine ok (hr == 0, "ScriptPlace should return 0 not (%08x)\n", (unsigned int) hr); } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 76d0db0..dd7832d 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -68,6 +68,13 @@ static const SCRIPT_PROPERTIES *Global_S &Default_Script_6, &Default_Script_7}; +typedef struct scriptcache { + HDC hdc; + DWORD GlyphToChar[256]; + int HaveWidths; + ABC CharWidths[256]; +} Scriptcache; + BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { switch(fdwReason) { @@ -86,9 +93,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, */ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { - FIXME("%p\n", psc); + TRACE("%p\n", psc); - if (psc) *psc = NULL; + if (psc) { + HeapFree ( GetProcessHeap(), 0, *psc); + *psc = NULL; + } return 0; } @@ -159,7 +169,7 @@ HRESULT WINAPI ScriptItemize(const WCHAR /* This implementation currently treats the entire string represented in * pwcInChars as a single entity. Hence pcItems will be set to 1. */ - FIXME("%s,%d,%d,%p,%p,%p,%p\n", debugstr_w(pwcInChars), cInChars, cMaxItems, + FIXME("%s,%d,%d,%p,%p,%p,%p: semi-stub\n", debugstr_w(pwcInChars), cInChars, cMaxItems, psControl, psState, pItems, pcItems); if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) @@ -281,13 +291,75 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRI SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs) { - FIXME("(%p,%p,%p,%s,%d,%d, %p, %p, %p, %p): stub\n", hdc, psc, pwcChars, - debugstr_w(pwcChars), - cChars, cMaxGlyphs, - psa, pwOutGlyphs, psva, pcGlyphs); - return E_NOTIMPL; + /* Note SCRIPT_CACHE (*psc) appears to be a good place to save info that needs to be + * passed between functions. */ + + HDC phdc; + int cnt; + DWORD hr; + int clusterinit; + Scriptcache *pScriptcache; + *pcGlyphs = cChars; + FIXME("(%p, %p, %p, %d, %d, %p): semi-stub\n", hdc, psc, pwcChars, + cChars, cMaxGlyphs, psa); + if (psa) TRACE("%d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, + psa->fLinkBefore, psa->fLinkAfter, + psa->fLogicalOrder, psa->fNoGlyphIndex); + + if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; + + if (!hdc && !*psc) { + TRACE("No Script_Cache (psc) and no hdc. Ask for one. Hdc=%p, psc=%p\n", hdc, *psc); + return E_PENDING; + } else + if (hdc && !*psc) { + pScriptcache = HeapAlloc( GetProcessHeap(), 0, sizeof(Scriptcache) ); + pScriptcache->hdc = (HDC) hdc; + phdc = hdc; + pScriptcache->HaveWidths = 0; + *psc = (Scriptcache *) pScriptcache; + } else + if (*psc) { + pScriptcache = (Scriptcache *) *psc; + phdc = pScriptcache->hdc; + } + + TRACE("Before: "); + for (cnt = 0; cnt < cChars; cnt++) + TRACE("%4x",pwcChars[cnt]); + TRACE("\n"); + + if (!psa->fNoGlyphIndex) { /* Glyph translate */ + hr = GetGlyphIndicesW(phdc, pwcChars, cChars, pwOutGlyphs, 0); + TRACE("After: "); + for (cnt = 0; cnt < cChars; cnt++) { + TRACE("%04x",pwOutGlyphs[cnt]); + pScriptcache->GlyphToChar[pwOutGlyphs[cnt]] = pwcChars[cnt]; /* save for ScriptPlace */ + } + TRACE("\n"); + } + else { + TRACE("After: "); + for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ + pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ + TRACE("%04x",pwOutGlyphs[cnt]); + pScriptcache->GlyphToChar[pwcChars[cnt]] = pwcChars[cnt]; /* set up a dummy table */ + } + TRACE("\n"); + } + /* Set up a valid SCRIPT_VISATTR for this run */ + clusterinit = 1; /* Start of Cluster */ + for (cnt = 0; cnt < cChars; cnt++) { + psva[cnt].uJustification = 0; + psva[cnt].fClusterStart = clusterinit; + clusterinit = 0; + psva[cnt].fDiacritic = 0; + psva[cnt].fZeroWidth = 0; + } + return 0; } + /*********************************************************************** * ScriptPlace (USP10.@) *

1 0

Roger Hoang : riched20: Implemented EM_SETTEXTMODE options TM_RICHTEXT and TM_PLAINTEXT
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: b03c70a8454381a5607e6755f8a9bd1bebf2c6f0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b03c70a8454381a5607e675… Author: Roger Hoang <rogerhoang(a)hotmail.com> Date: Sat Feb 18 22:32:24 2006 -0800 riched20: Implemented EM_SETTEXTMODE options TM_RICHTEXT and TM_PLAINTEXT and their tests. --- dlls/riched20/editor.c | 53 +++++++-- dlls/riched20/editstr.h | 5 + dlls/riched20/tests/editor.c | 235 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 280 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=b03c70a8454381a5607…

1 0

Jacek Caban : mshtml: Set default original uri in NewChannelFromURI.
by Alexandre Julliard Feb. 20, 2006

Feb. 20, 2006

Module: wine Branch: refs/heads/master Commit: 416f504cdd340b8f75ea396245e7c1dad6499cbb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=416f504cdd340b8f75ea396… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 20 16:43:32 2006 +0100 mshtml: Set default original uri in NewChannelFromURI. --- dlls/mshtml/nsio.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3b88597..8c86de7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1423,7 +1423,9 @@ static nsresult NSAPI nsIOService_NewCha ret->load_group = NULL; ret->notif_callback = NULL; ret->load_flags = 0; - ret->original_uri = NULL; + + nsIURI_AddRef(aURI); + ret->original_uri = aURI; if(channel) nsIChannel_QueryInterface(channel, &IID_nsIHttpChannel, (void**)&ret->http_channel);

1 0