November 2008 - Wine-commits

James Hawkins : msi: Factor out the table insertion code.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 2abb8bba13f432c84547a4bfa5721d769bd3cfb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2abb8bba13f432c84547a4bfa… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Nov 3 22:16:26 2008 -0600 msi: Factor out the table insertion code. --- dlls/msi/tests/db.c | 111 +++++++++++++++------------------------------------ 1 files changed, 32 insertions(+), 79 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 3561eeb..6f92a21 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -241,85 +241,38 @@ static UINT create_binary_table( MSIHANDLE hdb ) "PRIMARY KEY `Name` )" ); } -static UINT add_component_entry( MSIHANDLE hdb, const char *values ) -{ - char insert[] = "INSERT INTO `Component` " - "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `Condition`, `KeyPath`) " - "VALUES( %s )"; - char *query; - UINT sz, r; - - sz = strlen(values) + sizeof insert; - query = HeapAlloc(GetProcessHeap(),0,sz); - sprintf(query,insert,values); - r = run_query( hdb, 0, query ); - HeapFree(GetProcessHeap(), 0, query); - return r; -} +#define make_add_entry(type, qtext) \ + static UINT add##_##type##_##entry( MSIHANDLE hdb, const char *values ) \ + { \ + char insert[] = qtext; \ + char *query; \ + UINT sz, r; \ + sz = strlen(values) + sizeof insert; \ + query = HeapAlloc(GetProcessHeap(),0,sz); \ + sprintf(query,insert,values); \ + r = run_query( hdb, 0, query ); \ + HeapFree(GetProcessHeap(), 0, query); \ + return r; \ + } -static UINT add_custom_action_entry( MSIHANDLE hdb, const char *values ) -{ - char insert[] = "INSERT INTO `CustomAction` " - "(`Action`, `Type`, `Source`, `Target`) " - "VALUES( %s )"; - char *query; - UINT sz, r; - - sz = strlen(values) + sizeof insert; - query = HeapAlloc(GetProcessHeap(),0,sz); - sprintf(query,insert,values); - r = run_query( hdb, 0, query ); - HeapFree(GetProcessHeap(), 0, query); - return r; -} +make_add_entry(component, + "INSERT INTO `Component` " + "(`Component`, `ComponentId`, `Directory_`, " + "`Attributes`, `Condition`, `KeyPath`) VALUES( %s )") -static UINT add_feature_components_entry( MSIHANDLE hdb, const char *values ) -{ - char insert[] = "INSERT INTO `FeatureComponents` " - "(`Feature_`, `Component_`) " - "VALUES( %s )"; - char *query; - UINT sz, r; - - sz = strlen(values) + sizeof insert; - query = HeapAlloc(GetProcessHeap(),0,sz); - sprintf(query,insert,values); - r = run_query( hdb, 0, query ); - HeapFree(GetProcessHeap(), 0, query); - return r; -} +make_add_entry(custom_action, + "INSERT INTO `CustomAction` " + "(`Action`, `Type`, `Source`, `Target`) VALUES( %s )") -static UINT add_std_dlls_entry( MSIHANDLE hdb, const char *values ) -{ - char insert[] = "INSERT INTO `StdDlls` " - "(`File`, `Binary_`) " - "VALUES( %s )"; - char *query; - UINT sz, r; - - sz = strlen(values) + sizeof insert; - query = HeapAlloc(GetProcessHeap(),0,sz); - sprintf(query,insert,values); - r = run_query( hdb, 0, query ); - HeapFree(GetProcessHeap(), 0, query); - return r; -} +make_add_entry(feature_components, + "INSERT INTO `FeatureComponents` " + "(`Feature_`, `Component_`) VALUES( %s )") -static UINT add_binary_entry( MSIHANDLE hdb, const char *values ) -{ - char insert[] = "INSERT INTO `Binary` " - "(`Name`, `Data`) " - "VALUES( %s )"; - char *query; - UINT sz, r; - - sz = strlen(values) + sizeof insert; - query = HeapAlloc(GetProcessHeap(),0,sz); - sprintf(query,insert,values); - r = run_query( hdb, 0, query ); - HeapFree(GetProcessHeap(), 0, query); - return r; -} +make_add_entry(std_dlls, + "INSERT INTO `StdDlls` (`File`, `Binary_`) VALUES( %s )") + +make_add_entry(binary, + "INSERT INTO `Binary` (`Name`, `Data`) VALUES( %s )") static void test_msiinsert(void) {

1 0

James Hawkins : msi: Factor out the table insertion code.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 88f39d95f22318c0c3a2b14d1ae0df9856418c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=88f39d95f22318c0c3a2b14d1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Nov 3 22:16:22 2008 -0600 msi: Factor out the table insertion code. --- dlls/msi/tests/package.c | 331 +++++++++++---------------------------------- 1 files changed, 81 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88f39d95f22318c0c3a2b…

1 0

Juan Lang : wintrust: Implement WVTAsn1SpcFinancialCriteriaInfoDecode.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: cbccab6252af22492755759c0a8ddba23c408960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbccab6252af22492755759c0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 15:05:19 2008 -0800 wintrust: Implement WVTAsn1SpcFinancialCriteriaInfoDecode. --- dlls/wintrust/asn.c | 68 +++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 2 - 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index b32f488..0341a7c 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2186,11 +2186,75 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnDecodeBool(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret; + + if (cbEncoded < 3) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + if (GET_LEN_BYTES(pbEncoded[1]) > 1) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + if (pbEncoded[1] > 1) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + return FALSE; + } + if (!pvStructInfo) + { + *pcbStructInfo = sizeof(BOOL); + ret = TRUE; + } + else if (*pcbStructInfo < sizeof(BOOL)) + { + *pcbStructInfo = sizeof(BOOL); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbStructInfo = sizeof(BOOL); + *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; + ret = TRUE; + } + TRACE("returning %d (%08x)\n", ret, GetLastError()); + return ret; +} + BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(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_BOOL, offsetof(SPC_FINANCIAL_CRITERIA, fFinancialInfoAvailable), + CRYPT_AsnDecodeBool, sizeof(BOOL), FALSE, FALSE, 0, 0 }, + { ASN_BOOL, offsetof(SPC_FINANCIAL_CRITERIA, fMeetsCriteria), + CRYPT_AsnDecodeBool, sizeof(BOOL), FALSE, FALSE, 0, 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 bbba1f4..0cc02dc 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -79,7 +79,6 @@ static void test_decodeSPCFinancialCriteria(void) ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, falseCriteria, sizeof(falseCriteria), 0, NULL, &criteria, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -88,7 +87,6 @@ static void test_decodeSPCFinancialCriteria(void) } ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, trueCriteria, sizeof(trueCriteria), 0, NULL, &criteria, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : wintrust: Add stub for WVTAsn1SpcFinancialCriteriaInfoDecode.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 05956a6483821b2fa9d3101c4bff8d76818aeb47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05956a6483821b2fa9d3101c4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 14:59:37 2008 -0800 wintrust: Add stub for WVTAsn1SpcFinancialCriteriaInfoDecode. --- 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 56aeddc..b32f488 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -2185,3 +2185,12 @@ BOOL WINAPI WVTAsn1CatNameValueDecode(DWORD dwCertEncodingType, TRACE("returning %d\n", ret); return ret; } + +BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoDecode(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 2d03bdf..93a1b8e 100644 --- a/dlls/wintrust/wintrust.spec +++ b/dlls/wintrust/wintrust.spec @@ -90,7 +90,7 @@ @ stdcall WVTAsn1CatMemberInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1CatNameValueDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1CatNameValueEncode(long str ptr ptr ptr) -@ stub WVTAsn1SpcFinancialCriteriaInfoDecode +@ stdcall WVTAsn1SpcFinancialCriteriaInfoDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1SpcFinancialCriteriaInfoEncode(long str ptr ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentDecode(long str ptr long long ptr ptr) @ stdcall WVTAsn1SpcIndirectDataContentEncode(long str ptr ptr ptr)

1 0

Juan Lang : wintrust: Add tests for WVTAsn1SpcFinancialCriteriaInfoDecode.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 4c88340f72d738de023864211526d693b4161fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c88340f72d738de023864211… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 15:04:57 2008 -0800 wintrust: Add tests for WVTAsn1SpcFinancialCriteriaInfoDecode. --- dlls/wintrust/tests/asn.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 288c4d7..bbba1f4 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -65,6 +65,38 @@ static void test_encodeSPCFinancialCriteria(void) } } +static void test_decodeSPCFinancialCriteria(void) +{ + BOOL ret; + SPC_FINANCIAL_CRITERIA criteria; + DWORD size = sizeof(criteria); + + if (!pCryptDecodeObjectEx) + { + skip("CryptDecodeObjectEx() is not available. Skipping the decodeSPCFinancialCriteria tests\n"); + return; + } + + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, + falseCriteria, sizeof(falseCriteria), 0, NULL, &criteria, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(!criteria.fFinancialInfoAvailable, "expected FALSE\n"); + ok(!criteria.fMeetsCriteria, "expected FALSE\n"); + } + ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, + trueCriteria, sizeof(trueCriteria), 0, NULL, &criteria, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(criteria.fFinancialInfoAvailable, "expected TRUE\n"); + ok(criteria.fMeetsCriteria, "expected TRUE\n"); + } +} + static WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e','h','q','.', 'o','r','g',0 }; static const WCHAR nihongoURL[] = { 'h','t','t','p',':','/','/',0x226f, @@ -763,6 +795,7 @@ START_TEST(asn) pCryptEncodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptEncodeObjectEx"); test_encodeSPCFinancialCriteria(); + test_decodeSPCFinancialCriteria(); test_encodeSPCLink(); test_decodeSPCLink(); test_encodeSPCPEImage();

1 0

Juan Lang : wintrust: Add tests for WVTAsn1SpcFinancialCriteriaInfoEncode.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 5c0d8a3a12a7437b12be7c49b6bee10728fe7c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c0d8a3a12a7437b12be7c49b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 14:54:46 2008 -0800 wintrust: Add tests for WVTAsn1SpcFinancialCriteriaInfoEncode. --- dlls/wintrust/tests/asn.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/wintrust/tests/asn.c b/dlls/wintrust/tests/asn.c index 0f18c6d..00553ec 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -29,6 +29,43 @@ static BOOL (WINAPI *pCryptDecodeObjectEx)(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); static BOOL (WINAPI *pCryptEncodeObjectEx)(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); +static const BYTE falseCriteria[] = { 0x30,0x06,0x01,0x01,0x00,0x01,0x01,0x00 }; +static const BYTE trueCriteria[] = { 0x30,0x06,0x01,0x01,0xff,0x01,0x01,0xff }; + +static void test_encodeSPCFinancialCriteria(void) +{ + BOOL ret; + DWORD size = 0; + LPBYTE buf; + SPC_FINANCIAL_CRITERIA criteria = { FALSE, FALSE }; + + if (!pCryptEncodeObjectEx) + { + skip("CryptEncodeObjectEx() is not available. Skipping the encodeFinancialCriteria tests\n"); + return; + } + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, + &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(falseCriteria), "Unexpected size %d\n", size); + ok(!memcmp(buf, falseCriteria, size), "Unexpected value\n"); + LocalFree(buf); + } + criteria.fFinancialInfoAvailable = criteria.fMeetsCriteria = TRUE; + ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, + &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(size == sizeof(trueCriteria), "Unexpected size %d\n", size); + ok(!memcmp(buf, trueCriteria, size), "Unexpected value\n"); + LocalFree(buf); + } +} static WCHAR url[] = { 'h','t','t','p',':','/','/','w','i','n','e','h','q','.', 'o','r','g',0 }; @@ -727,6 +764,7 @@ START_TEST(asn) pCryptDecodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptDecodeObjectEx"); pCryptEncodeObjectEx = (void*)GetProcAddress(hCrypt32, "CryptEncodeObjectEx"); + test_encodeSPCFinancialCriteria(); test_encodeSPCLink(); test_decodeSPCLink(); test_encodeSPCPEImage();

1 0

Juan Lang : wintrust: Implement WVTAsn1SpcFinancialCriteriaInfoEncode.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: bbecd6913c7f61ca2941ed0f7c33b7d131382263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbecd6913c7f61ca2941ed0f7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 14:55:00 2008 -0800 wintrust: Implement WVTAsn1SpcFinancialCriteriaInfoEncode. --- dlls/wintrust/asn.c | 55 +++++++++++++++++++++++++++++++++++++++++++- dlls/wintrust/tests/asn.c | 2 - 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/asn.c b/dlls/wintrust/asn.c index d64a9e3..56aeddc 100644 --- a/dlls/wintrust/asn.c +++ b/dlls/wintrust/asn.c @@ -49,6 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cryptasn); #endif +#define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) #define ASN_BMPSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x1e) @@ -936,13 +937,63 @@ BOOL WINAPI WVTAsn1CatNameValueEncode(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeBool(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL val = *(const BOOL *)pvStructInfo, ret; + + TRACE("%d\n", val); + + if (!pbEncoded) + { + *pcbEncoded = 3; + ret = TRUE; + } + else if (*pcbEncoded < 3) + { + *pcbEncoded = 3; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbEncoded = 3; + *pbEncoded++ = ASN_BOOL; + *pbEncoded++ = 1; + *pbEncoded++ = val ? 0xff : 0; + ret = TRUE; + } + TRACE("returning %d (%08x)\n", ret, GetLastError()); + return ret; +} + BOOL WINAPI WVTAsn1SpcFinancialCriteriaInfoEncode(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 SPC_FINANCIAL_CRITERIA *criteria = pvStructInfo; + struct AsnEncodeSequenceItem items[] = { + { &criteria->fFinancialInfoAvailable, CRYPT_AsnEncodeBool, 0 }, + { &criteria->fMeetsCriteria, CRYPT_AsnEncodeBool, 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 00553ec..288c4d7 100644 --- a/dlls/wintrust/tests/asn.c +++ b/dlls/wintrust/tests/asn.c @@ -46,7 +46,6 @@ static void test_encodeSPCFinancialCriteria(void) } ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -57,7 +56,6 @@ static void test_encodeSPCFinancialCriteria(void) criteria.fFinancialInfoAvailable = criteria.fMeetsCriteria = TRUE; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_FINANCIAL_CRITERIA_STRUCT, &criteria, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Alexandre Julliard : wrc: Fix the duplicate resource check for user-defined types.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 87e12632fab023e042639566707e66dcb8b62ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e12632fab023e0426395667… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 4 10:07:07 2008 +0100 wrc: Fix the duplicate resource check for user-defined types. --- tools/wrc/parser.y | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y index 6c5043d..c0cc2ba 100644 --- a/tools/wrc/parser.y +++ b/tools/wrc/parser.y @@ -417,7 +417,8 @@ resources if(rsc->type == head->type && rsc->lan->id == head->lan->id && rsc->lan->sub == head->lan->sub - && !compare_name_id(rsc->name, head->name)) + && !compare_name_id(rsc->name, head->name) + && (rsc->type != res_usr || !compare_name_id(rsc->res.usr->type,head->res.usr->type))) { yyerror("Duplicate resource name '%s'", get_nameid_str(rsc->name)); }

1 0

Aric Stewart : gdiplus: Stub implementation of GdipNewInstalledFontCollection.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: 799a76e8c96d0471eb0cd5da2ade4757ed154b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=799a76e8c96d0471eb0cd5da2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Nov 3 11:39:16 2008 -0600 gdiplus: Stub implementation of GdipNewInstalledFontCollection. --- dlls/gdiplus/font.c | 11 +++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 210ebff..32713c7 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -849,3 +849,14 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( return NotImplemented; } + +GpStatus WINGDIPAPI GdipNewInstalledFontCollection( + GpFontCollection** fontCollection) +{ + FIXME("stub: %p\n",fontCollection); + + if (!fontCollection) + return InvalidParameter; + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fea80a4..5c47126 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -448,7 +448,7 @@ @ stub GdipMultiplyPenTransform @ stub GdipMultiplyTextureTransform @ stdcall GdipMultiplyWorldTransform(ptr ptr long) -@ stub GdipNewInstalledFontCollection +@ stdcall GdipNewInstalledFontCollection(ptr) @ stdcall GdipNewPrivateFontCollection(ptr) @ stdcall GdipPathIterCopyData(ptr ptr ptr ptr long long) @ stdcall GdipPathIterEnumerate(ptr ptr ptr ptr long)

1 0

Juan Lang : crypt32: Fix typo.
by Alexandre Julliard 04 Nov '08

04 Nov '08

Module: wine Branch: master Commit: d8c2a40cf6f1da78cad829d52495345d71a4af87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c2a40cf6f1da78cad829d52… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Nov 3 11:25:20 2008 -0800 crypt32: Fix typo. --- dlls/crypt32/msg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 8312ff9..0d615cc 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1341,7 +1341,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, return NULL; } if (info->cbSize == sizeof(CMSG_SIGNED_ENCODE_INFO_WITH_CMS) && - info->rgAttrCertEncoded) + info->cAttrCertEncoded) { FIXME("CMSG_SIGNED_ENCODE_INFO with CMS fields unsupported\n"); return NULL;

1 0