January 2009 - Wine-commits

Alexandre Julliard : Wine release 1.1.14
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: website Branch: master Commit: c7845d598793a3efb0087cad44eb65df0bd92a26 URL: http://source.winehq.org/git/website.git/?a=commit;h=c7845d598793a3efb0087c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 18:05:55 2009 +0100 Wine release 1.1.14 --- news/en/2009013001.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009013001.xml b/news/en/2009013001.xml new file mode 100644 index 0000000..d3a7e49 --- /dev/null +++ b/news/en/2009013001.xml @@ -0,0 +1,17 @@ +<news> +<date>January 30, 2009</date> +<title>Wine 1.1.14 Released</title> +<body> + The Wine development release 1.1.14 is now available. + <a href="{$root}/announce/1.1.14">What's new</a> in this release: +<ul> + <li>Various bug fixes for Internet Explorer 7.</li> + <li>Many crypt32 improvements, including new export wizard.</li> + <li>Better support for windowless Richedit.</li> + <li>Improvements to the print dialog.</li> + <li>Many fixes to the regression tests on Windows.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.14.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.14 : Alexandre Julliard : Release 1.1.14
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: refs/tags/wine-1.1.14 Tag: 479ceb07c80956f4196e28c05880c40fc846917e URL: http://source.winehq.org/git/wine.git/?a=tag;h=479ceb07c80956f4196e28c05880… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 17:54:01 2009 +0100 Release 1.1.14

1 0

Alexandre Julliard : Release 1.1.14.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 8e39646ac4d256b813ff69a23ba0c62ab4f08d33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e39646ac4d256b813ff69a23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 17:54:01 2009 +0100 Release 1.1.14. --- ANNOUNCE | 1617 ++++++++++++++++++++++++++++++------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 795 insertions(+), 842 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8e39646ac4d256b813ff6…

1 0

Francois Gouget : msvcrt/tests: Remove a space before a '\n'.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 4ee530b2a7f48e6b56fb219bb1200a17809f3417 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ee530b2a7f48e6b56fb219bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 30 11:37:51 2009 +0100 msvcrt/tests: Remove a space before a '\n'. --- dlls/msvcrt/tests/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 1a524fc..9032e51 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -369,7 +369,7 @@ static void test_asciimode(void) fclose(fp); fp = fopen("ascii.tst", "r"); fseek(fp, 3 ,SEEK_SET); - ok((c = fgetc(fp)) == '1', "fgetc fails to read next char when positioned on \\r \n"); + ok((c = fgetc(fp)) == '1', "fgetc fails to read next char when positioned on \\r\n"); fclose(fp); unlink("ascii.tst");

1 0

Alexandre Julliard : server: Don't return a value from a void function.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 548e18933b58c1eb8d60ed88541e498e91a954b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548e18933b58c1eb8d60ed885… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 14:04:56 2009 +0100 server: Don't return a value from a void function. --- server/procfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/procfs.c b/server/procfs.c index 28777d8..5978bbc 100644 --- a/server/procfs.c +++ b/server/procfs.c @@ -180,7 +180,7 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, if (!pos) { set_error( STATUS_ACCESS_DENIED ); - return 0; + return; } if ((fd = open_proc_as( thread->process, O_RDONLY )) == -1) return;

1 0

Francois Gouget : twain_32/tests: Add a trailing '\n' to ok() calls.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 4d044c6f2abfea71f58804d251d6bd30bbc1670b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d044c6f2abfea71f58804d25… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 30 11:38:03 2009 +0100 twain_32/tests: Add a trailing '\n' to ok() calls. --- dlls/twain_32/tests/dsm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index bf91ba2..278ea7c 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -247,12 +247,12 @@ START_TEST(dsm) NULL, NULL, GetModuleHandleA(0), NULL); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_OPENDSM, (TW_MEMREF) &hwnd); - ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d", rc); + ok(rc == TWRC_SUCCESS, "MSG_OPENDSM returned %d\n", rc); test_sources(&appid); rc = pDSM_Entry(&appid, NULL, DG_CONTROL, DAT_PARENT, MSG_CLOSEDSM, (TW_MEMREF) &hwnd); - ok(rc == TWRC_SUCCESS, "MSG_CLOSEDSM returned %d", rc); + ok(rc == TWRC_SUCCESS, "MSG_CLOSEDSM returned %d\n", rc); DestroyWindow(hwnd); FreeLibrary(htwain);

1 0

Alexandre Julliard : configure: Include net/if. h to check for netinet headers on Solaris.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: d7e846ccd96e90301e966effa5ae046a054e6d03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e846ccd96e90301e966effa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 14:01:12 2009 +0100 configure: Include net/if.h to check for netinet headers on Solaris. --- configure | 3 +++ configure.ac | 3 +++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f2bf40e..6fd07c8 100755 --- a/configure +++ b/configure @@ -7971,6 +7971,9 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef HAVE_NETINET_IN_SYSTM_H # include <netinet/in_systm.h> #endif + #ifdef HAVE_NET_IF_H + # include <net/if.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif diff --git a/configure.ac b/configure.ac index fe71343..8b78efe 100644 --- a/configure.ac +++ b/configure.ac @@ -408,6 +408,9 @@ AC_CHECK_HEADERS(\ #ifdef HAVE_NETINET_IN_SYSTM_H # include <netinet/in_systm.h> #endif + #ifdef HAVE_NET_IF_H + # include <net/if.h> + #endif #ifdef HAVE_NETINET_IP_H # include <netinet/ip.h> #endif])

1 0

Austin English : configure: Check for xinpgen struct.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 68f2db299d288c277b72e4e8abf496949b44cd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f2db299d288c277b72e4e8a… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jan 29 08:28:37 2009 -0600 configure: Check for xinpgen struct. --- configure | 148 +++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 24 ++++++++ dlls/iphlpapi/ipstats.c | 6 +- include/config.h.in | 3 + 4 files changed, 178 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6fd07c8..b820d2d 100755 --- a/configure +++ b/configure @@ -20488,6 +20488,154 @@ _ACEOF fi +{ $as_echo "$as_me:$LINENO: checking for struct xinpgen" >&5 +$as_echo_n "checking for struct xinpgen... " >&6; } +if test "${ac_cv_type_struct_xinpgen+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_type_struct_xinpgen=no +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NET_ROUTE_H +#include <net/route.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif + +int +main () +{ +if (sizeof (struct xinpgen)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NET_ROUTE_H +#include <net/route.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif + +int +main () +{ +if (sizeof ((struct xinpgen))) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_struct_xinpgen=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_struct_xinpgen" >&5 +$as_echo "$ac_cv_type_struct_xinpgen" >&6; } +if test "x$ac_cv_type_struct_xinpgen" = x""yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_STRUCT_XINPGEN 1 +_ACEOF + + +fi + + { $as_echo "$as_me:$LINENO: checking for struct ff_effect.direction" >&5 $as_echo_n "checking for struct ff_effect.direction... " >&6; } if test "${ac_cv_member_struct_ff_effect_direction+set}" = set; then diff --git a/configure.ac b/configure.ac index 8b78efe..b0725c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1572,6 +1572,30 @@ AC_CHECK_TYPES([sigset_t],,,[#include <sys/types.h> #include <signal.h>]) AC_CHECK_TYPES([request_sense],,,[#include <linux/cdrom.h>]) +AC_CHECK_TYPES([struct xinpgen],,, +[#include <sys/types.h> +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> +#endif +#ifdef HAVE_SYS_SOCKETVAR_H +#include <sys/socketvar.h> +#endif +#ifdef HAVE_NET_ROUTE_H +#include <net/route.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_NETINET_IN_SYSTM_H +#include <netinet/in_systm.h> +#endif +#ifdef HAVE_NETINET_IP_H +#include <netinet/ip.h> +#endif +#ifdef HAVE_NETINET_IN_PCB_H +#include <netinet/in_pcb.h> +#endif]) + AC_CHECK_MEMBERS([struct ff_effect.direction],,, [#ifdef HAVE_LINUX_INPUT_H #include <linux/input.h> diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 75d4611..31336f9 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -869,7 +869,7 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) static DWORD getNumWithOneHeader(const char *filename) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) +#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) size_t Len = 0; char *Buf; struct xinpgen *pXIG, *pOrigXIG; @@ -1581,7 +1581,7 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, DWORD maxEntries, HANDLE heap, { DWORD numEntries; PMIB_TCPTABLE table; -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) +#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) size_t Len = 0; char *Buf; struct xinpgen *pXIG, *pOrigXIG; @@ -1615,7 +1615,7 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, DWORD maxEntries, HANDLE heap, if (!numEntries) return NO_ERROR; -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) +#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) if (sysctlbyname ("net.inet.tcp.pcblist", NULL, &Len, NULL, 0) < 0) { diff --git a/include/config.h.in b/include/config.h.in index 11dc1c6..036b5fb 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -780,6 +780,9 @@ /* Define to 1 if `st_mtim' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_MTIM +/* Define to 1 if the system has the type `struct xinpgen'. */ +#undef HAVE_STRUCT_XINPGEN + /* Define to 1 if you have the `symlink' function. */ #undef HAVE_SYMLINK

1 0

Diaa Sami : shell32: Fix a mem leak in SHBrowseForFolder.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 72a7aed5b685c782e57d7ccf661344f964cd6c3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a7aed5b685c782e57d7ccf6… Author: Diaa Sami <diaasami(a)gmail.com> Date: Thu Jan 29 19:54:29 2009 +0000 shell32: Fix a mem leak in SHBrowseForFolder. --- dlls/shell32/brsfolder.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index 70dcc47..d62bd10 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -801,6 +801,17 @@ static BOOL BrsFolder_OnWindowPosChanging(browse_info *info, WINDOWPOS *pos) return 0; } +static INT BrsFolder_OnDestroy(browse_info *info) +{ + if (info->layout) + { + SHFree(info->layout); + info->layout = NULL; + } + + return 0; +} + /************************************************************************* * BrsFolderDlgProc32 (not an exported API function) */ @@ -860,6 +871,9 @@ static INT_PTR CALLBACK BrsFolderDlgProc( HWND hWnd, UINT msg, WPARAM wParam, case BFFM_SETEXPANDED: /* unicode only */ return BrsFolder_OnSetExpanded(info, (LPVOID)lParam, (BOOL)wParam, NULL); + + case WM_DESTROY: + return BrsFolder_OnDestroy(info); } return FALSE; }

1 0

Alexandre Julliard : msi: Fix compiler warning on older gcc.
by Alexandre Julliard 30 Jan '09

30 Jan '09

Module: wine Branch: master Commit: 8ca2aa3da9be85a42da4a4847aa97917df5bc8a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca2aa3da9be85a42da4a4847… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 30 13:44:06 2009 +0100 msi: Fix compiler warning on older gcc. --- dlls/msi/registry.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 9a43b8d..3689724 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1894,7 +1894,7 @@ static UINT msi_enum_patches(LPCWSTR szProductCode, LPCWSTR szUserSid, MSIINSTALLCONTEXT *pdwTargetProductContext, LPWSTR szTargetUserSid, LPDWORD pcchTargetUserSid, LPWSTR *szTransforms) { - UINT r; + UINT r = ERROR_INVALID_PARAMETER; if (dwContext & MSIINSTALLCONTEXT_USERMANAGED) {

1 0