January 2009 - Wine-commits

Michael Karcher : widl: Fix handling of [local] functions without [call_as] .
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 8092e85ece1e8f6fe18812ef15bfffba8a4715f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8092e85ece1e8f6fe18812ef1… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jan 11 14:54:12 2009 +0100 widl: Fix handling of [local] functions without [call_as]. --- tools/widl/proxy.c | 51 ++++++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 878e820..4e69190 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -543,6 +543,17 @@ static int count_methods(type_t *iface) return count; } +static const statement_t * get_callas_source(const type_t * iface, const var_t * def) +{ + const statement_t * source; + STATEMENTS_FOR_EACH_FUNC( source, type_iface_get_stmts(iface)) { + const var_t * cas = is_callas(source->u.var->attrs ); + if (cas && !strcmp(def->name, cas->name)) + return source; + } + return NULL; +} + static int write_proxy_methods(type_t *iface, int skip) { const statement_t *stmt; @@ -554,8 +565,11 @@ static int write_proxy_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { + if (i != func->type->details.function->idx ) + error("widl internal error: method index mismatch"); if (i) fprintf(proxy, ",\n"); - if (skip) print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func)); + if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) + print_proxy( "0 /* %s_%s_Proxy */", iface->name, get_name(func)); else print_proxy( "%s_%s_Proxy", iface->name, get_name(func)); i++; } @@ -575,10 +589,19 @@ static int write_stub_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; - if (!is_local(func->attrs)) { + if (!is_callas(func->attrs)) { + int missing = 0; + const char * fname = get_name(func); + if(is_local(func->attrs)) { + const statement_t * callas_source = get_callas_source(iface, func); + if(!callas_source) + missing = 1; + else + fname = get_name(callas_source->u.var); + } if (i) fprintf(proxy,",\n"); - if (skip) print_proxy("STUB_FORWARDING_FUNCTION"); - else print_proxy( "%s_%s_Stub", iface->name, get_name(func)); + if (skip || missing) print_proxy("STUB_FORWARDING_FUNCTION"); + else print_proxy( "%s_%s_Stub", iface->name, fname); i++; } } @@ -587,7 +610,7 @@ static int write_stub_methods(type_t *iface, int skip) static void write_proxy(type_t *iface, unsigned int *proc_offset) { - int midx = -1, count; + int count; const statement_t *stmt; int first_func = 1; @@ -619,28 +642,10 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) gen_proxy(iface, func, idx, *proc_offset); gen_stub(iface, func, cname, *proc_offset); *proc_offset += get_size_procformatstring_func( func ); - if (midx == -1) midx = idx; - else if (midx != idx) error("method index mismatch in write_proxy\n"); - midx++; - } - } - - /* interface didn't have any methods - search in inherited interfaces */ - if (midx == -1) { - const type_t *inherit_iface; - for (inherit_iface = type_iface_get_inherit(iface); - inherit_iface; - inherit_iface = type_iface_get_inherit(inherit_iface)) { - STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(inherit_iface)) { - const var_t *func = stmt->u.var; - int idx = func->type->details.function->idx; - if (idx + 1 > midx) midx = idx + 1; - } } } count = count_methods(iface); - if (midx != -1 && midx != count) error("invalid count %u/%u\n", count, midx); /* proxy vtable */ print_proxy( "static const CINTERFACE_PROXY_VTABLE(%d) _%sProxyVtbl =\n", count, iface->name);

1 0

Michael Karcher : widl: Don't forget conformance info on [iid_is] void pointers.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: f80e4aa9d249b9708199382d53ebe836bea875d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80e4aa9d249b9708199382d5… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Jan 11 14:57:47 2009 +0100 widl: Don't forget conformance info on [iid_is] void pointers. --- tools/widl/typegen.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2b0e414..da5c29b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3046,7 +3046,7 @@ static void write_parameter_conf_or_var_exprs(FILE *file, int indent, const char } break; } - else if (type->type == RPC_FC_IP) + else if (type->type == RPC_FC_IP || is_void(type)) { expr_t *iid;

1 0

Paul Vriens : crypt32/tests: Make tests run on some Win9x boxes again.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 110f2c2cd9e5e77cbdafbea73ea2bfd86ea4e8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=110f2c2cd9e5e77cbdafbea73… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jan 12 12:46:08 2009 +0100 crypt32/tests: Make tests run on some Win9x boxes again. --- dlls/crypt32/tests/object.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/tests/object.c b/dlls/crypt32/tests/object.c index 911fc9f..211b542 100644 --- a/dlls/crypt32/tests/object.c +++ b/dlls/crypt32/tests/object.c @@ -26,6 +26,9 @@ #include "wine/test.h" +static BOOL (WINAPI * pCryptQueryObject)(DWORD, const void *, DWORD, DWORD, + DWORD, DWORD *, DWORD *, DWORD *, HCERTSTORE *, HCRYPTMSG *, const void **); + static BYTE bigCert[] = { 0x30,0x7a,0x02,0x01,0x01,0x30,0x02,0x06,0x00,0x30,0x15,0x31, 0x13,0x30,0x11,0x06,0x03,0x55,0x04,0x03,0x13,0x0a,0x4a,0x75, @@ -128,12 +131,12 @@ static void test_query_object(void) /* Test the usual invalid arguments */ SetLastError(0xdeadbeef); - ret = CryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, + ret = pCryptQueryObject(0, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, NULL, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); @@ -141,7 +144,7 @@ static void test_query_object(void) blob.pbData = bigCert; blob.cbData = sizeof(bigCert); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); @@ -149,19 +152,19 @@ static void test_query_object(void) blob.pbData = (BYTE *)bigCertBase64; blob.cbData = sizeof(bigCertBase64); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); /* The same base64-encoded cert, restricting the format types */ SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); @@ -169,7 +172,7 @@ static void test_query_object(void) blob.pbData = (BYTE *)bigCertBase64W; blob.cbData = sizeof(bigCertBase64W); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, @@ -182,14 +185,14 @@ static void test_query_object(void) blob.pbData = signedWithCertWithValidPubKeyContent; blob.cbData = sizeof(signedWithCertWithValidPubKeyContent); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); blob.pbData = (BYTE *)signedWithCertWithValidPubKeyContentBase64; blob.cbData = sizeof(signedWithCertWithValidPubKeyContentBase64); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); @@ -199,18 +202,18 @@ static void test_query_object(void) blob.pbData = (BYTE *)signedWithCertWithValidPubKeyContentBase64W; blob.cbData = sizeof(signedWithCertWithValidPubKeyContentBase64W); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(!ret && GetLastError() == CRYPT_E_NO_MATCH, "expected CRYPT_E_NO_MATCH, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); - ret = CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, + ret = pCryptQueryObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_ALL, CERT_QUERY_FORMAT_FLAG_BASE64_ENCODED, 0, NULL, NULL, NULL, NULL, NULL, NULL); ok(ret, "CryptQueryObject failed: %08x\n", GetLastError()); @@ -218,5 +221,15 @@ static void test_query_object(void) START_TEST(object) { + HMODULE mod = GetModuleHandleA("crypt32.dll"); + + pCryptQueryObject = (void *)GetProcAddress(mod, "CryptQueryObject"); + + if (!pCryptQueryObject) + { + win_skip("CryptQueryObject is not available\n"); + return; + } + test_query_object(); }

1 0

Alexandre Julliard : configure: Improve error reporting for missing 32-bit development environment.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: dfa66db214a12be52204def741e53450f670d38e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfa66db214a12be52204def74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 12 15:25:44 2009 +0100 configure: Improve error reporting for missing 32-bit development environment. --- configure | 149 +++++++++++++++++++++++++++++++++++++++------------------ configure.ac | 45 ++++++++++-------- 2 files changed, 127 insertions(+), 67 deletions(-) diff --git a/configure b/configure index 65743ff..0c82d0e 100755 --- a/configure +++ b/configure @@ -747,6 +747,8 @@ CPP XMKMF TARGET TOOLSDIR +WIN16_INSTALL +WIN16_FILES CPPBIN ac_ct_CXX CXXFLAGS @@ -759,8 +761,6 @@ LDFLAGS CFLAGS CC SET_MAKE -WIN16_INSTALL -WIN16_FILES host_os host_vendor host_cpu @@ -2360,50 +2360,6 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -case $host in - x86_64*linux*) - if test "x$enable_win64" != "xyes" - then - CC="${CC:-gcc} -m32" - CXX="${CXX:-g++} -m32" - LD="${LD:-ld} -m elf_i386" - AS="${AS:-as} --32" - host_cpu="i386" - notice_platform="32-bit " - fi - ;; -esac - -case $host_cpu in - *i[3456789]86*) - enable_win16=${enable_win16:-yes} - ;; - *) - enable_win16=${enable_win16:-no} - enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} - enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} - enable_monodebg_vxd=${enable_monodebg_vxd:-no} - enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} - enable_vmm_vxd=${enable_vmm_vxd:-no} - enable_vnbt_vxd=${enable_vnbt_vxd:-no} - enable_vnetbios_vxd=${enable_vnetbios_vxd:-no} - enable_vtdapi_vxd=${enable_vtdapi_vxd:-no} - enable_vwin32_vxd=${enable_vwin32_vxd:-no} - enable_w32skrnl=${enable_w32skrnl:-no} - enable_winedos=${enable_winedos:-no} - enable_winevdm=${enable_winevdm:-no} - ;; -esac - -WIN16_FILES="\$(WIN16_FILES)" - -WIN16_INSTALL="\$(WIN16_INSTALL)" - -if test "x$enable_win16" != "xyes" -then - WIN16_FILES="" - WIN16_INSTALL="" -fi case "$srcdir" in .) ;; @@ -3846,6 +3802,106 @@ else fi +case $host in + x86_64*) + if test "x$enable_win64" != "xyes" + then + CC="$CC -m32" + CXX="$CXX -m32" + { $as_echo "$as_me:$LINENO: checking whether $CC works" >&5 +$as_echo_n "checking whether $CC works... " >&6; } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +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_link") 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_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:$LINENO: error: Cannot build a 32-bit program, you need to install 32-bit development libraries." >&5 +$as_echo "$as_me: error: Cannot build a 32-bit program, you need to install 32-bit development libraries." >&2;} + { (exit 1); exit 1; }; } +fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LD="${LD:-ld} -m elf_i386" + AS="${AS:-as} --32" + host_cpu="i386" + notice_platform="32-bit " + fi + ;; +esac + +case $host_cpu in + *i[3456789]86*) + enable_win16=${enable_win16:-yes} + ;; + *) + enable_win16=${enable_win16:-no} + enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no} + enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no} + enable_monodebg_vxd=${enable_monodebg_vxd:-no} + enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} + enable_vmm_vxd=${enable_vmm_vxd:-no} + enable_vnbt_vxd=${enable_vnbt_vxd:-no} + enable_vnetbios_vxd=${enable_vnetbios_vxd:-no} + enable_vtdapi_vxd=${enable_vtdapi_vxd:-no} + enable_vwin32_vxd=${enable_vwin32_vxd:-no} + enable_w32skrnl=${enable_w32skrnl:-no} + enable_winedos=${enable_winedos:-no} + enable_winevdm=${enable_winevdm:-no} + ;; +esac + +WIN16_FILES="\$(WIN16_FILES)" + +WIN16_INSTALL="\$(WIN16_INSTALL)" + +if test "x$enable_win16" != "xyes" +then + WIN16_FILES="" + WIN16_INSTALL="" +fi + { $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if test "${wine_cv_toolsdir+set}" = set; then @@ -3880,7 +3936,6 @@ then fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/configure.ac b/configure.ac index 604f331..591d541 100644 --- a/configure.ac +++ b/configure.ac @@ -81,12 +81,34 @@ AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree vide AC_ARG_WITH(wine-tools,AS_HELP_STRING([--with-wine-tools=DIR],[use Wine tools from directory DIR])) AC_CANONICAL_HOST + +dnl check for out of tree build with unclean source tree +case "$srcdir" in + .) ;; + *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then + AC_MSG_ERROR([you are building out of the source tree, but the source tree contains object files. +You need to run 'make distclean' in the source tree first.]) + fi ;; +esac + +dnl **** Check for some programs **** + +AC_PROG_MAKE_SET +AC_PROG_CC +AC_PROG_CXX +dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E +AC_CHECK_TOOL(CPPBIN,cpp,cpp) + case $host in - x86_64*linux*) + x86_64*) if test "x$enable_win64" != "xyes" then - CC="${CC:-gcc} -m32" - CXX="${CXX:-g++} -m32" + CC="$CC -m32" + CXX="$CXX -m32" + AC_MSG_CHECKING([whether $CC works]) + AC_LINK_IFELSE(AC_LANG_PROGRAM(),AC_MSG_RESULT([yes]), + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Cannot build a 32-bit program, you need to install 32-bit development libraries.])]) LD="${LD:-ld} -m elf_i386" AS="${AS:-as} --32" host_cpu="i386" @@ -126,23 +148,6 @@ then WIN16_INSTALL="" fi -dnl check for out of tree build with unclean source tree -case "$srcdir" in - .) ;; - *) if test -f "$srcdir/Makefile" -o -f "$srcdir/include/config.h"; then - AC_MSG_ERROR([you are building out of the source tree, but the source tree contains object files. -You need to run 'make distclean' in the source tree first.]) - fi ;; -esac - -dnl **** Check for some programs **** - -AC_PROG_MAKE_SET -AC_PROG_CC -AC_PROG_CXX -dnl We can't use AC_PROG_CPP for winegcc, it uses by default $(CC) -E -AC_CHECK_TOOL(CPPBIN,cpp,cpp) - AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, [if test -z "$with_wine_tools"; then if test "$cross_compiling" = "yes"; then

1 0

Alexandre Julliard : makedep: Copy the makefile to append dependencies instead of truncating in place.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: c31a36412caaa8be59d442c28bae45996c6304d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31a36412caaa8be59d442c28… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 12 14:43:15 2009 +0100 makedep: Copy the makefile to append dependencies instead of truncating in place. --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 9 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2571359..7941ea0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -866,6 +866,33 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) /******************************************************************* + * create_temp_file + */ +static FILE *create_temp_file( char **tmp_name ) +{ + char *name = xmalloc( strlen(OutputFileName) + 13 ); + unsigned int i, id = getpid(); + int fd; + FILE *ret = NULL; + + for (i = 0; i < 100; i++) + { + sprintf( name, "%s.tmp%08x", OutputFileName, id ); + if ((fd = open( name, O_RDWR | O_CREAT | O_EXCL, 0600 )) != -1) + { + ret = fdopen( fd, "w" ); + break; + } + if (errno != EEXIST) break; + id += 7777; + } + if (!ret) fatal_error( "failed to create output file for '%s'\n", OutputFileName ); + *tmp_name = name; + return ret; +} + + +/******************************************************************* * output_dependencies */ static void output_dependencies(void) @@ -873,19 +900,23 @@ static void output_dependencies(void) INCL_FILE *pFile; int i, column; FILE *file = NULL; - char *buffer; + char *tmp_name = NULL; - if (Separator && ((file = fopen( OutputFileName, "r+" )))) + if (Separator && ((file = fopen( OutputFileName, "r" )))) { - while ((buffer = get_line( file ))) + char buffer[1024]; + FILE *tmp_file = create_temp_file( &tmp_name ); + + while (fgets( buffer, sizeof(buffer), file )) { - if (strncmp( buffer, Separator, strlen(Separator) )) continue; - ftruncate( fileno(file), ftell(file) ); - fseek( file, 0L, SEEK_END ); - break; + if (fwrite( buffer, 1, strlen(buffer), tmp_file ) != strlen(buffer)) + fatal_error( "error writing to %s\n", tmp_name ); + if (!strncmp( buffer, Separator, strlen(Separator) )) break; } + fclose( file ); + file = tmp_file; } - if (!file) + else { if (!(file = fopen( OutputFileName, Separator ? "a" : "w" ))) { @@ -902,7 +933,17 @@ static void output_dependencies(void) pFile, &column ); fprintf( file, "\n" ); } - fclose(file); + fclose( file ); + + if (tmp_name) + { + if (rename( tmp_name, OutputFileName ) == -1) + { + unlink( tmp_name ); + fatal_error( "failed to rename output file to '%s'\n", OutputFileName ); + } + free( tmp_name ); + } }

1 0

Dylan Smith : richedit: Store mouse captured state rather than calling GetCapture.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: f885d40d672ba15137f3067e1f1dfcde6f8bd3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f885d40d672ba15137f3067e1… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 02:59:20 2009 -0500 richedit: Store mouse captured state rather than calling GetCapture. Windowless richedit control will not be able to call GetCapture without a handle to the host window (and there is no ITextHost_TxGetCapture method), but there is a ITextHost_TxSetCapture method available for setting and releasing the capture on the mouse. This means that the richedit control will need to keep track of whether it has captured the mouse or not to implement windowless richedit controls. --- dlls/riched20/editor.c | 12 ++++++++---- dlls/riched20/editstr.h | 2 ++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 47e50b3..d4f60e4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2530,7 +2530,7 @@ static BOOL ME_SetCursor(ME_TextEditor *editor) } ScreenToClient(editor->hWnd, &pt); - if (editor->nSelectionType == stLine && GetCapture() == editor->hWnd) { + if (editor->nSelectionType == stLine && editor->bMouseCaptured) { SetCursor(hLeft); return TRUE; } @@ -2670,6 +2670,7 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10) ed->mode = TM_RICHTEXT | TM_MULTILEVELUNDO | TM_MULTICODEPAGE; ed->AutoURLDetect_bEnable = FALSE; ed->bHaveFocus = FALSE; + ed->bMouseCaptured = FALSE; for (i=0; i<HFONT_CACHE_SIZE; i++) { ed->pFontCache[i].nRefs = 0; @@ -3874,6 +3875,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_LButtonDown(editor, (short)LOWORD(lParam), (short)HIWORD(lParam), ME_CalculateClickCount(editor, msg, wParam, lParam)); SetCapture(editor->hWnd); + editor->bMouseCaptured = TRUE; ME_LinkNotify(editor,msg,wParam,lParam); if (!ME_SetCursor(editor)) goto do_default; break; @@ -3882,16 +3884,18 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, if ((editor->nEventMask & ENM_MOUSEEVENTS) && !ME_FilterEvent(editor, msg, &wParam, &lParam)) return 0; - if (GetCapture() == editor->hWnd) + if (editor->bMouseCaptured) ME_MouseMove(editor, (short)LOWORD(lParam), (short)HIWORD(lParam)); ME_LinkNotify(editor,msg,wParam,lParam); /* Set cursor if mouse is captured, since WM_SETCURSOR won't be received. */ - if (GetCapture() == editor->hWnd) + if (editor->bMouseCaptured) ME_SetCursor(editor); break; case WM_LBUTTONUP: - if (GetCapture() == editor->hWnd) + if (editor->bMouseCaptured) { ReleaseCapture(); + editor->bMouseCaptured = FALSE; + } if (editor->nSelectionType == stDocument) editor->nSelectionType = stPosition; if ((editor->nEventMask & ENM_MOUSEEVENTS) && diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index cde05f9..6850ca7 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -376,6 +376,8 @@ typedef struct tagME_TextEditor /* Cache previously set vertical scrollbar info */ SCROLLINFO vert_si; + + BOOL bMouseCaptured; } ME_TextEditor; typedef struct tagME_Context

1 0

Dylan Smith : richedit: Prevent an unsigned integer underflow.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: ee19ec056a417fbd705f62b3ccd392023bcfe8ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee19ec056a417fbd705f62b3c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 02:59:38 2009 -0500 richedit: Prevent an unsigned integer underflow. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index f0acf4a..b6430e4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1127,7 +1127,7 @@ int ME_GetYScrollPos(ME_TextEditor *editor) BOOL ME_GetYScrollVisible(ME_TextEditor *editor) { /* Returns true if the scrollbar is visible */ - return (editor->vert_si.nMax - editor->vert_si.nMin >= max(editor->vert_si.nPage - 1, 0)); + return (editor->vert_si.nMax - editor->vert_si.nMin > editor->vert_si.nPage); } void ME_EnsureVisible(ME_TextEditor *editor, ME_DisplayItem *pRun)

1 0

Dylan Smith : richedit: Pressing enter adds newline on WM_KEYDOWN rather than WM_CHAR.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 603be645d2d77a028c3f209be1742d7dccb64372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=603be645d2d77a028c3f209be… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 02:59:09 2009 -0500 richedit: Pressing enter adds newline on WM_KEYDOWN rather than WM_CHAR. --- dlls/riched20/editor.c | 221 ++++++++++++++++++++++++++++-------------------- 1 files changed, 129 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=603be645d2d77a028c3f2…

1 0

Dylan Smith : richedit: Set bEmulateVersion10 initially to avoid retroactive changes.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 8089d980d1b07fbed1d2ba47e888e83b33c47977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8089d980d1b07fbed1d2ba47e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 02:59:31 2009 -0500 richedit: Set bEmulateVersion10 initially to avoid retroactive changes. Previously the WM_NCCREATE was handled by the as if it was always for later versions, then the window proc for version 1.0 would make appropriate changes afterwards. Instead both versions should call the same function (e.g. ME_MakeEditor) and provide the value for bEmulateVersion10 to make the code clearer. --- dlls/riched20/editor.c | 38 ++++++++++++++++++-------------------- dlls/riched20/editor.h | 2 +- dlls/riched20/para.c | 4 ++-- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9e5f123..47e50b3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2620,11 +2620,12 @@ static BOOL ME_ShowContextMenu(ME_TextEditor *editor, int x, int y) return TRUE; } -ME_TextEditor *ME_MakeEditor(HWND hWnd) { +ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10) +{ ME_TextEditor *ed = ALLOC_OBJ(ME_TextEditor); int i; ed->hWnd = hWnd; - ed->bEmulateVersion10 = FALSE; + ed->bEmulateVersion10 = bEmulateVersion10; ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ME_MakeFirstParagraph(ed); @@ -2658,7 +2659,10 @@ ME_TextEditor *ME_MakeEditor(HWND hWnd) { ed->nParagraphs = 1; ed->nLastSelStart = ed->nLastSelEnd = 0; ed->pLastSelStartPara = ed->pLastSelEndPara = ME_FindItemFwd(ed->pBuffer->pFirst, diParagraph); - ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; + if (ed->bEmulateVersion10) + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & ES_AUTOHSCROLL) ? FALSE : TRUE; + else + ed->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & (WS_HSCROLL|ES_AUTOHSCROLL)) ? FALSE : TRUE; ed->bHideSelection = FALSE; ed->nInvalidOfs = -1; ed->pfnWordBreak = NULL; @@ -2915,8 +2919,8 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (msg == WM_NCCREATE) { CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; - TRACE("WM_NCCREATE: style 0x%08x\n", pcs->style); - editor = ME_MakeEditor(hWnd); + TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); + editor = ME_MakeEditor(hWnd, FALSE); SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor); return TRUE; } @@ -4309,23 +4313,17 @@ LRESULT WINAPI RichEditANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lP */ LRESULT WINAPI RichEdit10ANSIWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - LRESULT result; - - /* FIXME: this is NOT the same as 2.0 version */ - result = RichEditANSIWndProc(hWnd, msg, wParam, lParam); - if (msg == WM_NCCREATE) + if (msg == WM_NCCREATE && !GetWindowLongPtrW(hWnd, 0)) { - ME_TextEditor *editor = (ME_TextEditor *)GetWindowLongPtrW(hWnd, 0); - - TRACE("Emulating version 1.0 (hWnd=%p)\n", hWnd); - editor->bEmulateVersion10 = TRUE; - editor->bWordWrap = (GetWindowLongW(hWnd, GWL_STYLE) & ES_AUTOHSCROLL) ? FALSE : TRUE; - editor->pBuffer->pLast->member.para.nCharOfs = 2; - assert(editor->pBuffer->pLast->prev->type == diRun); - assert(editor->pBuffer->pLast->prev->member.run.nFlags & MERF_ENDPARA); - editor->pBuffer->pLast->prev->member.run.nLF = 1; + ME_TextEditor *editor; + CREATESTRUCTW *pcs = (CREATESTRUCTW *)lParam; + + TRACE("WM_NCCREATE: hWnd %p style 0x%08x\n", hWnd, pcs->style); + editor = ME_MakeEditor(hWnd, TRUE); + SetWindowLongPtrW(hWnd, 0, (LONG_PTR)editor); + return TRUE; } - return result; + return RichEditANSIWndProc(hWnd, msg, wParam, lParam); } void ME_SendOldNotify(ME_TextEditor *editor, int nCode) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index df82073..4016ba2 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -269,7 +269,7 @@ void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src); void ME_DeleteReObject(REOBJECT* reo); /* editor.c */ -ME_TextEditor *ME_MakeEditor(HWND hWnd); +ME_TextEditor *ME_MakeEditor(HWND hWnd, BOOL bEmulateVersion10); void ME_DestroyEditor(ME_TextEditor *editor); LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode, HRESULT* phresult); diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 9cf4d97..f786d8c 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -67,7 +67,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) run = ME_MakeRun(style, ME_MakeString(wszParagraphSign), MERF_ENDPARA); run->member.run.nCharOfs = 0; run->member.run.nCR = 1; - run->member.run.nLF = (editor->bEmulateVersion10) ? 1 : 0; + run->member.run.nLF = editor->bEmulateVersion10 ? 1 : 0; ME_InsertBefore(text->pLast, para); ME_InsertBefore(text->pLast, run); @@ -76,7 +76,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) text->pFirst->member.para.next_para = para; text->pLast->member.para.prev_para = para; - text->pLast->member.para.nCharOfs = 1; + text->pLast->member.para.nCharOfs = editor->bEmulateVersion10 ? 2 : 1; ME_DestroyContext(&c, editor->hWnd); }

1 0

Dylan Smith : richedit: Added tests for autoscrolling options based on WS_V /HSCROLL.
by Alexandre Julliard 12 Jan '09

12 Jan '09

Module: wine Branch: master Commit: 55d9e95892c08e4e46b705f8ffa84b6237261e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55d9e95892c08e4e46b705f8f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sun Jan 11 22:20:42 2009 -0500 richedit: Added tests for autoscrolling options based on WS_V/HSCROLL. --- dlls/riched20/tests/editor.c | 30 ++++++++++++++++++++++++++++-- dlls/riched32/tests/editor.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 4efe8e3..534d217 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5826,7 +5826,7 @@ static void test_word_wrap(void) DestroyWindow(hwnd); } -static void test_auto_yscroll(void) +static void test_autoscroll(void) { HWND hwnd = new_richedit(NULL); int lines, ret, redraw; @@ -5856,6 +5856,32 @@ static void test_auto_yscroll(void) SendMessage(hwnd, WM_SETREDRAW, TRUE, 0); DestroyWindow(hwnd); + + /* The WS_VSCROLL and WS_HSCROLL styles implicitly set + * auto vertical/horizontal scrolling options. */ + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP|ES_MULTILINE|WS_VSCROLL|WS_HSCROLL, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + todo_wine ok(ret & ECO_AUTOVSCROLL, "ECO_AUTOVSCROLL isn't set.\n"); + todo_wine ok(ret & ECO_AUTOHSCROLL, "ECO_AUTOHSCROLL isn't set.\n"); + ret = GetWindowLong(hwnd, GWL_STYLE); + ok(!(ret & ES_AUTOVSCROLL), "ES_AUTOVSCROLL is set.\n"); + ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP|ES_MULTILINE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + ok(!(ret & ECO_AUTOVSCROLL), "ECO_AUTOVSCROLL is set.\n"); + ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); + ret = GetWindowLong(hwnd, GWL_STYLE); + ok(!(ret & ES_AUTOVSCROLL), "ES_AUTOVSCROLL is set.\n"); + ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); + DestroyWindow(hwnd); } @@ -6255,7 +6281,7 @@ START_TEST( editor ) test_EM_CHARFROMPOS(); test_SETPARAFORMAT(); test_word_wrap(); - test_auto_yscroll(); + test_autoscroll(); test_format_rect(); test_WM_GETDLGCODE(); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 09bdc2e..5a3530d 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -889,6 +889,37 @@ static void test_word_wrap(void) DestroyWindow(hwnd); } +static void test_autoscroll(void) +{ + HWND hwnd; + UINT ret; + + /* The WS_VSCROLL and WS_HSCROLL styles implicitly set + * auto vertical/horizontal scrolling options. */ + hwnd = CreateWindowEx(0, RICHEDIT_CLASS10A, NULL, + WS_POPUP|ES_MULTILINE|WS_VSCROLL|WS_HSCROLL, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + todo_wine ok(ret & ECO_AUTOVSCROLL, "ECO_AUTOVSCROLL isn't set.\n"); + ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); + ret = GetWindowLong(hwnd, GWL_STYLE); + todo_wine ok(ret & ES_AUTOVSCROLL, "ES_AUTOVSCROLL isn't set.\n"); + ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); + DestroyWindow(hwnd); + + hwnd = CreateWindowEx(0, RICHEDIT_CLASS, NULL, + WS_POPUP|ES_MULTILINE, + 0, 0, 200, 60, NULL, NULL, hmoduleRichEdit, NULL); + ok(hwnd != NULL, "class: %s, error: %d\n", RICHEDIT_CLASS, (int) GetLastError()); + ret = SendMessage(hwnd, EM_GETOPTIONS, 0, 0); + ok(!(ret & ECO_AUTOVSCROLL), "ECO_AUTOVSCROLL is set.\n"); + ok(!(ret & ECO_AUTOHSCROLL), "ECO_AUTOHSCROLL is set.\n"); + ret = GetWindowLong(hwnd, GWL_STYLE); + ok(!(ret & ES_AUTOVSCROLL), "ES_AUTOVSCROLL is set.\n"); + ok(!(ret & ES_AUTOHSCROLL), "ES_AUTOHSCROLL is set.\n"); + DestroyWindow(hwnd); +} START_TEST( editor ) { @@ -911,6 +942,7 @@ START_TEST( editor ) test_EM_FINDTEXT(); test_EM_POSFROMCHAR(); test_word_wrap(); + test_autoscroll(); /* Set the environment variable WINETEST_RICHED32 to keep windows * responsive and open for 30 seconds. This is useful for debugging.

1 0