September 2006 - Wine-commits

Robert Shearman : ole32: Make an ok message match the name of the function it is testing.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 83f13d6b99fc2cf514a68b0567f960e4569a91c7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=83f13d6b99fc2cf514a68b0… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:12:50 2006 +0100 ole32: Make an ok message match the name of the function it is testing. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index f3b9b27..437387f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -44,7 +44,7 @@ static void test_hglobal_storage_stat(vo mode = STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE;/*0x1012*/ r = StgCreateDocfileOnILockBytes( ilb, mode, 0, &stg ); - ok( r == S_OK, "CreateILockBytesOnHGlobal failed\n"); + ok( r == S_OK, "StgCreateDocfileOnILockBytes failed\n"); r = WriteClassStg( stg, &test_stg_cls ); ok( r == S_OK, "WriteClassStg failed\n");

1 0

Robert Shearman : ole32: Fix the IStream_SetSize function for HGLOBAL streams to ignore HighPart.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: bfc1bdc3bbf764ebb3da8af76afe7ded371cec62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=bfc1bdc3bbf764ebb3da8af… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:13:34 2006 +0100 ole32: Fix the IStream_SetSize function for HGLOBAL streams to ignore HighPart. --- dlls/ole32/hglobalstream.c | 4 +--- dlls/ole32/tests/hglobalstream.c | 2 -- 2 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 6d20725..e24fd9d 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -414,10 +414,8 @@ static HRESULT WINAPI HGLOBALStreamImpl_ TRACE("(%p, %ld)\n", iface, libNewSize.u.LowPart); /* - * As documented. + * HighPart is ignored as shown in tests */ - if (libNewSize.u.HighPart != 0) - return STG_E_INVALIDFUNCTION; if (This->streamSize.u.LowPart == libNewSize.u.LowPart) return S_OK; diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index 1377741..82de590 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -60,9 +60,7 @@ static void test_streamonhglobal(IStream ull.HighPart = -1; ull.LowPart = 0; hr = IStream_SetSize(pStream, ull); - todo_wine { ok_ole_success(hr, "IStream_SetSize"); - } hr = IStream_Commit(pStream, STGC_DEFAULT); ok_ole_success(hr, "IStream_Commit");

1 0

Robert Shearman : ole32: Fix the HGLOBAL stream IStream_Read function to return S_OK even if not all of the requested bytes were available .
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: a552c2ead7c406dd75dc49d32c797f3d1863a846 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a552c2ead7c406dd75dc49d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:11:56 2006 +0100 ole32: Fix the HGLOBAL stream IStream_Read function to return S_OK even if not all of the requested bytes were available. --- dlls/ole32/hglobalstream.c | 7 ++----- dlls/ole32/tests/hglobalstream.c | 2 -- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index eb2af30..7c78d68 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -255,14 +255,11 @@ static HRESULT WINAPI HGLOBALStreamImpl_ GlobalUnlock(This->supportHandle); /* - * The function returns S_OK if the buffer was filled completely - * it returns S_FALSE if the end of the stream is reached before the + * Always returns S_OK even if the end of the stream is reached before the * buffer is filled */ - if(*pcbRead == cb) - return S_OK; - return S_FALSE; + return S_OK; } /*** diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index f335852..df63093 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -53,9 +53,7 @@ static void test_streamonhglobal(IStream /* should return S_OK, not S_FALSE */ hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); - todo_wine { ok_ole_success(hr, "IStream_Read"); - } ok(read == sizeof(data), "IStream_Read returned read %ld instead of %d\n", read, sizeof(data)); /* ignores HighPart */

1 0

Robert Shearman : ole32: Fix the return value of the HGLOBAL stream IStream_LockRegion function.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 355903ddc43f2da1af6bab724745ad28057d929a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=355903ddc43f2da1af6bab7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:12:32 2006 +0100 ole32: Fix the return value of the HGLOBAL stream IStream_LockRegion function. --- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/tests/hglobalstream.c | 2 -- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 7c78d68..6d20725 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -563,7 +563,7 @@ static HRESULT WINAPI HGLOBALStreamImpl_ ULARGE_INTEGER cb, /* [in] */ DWORD dwLockType) /* [in] */ { - return S_OK; + return STG_E_INVALIDFUNCTION; } /* diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index df63093..1377741 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -71,9 +71,7 @@ static void test_streamonhglobal(IStream ok_ole_success(hr, "IStream_Revert"); hr = IStream_LockRegion(pStream, ull, ull, LOCK_WRITE); - todo_wine { ok(hr == STG_E_INVALIDFUNCTION, "IStream_LockRegion should have returned STG_E_INVALIDFUNCTION instead of 0x%08lx\n", hr); - } hr = IStream_Stat(pStream, &statstg, STATFLAG_DEFAULT); ok_ole_success(hr, "IStream_Stat");

1 0

Robert Shearman : ole32: Add tests for the stream object returned by CreateStreamOnHGlobal.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: e10103e3ec9497dcb60fb5c5f0ae2499b1399de9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e10103e3ec9497dcb60fb5c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Sep 11 11:11:19 2006 +0100 ole32: Add tests for the stream object returned by CreateStreamOnHGlobal. --- dlls/ole32/tests/Makefile.in | 1 dlls/ole32/tests/hglobalstream.c | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 dlls/ole32/tests/hglobalstream.c diff --git a/dlls/ole32/tests/Makefile.in b/dlls/ole32/tests/Makefile.in index 27d43a0..9d7068c 100644 --- a/dlls/ole32/tests/Makefile.in +++ b/dlls/ole32/tests/Makefile.in @@ -9,6 +9,7 @@ EXTRALIBS = -luuid CTESTS = \ clipboard.c \ compobj.c \ + hglobalstream.c \ marshal.c \ moniker.c \ ole2.c \ diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c new file mode 100644 index 0000000..f335852 --- /dev/null +++ b/dlls/ole32/tests/hglobalstream.c @@ -0,0 +1,102 @@ +/* + * Stream on HGLOBAL Tests + * + * Copyright 2006 Robert Shearman (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 + */ + +#define COBJMACROS + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" + +#include "wine/test.h" + +#define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08lx\n", hr) + +static void test_streamonhglobal(IStream *pStream) +{ + const char data[] = "Test String"; + ULARGE_INTEGER ull; + LARGE_INTEGER ll; + char buffer[128]; + ULONG read; + STATSTG statstg; + HRESULT hr; + + ull.QuadPart = sizeof(data); + hr = IStream_SetSize(pStream, ull); + ok_ole_success(hr, "IStream_SetSize"); + + hr = IStream_Write(pStream, data, sizeof(data), NULL); + ok_ole_success(hr, "IStream_Write"); + + ll.QuadPart = 0; + hr = IStream_Seek(pStream, ll, STREAM_SEEK_SET, NULL); + ok_ole_success(hr, "IStream_Seek"); + + /* should return S_OK, not S_FALSE */ + hr = IStream_Read(pStream, buffer, sizeof(buffer), &read); + todo_wine { + ok_ole_success(hr, "IStream_Read"); + } + ok(read == sizeof(data), "IStream_Read returned read %ld instead of %d\n", read, sizeof(data)); + + /* ignores HighPart */ + ull.HighPart = -1; + ull.LowPart = 0; + hr = IStream_SetSize(pStream, ull); + todo_wine { + ok_ole_success(hr, "IStream_SetSize"); + } + + hr = IStream_Commit(pStream, STGC_DEFAULT); + ok_ole_success(hr, "IStream_Commit"); + + hr = IStream_Revert(pStream); + ok_ole_success(hr, "IStream_Revert"); + + hr = IStream_LockRegion(pStream, ull, ull, LOCK_WRITE); + todo_wine { + ok(hr == STG_E_INVALIDFUNCTION, "IStream_LockRegion should have returned STG_E_INVALIDFUNCTION instead of 0x%08lx\n", hr); + } + + hr = IStream_Stat(pStream, &statstg, STATFLAG_DEFAULT); + ok_ole_success(hr, "IStream_Stat"); + ok(statstg.type == STGTY_STREAM, "statstg.type should have been STGTY_STREAM instead of %ld\n", statstg.type); + + /* test OOM condition */ + ull.HighPart = -1; + ull.LowPart = -1; + hr = IStream_SetSize(pStream, ull); + todo_wine { + ok(hr == E_OUTOFMEMORY, "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08lx\n", hr); + } +} + +START_TEST(hglobalstream) +{ + HRESULT hr; + IStream *pStream; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok_ole_success(hr, "CreateStreamOnHGlobal"); + + test_streamonhglobal(pStream); +}

1 0

Paul Vriens : wintrust: Change the name of the strings to not confuse them with the functions that are present in wintrust .
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 944a7788bdfd51ee2897544a1555f69b97eb6d05 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=944a7788bdfd51ee2897544… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 11 11:32:42 2006 +0200 wintrust: Change the name of the strings to not confuse them with the functions that are present in wintrust. --- dlls/wintrust/register.c | 96 +++++++++++++++++++++++----------------------- 1 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 955aad9..0e4d31c 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -703,28 +703,28 @@ static void WINTRUST_RegisterGenChainVer */ HRESULT WINAPI DllRegisterServer(void) { - static const CHAR WVTAsn1SpcPeImageDataEncode[] = "WVTAsn1SpcPeImageDataEncode"; - static const CHAR WVTAsn1SpcPeImageDataDecode[] = "WVTAsn1SpcPeImageDataDecode"; - static const CHAR WVTAsn1SpcLinkEncode[] = "WVTAsn1SpcLinkEncode"; - static const CHAR WVTAsn1SpcLinkDecode[] = "WVTAsn1SpcLinkDecode"; - static const CHAR WVTAsn1SpcSigInfoEncode[] = "WVTAsn1SpcSigInfoEncode"; - static const CHAR WVTAsn1SpcSigInfoDecode[] = "WVTAsn1SpcSigInfoDecode"; - static const CHAR WVTAsn1SpcIndirectDataContentEncode[] = "WVTAsn1SpcIndirectDataContentEncode"; - static const CHAR WVTAsn1SpcIndirectDataContentDecode[] = "WVTAsn1SpcIndirectDataContentDecode"; - static const CHAR WVTAsn1SpcSpAgencyInfoEncode[] = "WVTAsn1SpcSpAgencyInfoEncode"; - static const CHAR WVTAsn1SpcSpAgencyInfoDecode[] = "WVTAsn1SpcSpAgencyInfoDecode"; - static const CHAR WVTAsn1SpcMinimalCriteriaInfoEncode[] = "WVTAsn1SpcMinimalCriteriaInfoEncode"; - static const CHAR WVTAsn1SpcMinimalCriteriaInfoDecode[] = "WVTAsn1SpcMinimalCriteriaInfoDecode"; - static const CHAR WVTAsn1SpcFinancialCriteriaInfoEncode[] = "WVTAsn1SpcFinancialCriteriaInfoEncode"; - static const CHAR WVTAsn1SpcFinancialCriteriaInfoDecode[] = "WVTAsn1SpcFinancialCriteriaInfoDecode"; - static const CHAR WVTAsn1SpcStatementTypeEncode[] = "WVTAsn1SpcStatementTypeEncode"; - static const CHAR WVTAsn1SpcStatementTypeDecode[] = "WVTAsn1SpcStatementTypeDecode"; - static const CHAR WVTAsn1CatNameValueEncode[] = "WVTAsn1CatNameValueEncode"; - static const CHAR WVTAsn1CatNameValueDecode[] = "WVTAsn1CatNameValueDecode"; - static const CHAR WVTAsn1CatMemberInfoEncode[] = "WVTAsn1CatMemberInfoEncode"; - static const CHAR WVTAsn1CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; - static const CHAR WVTAsn1SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; - static const CHAR WVTAsn1SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; + static const CHAR SpcPeImageDataEncode[] = "WVTAsn1SpcPeImageDataEncode"; + static const CHAR SpcPeImageDataDecode[] = "WVTAsn1SpcPeImageDataDecode"; + static const CHAR SpcLinkEncode[] = "WVTAsn1SpcLinkEncode"; + static const CHAR SpcLinkDecode[] = "WVTAsn1SpcLinkDecode"; + static const CHAR SpcSigInfoEncode[] = "WVTAsn1SpcSigInfoEncode"; + static const CHAR SpcSigInfoDecode[] = "WVTAsn1SpcSigInfoDecode"; + static const CHAR SpcIndirectDataContentEncode[] = "WVTAsn1SpcIndirectDataContentEncode"; + static const CHAR SpcIndirectDataContentDecode[] = "WVTAsn1SpcIndirectDataContentDecode"; + static const CHAR SpcSpAgencyInfoEncode[] = "WVTAsn1SpcSpAgencyInfoEncode"; + static const CHAR SpcSpAgencyInfoDecode[] = "WVTAsn1SpcSpAgencyInfoDecode"; + static const CHAR SpcMinimalCriteriaInfoEncode[] = "WVTAsn1SpcMinimalCriteriaInfoEncode"; + static const CHAR SpcMinimalCriteriaInfoDecode[] = "WVTAsn1SpcMinimalCriteriaInfoDecode"; + static const CHAR SpcFinancialCriteriaInfoEncode[] = "WVTAsn1SpcFinancialCriteriaInfoEncode"; + static const CHAR SpcFinancialCriteriaInfoDecode[] = "WVTAsn1SpcFinancialCriteriaInfoDecode"; + static const CHAR SpcStatementTypeEncode[] = "WVTAsn1SpcStatementTypeEncode"; + static const CHAR SpcStatementTypeDecode[] = "WVTAsn1SpcStatementTypeDecode"; + static const CHAR CatNameValueEncode[] = "WVTAsn1CatNameValueEncode"; + static const CHAR CatNameValueDecode[] = "WVTAsn1CatNameValueDecode"; + static const CHAR CatMemberInfoEncode[] = "WVTAsn1CatMemberInfoEncode"; + static const CHAR CatMemberInfoDecode[] = "WVTAsn1CatMemberInfoDecode"; + static const CHAR SpcSpOpusInfoEncode[] = "WVTAsn1SpcSpOpusInfoEncode"; + static const CHAR SpcSpOpusInfoDecode[] = "WVTAsn1SpcSpOpusInfoDecode"; HRESULT Res = S_OK; HKEY Key; @@ -760,32 +760,32 @@ #define WINTRUST_REGISTEROID( oid, encod } \ } while (0) - WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_OBJID, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); - WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_STRUCT, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); - WINTRUST_REGISTEROID(SPC_CAB_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_CAB_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_LINK_OBJID, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_LINK_STRUCT, WVTAsn1SpcLinkEncode, WVTAsn1SpcLinkDecode); - WINTRUST_REGISTEROID(SPC_SIGINFO_OBJID, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); - WINTRUST_REGISTEROID(SPC_SIGINFO_STRUCT, WVTAsn1SpcSigInfoEncode, WVTAsn1SpcSigInfoDecode); - WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_OBJID, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); - WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_CONTENT_STRUCT, WVTAsn1SpcIndirectDataContentEncode, WVTAsn1SpcIndirectDataContentDecode); - WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_OBJID, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); - WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_STRUCT, WVTAsn1SpcSpAgencyInfoEncode, WVTAsn1SpcSpAgencyInfoDecode); - WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_OBJID, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); - WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_STRUCT, WVTAsn1SpcMinimalCriteriaInfoEncode, WVTAsn1SpcMinimalCriteriaInfoDecode); - WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_OBJID, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); - WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_STRUCT, WVTAsn1SpcFinancialCriteriaInfoEncode, WVTAsn1SpcFinancialCriteriaInfoDecode); - WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_OBJID, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); - WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_STRUCT, WVTAsn1SpcStatementTypeEncode, WVTAsn1SpcStatementTypeDecode); - WINTRUST_REGISTEROID(CAT_NAMEVALUE_OBJID, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); - WINTRUST_REGISTEROID(CAT_NAMEVALUE_STRUCT, WVTAsn1CatNameValueEncode, WVTAsn1CatNameValueDecode); - WINTRUST_REGISTEROID(CAT_MEMBERINFO_OBJID, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); - WINTRUST_REGISTEROID(CAT_MEMBERINFO_STRUCT, WVTAsn1CatMemberInfoEncode, WVTAsn1CatMemberInfoDecode); - WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_OBJID, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); - WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_STRUCT, WVTAsn1SpcSpOpusInfoEncode, WVTAsn1SpcSpOpusInfoDecode); + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_OBJID, SpcPeImageDataEncode, SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_STRUCT, SpcPeImageDataEncode, SpcPeImageDataDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_OBJID, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_CAB_DATA_STRUCT, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_OBJID, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_JAVA_CLASS_DATA_STRUCT, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_OBJID, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_LINK_STRUCT, SpcLinkEncode, SpcLinkDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_OBJID, SpcSigInfoEncode, SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_SIGINFO_STRUCT, SpcSigInfoEncode, SpcSigInfoDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_OBJID, SpcIndirectDataContentEncode, SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_INDIRECT_DATA_CONTENT_STRUCT, SpcIndirectDataContentEncode, SpcIndirectDataContentDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_OBJID, SpcSpAgencyInfoEncode, SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_AGENCY_INFO_STRUCT, SpcSpAgencyInfoEncode, SpcSpAgencyInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_OBJID, SpcMinimalCriteriaInfoEncode, SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_MINIMAL_CRITERIA_STRUCT, SpcMinimalCriteriaInfoEncode, SpcMinimalCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_OBJID, SpcFinancialCriteriaInfoEncode, SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_FINANCIAL_CRITERIA_STRUCT, SpcFinancialCriteriaInfoEncode, SpcFinancialCriteriaInfoDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_OBJID, SpcStatementTypeEncode, SpcStatementTypeDecode); + WINTRUST_REGISTEROID(SPC_STATEMENT_TYPE_STRUCT, SpcStatementTypeEncode, SpcStatementTypeDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_OBJID, CatNameValueEncode, CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_NAMEVALUE_STRUCT, CatNameValueEncode, CatNameValueDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_OBJID, CatMemberInfoEncode, CatMemberInfoDecode); + WINTRUST_REGISTEROID(CAT_MEMBERINFO_STRUCT, CatMemberInfoEncode, CatMemberInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_OBJID, SpcSpOpusInfoEncode, SpcSpOpusInfoDecode); + WINTRUST_REGISTEROID(SPC_SP_OPUS_INFO_STRUCT, SpcSpOpusInfoEncode, SpcSpOpusInfoDecode); #undef WINTRUST_REGISTEROID

1 0

Jeff Latimer : gdi: Fix test for GetGlyphIndicesW on non Unicode systems.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: aed4f478900f8bf454f40d81e01eeb697f1a20a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=aed4f478900f8bf454f40d8… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Sep 1 22:55:50 2006 +1000 gdi: Fix test for GetGlyphIndicesW on non Unicode systems. --- dlls/gdi/tests/font.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/gdi/tests/font.c b/dlls/gdi/tests/font.c index 4ed5bbc..699d9b2 100644 --- a/dlls/gdi/tests/font.c +++ b/dlls/gdi/tests/font.c @@ -402,6 +402,14 @@ static void test_GetGlyphIndices() WORD glyphs[(sizeof(testtext)/2)-1]; TEXTMETRIC textm; + typedef BOOL (WINAPI *fnGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); + fnGetGlyphIndicesW GetGlyphIndicesW = (fnGetGlyphIndicesW)GetProcAddress(LoadLibrary("gdi32"), + "GetGlyphIndicesW"); + if (!GetGlyphIndicesW) { + trace("GetGlyphIndices not available on platform\n"); + return; + } + memset(&lf, 0, sizeof(lf)); strcpy(lf.lfFaceName, "Symbol"); lf.lfHeight = 20;

1 0

Paul Vriens : wintrust: Use the return value of CryptRegisterOIDFunction.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: f9141fddbe3e8a44c22006e6e0160af4d36813ad URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f9141fddbe3e8a44c22006e… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Sep 11 11:23:20 2006 +0200 wintrust: Use the return value of CryptRegisterOIDFunction. --- dlls/wintrust/register.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index c9baea5..955aad9 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -740,9 +740,25 @@ HRESULT WINAPI DllRegisterServer(void) * - One call to CryptSIPRemoveProvider (do we need that?) */ + /* Testing on native shows that when an error is encountered in one of the CryptRegisterOIDFunction calls + * the rest of these calls is skipped. Registering is however continued for the trust providers. + * + * We are not totally in line with native as there all decoding functions are registered after all encoding + * functions. + */ #define WINTRUST_REGISTEROID( oid, encode_funcname, decode_funcname ) \ - CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, encode_funcname); \ - CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, decode_funcname) + do { \ + if (!CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_ENCODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, encode_funcname)) \ + { \ + Res = HRESULT_FROM_WIN32(GetLastError()); \ + goto add_trust_providers; \ + } \ + if (!CryptRegisterOIDFunction(X509_ASN_ENCODING, CRYPT_OID_DECODE_OBJECT_FUNC, oid, SP_POLICY_PROVIDER_DLL_NAME, decode_funcname)) \ + { \ + Res = HRESULT_FROM_WIN32(GetLastError()); \ + goto add_trust_providers; \ + } \ + } while (0) WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_OBJID, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); WINTRUST_REGISTEROID(SPC_PE_IMAGE_DATA_STRUCT, WVTAsn1SpcPeImageDataEncode, WVTAsn1SpcPeImageDataDecode); @@ -773,6 +789,8 @@ #define WINTRUST_REGISTEROID( oid, encod #undef WINTRUST_REGISTEROID +add_trust_providers: + /* Testing on W2K3 shows: * If we cannot open HKLM\Software\Microsoft\Cryptography\Providers\Trust * for writing, DllRegisterServer returns S_FALSE. If the key can be opened

1 0

James Liggett : explorer: Add support for tooltips for system tray icons.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 70cb31e4e6e6ab6e37dabc54b23d6ae4d31c0be3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=70cb31e4e6e6ab6e37dabc5… Author: James Liggett <jrliggett(a)cox.net> Date: Wed Aug 30 18:42:49 2006 -0700 explorer: Add support for tooltips for system tray icons. Based on the original systray implementation by Kai Morich <kai.morich(a)bigfoot.de>. --- programs/explorer/Makefile.in | 3 +- programs/explorer/systray.c | 55 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 5 deletions(-) diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 740611a..e386c2e 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = explorer.exe APPMODE = -mwindows -IMPORTS = user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = user32 gdi32 advapi32 kernel32 ntdll +DELAYIMPORTS = comctl32 EXTRADEFS = @HALINCL@ C_SRCS = \ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 70d29bf..7fc66fd 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -33,6 +33,7 @@ #include <assert.h> #define UNICODE #define _WIN32_IE 0x500 #include <windows.h> +#include <commctrl.h> #include <wine/debug.h> #include <wine/list.h> @@ -60,6 +61,7 @@ struct icon HICON image; /* the image to render */ HWND owner; /* the HWND passed in to the Shell_NotifyIcon call */ HWND window; /* the adaptor window */ + HWND tooltip; /* Icon tooltip */ UINT id; /* the unique id given by the app */ UINT callback_message; }; @@ -160,7 +162,26 @@ static struct icon *get_icon(HWND owner, return NULL; } -static void modify_icon(const NOTIFYICONDATAW *nid) +static void set_tooltip(struct icon *icon, WCHAR *szTip, BOOL modify) +{ + TTTOOLINFOW ti; + + ti.cbSize = sizeof(TTTOOLINFOW); + ti.uFlags = TTF_SUBCLASS | TTF_IDISHWND; + ti.hwnd = icon->window; + ti.hinst = 0; + ti.uId = (UINT_PTR)icon->window; + ti.lpszText = szTip; + ti.lParam = 0; + ti.lpReserved = NULL; + + if (modify) + SendMessageW(icon->tooltip, TTM_UPDATETIPTEXTW, 0, (LPARAM)&ti); + else + SendMessageW(icon->tooltip, TTM_ADDTOOLW, 0, (LPARAM)&ti); +} + +static void modify_icon(NOTIFYICONDATAW *nid, BOOL modify_tooltip) { struct icon *icon; @@ -186,13 +207,18 @@ static void modify_icon(const NOTIFYICON { icon->callback_message = nid->uCallbackMessage; } + if (nid->uFlags & NIF_TIP) + { + set_tooltip(icon, nid->szTip, modify_tooltip); + } } -static void add_icon(const NOTIFYICONDATAW *nid) +static void add_icon(NOTIFYICONDATAW *nid) { RECT rect; struct icon *icon; static const WCHAR adaptor_windowname[] = /* Wine System Tray Adaptor */ {'W','i','n','e',' ','S','y','s','t','e','m',' ','T','r','a','y',' ','A','d','a','p','t','o','r',0}; + static BOOL tooltps_initialized = FALSE; WINE_TRACE("id=0x%x, hwnd=%p\n", nid->uID, nid->hWnd); @@ -230,9 +256,29 @@ static void add_icon(const NOTIFYICONDAT if (!hide_systray) ShowWindow(icon->window, SW_SHOWNA); + /* create icon tooltip */ + + /* Register tooltip classes if this is the first icon */ + if (!tooltps_initialized) + { + INITCOMMONCONTROLSEX init_tooltip; + + init_tooltip.dwSize = sizeof(INITCOMMONCONTROLSEX); + init_tooltip.dwICC = ICC_TAB_CLASSES; + + InitCommonControlsEx(&init_tooltip); + tooltps_initialized = TRUE; + } + + icon->tooltip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, + WS_POPUP | TTS_ALWAYSTIP, + CW_USEDEFAULT, CW_USEDEFAULT, + CW_USEDEFAULT, CW_USEDEFAULT, + icon->window, NULL, NULL, NULL); + list_add_tail(&tray.icons, &icon->entry); - modify_icon(nid); + modify_icon(nid, FALSE); } static void delete_icon(const NOTIFYICONDATAW *nid) @@ -247,6 +293,7 @@ static void delete_icon(const NOTIFYICON return; } + DestroyWindow(icon->tooltip); DestroyWindow(icon->window); } @@ -304,7 +351,7 @@ static void handle_incoming(HWND hwndSou delete_icon(&nid); break; case NIM_MODIFY: - modify_icon(&nid); + modify_icon(&nid, TRUE); break; default: WINE_FIXME("unhandled tray message: %ld\n", cds->dwData);

1 0

Roderick Colenbrander : winex11.drv: Import glx context code.
by Alexandre Julliard 11 Sep '06

11 Sep '06

Module: wine Branch: master Commit: 9377c23efffc0fede71128b1419a8a1debfa5c00 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9377c23efffc0fede71128b… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Tue Aug 29 16:56:57 2006 +0200 winex11.drv: Import glx context code. --- dlls/opengl32/wgl.c | 228 ++++-------------------------- dlls/winex11.drv/opengl.c | 284 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/winex11.drv.spec | 8 + 3 files changed, 323 insertions(+), 197 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9377c23efffc0fede71…

1 0