January 2012 - Wine-commits

Austin English : xpsprint: Add stub dll.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 1c92d2022547fcc536f92c0e7f5e4bd42de335e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c92d2022547fcc536f92c0e7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 11 11:13:08 2012 -0800 xpsprint: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/xpsprint/Makefile.in | 8 ++++++++ dlls/xpsprint/main.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/xpsprint/xpsprint.rc | 28 ++++++++++++++++++++++++++++ dlls/xpsprint/xpsprint.spec | 6 ++++++ 6 files changed, 87 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 59bcd7d..91f6a8a 100755 --- a/configure +++ b/configure @@ -15416,6 +15416,7 @@ wine_fn_config_dll xinput9_1_0 enable_xinput9_1_0 wine_fn_config_dll xmllite enable_xmllite wine_fn_config_test dlls/xmllite/tests xmllite_test wine_fn_config_dll xolehlp enable_xolehlp +wine_fn_config_dll xpsprint enable_xpsprint wine_fn_config_makefile documentation enable_documentation wine_fn_config_makefile fonts enable_fonts install-lib wine_fn_config_makefile include enable_include install-dev diff --git a/configure.ac b/configure.ac index 5dc111c..8e6d96a 100644 --- a/configure.ac +++ b/configure.ac @@ -2925,6 +2925,7 @@ WINE_CONFIG_DLL(xinput9_1_0) WINE_CONFIG_DLL(xmllite) WINE_CONFIG_TEST(dlls/xmllite/tests) WINE_CONFIG_DLL(xolehlp) +WINE_CONFIG_DLL(xpsprint) WINE_CONFIG_MAKEFILE([documentation]) WINE_CONFIG_MAKEFILE([fonts],,[install-lib]) WINE_CONFIG_MAKEFILE([include],,[install-dev]) diff --git a/dlls/xpsprint/Makefile.in b/dlls/xpsprint/Makefile.in new file mode 100644 index 0000000..6dc46d5 --- /dev/null +++ b/dlls/xpsprint/Makefile.in @@ -0,0 +1,8 @@ +MODULE = xpsprint.dll + +C_SRCS = \ + main.c + +RC_SRCS = xpsprint.rc + +(a)MAKE_DLL_RULES@ diff --git a/dlls/xpsprint/main.c b/dlls/xpsprint/main.c new file mode 100644 index 0000000..0604665 --- /dev/null +++ b/dlls/xpsprint/main.c @@ -0,0 +1,43 @@ +/* + * XPS printing support + * + * Copyright 2012 Austin English + * + * 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> + +#include "windef.h" +#include "winbase.h" +#include "wine/debug.h" + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + break; + case DLL_PROCESS_DETACH: + break; + } + + return TRUE; +} diff --git a/dlls/xpsprint/xpsprint.rc b/dlls/xpsprint/xpsprint.rc new file mode 100644 index 0000000..647ca08 --- /dev/null +++ b/dlls/xpsprint/xpsprint.rc @@ -0,0 +1,28 @@ +/* + * Resources for XPS Print + * + * Copyright 2012 Austin English + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine XPS Print dll" +#define WINE_FILENAME_STR "xpsprint.dll" +#define WINE_FILEVERSION 7,0,6002,18363 +#define WINE_FILEVERSION_STR "7.0.6002.18363" +#define WINE_PRODUCTVERSION 7,0,6002,18363 +#define WINE_PRODUCTVERSION_STR "7.0.6002.18363" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/xpsprint/xpsprint.spec b/dlls/xpsprint/xpsprint.spec new file mode 100644 index 0000000..1fed74a --- /dev/null +++ b/dlls/xpsprint/xpsprint.spec @@ -0,0 +1,6 @@ +3 stub @ +5 stub @ + +@ stub DllMain +@ stub StartXpsPrintJob1 +@ stub StartXpsPrintJob

1 0

Piotr Caban : urlmon: Added CUri ClassFactory implementation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 11abd08bb5eb2d36b270cdf5012c1a03a884d681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11abd08bb5eb2d36b270cdf50… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:29:47 2012 +0100 urlmon: Added CUri ClassFactory implementation. --- dlls/urlmon/uri.c | 47 +++++++++++++++++++++++----------------- dlls/urlmon/urlmon_main.c | 8 ++++++- dlls/urlmon/urlmon_main.h | 2 + dlls/urlmon/urlmon_urlmon.idl | 7 ++++++ 4 files changed, 43 insertions(+), 21 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 4c6747d..88d6e5b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5320,16 +5320,23 @@ static const IPersistStreamVtbl PersistStreamVtbl = { PersistStream_GetSizeMax }; -static Uri* create_uri_obj(void) { +HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) +{ Uri *ret = heap_alloc_zero(sizeof(Uri)); - if(ret) { - ret->IUri_iface.lpVtbl = &UriVtbl; - ret->IUriBuilderFactory_iface.lpVtbl = &UriBuilderFactoryVtbl; - ret->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; - ret->ref = 1; - } - return ret; + TRACE("(%p %p)\n", pUnkOuter, ppobj); + + *ppobj = ret; + if(!ret) + return E_OUTOFMEMORY; + + ret->IUri_iface.lpVtbl = &UriVtbl; + ret->IUriBuilderFactory_iface.lpVtbl = &UriBuilderFactoryVtbl; + ret->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; + ret->ref = 1; + + *ppobj = &ret->IUri_iface; + return S_OK; } /*********************************************************************** @@ -5387,10 +5394,10 @@ HRESULT WINAPI CreateUri(LPCWSTR pwzURI, DWORD dwFlags, DWORD_PTR dwReserved, IU if(dwFlags & ~supported_flags) FIXME("Ignoring unsupported flag(s) %x\n", dwFlags & ~supported_flags); - ret = create_uri_obj(); - if(!ret) { + hr = Uri_Construct(NULL, (void**)&ret); + if(FAILED(hr)) { *ppURI = NULL; - return E_OUTOFMEMORY; + return hr; } /* Explicitly set the default flags if it doesn't cause a flag conflict. */ @@ -5547,10 +5554,10 @@ static HRESULT build_uri(const UriBuilder *builder, IUri **uri, DWORD create_fla return hr; } - ret = create_uri_obj(); - if(!ret) { + hr = Uri_Construct(NULL, (void**)&ret); + if(FAILED(hr)) { *uri = NULL; - return E_OUTOFMEMORY; + return hr; } hr = generate_uri(builder, &data, ret, create_flags); @@ -6115,10 +6122,10 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, parse_uri(&data, 0); - ret = create_uri_obj(); - if(!ret) { + hr = Uri_Construct(NULL, (void**)&ret); + if(FAILED(hr)) { *result = NULL; - return E_OUTOFMEMORY; + return hr; } if(extras & COMBINE_URI_FORCE_FLAG_USE) { @@ -6319,12 +6326,12 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, generate_raw_uri(&data, data.uri, raw_flags); - ret = create_uri_obj(); - if(!ret) { + hr = Uri_Construct(NULL, (void**)&ret); + if(FAILED(hr)) { SysFreeString(data.uri); heap_free(path); *result = NULL; - return E_OUTOFMEMORY; + return hr; } if(flags & URL_DONT_SIMPLIFY) diff --git a/dlls/urlmon/urlmon_main.c b/dlls/urlmon/urlmon_main.c index 13c61de..edd6930 100644 --- a/dlls/urlmon/urlmon_main.c +++ b/dlls/urlmon/urlmon_main.c @@ -27,6 +27,7 @@ #define NO_SHLWAPI_REG #include "shlwapi.h" #include "advpub.h" +#include "initguid.h" #include "wine/debug.h" @@ -34,6 +35,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); +DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); + LONG URLMON_refCount = 0; static HMODULE hCabinet = NULL; @@ -292,6 +295,8 @@ static ClassFactory StdURLMonikerCF = { { &ClassFactoryVtbl }, StdURLMoniker_Construct}; static ClassFactory MimeFilterCF = { { &ClassFactoryVtbl }, MimeFilter_Construct}; +static ClassFactory CUriCF = + { { &ClassFactoryVtbl }, Uri_Construct}; struct object_creation_info { @@ -318,7 +323,8 @@ static const struct object_creation_info object_creation[] = { &CLSID_InternetSecurityManager, &SecurityManagerCF.IClassFactory_iface, NULL }, { &CLSID_InternetZoneManager, &ZoneManagerCF.IClassFactory_iface, NULL }, { &CLSID_StdURLMoniker, &StdURLMonikerCF.IClassFactory_iface, NULL }, - { &CLSID_DeCompMimeFilter, &MimeFilterCF.IClassFactory_iface, NULL } + { &CLSID_DeCompMimeFilter, &MimeFilterCF.IClassFactory_iface, NULL }, + { &CLSID_CUri, &CUriCF.IClassFactory_iface, NULL } }; static void init_session(BOOL init) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index b60d678..a185f10 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -47,6 +47,7 @@ extern HRESULT FtpProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPE extern HRESULT GopherProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT MkProtocol_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT MimeFilter_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; +extern HRESULT Uri_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) DECLSPEC_HIDDEN; extern BOOL WINAPI URLMON_DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) DECLSPEC_HIDDEN; @@ -54,6 +55,7 @@ extern HRESULT WINAPI URLMON_DllRegisterServer(void) DECLSPEC_HIDDEN; extern HRESULT WINAPI URLMON_DllUnregisterServer(void) DECLSPEC_HIDDEN; extern GUID const CLSID_PSFactoryBuffer DECLSPEC_HIDDEN; +extern GUID const CLSID_CUri DECLSPEC_HIDDEN; /********************************************************************** * Dll lifetime tracking declaration for urlmon.dll diff --git a/dlls/urlmon/urlmon_urlmon.idl b/dlls/urlmon/urlmon_urlmon.idl index ad23dee..0ba5ce6 100644 --- a/dlls/urlmon/urlmon_urlmon.idl +++ b/dlls/urlmon/urlmon_urlmon.idl @@ -101,3 +101,10 @@ coclass PSFactoryBuffer { interface IPSFactoryBuffer; } uuid(8f6b0360-b80d-11d0-a9b3-006097942311) ] coclass DeCompMimeFilter { interface IInternetProtocol; interface IInternetProtocolSink; } + +[ + helpstring("CUri"), + threading(apartment), + uuid(df2fce13-25ec-45bb-9d4c-cecd47c2430c) +] +coclass CUri { interface IUri; }

1 0

Piotr Caban : urlmon: Return error in IUri functions on uninitialized object.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: e5925d2a5238b1465b53a4e36f93ff68a42ed672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5925d2a5238b1465b53a4e36… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:30:05 2012 +0100 urlmon: Return error in IUri functions on uninitialized object. --- dlls/urlmon/uri.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 88d6e5b..1638e74 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4264,6 +4264,8 @@ static HRESULT WINAPI Uri_GetPropertyBSTR(IUri *iface, Uri_PROPERTY uriProp, BST HRESULT hres; TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pbstrProperty, dwFlags); + if(!This->create_flags) + return E_UNEXPECTED; if(!pbstrProperty) return E_POINTER; @@ -4554,6 +4556,8 @@ static HRESULT WINAPI Uri_GetPropertyLength(IUri *iface, Uri_PROPERTY uriProp, D HRESULT hres; TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); + if(!This->create_flags) + return E_UNEXPECTED; if(!pcchProperty) return E_INVALIDARG; @@ -4689,6 +4693,8 @@ static HRESULT WINAPI Uri_GetPropertyDWORD(IUri *iface, Uri_PROPERTY uriProp, DW TRACE("(%p %s)->(%d %p %x)\n", This, debugstr_w(This->canon_uri), uriProp, pcchProperty, dwFlags); + if(!This->create_flags) + return E_UNEXPECTED; if(!pcchProperty) return E_INVALIDARG; @@ -4931,6 +4937,8 @@ static HRESULT WINAPI Uri_GetProperties(IUri *iface, DWORD *pdwProperties) Uri *This = impl_from_IUri(iface); TRACE("(%p %s)->(%p)\n", This, debugstr_w(This->canon_uri), pdwProperties); + if(!This->create_flags) + return E_UNEXPECTED; if(!pdwProperties) return E_INVALIDARG; @@ -4981,6 +4989,8 @@ static HRESULT WINAPI Uri_IsEqual(IUri *iface, IUri *pUri, BOOL *pfEqual) TRACE("(%p %s)->(%p %p)\n", This, debugstr_w(This->canon_uri), pUri, pfEqual); + if(!This->create_flags) + return E_UNEXPECTED; if(!pfEqual) return E_POINTER; @@ -5172,7 +5182,7 @@ static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *pStm, B Uri *This = impl_from_IPersistStream(iface); ULARGE_INTEGER size; struct persist_uri *data; - BYTE *p; + BYTE *p = NULL; HRESULT hres; TRACE("(%p)->(%p %x)\n", This, pStm, fClearDirty); @@ -5191,9 +5201,11 @@ static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *pStm, B data->size = size.u.LowPart; data->create_flags = This->create_flags; - data->fields_no = 1; - p = persist_stream_add_strprop(This, data->data, Uri_PROPERTY_RAW_URI, - SysStringLen(This->raw_uri), This->raw_uri); + if(This->create_flags) { + data->fields_no = 1; + p = persist_stream_add_strprop(This, data->data, Uri_PROPERTY_RAW_URI, + SysStringLen(This->raw_uri), This->raw_uri); + } if(This->scheme_type!=URL_SCHEME_HTTP && This->scheme_type!=URL_SCHEME_HTTPS && This->scheme_type!=URL_SCHEME_FTP) { hres = IStream_Write(pStm, data, data->size-2, NULL); @@ -5275,9 +5287,12 @@ static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INT if(!pcbSize) return E_INVALIDARG; - pcbSize->u.LowPart = 2+(SysStringLen(This->raw_uri)+1)*sizeof(WCHAR) - + 2*sizeof(DWORD) + sizeof(struct persist_uri); + pcbSize->u.LowPart = 2+sizeof(struct persist_uri); pcbSize->u.HighPart = 0; + if(This->create_flags) + pcbSize->u.LowPart += (SysStringLen(This->raw_uri)+1)*sizeof(WCHAR) + 2*sizeof(DWORD); + else /* there's no place for fields no */ + pcbSize->u.LowPart -= sizeof(DWORD); if(This->scheme_type!=URL_SCHEME_HTTP && This->scheme_type!=URL_SCHEME_HTTPS && This->scheme_type!=URL_SCHEME_FTP) return S_OK; @@ -6036,6 +6051,8 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve Uri *uri; if((uri = get_uri_obj(pIUri))) { + if(!uri->create_flags) + return E_UNEXPECTED; IUri_AddRef(pIUri); ret->uri = uri;

1 0

Piotr Caban : urlmon/tests: Test uninitialized IUri object.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 18f932cd1ca64c9994a666c1e979b3e21941681b URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f932cd1ca64c9994a666c1e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:30:26 2012 +0100 urlmon/tests: Test uninitialized IUri object. --- dlls/urlmon/tests/uri.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 7b4634f..350bcc7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -32,6 +32,9 @@ #include "shlwapi.h" #include "wininet.h" #include "strsafe.h" +#include "initguid.h" + +DEFINE_GUID(CLSID_CUri, 0xDF2FCE13, 0x25EC, 0x45BB, 0x9D,0x4C, 0xCE,0xCD,0x47,0xC2,0x43,0x0C); #define URI_STR_PROPERTY_COUNT Uri_PROPERTY_STRING_LAST+1 #define URI_DWORD_PROPERTY_COUNT (Uri_PROPERTY_DWORD_LAST - Uri_PROPERTY_DWORD_START)+1 @@ -10799,6 +10802,98 @@ static void test_IPersistStream(void) } } +static void test_UninitializedUri(void) +{ + IUri *uri; + IUriBuilderFactory *ubf; + IPersistStream *ps; + IUriBuilder *ub; + BSTR bstr; + DWORD dword; + BOOL eq; + ULARGE_INTEGER ui; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CUri, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUri, (void**)&uri); + if(FAILED(hr)) { + win_skip("Skipping uninitialized Uri tests.\n"); + return; + } + + hr = IUri_QueryInterface(uri, &IID_IUriBuilderFactory, (void**)&ubf); + ok(hr == S_OK, "QueryInterface(IID_IUriBuillderFactory) failed: %x.\n", hr); + hr = IUri_QueryInterface(uri, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface(IID_IPersistStream) failed: %x.\n", hr); + + hr = IUri_GetAbsoluteUri(uri, NULL); + ok(hr == E_UNEXPECTED, "GetAbsoluteUri returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetAbsoluteUri(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetAbsoluteUri returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetAuthority(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetAuthority returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetDisplayUri(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetDisplayUri returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetDomain(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetDomain returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetExtension(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetExtension returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetFragment(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetFragment returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetHost(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetHost returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetHostType(uri, &dword); + ok(hr == E_UNEXPECTED, "GetHostType returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPassword(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetPassword returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPassword(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetPassword returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPathAndQuery(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetPathAndQuery returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPort(uri, &dword); + ok(hr == E_UNEXPECTED, "GetPort returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetProperties(uri, &dword); + ok(hr == E_UNEXPECTED, "GetProperties returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPropertyBSTR(uri, Uri_PROPERTY_RAW_URI, &bstr, 0); + ok(hr == E_UNEXPECTED, "GetPropertyBSTR returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPropertyDWORD(uri, Uri_PROPERTY_PORT, &dword, 0); + ok(hr == E_UNEXPECTED, "GetPropertyDWORD returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetPropertyLength(uri, Uri_PROPERTY_RAW_URI, &dword, 0); + ok(hr == E_UNEXPECTED, "GetPropertyLength returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetQuery(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetQuery returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetRawUri(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetRawUri returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetScheme(uri, &dword); + ok(hr == E_UNEXPECTED, "GetScheme returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetSchemeName(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetSchemeName returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetUserInfo(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetUserInfo returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetUserName(uri, &bstr); + ok(hr == E_UNEXPECTED, "GetUserName returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_GetZone(uri, &dword); + ok(hr == E_UNEXPECTED, "GetZone returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUri_IsEqual(uri, uri, &eq); + ok(hr == E_UNEXPECTED, "IsEqual returned %x, expected E_UNEXPECTED.\n", hr); + + hr = IUriBuilderFactory_CreateInitializedIUriBuilder(ubf, 0, 0, &ub); + ok(hr == E_UNEXPECTED, "CreateInitializedIUriBuilder returned %x, expected E_UNEXPECTED.\n", hr); + hr = IUriBuilderFactory_CreateIUriBuilder(ubf, 0, 0, &ub); + ok(hr == S_OK, "CreateIUriBuilder returned %x, expected S_OK.\n", hr); + IUriBuilder_Release(ub); + + hr = IPersistStream_GetSizeMax(ps, &ui); + ok(hr == S_OK, "GetSizeMax returned %x, expected S_OK.\n", hr); + ok(ui.u.LowPart == 34, "ui.LowPart = %d, expected 34.\n", ui.u.LowPart); + hr = IPersistStream_IsDirty(ps); + ok(hr == S_FALSE, "IsDirty returned %x, expected S_FALSE.\n", hr); + + IPersistStream_Release(ps); + IUriBuilderFactory_Release(ubf); + IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; @@ -10916,5 +11011,11 @@ START_TEST(uri) { trace("test IPersistStream...\n"); test_IPersistStream(); + CoInitialize(NULL); + + trace("test uninitialized Uri...\n"); + test_UninitializedUri(); + + CoUninitialize(); unregister_protocols(); }

1 0

Piotr Caban : urlmon: Added Uri IPersistStream_GetClassID implementation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 28e95dfbed2912b8753f9da25200e3e276579b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e95dfbed2912b8753f9da25… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:30:38 2012 +0100 urlmon: Added Uri IPersistStream_GetClassID implementation. --- dlls/urlmon/uri.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1638e74..6ee4ce7 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5137,8 +5137,13 @@ static ULONG WINAPI PersistStream_Release(IPersistStream *iface) static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *pClassID) { Uri *This = impl_from_IPersistStream(iface); - FIXME("(%p)->(%p)\n", This, pClassID); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pClassID); + + if(!pClassID) + return E_INVALIDARG; + + *pClassID = CLSID_CUri; + return S_OK; } static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface)

1 0

Piotr Caban : urlmon: Added Uri IPersistStream_Load implementation.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: b430abce3b56c691823e39b486c3102817966917 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b430abce3b56c691823e39b48… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:30:54 2012 +0100 urlmon: Added Uri IPersistStream_Load implementation. --- dlls/urlmon/uri.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 63 insertions(+), 7 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6ee4ce7..9d3e371 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5153,13 +5153,6 @@ static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) return S_FALSE; } -static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) -{ - Uri *This = impl_from_IPersistStream(iface); - FIXME("(%p)->(%p)\n", This, pStm); - return E_NOTIMPL; -} - struct persist_uri { DWORD size; DWORD unk1[2]; @@ -5169,6 +5162,69 @@ struct persist_uri { BYTE data[1]; }; +static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) +{ + Uri *This = impl_from_IPersistStream(iface); + struct persist_uri *data; + parse_data parse; + DWORD size; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, pStm); + + if(This->create_flags) + return E_UNEXPECTED; + if(!pStm) + return E_INVALIDARG; + + hr = IStream_Read(pStm, &size, sizeof(DWORD), NULL); + if(FAILED(hr)) + return hr; + data = heap_alloc(size); + if(!data) + return E_OUTOFMEMORY; + hr = IStream_Read(pStm, &data->unk1, size-sizeof(DWORD)-2, NULL); + if(FAILED(hr)) + return hr; + + if(size < sizeof(struct persist_uri)) { + heap_free(data); + return S_OK; + } + + if(*(DWORD*)data->data != Uri_PROPERTY_RAW_URI) { + heap_free(data); + ERR("Can't find raw_uri\n"); + return E_UNEXPECTED; + } + + This->raw_uri = SysAllocString((WCHAR*)(data->data+sizeof(DWORD)*2)); + if(!This->raw_uri) { + heap_free(data); + return E_OUTOFMEMORY; + } + This->create_flags = data->create_flags; + heap_free(data); + TRACE("%x %s\n", This->create_flags, debugstr_w(This->raw_uri)); + + memset(&parse, 0, sizeof(parse_data)); + parse.uri = This->raw_uri; + if(!parse_uri(&parse, This->create_flags)) { + SysFreeString(This->raw_uri); + This->create_flags = 0; + return E_UNEXPECTED; + } + + hr = canonicalize_uri(&parse, This, This->create_flags); + if(FAILED(hr)) { + SysFreeString(This->raw_uri); + This->create_flags = 0; + return hr; + } + + return S_OK; +} + static inline BYTE* persist_stream_add_strprop(Uri *This, BYTE *p, DWORD type, DWORD len, WCHAR *data) { len *= sizeof(WCHAR);

1 0

Piotr Caban : urlmon/tests: Added Uri IPersistStream_Load tests.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 76a30f6b681c74c2f40e7c6de5a59350cc8f2b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a30f6b681c74c2f40e7c6de… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 13 14:31:14 2012 +0100 urlmon/tests: Added Uri IPersistStream_Load tests. --- dlls/urlmon/tests/uri.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 350bcc7..e570965 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10695,6 +10695,8 @@ static void test_IPersistStream(void) WCHAR str_data[1024]; ULARGE_INTEGER size, max_size; LARGE_INTEGER no_off; + CLSID curi; + BSTR raw_uri; HRESULT hr; if(test->create_todo || test->create_expected!=S_OK) @@ -10795,6 +10797,30 @@ static void test_IPersistStream(void) ok(props == 0, "%d) No all properties were processed %d. Next property type: %d\n", i, props, dw_data[0]); + IPersistStream_Release(persist_stream); + IUri_Release(uri); + + hr = IStream_Seek(stream, no_off, STREAM_SEEK_SET, NULL); + ok(hr == S_OK, "%d) Seek failed 0x%08x, expected S_OK.\n", i, hr); + hr = IPersistStream_GetClassID(persist_stream, &curi); + ok(hr == S_OK, "%d) GetClassID failed 0x%08x, expected S_OK.\n", i, hr); + ok(IsEqualCLSID(&curi, &CLSID_CUri), "%d) GetClassID returned incorrect CLSID.\n", i); + hr = CoCreateInstance(&curi, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUri, (void**)&uri); + ok(hr == S_OK, "%d) Error creating uninitialized Uri: 0x%08x.\n", i, hr); + hr = IUri_QueryInterface(uri, &IID_IPersistStream, (void**)&persist_stream); + ok(hr == S_OK, "%d) QueryInterface failed 0x%08x, expected S_OK.\n", i, hr); + hr = IPersistStream_Load(persist_stream, stream); + ok(hr == S_OK, "%d) Load failed 0x%08x, expected S_OK.\n", i, hr); + hr = IUri_GetRawUri(uri, &raw_uri); + ok(hr == S_OK, "%d) GetRawUri failed 0x%08x, expected S_OK.\n", i, hr); + ok(!strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].value, raw_uri) + || broken(test->str_props[Uri_PROPERTY_RAW_URI].broken_value + && !strcmp_aw(test->str_props[Uri_PROPERTY_RAW_URI].broken_value, raw_uri)), + "%d) Expected %s but got %s.\n", i, test->str_props[Uri_PROPERTY_RAW_URI].value, + wine_dbgstr_w(raw_uri)); + SysFreeString(raw_uri); + IStream_Release(stream); IPersistStream_Release(persist_stream); IUri_Release(uri); @@ -11008,11 +11034,11 @@ START_TEST(uri) { trace("test CreateURLMoniker...\n"); test_CreateURLMoniker(); + CoInitialize(NULL); + trace("test IPersistStream...\n"); test_IPersistStream(); - CoInitialize(NULL); - trace("test uninitialized Uri...\n"); test_UninitializedUri();

1 0

Aric Stewart : wineqtdecoder: Lower the Merit of the filters.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 607e274f814d73842aa6065eeb7b56bd5257a2f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=607e274f814d73842aa6065ee… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jan 13 06:38:44 2012 -0600 wineqtdecoder: Lower the Merit of the filters. As they are designed to be catch all decoders for unhandled type do not have them compete with potentially fully functional targeted filters. --- dlls/wineqtdecoder/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index dfa961f..e6e7e60 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -108,7 +108,7 @@ static const AMOVIESETUP_PIN amfQTDPin[] = static const AMOVIESETUP_FILTER amfQTV = { &CLSID_QTVDecoder, wQTVName, - MERIT_NORMAL, + MERIT_NORMAL-1, 2, amfQTVPin }; @@ -116,7 +116,7 @@ static const AMOVIESETUP_FILTER amfQTV = static const AMOVIESETUP_FILTER amfQTD = { &CLSID_QTSplitter, wQTDName, - MERIT_NORMAL, + MERIT_NORMAL-1, 3, amfQTDPin };

1 0

Jacek Caban : mshtml: Moved NPAPI struct declarations to npplugin.c.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 06e51bc6948badfc101d41927d1270153377d04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e51bc6948badfc101d41927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jan 13 12:16:39 2012 +0100 mshtml: Moved NPAPI struct declarations to npplugin.c. They are no longer needed in nsiface.idl --- dlls/mshtml/npplugin.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/nsiface.idl | 121 ----------------------------------------------- 2 files changed, 119 insertions(+), 121 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index e22499b..435933a 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -37,6 +37,125 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); /* Parts of npapi.h */ +#define NP_VERSION_MAJOR 0 +#define NP_VERSION_MINOR 25 + +typedef unsigned char NPBool; +typedef INT16 NPError; +typedef INT16 NPReason; +typedef char *NPMIMEType; + +typedef struct _NPP { + void *pdata; + void *ndata; +} NPP_t, *NPP; + +typedef struct _NPStream { + void *pdata; + void *ndata; + const char *url; + UINT32 end; + UINT32 lastmodified; + void *notifyData; + const char *headers; +} NPStream; + +typedef struct _NPSavedData { + INT32 len; + void *buf; +} NPSavedData; + +typedef struct _NPRect { + UINT16 top; + UINT16 left; + UINT16 bottom; + UINT16 right; +} NPRect; + +typedef enum { + NPFocusNext = 0, + NPFocusPrevious = 1 +} NPFocusDirection; + +#define NP_ABI_MASK 0 + +typedef enum { + NPPVpluginNameString = 1, + NPPVpluginDescriptionString, + NPPVpluginWindowBool, + NPPVpluginTransparentBool, + NPPVjavaClass, + NPPVpluginWindowSize, + NPPVpluginTimerInterval, + NPPVpluginScriptableInstance = (10 | NP_ABI_MASK), + NPPVpluginScriptableIID = 11, + NPPVjavascriptPushCallerBool = 12, + NPPVpluginKeepLibraryInMemory = 13, + NPPVpluginNeedsXEmbed = 14, + NPPVpluginScriptableNPObject = 15, + NPPVformValue = 16, + NPPVpluginUrlRequestsDisplayedBool = 17, + NPPVpluginWantsAllNetworkStreams = 18, + NPPVpluginNativeAccessibleAtkPlugId = 19, + NPPVpluginCancelSrcStream = 20, + NPPVSupportsAdvancedKeyHandling = 21 +} NPPVariable; + +typedef enum { + NPNVxDisplay = 1, + NPNVxtAppContext, + NPNVnetscapeWindow, + NPNVjavascriptEnabledBool, + NPNVasdEnabledBool, + NPNVisOfflineBool, + NPNVserviceManager = (10 | NP_ABI_MASK), + NPNVDOMElement = (11 | NP_ABI_MASK), + NPNVDOMWindow = (12 | NP_ABI_MASK), + NPNVToolkit = (13 | NP_ABI_MASK), + NPNVSupportsXEmbedBool = 14, + NPNVWindowNPObject = 15, + NPNVPluginElementNPObject = 16, + NPNVSupportsWindowless = 17, + NPNVprivateModeBool = 18, + NPNVsupportsAdvancedKeyHandling = 21 +} NPNVariable; + +typedef enum { + NPWindowTypeWindow = 1, + NPWindowTypeDrawable +} NPWindowType; + +typedef struct _NPWindow { + void *window; + INT32 x; + INT32 y; + UINT32 width; + UINT32 height; + NPRect clipRect; + NPWindowType type; +} NPWindow; + +typedef struct _NPFullPrint { + NPBool pluginPrinted; + NPBool printOne; + void *platformPrint; +} NPFullPrint; + +typedef struct _NPEmbedPrint { + NPWindow window; + void *platformPrint; +} NPEmbedPrint; + +typedef struct _NPPrint { + UINT16 mode; + union { + NPFullPrint fullPrint; + NPEmbedPrint embedPrint; + } print; +} NPPrint; + +typedef HRGN NPRegion; + #define NPERR_BASE 0 #define NPERR_NO_ERROR (NPERR_BASE + 0) #define NPERR_GENERIC_ERROR (NPERR_BASE + 1) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1477f2d..6a88103 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -3208,127 +3208,6 @@ interface nsIContentUtils : nsISupports nsresult AddScriptRunner(nsIRunnable *aRunnable); } -/* Parts of npapi.h */ - -cpp_quote("#define NP_VERSION_MAJOR 0") -cpp_quote("#define NP_VERSION_MINOR 25") - -typedef unsigned char NPBool; -typedef INT16 NPError; -typedef INT16 NPReason; -typedef char *NPMIMEType; - -typedef struct _NPP { - void *pdata; - void *ndata; -} NPP_t, *NPP; - -typedef struct _NPStream { - void *pdata; - void *ndata; - const char *url; - UINT32 end; - UINT32 lastmodified; - void *notifyData; - const char *headers; -} NPStream; - -typedef struct _NPSavedData { - INT32 len; - void *buf; -} NPSavedData; - -typedef struct _NPRect { - UINT16 top; - UINT16 left; - UINT16 bottom; - UINT16 right; -} NPRect; - -typedef enum { - NPFocusNext = 0, - NPFocusPrevious = 1 -} NPFocusDirection; - -#define NP_ABI_MASK 0 - -typedef enum { - NPPVpluginNameString = 1, - NPPVpluginDescriptionString, - NPPVpluginWindowBool, - NPPVpluginTransparentBool, - NPPVjavaClass, - NPPVpluginWindowSize, - NPPVpluginTimerInterval, - NPPVpluginScriptableInstance = (10 | NP_ABI_MASK), - NPPVpluginScriptableIID = 11, - NPPVjavascriptPushCallerBool = 12, - NPPVpluginKeepLibraryInMemory = 13, - NPPVpluginNeedsXEmbed = 14, - NPPVpluginScriptableNPObject = 15, - NPPVformValue = 16, - NPPVpluginUrlRequestsDisplayedBool = 17, - NPPVpluginWantsAllNetworkStreams = 18, - NPPVpluginNativeAccessibleAtkPlugId = 19, - NPPVpluginCancelSrcStream = 20, - NPPVSupportsAdvancedKeyHandling = 21 -} NPPVariable; - -typedef enum { - NPNVxDisplay = 1, - NPNVxtAppContext, - NPNVnetscapeWindow, - NPNVjavascriptEnabledBool, - NPNVasdEnabledBool, - NPNVisOfflineBool, - NPNVserviceManager = (10 | NP_ABI_MASK), - NPNVDOMElement = (11 | NP_ABI_MASK), - NPNVDOMWindow = (12 | NP_ABI_MASK), - NPNVToolkit = (13 | NP_ABI_MASK), - NPNVSupportsXEmbedBool = 14, - NPNVWindowNPObject = 15, - NPNVPluginElementNPObject = 16, - NPNVSupportsWindowless = 17, - NPNVprivateModeBool = 18, - NPNVsupportsAdvancedKeyHandling = 21 -} NPNVariable; - -typedef enum { - NPWindowTypeWindow = 1, - NPWindowTypeDrawable -} NPWindowType; - -typedef struct _NPWindow { - void *window; - INT32 x; - INT32 y; - UINT32 width; - UINT32 height; - NPRect clipRect; - NPWindowType type; -} NPWindow; - -typedef struct _NPFullPrint { - NPBool pluginPrinted; - NPBool printOne; - void *platformPrint; -} NPFullPrint; - -typedef struct _NPEmbedPrint { - NPWindow window; - void *platformPrint; -} NPEmbedPrint; - -typedef struct _NPPrint { - UINT16 mode; - union { - NPFullPrint fullPrint; - NPEmbedPrint embedPrint; - } print; -} NPPrint; - -typedef HRGN NPRegion; - [ object, uuid(8f672000-bab9-4c60-aaaf-2673c4e2a4c6),

1 0

Daniel Lehman : msvcp90: Add num_get<short> stubs.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 015ccccfeb07b047b68df5d852979d2a7dc35f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=015ccccfeb07b047b68df5d85… Author: Daniel Lehman <dlehman(a)esri.com> Date: Tue Jan 3 16:16:43 2012 -0800 msvcp90: Add num_get<short> stubs. --- dlls/msvcp90/locale.c | 115 +++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 130 ++++++++++++++++++++++---------------------- 2 files changed, 180 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=015ccccfeb07b047b68df…

1 0