February 2007 - Wine-commits

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: ce8ededf3b9d8d1529f51c1e96e1fc690e573d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8ededf3b9d8d1529f51c1e9… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:30:55 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index bd4064a..68c2e4f 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1550,8 +1550,6 @@ BOOL FTP_FtpRemoveDirectoryW(LPWININETFT TRACE("\n"); - assert (WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: e849f758baef32b08b99426698c21f00671a2044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e849f758baef32b08b9942669… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:30:51 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ae3b0dd..bd4064a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1422,8 +1422,6 @@ BOOL FTP_FtpDeleteFileW(LPWININETFTPSESS TRACE("%p\n", lpwfs); - assert (WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 00ff67ef09c04d7a46e91a63d8292141d460b85a URL: http://source.winehq.org/git/wine.git/?a=commit;h=00ff67ef09c04d7a46e91a63d… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:30:31 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 66f73eb..ae3b0dd 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1255,8 +1255,6 @@ BOOL WINAPI FTP_FtpGetFileW(LPWININETFTP TRACE("lpszRemoteFile(%s) lpszNewFile(%s)\n", debugstr_w(lpszRemoteFile), debugstr_w(lpszNewFile)); - assert (WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: a571476a7424f249bd3d1bae18e1226919c6566b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a571476a7424f249bd3d1bae1… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:30:21 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 0ab18c4..66f73eb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1062,8 +1062,6 @@ HINTERNET FTP_FtpOpenFileW(LPWININETFTPS TRACE("\n"); - assert (WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 7c7271d46538d0b8d9ff69abada0600026a2fa3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c7271d46538d0b8d9ff69aba… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:29:59 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7a4c57a..775bb88 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -701,8 +701,6 @@ HINTERNET WINAPI FTP_FtpFindFirstFileW(L TRACE("\n"); - assert(WH_HFTPSESSION == lpwfs->hdr.htype); - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 7a1ef2c1ef46affe1b3c65939e44ca2afa003b74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1ef2c1ef46affe1b3c65939… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:30:10 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 775bb88..0ab18c4 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -871,7 +871,7 @@ lend: /*********************************************************************** - * FTP_FtpGetCurrentDirectoryA (Internal) + * FTP_FtpGetCurrentDirectoryW (Internal) * * Retrieves the current directory * @@ -889,12 +889,6 @@ BOOL WINAPI FTP_FtpGetCurrentDirectoryW( TRACE("len(%d)\n", *lpdwCurrentDirectory); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 2831cf5d3e55e73eaa574bc2727f30be49e24dd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2831cf5d3e55e73eaa574bc27… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:29:51 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 2f84838..7a4c57a 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -556,12 +556,6 @@ BOOL WINAPI FTP_FtpCreateDirectoryW(LPWI TRACE("lpszDirectory(%s)\n", debugstr_w(lpszDirectory)); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Paul Vriens : wininet/ftp: Remove unneeded (double) checks.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 0e8ad3019a325637b682a376be70e29f00736463 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e8ad3019a325637b682a376b… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Feb 7 13:29:30 2007 +0100 wininet/ftp: Remove unneeded (double) checks. --- dlls/wininet/ftp.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index b26350f..2f84838 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -425,12 +425,6 @@ BOOL WINAPI FTP_FtpSetCurrentDirectoryW( TRACE("lpszDirectory(%s)\n", debugstr_w(lpszDirectory)); - if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype) - { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - return FALSE; - } - /* Clear any error information */ INTERNET_SetLastError(0);

1 0

Mike McCormack : msi: Add a test for the version method.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: 3ca5f8bbf99b311792cb1b6a4d706376c88b5b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ca5f8bbf99b311792cb1b6a4… Author: Mike McCormack <mike(a)codeweavers.com> Date: Wed Feb 7 20:21:11 2007 +0900 msi: Add a test for the version method. --- dlls/msi/tests/iface.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/msi/tests/iface.c b/dlls/msi/tests/iface.c index 9a0742b..8a18e34 100644 --- a/dlls/msi/tests/iface.c +++ b/dlls/msi/tests/iface.c @@ -170,32 +170,47 @@ static void test_msi_invoke(void) r = IDispatch_Invoke( installer, dispid, &IID_NULL, 0, DISPATCH_METHOD, &param, &result, NULL, NULL); todo_wine ok( r == S_OK, "dispatch failed %08x\n", r); - if (FAILED(r)) + if (SUCCEEDED(r)) { - skip( "failed to create record\n"); - return; - } + ok( V_VT(&result) == VT_DISPATCH, "type wrong\n"); + + record = V_DISPATCH(&result); - ok( V_VT(&result) == VT_DISPATCH, "type wrong\n"); + memset( &result, 0, sizeof result ); + dispid = get_dispid( record, "FieldCount" ); - record = V_DISPATCH(&result); + param.cArgs = 0; + param.cNamedArgs = 0; + param.rgvarg = &varg; + param.rgdispidNamedArgs = &arg; + + r = IDispatch_Invoke( record, dispid, &IID_NULL, 0, + DISPATCH_PROPERTYGET, &param, &result, NULL, NULL ); + ok( r == S_OK, "dispatch failed %08x\n", r); + + ok( V_VT(&result) == VT_I4, "type wrong\n"); + ok( V_I4(&result) == 1, "field count wrong\n"); + + IDispatch_Release( record ); + } + else + skip( "failed to create record\n"); memset( &result, 0, sizeof result ); - dispid = get_dispid( record, "FieldCount" ); + dispid = get_dispid( installer, "Version" ); param.cArgs = 0; param.cNamedArgs = 0; param.rgvarg = &varg; param.rgdispidNamedArgs = &arg; - r = IDispatch_Invoke( record, dispid, &IID_NULL, 0, + r = IDispatch_Invoke( installer, dispid, &IID_NULL, 0, DISPATCH_PROPERTYGET, &param, &result, NULL, NULL ); + todo_wine { ok( r == S_OK, "dispatch failed %08x\n", r); + ok( V_VT(&result) == VT_BSTR, "type wrong %d\n", V_VT(&result)); + } - ok( V_VT(&result) == VT_I4, "type wrong\n"); - ok( V_I4(&result) == 1, "field count wrong\n"); - - IDispatch_Release( record ); IDispatch_Release( installer ); }

1 0

Michael Stefaniuc : browseui: Move 'static' to the beginning of the declaration specifier.
by Alexandre Julliard 07 Feb '07

07 Feb '07

Module: wine Branch: master Commit: b6bf3d9c1df8bd5e45393faedf1e15e624cdf832 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6bf3d9c1df8bd5e45393faed… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Feb 7 13:46:14 2007 +0100 browseui: Move 'static' to the beginning of the declaration specifier. --- dlls/browseui/aclmulti.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 380d71b..3fb49b8 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -58,9 +58,9 @@ typedef struct tagACLMulti { struct ACLMultiSublist *objs; } ACLMulti; -const static IEnumStringVtbl ACLMultiVtbl; -const static IACListVtbl ACLMulti_ACListVtbl; -const static IObjMgrVtbl ACLMulti_ObjMgrVtbl; +static const IEnumStringVtbl ACLMultiVtbl; +static const IACListVtbl ACLMulti_ACListVtbl; +static const IObjMgrVtbl ACLMulti_ObjMgrVtbl; static inline ACLMulti *impl_from_IACList(IACList *iface) {

1 0