April 2007 - Wine-Commits - list.winehq.org

Stefan Leichter : advapi32: More tests for RegDeleteTreeA.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 2c99d4b2a7c282a63bf023b0cdf14ae842ec6124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c99d4b2a7c282a63bf023b0c… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Apr 22 22:28:20 2007 +0200 advapi32: More tests for RegDeleteTreeA. --- dlls/advapi32/tests/registry.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index cf581d7..9d73633 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -1151,15 +1151,33 @@ static void test_reg_delete_tree(void) ok(!RegQueryValueA(subkey, NULL, buffer, &size), "Default value of subkey not longer present\n"); + ret = RegCreateKeyA(subkey, "subkey2", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCreateKeyA(subkey, "subkey3", &subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegCloseKey(subkey2); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); + ret = RegSetValueA(subkey, "value", REG_SZ, "data2", 5); + ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ret = pRegDeleteTreeA(subkey, NULL); ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret); ok(!RegOpenKeyA(hkey_main, "subkey", &subkey), "subkey was deleted\n"); + ok(RegOpenKeyA(subkey, "subkey2", &subkey2), + "subkey2 was not deleted\n"); + ok(RegOpenKeyA(subkey, "subkey3", &subkey2), + "subkey3 was not deleted\n"); + size = MAX_PATH; ret = RegQueryValueA(subkey, NULL, buffer, &size); ok(ret == ERROR_SUCCESS, "Default value of subkey is not present\n"); ok(!lstrlenA(buffer), "Expected length 0 got length %u(%s)\n", lstrlenA(buffer), buffer); + size = MAX_PATH; + ok(RegQueryValueA(subkey, "value", buffer, &size), + "Value is still present\n"); ret = pRegDeleteTreeA(hkey_main, "not-here"); ok(ret == ERROR_FILE_NOT_FOUND,

1 0

Andrew Talbot : activeds: Exclude unused headers.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 3660ed87b515d14618d4c62bdb7eaa0f3bba78c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3660ed87b515d14618d4c62bd… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:44:50 2007 +0100 activeds: Exclude unused headers. --- dlls/activeds/activeds_main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/activeds/activeds_main.c b/dlls/activeds/activeds_main.c index ba829d1..9c03ac1 100644 --- a/dlls/activeds/activeds_main.c +++ b/dlls/activeds/activeds_main.c @@ -29,9 +29,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "objbase.h" #include "iads.h"

1 0

Andrew Talbot : acledit: Exclude unused headers.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: cc90c9afd36745fa71849278bb4daa65c1fbd8c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc90c9afd36745fa71849278b… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:43:48 2007 +0100 acledit: Exclude unused headers. --- dlls/acledit/main.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/acledit/main.c b/dlls/acledit/main.c index ca6836a..7dd374c 100644 --- a/dlls/acledit/main.c +++ b/dlls/acledit/main.c @@ -23,9 +23,6 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" -#include "winreg.h" -#include "winver.h" -#include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

Ben Taylor : configure: Fix to properly recognize functions on Solaris.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 41c599646fb9750abfd3794bd47ae45be8be1731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c599646fb9750abfd3794bd… Author: Ben Taylor <sol11x86(a)comcast.net> Date: Mon Apr 23 13:41:42 2007 +0000 configure: Fix to properly recognize functions on Solaris. --- configure | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++------- configure.ac | 20 +++++---- 2 files changed, 123 insertions(+), 24 deletions(-) diff --git a/configure b/configure index e0790fc..435de9c 100755 --- a/configure +++ b/configure @@ -15755,14 +15755,6 @@ fi - - - - - - - - for ac_func in \ _pclose \ _popen \ @@ -15786,22 +15778,15 @@ for ac_func in \ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -15816,7 +15801,6 @@ for ac_func in \ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -16398,6 +16382,117 @@ fi fi + + + + + + + +for ac_func in \ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ + +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+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. */ +/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. + For example, HP-UX 11i <limits.h> declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer <limits.h> to <assert.h> if __STDC__ is defined, since + <limits.h> exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include <limits.h> +#else +# include <assert.h> +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + 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 "echo \"\$as_me:$LINENO: $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 + 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 && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + + { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; } if test "${ac_cv_c_const+set}" = set; then diff --git a/configure.ac b/configure.ac index 6fd21b4..7757427 100644 --- a/configure.ac +++ b/configure.ac @@ -1165,22 +1165,15 @@ AC_CHECK_FUNCS(\ ftruncate \ futimes \ futimesat \ - getaddrinfo \ getdirentries \ gethostbyname \ - getnameinfo \ - getnetbyname \ getopt_long \ getpagesize \ - getprotobyname \ - getprotobynumber \ getpwuid \ - getservbyport \ gettid \ gettimeofday \ getuid \ inet_aton \ - inet_network \ kqueue \ lstat \ memmove \ @@ -1195,7 +1188,6 @@ AC_CHECK_FUNCS(\ rfork \ sched_yield \ select \ - sendmsg \ setrlimit \ settimeofday \ sigaltstack \ @@ -1247,6 +1239,18 @@ then AC_CHECK_LIB(resolv,inet_aton) fi +dnl **** Check for functions which may rely on -lsocket on Solaris. +AC_CHECK_FUNCS(\ + getaddrinfo \ + getnameinfo \ + getnetbyname \ + getprotobyname \ + getprotobynumber \ + getservbyport \ + inet_network \ + sendmsg \ +) + dnl **** Check for types **** AC_C_CONST

1 0

Andrew Talbot : avicap32: Exclude unused header.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 80bf297ad71feb9c10d10f0bfb8f84c330e54a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80bf297ad71feb9c10d10f0bf… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:53:17 2007 +0100 avicap32: Exclude unused header. --- dlls/avicap32/avicap32_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c index 41d790e..4fc6727 100644 --- a/dlls/avicap32/avicap32_main.c +++ b/dlls/avicap32/avicap32_main.c @@ -50,7 +50,6 @@ #include "wingdi.h" #include "winuser.h" #include "vfw.h" -#include "winreg.h" #include "winnls.h" #include "winternl.h" #include "wine/debug.h"

1 0

Andrew Talbot : advpack: Exclude unused headers.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 924e1d4bc3da6b77cf695b2a1106b5d72ab3a35b URL: http://source.winehq.org/git/wine.git/?a=commit;h=924e1d4bc3da6b77cf695b2a1… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Sat Apr 21 21:52:03 2007 +0100 advpack: Exclude unused headers. --- dlls/advpack/advpack.c | 1 - dlls/advpack/install.c | 1 - dlls/advpack/reg.c | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 45db5b1..ee3a87e 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" #include "winternl.h" #include "winnls.h" #include "setupapi.h" diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index e2e55ea..b7e997c 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -25,7 +25,6 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" -#include "winver.h" #include "winternl.h" #include "winnls.h" #include "setupapi.h" diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index f456f2c..2b1418a 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -25,7 +25,6 @@ #include "winerror.h" #include "winuser.h" #include "winternl.h" -#include "setupapi.h" #include "advpub.h" #include "wine/unicode.h" #include "wine/debug.h"

1 0

James Hawkins : msi: Abstract MSI_RecordSetStream.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 7d3162e6bed476c937a8d2f3d1b44c8076959e61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3162e6bed476c937a8d2f3d… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 21 06:56:20 2007 -0500 msi: Abstract MSI_RecordSetStream. --- dlls/msi/msipriv.h | 3 +-- dlls/msi/record.c | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2a9217c..b160443 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -592,8 +592,7 @@ extern UINT MSI_RecordGetStringA( MSIRECORD *, unsigned int, LPSTR, DWORD *); extern int MSI_RecordGetInteger( MSIRECORD *, unsigned int ); extern UINT MSI_RecordReadStream( MSIRECORD *, unsigned int, char *, DWORD *); extern unsigned int MSI_RecordGetFieldCount( MSIRECORD *rec ); -extern UINT MSI_RecordSetStreamW( MSIRECORD *, unsigned int, LPCWSTR ); -extern UINT MSI_RecordSetStreamA( MSIRECORD *, unsigned int, LPCSTR ); +extern UINT MSI_RecordSetStream( MSIRECORD *, unsigned int, IStream * ); extern UINT MSI_RecordDataSize( MSIRECORD *, unsigned int ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, unsigned int, LPCWSTR ); extern UINT MSI_RecordCopyField( MSIRECORD *, unsigned int, MSIRECORD *, unsigned int ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index bf01b20..fed7bf4 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -649,7 +649,19 @@ static UINT RECORD_StreamFromFile(LPCWSTR szFile, IStream **pstm) return ERROR_SUCCESS; } -UINT MSI_RecordSetStreamW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilename) +UINT MSI_RecordSetStream(MSIRECORD *rec, unsigned int iField, IStream *stream) +{ + if ( (iField == 0) || (iField > rec->count) ) + return ERROR_INVALID_PARAMETER; + + MSI_FreeField( &rec->fields[iField] ); + rec->fields[iField].type = MSIFIELD_STREAM; + rec->fields[iField].u.stream = stream; + + return ERROR_SUCCESS; +} + +UINT MSI_RecordSetStreamFromFileW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilename) { IStream *stm = NULL; HRESULT r; @@ -683,9 +695,7 @@ UINT MSI_RecordSetStreamW(MSIRECORD *rec, unsigned int iField, LPCWSTR szFilenam return r; /* if all's good, store it in the record */ - MSI_FreeField( &rec->fields[iField] ); - rec->fields[iField].type = MSIFIELD_STREAM; - rec->fields[iField].u.stream = stm; + MSI_RecordSetStream(rec, iField, stm); } return ERROR_SUCCESS; @@ -722,7 +732,7 @@ UINT WINAPI MsiRecordSetStreamW(MSIHANDLE handle, unsigned int iField, LPCWSTR s return ERROR_INVALID_HANDLE; msiobj_lock( &rec->hdr ); - ret = MSI_RecordSetStreamW( rec, iField, szFilename ); + ret = MSI_RecordSetStreamFromFileW( rec, iField, szFilename ); msiobj_unlock( &rec->hdr ); msiobj_release( &rec->hdr ); return ret;

1 0

Yuval Fledel : rsaenh: Convert handle type from unsigned int to HCRYPTKEY.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 1cdc057091527c99eea3607bca564efd21841d91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cdc057091527c99eea3607bc… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Sat Apr 21 22:48:57 2007 +0300 rsaenh: Convert handle type from unsigned int to HCRYPTKEY. --- dlls/rsaenh/handle.c | 30 +++++++++++----------- dlls/rsaenh/handle.h | 12 +++++---- dlls/rsaenh/rsaenh.c | 66 +++++++++++++++++++++++++------------------------- 3 files changed, 55 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1cdc057091527c99eea36…

1 0

Yuval Fledel : include: Introduce ntsecpkg.h.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 4d7d6e96a0a2b52ce185d90679661ffb3582f648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d7d6e96a0a2b52ce185d9067… Author: Yuval Fledel <yuvalfl(a)gmail.com> Date: Sat Apr 21 13:24:44 2007 +0300 include: Introduce ntsecpkg.h. --- include/Makefile.in | 1 + include/ntsecpkg.h | 424 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 425 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d7d6e96a0a2b52ce185d…

1 0

James Hawkins : msi: Add an internal MSI_ViewModify.
by Alexandre Julliard April 23, 2007

April 23, 2007

Module: wine Branch: master Commit: 2b4bf44b793fa1dcf102289b2c789a3284669f07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b4bf44b793fa1dcf102289b2… Author: James Hawkins <truiken(a)gmail.com> Date: Sat Apr 21 06:55:24 2007 -0500 msi: Add an internal MSI_ViewModify. --- dlls/msi/msipriv.h | 1 + dlls/msi/msiquery.c | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9a0918a..2a9217c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -619,6 +619,7 @@ extern UINT MSI_ViewExecute( MSIQUERY*, MSIRECORD * ); extern UINT MSI_ViewFetch( MSIQUERY*, MSIRECORD ** ); extern UINT MSI_ViewClose( MSIQUERY* ); extern UINT MSI_ViewGetColumnInfo(MSIQUERY *, MSICOLINFO, MSIRECORD **); +extern UINT MSI_ViewModify( MSIQUERY *, MSIMODIFY, MSIRECORD * ); extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, UINT * ); diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index f91a123..abec8d8 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -552,10 +552,23 @@ UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE hView, MSICOLINFO info, MSIHANDLE *hR return r; } +UINT MSI_ViewModify( MSIQUERY *query, MSIMODIFY mode, MSIRECORD *rec ) +{ + MSIVIEW *view = NULL; + + if ( !query || !rec ) + return ERROR_INVALID_HANDLE; + + view = query->view; + if ( !view || !view->ops->modify) + return ERROR_FUNCTION_FAILED; + + return view->ops->modify( view, mode, rec ); +} + UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, MSIHANDLE hRecord) { - MSIVIEW *view = NULL; MSIQUERY *query = NULL; MSIRECORD *rec = NULL; UINT r = ERROR_FUNCTION_FAILED; @@ -566,23 +579,9 @@ UINT WINAPI MsiViewModify( MSIHANDLE hView, MSIMODIFY eModifyMode, if( !query ) return ERROR_INVALID_HANDLE; - view = query->view; - if( !view ) - goto out; - - if( !view->ops->modify ) - goto out; - rec = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); - if( !rec ) - { - r = ERROR_INVALID_HANDLE; - goto out; - } + r = MSI_ViewModify( query, eModifyMode, rec ); - r = view->ops->modify( view, eModifyMode, rec ); - -out: msiobj_release( &query->hdr ); if( rec ) msiobj_release( &rec->hdr );

1 0