August 2007 - Wine-commits - list.winehq.org

Chris Robinson : winex11: Don' t use ConvertAttribWGLtoGLX for wglCreatePbufferARB.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: a2475921b14d9ef2a4a07dd5d73a33a8242f04be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2475921b14d9ef2a4a07dd5d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Aug 2 13:52:22 2007 -0700 winex11: Don't use ConvertAttribWGLtoGLX for wglCreatePbufferARB. --- dlls/winex11.drv/opengl.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index b8dfac4..74fba01 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2055,16 +2055,19 @@ static HPBUFFERARB WINAPI X11DRV_wglCreatePbufferARB(HDC hdc, int iPixelFormat, object->height = iHeight; object->fmt = fmt; - nAttribs = ConvertAttribWGLtoGLX(piAttribList, attribs, object); - if (-1 == nAttribs) { - WARN("Cannot convert WGL to GLX attributes\n"); - goto create_failed; - } PUSH2(attribs, GLX_PBUFFER_WIDTH, iWidth); PUSH2(attribs, GLX_PBUFFER_HEIGHT, iHeight); while (piAttribList && 0 != *piAttribList) { int attr_v; switch (*piAttribList) { + case WGL_PBUFFER_LARGEST_ARB: { + ++piAttribList; + attr_v = *piAttribList; + TRACE("WGL_LARGEST_PBUFFER_ARB = %d\n", attr_v); + PUSH2(attribs, GLX_LARGEST_PBUFFER, attr_v); + break; + } + case WGL_TEXTURE_FORMAT_ARB: { ++piAttribList; attr_v = *piAttribList;

1 0

Juan Lang : crypt32: Add and use a helper function for getting cert properties.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 90824039acf6ddf5e328524a4fca4c310945a976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90824039acf6ddf5e328524a4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:21:10 2007 -0700 crypt32: Add and use a helper function for getting cert properties. --- dlls/crypt32/cert.c | 74 ++++++++++++++++++++------------------------------ 1 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 940778d..b630f3d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -167,6 +167,27 @@ static BOOL CertContext_GetHashProp(void *context, DWORD dwPropId, return ret; } +static BOOL CertContext_CopyParam(void *pvData, DWORD *pcbData, const void *pb, + DWORD cb) +{ + BOOL ret = TRUE; + + if (!pvData) + *pcbData = cb; + else if (*pcbData < cb) + { + SetLastError(ERROR_MORE_DATA); + *pcbData = cb; + ret = FALSE; + } + else + { + memcpy(pvData, pb, cb); + *pcbData = cb; + } + return ret; +} + static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, void *pvData, DWORD *pcbData) { @@ -183,21 +204,7 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId, else ret = FALSE; if (ret) - { - if (!pvData) - *pcbData = blob.cbData; - else if (*pcbData < blob.cbData) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = blob.cbData; - ret = FALSE; - } - else - { - memcpy(pvData, blob.pbData, blob.cbData); - *pcbData = blob.cbData; - } - } + ret = CertContext_CopyParam(pvData, pcbData, blob.pbData, blob.cbData); else { /* Implicit properties */ @@ -283,25 +290,14 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = FALSE; break; case CERT_ACCESS_STATE_PROP_ID: - if (!pvData) - { - *pcbData = sizeof(DWORD); - ret = TRUE; - } - else if (*pcbData < sizeof(DWORD)) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = sizeof(DWORD); - ret = FALSE; - } + if (pCertContext->hCertStore) + ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, + pvData, pcbData); else { - if (pCertContext->hCertStore) - ret = CertGetStoreProperty(pCertContext->hCertStore, dwPropId, - pvData, pcbData); - else - *(DWORD *)pvData = 0; - ret = TRUE; + DWORD state = 0; + + ret = CertContext_CopyParam(pvData, pcbData, &state, sizeof(state)); } break; case CERT_KEY_IDENTIFIER_PROP_ID: @@ -318,18 +314,8 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext, ret = CertContext_GetProperty((void *)pCertContext, CERT_KEY_CONTEXT_PROP_ID, &keyContext, &size); if (ret) - { - if (!pvData) - *pcbData = sizeof(HCRYPTPROV); - else if (*pcbData < sizeof(HCRYPTPROV)) - { - SetLastError(ERROR_MORE_DATA); - *pcbData = sizeof(HCRYPTPROV); - ret = FALSE; - } - else - *(HCRYPTPROV *)pvData = keyContext.hCryptProv; - } + ret = CertContext_CopyParam(pvData, pcbData, &keyContext.hCryptProv, + sizeof(keyContext.hCryptProv)); break; } case CERT_KEY_PROV_INFO_PROP_ID:

1 0

Juan Lang : crypt32: Fix typo in key context property test, and the problems it hid.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 5885eb3cc3dc38e7933bd5b10ce849c24b238766 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5885eb3cc3dc38e7933bd5b10… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 12:21:46 2007 -0700 crypt32: Fix typo in key context property test, and the problems it hid. --- dlls/crypt32/cert.c | 10 +++++- dlls/crypt32/tests/cert.c | 63 +++++++++++++++++--------------------------- 2 files changed, 32 insertions(+), 41 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index b630f3d..a74e5e4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -476,8 +476,14 @@ static BOOL WINAPI CertContext_SetProperty(void *context, DWORD dwPropId, { const CERT_KEY_CONTEXT *keyContext = (const CERT_KEY_CONTEXT *)pvData; - ret = ContextPropertyList_SetProperty(properties, dwPropId, - (const BYTE *)keyContext, keyContext->cbSize); + if (keyContext->cbSize != sizeof(CERT_KEY_CONTEXT)) + { + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else + ret = ContextPropertyList_SetProperty(properties, dwPropId, + (const BYTE *)keyContext, keyContext->cbSize); } else { diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index a14137c..4231a1e 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -334,7 +334,6 @@ static void testCertProperties(void) BYTE hash[20] = { 0 }, hashProperty[20]; CRYPT_DATA_BLOB blob; CERT_KEY_CONTEXT keyContext; - HCRYPTPROV csp; ok(context != NULL, "CertCreateCertificateContext failed: %08x\n", GetLastError()); @@ -442,50 +441,38 @@ static void testCertProperties(void) context->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData, CALG_MD5, context, CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID); - /* Test key identifiers and handles and such */ + /* Test key contexts and handles and such */ size = 0; - ret = CertGetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); size = sizeof(CERT_KEY_CONTEXT); - ret = CertGetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); - ret = CertGetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, &keyContext, &size); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + NULL, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + ret = CertGetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); /* Key context with an invalid size */ keyContext.cbSize = 0; - ret = CertSetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, 0, &keyContext); - ok(ret, "CertSetCertificateContextProperty failed: %08x\n", - GetLastError()); + ret = CertSetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); + ok(!ret && GetLastError() == E_INVALIDARG, + "Expected E_INVALIDARG, got %08x\n", GetLastError()); size = sizeof(keyContext); - ret = CertGetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, &keyContext, &size); - ok(ret, "CertGetCertificateContextProperty failed: %08x\n", - GetLastError()); + ret = CertGetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + &keyContext, &size); + ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, + "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); keyContext.cbSize = sizeof(keyContext); keyContext.hCryptProv = 0; keyContext.dwKeySpec = AT_SIGNATURE; - /* Crash - ret = CertSetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, 0, &keyContext); - ret = CertSetCertificateContextProperty(context, - CERT_KEY_IDENTIFIER_PROP_ID, CERT_STORE_NO_CRYPT_RELEASE_FLAG, - &keyContext); - */ - ret = CryptAcquireContextW(&csp, cspNameW, - MS_DEF_PROV_W, PROV_RSA_FULL, CRYPT_NEWKEYSET); - ok(ret, "CryptAcquireContextW failed: %08x\n", GetLastError()); - keyContext.hCryptProv = csp; - ret = CertSetCertificateContextProperty(context, - CERT_KEY_CONTEXT_PROP_ID, 0, &keyContext); - ok(ret, "CertSetCertificateContextProperty failed: %08x\n", - GetLastError()); + ret = CertSetCertificateContextProperty(context, CERT_KEY_CONTEXT_PROP_ID, + 0, &keyContext); + ok(ret, "CertSetCertificateContextProperty failed: %08x\n", GetLastError()); /* Now that that's set, the key prov handle property is also gettable. */ size = sizeof(DWORD); @@ -506,8 +493,6 @@ static void testCertProperties(void) GetLastError()); ok(keyContext.hCryptProv == 0, "Expected no hCryptProv\n"); - CryptReleaseContext(csp, 0); - CertFreeCertificateContext(context); }

1 0

Stefan Dösinger : ddraw: SetDisplayMode may fail.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: df75a7e007857c1a1d92cfe21fdb973b40078096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df75a7e007857c1a1d92cfe21… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 20:44:05 2007 +0200 ddraw: SetDisplayMode may fail. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/tests/visual.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b447403..dbab8db 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -614,7 +614,7 @@ IDirectDrawImpl_SetDisplayMode(IDirectDraw7 *iface, LeaveCriticalSection(&ddraw_cs); switch(hr) { - case WINED3DERR_NOTAVAILABLE: return DDERR_INVALIDMODE; + case WINED3DERR_NOTAVAILABLE: return DDERR_UNSUPPORTED; default: return hr; }; } diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 930f3d5..4e7400e 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -61,8 +61,12 @@ static BOOL createObjects(void) hr = IDirectDraw7_SetDisplayMode(DirectDraw, 640, 480, 24, 0, 0); } - ok(hr == DD_OK, "IDirectDraw7_SetDisplayMode failed with %08x\n", hr); - if(FAILED(hr)) goto err; + ok(hr == DD_OK || hr == DDERR_UNSUPPORTED, "IDirectDraw7_SetDisplayMode failed with %08x\n", hr); + if(FAILED(hr)) { + /* use trace, the caller calls skip() */ + trace("SetDisplayMode failed\n"); + goto err; + } hr = IDirectDraw7_QueryInterface(DirectDraw, &IID_IDirect3D7, (void**) &Direct3D); if (hr == E_NOINTERFACE) goto err;

1 0

Stefan Dösinger : d3d9: Some visual test fixes.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 878414a5e6e4a987ce4f371d269a2021656b4724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=878414a5e6e4a987ce4f371d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 24 21:07:59 2007 +0200 d3d9: Some visual test fixes. --- dlls/d3d9/tests/visual.c | 31 ++++++++++++++++++++++++++----- 1 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3ab45e1..1d92d22 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -429,6 +429,7 @@ static void fog_test(IDirect3DDevice9 *device) HRESULT hr; DWORD color; float start = 0.0f, end = 1.0f; + D3DCAPS9 caps; /* Gets full z based fog with linear fog, no fog with specular color */ struct sVertex unstransformed_1[] = { @@ -461,6 +462,9 @@ static void fog_test(IDirect3DDevice9 *device) }; WORD Indices[] = {0, 1, 2, 2, 3, 0}; + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps returned %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff00ff, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); @@ -538,8 +542,20 @@ static void fog_test(IDirect3DDevice9 *device) ok(color == 0x0000FF00, "Untransformed vertex with linear vertex fog has color %08x\n", color); color = getPixelColor(device, 480, 120); ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); - color = getPixelColor(device, 480, 360); - ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + if(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE) + { + color = getPixelColor(device, 480, 360); + ok(color == 0x0000FF00, "Transformed vertex with linear table fog has color %08x\n", color); + } + else + { + /* Without fog table support the vertex fog is still applied, even though table fog is turned on. + * The settings above result in no fogging with vertex fog + */ + color = getPixelColor(device, 480, 120); + ok(color == 0x00FFFF00, "Transformed vertex with linear vertex fog has color %08x\n", color); + trace("Info: Table fog not supported by this device\n"); + } /* Turn off the fog master switch to avoid confusing other tests */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, FALSE); @@ -1222,7 +1238,12 @@ START_TEST(visual) lighting_test(device_ptr); clear_test(device_ptr); fog_test(device_ptr); - test_cube_wrap(device_ptr); + if(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) + { + test_cube_wrap(device_ptr); + } else { + skip("No cube texture support\n"); + } present_test(device_ptr); if (caps.VertexShaderVersion >= D3DVS_VERSION(2, 0)) @@ -1231,13 +1252,13 @@ START_TEST(visual) } else skip("No vs_2_0 support\n"); - if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DVS_VERSION(1, 1)) + if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1) && caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { fog_with_shader_test(device_ptr); } else skip("No vs_1_1 and ps_1_1 support\n"); - if (caps.PixelShaderVersion >= D3DVS_VERSION(1, 1)) + if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 1)) { texbem_test(device_ptr); }

1 0

Stefan Dösinger : d3d9: Check for volume texture support before running the volume test.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 17fe57e212599cd9cdeea3a8c650036b4ad7cec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17fe57e212599cd9cdeea3a8c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:29:41 2007 +0200 d3d9: Check for volume texture support before running the volume test. --- dlls/d3d9/tests/volume.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/volume.c b/dlls/d3d9/tests/volume.c index e1ad947..3f31084 100644 --- a/dlls/d3d9/tests/volume.c +++ b/dlls/d3d9/tests/volume.c @@ -122,7 +122,9 @@ START_TEST(volume) { HMODULE d3d9_handle; IDirect3DDevice9 *device_ptr; + D3DCAPS9 caps; + memset(&caps, 0, sizeof(caps)); d3d9_handle = LoadLibraryA("d3d9.dll"); if (!d3d9_handle) { @@ -132,6 +134,12 @@ START_TEST(volume) device_ptr = init_d3d9(d3d9_handle); if (!device_ptr) return; + IDirect3DDevice9_GetDeviceCaps(device_ptr, &caps); + + if(!(caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP)) { + skip("No volume texture support\n"); + return; + } test_volume_get_container(device_ptr); }

1 0

Stefan Dösinger : wined3d: Downgrade an ERR.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 8de07265a63c81338476cfc89ac78d8607039d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8de07265a63c81338476cfc89… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:37:54 2007 +0200 wined3d: Downgrade an ERR. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c5ad58e..7bd8c7f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1370,7 +1370,7 @@ static void state_multisampleaa(DWORD state, IWineD3DStateBlockImpl *stateblock, } } else { if(stateblock->renderState[WINED3DRS_MULTISAMPLEANTIALIAS]) { - ERR("Multisample antialiasing not supported by gl\n"); + WARN("Multisample antialiasing not supported by gl\n"); } } }

1 0

Stefan Dösinger : ddraw: Some drivers return DDERR_INVALIDPARAMS if DXTn surfaces aren't supported.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 1f4d71c0f68d4d7eac1e1caaf9a247b297b4b82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f4d71c0f68d4d7eac1e1caaf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 2 20:22:26 2007 +0200 ddraw: Some drivers return DDERR_INVALIDPARAMS if DXTn surfaces aren't supported. --- dlls/ddraw/tests/dsurface.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index e999aeb..b2cd033 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1787,7 +1787,8 @@ static void CompressedTest(void) U4(ddsd).ddpfPixelFormat.dwFourCC = MAKEFOURCC('D','X','T','1'); hr = IDirectDraw7_CreateSurface(dd7, &ddsd, &surface, NULL); - ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW, "CreateSurface returned %08x\n", hr); + ok(hr == DD_OK || hr == DDERR_NOTEXTUREHW || hr == DDERR_INVALIDPARAMS, + "CreateSurface returned %08x\n", hr); /* Not supported everywhere */ if(SUCCEEDED(hr))

1 0

Juan Lang : crypt32: Introduce a OID decoding function that ignores the tag and use it where the caller already checks the tag .
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 005b50e913595892aa0f5832a9f552b67168bd52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=005b50e913595892aa0f5832a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:48:53 2007 -0700 crypt32: Introduce a OID decoding function that ignores the tag and use it where the caller already checks the tag. --- dlls/crypt32/decode.c | 169 +++++++++++++++++++++++++++---------------------- 1 files changed, 93 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=005b50e913595892aa0f5…

1 0

Juan Lang : crypt32: Implement decoding OID and directory name alt name entries.
by Alexandre Julliard 03 Aug '07

03 Aug '07

Module: wine Branch: master Commit: 44948c3b38859cf63a3115b81a7c234a2ca9cba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44948c3b38859cf63a3115b81… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 2 09:49:40 2007 -0700 crypt32: Implement decoding OID and directory name alt name entries. --- dlls/crypt32/decode.c | 23 +++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 2 -- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index b54b841..495febd 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -2143,13 +2143,22 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, case 6: /* uniformResourceIdentifier */ bytesNeeded += (dataLen + 1) * sizeof(WCHAR); break; + case 4: /* directoryName */ case 7: /* iPAddress */ bytesNeeded += dataLen; break; case 8: /* registeredID */ - /* FIXME: decode as OID */ + ret = CRYPT_AsnDecodeOidIgnoreTag(dwCertEncodingType, NULL, + pbEncoded, cbEncoded, 0, NULL, NULL, &dataLen); + if (ret) + { + /* FIXME: ugly, shouldn't need to know internals of OID decode + * function to use it. + */ + bytesNeeded += dataLen - sizeof(LPSTR); + } + break; case 0: /* otherName */ - case 4: /* directoryName */ FIXME("%d: stub\n", pbEncoded[0] & ASN_TYPE_MASK); SetLastError(CRYPT_E_ASN1_BADTAG); ret = FALSE; @@ -2196,6 +2205,11 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, debugstr_w(entry->u.pwszURL)); break; } + case 4: /* directoryName */ + entry->dwAltNameChoice = CERT_ALT_NAME_DIRECTORY_NAME; + /* The data are memory-equivalent with the IPAddress case, + * fall-through + */ case 7: /* iPAddress */ /* The next data pointer is in the pwszURL spot, that is, * the first 4 bytes. Need to move it to the next spot. @@ -2205,6 +2219,11 @@ static BOOL WINAPI CRYPT_AsnDecodeAltNameEntry(DWORD dwCertEncodingType, memcpy(entry->u.IPAddress.pbData, pbEncoded + 1 + lenBytes, dataLen); break; + case 8: /* registeredID */ + ret = CRYPT_AsnDecodeOidIgnoreTag(dwCertEncodingType, NULL, + pbEncoded, cbEncoded, 0, NULL, &entry->u.pszRegisteredID, + &dataLen); + break; } } } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 92dca63..75dd321 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -1522,7 +1522,6 @@ static void test_decodeAltName(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedOidName, sizeof(encodedOidName), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (buf) { @@ -1540,7 +1539,6 @@ static void test_decodeAltName(DWORD dwEncoding) ret = CryptDecodeObjectEx(dwEncoding, X509_ALTERNATE_NAME, encodedDirectoryName, sizeof(encodedDirectoryName), CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&buf, &bufSize); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (buf) {

1 0