October 2007 - Wine-Commits

Juan Lang : setupapi: Add stubs for SetupDiCreateDevRegKeyA/W.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 0138ea49ed24c972733b6523112c251c2e95dbf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0138ea49ed24c972733b65231… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:23:56 2007 -0700 setupapi: Add stubs for SetupDiCreateDevRegKeyA/W. --- dlls/setupapi/devinst.c | 34 ++++++++++++++++++++++++++++++++++ dlls/setupapi/setupapi.spec | 4 ++-- include/setupapi.h | 4 ++-- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index a9d9aa3..7f9826c 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -1148,6 +1148,40 @@ SetupDiCreateDeviceInfoListExW(const GUID *ClassGuid, } /*********************************************************************** + * SetupDiCreateDevRegKeyA (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDevRegKeyA( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + HINF InfHandle, + PCSTR InfSectionName) +{ + FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName)); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** + * SetupDiCreateDevRegKeyW (SETUPAPI.@) + */ +HKEY WINAPI SetupDiCreateDevRegKeyW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + DWORD Scope, + DWORD HwProfile, + DWORD KeyType, + HINF InfHandle, + PCWSTR InfSectionName) +{ + FIXME("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); + return INVALID_HANDLE_VALUE; +} + +/*********************************************************************** * SetupDiCreateDeviceInfoA (SETUPAPI.@) */ BOOL WINAPI SetupDiCreateDeviceInfoA( diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index f9589b1..f6ed8ed 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -281,8 +281,8 @@ @ stdcall SetupDiClassNameFromGuidExA(ptr str long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidExW(ptr wstr long ptr wstr ptr) @ stdcall SetupDiClassNameFromGuidW(ptr wstr long ptr) -@ stub SetupDiCreateDevRegKeyA -@ stub SetupDiCreateDevRegKeyW +@ stdcall SetupDiCreateDevRegKeyA(ptr ptr long long long ptr str) +@ stdcall SetupDiCreateDevRegKeyW(ptr ptr long long long ptr wstr) @ stdcall SetupDiCreateDeviceInfoA(long str ptr str long long ptr) @ stdcall SetupDiCreateDeviceInfoList(ptr ptr) @ stdcall SetupDiCreateDeviceInfoListExA(ptr long str ptr) diff --git a/include/setupapi.h b/include/setupapi.h index 3169807..9379725 100644 --- a/include/setupapi.h +++ b/include/setupapi.h @@ -1463,8 +1463,8 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO, PSP_DEVINFO_DATA, const HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCSTR); HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DWORD, REGSAM, HINF, PCWSTR); #define SetupDiCreateDeviceInterfaceRegKey WINELIB_NAME_AW(SetupDiCreateDeviceInterfaceRegKey) -BOOL WINAPI SetupDiCreateDevRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCSTR); -BOOL WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); +HKEY WINAPI SetupDiCreateDevRegKeyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCSTR); +HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); #define SetupDiCreateDevRegKey WINELIB_NAME_AW(SetupDiCreateDevRegKey) BOOL WINAPI SetupDiDeleteDeviceInfo(HDEVINFO, PSP_DEVINFO_DATA); BOOL WINAPI SetupDiDeleteDeviceInterfaceData(HDEVINFO, PSP_DEVICE_INTERFACE_DATA);

1 0

Juan Lang : setupapi: SetupOpenAppendInfFile is implemented, so remove #if 0 around it.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 6851e109ed5a0091006864ee2c84f216123db86f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6851e109ed5a0091006864ee2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 13:21:56 2007 -0700 setupapi: SetupOpenAppendInfFile is implemented, so remove #if 0 around it. --- dlls/setupapi/devinst.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9964b8d..6a692e3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3168,9 +3168,7 @@ BOOL WINAPI SetupDiInstallClassW( /* Try to append a layout file */ -#if 0 SetupOpenAppendInfFileW(NULL, hInf, NULL); -#endif /* Retrieve the actual section name */ SetupDiGetActualSectionToInstallW(hInf,

1 0

Juan Lang : crypt32: Implement name constraint checking.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 9908fe9ac6d4ac8c3e2323d74aac6e44f9f8d41a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9908fe9ac6d4ac8c3e2323d74… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 10:59:46 2007 -0700 crypt32: Implement name constraint checking. --- dlls/crypt32/chain.c | 265 +++++++++++++++++++++++++++++++++++++++++++- dlls/crypt32/tests/chain.c | 3 +- 2 files changed, 265 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9908fe9ac6d4ac8c3e232…

1 0

Juan Lang : setupapi: Test SetupDiInstallClass.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: caae01f8becfd8df94edf4cdc8f51c41485f4610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caae01f8becfd8df94edf4cdc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Oct 11 14:06:06 2007 -0700 setupapi: Test SetupDiInstallClass. --- dlls/setupapi/tests/devinst.c | 90 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 89 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0b58e4e..a27fa5b 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -20,7 +20,7 @@ #include <assert.h> #include <stdarg.h> - +#include <stdio.h> #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -39,6 +39,7 @@ static BOOL (WINAPI *pSetupDiCreateDeviceInterfaceA)(HDEVINFO, PSP_DEVINFO_D static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); +static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static BOOL (WINAPI *pSetupDiCreateDeviceInfoA)(HDEVINFO, PCSTR, GUID *, PCSTR, HWND, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiGetDeviceInstanceIdA)(HDEVINFO, PSP_DEVINFO_DATA, PSTR, DWORD, PDWORD); @@ -58,6 +59,7 @@ static void init_function_pointers(void) pSetupDiEnumDeviceInterfaces = (void *)GetProcAddress(hSetupAPI, "SetupDiEnumDeviceInterfaces"); pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); + pSetupDiInstallClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiInstallClassA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); pSetupDiRegisterDeviceInfo = (void *)GetProcAddress(hSetupAPI, "SetupDiRegisterDeviceInfo"); } @@ -139,6 +141,91 @@ static void test_SetupDiOpenClassRegKeyExA(void) trace("failed to open classes key\n"); } +static void append_str(char **str, const char *data) +{ + sprintf(*str, data); + *str += strlen(*str); +} + +static void create_inf_file(LPCSTR filename) +{ + char data[1024]; + char *ptr = data; + DWORD dwNumberOfBytesWritten; + HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[Version]\n"); + append_str(&ptr, "Signature=\"$Chicago$\"\n"); + append_str(&ptr, "Class=Bogus\n"); + append_str(&ptr, "ClassGUID={6a55b5a4-3f65-11db-b704-0011955c2bdb}\n"); + append_str(&ptr, "[ClassInstall32]\n"); + append_str(&ptr, "AddReg=BogusClass.NT.AddReg\n"); + append_str(&ptr, "[BogusClass.NT.AddReg]\n"); + append_str(&ptr, "HKR,,,,\"Wine test devices\"\n"); + + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); +} + +static void get_temp_filename(LPSTR path) +{ + static char curr[MAX_PATH] = { 0 }; + char temp[MAX_PATH]; + LPSTR ptr; + + if (!*curr) + GetCurrentDirectoryA(MAX_PATH, curr); + GetTempFileNameA(curr, "set", 0, temp); + ptr = strrchr(temp, '\\'); + + lstrcpyA(path, ptr + 1); +} + +static void testInstallClass(void) +{ + static const WCHAR classKey[] = {'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','\\','C','l','a','s','s','\\', + '{','6','a','5','5','b','5','a','4','-','3','f','6','5','-', + '1','1','d','b','-','b','7','0','4','-', + '0','0','1','1','9','5','5','c','2','b','d','b','}',0}; + char tmpfile[MAX_PATH], dstfile[MAX_PATH * 2]; + BOOL ret; + + if (!pSetupDiInstallClassA) + { + skip("No SetupDiInstallClassA\n"); + return; + } + tmpfile[0] = '.'; + tmpfile[1] = '\\'; + get_temp_filename(tmpfile + 2); + create_inf_file(tmpfile + 2); + + ret = pSetupDiInstallClassA(NULL, NULL, 0, NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = pSetupDiInstallClassA(NULL, NULL, DI_NOVCP, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = pSetupDiInstallClassA(NULL, tmpfile + 2, DI_NOVCP, NULL); + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); + ret = pSetupDiInstallClassA(NULL, tmpfile + 2, 0, NULL); + ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, + "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = pSetupDiInstallClassA(NULL, tmpfile, 0, NULL); + ok(ret, "SetupDiInstallClassA failed: %08x\n", GetLastError()); + RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey); + GetWindowsDirectoryA(dstfile, MAX_PATH); + lstrcatA(dstfile, "inf\\"); + lstrcatA(dstfile, tmpfile + 2); + DeleteFile(dstfile); + DeleteFile(tmpfile); +} + static void testCreateDeviceInfo(void) { BOOL ret; @@ -510,6 +597,7 @@ START_TEST(devinst) test_SetupDiOpenClassRegKeyExA(); else skip("SetupDiOpenClassRegKeyExA is not available\n"); + testInstallClass(); testCreateDeviceInfo(); testGetDeviceInstanceId(); testRegisterDeviceInfo();

1 0

Stefan Dösinger : wined3d: Add a (nested) loop test.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: a022e8b40287885172ede6b3a152dacdfa149983 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a022e8b40287885172ede6b3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 22:12:59 2007 +0200 wined3d: Add a (nested) loop test. --- dlls/d3d9/tests/visual.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5ebd061..49f8782 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3572,6 +3572,61 @@ static void cnd_test(IDirect3DDevice9 *device) IDirect3DPixelShader9_Release(shader_11); } +static void nested_loop_test(IDirect3DDevice9 *device) { + const DWORD shader_code[] = { + 0xffff0300, /* ps_3_0 */ + 0x05000051, 0xa00f0000, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, /* def c0, 0, 0, 0, 1 */ + 0x05000051, 0xa00f0001, 0x3d000000, 0x00000000, 0x00000000, 0x00000000, /* def c1, 1/32, 0, 0, 0*/ + 0x05000030, 0xf00f0000, 0x00000004, 0x00000000, 0x00000002, 0x00000000, /* defi i0, 4, 0, 2, 0 */ + 0x02000001, 0x800f0000, 0xa0e40000, /* mov r0, c0 */ + 0x0200001b, 0xf0e40800, 0xf0e40000, /* loop aL, i0 */ + 0x0200001b, 0xf0e40800, 0xf0e40000, /* loop aL, i0 */ + 0x03000002, 0x800f0000, 0x80e40000, 0xa0e40001, /* add r0, r0, c1 */ + 0x0000001d, /* endloop */ + 0x0000001d, /* endloop */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ + }; + IDirect3DPixelShader9 *shader; + HRESULT hr; + DWORD color; + const float quad[] = { + -1.0, -1.0, 0.1, + 1.0, -1.0, 0.1, + -1.0, 1.0, 0.1, + 1.0, 1.0, 0.1 + }; + + hr = IDirect3DDevice9_CreatePixelShader(device, shader_code, &shader); + ok(hr == D3D_OK, "IDirect3DDevice9_CreatePixelShader failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetPixelShader(device, shader); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %s\n", DXGetErrorString9(hr)); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x0000ff00, 0.0, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %s\n", DXGetErrorString9(hr)); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene returned %s\n", DXGetErrorString9(hr)); + if(SUCCEEDED(hr)) + { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, 3 * sizeof(float)); + ok(hr == D3D_OK, "DrawPrimitiveUP failed (%08x)\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_EndScene returned %s\n", DXGetErrorString9(hr)); + } + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %s\n", DXGetErrorString9(hr)); + + color = getPixelColor(device, 360, 240); + ok(color == 0x007f0000 || color == 0x00800000 || color == 0x00810000, + "Nested loop test returned color 0x%08x, expected 0x00800000\n", color); + + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with %s\n", DXGetErrorString9(hr)); + IDirect3DPixelShader9_Release(shader); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -3679,6 +3734,11 @@ START_TEST(visual) if (caps.PixelShaderVersion >= D3DPS_VERSION(1, 4)) { constant_clamp_ps_test(device_ptr); cnd_test(device_ptr); + if (caps.PixelShaderVersion >= D3DPS_VERSION(3, 0)) { + nested_loop_test(device_ptr); + } else { + skip("No ps_3_0 support\n"); + } } } else skip("No ps_1_1 support\n");

1 0

Juan Lang : crypt32: Allow either NULL or empty strings where one or the other is expected.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 436a4a283b1957d7e7078fda281dab9b0c43c53d URL: http://source.winehq.org/git/wine.git/?a=commit;h=436a4a283b1957d7e7078fda2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 16:05:49 2007 -0700 crypt32: Allow either NULL or empty strings where one or the other is expected. --- dlls/crypt32/tests/encode.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 47b40e0..29590fc 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -3395,7 +3395,10 @@ static void compareAltNameEntry(const CERT_ALT_NAME_ENTRY *expected, case CERT_ALT_NAME_URL: case CERT_ALT_NAME_REGISTERED_ID: ok((!U(*expected).pwszURL && !U(*got).pwszURL) || - !lstrcmpW(U(*expected).pwszURL, U(*got).pwszURL), "Unexpected name\n"); + (!U(*expected).pwszURL && !lstrlenW(U(*got).pwszURL)) || + (!U(*got).pwszURL && !lstrlenW(U(*expected).pwszURL)) || + !lstrcmpW(U(*expected).pwszURL, U(*got).pwszURL), + "Unexpected name\n"); break; case CERT_ALT_NAME_X400_ADDRESS: case CERT_ALT_NAME_DIRECTORY_NAME:

1 0

Juan Lang : crypt32: Don't check tag in AsnDecodeIntInternal, caller already checks it.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 30355fa674312de2780989d82fdd2e151741d37a URL: http://source.winehq.org/git/wine.git/?a=commit;h=30355fa674312de2780989d82… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 17:49:33 2007 -0700 crypt32: Don't check tag in AsnDecodeIntInternal, caller already checks it. --- dlls/crypt32/decode.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 7bba04b..d0cf6cc 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -3118,6 +3118,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBits(DWORD dwCertEncodingType, return ret; } +/* Ignores tag. Only allows integers 4 bytes or smaller in size. */ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) { @@ -3127,14 +3128,8 @@ static BOOL CRYPT_AsnDecodeIntInternal(const BYTE *pbEncoded, DWORD cbEncoded, DWORD size = sizeof(buf); blob->pbData = buf + sizeof(CRYPT_INTEGER_BLOB); - if (pbEncoded[0] != ASN_INTEGER) - { - SetLastError(CRYPT_E_ASN1_BADTAG); - ret = FALSE; - } - else - ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, &buf, - &size, pcbDecoded); + ret = CRYPT_AsnDecodeIntegerInternal(pbEncoded, cbEncoded, 0, &buf, + &size, pcbDecoded); if (ret) { if (!pvStructInfo) @@ -3173,8 +3168,19 @@ static BOOL WINAPI CRYPT_AsnDecodeInt(DWORD dwCertEncodingType, { DWORD bytesNeeded; - ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, - dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_CORRUPT); + ret = FALSE; + } + else if (pbEncoded[0] != ASN_INTEGER) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + ret = FALSE; + } + else + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, + dwFlags & ~CRYPT_DECODE_ALLOC_FLAG, NULL, &bytesNeeded, NULL); if (ret) { if (!pvStructInfo)

1 0

Juan Lang : crypt32: Implement name constraints decoding.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: c57a0848825606623ef6fbc0411499c664247055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c57a0848825606623ef6fbc04… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 17:50:36 2007 -0700 crypt32: Implement name constraints decoding. --- dlls/crypt32/decode.c | 122 +++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 1 - 2 files changed, 122 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index d0cf6cc..17e4db6 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -4061,6 +4061,123 @@ static BOOL WINAPI CRYPT_AsnDecodeIssuingDistPoint(DWORD dwCertEncodingType, return ret; } +static BOOL CRYPT_AsnDecodeMaximum(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = FALSE; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + if (!cbEncoded) + { + SetLastError(CRYPT_E_ASN1_EOD); + return FALSE; + } + if (pbEncoded[0] != (ASN_CONTEXT | 1)) + { + SetLastError(CRYPT_E_ASN1_BADTAG); + return FALSE; + } + /* The BOOL is implicit: if the integer is present, then it's TRUE */ + ret = CRYPT_AsnDecodeIntInternal(pbEncoded, cbEncoded, dwFlags, + pvStructInfo ? (BYTE *)pvStructInfo + sizeof(BOOL) : NULL, pcbStructInfo, + pcbDecoded); + if (ret && pvStructInfo) + *(BOOL *)pvStructInfo = TRUE; + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret; + struct AsnDecodeSequenceItem items[] = { + { 0, offsetof(CERT_GENERAL_SUBTREE, Base), + CRYPT_AsnDecodeAltNameEntry, sizeof(CERT_ALT_NAME_ENTRY), TRUE, TRUE, + offsetof(CERT_ALT_NAME_ENTRY, u.pwszURL), 0 }, + { ASN_CONTEXT | 0, offsetof(CERT_GENERAL_SUBTREE, dwMinimum), + CRYPT_AsnDecodeIntInternal, sizeof(DWORD), TRUE, FALSE, 0, 0 }, + { ASN_CONTEXT | 1, offsetof(CERT_GENERAL_SUBTREE, fMaximum), + CRYPT_AsnDecodeMaximum, sizeof(BOOL) + sizeof(DWORD), TRUE, FALSE, 0, + 0 }, + }; + CERT_GENERAL_SUBTREE *subtree = (CERT_GENERAL_SUBTREE *)pvStructInfo; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, + pcbDecoded, subtree ? (BYTE *)subtree->Base.u.pwszURL : NULL); + if (pcbDecoded) + { + TRACE("%d\n", *pcbDecoded); + if (*pcbDecoded < cbEncoded) + TRACE("%02x %02x\n", *(pbEncoded + *pcbDecoded), + *(pbEncoded + *pcbDecoded + 1)); + } + TRACE("returning %d\n", ret); + return ret; +} + +static BOOL CRYPT_AsnDecodeSubtreeArray(const BYTE *pbEncoded, + DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, + DWORD *pcbDecoded) +{ + BOOL ret = TRUE; + struct AsnArrayDescriptor arrayDesc = { 0, + CRYPT_AsnDecodeSubtree, sizeof(CERT_GENERAL_SUBTREE), TRUE, + offsetof(CERT_GENERAL_SUBTREE, Base.u.pwszURL) }; + struct GenericArray *array = (struct GenericArray *)pvStructInfo; + + TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, + pvStructInfo, *pcbStructInfo, pcbDecoded); + + ret = CRYPT_AsnDecodeArray(&arrayDesc, pbEncoded, cbEncoded, dwFlags, + NULL, pvStructInfo, pcbStructInfo, pcbDecoded, + array ? array->rgItems : NULL); + return ret; +} + + +static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(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, *pcbStructInfo); + + __TRY + { + struct AsnDecodeSequenceItem items[] = { + { ASN_CONTEXT | ASN_CONSTRUCTOR | 0, + offsetof(CERT_NAME_CONSTRAINTS_INFO, cPermittedSubtree), + CRYPT_AsnDecodeSubtreeArray, sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CERT_NAME_CONSTRAINTS_INFO, rgPermittedSubtree), 0 }, + { ASN_CONTEXT | ASN_CONSTRUCTOR | 1, + offsetof(CERT_NAME_CONSTRAINTS_INFO, cExcludedSubtree), + CRYPT_AsnDecodeSubtreeArray, sizeof(struct GenericArray), TRUE, TRUE, + offsetof(CERT_NAME_CONSTRAINTS_INFO, rgExcludedSubtree), 0 }, + }; + + ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, + pcbStructInfo, NULL, NULL); + } + __EXCEPT_PAGE_FAULT + { + SetLastError(STATUS_ACCESS_VIOLATION); + } + __ENDTRY + return ret; +} + static BOOL CRYPT_AsnDecodeIssuerSerialNumber(const BYTE *pbEncoded, DWORD cbEncoded, DWORD dwFlags, void *pvStructInfo, DWORD *pcbStructInfo, DWORD *pcbDecoded) @@ -4336,6 +4453,9 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, case (WORD)X509_ISSUING_DIST_POINT: decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; break; + case (WORD)X509_NAME_CONSTRAINTS: + decodeFunc = CRYPT_AsnDecodeNameConstraints; + break; case (WORD)PKCS7_SIGNER_INFO: decodeFunc = CRYPT_AsnDecodePKCSSignerInfo; break; @@ -4375,6 +4495,8 @@ static CryptDecodeObjectExFunc CRYPT_GetBuiltinDecoder(DWORD dwCertEncodingType, decodeFunc = CRYPT_AsnDecodeEnhancedKeyUsage; else if (!strcmp(lpszStructType, szOID_ISSUING_DIST_POINT)) decodeFunc = CRYPT_AsnDecodeIssuingDistPoint; + else if (!strcmp(lpszStructType, szOID_NAME_CONSTRAINTS)) + decodeFunc = CRYPT_AsnDecodeNameConstraints; return decodeFunc; } diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 29590fc..2fbb6ed 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -5653,7 +5653,6 @@ static void test_decodeNameConstraints(DWORD dwEncoding) encodedNameConstraints[i].encoded.pbData, encodedNameConstraints[i].encoded.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &constraints, &size); - todo_wine ok(ret, "%d: CryptDecodeObjectEx failed: %08x\n", i, GetLastError()); if (ret) {

1 0

Juan Lang : crypt32: Allow imprecision of one millisecond in time decoding to fix test failures on Windows .
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: e6dbb9d2037956de2af6ab0d8f3b420ee953f78f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6dbb9d2037956de2af6ab0d8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 14:40:20 2007 -0700 crypt32: Allow imprecision of one millisecond in time decoding to fix test failures on Windows. --- dlls/crypt32/tests/encode.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c index 65b6a0f..421b236 100644 --- a/dlls/crypt32/tests/encode.c +++ b/dlls/crypt32/tests/encode.c @@ -482,17 +482,31 @@ static const char *printFileTime(const FILETIME *ft) return buf; } +static void compareTime(const SYSTEMTIME *expected, const FILETIME *got) +{ + SYSTEMTIME st; + + FileTimeToSystemTime(got, &st); + ok(expected->wYear == st.wYear && + expected->wMonth == st.wMonth && + expected->wDay == st.wDay && + expected->wHour == st.wHour && + expected->wMinute == st.wMinute && + expected->wSecond == st.wSecond && + abs(expected->wMilliseconds - st.wMilliseconds) <= 1, + "Got unexpected value for time decoding:\nexpected %s, got %s\n", + printSystemTime(expected), printFileTime(got)); +} + static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, const struct encodedFiletime *time) { - FILETIME ft1 = { 0 }, ft2 = { 0 }; - DWORD size = sizeof(ft2); + FILETIME ft = { 0 }; + DWORD size = sizeof(ft); BOOL ret; - ret = SystemTimeToFileTime(&time->sysTime, &ft1); - ok(ret, "SystemTimeToFileTime failed: %d\n", GetLastError()); ret = CryptDecodeObjectEx(dwEncoding, structType, time->encodedTime, - time->encodedTime[1] + 2, 0, NULL, &ft2, &size); + time->encodedTime[1] + 2, 0, NULL, &ft, &size); /* years other than 1950-2050 are not allowed for encodings other than * X509_CHOICE_OF_TIME. */ @@ -501,9 +515,7 @@ static void testTimeDecoding(DWORD dwEncoding, LPCSTR structType, { ok(ret, "CryptDecodeObjectEx failed: %d (0x%08x)\n", GetLastError(), GetLastError()); - ok(!memcmp(&ft1, &ft2, sizeof(ft1)), - "Got unexpected value for time decoding:\nexpected %s, got %s\n", - printSystemTime(&time->sysTime), printFileTime(&ft2)); + compareTime(&time->sysTime, &ft); } else ok(!ret && GetLastError() == CRYPT_E_ASN1_BADTAG,

1 0

Juan Lang : crypt32: Implement name constraint encoding.
by Alexandre Julliard Oct. 12, 2007

Oct. 12, 2007

Module: wine Branch: master Commit: 942fb6c3ebd482cebd0c8888fda527bb9777d301 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942fb6c3ebd482cebd0c8888f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 10 16:05:12 2007 -0700 crypt32: Implement name constraint encoding. --- dlls/crypt32/encode.c | 154 +++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/encode.c | 8 -- 2 files changed, 148 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=942fb6c3ebd482cebd0c8…

1 0