wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

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/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: 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: 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

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 + +@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

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

13 Jan '12

Module: wine Branch: master Commit: e3fb0783294b47584d3b181aae4afde2386cc178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3fb0783294b47584d3b181aa… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jan 11 11:12:41 2012 -0800 photometadatahandler: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/photometadatahandler/Makefile.in | 8 ++++ dlls/photometadatahandler/main.c | 43 ++++++++++++++++++++ dlls/photometadatahandler/photometadatahandler.rc | 29 +++++++++++++ .../photometadatahandler/photometadatahandler.spec | 4 ++ 6 files changed, 86 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 09b5cb4..59bcd7d 100755 --- a/configure +++ b/configure @@ -15228,6 +15228,7 @@ wine_fn_config_dll opengl32 enable_opengl32 implib wine_fn_config_test dlls/opengl32/tests opengl32_test wine_fn_config_dll pdh enable_pdh implib wine_fn_config_test dlls/pdh/tests pdh_test +wine_fn_config_dll photometadatahandler enable_photometadatahandler wine_fn_config_dll pidgen enable_pidgen wine_fn_config_dll powrprof enable_powrprof implib wine_fn_config_dll printui enable_printui diff --git a/configure.ac b/configure.ac index 279339c..5dc111c 100644 --- a/configure.ac +++ b/configure.ac @@ -2737,6 +2737,7 @@ WINE_CONFIG_DLL(opengl32,,[implib]) WINE_CONFIG_TEST(dlls/opengl32/tests) WINE_CONFIG_DLL(pdh,,[implib]) WINE_CONFIG_TEST(dlls/pdh/tests) +WINE_CONFIG_DLL(photometadatahandler) WINE_CONFIG_DLL(pidgen) WINE_CONFIG_DLL(powrprof,,[implib]) WINE_CONFIG_DLL(printui) diff --git a/dlls/photometadatahandler/Makefile.in b/dlls/photometadatahandler/Makefile.in new file mode 100644 index 0000000..a4ce922 --- /dev/null +++ b/dlls/photometadatahandler/Makefile.in @@ -0,0 +1,8 @@ +MODULE = photometadatahandler.dll + +C_SRCS = \ + main.c + +RC_SRCS = photometadatahandler.rc + +@MAKE_DLL_RULES@ diff --git a/dlls/photometadatahandler/main.c b/dlls/photometadatahandler/main.c new file mode 100644 index 0000000..4de07a0 --- /dev/null +++ b/dlls/photometadatahandler/main.c @@ -0,0 +1,43 @@ +/* + * PhotoMetadataHandler implementation + * + * 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/photometadatahandler/photometadatahandler.rc b/dlls/photometadatahandler/photometadatahandler.rc new file mode 100644 index 0000000..7178e4f --- /dev/null +++ b/dlls/photometadatahandler/photometadatahandler.rc @@ -0,0 +1,29 @@ +/* + * Resources for Photo Metadata Handler + * + * 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 photometadatahandler dll" +#define WINE_FILENAME_STR "photometadatahandler.dll" +#define WINE_FILEVERSION 7,0,0,0 +#define WINE_FILEVERSION_STR "7.0.0.0" +#define WINE_PRODUCTVERSION 7,0,0,0 +#define WINE_PRODUCTVERSION_STR "7.0.0.0" + + +#include "wine/wine_common_ver.rc" diff --git a/dlls/photometadatahandler/photometadatahandler.spec b/dlls/photometadatahandler/photometadatahandler.spec new file mode 100644 index 0000000..c5fc87a --- /dev/null +++ b/dlls/photometadatahandler/photometadatahandler.spec @@ -0,0 +1,4 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer

1 0

Detlef Riekenberg : shell32: Reorder functions to avoid forward declarations.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: cbfb15e8ebcb404d36197dab8319d0d1d78d06f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfb15e8ebcb404d36197dab8… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 11 22:25:31 2012 +0100 shell32: Reorder functions to avoid forward declarations. --- dlls/shell32/autocomplete.c | 551 +++++++++++++++++++++---------------------- 1 files changed, 271 insertions(+), 280 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbfb15e8ebcb404d36197…

1 0

Detlef Riekenberg : shell32: Remove outdated dll names from comments.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 38d58f8764b8dd6fed50b78be019fd12dadfd4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=38d58f8764b8dd6fed50b78be… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Jan 11 23:58:09 2012 +0100 shell32: Remove outdated dll names from comments. --- dlls/shell32/assoc.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 70056ba..ce3434c 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /************************************************************************** - * IQueryAssociations {SHELL32} + * IQueryAssociations * * DESCRIPTION * This object provides a layer of abstraction over the system registry in @@ -71,7 +71,7 @@ static inline IQueryAssociationsImpl *impl_from_IQueryAssociations(IQueryAssocia } /************************************************************************** - * IQueryAssociations_QueryInterface {SHLWAPI} + * IQueryAssociations_QueryInterface * * See IUnknown_QueryInterface. */ @@ -100,7 +100,7 @@ static HRESULT WINAPI IQueryAssociations_fnQueryInterface( } /************************************************************************** - * IQueryAssociations_AddRef {SHLWAPI} + * IQueryAssociations_AddRef * * See IUnknown_AddRef. */ @@ -115,7 +115,7 @@ static ULONG WINAPI IQueryAssociations_fnAddRef(IQueryAssociations *iface) } /************************************************************************** - * IQueryAssociations_Release {SHLWAPI} + * IQueryAssociations_Release * * See IUnknown_Release. */ @@ -138,7 +138,7 @@ static ULONG WINAPI IQueryAssociations_fnRelease(IQueryAssociations *iface) } /************************************************************************** - * IQueryAssociations_Init {SHLWAPI} + * IQueryAssociations_Init * * Initialise an IQueryAssociations object. * @@ -374,7 +374,7 @@ static HRESULT ASSOC_ReturnData(LPWSTR out, DWORD *outlen, LPCWSTR data, } /************************************************************************** - * IQueryAssociations_GetString {SHLWAPI} + * IQueryAssociations_GetString * * Get a file association string from the registry. * @@ -599,7 +599,7 @@ get_friendly_name_fail: } /************************************************************************** - * IQueryAssociations_GetKey {SHLWAPI} + * IQueryAssociations_GetKey * * Get a file association key from the registry. * @@ -629,7 +629,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetKey( } /************************************************************************** - * IQueryAssociations_GetData {SHLWAPI} + * IQueryAssociations_GetData * * Get the data for a file association key from the registry. * @@ -661,7 +661,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetData( } /************************************************************************** - * IQueryAssociations_GetEnum {SHLWAPI} + * IQueryAssociations_GetEnum * * Not yet implemented in native Win32. *

1 0

Jörg Höhle : winecoreaudio: Fix AudioCaptureClient Get/ReleaseBuffer protocol.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: ee5f6f229e4504d9435af8e653b8080b0fbb0fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee5f6f229e4504d9435af8e65… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Aug 21 23:35:11 2011 +0200 winecoreaudio: Fix AudioCaptureClient Get/ReleaseBuffer protocol. --- dlls/winecoreaudio.drv/mmdevdrv.c | 56 +++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 5d69e3c..6161e51 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1950,32 +1950,38 @@ static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, } if(This->public_buffer){ - *data = This->public_buffer->mAudioData; *frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; }else{ struct list *head = list_head(&This->avail_buffers); if(!head){ - *data = NULL; *frames = 0; }else{ AQBuffer *buf = LIST_ENTRY(head, AQBuffer, entry); This->public_buffer = buf->buf; - *data = This->public_buffer->mAudioData; *frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; list_remove(&buf->entry); + if(!*frames){ + OSStatus sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); + if(sc != noErr) + ERR("Unable to enqueue buffer: %lx\n", sc); + This->public_buffer = NULL; + WARN("empty packet\n"); + } } } - *flags = 0; - This->written_frames += *frames; - This->inbuf_frames -= *frames; - This->getbuf_last = 1; - - if(devpos || qpcpos) - AudioClock_GetPosition_nolock(This, devpos, qpcpos); + if((This->getbuf_last = *frames)){ + UINT64 pos; + *flags = 0; + *data = This->public_buffer->mAudioData; + if(devpos) + *devpos = This->written_frames; + if(qpcpos) /* fixme: qpc of recording time */ + AudioClock_GetPosition_nolock(This, &pos, qpcpos); + } OSSpinLockUnlock(&This->lock); return *frames ? S_OK : AUDCLNT_S_BUFFER_EMPTY; @@ -1985,34 +1991,42 @@ static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( IAudioCaptureClient *iface, UINT32 done) { ACImpl *This = impl_from_IAudioCaptureClient(iface); - UINT32 pbuf_frames; OSStatus sc; TRACE("(%p)->(%u)\n", This, done); OSSpinLockLock(&This->lock); + if(!done){ + This->getbuf_last = 0; + OSSpinLockUnlock(&This->lock); + return S_OK; + } + if(!This->getbuf_last){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } - pbuf_frames = This->public_buffer->mAudioDataByteSize / This->fmt->nBlockAlign; - if(done != 0 && done != pbuf_frames){ + if(This->getbuf_last != done){ OSSpinLockUnlock(&This->lock); return AUDCLNT_E_INVALID_SIZE; } - if(done){ - sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, - 0, NULL); - if(sc != noErr) - WARN("Unable to enqueue buffer: %lx\n", sc); - This->public_buffer = NULL; - } - + This->written_frames += done; + This->inbuf_frames -= done; This->getbuf_last = 0; + sc = AudioQueueEnqueueBuffer(This->aqueue, This->public_buffer, 0, NULL); + if(sc != noErr){ + OSSpinLockUnlock(&This->lock); + /* fixme: can't zero public_buffer or we lose memory, but then + * GetBuffer will see that packet again and again. */ + ERR("Unable to enqueue buffer: %lx\n", sc); + return AUDCLNT_E_DEVICE_INVALIDATED; + } + This->public_buffer = NULL; + OSSpinLockUnlock(&This->lock); return S_OK;

1 0

Jörg Höhle : wineoss: Reset accounts for dropped frames in capture mode.
by Alexandre Julliard 13 Jan '12

13 Jan '12

Module: wine Branch: master Commit: 04cf4dc06ff5d2d1b43d3a7d6f3ccbb07b8c1fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04cf4dc06ff5d2d1b43d3a7d6… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 12 23:08:47 2012 +0100 wineoss: Reset accounts for dropped frames in capture mode. --- dlls/wineoss.drv/mmdevdrv.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 89c9adf..8bfb768 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1501,7 +1501,12 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_BUFFER_OPERATION_PENDING; } - This->written_frames = 0; + if(This->dataflow == eRender){ + This->written_frames = 0; + }else{ + This->written_frames += This->held_frames; + } + This->lcl_offs_frames = 0; This->inbuf_frames = 0; This->held_frames = 0;

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012