October 2010 - Wine-commits

Juan Lang : crypt32/tests: Show expected values in ok output.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: bf70d35529c37ea3ea57bac7a41c0e05852c1ebd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf70d35529c37ea3ea57bac7a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 14:21:50 2010 -0700 crypt32/tests: Show expected values in ok output. --- dlls/crypt32/tests/str.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index d2ea3fb..913599e 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -26,11 +26,6 @@ #include "wine/test.h" -/*#define DUMP_STRINGS*/ -#ifdef DUMP_STRINGS -#include "wine/debug.h" -#endif - typedef struct _CertRDNAttrEncoding { LPCSTR pszObjId; DWORD dwValueType; @@ -303,11 +298,8 @@ static void test_CertRDNValueToStrW(void) buffer, sizeof(buffer) / sizeof(buffer[0])); ok(ret == lstrlenW(attrs[i].str) + 1, "Expected length %d, got %d\n", lstrlenW(attrs[i].str) + 1, ret); - ok(!lstrcmpW(buffer, attrs[i].str), "Unexpected value\n"); -#ifdef DUMP_STRINGS - trace("Expected %s, got %s\n", + ok(!lstrcmpW(buffer, attrs[i].str), "Expected %s, got %s\n", wine_dbgstr_w(attrs[i].str), wine_dbgstr_w(buffer)); -#endif } } @@ -489,13 +481,11 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", lstrlenW(expected) + 1, i); if (todo) - todo_wine ok(!lstrcmpW(buffer, expected), "Unexpected value\n"); + todo_wine ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", + wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); else - ok(!lstrcmpW(buffer, expected), "Unexpected value\n"); -#ifdef DUMP_STRINGS - trace("Expected %s, got %s\n", - wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); -#endif + ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", + wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); } static const WCHAR simpleCN_W[] = { 'C','N','=','1',0 };

1 0

Juan Lang : crypt32: Correct Unicode quoting of BMP strings.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 7833f30721fa400215cdd82fadac34b893acf2c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7833f30721fa400215cdd82fa… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 19:23:50 2010 -0700 crypt32: Correct Unicode quoting of BMP strings. --- dlls/crypt32/str.c | 45 +++++++++++++++++++++++++++++++++++++++------ dlls/crypt32/tests/str.c | 10 +++++----- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 1bdba5d..e118000 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -73,12 +73,12 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) needsQuotes = TRUE; for (i = 0; i < pValue->cbData; i++) - { + { if (is_quotable_char(pValue->pbData[i])) needsQuotes = TRUE; if (pValue->pbData[i] == '"') len += 1; - } + } if (needsQuotes) len += 2; if (!psz || !csz) @@ -158,7 +158,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, LPWSTR psz, DWORD csz) { - DWORD ret = 0, len, i; + DWORD ret = 0, len, i, strLen; BOOL needsQuotes = FALSE; TRACE("(%d, %p, %p, %d)\n", dwValueType, pValue, psz, csz); @@ -175,19 +175,18 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, case CERT_RDN_GRAPHIC_STRING: case CERT_RDN_VISIBLE_STRING: case CERT_RDN_GENERAL_STRING: - case CERT_RDN_BMP_STRING: len = pValue->cbData; if (pValue->cbData && isspace(pValue->pbData[0])) needsQuotes = TRUE; if (pValue->cbData && isspace(pValue->pbData[pValue->cbData - 1])) needsQuotes = TRUE; for (i = 0; i < pValue->cbData; i++) - { + { if (is_quotable_char(pValue->pbData[i])) needsQuotes = TRUE; if (pValue->pbData[i] == '"') len += 1; - } + } if (needsQuotes) len += 2; if (!psz || !csz) @@ -209,6 +208,40 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, ret = ptr - psz; } break; + case CERT_RDN_BMP_STRING: + strLen = len = pValue->cbData / sizeof(WCHAR); + if (pValue->cbData && isspace(pValue->pbData[0])) + needsQuotes = TRUE; + if (pValue->cbData && isspace(pValue->pbData[strLen - 1])) + needsQuotes = TRUE; + for (i = 0; i < strLen; i++) + { + if (is_quotable_char(((LPCWSTR)pValue->pbData)[i])) + needsQuotes = TRUE; + if (((LPCWSTR)pValue->pbData)[i] == '"') + len += 1; + } + if (needsQuotes) + len += 2; + if (!psz || !csz) + ret = len; + else + { + WCHAR *ptr = psz; + + if (needsQuotes) + *ptr++ = '"'; + for (i = 0; i < strLen && ptr - psz < csz; ptr++, i++) + { + *ptr = ((LPCWSTR)pValue->pbData)[i]; + if (((LPCWSTR)pValue->pbData)[i] == '"' && ptr - psz < csz - 1) + *(++ptr) = '"'; + } + if (needsQuotes && ptr - psz < csz) + *ptr++ = '"'; + ret = ptr - psz; + } + break; default: FIXME("string type %d unimplemented\n", dwValueType); } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 913599e..b9af4cd 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -570,7 +570,7 @@ static void test_CertNameToStrW(void) blob.pbData = encodedQuotedCN; blob.cbData = sizeof(encodedQuotedCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, quotedCN_W, - TRUE); + FALSE); blob.pbData = encodedMultipleAttrCN; blob.cbData = sizeof(encodedMultipleAttrCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, multipleAttrCN_W, @@ -583,17 +583,17 @@ static void test_CertNameToStrW(void) test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, equalCN_W, FALSE); blob.pbData = encodedLessThanCN; blob.cbData = sizeof(encodedLessThanCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, lessThanCN_W, FALSE); blob.pbData = encodedGreaterThanCN; blob.cbData = sizeof(encodedGreaterThanCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, greaterThanCN_W, - TRUE); + FALSE); blob.pbData = encodedHashCN; blob.cbData = sizeof(encodedHashCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, hashCN_W, FALSE); blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); - test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, TRUE); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, FALSE); } struct StrToNameA

1 0

Juan Lang : crypt32: The newline character must also be quoted.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 8f2821ac77a068c470ab56485ad2709a73c9d202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2821ac77a068c470ab56485… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 15:07:59 2010 -0700 crypt32: The newline character must also be quoted. --- dlls/crypt32/str.c | 1 + dlls/crypt32/tests/str.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index e118000..d514a5a 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -41,6 +41,7 @@ static inline BOOL is_quotable_char(char c) case '>': case ';': case '#': + case '\n': return TRUE; default: return FALSE; diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index b9af4cd..cf3d42e 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -363,6 +363,9 @@ static BYTE encodedHashCN[] = { static BYTE encodedSemiCN[] = { 0x30,0x0d,0x31,0x0b,0x30,0x09,0x06,0x03,0x55,0x04,0x03,0x1e,0x02,0x00,0x3b }; +static BYTE encodedNewlineCN[] = { +0x30,0x11,0x31,0x0f,0x30,0x0d,0x06,0x03,0x55,0x04,0x03,0x1e,0x06,0x00,0x61, +0x00,0x0a,0x00,0x62 }; static void test_CertNameToStrA(void) { @@ -457,6 +460,9 @@ static void test_CertNameToStrA(void) blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\";\"", FALSE); + blob.pbData = encodedNewlineCN; + blob.cbData = sizeof(encodedNewlineCN); + test_NameToStrConversionA(&blob, CERT_X500_NAME_STR, "CN=\"a\nb\"", FALSE); } static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, @@ -499,6 +505,7 @@ static const WCHAR lessThanCN_W[] = { 'C','N','=','"','<','"',0 }; static const WCHAR greaterThanCN_W[] = { 'C','N','=','"','>','"',0 }; static const WCHAR hashCN_W[] = { 'C','N','=','"','#','"',0 }; static const WCHAR semiCN_W[] = { 'C','N','=','"',';','"',0 }; +static const WCHAR newlineCN_W[] = { 'C','N','=','"','a','\n','b','"',0 }; static void test_CertNameToStrW(void) { @@ -594,6 +601,9 @@ static void test_CertNameToStrW(void) blob.pbData = encodedSemiCN; blob.cbData = sizeof(encodedSemiCN); test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, semiCN_W, FALSE); + blob.pbData = encodedNewlineCN; + blob.cbData = sizeof(encodedNewlineCN); + test_NameToStrConversionW(&blob, CERT_X500_NAME_STR, newlineCN_W, FALSE); } struct StrToNameA

1 0

Juan Lang : crypt32: Implement CertRDNValueToStr for UTF8 strings.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: a1352035d1c23003c8a30fdcec4febb705838b4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1352035d1c23003c8a30fdce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 17:32:01 2010 -0700 crypt32: Implement CertRDNValueToStr for UTF8 strings. --- dlls/crypt32/str.c | 2 ++ dlls/crypt32/tests/str.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index d514a5a..e0e238b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -102,6 +102,7 @@ DWORD WINAPI CertRDNValueToStrA(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, } break; case CERT_RDN_BMP_STRING: + case CERT_RDN_UTF8_STRING: len = WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)pValue->pbData, pValue->cbData / sizeof(WCHAR), NULL, 0, NULL, NULL); if (pValue->cbData && isspaceW(((LPCWSTR)pValue->pbData)[0])) @@ -210,6 +211,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, } break; case CERT_RDN_BMP_STRING: + case CERT_RDN_UTF8_STRING: strLen = len = pValue->cbData / sizeof(WCHAR); if (pValue->cbData && isspace(pValue->pbData[0])) needsQuotes = TRUE; diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index cf3d42e..ff652f3 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -53,6 +53,12 @@ static BYTE bin6[] = { 0x6c, 0x6f, 0x63, 0x61, 0x6c, 0x68, 0x6f, 0x73, 0x74 }; static BYTE bin7[] = { 0x61, 0x72, 0x69, 0x63, 0x40, 0x63, 0x6f, 0x64, 0x65, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x73, 0x2e, 0x63, 0x6f, 0x6d }; +static BYTE bin8[] = { +0x65,0x00,0x50,0x00,0x4b,0x00,0x49,0x00,0x20,0x00,0x52,0x00,0x6f,0x00,0x6f, +0x00,0x74,0x00,0x20,0x00,0x43,0x00,0x65,0x00,0x72,0x00,0x74,0x00,0x69,0x00, +0x66,0x00,0x69,0x00,0x63,0x00,0x61,0x00,0x74,0x00,0x69,0x00,0x6f,0x00,0x6e, +0x00,0x20,0x00,0x41,0x00,0x75,0x00,0x74,0x00,0x68,0x00,0x6f,0x00,0x72,0x00, +0x69,0x00,0x74,0x00,0x79,0x00 }; static const BYTE cert[] = {0x30,0x82,0x2,0xbb,0x30,0x82,0x2,0x24,0x2,0x9,0x0,0xe3,0x5a,0x10,0xf1,0xfc, @@ -216,6 +222,7 @@ static void test_CertRDNValueToStrA(void) DWORD i, ret; char buffer[2000]; CERT_RDN_VALUE_BLOB blob = { 0, NULL }; + static const char ePKI[] = "ePKI Root Certification Authority"; if (!pCertRDNValueToStrA) return; @@ -239,6 +246,14 @@ static void test_CertRDNValueToStrA(void) ok(!strcmp(buffer, attrs[i].str), "Expected %s, got %s\n", attrs[i].str, buffer); } + blob.pbData = bin8; + blob.cbData = sizeof(bin8); + ret = pCertRDNValueToStrA(CERT_RDN_UTF8_STRING, &blob, buffer, + sizeof(buffer)); + ok(ret == strlen(ePKI) + 1 || broken(ret != strlen(ePKI) + 1), + "Expected length %d, got %d\n", lstrlenA(ePKI), ret); + if (ret == strlen(ePKI) + 1) + ok(!strcmp(buffer, ePKI), "Expected %s, got %s\n", ePKI, buffer); } static void test_CertRDNValueToStrW(void) @@ -254,6 +269,9 @@ static void test_CertRDNValueToStrW(void) static const WCHAR localhostW[] = { 'l','o','c','a','l','h','o','s','t',0 }; static const WCHAR aricW[] = { 'a','r','i','c','@','c','o','d','e','w','e', 'a','v','e','r','s','.','c','o','m',0 }; + static const WCHAR ePKIW[] = { 'e','P','K','I',' ','R','o','o','t',' ', + 'C','e','r','t','i','f','i','c','a','t','i','o','n',' ','A','u','t','h', + 'o','r','i','t','y',0 }; CertRDNAttrEncodingW attrs[] = { { "2.5.4.6", CERT_RDN_PRINTABLE_STRING, { sizeof(bin1), bin1 }, usW }, @@ -269,6 +287,8 @@ static void test_CertRDNValueToStrW(void) { sizeof(bin6), bin6 }, localhostW }, { "1.2.840.113549.1.9.1", CERT_RDN_IA5_STRING, { sizeof(bin7), bin7 }, aricW }, + { "2.5.4.3", CERT_RDN_UTF8_STRING, + { sizeof(bin8), bin8 }, ePKIW }, }; DWORD i, ret; WCHAR buffer[2000]; @@ -301,6 +321,15 @@ static void test_CertRDNValueToStrW(void) ok(!lstrcmpW(buffer, attrs[i].str), "Expected %s, got %s\n", wine_dbgstr_w(attrs[i].str), wine_dbgstr_w(buffer)); } + blob.pbData = bin8; + blob.cbData = sizeof(bin8); + ret = pCertRDNValueToStrW(CERT_RDN_UTF8_STRING, &blob, buffer, + sizeof(buffer)); + ok(ret == lstrlenW(ePKIW) + 1 || broken(ret != lstrlenW(ePKIW) + 1), + "Expected length %d, got %d\n", lstrlenW(ePKIW), ret); + if (ret == lstrlenW(ePKIW) + 1) + ok(!lstrcmpW(buffer, ePKIW), "Expected %s, got %s\n", + wine_dbgstr_w(ePKIW), wine_dbgstr_w(buffer)); } static void test_NameToStrConversionA(PCERT_NAME_BLOB pName, DWORD dwStrType,

1 0

Krzysztof Nowicki : windowscodecs: Optimise copy_pixels in case the whole bitmap is copied.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: db6731f628c1be0e474860965d109954d8a9e71e URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6731f628c1be0e474860965… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Tue Oct 19 21:51:25 2010 +0200 windowscodecs: Optimise copy_pixels in case the whole bitmap is copied. --- dlls/windowscodecs/main.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c index 906ea16..6f37f5d 100644 --- a/dlls/windowscodecs/main.c +++ b/dlls/windowscodecs/main.c @@ -77,6 +77,13 @@ HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, if ((dststride * rc->Height) > dstbuffersize) return E_INVALIDARG; + /* if the whole bitmap is copied and the buffer format matches then it's a matter of a single memcpy */ + if (rc->X == 0 && rc->Y == 0 && rc->Width == srcwidth && rc->Height == srcheight && srcstride == dststride) + { + memcpy(dstbuffer, srcbuffer, srcstride * srcheight); + return S_OK; + } + row_offset = rc->X * bpp; if (row_offset % 8 == 0)

1 0

Henri Verbeet : wined3d: Handle WINED3DFMT_R10G10B10A2_UNORM in getColorBits().
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 58ecf706e2069524e7fa11e169890d21fa098bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ecf706e2069524e7fa11e16… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 20 12:12:26 2010 +0200 wined3d: Handle WINED3DFMT_R10G10B10A2_UNORM in getColorBits(). --- dlls/wined3d/utils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 2957c5a..efeaa14 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2499,11 +2499,12 @@ BOOL getColorBits(const struct wined3d_format *format, switch (format->id) { + case WINED3DFMT_B10G10R10A2_UNORM: + case WINED3DFMT_R10G10B10A2_UNORM: case WINED3DFMT_B8G8R8X8_UNORM: case WINED3DFMT_B8G8R8_UNORM: case WINED3DFMT_B8G8R8A8_UNORM: case WINED3DFMT_R8G8B8A8_UNORM: - case WINED3DFMT_B10G10R10A2_UNORM: case WINED3DFMT_B5G5R5X1_UNORM: case WINED3DFMT_B5G5R5A1_UNORM: case WINED3DFMT_B5G6R5_UNORM:

1 0

Alexandre Julliard : kernel32: Use the NT name to open the root directory in GetVolumeInformationW.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 5820f408623458c46e86cec37ff202c0614eee69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5820f408623458c46e86cec37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:25:32 2010 +0200 kernel32: Use the NT name to open the root directory in GetVolumeInformationW. --- dlls/kernel32/volume.c | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index a198add..0a3cc6a 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -521,6 +521,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, UNICODE_STRING nt_name; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + FILE_FS_DEVICE_INFORMATION info; WCHAR *p; enum fs_type type = FS_UNKNOWN; BOOL ret = FALSE; @@ -592,22 +593,20 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, /* we couldn't open the device, fallback to default strategy */ - switch(GetDriveTypeW( root )) + status = NtOpenFile( &handle, 0, &attr, &io, 0, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); + if (status != STATUS_SUCCESS) { - case DRIVE_UNKNOWN: - case DRIVE_NO_ROOT_DIR: - SetLastError( ERROR_NOT_READY ); + SetLastError( RtlNtStatusToDosError(status) ); + goto done; + } + status = NtQueryVolumeInformationFile( handle, &io, &info, sizeof(info), FileFsDeviceInformation ); + NtClose( handle ); + if (status != STATUS_SUCCESS) + { + SetLastError( RtlNtStatusToDosError(status) ); goto done; - case DRIVE_REMOVABLE: - case DRIVE_FIXED: - case DRIVE_REMOTE: - case DRIVE_RAMDISK: - type = FS_UNKNOWN; - break; - case DRIVE_CDROM: - type = FS_ISO9660; - break; } + if (info.DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) type = FS_ISO9660; if (label && label_len) get_filesystem_label( device, label, label_len ); if (serial) *serial = get_filesystem_serial( device );

1 0

Alexandre Julliard : kernel32: Use the NT name to retrieve label and serial in GetVolumeInformationW.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 357b50600bb11cfda1c7a155d85278a07134ad51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357b50600bb11cfda1c7a155d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:26:54 2010 +0200 kernel32: Use the NT name to retrieve label and serial in GetVolumeInformationW. --- dlls/kernel32/volume.c | 79 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 55 insertions(+), 24 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0a3cc6a..b65d67b 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -209,15 +209,31 @@ static DWORD get_mountmgr_drive_type( LPCWSTR root ) } /* get the label by reading it from a file at the root of the filesystem */ -static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) +static void get_filesystem_label( const UNICODE_STRING *device, WCHAR *label, DWORD len ) { + static const WCHAR labelW[] = {'.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; HANDLE handle; - WCHAR labelW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','l','a','b','e','l',0}; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; - labelW[0] = device[4]; - handle = CreateFileW( labelW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) + label[0] = 0; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + name.MaximumLength = device->Length + sizeof(labelW); + name.Length = name.MaximumLength - sizeof(WCHAR); + if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return; + + memcpy( name.Buffer, device->Buffer, device->Length ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), labelW, sizeof(labelW) ); + if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT )) { char buffer[256], *p; DWORD size; @@ -230,19 +246,34 @@ static void get_filesystem_label( const WCHAR *device, WCHAR *label, DWORD len ) if (!MultiByteToWideChar( CP_UNIXCP, 0, buffer, -1, label, len )) label[len-1] = 0; } - else label[0] = 0; + RtlFreeUnicodeString( &name ); } /* get the serial number by reading it from a file at the root of the filesystem */ -static DWORD get_filesystem_serial( const WCHAR *device ) +static DWORD get_filesystem_serial( const UNICODE_STRING *device ) { + static const WCHAR serialW[] = {'.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; HANDLE handle; - WCHAR serialW[] = {'A',':','\\','.','w','i','n','d','o','w','s','-','s','e','r','i','a','l',0}; + UNICODE_STRING name; + IO_STATUS_BLOCK io; + OBJECT_ATTRIBUTES attr; + DWORD ret = 0; - serialW[0] = device[4]; - handle = CreateFileW( serialW, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, - OPEN_EXISTING, 0, 0 ); - if (handle != INVALID_HANDLE_VALUE) + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &name; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + name.MaximumLength = device->Length + sizeof(serialW); + name.Length = name.MaximumLength - sizeof(WCHAR); + if (!(name.Buffer = HeapAlloc( GetProcessHeap(), 0, name.MaximumLength ))) return 0; + + memcpy( name.Buffer, device->Buffer, device->Length ); + memcpy( name.Buffer + device->Length / sizeof(WCHAR), serialW, sizeof(serialW) ); + if (!NtOpenFile( &handle, GENERIC_READ, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT )) { char buffer[32]; DWORD size; @@ -250,9 +281,10 @@ static DWORD get_filesystem_serial( const WCHAR *device ) if (!ReadFile( handle, buffer, sizeof(buffer)-1, &size, NULL )) size = 0; CloseHandle( handle ); buffer[size] = 0; - return strtoul( buffer, NULL, 16 ); + ret = strtoul( buffer, NULL, 16 ); } - else return 0; + RtlFreeUnicodeString( &name ); + return ret; } @@ -377,8 +409,8 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /************************************************************************** * VOLUME_GetSuperblockLabel */ -static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, const BYTE *superblock, - WCHAR *label, DWORD len ) +static void VOLUME_GetSuperblockLabel( const UNICODE_STRING *device, enum fs_type type, + const BYTE *superblock, WCHAR *label, DWORD len ) { const BYTE *label_ptr = NULL; DWORD label_len; @@ -431,7 +463,8 @@ static void VOLUME_GetSuperblockLabel( const WCHAR *device, enum fs_type type, c /************************************************************************** * VOLUME_GetSuperblockSerial */ -static DWORD VOLUME_GetSuperblockSerial( const WCHAR *device, enum fs_type type, const BYTE *superblock ) +static DWORD VOLUME_GetSuperblockSerial( const UNICODE_STRING *device, enum fs_type type, + const BYTE *superblock ) { switch(type) { @@ -515,7 +548,6 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, static const WCHAR cdfsW[] = {'C','D','F','S',0}; static const WCHAR default_rootW[] = {'\\',0}; - WCHAR device[] = {'\\','\\','.','\\','A',':',0}; HANDLE handle; NTSTATUS status; UNICODE_STRING nt_name; @@ -539,7 +571,6 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, SetLastError( ERROR_INVALID_NAME ); goto done; } - device[4] = nt_name.Buffer[4]; /* try to open the device */ @@ -585,8 +616,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, TRACE( "%s: found fs type %d\n", debugstr_w(nt_name.Buffer), type ); if (type == FS_ERROR) goto done; - if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); - if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); + if (label && label_len) VOLUME_GetSuperblockLabel( &nt_name, type, superblock, label, label_len ); + if (serial) *serial = VOLUME_GetSuperblockSerial( &nt_name, type, superblock ); goto fill_fs_info; } else TRACE( "cannot open device %s: err %d\n", debugstr_w(nt_name.Buffer), GetLastError() ); @@ -608,8 +639,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, } if (info.DeviceType == FILE_DEVICE_CD_ROM_FILE_SYSTEM) type = FS_ISO9660; - if (label && label_len) get_filesystem_label( device, label, label_len ); - if (serial) *serial = get_filesystem_serial( device ); + if (label && label_len) get_filesystem_label( &nt_name, label, label_len ); + if (serial) *serial = get_filesystem_serial( &nt_name ); fill_fs_info: /* now fill in the information that depends on the file system type */

1 0

Alexandre Julliard : kernel32: Fix last error code in GetVolumeInformationW when an explicit subdir is requested .
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 14556047045a08a98442e7e44bffb7cff29e67de URL: http://source.winehq.org/git/wine.git/?a=commit;h=14556047045a08a98442e7e44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 12:29:45 2010 +0200 kernel32: Fix last error code in GetVolumeInformationW when an explicit subdir is requested. --- dlls/kernel32/tests/volume.c | 2 +- dlls/kernel32/volume.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index c63dd72..482ff16 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -435,7 +435,7 @@ static void test_GetVolumeInformationA(void) SetLastError(0xdeadbeef); ret = pGetVolumeInformationA(windowsdir, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); - todo_wine ok(!ret && (GetLastError()==ERROR_DIR_NOT_ROOT || + ok(!ret && (GetLastError()==ERROR_DIR_NOT_ROOT || broken(GetLastError()==ERROR_BAD_PATHNAME/* win9x */)), "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", windowsdir, GetLastError()); /* A subdir with trailing \ yields DIR_NOT_ROOT instead of INVALID_NAME */ diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index b65d67b..17e70e5 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -568,7 +568,13 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) ); if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1) { - SetLastError( ERROR_INVALID_NAME ); + /* check if root contains an explicit subdir */ + if (root[0] && root[1] == ':') root += 2; + while (*root == '\\') root++; + if (strchrW( root, '\\' )) + SetLastError( ERROR_DIR_NOT_ROOT ); + else + SetLastError( ERROR_INVALID_NAME ); goto done; }

1 0

Juan Lang : crypt32: Remove unneeded comments.
by Alexandre Julliard 20 Oct '10

20 Oct '10

Module: wine Branch: master Commit: 41416252846843a1295fc7908172589272530c02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41416252846843a1295fc7908… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 19 12:51:52 2010 -0700 crypt32: Remove unneeded comments. --- dlls/crypt32/str.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 47130d0..1bdba5d 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -322,7 +322,6 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ chars = CertRDNValueToStrA( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, @@ -502,7 +501,6 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ chars = CertRDNValueToStrW( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL,

1 0