January 2009 - Wine-Commits

Juan Lang : rsaenh: Split CPExportKey into helper functions for each export type.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 8265569e997ae78835afc4725d015d132587e2b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8265569e997ae78835afc4725… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:52:22 2009 -0800 rsaenh: Split CPExportKey into helper functions for each export type. --- dlls/rsaenh/rsaenh.c | 203 ++++++++++++++++++++++++++++---------------------- 1 files changed, 114 insertions(+), 89 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index bbccac7..cccbcf3 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2207,6 +2207,117 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, return TRUE; } +static BOOL crypt_export_simple(CRYPTKEY *pCryptKey, CRYPTKEY *pPubKey, + DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + ALG_ID *pAlgid = (ALG_ID*)(pBlobHeader+1); + DWORD dwDataLen; + + if (!(GET_ALG_CLASS(pCryptKey->aiAlgid)&(ALG_CLASS_DATA_ENCRYPT|ALG_CLASS_MSG_ENCRYPT))) { + SetLastError(NTE_BAD_KEY); /* FIXME: error code? */ + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(ALG_ID) + pPubKey->dwBlockLen; + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = SIMPLEBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + *pAlgid = pPubKey->aiAlgid; + + if (!pad_data(pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), + pPubKey->dwBlockLen, dwFlags)) + { + return FALSE; + } + + encrypt_block_impl(pPubKey->aiAlgid, PK_PUBLIC, &pPubKey->context, (BYTE*)(pAlgid+1), + (BYTE*)(pAlgid+1), RSAENH_ENCRYPT); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + +static BOOL crypt_export_public_key(CRYPTKEY *pCryptKey, BYTE *pbData, + DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); + DWORD dwDataLen; + + if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { + SetLastError(NTE_BAD_KEY); + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + pCryptKey->dwKeyLen; + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = PUBLICKEYBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + pRSAPubKey->magic = RSAENH_MAGIC_RSA1; + pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; + + export_public_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, + pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + +static BOOL crypt_export_private_key(CRYPTKEY *pCryptKey, BYTE *pbData, + DWORD *pdwDataLen) +{ + BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; + RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); + DWORD dwDataLen; + + if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { + SetLastError(NTE_BAD_KEY); + return FALSE; + } + + dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + + 2 * pCryptKey->dwKeyLen + 5 * ((pCryptKey->dwKeyLen + 1) >> 1); + if (pbData) { + if (*pdwDataLen < dwDataLen) { + SetLastError(ERROR_MORE_DATA); + *pdwDataLen = dwDataLen; + return FALSE; + } + + pBlobHeader->bType = PRIVATEKEYBLOB; + pBlobHeader->bVersion = CUR_BLOB_VERSION; + pBlobHeader->reserved = 0; + pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; + + pRSAPubKey->magic = RSAENH_MAGIC_RSA2; + pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; + + export_private_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, + pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); + } + *pdwDataLen = dwDataLen; + return TRUE; +} + /****************************************************************************** * CPExportKey (RSAENH.@) * @@ -2229,10 +2340,6 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK DWORD dwBlobType, DWORD dwFlags, BYTE *pbData, DWORD *pdwDataLen) { CRYPTKEY *pCryptKey, *pPubKey; - BLOBHEADER *pBlobHeader = (BLOBHEADER*)pbData; - RSAPUBKEY *pRSAPubKey = (RSAPUBKEY*)(pBlobHeader+1); - ALG_ID *pAlgid = (ALG_ID*)(pBlobHeader+1); - DWORD dwDataLen; TRACE("(hProv=%08lx, hKey=%08lx, hPubKey=%08lx, dwBlobType=%08x, dwFlags=%08x, pbData=%p," "pdwDataLen=%p)\n", hProv, hKey, hPubKey, dwBlobType, dwFlags, pbData, pdwDataLen); @@ -2263,38 +2370,7 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK SetLastError(NTE_BAD_PUBLIC_KEY); /* FIXME: error_code? */ return FALSE; } - - if (!(GET_ALG_CLASS(pCryptKey->aiAlgid)&(ALG_CLASS_DATA_ENCRYPT|ALG_CLASS_MSG_ENCRYPT))) { - SetLastError(NTE_BAD_KEY); /* FIXME: error code? */ - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(ALG_ID) + pPubKey->dwBlockLen; - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = SIMPLEBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - *pAlgid = pPubKey->aiAlgid; - - if (!pad_data(pCryptKey->abKeyValue, pCryptKey->dwKeyLen, (BYTE*)(pAlgid+1), - pPubKey->dwBlockLen, dwFlags)) - { - return FALSE; - } - - encrypt_block_impl(pPubKey->aiAlgid, PK_PUBLIC, &pPubKey->context, (BYTE*)(pAlgid+1), - (BYTE*)(pAlgid+1), RSAENH_ENCRYPT); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_simple(pCryptKey, pPubKey, dwFlags, pbData, pdwDataLen); case PUBLICKEYBLOB: if (is_valid_handle(&handle_table, hPubKey, RSAENH_MAGIC_KEY)) { @@ -2302,61 +2378,10 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK return FALSE; } - if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { - SetLastError(NTE_BAD_KEY); - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + pCryptKey->dwKeyLen; - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = PUBLICKEYBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - pRSAPubKey->magic = RSAENH_MAGIC_RSA1; - pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; - - export_public_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_public_key(pCryptKey, pbData, pdwDataLen); case PRIVATEKEYBLOB: - if ((pCryptKey->aiAlgid != CALG_RSA_KEYX) && (pCryptKey->aiAlgid != CALG_RSA_SIGN)) { - SetLastError(NTE_BAD_KEY); - return FALSE; - } - - dwDataLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + - 2 * pCryptKey->dwKeyLen + 5 * ((pCryptKey->dwKeyLen + 1) >> 1); - if (pbData) { - if (*pdwDataLen < dwDataLen) { - SetLastError(ERROR_MORE_DATA); - *pdwDataLen = dwDataLen; - return FALSE; - } - - pBlobHeader->bType = PRIVATEKEYBLOB; - pBlobHeader->bVersion = CUR_BLOB_VERSION; - pBlobHeader->reserved = 0; - pBlobHeader->aiKeyAlg = pCryptKey->aiAlgid; - - pRSAPubKey->magic = RSAENH_MAGIC_RSA2; - pRSAPubKey->bitlen = pCryptKey->dwKeyLen << 3; - - export_private_key_impl((BYTE*)(pRSAPubKey+1), &pCryptKey->context, - pCryptKey->dwKeyLen, &pRSAPubKey->pubexp); - } - *pdwDataLen = dwDataLen; - return TRUE; + return crypt_export_private_key(pCryptKey, pbData, pdwDataLen); default: SetLastError(NTE_BAD_TYPE); /* FIXME: error code? */

1 0

Juan Lang : rsaenh: Fix CryptSetKeyParam for KP_PERMISSIONS.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 0eb9ae17fe8df7c8146103926c8139542f7a460f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb9ae17fe8df7c8146103926… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:31:35 2009 -0800 rsaenh: Fix CryptSetKeyParam for KP_PERMISSIONS. --- dlls/rsaenh/rsaenh.c | 20 +++++++++++++++++++- dlls/rsaenh/tests/rsaenh.c | 4 ---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 28603c6..bbccac7 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2824,8 +2824,26 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam return TRUE; case KP_PERMISSIONS: - pCryptKey->dwPermissions = *(DWORD*)pbData; + { + DWORD perms = *(DWORD *)pbData; + + if ((perms & CRYPT_EXPORT) && + !(pCryptKey->dwPermissions & CRYPT_EXPORT)) + { + SetLastError(NTE_BAD_DATA); + return FALSE; + } + else if (!(perms & CRYPT_EXPORT) && + (pCryptKey->dwPermissions & CRYPT_EXPORT)) + { + /* Clearing the export permission appears to be ignored, + * see tests. + */ + perms |= CRYPT_EXPORT; + } + pCryptKey->dwPermissions = perms; return TRUE; + } case KP_IV: memcpy(pCryptKey->abInitVector, pbData, pCryptKey->dwBlockLen); diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 83aad70..e13bc1c 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -1581,7 +1581,6 @@ static void test_rsa_encrypt(void) dwVal |= CRYPT_EXPORT; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE *)&dwVal, 0); - todo_wine ok(!result && GetLastError() == NTE_BAD_DATA, "expected NTE_BAD_DATA, got %08x\n", GetLastError()); @@ -1614,7 +1613,6 @@ static void test_rsa_encrypt(void) dwVal |= CRYPT_EXPORT; SetLastError(0xdeadbeef); result = CryptSetKeyParam(hRSAKey, KP_PERMISSIONS, (BYTE *)&dwVal, 0); - todo_wine ok(!result && GetLastError() == NTE_BAD_DATA, "expected NTE_BAD_DATA, got %08x\n", GetLastError()); @@ -2157,7 +2155,6 @@ static void test_key_permissions(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey1, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - todo_wine ok(dwVal == (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT," @@ -2178,7 +2175,6 @@ static void test_key_permissions(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey2, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - todo_wine ok(dwVal == (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT,"

1 0

Juan Lang : rsaenh: Honor the CRYPT_EXPORTABLE flag to CryptAcquireContext and CryptGenKey.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 1cc58867712c06226b55784ffaeec5b4ab4391e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc58867712c06226b55784ff… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:21:20 2009 -0800 rsaenh: Honor the CRYPT_EXPORTABLE flag to CryptAcquireContext and CryptGenKey. --- dlls/rsaenh/rsaenh.c | 5 ++++- dlls/rsaenh/tests/rsaenh.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 25e21d5..28603c6 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -755,7 +755,8 @@ static inline void setup_key(CRYPTKEY *pCryptKey) { * hProv [I] Handle to the provider to which the created key will belong. * aiAlgid [I] The new key shall use the crypto algorithm idenfied by aiAlgid. * dwFlags [I] Upper 16 bits give the key length. - * Lower 16 bits: CRYPT_CREATE_SALT, CRYPT_NO_SALT + * Lower 16 bits: CRYPT_EXPORTABLE, CRYPT_CREATE_SALT, + * CRYPT_NO_SALT * ppCryptKey [O] Pointer to the created key * * RETURNS @@ -836,6 +837,8 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK pCryptKey->dwModeBits = 0; pCryptKey->dwPermissions = CRYPT_ENCRYPT | CRYPT_DECRYPT | CRYPT_READ | CRYPT_WRITE | CRYPT_MAC; + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; pCryptKey->dwKeyLen = dwKeyLen >> 3; pCryptKey->dwEffectiveKeyLen = 0; if ((dwFlags & CRYPT_CREATE_SALT) || (dwKeyLen == 40 && !(dwFlags & CRYPT_NO_SALT))) diff --git a/dlls/rsaenh/tests/rsaenh.c b/dlls/rsaenh/tests/rsaenh.c index 43d35a3..83aad70 100644 --- a/dlls/rsaenh/tests/rsaenh.c +++ b/dlls/rsaenh/tests/rsaenh.c @@ -2137,7 +2137,6 @@ static void test_key_permissions(void) dwLen = sizeof(DWORD); result = CryptGetKeyParam(hKey1, KP_PERMISSIONS, (BYTE*)&dwVal, &dwLen, 0); ok(result, "%08x\n", GetLastError()); - todo_wine ok(dwVal == (CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT), "expected CRYPT_MAC|CRYPT_WRITE|CRYPT_READ|CRYPT_EXPORT|CRYPT_DECRYPT|CRYPT_ENCRYPT,"

1 0

Juan Lang : rsaenh: Honor the CRYPT_EXPORTABLE flags to CryptImportKey.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: cc1e6eed7ea94d34533fdb0071bcf9564f960de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc1e6eed7ea94d34533fdb007… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:15:53 2009 -0800 rsaenh: Honor the CRYPT_EXPORTABLE flags to CryptImportKey. --- dlls/rsaenh/rsaenh.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 94e54a1..25e21d5 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2371,7 +2371,8 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK * pbData [I] Pointer to a buffer which holds the BLOB. * dwDataLen [I] Length of data in buffer at pbData. * hPubKey [I] Key used to decrypt sensitive BLOB data. - * dwFlags [I] Currently none defined. + * dwFlags [I] One of: + * CRYPT_EXPORTABLE: the imported key is marked exportable * phKey [O] Handle to the imported key. * * RETURNS @@ -2428,6 +2429,8 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat ret = import_private_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, pRSAPubKey->bitlen/8, pRSAPubKey->pubexp); if (ret) { + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; switch (pBlobHeader->aiKeyAlg) { case AT_SIGNATURE: @@ -2467,6 +2470,8 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat ret = import_public_key_impl((CONST BYTE*)(pRSAPubKey+1), &pCryptKey->context, pRSAPubKey->bitlen >> 3, pRSAPubKey->pubexp); if (ret) { + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; switch (pBlobHeader->aiKeyAlg) { case AT_KEYEXCHANGE: @@ -2514,6 +2519,8 @@ BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, CONST BYTE *pbData, DWORD dwDat memcpy(pCryptKey->abKeyValue, pbDecrypted, dwKeyLen); HeapFree(GetProcessHeap(), 0, pbDecrypted); setup_key(pCryptKey); + if (dwFlags & CRYPT_EXPORTABLE) + pCryptKey->dwPermissions |= CRYPT_EXPORT; return TRUE; default:

1 0

Juan Lang : rsaenh: Add tests for key permissions.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: ba01e7b2b9a5f67da517e729aa674454538ecde0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba01e7b2b9a5f67da517e729a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jan 28 20:13:14 2009 -0800 rsaenh: Add tests for key permissions. --- dlls/rsaenh/tests/rsaenh.c | 165 ++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 158 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ba01e7b2b9a5f67da517e…

1 0

Dan Kegel : msvcrt: Remove CRs earlier in ascii mode in fseek, too.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 7f3c70c52fe470d431a51b3363ed4f7336d5f7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3c70c52fe470d431a51b336… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Jan 28 21:51:59 2009 -0800 msvcrt: Remove CRs earlier in ascii mode in fseek, too. --- dlls/msvcrt/file.c | 8 ++++++++ dlls/msvcrt/tests/file.c | 38 ++++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 2740cfa..30f83e6 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -910,6 +910,14 @@ int CDECL MSVCRT_fseek(MSVCRT_FILE* file, long offset, int whence) if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { offset -= file->_cnt; + if (MSVCRT_fdesc[file->_file].wxflag & WX_TEXT) { + /* Black magic correction for CR removal */ + int i; + for (i=0; i<file->_cnt; i++) { + if (file->_ptr[i] == '\n') + offset--; + } + } } /* Discard buffered input */ file->_cnt = 0; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 3c8844b..1a524fc 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -344,34 +344,32 @@ static void test_asciimode(void) c= fgetc(fp); c= fgetc(fp); fseek(fp,0,SEEK_CUR); - todo_wine { - for(i=1; i<10; i++) { - ok((j = ftell(fp)) == i*3, "ftell fails in TEXT mode\n"); - fseek(fp,0,SEEK_CUR); - ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek failed in line %d\n", i); - c= fgetc(fp); - } - /* Show that fseek doesn't skip \\r !*/ - rewind(fp); + for(i=1; i<10; i++) { + ok((j = ftell(fp)) == i*3, "ftell fails in TEXT mode\n"); + fseek(fp,0,SEEK_CUR); + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek failed in line %d\n", i); c= fgetc(fp); + } + /* Show that fseek doesn't skip \\r !*/ + rewind(fp); + c= fgetc(fp); + fseek(fp, 2 ,SEEK_CUR); + for(i=1; i<10; i++) { + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with pos Offset failed in line %d\n", i); fseek(fp, 2 ,SEEK_CUR); - for(i=1; i<10; i++) { - ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with pos Offset failed in line %d\n", i); - fseek(fp, 2 ,SEEK_CUR); - } - fseek(fp, 9*3 ,SEEK_SET); - c = fgetc(fp); + } + fseek(fp, 9*3 ,SEEK_SET); + c = fgetc(fp); + fseek(fp, -4 ,SEEK_CUR); + for(i= 8; i>=0; i--) { + ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with neg Offset failed in line %d\n", i); fseek(fp, -4 ,SEEK_CUR); - for(i= 8; i>=0; i--) { - ok((c = fgetc(fp)) == '0'+ i, "fgetc after fseek with neg Offset failed in line %d\n", i); - fseek(fp, -4 ,SEEK_CUR); - } } /* Show what happens is fseek positions filepointer on \\r */ fclose(fp); fp = fopen("ascii.tst", "r"); fseek(fp, 3 ,SEEK_SET); - ok((c = fgetc(fp)) == '1', "fgetc fails to read nect char when positioned on \\r \n"); + ok((c = fgetc(fp)) == '1', "fgetc fails to read next char when positioned on \\r \n"); fclose(fp); unlink("ascii.tst");

1 0

Dan Kegel : msvcrt: _flsbuf zeroes _cnt.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 5bf1ae82f19b915e75f12e748ad6a8fd3185001e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bf1ae82f19b915e75f12e748… Author: Dan Kegel <dank(a)kegel.com> Date: Wed Jan 28 21:42:01 2009 -0800 msvcrt: _flsbuf zeroes _cnt. --- dlls/msvcrt/file.c | 2 ++ dlls/msvcrt/tests/file.c | 23 ++++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index ed23d02..2740cfa 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2592,6 +2592,8 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) } else { unsigned char cc=c; int len; + /* set _cnt to 0 for unbuffered FILEs */ + file->_cnt = 0; len = MSVCRT__write(file->_file, &cc, 1); if (len == 1) return c & 0xff; file->_flag |= MSVCRT__IOERR; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b783b51..3c8844b 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -471,9 +471,10 @@ static void test_flsbuf( void ) { char* tempf; FILE *tempfh; + int c; int ret; int bufmode; - int bufmodes[] = {_IOFBF,_IONBF}; + static const int bufmodes[] = {_IOFBF,_IONBF}; tempf=_tempnam(".","wne"); for (bufmode=0; bufmode < sizeof(bufmodes)/sizeof(bufmodes[0]); bufmode++) @@ -497,6 +498,26 @@ static void test_flsbuf( void ) ok(EOF == ret, "_flsbuf(0,tempfh) on r/o file expected %x got %x\n", EOF, ret); fclose(tempfh); + /* See bug 17123, exposed by WinAVR's make */ + tempfh = fopen(tempf,"w"); + ok(tempfh->_cnt == 0, "_cnt on freshly opened file was %d\n", tempfh->_cnt); + setbuf(tempfh, NULL); + ok(tempfh->_cnt == 0, "_cnt on unbuffered file was %d\n", tempfh->_cnt); + /* Inlined putchar sets _cnt to -1. Native seems to ignore the value... */ + tempfh->_cnt = 1234; + ret = _flsbuf('Q',tempfh); + ok('Q' == ret, "_flsbuf('Q',tempfh) expected %x got %x\n", 'Q', ret); + /* ... and reset it to zero */ + ok(tempfh->_cnt == 0, "after unbuf _flsbuf, _cnt was %d\n", tempfh->_cnt); + fclose(tempfh); + /* And just for grins, make sure the file is correct */ + tempfh = fopen(tempf,"r"); + c = fgetc(tempfh); + ok(c == 'Q', "first byte should be 'Q'\n"); + c = fgetc(tempfh); + ok(c == EOF, "there should only be one byte\n"); + fclose(tempfh); + unlink(tempf); }

1 0

Alasdair Sinclair : user32/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: c2c564db9daa72a90761ac8ee07e9aeb2ed4ba29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c564db9daa72a90761ac8ee… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 28 21:34:52 2009 +0000 user32/tests: Fix missing void in empty parameter list. --- dlls/user32/tests/dde.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index a60e562..3598342 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -986,7 +986,7 @@ static LRESULT WINAPI dde_msg_client_wndproc(HWND hwnd, UINT msg, WPARAM wparam, return DefWindowProcA(hwnd, msg, wparam, lparam); } -static HGLOBAL create_poke() +static HGLOBAL create_poke(void) { HGLOBAL hglobal; DDEPOKE *poke; @@ -1022,7 +1022,7 @@ static HGLOBAL create_execute(LPCSTR command) return hglobal; } -static void test_msg_client() +static void test_msg_client(void) { HGLOBAL hglobal; LPARAM lparam;

1 0

Alasdair Sinclair : winmm/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: 986b957e4a335636b2b4ab2b8de265a510cfaf41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=986b957e4a335636b2b4ab2b8… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 28 21:34:59 2009 +0000 winmm/tests: Fix missing void in empty parameter list. --- dlls/winmm/tests/mixer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 472baa6..b54bb83 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -1001,7 +1001,7 @@ static void mixer_testsW(void) mixer_test_deviceW(d); } -static void test_mixerOpen() +static void test_mixerOpen(void) { HMIXER mix; MMRESULT rc;

1 0

Alasdair Sinclair : urlmon/tests: Fix missing void in empty parameter list.
by Alexandre Julliard Jan. 29, 2009

Jan. 29, 2009

Module: wine Branch: master Commit: ac1ef319ac4cd6b4686468c09fb0206288161b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac1ef319ac4cd6b4686468c09… Author: Alasdair Sinclair <alasdairs(a)dsl.pipex.com> Date: Wed Jan 28 21:34:43 2009 +0000 urlmon/tests: Fix missing void in empty parameter list. --- dlls/urlmon/tests/misc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index b40341e..2123392 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -825,7 +825,7 @@ static void test_SecurityManager(void) /* Check if Internet Explorer is configured to run in "Enhanced Security Configuration" (aka hardened mode) */ /* Note: this code is duplicated in dlls/mshtml/tests/dom.c, dlls/mshtml/tests/script.c and dlls/urlmon/tests/misc.c */ -static BOOL is_ie_hardened() +static BOOL is_ie_hardened(void) { HKEY zone_map; DWORD ie_harden, type, size;

1 0