October 2009 - Wine-Commits

Ge van Geldorp : ntdll/tests: Fix exception test failure on Win7.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: bc6f37ac004fe5b4e8746caf4e3de755d6e0779a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc6f37ac004fe5b4e8746caf4… Author: Ge van Geldorp <ggeldorp(a)vmware.com> Date: Wed Oct 7 12:27:12 2009 +0200 ntdll/tests: Fix exception test failure on Win7. --- dlls/ntdll/tests/exception.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2a959f7..f693960 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -129,11 +129,11 @@ static const struct exception { { 0x0e, 0x17, 0x58, 0xc3 }, /* 18: pushl %cs; popl %ss; popl %eax; ret */ 1, 1, STATUS_ACCESS_VIOLATION, 2, { 0, 0xffffffff } }, - /* 19: test overlong instruction (limit is 16 bytes) */ + /* 19: test overlong instruction (limit is 15 bytes, 5 on Win7) */ { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, 0, 16, STATUS_ILLEGAL_INSTRUCTION, 0 }, - { { 0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0x64,0xfa,0xc3 }, - 0, 15, STATUS_PRIVILEGED_INSTRUCTION, 0 }, + { { 0x64,0x64,0x64,0x64,0xfa,0xc3 }, + 0, 5, STATUS_PRIVILEGED_INSTRUCTION, 0 }, /* test invalid interrupt */ { { 0xcd, 0xff, 0xc3 }, /* 21: int $0xff; ret */

1 0

Alexander Scott-Johns : user32: Add missing doc comment.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 6ad9c443891a61f5a9f2b613e5d29c5d5f3d1401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad9c443891a61f5a9f2b613e… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Wed Oct 7 14:30:19 2009 +0100 user32: Add missing doc comment. --- dlls/user32/clipboard.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index c69d0c3..860e73f 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -188,6 +188,9 @@ static BOOL CLIPBOARD_CloseClipboard(void) return bRet; } +/************************************************************************** + * CLIPBOARD_SetClipboardViewer + */ static HWND CLIPBOARD_SetClipboardViewer( HWND hWnd ) { HWND hwndPrev = 0;

1 0

Alexander Scott-Johns : winecfg: In Load Theme dialog, add " (*.msstyles; * .theme)" to file type combobox.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 28ae6361d1fbce06beaa030dc1282e5076182284 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ae6361d1fbce06beaa030dc… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Thu Jul 2 18:36:50 2009 +0100 winecfg: In Load Theme dialog, add " (*.msstyles; *.theme)" to file type combobox. --- programs/winecfg/Bg.rc | 2 +- programs/winecfg/Cs.rc | 2 +- programs/winecfg/Da.rc | 2 +- programs/winecfg/De.rc | 2 +- programs/winecfg/En.rc | 2 +- programs/winecfg/Es.rc | 2 +- programs/winecfg/Fi.rc | 2 +- programs/winecfg/Fr.rc | 2 +- programs/winecfg/Hu.rc | 2 +- programs/winecfg/It.rc | 2 +- programs/winecfg/Ja.rc | 2 +- programs/winecfg/Ko.rc | 2 +- programs/winecfg/Lt.rc | 2 +- programs/winecfg/Nl.rc | 2 +- programs/winecfg/No.rc | 2 +- programs/winecfg/Pl.rc | 2 +- programs/winecfg/Pt.rc | 4 ++-- programs/winecfg/Ro.rc | 2 +- programs/winecfg/Ru.rc | 2 +- programs/winecfg/Si.rc | 2 +- programs/winecfg/Sv.rc | 2 +- programs/winecfg/Tr.rc | 2 +- programs/winecfg/Zh.rc | 4 ++-- 23 files changed, 25 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ae6361d1fbce06beaa0…

1 0

Rico Schüller : d3d10/tests: Add constant buffer type test.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: b277b114aaac2498c4678855e5678c3a41db7c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b277b114aaac2498c4678855e… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 6 20:44:30 2009 +0200 d3d10/tests: Add constant buffer type test. --- dlls/d3d10/tests/Makefile.in | 1 + dlls/d3d10/tests/effect.c | 212 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b277b114aaac2498c4678…

1 0

Francois Gouget : mshtml: Make HTMLDocumentNode_destructor() static.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 1860f529f574216ba5582ca85830e385a694cef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1860f529f574216ba5582ca85… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 7 14:49:10 2009 +0200 mshtml: Make HTMLDocumentNode_destructor() static. --- dlls/mshtml/htmldoc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index d6baa8e..bb5d968 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1768,7 +1768,7 @@ static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } -void HTMLDocumentNode_destructor(HTMLDOMNode *iface) +static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface);

1 0

Francois Gouget : ntdll/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 7c5df85f51e1992a176842a03b24c78bdada7973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5df85f51e1992a176842a03… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 7 14:49:00 2009 +0200 ntdll/tests: Add a trailing '\n' to an ok() call. --- dlls/ntdll/tests/info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 55b4498..dc5de94 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -960,7 +960,7 @@ static void test_affinity(void) status = pNtQueryInformationThread( GetCurrentThread(), ThreadBasicInformation, &tbi, sizeof(tbi), NULL ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, - "Unexpected thread affinity" ); + "Unexpected thread affinity\n" ); } START_TEST(info)

1 0

Alexandre Julliard : libport: Remove unnecessary function prototypes.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 305d4bfdd81262eca689af6d737a0432b1916e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=305d4bfdd81262eca689af6d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 15:04:47 2009 +0200 libport: Remove unnecessary function prototypes. --- libs/port/getopt.h | 52 ---------------------------------------------------- 1 files changed, 0 insertions(+), 52 deletions(-) diff --git a/libs/port/getopt.h b/libs/port/getopt.h index a90aa32..d1919d2 100644 --- a/libs/port/getopt.h +++ b/libs/port/getopt.h @@ -113,63 +113,11 @@ struct option #endif /* need getopt */ -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, `optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in `optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU `getopt'. - - The argument `--' causes premature termination of argument - scanning, explicitly telling `getopt' that there are no more - options. - - If OPTS begins with `--', then non-option arguments are treated as - arguments to the option '\0'. This behavior is specific to the GNU - `getopt'. */ - -#if (defined __STDC__ && __STDC__) || defined __cplusplus -# ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts); -# else /* not __GNU_LIBRARY__ */ -extern int getopt (); -# endif /* __GNU_LIBRARY__ */ - -# ifndef __need_getopt -extern int getopt_long (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind); -extern int getopt_long_only (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind); - /* Internal only. Users should not call this directly. */ extern int _getopt_internal (int ___argc, char *const *___argv, const char *__shortopts, const struct option *__longopts, int *__longind, int __long_only); -# endif -#else /* not __STDC__ */ -extern int getopt (); -# ifndef __need_getopt -extern int getopt_long (); -extern int getopt_long_only (); - -extern int _getopt_internal (); -# endif -#endif /* __STDC__ */ #ifdef __cplusplus }

1 0

Alexandre Julliard : programs: Build all programs with -DWINE_STRICT_PROTOTYPES.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 835bce270aac88dddfbc1a9047e9f4c384805ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=835bce270aac88dddfbc1a904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 7 13:41:13 2009 +0200 programs: Build all programs with -DWINE_STRICT_PROTOTYPES. --- programs/Makeprog.rules.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 6135771..77119e8 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -10,7 +10,7 @@ # DLLFLAGS = @DLLFLAGS@ -DEFS = $(EXTRADEFS) +DEFS = -DWINE_STRICT_PROTOTYPES $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)

1 0

Francois Gouget : ws2_32: Make wsaErrno() and wsaHerrno() static.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 78d413d4246811df77630c182d8caddf6bbd69e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d413d4246811df77630c182… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Oct 7 14:49:17 2009 +0200 ws2_32: Make wsaErrno() and wsaHerrno() static. --- dlls/ws2_32/socket.c | 189 ++++++++++++++++++++++++------------------------- 1 files changed, 93 insertions(+), 96 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fdc7aec..7c81bc9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -288,9 +288,6 @@ static struct WS_servent *WS_dup_se(const struct servent* p_se); int WSAIOCTL_GetInterfaceCount(void); int WSAIOCTL_GetInterfaceName(int intNumber, char *intName); -UINT wsaErrno(void); -UINT wsaHerrno(int errnr); - #define MAP_OPTION(opt) { WS_##opt, opt } static const int ws_sock_map[][2] = @@ -415,6 +412,99 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; +/* ----------------------------------- error handling */ + +static UINT wsaErrno(void) +{ + int loc_errno = errno; + WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); + + switch(loc_errno) + { + case EINTR: return WSAEINTR; + case EBADF: return WSAEBADF; + case EPERM: + case EACCES: return WSAEACCES; + case EFAULT: return WSAEFAULT; + case EINVAL: return WSAEINVAL; + case EMFILE: return WSAEMFILE; + case EWOULDBLOCK: return WSAEWOULDBLOCK; + case EINPROGRESS: return WSAEINPROGRESS; + case EALREADY: return WSAEALREADY; + case ENOTSOCK: return WSAENOTSOCK; + case EDESTADDRREQ: return WSAEDESTADDRREQ; + case EMSGSIZE: return WSAEMSGSIZE; + case EPROTOTYPE: return WSAEPROTOTYPE; + case ENOPROTOOPT: return WSAENOPROTOOPT; + case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; + case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; + case EOPNOTSUPP: return WSAEOPNOTSUPP; + case EPFNOSUPPORT: return WSAEPFNOSUPPORT; + case EAFNOSUPPORT: return WSAEAFNOSUPPORT; + case EADDRINUSE: return WSAEADDRINUSE; + case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; + case ENETDOWN: return WSAENETDOWN; + case ENETUNREACH: return WSAENETUNREACH; + case ENETRESET: return WSAENETRESET; + case ECONNABORTED: return WSAECONNABORTED; + case EPIPE: + case ECONNRESET: return WSAECONNRESET; + case ENOBUFS: return WSAENOBUFS; + case EISCONN: return WSAEISCONN; + case ENOTCONN: return WSAENOTCONN; + case ESHUTDOWN: return WSAESHUTDOWN; + case ETOOMANYREFS: return WSAETOOMANYREFS; + case ETIMEDOUT: return WSAETIMEDOUT; + case ECONNREFUSED: return WSAECONNREFUSED; + case ELOOP: return WSAELOOP; + case ENAMETOOLONG: return WSAENAMETOOLONG; + case EHOSTDOWN: return WSAEHOSTDOWN; + case EHOSTUNREACH: return WSAEHOSTUNREACH; + case ENOTEMPTY: return WSAENOTEMPTY; +#ifdef EPROCLIM + case EPROCLIM: return WSAEPROCLIM; +#endif +#ifdef EUSERS + case EUSERS: return WSAEUSERS; +#endif +#ifdef EDQUOT + case EDQUOT: return WSAEDQUOT; +#endif +#ifdef ESTALE + case ESTALE: return WSAESTALE; +#endif +#ifdef EREMOTE + case EREMOTE: return WSAEREMOTE; +#endif + + /* just in case we ever get here and there are no problems */ + case 0: return 0; + default: + WARN("Unknown errno %d!\n", loc_errno); + return WSAEOPNOTSUPP; + } +} + +static UINT wsaHerrno(int loc_errno) +{ + + WARN("h_errno %d.\n", loc_errno); + + switch(loc_errno) + { + case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; + case TRY_AGAIN: return WSATRY_AGAIN; + case NO_RECOVERY: return WSANO_RECOVERY; + case NO_DATA: return WSANO_DATA; + case ENOBUFS: return WSAENOBUFS; + + case 0: return 0; + default: + WARN("Unknown h_errno %d!\n", loc_errno); + return WSAEOPNOTSUPP; + } +} + static inline DWORD NtStatusToWSAError( const DWORD status ) { /* We only need to cover the status codes set by server async request handling */ @@ -4423,99 +4513,6 @@ static struct WS_servent *WS_dup_se(const struct servent* p_se) return p_to; } -/* ----------------------------------- error handling */ - -UINT wsaErrno(void) -{ - int loc_errno = errno; - WARN("errno %d, (%s).\n", loc_errno, strerror(loc_errno)); - - switch(loc_errno) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - - /* just in case we ever get here and there are no problems */ - case 0: return 0; - default: - WARN("Unknown errno %d!\n", loc_errno); - return WSAEOPNOTSUPP; - } -} - -UINT wsaHerrno(int loc_errno) -{ - - WARN("h_errno %d.\n", loc_errno); - - switch(loc_errno) - { - case HOST_NOT_FOUND: return WSAHOST_NOT_FOUND; - case TRY_AGAIN: return WSATRY_AGAIN; - case NO_RECOVERY: return WSANO_RECOVERY; - case NO_DATA: return WSANO_DATA; - case ENOBUFS: return WSAENOBUFS; - - case 0: return 0; - default: - WARN("Unknown h_errno %d!\n", loc_errno); - return WSAEOPNOTSUPP; - } -} - /*********************************************************************** * WSARecv (WS2_32.67)

1 0

Rico Schüller : d3d10/tests: Add variable type test.
by Alexandre Julliard Oct. 7, 2009

Oct. 7, 2009

Module: wine Branch: master Commit: 54592ea374346e1248bc6624f92e83030a1fe207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54592ea374346e1248bc6624f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Oct 6 20:44:39 2009 +0200 d3d10/tests: Add variable type test. --- dlls/d3d10/tests/effect.c | 224 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 224 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=54592ea374346e1248bc6…

1 0