November 2008 - Wine-Commits

Stefan Dösinger : wined3d: Make sure the arbfp pipeline replacement constants are loaded.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 234e995bdc25bc47a6c7adea736d81a1cba68ee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=234e995bdc25bc47a6c7adea7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 19 14:29:34 2008 +0100 wined3d: Make sure the arbfp pipeline replacement constants are loaded. The code here skipped constant loading when a pixel shader was in use, and only reloaded them on ffp use if the shader implementation used ARB too. This way a e.g. texfactor change could get lost if GLSL shaders are used, and the texfactor changed while a pixel shader was in use. --- dlls/wined3d/arb_program_shader.c | 65 ++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 47a03ca..cb89892 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2470,26 +2470,37 @@ static void state_texfactor_arbfp(DWORD state, IWineD3DStateBlockImpl *statebloc float col[4]; IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; - /* Do not overwrite pixel shader constants if a pshader is in use */ - if(use_ps(device)) return; - - D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, col)); - checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, col)"); - + /* Don't load the parameter if we're using an arbfp pixel shader, otherwise we'll overwrite + * application provided constants + */ if(device->shader_backend == &arb_program_shader_backend) { + if(use_ps(device)) return; + device = stateblock->wineD3DDevice; device->activeContext->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_TFACTOR + 1); } + + D3DCOLORTOGLFLOAT4(stateblock->renderState[WINED3DRS_TEXTUREFACTOR], col); + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, col)); + checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, col)"); + } static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { float col[4]; IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; - /* Do not overwrite pixel shader constants if a pshader is in use */ - if(use_ps(device)) return; + /* Don't load the parameter if we're using an arbfp pixel shader, otherwise we'll overwrite + * application provided constants + */ + if(device->shader_backend == &arb_program_shader_backend) { + if(use_ps(device)) return; + + device = stateblock->wineD3DDevice; + device->activeContext->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; + device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); + } if(stateblock->renderState[WINED3DRS_SPECULARENABLE]) { /* The specular color has no alpha */ @@ -2501,12 +2512,6 @@ static void state_arb_specularenable(DWORD state, IWineD3DStateBlockImpl *stateb } GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)); checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)"); - - if(device->shader_backend == &arb_program_shader_backend) { - device = stateblock->wineD3DDevice; - device->activeContext->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; - device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); - } } static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -2524,8 +2529,14 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, W device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); } } - /* Exit now, don't set the bumpmat below, otherwise we may overwrite pixel shader constants */ - return; + + if(device->shader_backend == &arb_program_shader_backend) { + /* Exit now, don't set the bumpmat below, otherwise we may overwrite pixel shader constants */ + return; + } + } else if(device->shader_backend == &arb_program_shader_backend) { + device->activeContext->pshader_const_dirty[ARB_FFP_CONST_BUMPMAT(stage)] = 1; + device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_BUMPMAT(stage) + 1); } mat[0][0] = *((float *) &stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]); @@ -2535,11 +2546,6 @@ static void set_bumpmat_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, W GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0])); checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_BUMPMAT(stage), &mat[0][0])"); - - if(device->shader_backend == &arb_program_shader_backend) { - device->activeContext->pshader_const_dirty[ARB_FFP_CONST_BUMPMAT(stage)] = 1; - device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_BUMPMAT(stage) + 1); - } } static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -2557,8 +2563,14 @@ static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); } } - /* Exit now, don't set the bumpmat below, otherwise we may overwrite pixel shader constants */ - return; + + if(device->shader_backend == &arb_program_shader_backend) { + /* Exit now, don't set the bumpmat below, otherwise we may overwrite pixel shader constants */ + return; + } + } else if(device->shader_backend == &arb_program_shader_backend) { + device->activeContext->pshader_const_dirty[ARB_FFP_CONST_LUMINANCE(stage)] = 1; + device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_LUMINANCE(stage) + 1); } param[0] = *((float *) &stateblock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]); @@ -2568,11 +2580,6 @@ static void tex_bumpenvlum_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_LUMINANCE(stage), param)); checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_LUMINANCE(stage), param)"); - - if(device->shader_backend == &arb_program_shader_backend) { - device->activeContext->pshader_const_dirty[ARB_FFP_CONST_LUMINANCE(stage)] = 1; - device->highest_dirty_ps_const = max(device->highest_dirty_ps_const, ARB_FFP_CONST_LUMINANCE(stage) + 1); - } } static const char *get_argreg(SHADER_BUFFER *buffer, DWORD argnum, unsigned int stage, DWORD arg) {

1 0

A C Hurst : ntdll: wine_nt_to_unix_file_name() parse string to int instead of cast char, where string may be passed.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: ad335b7e7f088476ce6f761945317c12fed885a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad335b7e7f088476ce6f76194… Author: A C Hurst <A.Hurst(a)sheffield.ac.uk> Date: Wed Nov 19 14:58:59 2008 +0000 ntdll: wine_nt_to_unix_file_name() parse string to int instead of cast char, where string may be passed. --- dlls/ntdll/directory.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 5c163f1..8a29098 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -1877,8 +1877,8 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *u dev[2] = 0; /* remove last ':' to get the drive mount point symlink */ new_name = get_default_drive_device( unix_name ); } - else if (!strncmp( dev, "com", 3 )) new_name = get_default_com_device( dev[3] - '0' ); - else if (!strncmp( dev, "lpt", 3 )) new_name = get_default_lpt_device( dev[3] - '0' ); + else if (!strncmp( dev, "com", 3 )) new_name = get_default_com_device( atoi(dev + 3 )); + else if (!strncmp( dev, "lpt", 3 )) new_name = get_default_lpt_device( atoi(dev + 3 )); if (!new_name) break;

1 0

Aric Stewart : imm32: Implement ImmInstallIME(W/A).
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 6c551744ef77e02832113b3eb12ba279c3edbf39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c551744ef77e02832113b3eb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 19 08:10:33 2008 -0600 imm32: Implement ImmInstallIME(W/A). --- dlls/imm32/imm.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 5e820a2..3ed6411 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -106,6 +106,11 @@ static UINT WM_MSIME_DOCUMENTFEED; static const WCHAR szwWineIMCProperty[] = {'W','i','n','e','I','m','m','H','I','M','C','P','r','o','p','e','r','t','y',0}; +static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; +static const WCHAR szLayoutTextW[] = {'L','a','y','o','u','t',' ','T','e','x','t',0}; +static const WCHAR szImeRegFmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','x',0}; + + #define is_himc_ime_unicode(p) (p->immKbd->imeInfo.fdwProperty & IME_PROP_UNICODE) #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) @@ -1523,15 +1528,12 @@ UINT WINAPI ImmGetIMEFileNameA( HKL hKL, LPSTR lpszFileName, UINT uBufLen) */ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) { - static const WCHAR szImeFileW[] = {'I','m','e',' ','F','i','l','e',0}; - static const WCHAR fmt[] = {'S','y','s','t','e','m','\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\','C','o','n','t','r','o','l','\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s','\\','%','0','8','x',0}; - HKEY hkey; DWORD length; DWORD rc; - WCHAR regKey[sizeof(fmt)/sizeof(WCHAR)+8]; + WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; - wsprintfW( regKey, fmt, (unsigned)hKL ); + wsprintfW( regKey, szImeRegFmt, (unsigned)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); if (rc != ERROR_SUCCESS) { @@ -1713,11 +1715,21 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) HKL WINAPI ImmInstallIMEA( LPCSTR lpszIMEFileName, LPCSTR lpszLayoutText) { - FIXME("(%s, %s): stub\n", - debugstr_a(lpszIMEFileName), debugstr_a(lpszLayoutText) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + LPWSTR lpszwIMEFileName; + LPWSTR lpszwLayoutText; + HKL hkl; + + TRACE ("(%s, %s)\n", debugstr_a(lpszIMEFileName), + debugstr_a(lpszLayoutText)); + + lpszwIMEFileName = strdupAtoW(lpszIMEFileName); + lpszwLayoutText = strdupAtoW(lpszLayoutText); + + hkl = ImmInstallIMEW(lpszwIMEFileName, lpszwLayoutText); + + HeapFree(GetProcessHeap(),0,lpszwIMEFileName); + HeapFree(GetProcessHeap(),0,lpszwLayoutText); + return hkl; } /*********************************************************************** @@ -1726,11 +1738,56 @@ HKL WINAPI ImmInstallIMEA( HKL WINAPI ImmInstallIMEW( LPCWSTR lpszIMEFileName, LPCWSTR lpszLayoutText) { - FIXME("(%s, %s): stub\n", - debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText) - ); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return NULL; + INT lcid = GetUserDefaultLCID(); + INT count; + HKL hkl; + DWORD rc; + HKEY hkey; + WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + + TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), + debugstr_w(lpszLayoutText)); + + /* Start with 2. e001 will be blank and so default to the wine internal IME */ + count = 2; + + while (count < 0xfff) + { + DWORD disposition = 0; + + hkl = (HKL)(((0xe000|count)<<16) | lcid); + wsprintfW( regKey, szImeRegFmt, (unsigned)hkl); + + rc = RegCreateKeyExW(HKEY_LOCAL_MACHINE, regKey, 0, NULL, 0, KEY_WRITE, NULL, &hkey, &disposition); + if (rc == ERROR_SUCCESS && disposition == REG_CREATED_NEW_KEY) + break; + else if (rc == ERROR_SUCCESS) + RegCloseKey(hkey); + + count++; + } + + if (count == 0xfff) + { + WARN("Unable to find slot to install IME\n"); + return 0; + } + + if (rc == ERROR_SUCCESS) + { + rc = RegSetValueExW(hkey, szImeFileW, 0, REG_SZ, (LPBYTE)lpszIMEFileName, + (lstrlenW(lpszIMEFileName) + 1) * sizeof(WCHAR)); + if (rc == ERROR_SUCCESS) + rc = RegSetValueExW(hkey, szLayoutTextW, 0, REG_SZ, (LPBYTE)lpszLayoutText, + (lstrlenW(lpszLayoutText) + 1) * sizeof(WCHAR)); + RegCloseKey(hkey); + return hkl; + } + else + { + WARN("Unable to set IME registry values\n"); + return 0; + } } /***********************************************************************

1 0

Paul Vriens : user32/tests: Don't crash on Win95.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: bc3484bc208fb9e89bbed31d74cc1092b242d27b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc3484bc208fb9e89bbed31d7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Nov 20 11:42:35 2008 +0100 user32/tests: Don't crash on Win95. --- dlls/user32/tests/win.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e8ee9d9..d1bf206 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3361,9 +3361,17 @@ static void test_params(void) INT rc; /* Just a param check */ - SetLastError(0xdeadbeef); - rc = GetWindowText(hwndMain2, NULL, 1024); - ok( rc==0, "GetWindowText: rc=%d err=%d\n",rc,GetLastError()); + if (pGetMonitorInfoA) + { + SetLastError(0xdeadbeef); + rc = GetWindowText(hwndMain2, NULL, 1024); + ok( rc==0, "GetWindowText: rc=%d err=%d\n",rc,GetLastError()); + } + else + { + /* Skips actually on Win95 and NT4 */ + win_skip("Test would crash on Win95\n"); + } SetLastError(0xdeadbeef); hwnd=CreateWindow("LISTBOX", "TestList",

1 0

Juan Lang : crypt32: Fix failing tests on Win9x/NT4.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 4f14b030a66e34a8bec2b5d79799ad9699627061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f14b030a66e34a8bec2b5d79… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 19 12:35:19 2008 -0800 crypt32: Fix failing tests on Win9x/NT4. --- dlls/crypt32/tests/encode.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 1141d5e..60c387c 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1318,9 +1318,10 @@ static void test_encodeNameValue(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, X509_NAME_VALUE, &nameValues[i].value, CRYPT_ENCODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &size); - ok(ret, "Type %d: CryptEncodeObjectEx failed: %08x\n", + ok(ret || broken(GetLastError() == OSS_PDU_MISMATCH) /* NT4/Win9x */, + "Type %d: CryptEncodeObjectEx failed: %08x\n", nameValues[i].value.dwValueType, GetLastError()); - if (buf) + if (ret) { ok(size == nameValues[i].encodedSize, "Expected size %d, got %d\n", nameValues[i].encodedSize, size); @@ -1346,7 +1347,7 @@ static void test_decodeNameValue(DWORD dwEncoding) (BYTE *)&buf, &bufSize); ok(ret, "Value type %d: CryptDecodeObjectEx failed: %08x\n", nameValues[i].value.dwValueType, GetLastError()); - if (buf) + if (ret) { compareNameValues(&nameValues[i].value, (const CERT_NAME_VALUE *)buf); @@ -2367,8 +2368,10 @@ static void test_decodeRsaPublicKey(DWORD dwEncoding) ret = pCryptDecodeObjectEx(dwEncoding, RSA_CSP_PUBLICKEYBLOB, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1], CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - ok(!ret && GetLastError() == CRYPT_E_ASN1_EOD, - "Expected CRYPT_E_ASN1_EOD, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == CRYPT_E_ASN1_EOD || + GetLastError() == OSS_MORE_INPUT /* Win9x/NT4 */), + "Expected CRYPT_E_ASN1_EOD or OSS_MORE_INPUT, got %08x\n", + GetLastError()); /* Try with a couple of RSA-related OIDs */ ret = pCryptDecodeObjectEx(dwEncoding, szOID_RSA_RSA, rsaPubKeys[0].encoded, rsaPubKeys[0].encoded[1] + 2, @@ -7065,6 +7068,11 @@ static void test_encodePolicyQualifierUserNotice(DWORD dwEncoding) ret = pCryptEncodeObjectEx(dwEncoding, X509_PKIX_POLICY_QUALIFIER_USERNOTICE, &notice, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no X509_PKIX_POLICY_QUALIFIER_USERNOTICE encode support\n"); + return; + } ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7109,6 +7117,11 @@ static void test_decodePolicyQualifierUserNotice(DWORD dwEncoding) X509_PKIX_POLICY_QUALIFIER_USERNOTICE, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &notice, &size); + if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND) + { + skip("no X509_PKIX_POLICY_QUALIFIER_USERNOTICE decode support\n"); + return; + } ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -7196,8 +7209,9 @@ static void test_encodeCertPolicies(DWORD dwEncoding) info.rgPolicyInfo = policy; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); - ok(!ret && GetLastError() == E_INVALIDARG, - "expected E_INVALIDARG, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == E_INVALIDARG || + GetLastError() == OSS_LIMITED /* Win9x/NT4 */), + "expected E_INVALIDARG or OSS_LIMITED, got %08x\n", GetLastError()); policy[0].pszPolicyIdentifier = oid_any_policy; ret = pCryptEncodeObjectEx(dwEncoding, X509_CERT_POLICIES, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size);

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_NETSCAPE_CERT_TYPE.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 76d25370940245600de4d4acdb239392249410c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76d25370940245600de4d4acd… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 19 12:06:08 2008 -0800 crypt32: Implement CryptFormatObject for szOID_NETSCAPE_CERT_TYPE. --- dlls/crypt32/crypt32_En.rc | 7 +++ dlls/crypt32/cryptres.h | 7 +++ dlls/crypt32/object.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 301816e..ace77d2 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -227,4 +227,11 @@ STRINGTABLE DISCARDABLE IDS_CRL_SIGN "CRL Signing" IDS_ENCIPHER_ONLY "Encipher Only" IDS_DECIPHER_ONLY "Decipher Only" + IDS_NETSCAPE_SSL_CLIENT "SSL Client Authentication" + IDS_NETSCAPE_SSL_SERVER "SSL Server Authentication" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Signature" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "Signature CA" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 58daa07..6d0ac46 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -217,5 +217,12 @@ #define IDS_CRL_SIGN 1250 #define IDS_ENCIPHER_ONLY 1251 #define IDS_DECIPHER_ONLY 1252 +#define IDS_NETSCAPE_SSL_CLIENT 1253 +#define IDS_NETSCAPE_SSL_SERVER 1254 +#define IDS_NETSCAPE_SMIME 1255 +#define IDS_NETSCAPE_SIGN 1256 +#define IDS_NETSCAPE_SSL_CA 1257 +#define IDS_NETSCAPE_SMIME_CA 1258 +#define IDS_NETSCAPE_SIGN_CA 1259 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 2a556cb..bd3ad11 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -2057,6 +2057,114 @@ static BOOL WINAPI CRYPT_FormatEnhancedKeyUsage(DWORD dwCertEncodingType, return ret; } +static struct BitToString netscapeCertTypeMap[] = { + { NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE, IDS_NETSCAPE_SSL_CLIENT, { 0 } }, + { NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE, IDS_NETSCAPE_SSL_SERVER, { 0 } }, + { NETSCAPE_SMIME_CERT_TYPE, IDS_NETSCAPE_SMIME, { 0 } }, + { NETSCAPE_SIGN_CERT_TYPE, IDS_NETSCAPE_SIGN, { 0 } }, + { NETSCAPE_SSL_CA_CERT_TYPE, IDS_NETSCAPE_SSL_CA, { 0 } }, + { NETSCAPE_SMIME_CA_CERT_TYPE, IDS_NETSCAPE_SMIME_CA, { 0 } }, + { NETSCAPE_SIGN_CA_CERT_TYPE, IDS_NETSCAPE_SIGN_CA, { 0 } }, +}; + +static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + DWORD size; + CRYPT_BIT_BLOB *bits; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_BITS, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &bits, &size))) + { + WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; + DWORD bytesNeeded = sizeof(WCHAR); + + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, + sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + if (!bits->cbData || bits->cbData > 1) + { + bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = bytesNeeded; + strcpyW(str, infoNotAvailable); + } + } + else + { + static BOOL stringsLoaded = FALSE; + int i; + DWORD bitStringLen; + BOOL first = TRUE; + + if (!stringsLoaded) + { + for (i = 0; i < sizeof(netscapeCertTypeMap) / + sizeof(netscapeCertTypeMap[0]); i++) + LoadStringW(hInstance, netscapeCertTypeMap[i].id, + netscapeCertTypeMap[i].str, MAX_STRING_RESOURCE_LEN); + stringsLoaded = TRUE; + } + CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], + netscapeCertTypeMap, + sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), + NULL, &bitStringLen, &first); + bytesNeeded += bitStringLen; + bytesNeeded += 3 * sizeof(WCHAR); /* " (" + ")" */ + CRYPT_FormatHexString(0, 0, 0, NULL, NULL, bits->pbData, + bits->cbData, NULL, &size); + bytesNeeded += size; + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + bitStringLen = bytesNeeded; + first = TRUE; + CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], + netscapeCertTypeMap, + sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), + str, &bitStringLen, &first); + str += bitStringLen / sizeof(WCHAR) - 1; + *str++ = ' '; + *str++ = '('; + CRYPT_FormatHexString(0, 0, 0, NULL, NULL, bits->pbData, + bits->cbData, str, &size); + str += size / sizeof(WCHAR) - 1; + *str++ = ')'; + *str = 0; + } + } + LocalFree(bits); + } + return ret; +} + static WCHAR financialCriteria[MAX_STRING_RESOURCE_LEN]; static WCHAR available[MAX_STRING_RESOURCE_LEN]; static WCHAR notAvailable[MAX_STRING_RESOURCE_LEN]; @@ -2225,6 +2333,8 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatCRLDistPoints; else if (!strcmp(lpszStructType, szOID_ENHANCED_KEY_USAGE)) format = CRYPT_FormatEnhancedKeyUsage; + else if (!strcmp(lpszStructType, szOID_NETSCAPE_CERT_TYPE)) + format = CRYPT_FormatNetscapeCertType; else if (!strcmp(lpszStructType, SPC_FINANCIAL_CRITERIA_OBJID)) format = CRYPT_FormatSpcFinancialCriteria; if (!format && !(formatStrType & CRYPT_FORMAT_STR_NO_HEX))

1 0

Alexandre Julliard : user32/tests: Fix a few more failures in the window test.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 80e163eba987d21396015c9c01ebcfc6c2d7e12f URL: http://source.winehq.org/git/wine.git/?a=commit;h=80e163eba987d21396015c9c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 20 11:57:32 2008 +0100 user32/tests: Fix a few more failures in the window test. --- dlls/user32/tests/win.c | 38 ++++++++++++++++++++++++-------------- 1 files changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5884ce2..e8ee9d9 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -740,8 +740,8 @@ static void verify_window_info(HWND hwnd, const WINDOWINFO *info) ok((info->dwExStyle & ~0xe0000800) == (DWORD)GetWindowLongA(hwnd, GWL_EXSTYLE), "wrong dwExStyle: %08x != %08x\n", info->dwExStyle, GetWindowLongA(hwnd, GWL_EXSTYLE)); status = (GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0; - ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x\n", - info->dwWindowStatus, status); + ok(info->dwWindowStatus == status, "wrong dwWindowStatus: %04x != %04x active %p fg %p\n", + info->dwWindowStatus, status, GetActiveWindow(), GetForegroundWindow()); /* win2k and XP return broken border info in GetWindowInfo most of * the time, so there is no point in testing it. @@ -1877,7 +1877,8 @@ static void test_SetMenu(HWND parent) /* test whether we can destroy a menu assigned to a window */ retok = DestroyMenu(hMenu); ok( retok, "DestroyMenu error %d\n", GetLastError()); - ok(!IsMenu(hMenu), "menu handle should be not valid after DestroyMenu\n"); + retok = IsMenu(hMenu); + ok(!retok || broken(retok) /* nt4 */, "menu handle should be not valid after DestroyMenu\n"); ret = GetMenu(parent); /* This test fails on Win9x */ if (!is_win9x) @@ -2669,12 +2670,19 @@ static void test_mouse_input(HWND hwnd) flush_events( TRUE ); - /* Check that setting the same position will generate WM_MOUSEMOVE */ + /* Check that setting the same position may generate WM_MOUSEMOVE */ SetCursorPos(x, y); msg.message = 0; - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%d,%d)\n", x, y, msg.pt.x, msg.pt.y); + do + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + while (ret && msg.message >= 0xc000); /* skip registered messages */ + if (ret) + { + ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", + msg.hwnd, msg.message); + ok(msg.pt.x == x && msg.pt.y == y, "wrong message coords (%d,%d)/(%d,%d)\n", + x, y, msg.pt.x, msg.pt.y); + } /* force the system to update its internal queue mouse position, * otherwise it won't generate relative mouse movements below. @@ -2684,11 +2692,13 @@ static void test_mouse_input(HWND hwnd) msg.message = 0; mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); - ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ - if (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + if (msg.message >= 0xc000) continue; /* skip registered messages */ + ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, + "hwnd %p message %04x\n", msg.hwnd, msg.message); + } ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); ok( !ret, "message %04x available\n", msg.message); @@ -4246,7 +4256,7 @@ static void test_CreateWindow(void) expected_cx = expected_cy = -10; SetRect( &expected_rect, 0, 0, 0, 0 ); - broken_rect = expected_rect; + SetRect( &broken_rect, 0, 0, -10, -10 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -20, -20, -10, -10, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); @@ -4256,7 +4266,7 @@ static void test_CreateWindow(void) expected_cx = expected_cy = -200000; SetRect( &expected_rect, 0, 0, 0, 0 ); - broken_rect = expected_rect; + SetRect( &broken_rect, 0, 0, -200000, -200000 ); hwnd = CreateWindowExA(0, "Sizes_WndClass", NULL, WS_CHILD, -300000, -300000, -200000, -200000, parent, 0, 0, NULL); ok( hwnd != 0, "creation failed err %u\n", GetLastError()); GetClientRect( hwnd, &rc ); @@ -5175,7 +5185,7 @@ static LRESULT WINAPI test_thick_child_size_winproc(HWND hwnd, UINT msg, WPARAM "expected maxTrack %dx%d, actual maxTrack %dx%d\n", expectedMaxTrackX, expectedMaxTrackY, actualMaxTrackX, actualMaxTrackY); - GetClientRect(GetAncestor(hwnd, GA_PARENT), &rect); + GetClientRect(GetParent(hwnd), &rect); AdjustWindowRectEx(&rect, WS_CHILD | WS_VISIBLE | WS_THICKFRAME, FALSE, 0); expectedMaxSizeX = rect.right - rect.left; expectedMaxSizeY = rect.bottom - rect.top;

1 0

Juan Lang : include: Add a few missing definitions for Netscape cert extensions.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: a5a0748747ee011c3db00bcac73c011136677354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5a0748747ee011c3db00bcac… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 19 12:05:39 2008 -0800 include: Add a few missing definitions for Netscape cert extensions. --- include/wincrypt.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index bd8023a..2a2a3b3 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -3087,6 +3087,17 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define szOID_NETSCAPE_CA_POLICY_URL "2.16.840.1.113730.1.8" #define szOID_NETSCAPE_SSL_SERVER_NAME "2.16.840.1.113730.1.12" #define szOID_NETSCAPE_COMMENT "2.16.840.1.113730.1.13" +#define szOID_NETSCAPE_DATA_TYPE "2.16.840.1.113730.2" +#define szOID_NETSCAPE_CERT_SEQUENCE "2.16.840.1.113730.2.5" + +/* Bits for szOID_NETSCAPE_CERT_TYPE */ +#define NETSCAPE_SSL_CLIENT_AUTH_CERT_TYPE 0x80 +#define NETSCAPE_SSL_SERVER_AUTH_CERT_TYPE 0x40 +#define NETSCAPE_SMIME_CERT_TYPE 0x20 +#define NETSCAPE_SIGN_CERT_TYPE 0x10 +#define NETSCAPE_SSL_CA_CERT_TYPE 0x04 +#define NETSCAPE_SMIME_CA_CERT_TYPE 0x02 +#define NETSCAPE_SIGN_CA_CERT_TYPE 0x01 #define CRYPT_ENCODE_DECODE_NONE 0 #define X509_CERT ((LPCSTR)1)

1 0

Juan Lang : include: Fix typos.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 1eeb889252e5cf88d1116edde9b3dcf81ef1e9f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1eeb889252e5cf88d1116edde… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 19 10:48:05 2008 -0800 include: Fix typos. --- include/wincrypt.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index e6ce84a..bd8023a 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -290,10 +290,10 @@ typedef struct _CERT_KEY_ATTRIBUTES_INFO { #define CERT_NON_REPUDIATION_KEY_USAGE 0x40 #define CERT_KEY_ENCIPHERMENT_KEY_USAGE 0x20 #define CERT_DATA_ENCIPHERMENT_KEY_USAGE 0x10 -#define CERT_KEY_AGREEMENT_KEY_USAGE 0x80 -#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x40 -#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x20 -#define CERT_CRL_SIGN_KEY_USAGE 0x10 +#define CERT_KEY_AGREEMENT_KEY_USAGE 0x08 +#define CERT_KEY_CERT_SIGN_KEY_USAGE 0x04 +#define CERT_OFFLINE_CRL_SIGN_KEY_USAGE 0x02 +#define CERT_CRL_SIGN_KEY_USAGE 0x02 #define CERT_ENCIPHER_ONLY_KEY_USAGE 0x01 /* byte 1 */ #define CERT_DECIPHER_ONLY_KEY_USAGE 0x80

1 0

Juan Lang : crypt32: Implement CryptFormatObject for szOID_KEY_USAGE.
by Alexandre Julliard Nov. 20, 2008

Nov. 20, 2008

Module: wine Branch: master Commit: 5eb2a8318994ec2c88e8d2a17736037ce1562265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb2a8318994ec2c88e8d2a17… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Nov 19 11:42:34 2008 -0800 crypt32: Implement CryptFormatObject for szOID_KEY_USAGE. --- dlls/crypt32/crypt32_En.rc | 10 ++ dlls/crypt32/cryptres.h | 10 ++ dlls/crypt32/object.c | 210 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 230 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 66b56b4..301816e 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -217,4 +217,14 @@ STRINGTABLE DISCARDABLE IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Meets Criteria=" IDS_YES "Yes" IDS_NO "No" + IDS_DIGITAL_SIGNATURE "Digital Signature" + IDS_NON_REPUDIATION "Non-Repudiation" + IDS_KEY_ENCIPHERMENT "Key Encipherment" + IDS_DATA_ENCIPHERMENT "Data Encipherment" + IDS_KEY_AGREEMENT "Key Agreement" + IDS_CERT_SIGN "Certificate Signing" + IDS_OFFLINE_CRL_SIGN "Off-line CRL Signing" + IDS_CRL_SIGN "CRL Signing" + IDS_ENCIPHER_ONLY "Encipher Only" + IDS_DECIPHER_ONLY "Decipher Only" } diff --git a/dlls/crypt32/cryptres.h b/dlls/crypt32/cryptres.h index 7480d46..58daa07 100644 --- a/dlls/crypt32/cryptres.h +++ b/dlls/crypt32/cryptres.h @@ -207,5 +207,15 @@ #define IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA 1240 #define IDS_YES 1241 #define IDS_NO 1242 +#define IDS_DIGITAL_SIGNATURE 1243 +#define IDS_NON_REPUDIATION 1244 +#define IDS_KEY_ENCIPHERMENT 1245 +#define IDS_DATA_ENCIPHERMENT 1246 +#define IDS_KEY_AGREEMENT 1247 +#define IDS_CERT_SIGN 1248 +#define IDS_OFFLINE_CRL_SIGN 1249 +#define IDS_CRL_SIGN 1250 +#define IDS_ENCIPHER_ONLY 1251 +#define IDS_DECIPHER_ONLY 1252 #endif /* ndef __WINE_CRYPTRES_H__ */ diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index cb90332..2a556cb 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -607,6 +607,211 @@ static BOOL WINAPI CRYPT_FormatHexString(DWORD dwCertEncodingType, static const WCHAR crlf[] = { '\r','\n',0 }; static const WCHAR commaSpace[] = { ',',' ',0 }; +struct BitToString +{ + BYTE bit; + int id; + WCHAR str[MAX_STRING_RESOURCE_LEN]; +}; + +static BOOL CRYPT_FormatBits(DWORD dwFormatStrType, BYTE bits, + const struct BitToString *map, DWORD mapEntries, void *pbFormat, + DWORD *pcbFormat, BOOL *first) +{ + LPCWSTR sep; + DWORD sepLen, bytesNeeded = sizeof(WCHAR); + int i; + BOOL ret = TRUE, localFirst = *first; + + if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) + { + sep = crlf; + sepLen = strlenW(crlf) * sizeof(WCHAR); + } + else + { + sep = commaSpace; + sepLen = strlenW(commaSpace) * sizeof(WCHAR); + } + for (i = 0; i < mapEntries; i++) + if (bits & map[i].bit) + { + if (!localFirst) + bytesNeeded += sepLen; + localFirst = FALSE; + bytesNeeded += strlenW(map[i].str) * sizeof(WCHAR); + } + if (!pbFormat) + { + *first = localFirst; + *pcbFormat = bytesNeeded; + } + else if (*pcbFormat < bytesNeeded) + { + *first = localFirst; + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + localFirst = *first; + *pcbFormat = bytesNeeded; + for (i = 0; i < mapEntries; i++) + if (bits & map[i].bit) + { + if (!localFirst) + { + strcpyW(str, sep); + str += sepLen / sizeof(WCHAR); + } + localFirst = FALSE; + strcpyW(str, map[i].str); + str += strlenW(map[i].str); + } + *first = localFirst; + } + return ret; +} + +static struct BitToString keyUsageByte0Map[] = { + { CERT_DIGITAL_SIGNATURE_KEY_USAGE, IDS_DIGITAL_SIGNATURE, { 0 } }, + { CERT_NON_REPUDIATION_KEY_USAGE, IDS_NON_REPUDIATION, { 0 } }, + { CERT_KEY_ENCIPHERMENT_KEY_USAGE, IDS_KEY_ENCIPHERMENT, { 0 } }, + { CERT_DATA_ENCIPHERMENT_KEY_USAGE, IDS_DATA_ENCIPHERMENT, { 0 } }, + { CERT_KEY_AGREEMENT_KEY_USAGE, IDS_KEY_AGREEMENT, { 0 } }, + { CERT_KEY_CERT_SIGN_KEY_USAGE, IDS_CERT_SIGN, { 0 } }, + { CERT_OFFLINE_CRL_SIGN_KEY_USAGE, IDS_OFFLINE_CRL_SIGN, { 0 } }, + { CERT_CRL_SIGN_KEY_USAGE, IDS_CRL_SIGN, { 0 } }, + { CERT_ENCIPHER_ONLY_KEY_USAGE, IDS_ENCIPHER_ONLY, { 0 } }, +}; +static struct BitToString keyUsageByte1Map[] = { + { CERT_DECIPHER_ONLY_KEY_USAGE, IDS_DECIPHER_ONLY, { 0 } }, +}; + +static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, + DWORD dwFormatType, DWORD dwFormatStrType, void *pFormatStruct, + LPCSTR lpszStructType, const BYTE *pbEncoded, DWORD cbEncoded, void *pbFormat, + DWORD *pcbFormat) +{ + DWORD size; + CRYPT_BIT_BLOB *bits; + BOOL ret; + + if (!cbEncoded) + { + SetLastError(E_INVALIDARG); + return FALSE; + } + if ((ret = CryptDecodeObjectEx(dwCertEncodingType, X509_KEY_USAGE, + pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &bits, &size))) + { + WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; + DWORD bytesNeeded = sizeof(WCHAR); + + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, + sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + if (!bits->cbData || bits->cbData > 2) + { + bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + *pcbFormat = bytesNeeded; + strcpyW(str, infoNotAvailable); + } + } + else + { + static BOOL stringsLoaded = FALSE; + int i; + DWORD bitStringLen; + BOOL first = TRUE; + + if (!stringsLoaded) + { + for (i = 0; + i < sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]); + i++) + LoadStringW(hInstance, keyUsageByte0Map[i].id, + keyUsageByte0Map[i].str, MAX_STRING_RESOURCE_LEN); + for (i = 0; + i < sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]); + i++) + LoadStringW(hInstance, keyUsageByte1Map[i].id, + keyUsageByte1Map[i].str, MAX_STRING_RESOURCE_LEN); + stringsLoaded = TRUE; + } + CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], + keyUsageByte0Map, + sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), + NULL, &bitStringLen, &first); + bytesNeeded += bitStringLen; + if (bits->cbData == 2) + { + CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], + keyUsageByte1Map, + sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), + NULL, &bitStringLen, &first); + bytesNeeded += bitStringLen; + } + bytesNeeded += 3 * sizeof(WCHAR); /* " (" + ")" */ + CRYPT_FormatHexString(0, 0, 0, NULL, NULL, bits->pbData, + bits->cbData, NULL, &size); + bytesNeeded += size; + if (!pbFormat) + *pcbFormat = bytesNeeded; + else if (*pcbFormat < bytesNeeded) + { + *pcbFormat = bytesNeeded; + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + LPWSTR str = pbFormat; + + bitStringLen = bytesNeeded; + first = TRUE; + CRYPT_FormatBits(dwFormatStrType, bits->pbData[0], + keyUsageByte0Map, + sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), + str, &bitStringLen, &first); + str += bitStringLen / sizeof(WCHAR) - 1; + if (bits->cbData == 2) + { + bitStringLen = bytesNeeded; + CRYPT_FormatBits(dwFormatStrType, bits->pbData[1], + keyUsageByte1Map, + sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), + str, &bitStringLen, &first); + str += bitStringLen / sizeof(WCHAR) - 1; + } + *str++ = ' '; + *str++ = '('; + CRYPT_FormatHexString(0, 0, 0, NULL, NULL, bits->pbData, + bits->cbData, str, &size); + str += size / sizeof(WCHAR) - 1; + *str++ = ')'; + *str = 0; + } + } + LocalFree(bits); + } + return ret; +} + static WCHAR subjectTypeHeader[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeCA[MAX_STRING_RESOURCE_LEN]; static WCHAR subjectTypeEndCert[MAX_STRING_RESOURCE_LEN]; @@ -1974,6 +2179,9 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, { switch (LOWORD(lpszStructType)) { + case LOWORD(X509_KEY_USAGE): + format = CRYPT_FormatKeyUsage; + break; case LOWORD(X509_ALTERNATE_NAME): format = CRYPT_FormatAltName; break; @@ -2001,6 +2209,8 @@ static CryptFormatObjectFunc CRYPT_GetBuiltinFormatFunction(DWORD encodingType, format = CRYPT_FormatAltName; else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME)) format = CRYPT_FormatAltName; + else if (!strcmp(lpszStructType, szOID_KEY_USAGE)) + format = CRYPT_FormatKeyUsage; else if (!strcmp(lpszStructType, szOID_SUBJECT_ALT_NAME2)) format = CRYPT_FormatAltName; else if (!strcmp(lpszStructType, szOID_ISSUER_ALT_NAME2))

1 0