December 2008 - Wine-Commits

Juan Lang : crypt32: Fix encoding OIDs with only two components.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 519478e0485cec9cff58dadc494dfc97ccce7ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=519478e0485cec9cff58dadc4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 19 15:40:35 2008 -0800 crypt32: Fix encoding OIDs with only two components. --- dlls/crypt32/encode.c | 7 ++++++- dlls/crypt32/tests/encode.c | 5 +++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 12ab05f..2440d16 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -796,7 +796,7 @@ BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, const char *ptr; int val1, val2; - if (sscanf(pszObjId, "%d.%d.%n", &val1, &val2, &firstPos) != 2) + if (sscanf(pszObjId, "%d.%d%n", &val1, &val2, &firstPos) != 2) { SetLastError(CRYPT_E_ASN1_ERROR); return FALSE; @@ -804,6 +804,11 @@ BOOL WINAPI CRYPT_AsnEncodeOid(DWORD dwCertEncodingType, bytesNeeded++; firstByte = val1 * 40 + val2; ptr = pszObjId + firstPos; + if (*ptr == '.') + { + ptr++; + firstPos++; + } while (ret && *ptr) { int pos; diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 952e246..bb60798 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -2536,17 +2536,22 @@ static CERT_EXTENSION criticalExt = { oid_basic_constraints2, TRUE, { 8, crit_ext_data } }; static CERT_EXTENSION nonCriticalExt = { oid_basic_constraints2, FALSE, { 8, noncrit_ext_data } }; +static CHAR oid_short[] = "1.1"; +static CERT_EXTENSION extWithShortOid = + { oid_short, FALSE, { 0, NULL } }; static const BYTE ext0[] = { 0x30,0x00 }; static const BYTE ext1[] = { 0x30,0x14,0x30,0x12,0x06,0x03,0x55,0x1d,0x13,0x01,0x01, 0xff,0x04,0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; static const BYTE ext2[] = { 0x30,0x11,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13,0x04, 0x08,0x30,0x06,0x01,0x01,0xff,0x02,0x01,0x01 }; +static const BYTE ext3[] = { 0x30,0x07,0x30,0x05,0x06,0x01,0x29,0x04,0x00 }; static const struct encodedExtensions exts[] = { { { 0, NULL }, ext0 }, { { 1, &criticalExt }, ext1 }, { { 1, &nonCriticalExt }, ext2 }, + { { 1, &extWithShortOid }, ext3 } }; static void test_encodeExtensions(DWORD dwEncoding)

1 0

Juan Lang : crypt32: Don' t check for the TLV after indefinite-length sequence items, the item' s decoder has already done so.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: fa65c3f6342ccbeef0715244bd16b2ca7fa54c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa65c3f6342ccbeef0715244b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 19 15:37:35 2008 -0800 crypt32: Don't check for the TLV after indefinite-length sequence items, the item's decoder has already done so. --- dlls/crypt32/decode.c | 24 ++++-------------------- 1 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 632369f..fa06510 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -376,26 +376,10 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[], } else { - if (itemLen == CMSG_INDEFINITE_LENGTH) - { - if (itemDecoded > itemEncodedLen - 2 || - *(ptr + itemDecoded) != 0 || - *(ptr + itemDecoded + 1) != 0) - { - TRACE("expected 0 TLV\n"); - SetLastError(CRYPT_E_ASN1_CORRUPT); - ret = FALSE; - } - else - itemDecoded += 2; - } - if (ret) - { - ptr += itemDecoded; - decoded += itemDecoded; - TRACE("item %d: decoded %d bytes\n", i, - itemDecoded); - } + ptr += itemDecoded; + decoded += itemDecoded; + TRACE("item %d: decoded %d bytes\n", i, + itemDecoded); } } else if (items[i].optional &&

1 0

Juan Lang : cryptui: Fix problem with usage checkbox bitmap not being visible after the first time the edit cert properties dialog is shown .
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: dd4e05e3ab834aa7cfebaf00ff29e8583f8fe1b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4e05e3ab834aa7cfebaf00f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 19 09:32:25 2008 -0800 cryptui: Fix problem with usage checkbox bitmap not being visible after the first time the edit cert properties dialog is shown. --- dlls/cryptui/main.c | 79 +++++++++++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 30 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 169d0cd..82a877f 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1157,7 +1157,6 @@ struct detail_data BOOL *pfPropertiesChanged; int cFields; struct field_value_data *fields; - HIMAGELIST imageList; }; typedef void (*add_fields_func)(HWND hwnd, struct detail_data *data); @@ -1860,9 +1859,16 @@ static void add_known_usage(HWND lv, PCCRYPT_OID_INFO info) SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); } -static void show_cert_usages(HWND hwnd, struct detail_data *data) +struct edit_cert_data { - PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + PCCERT_CONTEXT cert; + BOOL *pfPropertiesChanged; + HIMAGELIST imageList; +}; + +static void show_cert_usages(HWND hwnd, struct edit_cert_data *data) +{ + PCCERT_CONTEXT cert = data->cert; HWND lv = GetDlgItem(hwnd, IDC_CERTIFICATE_USAGES); PCERT_ENHKEY_USAGE usage; DWORD size; @@ -1949,9 +1955,9 @@ static void show_cert_usages(HWND hwnd, struct detail_data *data) BM_CLICK, 0, 0); } -static void set_general_cert_properties(HWND hwnd, struct detail_data *data) +static void set_general_cert_properties(HWND hwnd, struct edit_cert_data *data) { - PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; + PCCERT_CONTEXT cert = data->cert; WCHAR *str; if ((str = get_cert_property_as_string(cert, CERT_FRIENDLY_NAME_PROP_ID))) @@ -2021,27 +2027,25 @@ static BOOL CALLBACK refresh_propsheet_pages(HWND hwnd, LPARAM lParam) static void apply_general_changes(HWND hwnd) { WCHAR buf[MAX_DESCRIPTION + 1]; - struct detail_data *data = - (struct detail_data *)GetWindowLongPtrW(hwnd, DWLP_USER); + struct edit_cert_data *data = + (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); - set_cert_string_property(data->pCertViewInfo->pCertContext, - CERT_FRIENDLY_NAME_PROP_ID, buf); + set_cert_string_property(data->cert, CERT_FRIENDLY_NAME_PROP_ID, buf); SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); - set_cert_string_property(data->pCertViewInfo->pCertContext, - CERT_DESCRIPTION_PROP_ID, buf); + set_cert_string_property(data->cert, CERT_DESCRIPTION_PROP_ID, buf); if (IsDlgButtonChecked(hwnd, IDC_ENABLE_ALL_PURPOSES)) { /* Setting a NULL usage removes the enhanced key usage property. */ - CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, NULL); + CertSetEnhancedKeyUsage(data->cert, NULL); } else if (IsDlgButtonChecked(hwnd, IDC_DISABLE_ALL_PURPOSES)) { CERT_ENHKEY_USAGE usage = { 0, NULL }; - CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, &usage); + CertSetEnhancedKeyUsage(data->cert, &usage); } else if (IsDlgButtonChecked(hwnd, IDC_ENABLE_SELECTED_PURPOSES)) { @@ -2078,7 +2082,7 @@ static void apply_general_changes(HWND hwnd) } } } - CertSetEnhancedKeyUsage(data->pCertViewInfo->pCertContext, &usage); + CertSetEnhancedKeyUsage(data->cert, &usage); HeapFree(GetProcessHeap(), 0, usage.rgpszUsageIdentifier); } EnumChildWindows(GetParent(GetParent(hwnd)), refresh_propsheet_pages, 0); @@ -2090,7 +2094,6 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { PROPSHEETPAGEW *page; - struct detail_data *data; TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); @@ -2099,15 +2102,36 @@ static LRESULT CALLBACK cert_properties_general_dlg_proc(HWND hwnd, UINT msg, case WM_INITDIALOG: { HWND description = GetDlgItem(hwnd, IDC_DESCRIPTION); + struct detail_data *detailData; + struct edit_cert_data *editData; page = (PROPSHEETPAGEW *)lp; - data = (struct detail_data *)page->lParam; + detailData = (struct detail_data *)page->lParam; SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), EM_SETLIMITTEXT, MAX_FRIENDLY_NAME, 0); SendMessageW(description, EM_SETLIMITTEXT, MAX_DESCRIPTION, 0); ShowScrollBar(description, SB_VERT, FALSE); - set_general_cert_properties(hwnd, data); - SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)data); + editData = HeapAlloc(GetProcessHeap(), 0, + sizeof(struct edit_cert_data)); + if (editData) + { + editData->imageList = ImageList_Create(16, 16, + ILC_COLOR4 | ILC_MASK, 4, 0); + if (editData->imageList) + { + HBITMAP bmp; + COLORREF backColor = RGB(255, 0, 255); + + bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_CHECKS)); + ImageList_AddMasked(editData->imageList, bmp, backColor); + DeleteObject(bmp); + ImageList_SetBkColor(editData->imageList, CLR_NONE); + } + editData->cert = detailData->pCertViewInfo->pCertContext; + editData->pfPropertiesChanged = detailData->pfPropertiesChanged; + SetWindowLongPtrW(hwnd, DWLP_USER, (LPARAM)editData); + set_general_cert_properties(hwnd, editData); + } break; } case WM_NOTIFY: @@ -2172,6 +2196,7 @@ static UINT CALLBACK cert_properties_general_callback(HWND hwnd, UINT msg, { HWND lv; int cItem, i; + struct edit_cert_data *data; switch (msg) { @@ -2196,6 +2221,12 @@ static UINT CALLBACK cert_properties_general_callback(HWND hwnd, UINT msg, } } } + data = (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); + if (data) + { + ImageList_Destroy(data->imageList); + HeapFree(GetProcessHeap(), 0, data); + } break; } return 1; @@ -2359,7 +2390,6 @@ static UINT CALLBACK detail_callback(HWND hwnd, UINT msg, case PSPCB_RELEASE: data = (struct detail_data *)page->lParam; free_detail_fields(data); - ImageList_Destroy(data->imageList); HeapFree(GetProcessHeap(), 0, data); break; } @@ -2379,17 +2409,6 @@ static BOOL init_detail_page(PCCRYPTUI_VIEWCERTIFICATE_STRUCTW pCertViewInfo, data->pfPropertiesChanged = pfPropertiesChanged; data->cFields = 0; data->fields = NULL; - data->imageList = ImageList_Create(16, 16, ILC_COLOR4 | ILC_MASK, 4, 0); - if (data->imageList) - { - HBITMAP bmp; - COLORREF backColor = RGB(255, 0, 255); - - bmp = LoadBitmapW(hInstance, MAKEINTRESOURCEW(IDB_CHECKS)); - ImageList_AddMasked(data->imageList, bmp, backColor); - DeleteObject(bmp); - ImageList_SetBkColor(data->imageList, CLR_NONE); - } memset(page, 0, sizeof(PROPSHEETPAGEW)); page->dwSize = sizeof(PROPSHEETPAGEW); page->dwFlags = PSP_USECALLBACK;

1 0

Juan Lang : crypt32: Don't restrict file stores to binary-encoded files.
by Alexandre Julliard Dec. 20, 2008

Dec. 20, 2008

Module: wine Branch: master Commit: 09aec4f155145223020499f2ee667a01b2a7fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=09aec4f155145223020499f2e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 19 15:36:58 2008 -0800 crypt32: Don't restrict file stores to binary-encoded files. --- dlls/crypt32/filestore.c | 2 +- dlls/crypt32/tests/store.c | 114 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index cfa29b3..a33b828 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -338,7 +338,7 @@ PWINECRYPT_CERTSTORE CRYPT_FileNameOpenStoreW(HCRYPTPROV hCryptProv, CERT_QUERY_CONTENT_FLAG_CERT | CERT_QUERY_CONTENT_FLAG_SERIALIZED_STORE | CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, - CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, &contentType, NULL, + CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, &contentType, NULL, &memStore, NULL, NULL); if (ret) { diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 450b754..ae21123 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -1251,9 +1251,71 @@ static BOOL initFileFromData(LPCWSTR filename, const BYTE *pb, DWORD cb) ret = FALSE; return ret; } + +static const BYTE base64SPC[] = +"MIICJQYJKoZIhvcNAQcCoIICFjCCAhICAQExADALBgkqhkiG9w0BBwGgggH6MIIB" +"9jCCAV+gAwIBAgIQnP8+EF4opr9OxH7h4uBPWTANBgkqhkiG9w0BAQQFADAUMRIw" +"EAYDVQQDEwlKdWFuIExhbmcwHhcNMDgxMjEyMTcxMDE0WhcNMzkxMjMxMjM1OTU5" +"WjAUMRIwEAYDVQQDEwlKdWFuIExhbmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ" +"AoGBALCgNjyNvOic0FOfjxvi43HbM+D5joDkhiGSXe+gbZlf8f16k07kkObFEunz" +"mdB5coscmA7gyqiWNN4ZUyr2cA3lCbnpGPA/0IblyyOcuGIFmmCzeZaVa5ZG6xZP" +"K7L7o+73Qo6jXVbGhBGnMZ7Q9sAn6s2933olnStnejnqwV0NAgMBAAGjSTBHMEUG" +"A1UdAQQ+MDyAEFKbKEdXYyx+CWKcV6vxM6ShFjAUMRIwEAYDVQQDEwlKdWFuIExh" +"bmeCEJz/PhBeKKa/TsR+4eLgT1kwDQYJKoZIhvcNAQEEBQADgYEALpkgLgW3mEaK" +"idPQ3iPJYLG0Ub1wraqEl9bd42hrhzIdcDzlQgxnm8/5cHYVxIF/C20x/HJplb1R" +"G6U1ipFe/q8byWD/9JpiBKMGPi9YlUTgXHfS9d4S/QWO1h9Z7KeipBYhoslQpHXu" +"y9bUr8Adqi6SzgHpCnMu53dxgxUD1r4xAA=="; +/* Same as base64SPC, but as a wide-char string */ +static const WCHAR utf16Base64SPC[] = { +'M','I','I','C','J','Q','Y','J','K','o','Z','I','h','v','c','N','A', +'Q','c','C','o','I','I','C','F','j','C','C','A','h','I','C','A','Q', +'E','x','A','D','A','L','B','g','k','q','h','k','i','G','9','w','0', +'B','B','w','G','g','g','g','H','6','M','I','I','B','9','j','C','C', +'A','V','+','g','A','w','I','B','A','g','I','Q','n','P','8','+','E', +'F','4','o','p','r','9','O','x','H','7','h','4','u','B','P','W','T', +'A','N','B','g','k','q','h','k','i','G','9','w','0','B','A','Q','Q', +'F','A','D','A','U','M','R','I','w','E','A','Y','D','V','Q','Q','D', +'E','w','l','K','d','W','F','u','I','E','x','h','b','m','c','w','H', +'h','c','N','M','D','g','x','M','j','E','y','M','T','c','x','M','D', +'E','0','W','h','c','N','M','z','k','x','M','j','M','x','M','j','M', +'1','O','T','U','5','W','j','A','U','M','R','I','w','E','A','Y','D', +'V','Q','Q','D','E','w','l','K','d','W','F','u','I','E','x','h','b', +'m','c','w','g','Z','8','w','D','Q','Y','J','K','o','Z','I','h','v', +'c','N','A','Q','E','B','B','Q','A','D','g','Y','0','A','M','I','G', +'J','A','o','G','B','A','L','C','g','N','j','y','N','v','O','i','c', +'0','F','O','f','j','x','v','i','4','3','H','b','M','+','D','5','j', +'o','D','k','h','i','G','S','X','e','+','g','b','Z','l','f','8','f', +'1','6','k','0','7','k','k','O','b','F','E','u','n','z','m','d','B', +'5','c','o','s','c','m','A','7','g','y','q','i','W','N','N','4','Z', +'U','y','r','2','c','A','3','l','C','b','n','p','G','P','A','/','0', +'I','b','l','y','y','O','c','u','G','I','F','m','m','C','z','e','Z', +'a','V','a','5','Z','G','6','x','Z','P','K','7','L','7','o','+','7', +'3','Q','o','6','j','X','V','b','G','h','B','G','n','M','Z','7','Q', +'9','s','A','n','6','s','2','9','3','3','o','l','n','S','t','n','e', +'j','n','q','w','V','0','N','A','g','M','B','A','A','G','j','S','T', +'B','H','M','E','U','G','A','1','U','d','A','Q','Q','+','M','D','y', +'A','E','F','K','b','K','E','d','X','Y','y','x','+','C','W','K','c', +'V','6','v','x','M','6','S','h','F','j','A','U','M','R','I','w','E', +'A','Y','D','V','Q','Q','D','E','w','l','K','d','W','F','u','I','E', +'x','h','b','m','e','C','E','J','z','/','P','h','B','e','K','K','a', +'/','T','s','R','+','4','e','L','g','T','1','k','w','D','Q','Y','J', +'K','o','Z','I','h','v','c','N','A','Q','E','E','B','Q','A','D','g', +'Y','E','A','L','p','k','g','L','g','W','3','m','E','a','K','i','d', +'P','Q','3','i','P','J','Y','L','G','0','U','b','1','w','r','a','q', +'E','l','9','b','d','4','2','h','r','h','z','I','d','c','D','z','l', +'Q','g','x','n','m','8','/','5','c','H','Y','V','x','I','F','/','C', +'2','0','x','/','H','J','p','l','b','1','R','G','6','U','1','i','p', +'F','e','/','q','8','b','y','W','D','/','9','J','p','i','B','K','M', +'G','P','i','9','Y','l','U','T','g','X','H','f','S','9','d','4','S', +'/','Q','W','O','1','h','9','Z','7','K','e','i','p','B','Y','h','o', +'s','l','Q','p','H','X','u','y','9','b','U','r','8','A','d','q','i', +'6','S','z','g','H','p','C','n','M','u','5','3','d','x','g','x','U', +'D','1','r','4','x','A','A','=','=',0 }; + static void testFileNameStore(void) { static const WCHAR szPrefix[] = { 'c','e','r',0 }; + static const WCHAR spcPrefix[] = { 's','p','c',0 }; static const WCHAR szDot[] = { '.',0 }; WCHAR filename[MAX_PATH]; HCERTSTORE store; @@ -1387,6 +1449,58 @@ static void testFileNameStore(void) sizeof(serializedStoreWithCertAndCRL)); } DeleteFileW(filename); + + if (!GetTempFileNameW(szDot, spcPrefix, 0, filename)) + return; + DeleteFileW(filename); + + if (initFileFromData(filename, base64SPC, sizeof(base64SPC))) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, + CERT_STORE_READONLY_FLAG, filename); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(!crl, "Expected no CRLs\n"); + } + + CertCloseStore(store, 0); + DeleteFileW(filename); + } + if (initFileFromData(filename, (BYTE *)utf16Base64SPC, + sizeof(utf16Base64SPC))) + { + PCCERT_CONTEXT cert; + PCCRL_CONTEXT crl; + + store = CertOpenStore(CERT_STORE_PROV_FILENAME_W, 0, 0, + CERT_STORE_READONLY_FLAG, filename); + ok(store != NULL, "CertOpenStore failed: %08x\n", GetLastError()); + + cert = CertEnumCertificatesInStore(store, NULL); + ok(cert != NULL, "CertEnumCertificatesInStore failed: %08x\n", + GetLastError()); + cert = CertEnumCertificatesInStore(store, cert); + ok(!cert, "Expected only one cert\n"); + if (pCertEnumCRLsInStore) + { + crl = pCertEnumCRLsInStore(store, NULL); + ok(!crl, "Expected no CRLs\n"); + } + + CertCloseStore(store, 0); + DeleteFileW(filename); + } } static const BYTE signedContent[] = {

1 0

Alexandre Julliard : cryptui: Commit checks.bmp missed in a previous patch.
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: 4cca303be0485ae3a224ff01af68042d6e27e5e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cca303be0485ae3a224ff01a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 19 18:31:35 2008 +0100 cryptui: Commit checks.bmp missed in a previous patch. --- dlls/cryptui/checks.bmp | Bin 0 -> 3126 bytes 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/checks.bmp b/dlls/cryptui/checks.bmp new file mode 100644 index 0000000..d3f1b66 Binary files /dev/null and b/dlls/cryptui/checks.bmp differ

1 0

Juan Lang : cryptui: Don't crash if a chain can' t be created for the viewed cert.
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: 197df1643e54b8e5c38475b70ecf574f52fd446b URL: http://source.winehq.org/git/wine.git/?a=commit;h=197df1643e54b8e5c38475b70… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 18 16:54:39 2008 -0800 cryptui: Don't crash if a chain can't be created for the viewed cert. --- dlls/cryptui/main.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 6b00c37..169d0cd 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -742,8 +742,9 @@ static void set_cert_info(HWND hwnd, CRYPT_PROVIDER_CERT *root = &provSigner->pasCertChain[provSigner->csCertChain - 1]; - if (provSigner->pChainContext->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_PARTIAL_CHAIN) + if (!provSigner->pChainContext || + (provSigner->pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN)) add_icon_to_control(icon, IDB_CERT_WARNING); else if (!root->fTrustedRoot) add_icon_to_control(icon, IDB_CERT_ERROR); @@ -767,8 +768,9 @@ static void set_cert_info(HWND hwnd, if (provSigner->dwError == TRUST_E_CERT_SIGNATURE) add_string_resource_with_paraformat_to_control(text, IDS_CERT_INFO_BAD_SIG, &parFmt); - else if (provSigner->pChainContext->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_PARTIAL_CHAIN) + else if (!provSigner->pChainContext || + (provSigner->pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN)) add_string_resource_with_paraformat_to_control(text, IDS_CERT_INFO_PARTIAL_CHAIN, &parFmt); else if (!root->fTrustedRoot)

1 0

Henri Verbeet : wined3d: Don't call allocate_shader_constants() from Init3D ().
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: a52edd78108c82b85b5954938a05a775b00778dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52edd78108c82b85b5954938… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 18 17:59:06 2008 +0100 wined3d: Don't call allocate_shader_constants() from Init3D(). CreateStateBlock() should take care of that. --- dlls/wined3d/device.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc7017b..09f4739 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -340,6 +340,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, list_init(&object->lightMap[i]); } + temp_result = allocate_shader_constants(object); + if (FAILED(temp_result)) + { + HeapFree(GetProcessHeap(), 0, object); + return temp_result; + } + /* Special case - Used during initialization to produce a placeholder stateblock so other functions called can update a state block */ if (Type == WINED3DSBT_INIT) { @@ -347,10 +354,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateStateBlock(IWineD3DDevice* iface, be freed due to circular dependencies */ return WINED3D_OK; } - - temp_result = allocate_shader_constants(object); - if (WINED3D_OK != temp_result) - return temp_result; /* Otherwise, might as well set the whole state block to the appropriate values */ if (This->stateBlock != NULL) @@ -2085,11 +2088,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR This->updateStateBlock = This->stateBlock; IWineD3DStateBlock_AddRef((IWineD3DStateBlock*)This->updateStateBlock); - hr = allocate_shader_constants(This->updateStateBlock); - if (WINED3D_OK != hr) { - goto err_out; - } - This->render_targets = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *) * GL_LIMITS(buffers)); This->draw_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLenum) * GL_LIMITS(buffers));

1 0

Roderick Colenbrander : wined3d: Add GL_RG16F / GL_RG32F support using ARB_texture_rg.
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: 086d949877b3632f6bc31c07187a740c3edde216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=086d949877b3632f6bc31c071… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Dec 18 23:00:02 2008 +0100 wined3d: Add GL_RG16F / GL_RG32F support using ARB_texture_rg. --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/utils.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 149c330..d5fd0a5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2361,6 +2361,10 @@ static BOOL CheckTextureCapability(UINT Adapter, WINED3DDEVTYPE DeviceType, WINE case WINED3DFMT_G16R16F: case WINED3DFMT_G32R32F: + if(GL_SUPPORT(ARB_TEXTURE_RG)) { + TRACE_(d3d_caps)("[OK]\n"); + return TRUE; + } TRACE_(d3d_caps)("[FAILED]\n"); return FALSE; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ada273f..b9c4bf2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -167,7 +167,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* IEEE formats */ {WINED3DFMT_R32F ,GL_RGB32F_ARB ,GL_RGB32F_ARB , 0, GL_RED ,GL_FLOAT ,WINED3DFMT_FLAG_RENDERTARGET }, - {WINED3DFMT_G32R32F ,0 ,0 , 0, 0 ,0 + {WINED3DFMT_G32R32F ,GL_RG32F ,GL_RG32F , 0, GL_RG ,GL_FLOAT ,WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A32B32G32R32F ,GL_RGBA32F_ARB ,GL_RGBA32F_ARB , 0, GL_RGBA ,GL_FLOAT ,WINED3DFMT_FLAG_RENDERTARGET }, @@ -177,7 +177,7 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* Float */ {WINED3DFMT_R16F ,GL_RGB16F_ARB ,GL_RGB16F_ARB , 0, GL_RED ,GL_HALF_FLOAT_ARB ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, - {WINED3DFMT_G16R16F ,0 ,0 , 0, 0 ,0 + {WINED3DFMT_G16R16F ,GL_RG16F ,GL_RG16F , 0, GL_RG ,GL_HALF_FLOAT_ARB ,WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET }, {WINED3DFMT_A16B16G16R16F ,GL_RGBA16F_ARB ,GL_RGBA16F_ARB , 0, GL_RGBA ,GL_HALF_FLOAT_ARB ,WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET },

1 0

Roderick Colenbrander : wined3d: Add R16F using ARB_texture_rg.
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: 8cb84458d3f35eeeb82cfb85d6ff4458ecc02e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cb84458d3f35eeeb82cfb85d… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Dec 18 22:32:07 2008 +0100 wined3d: Add R16F using ARB_texture_rg. --- dlls/wined3d/utils.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f65bcdc..88980d7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -366,6 +366,12 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) dst = getFmtIdx(WINED3DFMT_R16F); gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + /* When ARB_texture_rg is supported we only require 16-bit for R16F instead of 64-bit RGBA16F */ + if(GL_SUPPORT(ARB_TEXTURE_RG)) + { + gl_info->gl_formats[dst].glInternal = GL_R16F; + gl_info->gl_formats[dst].glGammaInternal = GL_R16F; + } dst = getFmtIdx(WINED3DFMT_R32F); gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc(

1 0

Roderick Colenbrander : wined3d: Add R32F using ARB_texture_rg.
by Alexandre Julliard Dec. 19, 2008

Dec. 19, 2008

Module: wine Branch: master Commit: 331fe08b549bcb1ca4cb5e3d61eb898f848f0ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=331fe08b549bcb1ca4cb5e3d6… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Thu Dec 18 22:34:22 2008 +0100 wined3d: Add R32F using ARB_texture_rg. --- dlls/wined3d/utils.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 88980d7..ada273f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -376,6 +376,12 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) dst = getFmtIdx(WINED3DFMT_R32F); gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); + /* When ARB_texture_rg is supported we only require 32-bit for R32F instead of 128-bit RGBA32F */ + if(GL_SUPPORT(ARB_TEXTURE_RG)) + { + gl_info->gl_formats[dst].glInternal = GL_R32F; + gl_info->gl_formats[dst].glGammaInternal = GL_R32F; + } dst = getFmtIdx(WINED3DFMT_G16R16); gl_info->gl_formats[dst].color_fixup = create_color_fixup_desc(

1 0