September 2010 - Wine-Commits

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Password.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 0a4e85418224667d32518e6cdc50f7c741889951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4e85418224667d32518e6cd… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Sep 5 11:37:21 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Password. --- dlls/urlmon/tests/uri.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/uri.c | 28 ++++++++++---------- 2 files changed, 79 insertions(+), 15 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 21c841e..cfd7a04 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4279,7 +4279,7 @@ static const uri_builder_test uri_builder_tests[] = { { "http://google.com/",0,S_OK,FALSE, { {TRUE,"#fragment",NULL,Uri_PROPERTY_FRAGMENT,S_OK,FALSE}, - {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,TRUE}, + {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE}, {TRUE,"?query=x",NULL,Uri_PROPERTY_QUERY,S_OK,TRUE}, {TRUE,"username",NULL,Uri_PROPERTY_USER_NAME,S_OK,TRUE} }, @@ -4440,6 +4440,70 @@ static const uri_builder_test uri_builder_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/",0,S_OK,FALSE, + { + {TRUE,":password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + 0,S_OK,TRUE, + 0,S_OK,TRUE, + 0,0,0,S_OK,TRUE, + { + {"http://::password(a)google.com/",S_OK}, + {"::password(a)google.com",S_OK}, + {"http://google.com/",S_OK}, + {"google.com",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"google.com",S_OK}, + {":password",S_OK}, + {"/",S_OK}, + {"/",S_OK}, + {"",S_FALSE}, + {"http://::password(a)google.com/",S_OK}, + {"http",S_OK}, + {"::password",S_OK}, + {"",S_FALSE} + }, + { + {Uri_HOST_DNS,S_OK}, + {80,S_OK}, + {URL_SCHEME_HTTP,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "test/test",Uri_CREATE_ALLOW_RELATIVE,S_OK,FALSE, + { + {TRUE,"password",NULL,Uri_PROPERTY_PASSWORD,S_OK,FALSE} + }, + {FALSE}, + Uri_CREATE_ALLOW_RELATIVE,S_OK,TRUE, + 0,S_OK,TRUE, + Uri_CREATE_ALLOW_RELATIVE,0,0,S_OK,TRUE, + { + {":password(a)test/test",S_OK}, + {":password@",S_OK}, + {":password(a)test/test",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"password",S_OK}, + {"test/test",S_OK}, + {"test/test",S_OK}, + {"",S_FALSE}, + {":password(a)test/test",S_OK}, + {"",S_FALSE}, + {":password",S_OK}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_UNKNOWN,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 195786c..b5e9df0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -85,6 +85,9 @@ typedef struct { WCHAR *host; DWORD host_len; + + WCHAR *password; + DWORD password_len; } UriBuilder; typedef struct { @@ -4314,6 +4317,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) if(This->uri) IUri_Release(URI(This->uri)); heap_free(This->fragment); heap_free(This->host); + heap_free(This->password); heap_free(This); } @@ -4462,19 +4466,13 @@ static HRESULT WINAPI UriBuilder_GetPassword(IUriBuilder *iface, DWORD *pcchPass UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchPassword, ppwzPassword); - if(!pcchPassword) { - if(ppwzPassword) - *ppwzPassword = NULL; - return E_POINTER; - } - - if(!ppwzPassword) { - *pcchPassword = 0; - return E_POINTER; + if(!This->uri || This->uri->userinfo_split == -1 || This->modified_props & Uri_HAS_PASSWORD) + return get_builder_component(&This->password, &This->password_len, NULL, 0, ppwzPassword, pcchPassword); + else { + const WCHAR *start = This->uri->canon_uri+This->uri->userinfo_start+This->uri->userinfo_split+1; + DWORD len = This->uri->userinfo_len-This->uri->userinfo_split-1; + return get_builder_component(&This->password, &This->password_len, start, len, ppwzPassword, pcchPassword); } - - FIXME("(%p)->(%p %p)\n", This, pcchPassword, ppwzPassword); - return E_NOTIMPL; } static HRESULT WINAPI UriBuilder_GetPath(IUriBuilder *iface, DWORD *pcchPath, LPCWSTR *ppwzPath) @@ -4598,8 +4596,10 @@ static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue static HRESULT WINAPI UriBuilder_SetPassword(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + This->modified_props |= Uri_HAS_PASSWORD; + return set_builder_component(&This->password, &This->password_len, pwzNewValue, 0); } static HRESULT WINAPI UriBuilder_SetPath(IUriBuilder *iface, LPCWSTR pwzNewValue)

1 0

Thomas Mullaly : urlmon/tests: Restructured IUriBuilder's test data.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: cf1d55c24b9fb66c7200f2da12857759abeab5bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf1d55c24b9fb66c7200f2da1… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 4 22:40:30 2010 -0400 urlmon/tests: Restructured IUriBuilder's test data. Instead of just comparing the absolute URI property of the generated IUri, compare on a property by property basis. Since not all IUri's have an absolute URI property. --- dlls/urlmon/tests/uri.c | 420 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 356 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf1d55c24b9fb66c7200f…

1 0

Vincent Povirk : windowscodecs: Implement IWICComponentInfo::GetCLSID.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 06c35e8b7511162d1c869d5a2112112fc3beba62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c35e8b7511162d1c869d5a2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 5 22:22:52 2010 -0500 windowscodecs: Implement IWICComponentInfo::GetCLSID. --- dlls/windowscodecs/info.c | 33 +++++++++++++++++++++++++++------ dlls/windowscodecs/tests/info.c | 8 ++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 877ac4a..569b1a8 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -132,8 +132,15 @@ static HRESULT WINAPI BitmapDecoderInfo_GetComponentType(IWICBitmapDecoderInfo * static HRESULT WINAPI BitmapDecoderInfo_GetCLSID(IWICBitmapDecoderInfo *iface, CLSID *pclsid) { - FIXME("(%p,%p): stub\n", iface, pclsid); - return E_NOTIMPL; + BitmapDecoderInfo *This = (BitmapDecoderInfo*)iface; + TRACE("(%p,%p)\n", iface, pclsid); + + if (!pclsid) + return E_INVALIDARG; + + memcpy(pclsid, &This->clsid, sizeof(CLSID)); + + return S_OK; } static HRESULT WINAPI BitmapDecoderInfo_GetSigningStatus(IWICBitmapDecoderInfo *iface, DWORD *pStatus) @@ -564,8 +571,15 @@ static HRESULT WINAPI BitmapEncoderInfo_GetComponentType(IWICBitmapEncoderInfo * static HRESULT WINAPI BitmapEncoderInfo_GetCLSID(IWICBitmapEncoderInfo *iface, CLSID *pclsid) { - FIXME("(%p,%p): stub\n", iface, pclsid); - return E_NOTIMPL; + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + TRACE("(%p,%p)\n", iface, pclsid); + + if (!pclsid) + return E_INVALIDARG; + + memcpy(pclsid, &This->clsid, sizeof(CLSID)); + + return S_OK; } static HRESULT WINAPI BitmapEncoderInfo_GetSigningStatus(IWICBitmapEncoderInfo *iface, DWORD *pStatus) @@ -821,8 +835,15 @@ static HRESULT WINAPI FormatConverterInfo_GetComponentType(IWICFormatConverterIn static HRESULT WINAPI FormatConverterInfo_GetCLSID(IWICFormatConverterInfo *iface, CLSID *pclsid) { - FIXME("(%p,%p): stub\n", iface, pclsid); - return E_NOTIMPL; + FormatConverterInfo *This = (FormatConverterInfo*)iface; + TRACE("(%p,%p)\n", iface, pclsid); + + if (!pclsid) + return E_INVALIDARG; + + memcpy(pclsid, &This->clsid, sizeof(CLSID)); + + return S_OK; } static HRESULT WINAPI FormatConverterInfo_GetSigningStatus(IWICFormatConverterInfo *iface, DWORD *pStatus) diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 74d2748..de2dd32 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -35,6 +35,7 @@ static void test_decoder_info(void) ULONG len; WCHAR value[256]; const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; + CLSID clsid; hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void**)&factory); @@ -47,6 +48,13 @@ static void test_decoder_info(void) hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, NULL); + ok(hr == E_INVALIDARG, "GetCLSID failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetCLSID(decoder_info, &clsid); + ok(hr == S_OK, "GetCLSID failed, hr=%x\n", hr); + ok(IsEqualGUID(&CLSID_WICBmpDecoder, &clsid), "GetCLSID returned wrong result\n"); + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, NULL); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr);

1 0

Vincent Povirk : windowscodecs: Add tests for IWICBitmapDecoderInfo_GetMimeTypes.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 2d2a6526d88ca1575259b23f3561ebe5d94acc2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2a6526d88ca1575259b23f3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 5 21:48:31 2010 -0500 windowscodecs: Add tests for IWICBitmapDecoderInfo_GetMimeTypes. --- dlls/windowscodecs/tests/Makefile.in | 1 + dlls/windowscodecs/tests/info.c | 95 ++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/Makefile.in b/dlls/windowscodecs/tests/Makefile.in index d78da2e..e274d3c 100644 --- a/dlls/windowscodecs/tests/Makefile.in +++ b/dlls/windowscodecs/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = ole32 windowscodecs C_SRCS = \ bmpformat.c \ converter.c \ + info.c \ palette.c \ stream.c diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c new file mode 100644 index 0000000..3e5b26a --- /dev/null +++ b/dlls/windowscodecs/tests/info.c @@ -0,0 +1,95 @@ +/* + * Copyright 2009 Vincent Povirk for CodeWeavers + * + * 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 <stdarg.h> +#include <math.h> + +#define COBJMACROS + +#include "windef.h" +#include "objbase.h" +#include "wincodec.h" +#include "wine/test.h" + +static void test_decoder_info(void) +{ + IWICImagingFactory *factory; + IWICComponentInfo *info; + IWICBitmapDecoderInfo *decoder_info; + HRESULT hr; + ULONG len; + WCHAR value[256]; + const WCHAR expected_mimetype[] = {'i','m','a','g','e','/','b','m','p',0}; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + hr = IWICImagingFactory_CreateComponentInfo(factory, &CLSID_WICBmpDecoder, &info); + ok(hr == S_OK, "CreateComponentInfo failed, hr=%x\n", hr); + + hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); + ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); + +todo_wine { + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, NULL, &len); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, NULL); + ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + + value[0] = 0; + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, len, value, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); + ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 1, value, &len); + ok(hr == WINCODEC_ERR_INSUFFICIENTBUFFER, "GetMimeType failed, hr=%x\n", hr); + ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); + + hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 256, value, &len); + ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); + ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); + ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); +} + + IWICBitmapDecoderInfo_Release(decoder_info); + + IWICComponentInfo_Release(info); + + IWICImagingFactory_Release(factory); +} + +START_TEST(info) +{ + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + test_decoder_info(); + + CoUninitialize(); +}

1 0

Vincent Povirk : windowscodecs: Implement IWICBitmapCodecInfo::GetMimeTypes .
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: a53a57b79eb9e6d72ebdd734593672cb90705cc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a53a57b79eb9e6d72ebdd7345… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Sep 5 22:16:04 2010 -0500 windowscodecs: Implement IWICBitmapCodecInfo::GetMimeTypes. --- dlls/windowscodecs/info.c | 42 +++++++++++++++++++++++++++++++++++--- dlls/windowscodecs/tests/info.c | 2 - 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 373699d..877ac4a 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -36,8 +36,34 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +static WCHAR const mimetypes_valuename[] = {'M','i','m','e','T','y','p','e','s',0}; static WCHAR const pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; +static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, + UINT buffer_size, WCHAR *buffer, UINT *actual_size) +{ + LONG ret; + DWORD cbdata=buffer_size * sizeof(WCHAR); + + if (!actual_size) + return E_INVALIDARG; + + ret = RegGetValueW(classkey, NULL, value, RRF_RT_REG_SZ|RRF_NOEXPAND, NULL, + buffer, &cbdata); + + if (ret == 0 || ret == ERROR_MORE_DATA) + *actual_size = cbdata/sizeof(WCHAR); + + if (!buffer && buffer_size != 0) + /* Yes, native returns the correct size in this case. */ + return E_INVALIDARG; + + if (ret == ERROR_MORE_DATA) + return WINCODEC_ERR_INSUFFICIENTBUFFER; + + return HRESULT_FROM_WIN32(ret); +} + typedef struct { const IWICBitmapDecoderInfoVtbl *lpIWICBitmapDecoderInfoVtbl; LONG ref; @@ -188,8 +214,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetDeviceModels(IWICBitmapDecoderInfo *i static HRESULT WINAPI BitmapDecoderInfo_GetMimeTypes(IWICBitmapDecoderInfo *iface, UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchMimeTypes, wzMimeTypes, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = (BitmapDecoderInfo*)iface; + + TRACE("(%p,%u,%p,%p)\n", iface, cchMimeTypes, wzMimeTypes, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, mimetypes_valuename, + cchMimeTypes, wzMimeTypes, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetFileExtensions(IWICBitmapDecoderInfo *iface, @@ -616,8 +646,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetDeviceModels(IWICBitmapEncoderInfo *i static HRESULT WINAPI BitmapEncoderInfo_GetMimeTypes(IWICBitmapEncoderInfo *iface, UINT cchMimeTypes, WCHAR *wzMimeTypes, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchMimeTypes, wzMimeTypes, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = (BitmapEncoderInfo*)iface; + + TRACE("(%p,%u,%p,%p)\n", iface, cchMimeTypes, wzMimeTypes, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, mimetypes_valuename, + cchMimeTypes, wzMimeTypes, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetFileExtensions(IWICBitmapEncoderInfo *iface, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index 3e5b26a..74d2748 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -47,7 +47,6 @@ static void test_decoder_info(void) hr = IWICComponentInfo_QueryInterface(info, &IID_IWICBitmapDecoderInfo, (void**)&decoder_info); ok(hr == S_OK, "QueryInterface failed, hr=%x\n", hr); -todo_wine { hr = IWICBitmapDecoderInfo_GetMimeTypes(decoder_info, 0, NULL, NULL); ok(hr == E_INVALIDARG, "GetMimeType failed, hr=%x\n", hr); @@ -76,7 +75,6 @@ todo_wine { ok(hr == S_OK, "GetMimeType failed, hr=%x\n", hr); ok(lstrcmpW(value, expected_mimetype) == 0, "GetMimeType returned wrong value %s\n", wine_dbgstr_w(value)); ok(len == lstrlenW(expected_mimetype)+1, "GetMimeType returned wrong len %i\n", len); -} IWICBitmapDecoderInfo_Release(decoder_info);

1 0

Alexandre Julliard : widl: Fix declaration order in generated headers.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: d3c4106d6f6d587ec4b9013692dc1cf6da29c279 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c4106d6f6d587ec4b901369… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 6 17:06:59 2010 +0200 widl: Fix declaration order in generated headers. --- tools/widl/header.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b9b750a..eaef867 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1309,16 +1309,14 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#ifndef __WIDL_%s\n", header_token); fprintf(header, "#define __WIDL_%s\n\n", header_token); - start_cplusplus_guard(header); - - fprintf(header, "/* Headers for imported files */\n\n"); - write_imports(header, stmts); - fprintf(header, "\n"); - /* FIXME: should be before imported file includes */ fprintf(header, "/* Forward declarations */\n\n"); write_forward_decls(header, stmts); + + fprintf(header, "/* Headers for imported files */\n\n"); + write_imports(header, stmts); fprintf(header, "\n"); + start_cplusplus_guard(header); write_header_stmts(header, stmts, NULL, FALSE);

1 0

Paul Vriens : advapi32: Add stubs for FlushTrace[AW].
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 1042aa014509fa3c950e2443044f3ab0b7243033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1042aa014509fa3c950e24430… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 6 14:44:17 2010 +0200 advapi32: Add stubs for FlushTrace[AW]. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 17 +++++++++++++++++ include/evntrace.h | 8 ++++++++ 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 820d73c..ac69d3c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -220,8 +220,8 @@ @ stdcall FileEncryptionStatusA(str ptr) @ stdcall FileEncryptionStatusW(wstr ptr) @ stdcall FindFirstFreeAce(ptr ptr) -# @ stub FlushTraceA -# @ stub FlushTraceW +@ stdcall FlushTraceA(int64 str ptr) +@ stdcall FlushTraceW(int64 wstr ptr) # @ stub FreeEncryptedFileKeyInfo # @ stub FreeEncryptionCertificateHashList # @ stub FreeInheritedFromArray diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index a5d1837..df44cd2 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -199,6 +199,23 @@ ULONG WINAPI ControlTraceA( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRA } /****************************************************************************** + * FlushTraceA [ADVAPI32.@] + */ +ULONG WINAPI FlushTraceA ( TRACEHANDLE hSession, LPCSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + return ControlTraceA( hSession, SessionName, Properties, EVENT_TRACE_CONTROL_FLUSH ); +} + +/****************************************************************************** + * FlushTraceW [ADVAPI32.@] + */ +ULONG WINAPI FlushTraceW ( TRACEHANDLE hSession, LPCWSTR SessionName, PEVENT_TRACE_PROPERTIES Properties ) +{ + return ControlTraceW( hSession, SessionName, Properties, EVENT_TRACE_CONTROL_FLUSH ); +} + + +/****************************************************************************** * DeregisterEventSource [ADVAPI32.@] * * Closes a write handle to an event log diff --git a/include/evntrace.h b/include/evntrace.h index 993872e..41083ae 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -25,6 +25,11 @@ extern "C" { #endif +#define EVENT_TRACE_CONTROL_QUERY 0 +#define EVENT_TRACE_CONTROL_STOP 1 +#define EVENT_TRACE_CONTROL_UPDATE 2 +#define EVENT_TRACE_CONTROL_FLUSH 3 + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -202,6 +207,9 @@ ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); #define ControlTrace WINELIB_NAME_AW(ControlTrace) ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +#define FlushTrace WINELIB_NAME_AW(FlushTrace) ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); #define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces)

1 0

Thomas Mullaly : urlmon: Implemented IUriBuilder_{Get/Set}Host.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: 1e5040eca144e8824a4879e66f816bec08a0171c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5040eca144e8824a4879e66… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sat Sep 4 21:09:46 2010 -0400 urlmon: Implemented IUriBuilder_{Get/Set}Host. --- dlls/urlmon/tests/uri.c | 8 +++----- dlls/urlmon/uri.c | 32 ++++++++++++++++++-------------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 1ce6dfa..154bdff 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4288,7 +4288,7 @@ static const uri_builder_test uri_builder_tests[] = { { "/Test/test dir",Uri_CREATE_ALLOW_RELATIVE,S_OK,FALSE, { {TRUE,"http",NULL,Uri_PROPERTY_SCHEME_NAME,S_OK,TRUE}, - {TRUE,"::192.2.3.4",NULL,Uri_PROPERTY_HOST,S_OK,TRUE}, + {TRUE,"::192.2.3.4",NULL,Uri_PROPERTY_HOST,S_OK,FALSE}, {TRUE,NULL,NULL,Uri_PROPERTY_PATH,S_OK,TRUE} }, {FALSE}, @@ -6920,10 +6920,8 @@ static void test_IUriBuilder_HasBeenModified(void) { hr, E_POINTER); hr = IUriBuilder_SetHost(builder, hostW); - todo_wine { - ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", - hr, S_OK); - } + ok(hr == S_OK, "Error: IUriBuilder_SetHost returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); hr = IUriBuilder_HasBeenModified(builder, &received); todo_wine { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index c6b496b..195786c 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -82,6 +82,9 @@ typedef struct { WCHAR *fragment; DWORD fragment_len; + + WCHAR *host; + DWORD host_len; } UriBuilder; typedef struct { @@ -4310,6 +4313,7 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) if(!ref) { if(This->uri) IUri_Release(URI(This->uri)); heap_free(This->fragment); + heap_free(This->host); heap_free(This); } @@ -4440,19 +4444,17 @@ static HRESULT WINAPI UriBuilder_GetHost(IUriBuilder *iface, DWORD *pcchHost, LP UriBuilder *This = URIBUILDER_THIS(iface); TRACE("(%p)->(%p %p)\n", This, pcchHost, ppwzHost); - if(!pcchHost) { - if(ppwzHost) - *ppwzHost = NULL; - return E_POINTER; - } - - if(!ppwzHost) { - *pcchHost = 0; - return E_POINTER; + if(!This->uri || This->uri->host_start == -1 || This->modified_props & Uri_HAS_HOST) + return get_builder_component(&This->host, &This->host_len, NULL, 0, ppwzHost, pcchHost); + else { + if(This->uri->host_type == Uri_HOST_IPV6) + /* Don't include the '[' and ']' around the address. */ + return get_builder_component(&This->host, &This->host_len, This->uri->canon_uri+This->uri->host_start+1, + This->uri->host_len-2, ppwzHost, pcchHost); + else + return get_builder_component(&This->host, &This->host_len, This->uri->canon_uri+This->uri->host_start, + This->uri->host_len, ppwzHost, pcchHost); } - - FIXME("(%p)->(%p %p)\n", This, pcchHost, ppwzHost); - return E_NOTIMPL; } static HRESULT WINAPI UriBuilder_GetPassword(IUriBuilder *iface, DWORD *pcchPassword, LPCWSTR *ppwzPassword) @@ -4587,8 +4589,10 @@ static HRESULT WINAPI UriBuilder_SetFragment(IUriBuilder *iface, LPCWSTR pwzNewV static HRESULT WINAPI UriBuilder_SetHost(IUriBuilder *iface, LPCWSTR pwzNewValue) { UriBuilder *This = URIBUILDER_THIS(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(pwzNewValue)); + + This->modified_props |= Uri_HAS_HOST; + return set_builder_component(&This->host, &This->host_len, pwzNewValue, 0); } static HRESULT WINAPI UriBuilder_SetPassword(IUriBuilder *iface, LPCWSTR pwzNewValue)

1 0

Paul Vriens : include/evntrace.h: Add some definitions.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: dbb33085bfb287375796bf653fb05aeb71d1a5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbb33085bfb287375796bf653… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Sep 6 14:33:02 2010 +0200 include/evntrace.h: Add some definitions. --- include/evntrace.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/evntrace.h b/include/evntrace.h index 8f94cd2..993872e 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -198,10 +198,21 @@ typedef struct _EVENT_TRACE_PROPERTIES } EVENT_TRACE_PROPERTIES, *PEVENT_TRACE_PROPERTIES; ULONG WINAPI CloseTrace(TRACEHANDLE); +ULONG WINAPI ControlTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES,ULONG); +ULONG WINAPI ControlTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES,ULONG); +#define ControlTrace WINELIB_NAME_AW(ControlTrace) ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); +ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); +#define QueryAllTraces WINELIB_NAME_AW(QueryAllTraces) ULONG WINAPI RegisterTraceGuidsA(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCSTR,LPCSTR,PTRACEHANDLE); ULONG WINAPI RegisterTraceGuidsW(WMIDPREQUEST,PVOID,LPCGUID,ULONG,PTRACE_GUID_REGISTRATION,LPCWSTR,LPCWSTR,PTRACEHANDLE); #define RegisterTraceGuids WINELIB_NAME_AW(RegisterTraceGuids) +ULONG WINAPI StartTraceA(PTRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); +ULONG WINAPI StartTraceW(PTRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); +#define StartTrace WINELIB_NAME_AW(StartTrace) +ULONG WINAPI TraceEvent(TRACEHANDLE,PEVENT_TRACE_HEADER); +ULONG WINAPI UnregisterTraceGuids(TRACEHANDLE); #ifdef __cplusplus }

1 0

Austin English : winealsa.drv: Remove unused variable.
by Alexandre Julliard Sept. 6, 2010

Sept. 6, 2010

Module: wine Branch: master Commit: abd0a93afd3b1be423ac7c691793eb1749baa42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd0a93afd3b1be423ac7c691… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 6 01:49:12 2010 -0500 winealsa.drv: Remove unused variable. --- dlls/winealsa.drv/wavein.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 8985ec3..2b0630b 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -149,7 +149,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) enum win_wm_message msg; DWORD_PTR param; HANDLE ev; - DWORD frames_per_period; wwi->state = WINE_WS_STOPPED; InterlockedExchange((LONG*)&wwi->dwTotalRecorded, 0); @@ -159,7 +158,6 @@ static DWORD CALLBACK widRecorder(LPVOID pmt) /* make sleep time to be # of ms to output a period */ dwSleepTime = (wwi->dwPeriodSize * 1000) / wwi->format.Format.nAvgBytesPerSec; - frames_per_period = snd_pcm_bytes_to_frames(wwi->pcm, wwi->dwPeriodSize); TRACE("sleeptime=%d ms, total buffer length=%d ms (%d bytes)\n", dwSleepTime, wwi->dwBufferSize * 1000 / wwi->format.Format.nAvgBytesPerSec, wwi->dwBufferSize); for (;;) {

1 0