December 2009 - Wine-commits

Hans Leidekker : msi: Clone the open stream instead of trying to open a stream again.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: ef522c5ef0aeb2563885ad0a70ffe3fa3f1489f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef522c5ef0aeb2563885ad0a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 16 11:11:19 2009 +0100 msi: Clone the open stream instead of trying to open a stream again. --- dlls/msi/database.c | 1 + dlls/msi/msipriv.h | 1 + dlls/msi/table.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 99 insertions(+), 1 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index 6ce516a..b485b21 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -198,6 +198,7 @@ UINT MSI_OpenDatabaseW(LPCWSTR szDBPath, LPCWSTR szPersist, MSIDATABASE **pdb) db->deletefile = strdupW( szDBPath ); list_init( &db->tables ); list_init( &db->transforms ); + list_init( &db->streams ); db->strings = msi_load_string_table( stg, &db->bytes_per_strref ); if( !db->strings ) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 0e1a23b..2f8a38c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -80,6 +80,7 @@ typedef struct tagMSIDATABASE LPCWSTR mode; struct list tables; struct list transforms; + struct list streams; } MSIDATABASE; typedef struct tagMSIVIEW MSIVIEW; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index fc36079..392fcc8 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -88,6 +88,11 @@ typedef struct tagMSITRANSFORM { IStorage *stg; } MSITRANSFORM; +typedef struct tagMSISTREAM { + struct list entry; + IStream *stm; +} MSISTREAM; + static const WCHAR szStringData[] = { '_','S','t','r','i','n','g','D','a','t','a',0 }; static const WCHAR szStringPool[] = { @@ -332,6 +337,66 @@ end: return ret; } +static UINT find_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) +{ + MSISTREAM *stream; + + LIST_FOR_EACH_ENTRY( stream, &db->streams, MSISTREAM, entry ) + { + HRESULT r; + STATSTG stat; + + r = IStream_Stat( stream->stm, &stat, 0 ); + if( FAILED( r ) ) + { + WARN("failed to stat stream r = %08x!\n", r); + continue; + } + + if( !lstrcmpW( name, stat.pwcsName ) ) + { + TRACE("found %s\n", debugstr_w(name)); + *stm = stream->stm; + CoTaskMemFree( stat.pwcsName ); + return ERROR_SUCCESS; + } + + CoTaskMemFree( stat.pwcsName ); + } + + return ERROR_FUNCTION_FAILED; +} + +static UINT clone_open_stream( MSIDATABASE *db, LPCWSTR name, IStream **stm ) +{ + IStream *stream; + + if (find_open_stream( db, name, &stream ) == ERROR_SUCCESS) + { + HRESULT r; + LARGE_INTEGER pos; + + r = IStream_Clone( stream, stm ); + if( FAILED( r ) ) + { + WARN("failed to clone stream r = %08x!\n", r); + return ERROR_FUNCTION_FAILED; + } + + pos.QuadPart = 0; + r = IStream_Seek( *stm, pos, STREAM_SEEK_SET, NULL ); + if( FAILED( r ) ) + { + IStream_Release( *stm ); + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + + return ERROR_FUNCTION_FAILED; +} + static UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) { LPWSTR encname; @@ -341,6 +406,12 @@ static UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) TRACE("%s -> %s\n",debugstr_w(stname),debugstr_w(encname)); + if (clone_open_stream( db, encname, stm ) == ERROR_SUCCESS) + { + msi_free( encname ); + return ERROR_SUCCESS; + } + r = IStorage_OpenStream(db->storage, encname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm); if( FAILED( r ) ) @@ -359,7 +430,20 @@ static UINT db_get_raw_stream( MSIDATABASE *db, LPCWSTR stname, IStream **stm ) msi_free( encname ); - return SUCCEEDED(r) ? ERROR_SUCCESS : ERROR_FUNCTION_FAILED; + if( SUCCEEDED(r) ) + { + MSISTREAM *stream; + + stream = msi_alloc( sizeof(MSISTREAM) ); + if( !stream ) + return ERROR_NOT_ENOUGH_MEMORY; + + stream->stm = *stm; + IStream_AddRef( *stm ); + list_add_tail( &db->streams, &stream->entry ); + } + + return ERROR_SUCCESS; } UINT read_raw_stream_data( MSIDATABASE *db, LPCWSTR stname, @@ -3041,3 +3125,15 @@ void msi_free_transforms( MSIDATABASE *db ) msi_free( t ); } } + +void msi_free_streams( MSIDATABASE *db ) +{ + while( !list_empty( &db->streams ) ) + { + MSISTREAM *s = LIST_ENTRY( list_head( &db->streams ), + MSISTREAM, entry ); + list_remove( &s->entry ); + IStream_Release( s->stm ); + msi_free( s ); + } +}

1 0

Piotr Caban : mshtml: Added IObjectWithSite stubs.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 17bec80f71f04115cfa80d8785aa516cab132df0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17bec80f71f04115cfa80d878… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:46:24 2009 +0100 mshtml: Added IObjectWithSite stubs. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/oleobj.c | 49 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 57d4fc6..84f6cc8 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1748,6 +1748,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IMarshal, riid)) { TRACE("(%p)->(IID_IMarshal %p) returning NULL\n", This, ppv); *ppv = NULL; + }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { + TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); + *ppv = OBJSITE(This); }else { return FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index afd0bff..98abec2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -323,6 +323,7 @@ struct HTMLDocument { const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; + const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; IUnknown *unk_impl; IDispatchEx *dispex; @@ -577,6 +578,7 @@ struct HTMLDocumentNode { #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define PERSISTHIST(x) ((IPersistHistory*) &(x)->lpPersistHistoryVtbl) #define CUSTOMDOC(x) ((ICustomDoc*) &(x)->lpCustomDocVtbl) +#define OBJSITE(x) ((IObjectWithSite*) &(x)->lpObjectWithSiteVtbl) #define NSWBCHROME(x) ((nsIWebBrowserChrome*) &(x)->lpWebBrowserChromeVtbl) #define NSCML(x) ((nsIContextMenuListener*) &(x)->lpContextMenuListenerVtbl) diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 872d766..3dec3dc 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -732,6 +732,54 @@ static const IOleControlVtbl OleControlVtbl = { OleControl_FreezeEvents }; +/********************************************************** + * IObjectWithSite implementation + */ + +#define OBJSITE_THIS(iface) DEFINE_THIS(HTMLDocument, ObjectWithSite, iface) + +static HRESULT WINAPI ObjectWithSite_QueryInterface(IObjectWithSite *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppvObject); +} + +static ULONG WINAPI ObjectWithSite_AddRef(IObjectWithSite *iface) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI ObjectWithSite_Release(IObjectWithSite *iface) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI ObjectWithSite_SetSite(IObjectWithSite *iface, IUnknown *pUnkSite) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, pUnkSite); + return E_NOTIMPL; +} + +static HRESULT WINAPI ObjectWithSite_GetSite(IObjectWithSite* iface, REFIID riid, PVOID *ppvSite) +{ + HTMLDocument *This = OBJSITE_THIS(iface); + FIXME("(%p)->(%p)\n", This, ppvSite); + return E_NOTIMPL; +} + +#undef OBJSITE_THIS + +static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { + ObjectWithSite_QueryInterface, + ObjectWithSite_AddRef, + ObjectWithSite_Release, + ObjectWithSite_SetSite, + ObjectWithSite_GetSite +}; + void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -753,4 +801,5 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleObjectVtbl = &OleObjectVtbl; This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; + This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; }

1 0

Piotr Caban : oleaut32: Fix SysReAllocStringLen implementation.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 7e3fd4e3c67fef7d70f4372bfd56414a945b61da URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e3fd4e3c67fef7d70f4372bf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:46:42 2009 +0100 oleaut32: Fix SysReAllocStringLen implementation. --- dlls/oleaut32/oleaut.c | 3 ++- dlls/oleaut32/tests/vartype.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 72b70e2..89e1ab9 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -294,6 +294,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) return 0; if (*old!=NULL) { + BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); *old = (BSTR)(ptr+1); @@ -302,7 +303,7 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) * when 'in' is NULL! * Some Microsoft program needs it. */ - if (str) memmove(*old, str, newbytelen); + if (str && old_copy!=str) memmove(*old, str, newbytelen); (*old)[len] = 0; } else { /* diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index a61c777..0c23a11 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5440,6 +5440,20 @@ static void test_SysReAllocStringLen(void) } } } + + /* Some Windows applications use the same pointer for pbstr and psz */ + str = SysAllocStringLen(szTest, 4); + ok(str != NULL, "Expected non-NULL\n"); + if(str) + { + int changed; + + changed = SysReAllocStringLen(&str, str, 1000000); + ok(SysStringLen(str)==1000000, "Incorrect string length\n"); + ok(!memcmp(szTest, str, 4*sizeof(WCHAR)), "Incorrect string returned\n"); + + SysFreeString(str); + } } static void test_BstrCopy(void)

1 0

Piotr Caban : mshtml: Added IElementBehavior{Site, Factory} to idl file.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: c23b0b0b4860440e206aba9c39a143707ff74ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c23b0b0b4860440e206aba9c3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:00 2009 +0100 mshtml: Added IElementBehavior{Site,Factory} to idl file. --- include/mshtml.idl | 41 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 5b390ee..4a182f2 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -15085,4 +15085,45 @@ interface IHTMLEditServices : IUnknown [in] SELECTION_TYPE eType); } +/***************************************************************************** + * IElementBehaviorSite interface + */ +[ + odl, + uuid(3050F427-98B5-11CF-BB82-00AA00BDCE0B) +] +interface IElementBehaviorSite : IUnknown { + HRESULT GetElement([out, retval] IHTMLElement **ppElement); + HRESULT RegisterNotification([in] long lEvent); +} + +/***************************************************************************** + * IElementBehavior interface + */ +[ + odl, + uuid(3050F425-98B5-11CF-BB82-00AA00BDCE0B) +] +interface IElementBehavior : IUnknown { + HRESULT Init([in] IElementBehaviorSite *pBehaviorSite); + HRESULT Notify([in] long lEvent, [in, out] VARIANT *pVar); + HRESULT Detach(); +} + +/***************************************************************************** + * IElementBehaviorFactory interface + */ +[ + odl, + uuid(3050f429-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementBehaviorFactory : IUnknown +{ + HRESULT FindBehavior( + [in] BSTR bstrBehavior, + [in] BSTR bstrBehaviorUrl, + [in] IElementBehaviorSite *pSite, + [out] IElementBehavior **ppBehavior); +} + } /* library MSHTML */

1 0

Piotr Caban : shlwapi: Allow ' ' in hostname and password in UrlGetPart.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 1e0827f645d1a1d986a1aa4b77f9be794daee32d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0827f645d1a1d986a1aa4b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:17 2009 +0100 shlwapi: Allow ' ' in hostname and password in UrlGetPart. --- dlls/shlwapi/tests/url.c | 8 ++++++++ dlls/shlwapi/url.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 0138c35..da051a1 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -519,6 +519,9 @@ static void test_url_part(const char* szUrl, DWORD dwPart, DWORD dwFlags, const static void test_UrlGetPart(void) { + const char* file_url = "file://h o s t/c:/windows/file"; + const char* http_url = "http://user:pass 123(a)www.wine hq.org"; + CHAR szPart[INTERNET_MAX_URL_LENGTH]; DWORD dwSize; HRESULT res; @@ -544,6 +547,11 @@ static void test_UrlGetPart(void) test_url_part(TEST_URL_3, URL_PART_PASSWORD, 0, "bar"); test_url_part(TEST_URL_3, URL_PART_SCHEME, 0, "http"); test_url_part(TEST_URL_3, URL_PART_QUERY, 0, "?query=x&return=y"); + + test_url_part(file_url, URL_PART_HOSTNAME, 0, "h o s t"); + + test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); + test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 2b7a8cd..198f17f 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -1856,7 +1856,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) (*start == '_') || (*start == '+') || (*start == '-') || - (*start == '.')) { + (*start == '.') || + (*start == ' ')) { start++; (*size)++; } else if (*start == '%') { @@ -1886,7 +1887,8 @@ static LPCWSTR URL_ScanID(LPCWSTR start, LPDWORD size, WINE_URL_SCAN_TYPE type) while (cont) { if (isalnumW(*start) || (*start == '-') || - (*start == '.') ) { + (*start == '.') || + (*start == ' ') ) { start++; (*size)++; }

1 0

Piotr Caban : shlwapi: Added special case for URL_PART_HOSTNAME in UrlGetPart.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 8de69a174aaf1b6337d5a854f3859d8425b9ea33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de69a174aaf1b6337d5a854f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:36 2009 +0100 shlwapi: Added special case for URL_PART_HOSTNAME in UrlGetPart. --- dlls/shlwapi/tests/url.c | 11 +++++++++++ dlls/shlwapi/url.c | 42 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index da051a1..ab3d0b6 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -552,6 +552,17 @@ static void test_UrlGetPart(void) test_url_part(http_url, URL_PART_HOSTNAME, 0, "www.wine hq.org"); test_url_part(http_url, URL_PART_PASSWORD, 0, "pass 123"); + + dwSize = sizeof(szPart); + res = UrlGetPartA("file://c:\\index.htm", szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==S_FALSE, "returned %08x\n", res); + + dwSize = sizeof(szPart); + szPart[0] = 'x'; szPart[1] = '\0'; + res = UrlGetPartA("file:some text", szPart, &dwSize, URL_PART_HOSTNAME, 0); + ok(res==S_FALSE, "returned %08x\n", res); + ok(szPart[0] == '\0', "szPart[0] = %c\n", szPart[0]); + ok(dwSize == 0, "dwSize = %d\n", dwSize); } /* ########################### */ diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 198f17f..f8a5162 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2004,7 +2004,7 @@ HRESULT WINAPI UrlGetPartA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, len = INTERNET_MAX_URL_LENGTH; ret = UrlGetPartW(in, out, &len, dwPart, dwFlags); - if (ret != S_OK) { + if (FAILED(ret)) { HeapFree(GetProcessHeap(), 0, in); return ret; } @@ -2015,10 +2015,10 @@ HRESULT WINAPI UrlGetPartA(LPCSTR pszIn, LPSTR pszOut, LPDWORD pcchOut, HeapFree(GetProcessHeap(), 0, in); return E_POINTER; } - WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); - *pcchOut = len2; + len2 = WideCharToMultiByte(0, 0, out, len+1, pszOut, *pcchOut, 0, 0); + *pcchOut = len2-1; HeapFree(GetProcessHeap(), 0, in); - return S_OK; + return ret; } /************************************************************************* @@ -2031,12 +2031,18 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, { WINE_PARSE_URL pl; HRESULT ret; - DWORD size, schsize; + DWORD scheme, size, schsize; LPCWSTR addr, schaddr; TRACE("(%s %p %p(%d) %08x %08x)\n", debugstr_w(pszIn), pszOut, pcchOut, *pcchOut, dwPart, dwFlags); + addr = strchrW(pszIn, ':'); + if(!addr) + return E_FAIL; + + scheme = get_scheme_code(pszIn, addr-pszIn); + ret = URL_ParseUrl(pszIn, &pl); if (ret == S_OK) { schaddr = pl.pScheme; @@ -2050,6 +2056,26 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, break; case URL_PART_HOSTNAME: + switch(scheme) { + case URL_SCHEME_FTP: + case URL_SCHEME_HTTP: + case URL_SCHEME_GOPHER: + case URL_SCHEME_TELNET: + case URL_SCHEME_FILE: + case URL_SCHEME_HTTPS: + break; + default: + return E_FAIL; + } + + if(scheme==URL_SCHEME_FILE && (!pl.szHostName || + (pl.szHostName==1 && *(pl.pHostName+1)==':'))) { + if(pcchOut) + *pszOut = '\0'; + *pcchOut = 0; + return S_FALSE; + } + if (!pl.szHostName) return E_INVALIDARG; addr = pl.pHostName; size = pl.szHostName; @@ -2101,7 +2127,13 @@ HRESULT WINAPI UrlGetPartW(LPCWSTR pszIn, LPWSTR pszOut, LPDWORD pcchOut, *pcchOut = size; } TRACE("len=%d %s\n", *pcchOut, debugstr_w(pszOut)); + }else if(dwPart==URL_PART_HOSTNAME && scheme==URL_SCHEME_FILE) { + if(*pcchOut) + *pszOut = '\0'; + *pcchOut = 0; + return S_FALSE; } + return ret; }

1 0

Piotr Caban : urlmon: Added PARSE_DOMAIN to CoInternetParseUrl.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 3adfe170bfb9a31082d41c6b8fa796f3f33d388c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adfe170bfb9a31082d41c6b8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 15 23:47:52 2009 +0100 urlmon: Added PARSE_DOMAIN to CoInternetParseUrl. --- dlls/urlmon/internet.c | 32 ++++++++++++++++++++++++++++++++ dlls/urlmon/tests/misc.c | 23 +++++++++++++++++------ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/internet.c b/dlls/urlmon/internet.c index 8bde7b4..c72ac42 100644 --- a/dlls/urlmon/internet.c +++ b/dlls/urlmon/internet.c @@ -170,6 +170,36 @@ static HRESULT parse_security_domain(LPCWSTR url, DWORD flags, LPWSTR result, return E_FAIL; } +static HRESULT parse_domain(LPCWSTR url, DWORD flags, LPWSTR result, + DWORD size, DWORD *rsize) +{ + IInternetProtocolInfo *protocol_info; + HRESULT hres; + + TRACE("(%s %08x %p %d %p)\n", debugstr_w(url), flags, result, size, rsize); + + protocol_info = get_protocol_info(url); + + if(protocol_info) { + hres = IInternetProtocolInfo_ParseUrl(protocol_info, url, PARSE_DOMAIN, + flags, result, size, rsize, 0); + IInternetProtocolInfo_Release(protocol_info); + if(SUCCEEDED(hres)) + return hres; + } + + hres = UrlGetPartW(url, result, &size, URL_PART_HOSTNAME, flags); + if(rsize) + *rsize = size; + + if(hres == E_POINTER) + return S_FALSE; + + if(FAILED(hres)) + return E_FAIL; + return S_OK; +} + /************************************************************************** * CoInternetParseUrl (URLMON.@) */ @@ -192,6 +222,8 @@ HRESULT WINAPI CoInternetParseUrl(LPCWSTR pwzUrl, PARSEACTION ParseAction, DWORD return parse_schema(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); case PARSE_SECURITY_DOMAIN: return parse_security_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); + case PARSE_DOMAIN: + return parse_domain(pwzUrl, dwFlags, pszResult, cchResult, pcchResult); default: FIXME("not supported action %d\n", ParseAction); } diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 5b59626..f6d5c87 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -270,6 +270,8 @@ static const WCHAR wszHttp[] = {'h','t','t','p',0}; static const WCHAR wszAbout[] = {'a','b','o','u','t',0}; static const WCHAR wszEmpty[] = {0}; +static const WCHAR wszWineHQ[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + struct parse_test { LPCWSTR url; HRESULT secur_hres; @@ -277,15 +279,17 @@ struct parse_test { HRESULT path_hres; LPCWSTR path; LPCWSTR schema; + LPCWSTR domain; + HRESULT domain_hres; }; static const struct parse_test parse_tests[] = { - {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes}, - {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty}, - {url3, E_FAIL, url3, S_OK, path3, wszFile}, - {url4, E_FAIL, url4e, S_OK, path4, wszFile}, - {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp}, - {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout} + {url1, S_OK, url1, E_INVALIDARG, NULL, wszRes, NULL, E_FAIL}, + {url2, E_FAIL, url2, E_INVALIDARG, NULL, wszEmpty, NULL, E_FAIL}, + {url3, E_FAIL, url3, S_OK, path3, wszFile, wszEmpty, S_OK}, + {url4, E_FAIL, url4e, S_OK, path4, wszFile, wszEmpty, S_OK}, + {url5, E_FAIL, url5, E_INVALIDARG, NULL, wszHttp, wszWineHQ, S_OK}, + {url6, S_OK, url6, E_INVALIDARG, NULL, wszAbout, NULL, E_FAIL} }; static void test_CoInternetParseUrl(void) @@ -331,6 +335,13 @@ static void test_CoInternetParseUrl(void) ok(hres == S_OK, "[%d] schema failed: %08x\n", i, hres); ok(size == lstrlenW(parse_tests[i].schema), "[%d] wrong size\n", i); ok(!lstrcmpW(parse_tests[i].schema, buf), "[%d] wrong schema\n", i); + + memset(buf, 0xf0, sizeof(buf)); + hres = CoInternetParseUrl(parse_tests[i].url, PARSE_DOMAIN, 0, buf, + sizeof(buf)/sizeof(WCHAR), &size, 0); + ok(hres == parse_tests[i].domain_hres, "[%d] domain failed: %08x\n", i, hres); + if(parse_tests[i].domain) + ok(!lstrcmpW(parse_tests[i].domain, buf), "[%d] wrong domain, received %s\n", i, wine_dbgstr_w(buf)); } }

1 0

Maarten Lankhorst : mmdevapi: Add class factory.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: b80fe3618b6a9e1e52f4885be6b2c5d02f15350a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b80fe3618b6a9e1e52f4885be… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 15 15:35:18 2009 +0100 mmdevapi: Add class factory. --- dlls/mmdevapi/Makefile.in | 1 + dlls/mmdevapi/devenum.c | 40 ++++++++++++++++ dlls/mmdevapi/main.c | 111 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mmdevapi/mmdevapi.h | 19 ++++++++ 4 files changed, 169 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index 2f9db6c..fd43434 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -6,6 +6,7 @@ MODULE = mmdevapi.dll IMPORTS = ole32 user32 advapi32 kernel32 ntdll C_SRCS = \ + devenum.c \ main.c \ regsvr.c diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c new file mode 100644 index 0000000..e34c824 --- /dev/null +++ b/dlls/mmdevapi/devenum.c @@ -0,0 +1,40 @@ +/* + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define CINTERFACE +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +#include "ole2.h" +#include "mmdeviceapi.h" + +#include "mmdevapi.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); + +HRESULT MMDevEnum_Create(REFIID riid, void **ppv) +{ + FIXME("stub\n"); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index af200dc..d167d80 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define CINTERFACE +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "wine/debug.h" @@ -28,6 +30,8 @@ #include "ole2.h" #include "mmdeviceapi.h" +#include "mmdevapi.h" + WINE_DEFAULT_DEBUG_CHANNEL(mmdevapi); BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -52,8 +56,111 @@ HRESULT WINAPI DllCanUnloadNow(void) return S_FALSE; } -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); + +typedef struct { + const IClassFactoryVtbl *lpVtbl; + REFCLSID rclsid; + FnCreateInstance pfnCreateInstance; +} IClassFactoryImpl; + +static HRESULT WINAPI +MMCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) { - FIXME("stub\n"); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); + if (ppobj == NULL) + return E_POINTER; + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IClassFactory)) + { + *ppobj = iface; + IUnknown_AddRef(iface); + return S_OK; + } + *ppobj = NULL; return E_NOINTERFACE; } + +static ULONG WINAPI MMCF_AddRef(LPCLASSFACTORY iface) +{ + return 2; +} + +static ULONG WINAPI MMCF_Release(LPCLASSFACTORY iface) +{ + /* static class, won't be freed */ + return 1; +} + +static HRESULT WINAPI MMCF_CreateInstance( + LPCLASSFACTORY iface, + LPUNKNOWN pOuter, + REFIID riid, + LPVOID *ppobj) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + TRACE("(%p, %p, %s, %p)\n", This, pOuter, debugstr_guid(riid), ppobj); + + if (pOuter) + return CLASS_E_NOAGGREGATION; + + if (ppobj == NULL) { + WARN("invalid parameter\n"); + return E_POINTER; + } + *ppobj = NULL; + return This->pfnCreateInstance(riid, ppobj); +} + +static HRESULT WINAPI MMCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +{ + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + FIXME("(%p, %d) stub!\n", This, dolock); + return S_OK; +} + +static const IClassFactoryVtbl MMCF_Vtbl = { + MMCF_QueryInterface, + MMCF_AddRef, + MMCF_Release, + MMCF_CreateInstance, + MMCF_LockServer +}; + +static IClassFactoryImpl MMDEVAPI_CF[] = { + { &MMCF_Vtbl, &CLSID_MMDeviceEnumerator, (FnCreateInstance)MMDevEnum_Create } +}; + +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + int i = 0; + TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); + + if (ppv == NULL) { + WARN("invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (!IsEqualIID(riid, &IID_IClassFactory) && + !IsEqualIID(riid, &IID_IUnknown)) { + WARN("no interface for %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + for (i = 0; i < sizeof(MMDEVAPI_CF)/sizeof(MMDEVAPI_CF[0]); ++i) + { + if (IsEqualGUID(rclsid, MMDEVAPI_CF[i].rclsid)) { + IUnknown_AddRef((IClassFactory*) &MMDEVAPI_CF[i]); + *ppv = &MMDEVAPI_CF[i]; + return S_OK; + } + i++; + } + + WARN("(%s, %s, %p): no class found.\n", debugstr_guid(rclsid), + debugstr_guid(riid), ppv); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h new file mode 100644 index 0000000..e6b878a --- /dev/null +++ b/dlls/mmdevapi/mmdevapi.h @@ -0,0 +1,19 @@ +/* + * Copyright 2009 Maarten Lankhorst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv);

1 0

Maarten Lankhorst : dsound: Remove refcounting in classfactory.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 1b94450f789791908a370f16e125087b84f35bcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b94450f789791908a370f16e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Dec 15 15:39:14 2009 +0100 dsound: Remove refcounting in classfactory. --- dlls/dsound/dsound_main.c | 25 +++++++++---------------- 1 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index f65dbf9..e7c59e9 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -497,7 +497,6 @@ typedef HRESULT (*FnCreateInstance)(REFIID riid, LPVOID *ppobj); typedef struct { const IClassFactoryVtbl *lpVtbl; - LONG ref; REFCLSID rclsid; FnCreateInstance pfnCreateInstance; } IClassFactoryImpl; @@ -522,19 +521,13 @@ DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - ULONG ref = InterlockedIncrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref - 1); - return ref; + return 2; } static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - ULONG ref = InterlockedDecrement(&(This->ref)); - TRACE("(%p) ref was %d\n", This, ref + 1); /* static class, won't be freed */ - return ref; + return 1; } static HRESULT WINAPI DSCF_CreateInstance( @@ -573,13 +566,13 @@ static const IClassFactoryVtbl DSCF_Vtbl = { }; static IClassFactoryImpl DSOUND_CF[] = { - { &DSCF_Vtbl, 1, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, - { &DSCF_Vtbl, 1, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, - { &DSCF_Vtbl, 1, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, - { NULL, 0, NULL, NULL } + { &DSCF_Vtbl, &CLSID_DirectSound, (FnCreateInstance)DSOUND_Create }, + { &DSCF_Vtbl, &CLSID_DirectSound8, (FnCreateInstance)DSOUND_Create8 }, + { &DSCF_Vtbl, &CLSID_DirectSoundCapture, (FnCreateInstance)DSOUND_CaptureCreate }, + { &DSCF_Vtbl, &CLSID_DirectSoundCapture8, (FnCreateInstance)DSOUND_CaptureCreate8 }, + { &DSCF_Vtbl, &CLSID_DirectSoundFullDuplex, (FnCreateInstance)DSOUND_FullDuplexCreate }, + { &DSCF_Vtbl, &CLSID_DirectSoundPrivate, (FnCreateInstance)IKsPrivatePropertySetImpl_Create }, + { NULL, NULL, NULL } }; /*******************************************************************************

1 0

Vladimir Pankratov : setupapi: Add stub for CM_Get_Device_ID_ExW.
by Alexandre Julliard 16 Dec '09

16 Dec '09

Module: wine Branch: master Commit: 6f2ec37b60235bca17460e35fe89c6612fbdb54f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2ec37b60235bca17460e35f… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Dec 15 21:46:59 2009 +0500 setupapi: Add stub for CM_Get_Device_ID_ExW. --- dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/stubs.c | 10 ++++++++++ include/cfgmgr32.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 2f62b66..04473aa 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -74,7 +74,7 @@ @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stub CM_Get_Device_ID_ExA -@ stub CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str ptr long long) @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) @ stub CM_Get_Device_ID_List_ExA diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 1b217db..44cd2c0 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -79,6 +79,16 @@ CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE handle) } /*********************************************************************** + * CM_Get_Device_ID_ExW (SETUPAPI.@) + */ +DWORD WINAPI CM_Get_Device_ID_ExW( + DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) +{ + FIXME("0x%08x %p 0x%08x 0x%08x %p\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + return CR_SUCCESS; +} + +/*********************************************************************** * CM_Get_Device_ID_ListA (SETUPAPI.@) */ CONFIGRET WINAPI CM_Get_Device_ID_ListA( diff --git a/include/cfgmgr32.h b/include/cfgmgr32.h index 2b80534..cd26df8 100644 --- a/include/cfgmgr32.h +++ b/include/cfgmgr32.h @@ -127,6 +127,9 @@ CMAPI CONFIGRET WINAPI CM_Disconnect_Machine(HMACHINE); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST,PSTR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST,PWSTR,ULONG,ULONG); #define CM_Get_Device_ID WINELIB_NAME_AW(CM_Get_Device_ID) +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExA(DEVINST,PSTR,ULONG,ULONG,HMACHINE); +CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExW(DEVINST,PWSTR,ULONG,ULONG,HMACHINE); +#define CM_Get_Device_ID_Ex WINELIB_NAME_AW(CM_Get_Device_ID_Ex) CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListA(PCSTR,PCHAR,ULONG,ULONG); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListW(PCWSTR,PWCHAR,ULONG,ULONG); #define CM_Get_Device_ID_List WINELIB_NAME_AW(CM_Get_Device_ID_List)

1 0