November 2008 - Wine-commits

Christian Costa : d3dxof: Finish support for objects binary format.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 6ec11ac3f30411b83f5f260e8378803459b56ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ec11ac3f30411b83f5f260e8… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Sun Nov 16 19:45:38 2008 +0100 d3dxof: Finish support for objects binary format. --- dlls/d3dxof/d3dxof.c | 74 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index fc01a74..7c97771 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -276,13 +276,6 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV goto error; } - if (header[2] == XOFFILE_FORMAT_BINARY) - { - FIXME("Binary format not supported yet\n"); - hr = DXFILEERR_NOTDONEYET; - goto error; - } - if (header[2] == XOFFILE_FORMAT_COMPRESSED) { FIXME("Compressed formats not supported yet\n"); @@ -803,10 +796,50 @@ static WORD parse_TOKEN(parse_buffer * buf) } else { - if (!read_bytes(buf, &token, 2)) - return 0; + static int nb_elem; + static int is_float; + + if (!nb_elem) + { + if (!read_bytes(buf, &token, 2)) + return 0; + + /* Convert integer and float list into sereparate elements */ + if (token == TOKEN_INTEGER_LIST) + { + if (!read_bytes(buf, &nb_elem, 4)) + return 0; + token = TOKEN_INTEGER; + is_float = FALSE; + TRACE("Integer list (TOKEN_INTEGER_LIST) of size %d\n", nb_elem); + } + else if (token == TOKEN_FLOAT_LIST) + { + if (!read_bytes(buf, &nb_elem, 4)) + return 0; + token = TOKEN_FLOAT; + is_float = TRUE; + TRACE("Float list (TOKEN_FLOAT_LIST) of size %d\n", nb_elem); + } + } + + if (nb_elem) + { + token = is_float ? TOKEN_FLOAT : TOKEN_INTEGER; + nb_elem--; + { + DWORD integer; + + if (!read_bytes(buf, &integer, 4)) + return 0; + + *(DWORD*)buf->value = integer; + } + dump_TOKEN(token); + return token; + } - switch(token) + switch (token) { case TOKEN_NAME: { @@ -850,8 +883,25 @@ static WORD parse_TOKEN(parse_buffer * buf) } break; case TOKEN_STRING: - case TOKEN_INTEGER_LIST: - case TOKEN_FLOAT_LIST: + { + DWORD count; + WORD tmp_token; + char strname[100]; + if (!read_bytes(buf, &count, 4)) + return 0; + if (!read_bytes(buf, strname, count)) + return 0; + strname[count] = 0; + if (!read_bytes(buf, &tmp_token, 2)) + return 0; + if ((tmp_token != TOKEN_COMMA) && (tmp_token != TOKEN_SEMICOLON)) + ERR("No comma or semicolon (got %d)\n", tmp_token); + /*TRACE("name = %s\n", strname);*/ + + strcpy((char*)buf->value, strname); + token = TOKEN_LPSTR; + } + break; case TOKEN_OBRACE: case TOKEN_CBRACE: case TOKEN_OPAREN:

1 0

Andrew Riedi : reg: const WCHAR -> static const WCHAR.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 103cfb90f23fe45ca9b3e53211d797d856919d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=103cfb90f23fe45ca9b3e5321… Author: Andrew Riedi <andrewriedi(a)gmail.com> Date: Fri Nov 14 12:14:38 2008 -0800 reg: const WCHAR -> static const WCHAR. --- programs/reg/reg.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 043872c..2f1da6e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -69,7 +69,7 @@ static int reg_message(int msg, ...) static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - const WCHAR stubW[] = {'S','T','U','B',' ','A','D','D',' ','-',' ','%','s', + static const WCHAR stubW[] = {'S','T','U','B',' ','A','D','D',' ','-',' ','%','s', ' ','%','s',' ','%','d',' ','%','s',' ','%','s',' ','%','d','\n',0}; reg_printfW(stubW, key_name, value_name, value_empty, type, data, force); @@ -79,8 +79,9 @@ static int reg_add(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL value_all, BOOL force) { - const WCHAR stubW[] = {'S','T','U','B',' ','D','E','L','E','T','E',' ','-', - ' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n',0}; + static const WCHAR stubW[] = {'S','T','U','B',' ','D','E','L','E','T','E', + ' ','-',' ','%','s',' ','%','s',' ','%','d',' ','%','d',' ','%','d','\n' + ,0}; reg_printfW(stubW, key_name, value_name, value_empty, value_all, force); return 1; @@ -89,8 +90,8 @@ static int reg_delete(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, static int reg_query(WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL subkey) { - const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ','-',' ', - '%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; + static const WCHAR stubW[] = {'S','T','U','B',' ','Q','U','E','R','Y',' ', + '-',' ','%','s',' ','%','s',' ','%','d',' ','%','d','\n',0}; reg_printfW(stubW, key_name, value_name, value_empty, subkey); return 1; @@ -100,16 +101,16 @@ int wmain(int argc, WCHAR *argvW[]) { int i; - const WCHAR addW[] = {'a','d','d',0}; - const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; - const WCHAR queryW[] = {'q','u','e','r','y',0}; - const WCHAR slashDW[] = {'/','d',0}; - const WCHAR slashFW[] = {'/','f',0}; - const WCHAR slashSW[] = {'/','s',0}; - const WCHAR slashTW[] = {'/','t',0}; - const WCHAR slashVW[] = {'/','v',0}; - const WCHAR slashVAW[] = {'/','v','a',0}; - const WCHAR slashVEW[] = {'/','v','e',0}; + static const WCHAR addW[] = {'a','d','d',0}; + static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; + static const WCHAR queryW[] = {'q','u','e','r','y',0}; + static const WCHAR slashDW[] = {'/','d',0}; + static const WCHAR slashFW[] = {'/','f',0}; + static const WCHAR slashSW[] = {'/','s',0}; + static const WCHAR slashTW[] = {'/','t',0}; + static const WCHAR slashVW[] = {'/','v',0}; + static const WCHAR slashVAW[] = {'/','v','a',0}; + static const WCHAR slashVEW[] = {'/','v','e',0}; if (argc < 2) {

1 0

Dylan Smith : richedit: Removed unused ME_AutoURLDetect function.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 1e8df4351dd6854e06bda8438161d570fc3021c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e8df4351dd6854e06bda8438… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Nov 17 03:46:29 2008 -0500 richedit: Removed unused ME_AutoURLDetect function. --- dlls/riched20/editor.c | 89 ------------------------------------------------ dlls/riched20/editor.h | 1 - 2 files changed, 0 insertions(+), 90 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6ee5fae..33310a1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4432,95 +4432,6 @@ LRESULT WINAPI REExtendedRegisterClass(void) return result; } -int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar) -{ - struct prefix_s { - const char *text; - int length; - } prefixes[12] = { - {"http:", 5}, - {"file:", 6}, - {"mailto:", 8}, - {"ftp:", 5}, - {"https:", 7}, - {"gopher:", 8}, - {"nntp:", 6}, - {"prospero:", 10}, - {"telnet:", 8}, - {"news:", 6}, - {"wais:", 6}, - {"www.", 5} - }; - CHARRANGE ins_pt; - int curf_ef, link_ef, def_ef; - int cur_prefx, prefx_cnt; - int sel_min, sel_max; - int car_pos = 0; - int text_pos=-1; - int URLmin, URLmax = 0; - FINDTEXTA ft; - CHARFORMAT2W cur_format; - CHARFORMAT2W default_format; - CHARFORMAT2W link; - RichEditANSIWndProc(editor->hWnd, EM_EXGETSEL, (WPARAM) 0, (LPARAM) &ins_pt); - sel_min = ins_pt.cpMin; - sel_max = ins_pt.cpMax; - if (sel_min==sel_max) - car_pos = sel_min; - if (sel_min!=sel_max) - car_pos = ME_GetTextLength(editor)+1; - cur_format.cbSize = sizeof(cur_format); - default_format.cbSize = sizeof(default_format); - RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM) &cur_format); - RichEditANSIWndProc(editor->hWnd, EM_GETCHARFORMAT, SCF_DEFAULT, (LPARAM) &default_format); - link.cbSize = sizeof(link); - link.dwMask = CFM_LINK; - link.dwEffects = CFE_LINK; - curf_ef = cur_format.dwEffects & link.dwEffects; - def_ef = default_format.dwEffects & link.dwEffects; - link_ef = link.dwEffects & link.dwEffects; - if (curf_ef == link_ef) - { - if( curChar == '\n' || curChar=='\r' || curChar==' ') - { - ME_SetSelection(editor, car_pos, car_pos); - RichEditANSIWndProc(editor->hWnd, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM) &default_format); - text_pos=-1; - return 0; - } - } - if (curf_ef == def_ef) - { - cur_prefx = 0; - prefx_cnt = (sizeof(prefixes)/sizeof(struct prefix_s))-1; - while (cur_prefx<=prefx_cnt) - { - if (text_pos == -1) - { - ft.lpstrText = prefixes[cur_prefx].text; - URLmin=max(0,(car_pos-prefixes[cur_prefx].length)); - URLmax=max(0, car_pos); - if ((car_pos == 0) && (ME_GetTextLength(editor) != 0)) - { - URLmax = ME_GetTextLength(editor)+1; - } - ft.chrg.cpMin = URLmin; - ft.chrg.cpMax = URLmax; - text_pos=RichEditANSIWndProc(editor->hWnd, EM_FINDTEXT, FR_DOWN, (LPARAM)&ft); - cur_prefx++; - } - if (text_pos != -1) - { - ME_SetCharFormat(editor, text_pos, (URLmax-text_pos), &link); - ME_RewrapRepaint(editor); - break; - } - } - } - return 0; -} - - static BOOL isurlspecial(WCHAR c) { static const WCHAR special_chars[] = {'.','/','%','@','*','|','\\','+','#',0}; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d786e0a..b3918bf 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -280,7 +280,6 @@ void ME_RTFParAttrHook(struct _RTF_Info *info); void ME_RTFTblAttrHook(struct _RTF_Info *info); void ME_RTFSpecialCharHook(struct _RTF_Info *info); void ME_StreamInFill(ME_InStream *stream); -int ME_AutoURLDetect(ME_TextEditor *editor, WCHAR curChar); extern int me_debug; extern void DoWrap(ME_TextEditor *editor); extern BOOL ME_FindNextURLCandidate(ME_TextEditor *editor, int sel_min, int sel_max,

1 0

Juan Lang : crypt32: Implement decoding CERT_POLICIES_INFO.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 305e732e8586184cda9946bc87e953aa1e0b3fb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305e732e8586184cda9946bc8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 18:00:01 2008 -0800 crypt32: Implement decoding CERT_POLICIES_INFO. --- dlls/crypt32/decode.c | 99 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 3 - 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index a3131c5..179bed7 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3379,6 +3379,100 @@ static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints2(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodePolicyQualifier(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CERT_POLICY_QUALIFIER_INFO, + pszPolicyQualifierId), CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), + FALSE, TRUE, offsetof(CERT_POLICY_QUALIFIER_INFO, pszPolicyQualifierId), + 0 }, + { 0, offsetof(CERT_POLICY_QUALIFIER_INFO, Qualifier), + CRYPT_AsnDecodeDerBlob, sizeof(CRYPT_OBJID_BLOB), TRUE, TRUE, + offsetof(CERT_POLICY_QUALIFIER_INFO, Qualifier.pbData), 0 }, + }; + BOOL ret; + CERT_POLICY_QUALIFIER_INFO *qualifier = pvStructInfo; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, qualifier ? qualifier->pszPolicyQualifierId : NULL); + return ret; +} + +static BOOL CRYPT_AsnDecodePolicyQualifiers(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodePolicyQualifier, sizeof(CERT_POLICY_QUALIFIER_INFO), TRUE, + offsetof(CERT_POLICY_QUALIFIER_INFO, pszPolicyQualifierId) }; + struct GenericArray *entries = pvStructInfo; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + NULL, pvStructInfo, pcbStructInfo, pcbDecoded, + entries ? entries->rgItems : NULL); + TRACE("Returning %d (%08x)\n", ret, GetLastError()); + return ret; +} + +static BOOL CRYPT_AsnDecodeCertPolicy(const BYTE *pbEncoded, DWORD cbEncoded, + DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) +{ + struct AsnDecodeSequenceItem items[] = { + { ASN_OBJECTIDENTIFIER, offsetof(CERT_POLICY_INFO, pszPolicyIdentifier), + CRYPT_AsnDecodeOidInternal, sizeof(LPSTR), FALSE, TRUE, + offsetof(CERT_POLICY_INFO, pszPolicyIdentifier), 0 }, + { ASN_SEQUENCEOF, offsetof(CERT_POLICY_INFO, cPolicyQualifier), + CRYPT_AsnDecodePolicyQualifiers, sizeof(struct GenericArray), TRUE, + TRUE, offsetof(CERT_POLICY_INFO, rgPolicyQualifier), 0 }, + }; + CERT_POLICY_INFO *info = pvStructInfo; + BOOL ret; + + TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, info ? info->pszPolicyIdentifier : NULL); + return ret; +} + +static BOOL WINAPI CRYPT_AsnDecodeCertPolicies(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, + PCRYPT_DECODE_PARA pDecodePara, void *pvStructInfo, DWORD *pcbStructInfo) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); + + __TRY + { + struct AsnArrayDescriptor arrayDesc = { ASN_SEQUENCEOF, + CRYPT_AsnDecodeCertPolicy, sizeof(CERT_POLICY_INFO), TRUE, + offsetof(CERT_POLICY_INFO, pszPolicyIdentifier) }; + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + #define RSA1_MAGIC 0x31415352 struct DECODED_RSA_PUB_KEY @@ -5072,6 +5166,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case LOWORD(X509_BASIC_CONSTRAINTS2): decodeFunc = CRYPT_AsnDecodeBasicConstraints2; break; + case LOWORD(X509_CERT_POLICIES): + decodeFunc = CRYPT_AsnDecodeCertPolicies; + break; case LOWORD(RSA_CSP_PUBLICKEYBLOB): decodeFunc = CRYPT_AsnDecodeRsaPubKey; break; @@ -5185,6 +5282,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeAltName; else if (!strcmp(lpszStructType, szOID_CRL_DIST_POINTS)) decodeFunc = CRYPT_AsnDecodeCRLDistPoints; + else if (!strcmp(lpszStructType, szOID_CERT_POLICIES)) + decodeFunc = CRYPT_AsnDecodeCertPolicies; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index b52919a..1141d5e 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7236,7 +7236,6 @@ static void test_decodeCertPolicies(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7247,7 +7246,6 @@ static void test_decodeCertPolicies(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, policiesWithAnyPolicy, sizeof(policiesWithAnyPolicy), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7264,7 +7262,6 @@ static void test_decodeCertPolicies(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, twoPolicies, sizeof(twoPolicies), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Vincent Povirk : comctl32: Do not repaint on TBM_SETPOS if position is unchanged.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 00e2d897c2389a3ac463abfcd26d7a77ac7ed59b URL: http://source.winehq.org/git/wine.git/?a=commit;h=00e2d897c2389a3ac463abfcd… Author: Vincent Povirk <madewokherd+d41d(a)gmail.com> Date: Sat Nov 15 21:50:54 2008 -0600 comctl32: Do not repaint on TBM_SETPOS if position is unchanged. --- dlls/comctl32/tests/trackbar.c | 4 ++++ dlls/comctl32/trackbar.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index f69e286..f54e32e 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -141,11 +141,13 @@ static const struct message position_test_seq[] = { { TBM_SETPOS, sent|wparam|lparam, TRUE, 5}, { WM_PAINT, sent|defwinproc}, { TBM_GETPOS, sent}, + { TBM_SETPOS, sent|wparam|lparam, TRUE, 5}, { TBM_SETPOS, sent|wparam|lparam, TRUE, 1000}, { WM_PAINT, sent|defwinproc}, { TBM_GETPOS, sent}, { TBM_SETPOS, sent|wparam|lparam, FALSE, 20}, { TBM_GETPOS, sent}, + { TBM_SETPOS, sent|wparam|lparam, TRUE, 20}, { TBM_GETPOS, sent}, {0} }; @@ -605,12 +607,14 @@ static void test_position(HWND hWndTrackbar){ SendMessage(hWndTrackbar, TBM_SETPOS, TRUE, 5); r = SendMessage(hWndTrackbar, TBM_GETPOS, 0,0); expect(5, r); + SendMessage(hWndTrackbar, TBM_SETPOS, TRUE, 5); SendMessage(hWndTrackbar, TBM_SETPOS, TRUE, 1000); r = SendMessage(hWndTrackbar, TBM_GETPOS, 0,0); expect(100, r); SendMessage(hWndTrackbar, TBM_SETPOS, FALSE, 20); r = SendMessage(hWndTrackbar, TBM_GETPOS, 0,0); expect(20, r); + SendMessage(hWndTrackbar, TBM_SETPOS, TRUE, 20); /* test TBM_GETPOS */ r = SendMessage(hWndTrackbar, TBM_GETPOS, 0,0); diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index a9959e2..c72f29b 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1148,7 +1148,7 @@ TRACKBAR_SetPos (TRACKBAR_INFO *infoPtr, BOOL fPosition, LONG lPosition) infoPtr->lPos = infoPtr->lRangeMax; infoPtr->flags |= TB_THUMBPOSCHANGED; - if (fPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); + if (fPosition && oldPos != lPosition) TRACKBAR_InvalidateThumbMove(infoPtr, oldPos, lPosition); return 0; }

1 0

Juan Lang : crypt32: Implement encoding CERT_POLICIES_INFO.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 8b4f53bb269621abb6da253bbec6f88a49c036e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b4f53bb269621abb6da253bb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 16:06:13 2008 -0800 crypt32: Implement encoding CERT_POLICIES_INFO. --- dlls/crypt32/encode.c | 161 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 4 - 2 files changed, 161 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 3699b5f..9e10298 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2812,6 +2812,162 @@ static BOOL WINAPI CRYPT_AsnEncodeBasicConstraints2(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + DWORD cPolicyQualifier = *(DWORD *)pvStructInfo; + const CERT_POLICY_QUALIFIER_INFO *rgPolicyQualifier = + *(const CERT_POLICY_QUALIFIER_INFO **) + ((LPBYTE)pvStructInfo + sizeof(DWORD)); + BOOL ret; + + if (!cPolicyQualifier) + { + *pcbEncoded = 0; + ret = TRUE; + } + else + { + struct AsnEncodeSequenceItem items[2] = { + { NULL, CRYPT_AsnEncodeOid, 0 }, + { NULL, CRYPT_CopyEncodedBlob, 0 }, + }; + DWORD bytesNeeded = 0, lenBytes, size, i; + + ret = TRUE; + for (i = 0; ret && i < cPolicyQualifier; i++) + { + items[0].pvStructInfo = rgPolicyQualifier[i].pszPolicyQualifierId; + items[1].pvStructInfo = &rgPolicyQualifier[i].Qualifier; + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), + dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, NULL, &size); + if (ret) + bytesNeeded += size; + } + CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); + bytesNeeded += 1 + lenBytes; + if (ret) + { + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, + &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < cPolicyQualifier; i++) + { + items[0].pvStructInfo = + rgPolicyQualifier[i].pszPolicyQualifierId; + items[1].pvStructInfo = + &rgPolicyQualifier[i].Qualifier; + size = bytesNeeded; + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), + dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, pbEncoded, + &size); + if (ret) + { + pbEncoded += size; + bytesNeeded -= size; + } + } + } + } + } + } + return ret; +} + +static BOOL CRYPT_AsnEncodeCertPolicy(DWORD dwCertEncodingType, + const CERT_POLICY_INFO *info, DWORD dwFlags, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + struct AsnEncodeSequenceItem items[2] = { + { info->pszPolicyIdentifier, CRYPT_AsnEncodeOid, 0 }, + { &info->cPolicyQualifier, CRYPT_AsnEncodeCertPolicyQualifiers, 0 }, + }; + BOOL ret; + + if (!info->pszPolicyIdentifier) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, NULL, pbEncoded, pcbEncoded); + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeCertPolicies(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_POLICIES_INFO *info = pvStructInfo; + DWORD bytesNeeded = 0, lenBytes, size, i; + + ret = TRUE; + for (i = 0; ret && i < info->cPolicyInfo; i++) + { + ret = CRYPT_AsnEncodeCertPolicy(dwCertEncodingType, + &info->rgPolicyInfo[i], dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, + &size); + if (ret) + bytesNeeded += size; + } + CRYPT_EncodeLen(bytesNeeded, NULL, &lenBytes); + bytesNeeded += 1 + lenBytes; + if (ret) + { + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, + pbEncoded, pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCEOF; + CRYPT_EncodeLen(bytesNeeded - lenBytes - 1, pbEncoded, + &lenBytes); + pbEncoded += lenBytes; + for (i = 0; ret && i < info->cPolicyInfo; i++) + { + size = bytesNeeded; + ret = CRYPT_AsnEncodeCertPolicy(dwCertEncodingType, + &info->rgPolicyInfo[i], + dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, pbEncoded, &size); + if (ret) + { + pbEncoded += size; + bytesNeeded -= size; + } + } + } + } + } + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -4110,6 +4266,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(X509_BASIC_CONSTRAINTS2): encodeFunc = CRYPT_AsnEncodeBasicConstraints2; break; + case LOWORD(X509_CERT_POLICIES): + encodeFunc = CRYPT_AsnEncodeCertPolicies; + break; case LOWORD(RSA_CSP_PUBLICKEYBLOB): encodeFunc = CRYPT_AsnEncodeRsaPubKey; break; @@ -4223,6 +4382,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeAltName; else if (!strcmp(lpszStructType, szOID_CRL_DIST_POINTS)) encodeFunc = CRYPT_AsnEncodeCRLDistPoints; + else if (!strcmp(lpszStructType, szOID_CERT_POLICIES)) + encodeFunc = CRYPT_AsnEncodeCertPolicies; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) encodeFunc = CRYPT_AsnEncodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 92bc0b4..b52919a 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7184,7 +7184,6 @@ static void test_encodeCertPolicies(DWORD dwEncoding) memset(&info, 0, sizeof(info)); ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7197,13 +7196,11 @@ static void test_encodeCertPolicies(DWORD dwEncoding) info.rgPolicyInfo = policy; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); policy[0].pszPolicyIdentifier = oid_any_policy; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7221,7 +7218,6 @@ static void test_encodeCertPolicies(DWORD dwEncoding) info.cPolicyInfo = 2; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Implement encoding CERT_POLICY_QUALIFIER_USER_NOTICE.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 3dd2cc5eaa97890cb907486df4f3b52a6024cfd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dd2cc5eaa97890cb907486df… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Nov 13 13:45:29 2008 -0800 crypt32: Implement encoding CERT_POLICY_QUALIFIER_USER_NOTICE. --- dlls/crypt32/encode.c | 113 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 3 - 2 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index e474ff7..3699b5f 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -1697,6 +1697,114 @@ static BOOL WINAPI CRYPT_AsnEncodeSMIMECapabilities(DWORD dwCertEncodingType, return ret; } +static BOOL WINAPI CRYPT_AsnEncodeNoticeNumbers(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + const CERT_POLICY_QUALIFIER_NOTICE_REFERENCE *noticeRef = pvStructInfo; + DWORD bytesNeeded, dataLen, lenBytes, i; + BOOL ret = TRUE; + + for (i = 0, dataLen = 0; ret && i < noticeRef->cNoticeNumbers; i++) + { + DWORD size; + + ret = CRYPT_AsnEncodeInt(dwCertEncodingType, X509_INTEGER, + &noticeRef->rgNoticeNumbers[i], 0, NULL, NULL, &size); + if (ret) + dataLen += size; + } + if (ret) + { + CRYPT_EncodeLen(dataLen, NULL, &lenBytes); + bytesNeeded = 1 + lenBytes + dataLen; + if (!pbEncoded) + *pcbEncoded = bytesNeeded; + else + { + if ((ret = CRYPT_EncodeEnsureSpace(dwFlags, pEncodePara, pbEncoded, + pcbEncoded, bytesNeeded))) + { + if (dwFlags & CRYPT_ENCODE_ALLOC_FLAG) + pbEncoded = *(BYTE **)pbEncoded; + *pbEncoded++ = ASN_SEQUENCE; + CRYPT_EncodeLen(dataLen, pbEncoded, &lenBytes); + pbEncoded += lenBytes; + for (i = 0; i < noticeRef->cNoticeNumbers; i++) + { + DWORD size = dataLen; + + ret = CRYPT_AsnEncodeInt(dwCertEncodingType, X509_INTEGER, + &noticeRef->rgNoticeNumbers[i], 0, NULL, pbEncoded, &size); + pbEncoded += size; + dataLen -= size; + } + } + } + } + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodeNoticeReference(DWORD dwCertEncodingType, + LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, + PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) +{ + const CERT_POLICY_QUALIFIER_NOTICE_REFERENCE *noticeRef = pvStructInfo; + BOOL ret; + CERT_NAME_VALUE orgValue = { CERT_RDN_IA5_STRING, + { 0, (LPBYTE)noticeRef->pszOrganization } }; + struct AsnEncodeSequenceItem items[] = { + { &orgValue, CRYPT_AsnEncodeNameValue, 0 }, + { noticeRef, CRYPT_AsnEncodeNoticeNumbers, 0 }, + }; + + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, + sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + pcbEncoded); + return ret; +} + +static BOOL WINAPI CRYPT_AsnEncodePolicyQualifierUserNotice( + DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, + DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, + DWORD *pcbEncoded) +{ + BOOL ret = FALSE; + + __TRY + { + const CERT_POLICY_QUALIFIER_USER_NOTICE *notice = pvStructInfo; + struct AsnEncodeSequenceItem items[2]; + CERT_NAME_VALUE displayTextValue; + DWORD cItem = 0; + + ret = TRUE; + if (notice->pNoticeReference) + { + items[cItem].encodeFunc = CRYPT_AsnEncodeNoticeReference; + items[cItem].pvStructInfo = notice->pNoticeReference; + cItem++; + } + if (notice->pszDisplayText) + { + displayTextValue.dwValueType = CERT_RDN_BMP_STRING; + displayTextValue.Value.cbData = 0; + displayTextValue.Value.pbData = (LPBYTE)notice->pszDisplayText; + items[cItem].encodeFunc = CRYPT_AsnEncodeNameValue; + items[cItem].pvStructInfo = &displayTextValue; + cItem++; + } + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, cItem, + dwFlags, pEncodePara, pbEncoded, pcbEncoded); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags, PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded) @@ -4063,6 +4171,9 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, case LOWORD(PKCS_SMIME_CAPABILITIES): encodeFunc = CRYPT_AsnEncodeSMIMECapabilities; break; + case LOWORD(X509_PKIX_POLICY_QUALIFIER_USERNOTICE): + encodeFunc = CRYPT_AsnEncodePolicyQualifierUserNotice; + break; case LOWORD(PKCS_ATTRIBUTES): encodeFunc = CRYPT_AsnEncodePKCSAttributes; break; @@ -4120,6 +4231,8 @@ static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, encodeFunc = CRYPT_AsnEncodeNameConstraints; else if (!strcmp(lpszStructType, szOID_AUTHORITY_INFO_ACCESS)) encodeFunc = CRYPT_AsnEncodeAuthorityInfoAccess; + else if (!strcmp(lpszStructType, szOID_PKIX_POLICY_QUALIFIER_USERNOTICE)) + encodeFunc = CRYPT_AsnEncodePolicyQualifierUserNotice; else if (!strcmp(lpszStructType, szOID_CTL)) encodeFunc = CRYPT_AsnEncodeCTL; return encodeFunc; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 74c329d..0898504 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7065,7 +7065,6 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7077,7 +7076,6 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7092,7 +7090,6 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - todo_wine ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Implement decoding CERT_POLICY_QUALIFIER_USER_NOTICE.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 8729e6956b671c4691f02797fc84473bc4416cd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8729e6956b671c4691f02797f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 14:55:35 2008 -0800 crypt32: Implement decoding CERT_POLICY_QUALIFIER_USER_NOTICE. --- dlls/crypt32/decode.c | 266 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 6 +- 2 files changed, 268 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8729e6956b671c4691f02…

1 0

Juan Lang : crypt32: Add tests for encoding/decoding CERT_POLICIES_INFO.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: a90c26eb33290287e037a18b376ca9838b7d48d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90c26eb33290287e037a18b3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Nov 14 15:00:30 2008 -0800 crypt32: Add tests for encoding/decoding CERT_POLICIES_INFO. --- dlls/crypt32/tests/encode.c | 146 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 4adba05..92bc0b4 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -7157,6 +7157,150 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) } } +static char oid_any_policy[] = "2.5.29.32.0"; +static const BYTE policiesWithAnyPolicy[] = { + 0x30,0x08,0x30,0x06,0x06,0x04,0x55,0x1d,0x20,0x00 +}; +static char oid1[] = "1.2.3"; +static char oid_user_notice[] = "1.3.6.1.5.5.7.2.2"; +static const BYTE twoPolicies[] = { + 0x30,0x50,0x30,0x06,0x06,0x04,0x55,0x1d,0x20,0x00,0x30,0x46,0x06,0x02,0x2a, + 0x03,0x30,0x40,0x30,0x3e,0x06,0x08,0x2b,0x06,0x01,0x05,0x05,0x07,0x02,0x02, + 0x30,0x32,0x30,0x0e,0x16,0x04,0x57,0x69,0x6e,0x65,0x30,0x06,0x02,0x01,0x02, + 0x02,0x01,0x03,0x1e,0x20,0x00,0x54,0x00,0x68,0x00,0x69,0x00,0x73,0x00,0x20, + 0x00,0x69,0x00,0x73,0x00,0x20,0x00,0x61,0x00,0x20,0x00,0x6e,0x00,0x6f,0x00, + 0x74,0x00,0x69,0x00,0x63,0x00,0x65 +}; + +static void test_encodeCertPolicies(DWORD dwEncoding) +{ + BOOL ret; + CERT_POLICIES_INFO info; + CERT_POLICY_INFO policy[2]; + CERT_POLICY_QUALIFIER_INFO qualifier; + LPBYTE buf; + DWORD size; + + memset(&info, 0, sizeof(info)); + ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(emptySequence) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, emptySequence, size), "unexpected value\n"); + LocalFree(buf); + } + memset(policy, 0, sizeof(policy)); + info.cPolicyInfo = 1; + info.rgPolicyInfo = policy; + ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(!ret && GetLastError() == E_INVALIDARG, + "expected E_INVALIDARG, got %08x\n", GetLastError()); + policy[0].pszPolicyIdentifier = oid_any_policy; + ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(policiesWithAnyPolicy) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, policiesWithAnyPolicy, size), "unexpected value\n"); + LocalFree(buf); + } + policy[1].pszPolicyIdentifier = oid1; + memset(&qualifier, 0, sizeof(qualifier)); + qualifier.pszPolicyQualifierId = oid_user_notice; + qualifier.Qualifier.cbData = sizeof(noticeWithReference); + qualifier.Qualifier.pbData = noticeWithReference; + policy[1].cPolicyQualifier = 1; + policy[1].rgPolicyQualifier = &qualifier; + info.cPolicyInfo = 2; + ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, + CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + todo_wine + ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(sizeof(twoPolicies) == size, "unexpected size %d\n", size); + ok(!memcmp(buf, twoPolicies, size), "unexpected value\n"); + LocalFree(buf); + } +} + +static void test_decodeCertPolicies(DWORD dwEncoding) +{ + BOOL ret; + CERT_POLICIES_INFO *info; + DWORD size; + + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, + &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyInfo == 0, "unexpected policy info %d\n", + info->cPolicyInfo); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + policiesWithAnyPolicy, sizeof(policiesWithAnyPolicy), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyInfo == 1, "unexpected policy info %d\n", + info->cPolicyInfo); + ok(!strcmp(info->rgPolicyInfo[0].pszPolicyIdentifier, oid_any_policy), + "unexpected policy id %s\n", + info->rgPolicyInfo[0].pszPolicyIdentifier); + ok(info->rgPolicyInfo[0].cPolicyQualifier == 0, + "unexpected policy qualifier count %d\n", + info->rgPolicyInfo[0].cPolicyQualifier); + LocalFree(info); + } + ret = pCryptDecodeObjectEx(dwEncoding, X509_CERT_POLICIES, + twoPolicies, sizeof(twoPolicies), + CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + todo_wine + ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); + if (ret) + { + ok(info->cPolicyInfo == 2, "unexpected policy info %d\n", + info->cPolicyInfo); + ok(!strcmp(info->rgPolicyInfo[0].pszPolicyIdentifier, oid_any_policy), + "unexpected policy id %s\n", + info->rgPolicyInfo[0].pszPolicyIdentifier); + ok(info->rgPolicyInfo[0].cPolicyQualifier == 0, + "unexpected policy qualifier count %d\n", + info->rgPolicyInfo[0].cPolicyQualifier); + ok(!strcmp(info->rgPolicyInfo[1].pszPolicyIdentifier, oid1), + "unexpected policy id %s\n", + info->rgPolicyInfo[1].pszPolicyIdentifier); + ok(info->rgPolicyInfo[1].cPolicyQualifier == 1, + "unexpected policy qualifier count %d\n", + info->rgPolicyInfo[1].cPolicyQualifier); + ok(!strcmp( + info->rgPolicyInfo[1].rgPolicyQualifier[0].pszPolicyQualifierId, + oid_user_notice), "unexpected policy qualifier id %s\n", + info->rgPolicyInfo[1].rgPolicyQualifier[0].pszPolicyQualifierId); + ok(info->rgPolicyInfo[1].rgPolicyQualifier[0].Qualifier.cbData == + sizeof(noticeWithReference), "unexpected qualifier size %d\n", + info->rgPolicyInfo[1].rgPolicyQualifier[0].Qualifier.cbData); + ok(!memcmp( + info->rgPolicyInfo[1].rgPolicyQualifier[0].Qualifier.pbData, + noticeWithReference, sizeof(noticeWithReference)), + "unexpected qualifier value\n"); + LocalFree(info); + } +} + /* Free *pInfo with HeapFree */ static void testExportPublicKey(HCRYPTPROV csp, PCERT_PUBLIC_KEY_INFO *pInfo) { @@ -7425,6 +7569,8 @@ START_TEST(encode) test_decodeNameConstraints(encodings[i]); test_encodePolicyQualifierUserNotice(encodings[i]); test_decodePolicyQualifierUserNotice(encodings[i]); + test_encodeCertPolicies(encodings[i]); + test_decodeCertPolicies(encodings[i]); } testPortPublicKeyInfo(); }

1 0

Alexandre Julliard : kernel32/tests: Fix pipe test on w2k3.
by Alexandre Julliard 17 Nov '08

17 Nov '08

Module: wine Branch: master Commit: 61ea936d68b8d7de604b891166145ef5ffd83b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ea936d68b8d7de604b89116… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 17 13:16:26 2008 +0100 kernel32/tests: Fix pipe test on w2k3. --- dlls/kernel32/tests/pipe.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e6a57bf..a68a813 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -955,10 +955,7 @@ static void test_ImpersonateNamedPipeClient(HANDLE hClientToken, DWORD security_ SetLastError(0xdeadbeef); ret = ImpersonateNamedPipeClient(hPipeServer); error = GetLastError(); - todo_wine - ok(!ret && - (error == ERROR_CANNOT_IMPERSONATE || - error == 0xdeadbeef), /* win2k3 */ + ok(ret /* win2k3 */ || (error == ERROR_CANNOT_IMPERSONATE), "ImpersonateNamedPipeClient should have failed with ERROR_CANNOT_IMPERSONATE instead of %d\n", GetLastError()); ret = ConnectNamedPipe(hPipeServer, NULL);

1 0