Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 55142: [HTTPAPI] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: akhaldi Date: Tue Jan 24 13:54:58 2012 New Revision: 55142 URL: http://svn.reactos.org/svn/reactos?rev=55142&view=rev Log: [HTTPAPI] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/httpapi/httpapi.spec trunk/reactos/dll/win32/httpapi/httpapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/httpapi/httpapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi.… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi.spec [iso-8859-1] Tue Jan 24 13:54:58 2012 @@ -5,7 +5,7 @@ @ stub HttpCreateAppPool @ stub HttpCreateConfigGroup @ stub HttpCreateFilter -@ stub HttpCreateHttpHandle +@ stdcall HttpCreateHttpHandle(ptr long) @ stub HttpDeleteConfigGroup @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr) @ stub HttpFilterAccept Modified: trunk/reactos/dll/win32/httpapi/httpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/httpapi/httpapi_… ============================================================================== --- trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/httpapi/httpapi_main.c [iso-8859-1] Tue Jan 24 13:54:58 2012 @@ -157,3 +157,22 @@ FIXME( "(%p, %d, %p, %d, %p): stub!\n", handle, type, config, length, overlapped ); return NO_ERROR; } + +/*********************************************************************** + * HttpCreateHttpHandle (HTTPAPI.@) + * + * Creates a handle to the HTTP request queue + * + * PARAMS + * handle [O] handle to request queue + * reserved [I] reserved, must be NULL + * + * RETURNS + * NO_ERROR if function succeeds, or error code if function fails + * + */ +ULONG WINAPI HttpCreateHttpHandle( PHANDLE handle, ULONG reserved ) +{ + FIXME( "(%p, %d): stub!\n", handle, reserved); + return ERROR_CALL_NOT_IMPLEMENTED; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jan 24 13:54:58 2012 @@ -65,7 +65,7 @@ reactos/dll/win32/hhctrl.ocx # Autosync reactos/dll/win32/hlink # Autosync reactos/dll/win32/hnetcfg # Autosync -reactos/dll/win32/httpapi # Autosync +reactos/dll/win32/httpapi # Synced to Wine-1.3.37 reactos/dll/win32/iccvid # Autosync reactos/dll/win32/icmp # Synced to Wine-0_9_10 reactos/dll/win32/imaadp32.acm # Autosync

1 0

[akhaldi] 55141: [DWMAPI] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: akhaldi Date: Tue Jan 24 13:52:57 2012 New Revision: 55141 URL: http://svn.reactos.org/svn/reactos?rev=55141&view=rev Log: [DWMAPI] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec trunk/reactos/dll/win32/dwmapi/dwmapi_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/dwmapi/dwmapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi.sp… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi.spec [iso-8859-1] Tue Jan 24 13:52:57 2012 @@ -21,7 +21,7 @@ 120 stub DWMAPI_120 @ stub DwmAttachMilContent -@ stub DwmDefWindowProc +@ stdcall DwmDefWindowProc(long long long long ptr) @ stub DwmDetachMilContent @ stdcall DwmEnableBlurBehindWindow(ptr ptr) @ stdcall DwmEnableMMCSS(long) @@ -32,11 +32,11 @@ @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) -@ stub DwmGetWindowAttribute +@ stdcall DwmGetWindowAttribute(ptr long ptr long) @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize -@ stub DwmRegisterThumbnail +@ stdcall DwmRegisterThumbnail(long long ptr) @ stub DwmSetDxFrameDuration @ stub DwmSetPresentParameters @ stdcall DwmSetWindowAttribute(long long ptr long) Modified: trunk/reactos/dll/win32/dwmapi/dwmapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dwmapi/dwmapi_ma… ============================================================================== --- trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dwmapi/dwmapi_main.c [iso-8859-1] Tue Jan 24 13:52:57 2012 @@ -176,3 +176,35 @@ return E_NOTIMPL; } + +/********************************************************************** + * DwmDefWindowProc (DWMAPI.@) + */ +BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + static int i; + + if (!i++) FIXME("stub\n"); + + return FALSE; +} + +/********************************************************************** + * DwmGetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) +{ + FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + + return E_NOTIMPL; +} + +/********************************************************************** + * DwmRegisterThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_id) +{ + FIXME("(%p %p %p) stub\n", dest, src, thumbnail_id); + + return E_NOTIMPL; +} Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jan 24 13:52:57 2012 @@ -59,7 +59,7 @@ reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Autosync reactos/dll/win32/dciman32 # Autosync -reactos/dll/win32/dwmapi # Autosync +reactos/dll/win32/dwmapi # Synced to Wine-1.3.37 reactos/dll/win32/fusion # Autosync reactos/dll/win32/gdiplus # Autosync reactos/dll/win32/hhctrl.ocx # Autosync

1 0

[akhaldi] 55140: [CRYPTNET_WINETEST] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: akhaldi Date: Tue Jan 24 13:50:35 2012 New Revision: 55140 URL: http://svn.reactos.org/svn/reactos?rev=55140&view=rev Log: [CRYPTNET_WINETEST] * Sync to Wine 1.3.37. Modified: trunk/rostests/winetests/cryptnet/cryptnet.c Modified: trunk/rostests/winetests/cryptnet/cryptnet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/cryptnet/cryptn… ============================================================================== --- trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] (original) +++ trunk/rostests/winetests/cryptnet/cryptnet.c [iso-8859-1] Tue Jan 24 13:50:35 2012 @@ -316,7 +316,7 @@ static void test_retrieveObjectByUrl(void) { BOOL ret; - char tmpfile[MAX_PATH * 2], *ptr, url[MAX_PATH + 8]; + char tmpfile[MAX_PATH * 2], url[MAX_PATH + 8]; CRYPT_BLOB_ARRAY *pBlobArray; PCCERT_CONTEXT cert; PCCRL_CONTEXT crl; @@ -332,17 +332,7 @@ GetLastError(), GetLastError()); make_tmp_file(tmpfile); - ptr = strchr(tmpfile, ':'); - if (ptr) - ptr += 2; /* skip colon and first slash */ - else - ptr = tmpfile; - snprintf(url, sizeof(url), "file:///%s", ptr); - do { - ptr = strchr(url, '\\'); - if (ptr) - *ptr = '/'; - } while (ptr); + snprintf(url, sizeof(url), "file://%s", tmpfile); pBlobArray = (CRYPT_BLOB_ARRAY *)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, NULL, 0, 0, (void **)&pBlobArray, @@ -367,6 +357,7 @@ cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, NULL); + ok(ret, "CryptRetrieveObjectByUrlA failed: %d\n", GetLastError()); ok(cert && cert != (PCCERT_CONTEXT)0xdeadbeef, "Expected a cert\n"); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) CertFreeCertificateContext(cert); @@ -374,12 +365,10 @@ SetLastError(0xdeadbeef); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, NULL, NULL, NULL, NULL); - /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, 95: OSS_DATA_ERROR */ + /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || - GetLastError() == CRYPT_E_ASN1_BADTAG || - GetLastError() == OSS_DATA_ERROR), - "got 0x%x/%u (expected CRYPT_E_NO_MATCH or CRYPT_E_ASN1_BADTAG or " - "OSS_DATA_ERROR)\n", GetLastError(), GetLastError()); + broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), + "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); /* only newer versions of cryptnet do the cleanup */ if(!ret && GetLastError() != CRYPT_E_ASN1_BADTAG && @@ -417,8 +406,8 @@ cert = (PCCERT_CONTEXT)0xdeadbeef; ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), + /* w2k: failure with E_INVALIDARG */ + ok(ret || broken(GetLastError() == E_INVALIDARG), "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) @@ -428,8 +417,8 @@ aux.cbSize = sizeof(aux); ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, (void **)&cert, NULL, NULL, NULL, &aux); - /* w2k: success, 9x: fail with E_INVALIDARG */ - ok(ret || (GetLastError() == E_INVALIDARG), + /* w2k: failure with E_INVALIDARG */ + ok(ret || broken(GetLastError() == E_INVALIDARG), "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ret, GetLastError(), GetLastError()); if (!ret) { @@ -492,7 +481,7 @@ 0x2e,0x7c,0xf2,0x06,0x9d,0xb3,0x3b,0x7e,0x2f,0xda,0x25,0x66,0x7e,0xa7,0x1f, 0x45,0xd4,0xf5,0xe3,0xdf,0x2a,0xf1,0x18,0x28,0x20,0xb5,0xf8,0xf5,0x8d,0x7a, 0x2e,0x84,0xee }; -static const BYTE eeCert[] = { +static const BYTE revokedCert[] = { 0x30,0x82,0x01,0xb9,0x30,0x82,0x01,0x22,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, 0x01,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05, 0x00,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43, @@ -523,7 +512,37 @@ 0xd6,0x5e,0x0a,0x74,0xf2,0x85,0xa6,0xd5,0x3c,0x28,0xc0,0x89,0x5d,0xda,0xf3, 0xa6,0x01,0xc2,0xe9,0xa3,0xc1,0xb7,0x21,0x08,0xba,0x18,0x07,0x45,0xeb,0x77, 0x7d,0xcd,0xc6,0xe7,0x2a,0x7b,0x46,0xd2,0x3d,0xb5 }; -static const BYTE rootSignedCRL[] = { +static const BYTE unRevokedCert[] = { +0x30,0x82,0x01,0xa2,0x30,0x82,0x01,0x0d,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x02,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30, +0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72, +0x74,0x31,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x24,0x31,0x22,0x30,0x0e,0x06,0x03,0x55,0x04,0x03, +0x13,0x07,0x66,0x6f,0x6f,0x2e,0x63,0x6f,0x6d,0x30,0x10,0x06,0x03,0x55,0x04, +0x03,0x13,0x09,0x2a,0x2e,0x66,0x6f,0x6f,0x2e,0x63,0x6f,0x6d,0x30,0x81,0x9d, +0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81, +0x8d,0x00,0x30,0x81,0x89,0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f, +0xe5,0x33,0x0e,0x67,0x5f,0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4, +0xc6,0xdc,0xb6,0x17,0x8e,0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5, +0xa7,0x48,0x9f,0x6e,0xfe,0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6, +0x8b,0x47,0xd1,0x57,0x71,0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf, +0x6b,0x05,0x72,0xa7,0x87,0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40, +0xfc,0x6a,0x80,0x83,0x68,0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac, +0x85,0x85,0xb5,0x46,0x36,0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23, +0xb2,0xd3,0x51,0x9a,0x22,0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98, +0x72,0xa3,0x02,0x03,0x01,0x00,0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x05,0x03,0x81,0x81,0x00,0x9f,0x11,0x8a,0x0a,0x6e,0xb0, +0x73,0xcc,0x48,0xf1,0x92,0xca,0xaf,0x9a,0x3d,0xb9,0xcf,0xbe,0x84,0xd0,0xa8, +0x34,0x25,0x27,0x9d,0x28,0x68,0xc5,0x35,0x2b,0x84,0xff,0xdb,0xd0,0x1f,0x0d, +0xd7,0xd6,0x8c,0x1b,0x33,0x52,0x7d,0x19,0xd0,0xc2,0xf3,0x63,0xd6,0x55,0x45, +0xf9,0x46,0xa0,0xb7,0xb3,0x94,0xbb,0x25,0x9b,0x29,0x76,0x7c,0x11,0xc7,0x7b, +0xcc,0xcb,0x99,0x3c,0xae,0xe7,0x16,0xb5,0xa7,0x6a,0x1f,0x75,0x4a,0x58,0x65, +0xb1,0x5b,0x91,0x29,0x20,0x81,0x51,0x64,0x05,0x24,0xa5,0x77,0xb7,0x8e,0xc8, +0x32,0x0f,0x0d,0x4f,0xf9,0x78,0x0f,0xc4,0xef,0xd6,0x25,0x5a,0xa4,0x9b,0x07, +0x17,0xea,0x56,0xe2,0x7b,0x61,0x1c,0x2d,0x40,0x38,0x9a,0x24,0x64,0x4b,0x6d, +0x08,0x96 }; +static const BYTE rootSignedCRLWithBadAKI[] = { 0x30,0x82,0x01,0x1f,0x30,0x81,0x89,0x02,0x01,0x01,0x30,0x0d,0x06,0x09,0x2a, 0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x05,0x00,0x30,0x10,0x31,0x0e,0x30, 0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31,0x17,0x0d, @@ -544,12 +563,31 @@ 0xa5,0xed,0xf9,0x77,0xb0,0x3c,0x81,0xcf,0xcc,0x49,0xb2,0x1a,0xc3,0xfd,0x34, 0xd5,0xbc,0xb0,0xd5,0xa5,0x9c,0x1b,0x72,0xc3,0x0f,0xa3,0xe3,0x3c,0xf0,0xc3, 0x91,0xe8,0x93,0x4f,0xd4,0x2f }; - -BOOL (WINAPI *pCertVerifyRevocation)(DWORD, DWORD, DWORD, void **, DWORD, +static const BYTE rootSignedCRL[] = { +0x30,0x81,0xe6,0x30,0x53,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d, +0x01,0x01,0x05,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13, +0x05,0x43,0x65,0x72,0x74,0x31,0x17,0x0d,0x30,0x37,0x30,0x35,0x30,0x31,0x30, +0x30,0x30,0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x32,0x33,0x31,0x32, +0x33,0x35,0x39,0x35,0x39,0x5a,0x30,0x14,0x30,0x12,0x02,0x01,0x01,0x17,0x0d, +0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,0x30,0x30,0x30,0x30,0x5a,0x30,0x0b, +0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x03,0x81,0x81,0x00, +0x94,0x84,0x0a,0xad,0x63,0xe3,0x05,0xc1,0xd8,0x94,0x44,0xeb,0x30,0x03,0xa1, +0xb4,0x7b,0x09,0x2f,0xf6,0xef,0x0f,0xe5,0x58,0x70,0x67,0xac,0x32,0x91,0xc0, +0x9d,0xf1,0x2b,0xf4,0xb3,0xcf,0xdd,0x1d,0x74,0x7b,0x6f,0x59,0x36,0x73,0xca, +0xcd,0x9c,0xb6,0xd9,0x35,0x39,0x45,0x8d,0xfd,0xf9,0x65,0xf3,0x42,0x2c,0x2c, +0xa6,0xfc,0xd2,0x23,0x6c,0x73,0x28,0x21,0x47,0x22,0x88,0x36,0x7d,0xd8,0xf0, +0xd0,0xca,0x11,0x20,0x50,0x6b,0x1e,0xb1,0x16,0x16,0xde,0xa6,0xc1,0x8d,0x18, +0xf1,0x42,0x22,0x1d,0x95,0x11,0xd7,0xa9,0x8f,0x90,0xe5,0x2f,0x71,0x52,0x47, +0xe0,0x45,0xb1,0x5a,0x2c,0x72,0x8a,0x25,0xca,0xd6,0x96,0xa2,0x7b,0x83,0x4c, +0xa3,0x24,0x7e,0xdd,0x45,0xa1,0x38,0xf8 }; + +static BOOL (WINAPI *pCertVerifyRevocation)(DWORD, DWORD, DWORD, void **, DWORD, PCERT_REVOCATION_PARA, PCERT_REVOCATION_STATUS); /* Wednesday, Oct 1, 2007 */ static SYSTEMTIME oct2007 = { 2007, 10, 1, 1, 0, 0, 0, 0 }; +/* Tuesday, May 1, 2007 */ +static SYSTEMTIME may2007 = { 2007, 5, 2, 1, 0, 0, 0, 0 }; static void test_verifyRevocation(void) { @@ -570,7 +608,7 @@ if (0) { /* Crash */ - ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); + pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, NULL); } SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, 0, 0, NULL, 0, NULL, &status); @@ -600,7 +638,7 @@ certs[0] = CertCreateCertificateContext(X509_ASN_ENCODING, rootWithKeySignAndCRLSign, sizeof(rootWithKeySignAndCRLSign)); certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING, - eeCert, sizeof(eeCert)); + revokedCert, sizeof(revokedCert)); /* The root cert itself can't be checked for revocation */ SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, @@ -632,7 +670,8 @@ revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); CertAddEncodedCRLToStore(revPara.hCrlStore, X509_ASN_ENCODING, - rootSignedCRL, sizeof(rootSignedCRL), CERT_STORE_ADD_ALWAYS, NULL); + rootSignedCRLWithBadAKI, sizeof(rootSignedCRLWithBadAKI), + CERT_STORE_ADD_ALWAYS, NULL); SetLastError(0xdeadbeef); ret = pCertVerifyRevocation(0, CERT_CONTEXT_REVOCATION_TYPE, 2, (void **)certs, 0, &revPara, &status); @@ -655,8 +694,9 @@ SetLastError(0xdeadbeef); ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certs[1], 0, &revPara, &status); - /* Win2k thinks the cert is revoked, and it is, except the CRL is out of - * date, hence the revocation status should be unknown. + /* Win2k thinks the cert is revoked, and it is, except the CRL contains a + * bad authority key ID extension and can't be matched with the issuer + * cert, hence the revocation status should be unknown. */ ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), @@ -679,6 +719,67 @@ "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", status.dwError); ok(status.dwIndex == 0, "expected index 0, got %d\n", status.dwIndex); CertCloseStore(revPara.hCrlStore, 0); + /* Test again with a valid CRL. This time, the cert should be revoked when + * the time is after the validity period of the CRL, or considered + * "revocation offline" when the checked time precedes the validity + * period of the CRL. + */ + revPara.hCrlStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, + CERT_STORE_CREATE_NEW_FLAG, NULL); + ret = CertAddEncodedCRLToStore(revPara.hCrlStore, X509_ASN_ENCODING, + rootSignedCRL, sizeof(rootSignedCRL), CERT_STORE_ADD_ALWAYS, NULL); + ok(ret, "CertAddEncodedCRLToStore failed: %08x\n", GetLastError()); + revPara.pftTimeToUse = NULL; + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOKED || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOKED, got %08x\n", GetLastError()); + revPara.pftTimeToUse = &time; + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOKED || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOKED, got %08x\n", GetLastError()); + SystemTimeToFileTime(&may2007, &time); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); + CertFreeCertificateContext(certs[1]); + /* Test again with a valid CRL and an un-revoked cert. No matter the + * time checked, it's reported as revocation offline. + */ + certs[1] = CertCreateCertificateContext(X509_ASN_ENCODING, + unRevokedCert, sizeof(unRevokedCert)); + ok(certs[1] != NULL, "CertCreateCertificateContext failed: %08x\n", + GetLastError()); + revPara.pftTimeToUse = NULL; + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); + revPara.pftTimeToUse = &time; + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); + SystemTimeToFileTime(&may2007, &time); + SetLastError(0xdeadbeef); + ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, + 1, (void **)&certs[1], 0, &revPara, &status); + ok(!ret && (GetLastError() == CRYPT_E_REVOCATION_OFFLINE || + broken(GetLastError() == CRYPT_E_NO_REVOCATION_CHECK /* NT4 */)), + "expected CRYPT_E_REVOCATION_OFFLINE, got %08x\n", GetLastError()); + CertCloseStore(revPara.hCrlStore, 0); CertFreeCertificateContext(certs[1]); CertFreeCertificateContext(certs[0]); }

1 0

[akhaldi] 55139: [CRYPTNET] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: akhaldi Date: Tue Jan 24 13:50:22 2012 New Revision: 55139 URL: http://svn.reactos.org/svn/reactos?rev=55139&view=rev Log: [CRYPTNET] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Tue Jan 24 13:50:22 2012 @@ -60,8 +60,6 @@ static const WCHAR cryptNet[] = { 'c','r','y','p','t','n','e','t','.', 'd','l','l',0 }; -static const WCHAR ldapProvOpenStore[] = { 'L','d','a','p','P','r','o','v', - 'O','p','e','S','t','o','r','e',0 }; /*********************************************************************** * DllRegisterServer (CRYPTNET.@) @@ -571,7 +569,7 @@ return ret; } -/* Parses the URL, and sets components's lpszHostName and lpszUrlPath members +/* Parses the URL, and sets components' lpszHostName and lpszUrlPath members * to NULL-terminated copies of those portions of the URL (to be freed with * CryptMemFree.) */ @@ -583,16 +581,25 @@ memset(components, 0, sizeof(*components)); components->dwStructSize = sizeof(*components); - components->lpszHostName = CryptMemAlloc(MAX_PATH * sizeof(WCHAR)); - components->dwHostNameLength = MAX_PATH; - components->lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components->dwUrlPathLength = 2 * MAX_PATH; + components->lpszHostName = CryptMemAlloc(INTERNET_MAX_HOST_NAME_LENGTH * sizeof(WCHAR)); + components->dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH; + if (!components->lpszHostName) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + components->lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components->dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components->lpszUrlPath) + { + CryptMemFree(components->lpszHostName); + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, components); if (ret) { - if ((components->dwUrlPathLength == 2 * MAX_PATH - 1) || - (components->dwHostNameLength == MAX_PATH - 1)) - FIXME("Buffers are too small\n"); switch (components->nScheme) { case INTERNET_SCHEME_FTP: @@ -740,11 +747,15 @@ if (ret) lstrcpyW(cacheFileName, info->lpszLocalFileName); /* Check if the existing cache entry is up to date. If it isn't, - * overwite it with the new value. + * remove the existing cache entry, and create a new one with the + * new value. */ GetSystemTimeAsFileTime(&ft); if (CompareFileTime(&info->ExpireTime, &ft) < 0) + { create = TRUE; + DeleteUrlCacheEntryW(pszURL); + } CryptMemFree(info); } else @@ -814,7 +825,7 @@ components->nPort, context, pCredentials, phInt, phInt); *phHost = NULL; - *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, + *phInt = InternetOpenW(NULL, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, context ? INTERNET_FLAG_ASYNC : 0); if (*phInt) { @@ -1021,15 +1032,18 @@ *ppfnFreeObject = CRYPT_FreeBlob; *ppvFreeContext = NULL; - components.lpszUrlPath = CryptMemAlloc(MAX_PATH * 2 * sizeof(WCHAR)); - components.dwUrlPathLength = 2 * MAX_PATH; + components.lpszUrlPath = CryptMemAlloc(INTERNET_MAX_PATH_LENGTH * sizeof(WCHAR)); + components.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH; + if (!components.lpszUrlPath) + { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + ret = InternetCrackUrlW(pszURL, 0, ICU_DECODE, &components); if (ret) { LPWSTR path; - - if (components.dwUrlPathLength == 2 * MAX_PATH - 1) - FIXME("Buffers are too small\n"); /* 3 == lstrlenW(L"c:") + 1 */ path = CryptMemAlloc((components.dwUrlPathLength + 3) * sizeof(WCHAR)); @@ -1082,6 +1096,11 @@ else ret = FALSE; CryptMemFree(path); + } + else + { + SetLastError(ERROR_OUTOFMEMORY); + ret = FALSE; } } CryptMemFree(components.lpszUrlPath); @@ -1553,36 +1572,32 @@ return ret; } -static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, +static DWORD verify_cert_revocation_with_crl_online(PCCERT_CONTEXT cert, PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, PCERT_REVOCATION_STATUS pRevStatus) { DWORD error; - - if (CertVerifyCRLTimeValidity(pTime, crl->pCrlInfo)) - { - /* The CRL isn't time valid */ - error = CRYPT_E_NO_REVOCATION_CHECK; + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; } else { - PCRL_ENTRY entry = NULL; - - CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); - if (entry) - { - error = CRYPT_E_REVOKED; - pRevStatus->dwIndex = index; - } - else - error = ERROR_SUCCESS; + /* Since the CRL was retrieved for the cert being checked, then it's + * guaranteed to be fresh, and the cert is not revoked. + */ + error = ERROR_SUCCESS; } return error; } static DWORD verify_cert_revocation_from_dist_points_ext( const CRYPT_DATA_BLOB *value, PCCERT_CONTEXT cert, DWORD index, - FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, + FILETIME *pTime, DWORD dwFlags, const CERT_REVOCATION_PARA *pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { DWORD error = ERROR_SUCCESS, cbUrlArray; @@ -1621,8 +1636,8 @@ NULL, NULL, NULL, NULL); if (ret) { - error = verify_cert_revocation_with_crl(cert, crl, index, - pTime, pRevStatus); + error = verify_cert_revocation_with_crl_online(cert, crl, + index, pTime, pRevStatus); if (!error && timeout) { DWORD time = GetTickCount(); @@ -1692,6 +1707,45 @@ return error; } +static DWORD verify_cert_revocation_with_crl_offline(PCCERT_CONTEXT cert, + PCCRL_CONTEXT crl, DWORD index, FILETIME *pTime, + PCERT_REVOCATION_STATUS pRevStatus) +{ + DWORD error; + LONG valid; + + valid = CompareFileTime(pTime, &crl->pCrlInfo->ThisUpdate); + if (valid <= 0) + { + /* If this CRL is not older than the time being verified, there's no + * way to know whether the certificate was revoked. + */ + TRACE("CRL not old enough\n"); + error = CRYPT_E_REVOCATION_OFFLINE; + } + else + { + PCRL_ENTRY entry = NULL; + + CertFindCertificateInCRL(cert, crl, 0, NULL, &entry); + if (entry) + { + error = CRYPT_E_REVOKED; + pRevStatus->dwIndex = index; + } + else + { + /* Since the CRL was not retrieved for the cert being checked, + * there's no guarantee it's fresh, so the cert *might* be okay, + * but it's safer not to guess. + */ + TRACE("certificate not found\n"); + error = CRYPT_E_REVOCATION_OFFLINE; + } + } + return error; +} + static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) @@ -1757,18 +1811,25 @@ } if (crl) { - error = verify_cert_revocation_with_crl(cert, crl, index, - pTime, pRevStatus); + error = verify_cert_revocation_with_crl_offline(cert, crl, + index, pTime, pRevStatus); CertFreeCRLContext(crl); } else { + TRACE("no CRL found\n"); error = CRYPT_E_NO_REVOCATION_CHECK; pRevStatus->dwIndex = index; } } else { + if (!pRevPara) + WARN("no CERT_REVOCATION_PARA\n"); + else if (!pRevPara->hCrlStore) + WARN("no dist points/aia extension and no CRL store\n"); + else if (!pRevPara->pIssuerCert) + WARN("no dist points/aia extension and no issuer\n"); error = CRYPT_E_NO_REVOCATION_CHECK; pRevStatus->dwIndex = index; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Jan 24 13:50:22 2012 @@ -55,7 +55,7 @@ reactos/dll/win32/crypt32 # Synced to Wine-1.3.37 reactos/dll/win32/cryptdlg # Synced to Wine-1.3.37 reactos/dll/win32/cryptdll # Synced to Wine-1.3.37 -reactos/dll/win32/cryptnet # Autosync +reactos/dll/win32/cryptnet # Synced to Wine-1.3.37 reactos/dll/win32/cryptui # Autosync reactos/dll/win32/dbghelp # Autosync reactos/dll/win32/dciman32 # Autosync

1 0

[cgutman] 55138: [USBSTOR] - Fix cancellation for IRPs that have already been dispatched for processing by IoStartNextPacket - Don't complete IRPs with the IRP list lock held - Clear the cancel rou...
by cgutman＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: cgutman Date: Tue Jan 24 04:39:09 2012 New Revision: 55138 URL: http://svn.reactos.org/svn/reactos?rev=55138&view=rev Log: [USBSTOR] - Fix cancellation for IRPs that have already been dispatched for processing by IoStartNextPacket - Don't complete IRPs with the IRP list lock held - Clear the cancel routine before completing the IRP Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/queue.c [iso-8859-1] Tue Jan 24 04:39:09 2012 @@ -51,6 +51,45 @@ ASSERT(FDODeviceExtension->Common.IsFDO); // + // this IRP isn't in our list here + // + + // + // now release the cancel lock + // + IoReleaseCancelSpinLock(Irp->CancelIrql); + + // + // set cancel status + // + Irp->IoStatus.Status = STATUS_CANCELLED; + + // + // now cancel the irp + // + IoCompleteRequest(Irp, IO_NO_INCREMENT); +} + +VOID +NTAPI +USBSTOR_Cancel( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get FDO device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // sanity check + // + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(FDODeviceExtension->Common.IsFDO); + + // // acquire irp list lock // KeAcquireSpinLockAtDpcLevel(&FDODeviceExtension->IrpListLock); @@ -80,7 +119,6 @@ // IoCompleteRequest(Irp, IO_NO_INCREMENT); } - BOOLEAN USBSTOR_QueueAddIrp( @@ -149,7 +187,14 @@ // // now set the driver cancel routine // - OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_CancelIo); + if (SrbProcessing) + { + OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_Cancel); + } + else + { + OldDriverCancel = IoSetCancelRoutine(Irp, USBSTOR_CancelIo); + } // // check if the irp has already been cancelled @@ -159,7 +204,7 @@ // // cancel irp // - USBSTOR_CancelIo(DeviceObject, Irp); + Irp->CancelRoutine(DeviceObject, Irp); // // irp was cancelled @@ -241,6 +286,7 @@ PIRP Irp; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; + KIRQL OldIrql; // // get FDO device extension @@ -273,6 +319,13 @@ Irp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); // + // remove the cancellation routine + // + IoAcquireCancelSpinLock(&OldIrql); + (void)IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(OldIrql); + + // // get current stack location // IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -298,15 +351,20 @@ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // // complete request // IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - // - // release lock - // - KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + } } VOID

1 0

[cgutman] 55137: [CLASS2] - Add back an accidentally removed line
by cgutman＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: cgutman Date: Tue Jan 24 03:33:45 2012 New Revision: 55137 URL: http://svn.reactos.org/svn/reactos?rev=55137&view=rev Log: [CLASS2] - Add back an accidentally removed line Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Jan 24 03:33:45 2012 @@ -373,6 +373,9 @@ /* Assign a drive letter */ ScsiClassAssignDriveLetter(DeviceInfo); + + /* Move to the next port number */ + DriverExtension->PortNumber++; } else {

1 0

[cgutman] 55136: [CLASS2] - Add more black magic to remove symbolic links when a drive is removed
by cgutman＠svn.reactos.org 24 Jan '12

24 Jan '12

Author: cgutman Date: Tue Jan 24 03:25:52 2012 New Revision: 55136 URL: http://svn.reactos.org/svn/reactos?rev=55136&view=rev Log: [CLASS2] - Add more black magic to remove symbolic links when a drive is removed Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c Modified: branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/class2/class2.c [iso-8859-1] Tue Jan 24 03:25:52 2012 @@ -130,38 +130,57 @@ return STATUS_SUCCESS; } +/* The following hack to assign drive letters with a non-PnP storage stack */ + +typedef struct _CLASS_DEVICE_INFO { + ULONG Partitions; + ULONG DeviceNumber; + ULONG DriveNumber; + PDEVICE_OBJECT LowerDevice; +} CLASS_DEVICE_INFO, *PCLASS_DEVICE_INFO; + +typedef struct _CLASS_DRIVER_EXTENSION { + ULONG PortNumber; + CLASS_INIT_DATA InitializationData; +} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; + +VOID +NTAPI +ScsiClassRemoveDriveLetter(PCLASS_DEVICE_INFO DeviceInfo) +{ + WCHAR Buffer1[100]; + UNICODE_STRING DriveLetterU; + ULONG Index; + + DriveLetterU.Buffer = Buffer1; + DriveLetterU.MaximumLength = sizeof(Buffer1); + + /* Delete the symbolic link to PhysicalDriveX */ + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DeviceInfo->DriveNumber) * sizeof(WCHAR); + IoDeleteSymbolicLink(&DriveLetterU); + + DbgPrint("HACK: Deleted symbolic link %wZ\n", &DriveLetterU); + + for (Index = 0; Index < sizeof(ULONG) * 8; Index++) + { + if (DeviceInfo->Partitions & (1 << Index)) + { + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\%C:", ('C' + Index)) * sizeof(WCHAR); + IoDeleteSymbolicLink(&DriveLetterU); + DbgPrint("HACK: Deleted symbolic link %wZ\n", &DriveLetterU); + } + } +} + NTSTATUS NTAPI -ScsiClassPlugPlay( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - - if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) - { - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_SUCCESS; - } - else - { - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; - } -} - -/* This is a hack to assign drive letters with a non-PnP storage stack */ -NTSTATUS -NTAPI -ScsiClassAssignDriveLetter(VOID) +ScsiClassAssignDriveLetter(PCLASS_DEVICE_INFO DeviceInfo) { WCHAR Buffer1[100]; WCHAR Buffer2[100]; UNICODE_STRING DriveLetterU, PartitionU; NTSTATUS Status; - ULONG Index, PartitionNumber, DeviceNumber; + ULONG Index, PartitionNumber, DeviceNumber, DriveNumber; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK Iosb; HANDLE PartitionHandle; @@ -170,6 +189,7 @@ Index = 0; DeviceNumber = 0; + DriveNumber = 0; PartitionNumber = 1; DriveLetterU.Buffer = Buffer1; DriveLetterU.MaximumLength = sizeof(Buffer1); @@ -204,9 +224,32 @@ } } while (Status == STATUS_SUCCESS); + /* Determine the correct drive number */ + do + { + /* Check that the drive exists */ + PartitionU.Length = swprintf(PartitionU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); + InitializeObjectAttributes(&ObjectAttributes, + &PartitionU, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + Status = ZwOpenFile(&PartitionHandle, + FILE_READ_ATTRIBUTES, + &ObjectAttributes, + &Iosb, + 0, + 0); + if (NT_SUCCESS(Status)) + { + ZwClose(PartitionHandle); + DriveNumber++; + } + } while (Status == STATUS_SUCCESS); + /* Create the symbolic link to PhysicalDriveX */ PartitionU.Length = swprintf(PartitionU.Buffer, L"\\Device\\Harddisk%d\\Partition0", DeviceNumber) * sizeof(WCHAR); - DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DeviceNumber) * sizeof(WCHAR); + DriveLetterU.Length = swprintf(DriveLetterU.Buffer, L"\\??\\PhysicalDrive%d", DriveNumber) * sizeof(WCHAR); Status = IoCreateSymbolicLink(&DriveLetterU, &PartitionU); if (!NT_SUCCESS(Status)) @@ -248,18 +291,52 @@ Index++; } while (Status != STATUS_SUCCESS); + DeviceInfo->Partitions |= (1 << (Index - 1)); + DbgPrint("HACK: Created symbolic link %wZ -> %wZ\n", &PartitionU, &DriveLetterU); PartitionNumber++; } } + DeviceInfo->DeviceNumber = DeviceNumber; + DeviceInfo->DriveNumber = DriveNumber; + return STATUS_SUCCESS; } -typedef struct _CLASS_DRIVER_EXTENSION { - ULONG PortNumber; - CLASS_INIT_DATA InitializationData; -} CLASS_DRIVER_EXTENSION, *PCLASS_DRIVER_EXTENSION; +NTSTATUS +NTAPI +ScsiClassPlugPlay( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + if (IrpSp->MinorFunction == IRP_MN_START_DEVICE) + { + IoSkipCurrentIrpStackLocation(Irp); + return STATUS_SUCCESS; + } + else if (IrpSp->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + PCLASS_DEVICE_INFO DeviceInfo = DeviceObject->DeviceExtension; + + ScsiClassRemoveDriveLetter(DeviceInfo); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + IoDetachDevice(DeviceInfo->LowerDevice); + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; + } + else + { + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; + } +} NTSTATUS NTAPI @@ -268,15 +345,34 @@ IN PDEVICE_OBJECT PhysicalDeviceObject) { PCLASS_DRIVER_EXTENSION DriverExtension = IoGetDriverObjectExtension(DriverObject, DriverObject); + PCLASS_DEVICE_INFO DeviceInfo; + PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; if (DriverExtension->InitializationData.ClassFindDevices(DriverObject, NULL, &DriverExtension->InitializationData, PhysicalDeviceObject, DriverExtension->PortNumber)) { + /* Create a device object */ + Status = IoCreateDevice(DriverObject, + sizeof(CLASS_DEVICE_INFO), + NULL, + FILE_DEVICE_DISK, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + DeviceInfo = DeviceObject->DeviceExtension; + RtlZeroMemory(DeviceInfo, sizeof(CLASS_DEVICE_INFO)); + + /* Attach it to the PDO */ + DeviceInfo->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); + /* Assign a drive letter */ - ScsiClassAssignDriveLetter(); - - /* Increment the port number */ - DriverExtension->PortNumber++; + ScsiClassAssignDriveLetter(DeviceInfo); } else { @@ -286,6 +382,7 @@ return STATUS_SUCCESS; } +/* ---- End hack ---- */

1 0

[janderwald] 55135: [USBHUB] - Add more checks for detecting composite device
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 23:41:40 2012 New Revision: 55135 URL: http://svn.reactos.org/svn/reactos?rev=55135&view=rev Log: [USBHUB] - Add more checks for detecting composite device Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 23 23:41:40 2012 @@ -806,8 +806,25 @@ ULONG IsCompositeDevice( - PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) + IN PUSB_DEVICE_DESCRIPTOR DeviceDescriptor, + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor) { + if (DeviceDescriptor->bNumConfigurations != 1) + { + // + // composite device must have only one configuration + // + return FALSE; + } + + if (ConfigurationDescriptor->bNumInterfaces < 2) + { + // + // composite device must have multiple interfaces + // + return FALSE; + } + if (DeviceDescriptor->bDeviceClass == 0) { // @@ -877,7 +894,7 @@ // // Construct the CompatibleIds // - if (IsCompositeDevice(DeviceDescriptor)) + if (IsCompositeDevice(DeviceDescriptor, UsbChildExtension->FullConfigDesc)) { Index += swprintf(&BufferPtr[Index], L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x",

1 0

[janderwald] 55134: [USBHUB] - Check if the device is a composite device - Report USB\COMPOSITE as compatible id when a usb compsite device is detected
by janderwald＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: janderwald Date: Mon Jan 23 23:29:54 2012 New Revision: 55134 URL: http://svn.reactos.org/svn/reactos?rev=55134&view=rev Log: [USBHUB] - Check if the device is a composite device - Report USB\COMPOSITE as compatible id when a usb compsite device is detected Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Mon Jan 23 23:29:54 2012 @@ -804,6 +804,34 @@ return STATUS_SUCCESS; } +ULONG +IsCompositeDevice( + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor) +{ + if (DeviceDescriptor->bDeviceClass == 0) + { + // + // composite device + // + return TRUE; + } + + if (DeviceDescriptor->bDeviceClass == 0xEF && + DeviceDescriptor->bDeviceSubClass == 0x02 && + DeviceDescriptor->bDeviceProtocol == 0x01) + { + // + // USB-IF association descriptor + // + return TRUE; + } + + // + // not a composite device + // + return FALSE; +} + NTSTATUS CreateDeviceIds( PDEVICE_OBJECT UsbChildDeviceObject) @@ -813,15 +841,22 @@ PWCHAR BufferPtr; WCHAR Buffer[100]; PHUB_CHILDDEVICE_EXTENSION UsbChildExtension; - + PUSB_DEVICE_DESCRIPTOR DeviceDescriptor; + + // + // get child device extension + // UsbChildExtension = (PHUB_CHILDDEVICE_EXTENSION)UsbChildDeviceObject->DeviceExtension; // // Initialize the CompatibleIds String // - UsbChildExtension->usCompatibleIds.Length = 144; + UsbChildExtension->usCompatibleIds.Length = 144; //FIXME UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; + // + // allocate mem for compatible id string + // BufferPtr = ExAllocatePoolWithTag(NonPagedPool, UsbChildExtension->usCompatibleIds.Length, USB_HUB_TAG); @@ -832,39 +867,43 @@ } RtlZeroMemory(BufferPtr, UsbChildExtension->usCompatibleIds.Length); - Index = 0; + + // + // get device descriptor + // + DeviceDescriptor = &UsbChildExtension->DeviceDesc; + // // Construct the CompatibleIds // - if (UsbChildExtension->DeviceDesc.bDeviceClass == 0) - { - PUSB_INTERFACE_DESCRIPTOR InterDesc = (PUSB_INTERFACE_DESCRIPTOR) - ((ULONG_PTR)UsbChildExtension->FullConfigDesc + sizeof(USB_CONFIGURATION_DESCRIPTOR)); - + if (IsCompositeDevice(DeviceDescriptor)) + { + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x&SubClass_%02x&Prot_%02x", + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x&SubClass_%02x", + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\DevClass_%02x", + DeviceDescriptor->bDeviceClass) + 1; + Index += swprintf(&BufferPtr[Index], + L"USB\\COMPOSITE") + 1; + } + else + { Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass,InterDesc->bInterfaceProtocol) + 1; + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass, DeviceDescriptor->bDeviceProtocol) + 1; Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x&SubClass_%02x", - InterDesc->bInterfaceClass,InterDesc->bInterfaceSubClass) + 1; + DeviceDescriptor->bDeviceClass, DeviceDescriptor->bDeviceSubClass) + 1; Index += swprintf(&BufferPtr[Index], L"USB\\Class_%02x", - InterDesc->bInterfaceClass) + 1; - } - else - { - PUSB_DEVICE_DESCRIPTOR DevDesc = &UsbChildExtension->DeviceDesc; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x&SubClass_%02x&Prot_%02x", - DevDesc->bDeviceClass,DevDesc->bDeviceSubClass,DevDesc->bDeviceProtocol) + 1; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x&SubClass_%02x", - DevDesc->bDeviceClass,DevDesc->bDeviceSubClass) + 1; - Index += swprintf(&BufferPtr[Index], - L"USB\\Class_%02x", - DevDesc->bDeviceClass) + 1; - } + DeviceDescriptor->bDeviceClass) + 1; + } + BufferPtr[Index] = UNICODE_NULL; UsbChildExtension->usCompatibleIds.Buffer = BufferPtr; DPRINT1("usCompatibleIds %wZ\n", &UsbChildExtension->usCompatibleIds);

1 0

[akhaldi] 55133: [PSDK] * Update dwmapi.h from Wine.
by akhaldi＠svn.reactos.org 23 Jan '12

23 Jan '12

Author: akhaldi Date: Mon Jan 23 22:30:15 2012 New Revision: 55133 URL: http://svn.reactos.org/svn/reactos?rev=55133&view=rev Log: [PSDK] * Update dwmapi.h from Wine. Modified: trunk/reactos/include/psdk/dwmapi.h Modified: trunk/reactos/include/psdk/dwmapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dwmapi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dwmapi.h [iso-8859-1] Mon Jan 23 22:30:15 2012 @@ -30,6 +30,7 @@ #endif DECLARE_HANDLE(HTHUMBNAIL); +typedef HTHUMBNAIL *PHTHUMBNAIL; typedef struct _MilMatrix3x2D { @@ -53,12 +54,14 @@ BOOL fTransitionOnMaximized; } DWM_BLURBEHIND, *PDWM_BLURBEHIND; +DWMAPI DwmDefWindowProc(HWND, UINT, WPARAM, LPARAM, LRESULT*); DWMAPI DwmEnableBlurBehindWindow(HWND, const DWM_BLURBEHIND *); DWMAPI DwmEnableComposition(UINT); DWMAPI DwmEnableMMCSS(BOOL); DWMAPI DwmExtendFrameIntoClientArea(HWND,const MARGINS*); DWMAPI DwmGetColorizationColor(DWORD*,BOOL); DWMAPI DwmIsCompositionEnabled(BOOL*); +DWMAPI DwmRegisterThumbnail(HWND, HWND, PHTHUMBNAIL); DWMAPI DwmSetWindowAttribute(HWND, DWORD, LPCVOID, DWORD); DWMAPI DwmUnregisterThumbnail(HTHUMBNAIL);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs