October 2008 - Wine-Commits

Austin English : wineinstall: Remove bashisms, make sh compatible.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 7e4fc8cb35b5741f012094894f5ba18535ab5486 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e4fc8cb35b5741f012094894… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 17 21:27:37 2008 -0500 wineinstall: Remove bashisms, make sh compatible. --- tools/wineinstall | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/wineinstall b/tools/wineinstall index e4ad473..fe48505 100755 --- a/tools/wineinstall +++ b/tools/wineinstall @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # WINE Installation script # Can do almost everything from compiling to configuring... # @@ -22,13 +22,11 @@ #--- defaults (change these if you are a packager) CONFARGS="" # configure args, e.g. --prefix=/usr -# functions - -function std_sleep { +std_sleep() { sleep 1 } -function conf_yesno_answer { +conf_yesno_answer() { unset ANSWER while [ "$ANSWER" != 'yes' ] && [ "$ANSWER" != 'no' ] do {

1 0

Andrew Talbot : mshtml: Sign-compare warnings fix.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 75d4faabd38acb25cb13ebf764ad765bb9595255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d4faabd38acb25cb13ebf76… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Oct 18 16:08:41 2008 +0100 mshtml: Sign-compare warnings fix. --- dlls/mshtml/conpoint.c | 2 +- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/main.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/protocol.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/conpoint.c b/dlls/mshtml/conpoint.c index 0c77e9c..10d8e29 100644 --- a/dlls/mshtml/conpoint.c +++ b/dlls/mshtml/conpoint.c @@ -213,7 +213,7 @@ void ConnectionPoint_Init(ConnectionPoint *cp, ConnectionPointContainer *contain static void ConnectionPoint_Destroy(ConnectionPoint *This) { - int i; + DWORD i; for(i=0; i<This->sinks_size; i++) { if(This->sinks[i].unk) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7fc6f30..01d52a2 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -763,7 +763,7 @@ static HRESULT WINAPI HTMLDocument_write(IHTMLDocument2 *iface, SAFEARRAY *psarr HTMLDocument *This = HTMLDOC_THIS(iface); nsAString nsstr; VARIANT *var; - int i; + ULONG i; nsresult nsres; HRESULT hres; diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 1315e8a..8b441f0 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -318,7 +318,7 @@ static HRESULT register_server(BOOL do_register) STRTABLEA strtable; STRENTRYA pse[35]; static CLSID const *clsids[35]; - int i = 0; + unsigned int i = 0; static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 45386be..1734541 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -497,7 +497,7 @@ BOOL load_gecko(BOOL silent) PRUnichar gre_path[MAX_PATH]; BOOL ret = FALSE; - static LONG loading_thread; + static DWORD loading_thread; TRACE("()\n"); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 82f7c0d..1843542 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1583,7 +1583,7 @@ static nsresult NSAPI nsURI_SchemeIs(nsIWineURI *iface, const char *scheme, PRBo WCHAR buf[INTERNET_MAX_SCHEME_LENGTH]; int len = MultiByteToWideChar(CP_ACP, 0, scheme, -1, buf, sizeof(buf)/sizeof(WCHAR))-1; - *_retval = strlenW(This->wine_url) > len + *_retval = lstrlenW(This->wine_url) > len && This->wine_url[len] == ':' && !memcmp(buf, This->wine_url, len*sizeof(WCHAR)); return NS_OK; diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index ff319ac..4cdac9f 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -424,7 +424,7 @@ static HRESULT WINAPI AboutProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, L dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); if(ParseAction == PARSE_SECURITY_URL) { - int len = lstrlenW(pwzUrl); + unsigned int len = strlenW(pwzUrl); if(len >= cchResult) return S_FALSE;

1 0

Ricardo Filipe : reg.exe: Added Portuguese translation.
by Alexandre Julliard Oct. 20, 2008

Oct. 20, 2008

Module: wine Branch: master Commit: 3df91587476b0c47e84abb48ea367bf3a7fb2bea URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df91587476b0c47e84abb48e… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Sat Oct 18 17:18:35 2008 -0700 reg.exe: Added Portuguese translation. --- programs/reg/Pt.rc | 31 +++++++++++++++++++++++++++++++ programs/reg/rsrc.rc | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/reg/Pt.rc b/programs/reg/Pt.rc new file mode 100644 index 0000000..2918883 --- /dev/null +++ b/programs/reg/Pt.rc @@ -0,0 +1,31 @@ +/* + * REG.EXE - Wine-compatible reg program. + * Portuguese language support + * + * Copyright 2008 Andrew Riedi + * Copyright 2008 Ricardo Filipe + * + * 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 + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +STRINGTABLE +{ + STRING_USAGE, "A sintaxe deste comando é:\n\nREG [ ADD | DELETE | QUERY ]\nREG comando /?\n" + STRING_ADD_USAGE, "REG ADD nome_chave [/v nome_valor | /ve] [/t tipo] [/s separador] [/d dados] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nome_chave [/v nome_valor | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nome_chave [/v nome_valor | /ve] [/s]\n" +} diff --git a/programs/reg/rsrc.rc b/programs/reg/rsrc.rc index 0c69c1b..743c324 100644 --- a/programs/reg/rsrc.rc +++ b/programs/reg/rsrc.rc @@ -31,5 +31,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Nl.rc" #include "No.rc" #include "Pl.rc" +#include "Pt.rc" #include "Ru.rc" #include "Si.rc"

1 0

Juan Lang : wintrust: Implement WVTAsn1CatNameValueDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 36d01401dc734e049b28748d3d8418c291c7b0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d01401dc734e049b28748d3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 15:34:12 2008 -0700 wintrust: Implement WVTAsn1CatNameValueDecode. --- dlls/wintrust/asn.c | 30 ++++++++++++++++++++++++++++-- dlls/wintrust/tests/asn.c | 4 ---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 3f6a0e8..cc877dc 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2095,7 +2095,33 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo) { - FIXME("(%p, %d, %08x, %p, %d): stub\n", pbEncoded, cbEncoded, dwFlags, + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - return FALSE; + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_BMPSTRING, offsetof(CAT_NAMEVALUE, pwszTag), + CRYPT_AsnDecodeBMPString, sizeof(LPWSTR), FALSE, TRUE, + offsetof(CAT_NAMEVALUE, pwszTag), 0 }, + { ASN_INTEGER, offsetof(CAT_NAMEVALUE, fdwFlags), + CRYPT_AsnDecodeInt, sizeof(DWORD), FALSE, FALSE, 0, 0 }, + { ASN_OCTETSTRING, offsetof(CAT_NAMEVALUE, Value), + CRYPT_AsnDecodeOctets, sizeof(CRYPT_DER_BLOB), FALSE, TRUE, + offsetof(CAT_NAMEVALUE, Value.pbData), 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pcbStructInfo, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + TRACE("returning %d\n", ret); + return ret; } diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index b7386d9..0f18c6d 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -663,7 +663,6 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, emptyCatNameValue, sizeof(emptyCatNameValue), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -678,7 +677,6 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithTag, sizeof(catNameValueWithTag), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -694,7 +692,6 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithFlags, sizeof(catNameValueWithFlags), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -709,7 +706,6 @@ static void test_decodeCatNameValue(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithValue, sizeof(catNameValueWithValue), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : wintrust: Add tests for WVTAsn1CatNameValueDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: e009cd90396ab557d8cf39cdc46da22f1bcc2963 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e009cd90396ab557d8cf39cdc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 15:33:46 2008 -0700 wintrust: Add tests for WVTAsn1CatNameValueDecode. --- dlls/wintrust/tests/asn.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index cb0e2b0..b7386d9 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -653,6 +653,78 @@ static void test_encodeCatNameValue(void) } } +static void test_decodeCatNameValue(void) +{ + BOOL ret; + LPBYTE buf; + DWORD size; + CAT_NAMEVALUE *value; + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + emptyCatNameValue, sizeof(emptyCatNameValue), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + value = (CAT_NAMEVALUE *)buf; + ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + value->fdwFlags); + ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + value->Value.cbData); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + catNameValueWithTag, sizeof(catNameValueWithTag), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + value = (CAT_NAMEVALUE *)buf; + ok(value->pwszTag && !lstrcmpW(value->pwszTag, foo), + "unexpected pwszTag\n"); + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + value->fdwFlags); + ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + value->Value.cbData); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + catNameValueWithFlags, sizeof(catNameValueWithFlags), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + value = (CAT_NAMEVALUE *)buf; + ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); + ok(value->fdwFlags == 0xf00dd00d, + "expected fdwFlags == 0xf00dd00d, got %08x\n", value->fdwFlags); + ok(value->Value.cbData == 0, "expected 0-length value, got %d\n", + value->Value.cbData); + LocalFree(buf); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + catNameValueWithValue, sizeof(catNameValueWithValue), + CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + value = (CAT_NAMEVALUE *)buf; + ok(!value->pwszTag || !value->pwszTag[0], "expected empty pwszTag\n"); + ok(value->fdwFlags == 0, "expected fdwFlags == 0, got %08x\n", + value->fdwFlags); + ok(value->Value.cbData == sizeof(aVal), "unexpected size %d\n", + value->Value.cbData); + ok(!memcmp(value->Value.pbData, aVal, value->Value.cbData), + "unexpected value\n"); + LocalFree(buf); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -666,6 +738,7 @@ START_TEST(asn) test_encodeCatMemberInfo(); test_decodeCatMemberInfo(); test_encodeCatNameValue(); + test_decodeCatNameValue(); FreeLibrary(hCrypt32); }

1 0

Juan Lang : wintrust: Add stub for WVTAsn1CatNameValueDecode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 9216340ab7f52abba6a439ad0d4019d857c1a202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9216340ab7f52abba6a439ad0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 15:33:27 2008 -0700 wintrust: Add stub for WVTAsn1CatNameValueDecode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index b18539a..3f6a0e8 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2090,3 +2090,12 @@ BOOL WINAPI WVTAsn1CatMemberInfoDecode(DWORD dwCertEncodingType, TRACE("returning %d\n", ret); return ret; } + +BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + FIXME("(%p, %d, %08x, %p, %d): stub\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo); + return FALSE; +} diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 5c86b45..83d41db 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -88,7 +88,7 @@ @ stdcall WTHelperProvDataFromStateData(ptr) @ stdcall WVTAsn1CatMemberInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) -@ stub WVTAsn1CatNameValueDecode +@ stdcall WVTAsn1CatNameValueDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcFinancialCriteriaInfoDecode @ stub WVTAsn1SpcFinancialCriteriaInfoEncode

1 0

Juan Lang : wintrust: Implement WVTAsn1CatNameValueEncode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 74b91cb25fed1b10d6655edc1f53a9b7fa4fa0b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74b91cb25fed1b10d6655edc1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 15:31:12 2008 -0700 wintrust: Implement WVTAsn1CatNameValueEncode. --- dlls/wintrust/asn.c | 24 ++++++++++++++++++++++-- dlls/wintrust/tests/asn.c | 4 ---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 9a1c1b8..b18539a 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -911,9 +911,29 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, DWORD *pcbEncoded) { - FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + BOOL ret = FALSE; + + TRACE("(0x%08x, %s, %p, %p, %p)\n", dwCertEncodingType, debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); - return FALSE; + + __TRY + { + const CAT_NAMEVALUE *value = (const CAT_NAMEVALUE *)pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { value->pwszTag, CRYPT_AsnEncodeBMPString, 0 }, + { &value->fdwFlags, CRYPT_AsnEncodeInt, 0 }, + { &value->Value, CRYPT_AsnEncodeOctets, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, + items, sizeof(items) / sizeof(items[0]), pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; } /* Gets the number of length bytes from the given (leading) length byte */ diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 4ef35ee..cb0e2b0 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -607,7 +607,6 @@ static void test_encodeCatNameValue(void) memset(&value, 0, sizeof(value)); ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -619,7 +618,6 @@ static void test_encodeCatNameValue(void) value.pwszTag = foo; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -632,7 +630,6 @@ static void test_encodeCatNameValue(void) value.fdwFlags = 0xf00dd00d; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -646,7 +643,6 @@ static void test_encodeCatNameValue(void) value.Value.pbData = aVal; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : wintrust: Add tests for WVTAsn1CatNameValueEncode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 1f6a67d881e4934ba739236b1d65c63efe856de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f6a67d881e4934ba739236b1… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:43:05 2008 -0700 wintrust: Add tests for WVTAsn1CatNameValueEncode. --- dlls/wintrust/tests/asn.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 034d922..4ef35ee 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -585,6 +585,78 @@ static void test_decodeCatMemberInfo(void) } } +static const BYTE emptyCatNameValue[] = { +0x30,0x07,0x1e,0x00,0x02,0x01,0x00,0x04,0x00 }; +static const BYTE catNameValueWithTag[] = { +0x30,0x0d,0x1e,0x06,0x00,0x66,0x00,0x6f,0x00,0x6f,0x02,0x01,0x00,0x04,0x00 }; +static const BYTE catNameValueWithFlags[] = { +0x30,0x0a,0x1e,0x00,0x02,0x04,0xf0,0x0d,0xd0,0x0d,0x04,0x00 }; +static const BYTE catNameValueWithValue[] = { +0x30,0x0b,0x1e,0x00,0x02,0x01,0x00,0x04,0x04,0x01,0x02,0x03,0x04 }; + +static BYTE aVal[] = { 1,2,3,4 }; + +static void test_encodeCatNameValue(void) +{ + static WCHAR foo[] = { 'f','o','o',0 }; + BOOL ret; + LPBYTE buf; + DWORD size; + CAT_NAMEVALUE value; + + memset(&value, 0, sizeof(value)); + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(emptyCatNameValue), "Unexpected size %d\n", size); + ok(!memcmp(buf, emptyCatNameValue, sizeof(emptyCatNameValue)), + "Unexpected value\n"); + LocalFree(buf); + } + value.pwszTag = foo; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(catNameValueWithTag), "Unexpected size %d\n", size); + ok(!memcmp(buf, catNameValueWithTag, sizeof(catNameValueWithTag)), + "Unexpected value\n"); + LocalFree(buf); + } + value.pwszTag = NULL; + value.fdwFlags = 0xf00dd00d; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(catNameValueWithFlags), "Unexpected size %d\n", size); + ok(!memcmp(buf, catNameValueWithFlags, sizeof(catNameValueWithFlags)), + "Unexpected value\n"); + LocalFree(buf); + } + value.fdwFlags = 0; + value.Value.cbData = sizeof(aVal); + value.Value.pbData = aVal; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, + (LPBYTE)&value, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(catNameValueWithValue), "Unexpected size %d\n", size); + ok(!memcmp(buf, catNameValueWithValue, sizeof(catNameValueWithValue)), + "Unexpected value\n"); + LocalFree(buf); + } +} + START_TEST(asn) { HMODULE hCrypt32 = LoadLibraryA("crypt32.dll"); @@ -597,6 +669,7 @@ START_TEST(asn) test_decodeSPCPEImage(); test_encodeCatMemberInfo(); test_decodeCatMemberInfo(); + test_encodeCatNameValue(); FreeLibrary(hCrypt32); }

1 0

Vitaliy Margolen : wined3d: Add one more FBO error status code.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: a2b2a4cf7908c8151a8ade2f2a61dae5c0fbe4e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b2a4cf7908c8151a8ade2f2… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Oct 18 10:48:24 2008 -0600 wined3d: Add one more FBO error status code. --- dlls/wined3d/utils.c | 1 + include/wine/wined3d_gl.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2e7caf8..94d8625 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1083,6 +1083,7 @@ const char *debug_fbostatus(GLenum status) { FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT); + FBOSTATUS_TO_STR(GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT); FBOSTATUS_TO_STR(GL_FRAMEBUFFER_UNSUPPORTED_EXT); #undef FBOSTATUS_TO_STR default: diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 5e55a0d..b26ab78 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -1819,6 +1819,7 @@ typedef void (WINE_GLAPI * PGLFNGLVERTEXBLENDARB) (GLint count); #define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD #define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 #define GL_RENDERBUFFER_BINDING_EXT 0x8CA7

1 0

Juan Lang : wintrust: Add stub for WVTAsn1CatNameValueEncode.
by Alexandre Julliard Oct. 18, 2008

Oct. 18, 2008

Module: wine Branch: master Commit: 9033fa9ab256e590c09a94550e5f23deee7b43b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9033fa9ab256e590c09a94550… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Oct 17 14:40:05 2008 -0700 wintrust: Add stub for WVTAsn1CatNameValueEncode. --- dlls/wintrust/asn.c | 9 +++++++++ dlls/wintrust/wintrust.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index 2ba5eb6..9a1c1b8 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -907,6 +907,15 @@ BOOL WINAPI WVTAsn1CatMemberInfoEncode(DWORD dwCertEncodingType, return ret; } +BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + FIXME("(0x%08x, %s, %p, %p, %p): stub\n", dwCertEncodingType, + debugstr_a(lpszStructType), pvStructInfo, pbEncoded, pcbEncoded); + return FALSE; +} + /* Gets the number of length bytes from the given (leading) length byte */ #define GET_LEN_BYTES(b) ((b) <= 0x7f ? 1 : 1 + ((b) & 0x7f)) diff --git a/dlls/wintrust/wintrust.spec b/dlls/wintrust/wintrust.spec index 28de78b..5c86b45 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -89,7 +89,7 @@ @ stdcall WVTAsn1CatMemberInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stub WVTAsn1CatNameValueDecode -@ stub WVTAsn1CatNameValueEncode +@ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) @ stub WVTAsn1SpcFinancialCriteriaInfoDecode @ stub WVTAsn1SpcFinancialCriteriaInfoEncode @ stdcall WVTAsn1SpcIndirectDataContentDecode(long str ptr long long ptr ptr)

1 0