May 2006 - Wine-commits - list.winehq.org

Gerald Pfeifer : gphoto2.ds: Fix a typo in a #warning, and slight rewording . Fix grammaro in comment.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 3394472da810b98e2f3858656fb480e016fd8513 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3394472da810b98e2f38586… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun May 14 11:38:52 2006 +0200 gphoto2.ds: Fix a typo in a #warning, and slight rewording. Fix grammaro in comment. --- dlls/gphoto2.ds/gphoto2_i.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 6851833..ef1f34c 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -25,12 +25,12 @@ # error You must include config.h first #endif #if !defined(HAVE_JPEGLIB_H) -# warning "ghoto2 in twain needs jpeg development headers" +# warning "gphoto2 support in twain needs jpeg development headers" # undef HAVE_GPHOTO2 #endif #ifdef HAVE_GPHOTO2 -/* Hack for gphoto2, who changes behaviour when WIN32 is set. */ +/* Hack for gphoto2, which changes behaviour when WIN32 is set. */ #undef WIN32 #include <gphoto2/gphoto2-camera.h> #define WIN32

1 0

Hans Leidekker : dnsapi: Add tests for DnsValidateName_A.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 6e3223eb38a865f51ee34687046d5af0cfd256d3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6e3223eb38a865f51ee3468… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sat May 13 20:26:36 2006 +0200 dnsapi: Add tests for DnsValidateName_A. --- dlls/dnsapi/tests/name.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 127 insertions(+), 0 deletions(-) diff --git a/dlls/dnsapi/tests/name.c b/dlls/dnsapi/tests/name.c index 54fabd3..584f776 100644 --- a/dlls/dnsapi/tests/name.c +++ b/dlls/dnsapi/tests/name.c @@ -30,6 +30,7 @@ #include "wine/test.h" static HMODULE dnsapi; static BOOL (WINAPI *pDnsNameCompare_A)(LPSTR,LPSTR); +static DNS_STATUS (WINAPI *pDnsValidateName_A)(LPCSTR,DNS_NAME_FORMAT); #define GETFUNCPTR(func) p##func = (void *)GetProcAddress( dnsapi, #func ); \ if (!p##func) return FALSE; @@ -37,9 +38,134 @@ #define GETFUNCPTR(func) p##func = (void static BOOL init_function_ptrs( void ) { GETFUNCPTR( DnsNameCompare_A ) + GETFUNCPTR( DnsValidateName_A ) return TRUE; } +static const struct +{ + LPSTR name; + DNS_NAME_FORMAT format; + DNS_STATUS status; +} +test_data[] = +{ + { "", DnsNameDomain, ERROR_INVALID_NAME }, + { ".", DnsNameDomain, ERROR_SUCCESS }, + { "..", DnsNameDomain, ERROR_INVALID_NAME }, + { ".a", DnsNameDomain, ERROR_INVALID_NAME }, + { "a.", DnsNameDomain, ERROR_SUCCESS }, + { "a..", DnsNameDomain, ERROR_INVALID_NAME }, + { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", DnsNameDomain, ERROR_INVALID_NAME }, + { "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", DnsNameDomain, ERROR_INVALID_NAME }, + { "a.?", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, + { "a.*", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, + { "a ", DnsNameDomain, DNS_ERROR_INVALID_NAME_CHAR }, + { "a._b", DnsNameDomain, DNS_ERROR_NON_RFC_NAME }, + { "123", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, + { "123.456", DnsNameDomain, DNS_ERROR_NUMERIC_NAME }, + { "a.b", DnsNameDomain, ERROR_SUCCESS }, + + { "", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { ".", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "..", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { ".c", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "c.", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "c..", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "?", DnsNameDomainLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "*", DnsNameDomainLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "c ", DnsNameDomainLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "_c", DnsNameDomainLabel, DNS_ERROR_NON_RFC_NAME }, + { "456", DnsNameDomainLabel, ERROR_SUCCESS }, + { "456.789", DnsNameDomainLabel, ERROR_INVALID_NAME }, + { "c.d", DnsNameDomainLabel, ERROR_INVALID_NAME }, + + { "", DnsNameHostnameFull, ERROR_INVALID_NAME }, + { ".", DnsNameHostnameFull, ERROR_SUCCESS }, + { "..", DnsNameHostnameFull, ERROR_INVALID_NAME }, + { ".e", DnsNameHostnameFull, ERROR_INVALID_NAME }, + { "e.", DnsNameHostnameFull, ERROR_SUCCESS }, + { "e..", DnsNameHostnameFull, ERROR_INVALID_NAME }, + { "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", DnsNameDomain, ERROR_INVALID_NAME }, + { "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee.eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee.eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee.eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee", DnsNameHostnameFull, ERROR_INVALID_NAME }, + { "?", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "e.?", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, + { "e.*", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, + { "e ", DnsNameHostnameFull, DNS_ERROR_INVALID_NAME_CHAR }, + { "e._f", DnsNameHostnameFull, DNS_ERROR_NON_RFC_NAME }, + { "789", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, + { "789.456", DnsNameHostnameFull, DNS_ERROR_NUMERIC_NAME }, + { "e.f", DnsNameHostnameFull, ERROR_SUCCESS }, + + { "", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { ".", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "..", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { ".g", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "g.", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "g..", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "gggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggg", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "*", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "g ", DnsNameHostnameLabel, DNS_ERROR_INVALID_NAME_CHAR }, + { "_g", DnsNameHostnameLabel, DNS_ERROR_NON_RFC_NAME }, + { "123", DnsNameHostnameLabel, DNS_ERROR_NUMERIC_NAME }, + { "123.456", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + { "g.h", DnsNameHostnameLabel, ERROR_INVALID_NAME }, + + { "", DnsNameWildcard, ERROR_INVALID_NAME }, + { ".", DnsNameWildcard, ERROR_INVALID_NAME }, + { "..", DnsNameWildcard, ERROR_INVALID_NAME }, + { ".j", DnsNameWildcard, ERROR_INVALID_NAME }, + { "j.", DnsNameWildcard, ERROR_INVALID_NAME }, + { "j..", DnsNameWildcard, ERROR_INVALID_NAME }, + { "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj", DnsNameWildcard, ERROR_INVALID_NAME }, + { "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj.jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj.jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj.jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj", DnsNameWildcard, ERROR_INVALID_NAME }, + { "?", DnsNameWildcard, ERROR_INVALID_NAME }, + { "i ", DnsNameWildcard, ERROR_INVALID_NAME }, + { "_i", DnsNameWildcard, ERROR_INVALID_NAME }, + { "123", DnsNameWildcard, ERROR_INVALID_NAME }, + { "123.456", DnsNameWildcard, ERROR_INVALID_NAME }, + { "i.j", DnsNameWildcard, ERROR_INVALID_NAME }, + { "*", DnsNameWildcard, ERROR_SUCCESS }, + { "*j", DnsNameWildcard, DNS_ERROR_INVALID_NAME_CHAR }, + { "*.j", DnsNameWildcard, ERROR_SUCCESS }, + { "i.*", DnsNameWildcard, ERROR_INVALID_NAME }, + + { "", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { ".", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "..", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { ".k", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "k.", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "k..", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk.kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk.kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk.kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "?", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "k ", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "_k", DnsNameSrvRecord, ERROR_SUCCESS }, + { "123", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "123.456", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "k.l", DnsNameSrvRecord, ERROR_INVALID_NAME }, + { "_", DnsNameSrvRecord, DNS_ERROR_NON_RFC_NAME }, + { "_k.l", DnsNameSrvRecord, ERROR_SUCCESS }, + { "k._l", DnsNameSrvRecord, ERROR_INVALID_NAME } +}; + +static void test_DnsValidateName_A( void ) +{ + unsigned int i; + DNS_STATUS status; + + status = pDnsValidateName_A( NULL, DnsNameDomain ); + ok( status == ERROR_INVALID_NAME, "succeeded unexpectedly\n" ); + + for (i = 0; i < sizeof(test_data) / sizeof(test_data[0]); i++) + { + status = pDnsValidateName_A( test_data[i].name, test_data[i].format ); + ok( status == test_data[i].status, "%d: \'%s\': got %ld, expected %ld\n", + i, test_data[i].name, status, test_data[i].status ); + } +} + static void test_DnsNameCompare_A( void ) { ok( pDnsNameCompare_A( NULL, NULL ) == TRUE, "failed unexpectedly\n" ); @@ -84,6 +210,7 @@ START_TEST(name) return; } + test_DnsValidateName_A(); test_DnsNameCompare_A(); FreeLibrary( dnsapi );

1 0

Jacek Caban : widl: Added RPC_FC_ENUM16 encoding.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: dce3f2be057eaf7d3cecbcdb023a5446d6fd2ec4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dce3f2be057eaf7d3cecbcd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 13 18:08:32 2006 +0200 widl: Added RPC_FC_ENUM16 encoding. --- tools/widl/write_msft.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index a3a7cb7..fcb5f9c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -666,6 +666,8 @@ static int alloc_importfile( static void add_structure_typeinfo(msft_typelib_t *typelib, type_t *structure); static void add_interface_typeinfo(msft_typelib_t *typelib, type_t *interface); +static void add_enum_typeinfo(msft_typelib_t *typelib, type_t *enumeration); + /**************************************************************************** * encode_type @@ -894,6 +896,9 @@ #endif case RPC_FC_IP: add_interface_typeinfo(typelib, type); break; + case RPC_FC_ENUM16: + add_enum_typeinfo(typelib, type); + break; case 0: error("encode_type: VT_USERDEFINED - can't yet add typedef's on the fly\n"); default:

1 0

Jacek Caban : widl: res50 is number of impinfos. Fix its usage.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 4812abc2475f67f4cfbbdda4c6c56bfaef57adb0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4812abc2475f67f4cfbbdda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 13 18:07:38 2006 +0200 widl: res50 is number of impinfos. Fix its usage. --- tools/widl/typelib_struct.h | 2 +- tools/widl/write_msft.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/widl/typelib_struct.h b/tools/widl/typelib_struct.h index 83a326b..961105c 100644 --- a/tools/widl/typelib_struct.h +++ b/tools/widl/typelib_struct.h @@ -76,7 +76,7 @@ typedef struct tagMSFT_Header { INT res44; /* unknown always: 0x20 (guid hash size?) */ INT res48; /* unknown always: 0x80 (name hash size?) */ INT dispatchpos; /* HREFTYPE to IDispatch, or -1 if no IDispatch */ -/*0x50*/INT res50; /* is zero becomes one when an interface is derived */ +/*0x50*/INT nimpinfos; /* number of impinfos */ } MSFT_Header; /* segments in the type lib file have a structure like this: */ diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index d051aa5..a3a7cb7 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -156,7 +156,7 @@ static void ctl2_init_header( typelib->typelib_header.res44 = 0x20; typelib->typelib_header.res48 = 0x80; typelib->typelib_header.dispatchpos = -1; - typelib->typelib_header.res50 = 0; + typelib->typelib_header.nimpinfos = 0; } /**************************************************************************** @@ -608,6 +608,8 @@ static int alloc_importinfo( } } + impinfo->flags |= typelib->typelib_header.nimpinfos++; + offset = ctl2_alloc_segment(typelib, MSFT_SEG_IMPORTINFO, sizeof(MSFT_ImpInfo), 0); if (offset == -1) return -1; @@ -1801,9 +1803,6 @@ static void add_dispatch(msft_typelib_t impinfo.oImpFile = impfile_offset; impinfo.oGuid = ctl2_alloc_guid(typelib, &guidentry); typelib->typelib_header.dispatchpos = alloc_importinfo(typelib, &impinfo) | 0x01; - - typelib->typelib_header.res50 = 1; - } static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface)

1 0

Jacek Caban : oleaut32: res50 is number of impinfos. Fix its usage.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: e8f4fff3eacc6c61a2bd99148ed3c57a5387d816 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e8f4fff3eacc6c61a2bd991… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 13 18:06:45 2006 +0200 oleaut32: res50 is number of impinfos. Fix its usage. --- dlls/oleaut32/typelib.h | 2 +- dlls/oleaut32/typelib2.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.h b/dlls/oleaut32/typelib.h index c286fae..f82ca12 100644 --- a/dlls/oleaut32/typelib.h +++ b/dlls/oleaut32/typelib.h @@ -79,7 +79,7 @@ typedef struct tagMSFT_Header { INT res44; /* unknown always: 0x20 (guid hash size?) */ INT res48; /* unknown always: 0x80 (name hash size?) */ INT dispatchpos; /* HREFTYPE to IDispatch, or -1 if no IDispatch */ -/*0x50*/INT res50; /* is zero becomes one when an interface is derived */ +/*0x50*/INT nimpinfos; /* number of impinfos */ } MSFT_Header; /* segments in the type lib file have a structure like this: */ diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 7b4c670..ecebdc3 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -232,7 +232,7 @@ static void ctl2_init_header( This->typelib_header.res44 = 0x20; This->typelib_header.res48 = 0x80; This->typelib_header.dispatchpos = -1; - This->typelib_header.res50 = 0; + This->typelib_header.nimpinfos = 0; } /**************************************************************************** @@ -677,6 +677,8 @@ static int ctl2_alloc_importinfo( } } + impinfo->flags |= This->typelib_header.nimpinfos++; + offset = ctl2_alloc_segment(This, MSFT_SEG_IMPORTINFO, sizeof(MSFT_ImpInfo), 0); if (offset == -1) return -1; @@ -1252,7 +1254,6 @@ static HRESULT WINAPI ICreateTypeInfo2_f ctl2_alloc_importinfo(This->typelib, &impinfo); This->typelib->typelib_header.dispatchpos = 1; - This->typelib->typelib_header.res50 = 1; This->typeinfo->typekind |= 0x10; This->typeinfo->typekind &= ~0x0f;

1 0

Jacek Caban : urlmon: Fix tests.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 735c43437683c36513c71a01b445ad5b1e444079 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=735c43437683c36513c71a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 12 18:54:54 2006 +0200 urlmon: Fix tests. --- dlls/urlmon/tests/protocol.c | 2 +- dlls/urlmon/tests/url.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 7f39012..a82a73e 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -118,7 +118,7 @@ static HRESULT WINAPI HttpNegotiate_Begi ok(!lstrcmpW(szURL, http_url), "szURL != http_url\n"); - ok(szHeaders == NULL, "szHeaders != NULL\n"); + ok(szHeaders != NULL, "szHeaders == NULL\n"); if(szHeaders) { static const WCHAR header[] = {'A','c','c','e','p','t','-','E','n','c','o','d','i','n','g',':', diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f97aad8..acf0f0a 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -753,7 +753,9 @@ START_TEST(url) trace("about test...\n"); test_protocol = ABOUT_TEST; + CoInitialize(NULL); test_BindToStorage(); + CoUninitialize(); trace("emulated about test...\n"); emulate_protocol = TRUE;

1 0

Jacek Caban : mshtml: Fix protocol tests on XP. Make Wine match XP implementation.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 8bb2513ee9f2457093b6ac3fff5866f3279e3274 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8bb2513ee9f2457093b6ac3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 12 18:49:27 2006 +0200 mshtml: Fix protocol tests on XP. Make Wine match XP implementation. --- dlls/mshtml/protocol.c | 20 +++++++++++--- dlls/mshtml/tests/protocol.c | 61 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 104b1c1..b99bef3 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -414,8 +414,14 @@ static HRESULT WINAPI AboutProtocolInfo_ } if(ParseAction == PARSE_DOMAIN) { - /* Tests show that we don't have to do anything here */ - return S_OK; + if(!pcchResult) + return E_POINTER; + + if(pwzUrl) + *pcchResult = strlenW(pwzUrl)+1; + else + *pcchResult = 1; + return E_FAIL; } return INET_E_DEFAULT_ACTION; @@ -810,8 +816,14 @@ static HRESULT WINAPI ResProtocolInfo_Pa } if(ParseAction == PARSE_DOMAIN) { - /* Tests show that we don't have to do anything here */ - return S_OK; + if(!pcchResult) + return E_POINTER; + + if(pwzUrl) + *pcchResult = strlenW(pwzUrl)+1; + else + *pcchResult = 1; + return E_FAIL; } return INET_E_DEFAULT_ACTION; diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 309c860..3f01207 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -290,21 +290,51 @@ static void test_res_protocol(void) sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08lx, expected MK_E_SYNTAX\n", hres); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); + ok(size == sizeof(blank_url)/sizeof(WCHAR), + "size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR)); + size = 0xdeadbeef; hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08lx, expected MK_E_SYNTAX\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); + ok(size == sizeof(wrong_url1)/sizeof(WCHAR), + "size=%ld, ezpected %d\n", size, sizeof(wrong_url1)/sizeof(WCHAR)); +#if 0 /* Crashes on win9x */ + size = 0xdeadbeef; + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); + ok(size == 1, "size=%ld, ezpected 1\n", size); + + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), NULL, 0); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); + + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), NULL, 0); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); +#endif + + buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == INET_E_DEFAULT_ACTION, "ParseUrl failed: %08lx, expected INET_E_DEFAULT_ACTION\n", hres); + ok(buf[0] == '?', "buf changed\n"); IInternetProtocolInfo_Release(protocol_info); } @@ -437,11 +467,36 @@ static void test_about_protocol(void) ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); ok(!lstrcmpW(test_url, buf), "buf != test_url\n"); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); - ok(hres == S_OK, "ParseUrl failed: %08lx\n", hres); + ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); + ok(size == sizeof(blank_url)/sizeof(WCHAR), + "size=%ld, expected %d\n", size, sizeof(blank_url)/sizeof(WCHAR)); + +#if 0 /* Crashes on win9x */ + size = 0xdeadbeef; + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == E_FAIL, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); + ok(size == 1, "size=%ld, ezpected 1\n", size); + + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), NULL, 0); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); + ok(buf[0] == '?', "buf changed\n"); + + buf[0] = '?'; + hres = IInternetProtocolInfo_ParseUrl(protocol_info, NULL, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(buf[0]), NULL, 0); + ok(hres == E_POINTER, "ParseUrl failed: %08lx\n", hres); ok(buf[0] == '?', "buf changed\n"); +#endif hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_UNESCAPE+1, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0);

1 0

Jacek Caban : shdocvw: Added support for navigation to application URLs.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: e02d36274bcc953daf447598280d90e2f23f7787 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e02d36274bcc953daf44759… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 12 18:50:27 2006 +0200 shdocvw: Added support for navigation to application URLs. --- dlls/shdocvw/navigate.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 865195f..5798ead 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -25,6 +25,8 @@ #include "wine/unicode.h" #include "shdocvw.h" #include "mshtml.h" #include "exdispid.h" +#include "shellapi.h" +#include "winreg.h" WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); @@ -378,6 +380,39 @@ static void on_before_navigate2(DocHost SafeArrayDestroy(V_ARRAY(&var_post_data)); } +static BOOL try_application_url(LPCWSTR url) +{ + SHELLEXECUTEINFOW exec_info; + WCHAR app[64]; + HKEY hkey; + DWORD res, type; + HRESULT hres; + + static const WCHAR wszURLProtocol[] = {'U','R','L',' ','P','r','o','t','o','c','o','l',0}; + + hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, app, sizeof(app)/sizeof(WCHAR), NULL, 0); + if(FAILED(hres)) + return FALSE; + + res = RegOpenKeyW(HKEY_CLASSES_ROOT, app, &hkey); + if(res != ERROR_SUCCESS) + return FALSE; + + res = RegQueryValueExW(hkey, wszURLProtocol, NULL, &type, NULL, NULL); + RegCloseKey(hkey); + if(res != ERROR_SUCCESS || type != REG_SZ) + return FALSE; + + TRACE("openning application %s\n", debugstr_w(app)); + + memset(&exec_info, 0, sizeof(exec_info)); + exec_info.cbSize = sizeof(exec_info); + exec_info.lpFile = url; + exec_info.nShow = SW_SHOW; + + return ShellExecuteExW(&exec_info); +} + static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { @@ -520,6 +555,10 @@ HRESULT navigate_hlink(DocHost *This, IM return S_OK; } + /* FIXME: We should do it after BindToObject call */ + if(try_application_url(url)) + return S_OK; + This->url = url; return navigate(This, mon, bindctx, callback);

1 0

Francois Gouget : gphoto2.ds: Spelling fix.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 9359fd2f9f65f77acf0e7b9f8f99607dcabf8632 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9359fd2f9f65f77acf0e7b9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 12 00:24:56 2006 +0200 gphoto2.ds: Spelling fix. --- dlls/gphoto2.ds/ds_ctrl.c | 4 ++-- dlls/gphoto2.ds/ds_image.c | 8 ++++---- dlls/gphoto2.ds/gphoto2_i.h | 2 +- dlls/gphoto2.ds/ui.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gphoto2.ds/ds_ctrl.c b/dlls/gphoto2.ds/ds_ctrl.c index 282ef1b..9a877cf 100644 --- a/dlls/gphoto2.ds/ds_ctrl.c +++ b/dlls/gphoto2.ds/ds_ctrl.c @@ -363,8 +363,8 @@ TW_UINT16 GPHOTO2_PendingXfersEndXfer (p activeDS.currentState = 5; /* Notify the application that it can close the data source */ activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; - /* close any Transfering dialog */ - TransferingDialogBox(activeDS.progressWnd,-1); + /* close any Transferring dialog */ + TransferringDialogBox(activeDS.progressWnd,-1); activeDS.progressWnd = 0; } activeDS.twCC = TWCC_SUCCESS; diff --git a/dlls/gphoto2.ds/ds_image.c b/dlls/gphoto2.ds/ds_image.c index aa506af..ce3ed7c 100644 --- a/dlls/gphoto2.ds/ds_image.c +++ b/dlls/gphoto2.ds/ds_image.c @@ -316,8 +316,8 @@ #ifdef HAVE_GPHOTO2 } if (!activeDS.progressWnd) - activeDS.progressWnd = TransferingDialogBox(NULL,0); - TransferingDialogBox(activeDS.progressWnd,0); + activeDS.progressWnd = TransferringDialogBox(NULL,0); + TransferringDialogBox(activeDS.progressWnd,0); activeDS.currentState = 7; } else { @@ -355,7 +355,7 @@ #ifdef HAVE_GPHOTO2 pImageMemXfer->Columns = activeDS.jd.output_width; /* we do whole strips */ pImageMemXfer->BytesWritten = curoff; - TransferingDialogBox(activeDS.progressWnd,0); + TransferringDialogBox(activeDS.progressWnd,0); if (activeDS.jd.output_scanline == activeDS.jd.output_height) { pjpeg_finish_decompress(&activeDS.jd); @@ -364,7 +364,7 @@ #ifdef HAVE_GPHOTO2 activeDS.file = NULL; TRACE("xfer is done!\n"); - /*TransferingDialogBox(activeDS.progressWnd, -1);*/ + /*TransferringDialogBox(activeDS.progressWnd, -1);*/ twRC = TWRC_XFERDONE; } activeDS.twCC = TWRC_SUCCESS; diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index 40f008b..6851833 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -247,7 +247,7 @@ TW_UINT16 GPHOTO2_RGBResponseSet /* UI function */ BOOL DoCameraUI(); -HWND TransferingDialogBox(HWND dialog, DWORD progress); +HWND TransferringDialogBox(HWND dialog, DWORD progress); #ifdef HAVE_GPHOTO2 /* Helper function for GUI */ diff --git a/dlls/gphoto2.ds/ui.c b/dlls/gphoto2.ds/ui.c index 527e98e..1a6476a 100644 --- a/dlls/gphoto2.ds/ui.c +++ b/dlls/gphoto2.ds/ui.c @@ -238,7 +238,7 @@ static INT_PTR CALLBACK ProgressProc(HWN return FALSE; } -HWND TransferingDialogBox(HWND dialog, DWORD progress) +HWND TransferringDialogBox(HWND dialog, DWORD progress) { if (!dialog) dialog = CreateDialogW(GPHOTO2_instance,

1 0

Stefan Leichter : ntdll: Fix endless loop in port test for users without admin rights.
by Alexandre Julliard 15 May '06

15 May '06

Module: wine Branch: refs/heads/master Commit: 5996ef7f8ec53661e8bc1a874e139e8a54dd4f30 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5996ef7f8ec53661e8bc1a8… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sat May 13 09:15:50 2006 +0200 ntdll: Fix endless loop in port test for users without admin rights. --- dlls/ntdll/tests/port.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 387efe1..495cf7d 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -259,9 +259,13 @@ static void test_ports_server(void) status = pNtReplyWaitReceivePort(PortHandle, NULL, NULL, LpcMessage); todo_wine { - ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld\n", status); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %ld(%lx)\n", status, status); } - if (status == STATUS_NOT_IMPLEMENTED) return; + /* STATUS_INVALID_HANDLE: win2k without admin rights will perform an + * endless loop here + */ + if ((status == STATUS_NOT_IMPLEMENTED) || + (status == STATUS_INVALID_HANDLE)) return; switch (LpcMessage->MessageType) {

1 0