January 2011 - Wine-Commits

Nikolay Sivov : oleaut32: Use implementation pointer to avoid casts.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: b09fd556b0c3cf1613a24bc4b9d542413337dd90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09fd556b0c3cf1613a24bc4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 3 18:18:06 2011 +0300 oleaut32: Use implementation pointer to avoid casts. --- dlls/oleaut32/typelib.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index ea7a965..d9fa638 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1141,8 +1141,8 @@ static inline ITypeInfoImpl *info_impl_from_ITypeComp( ITypeComp *iface ) static const ITypeInfo2Vtbl tinfvt; static const ITypeCompVtbl tcompvt; -static ITypeInfo2 * ITypeInfo_Constructor(void); -static void ITypeInfo_fnDestroy(ITypeInfoImpl *This); +static ITypeInfoImpl* ITypeInfoImpl_Constructor(void); +static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This); typedef struct tagTLBContext { @@ -2226,7 +2226,7 @@ static ITypeInfoImpl * MSFT_DoTypeInfo( TRACE_(typelib)("count=%u\n", count); - ptiRet = (ITypeInfoImpl*) ITypeInfo_Constructor(); + ptiRet = ITypeInfoImpl_Constructor(); MSFT_ReadLEDWords(&tiBase, sizeof(tiBase) ,pcx , pcx->pTblDir->pTypeInfoTab.offset+count*sizeof(tiBase)); @@ -3961,7 +3961,7 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) "pTIHeader->res16 = %x, pTIHeader->res1e = %x\n", pTIHeader->res06, pTIHeader->res0e, pTIHeader->res16, pTIHeader->res1e); - *ppTypeInfoImpl = (ITypeInfoImpl*)ITypeInfo_Constructor(); + *ppTypeInfoImpl = ITypeInfoImpl_Constructor(); (*ppTypeInfoImpl)->pTypeLib = pTypeLibImpl; (*ppTypeInfoImpl)->index = i; (*ppTypeInfoImpl)->Name = TLB_MultiByteToBSTR( @@ -4186,7 +4186,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) for (pTI = This->pTypeInfo; pTI; pTI = pTINext) { pTINext = pTI->next; - ITypeInfo_fnDestroy(pTI); + ITypeInfoImpl_Destroy(pTI); } heap_free(This); return 0; @@ -4935,9 +4935,9 @@ static const ITypeCompVtbl tlbtcvt = }; /*================== ITypeInfo(2) Methods ===================================*/ -static ITypeInfo2 * ITypeInfo_Constructor(void) +static ITypeInfoImpl* ITypeInfoImpl_Constructor(void) { - ITypeInfoImpl * pTypeInfoImpl; + ITypeInfoImpl *pTypeInfoImpl; pTypeInfoImpl = heap_alloc_zero(sizeof(ITypeInfoImpl)); if (pTypeInfoImpl) @@ -4950,7 +4950,7 @@ static ITypeInfo2 * ITypeInfo_Constructor(void) pTypeInfoImpl->TypeAttr.memidDestructor = MEMBERID_NIL; } TRACE("(%p)\n", pTypeInfoImpl); - return (ITypeInfo2*) pTypeInfoImpl; + return pTypeInfoImpl; } /* ITypeInfo::QueryInterface @@ -4994,7 +4994,7 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) return ref; } -static void ITypeInfo_fnDestroy(ITypeInfoImpl *This) +static void ITypeInfoImpl_Destroy(ITypeInfoImpl *This) { TLBFuncDesc *pFInfo, *pFInfoNext; TLBVarDesc *pVInfo, *pVInfoNext; @@ -6845,7 +6845,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( /* when we meet a DUAL dispinterface, we must create the interface * version of it. */ - ITypeInfoImpl* pTypeInfoImpl = (ITypeInfoImpl*) ITypeInfo_Constructor(); + ITypeInfoImpl *pTypeInfoImpl = ITypeInfoImpl_Constructor(); /* the interface version contains the same information as the dispinterface @@ -7696,7 +7696,7 @@ HRESULT WINAPI CreateDispTypeInfo( pTypeLibImpl = TypeLibImpl_Constructor(); if (!pTypeLibImpl) return E_FAIL; - pTIIface = (ITypeInfoImpl*)ITypeInfo_Constructor(); + pTIIface = ITypeInfoImpl_Constructor(); pTIIface->pTypeLib = pTypeLibImpl; pTIIface->index = 0; pTIIface->Name = NULL; @@ -7754,7 +7754,7 @@ HRESULT WINAPI CreateDispTypeInfo( pTypeLibImpl->pTypeInfo = pTIIface; pTypeLibImpl->TypeInfoCount++; - pTIClass = (ITypeInfoImpl*)ITypeInfo_Constructor(); + pTIClass = ITypeInfoImpl_Constructor(); pTIClass->pTypeLib = pTypeLibImpl; pTIClass->index = 1; pTIClass->Name = NULL;

1 0

Andrew Nguyen : reg: Accept full names of the standard registry hives.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 060c8f0c6e6285630b68ada0712ca733c68a6901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=060c8f0c6e6285630b68ada07… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Jan 4 04:47:13 2011 -0600 reg: Accept full names of the standard registry hives. --- programs/reg/reg.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f65a3c8..0f8aa15 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -66,20 +66,30 @@ static int reg_message(int msg) static HKEY get_rootkey(LPWSTR key) { static const WCHAR szHKLM[] = {'H','K','L','M',0}; + static const WCHAR szHKEY_LOCAL_MACHINE[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E',0}; static const WCHAR szHKCU[] = {'H','K','C','U',0}; + static const WCHAR szHKEY_CURRENT_USER[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R',0}; static const WCHAR szHKCR[] = {'H','K','C','R',0}; + static const WCHAR szHKEY_CLASSES_ROOT[] = {'H','K','E','Y','_','C','L','A','S','S','E','S','_','R','O','O','T',0}; static const WCHAR szHKU[] = {'H','K','U',0}; + static const WCHAR szHKEY_USERS[] = {'H','K','E','Y','_','U','S','E','R','S',0}; static const WCHAR szHKCC[] = {'H','K','C','C',0}; + static const WCHAR szHKEY_CURRENT_CONFIG[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','C','O','N','F','I','G',0}; - if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2) + if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKLM,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,18,szHKEY_LOCAL_MACHINE,18)==2) return HKEY_LOCAL_MACHINE; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCU,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CURRENT_USER,17)==2) return HKEY_CURRENT_USER; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCR,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,17,szHKEY_CLASSES_ROOT,17)==2) return HKEY_CLASSES_ROOT; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,3,szHKU,3)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,10,szHKEY_USERS,10)==2) return HKEY_USERS; - else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2) + else if (CompareStringW(CP_ACP,NORM_IGNORECASE,key,4,szHKCC,4)==2 || + CompareStringW(CP_ACP,NORM_IGNORECASE,key,19,szHKEY_CURRENT_CONFIG,19)==2) return HKEY_CURRENT_CONFIG; else return NULL; }

1 0

Andrew Nguyen : kernel32/tests: Add tests for FillConsoleOutputCharacterA.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 50ee017f34d252df852ff84c5aad35b3620229f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50ee017f34d252df852ff84c5… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:44 2011 -0600 kernel32/tests: Add tests for FillConsoleOutputCharacterA. --- dlls/kernel32/tests/console.c | 67 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 112d737..bfd8a2b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1652,6 +1652,72 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_FillConsoleOutputCharacterA(HANDLE output_handle) +{ + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + CHAR ch; + DWORD length; + COORD coord; + LPDWORD lpNumCharsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumCharsWritten) count = 0xdeadbeef; + ret = FillConsoleOutputCharacterA(invalid_table[i].hConsoleOutput, + invalid_table[i].ch, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumCharsWritten); + ok(!ret, "[%d] Expected FillConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumCharsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = FillConsoleOutputCharacterA(output_handle, 'a', 0, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = FillConsoleOutputCharacterA(output_handle, 'a', 1, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + static void test_FillConsoleOutputCharacterW(HANDLE output_handle) { COORD origin = {0, 0}; @@ -1777,5 +1843,6 @@ START_TEST(console) test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut); + test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for FillConsoleOutputCharacterW.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 5a7c633fabc1c1682352673216fbaa57f9eab231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a7c633fabc1c168235267321… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:39 2011 -0600 kernel32: Improve parameter validation for FillConsoleOutputCharacterW. --- dlls/kernel32/console.c | 12 +++++-- dlls/kernel32/tests/console.c | 67 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 2c310bd..d365df2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -755,6 +755,14 @@ BOOL WINAPI FillConsoleOutputCharacterW( HANDLE hConsoleOutput, WCHAR ch, DWORD TRACE("(%p,%s,%d,(%dx%d),%p)\n", hConsoleOutput, debugstr_wn(&ch, 1), length, coord.X, coord.Y, lpNumCharsWritten); + if (!lpNumCharsWritten) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *lpNumCharsWritten = 0; + SERVER_START_REQ( fill_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -765,9 +773,7 @@ BOOL WINAPI FillConsoleOutputCharacterW( HANDLE hConsoleOutput, WCHAR ch, DWORD req->data.ch = ch; req->count = length; if ((ret = !wine_server_call_err( req ))) - { - if (lpNumCharsWritten) *lpNumCharsWritten = reply->written; - } + *lpNumCharsWritten = reply->written; } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 0ed73c0..112d737 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1652,6 +1652,72 @@ static void test_WriteConsoleOutputAttribute(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_FillConsoleOutputCharacterW(HANDLE output_handle) +{ + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + WCHAR ch; + DWORD length; + COORD coord; + LPDWORD lpNumCharsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, 'a', 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, 'a', 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, 'a', 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumCharsWritten) count = 0xdeadbeef; + ret = FillConsoleOutputCharacterW(invalid_table[i].hConsoleOutput, + invalid_table[i].ch, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumCharsWritten); + ok(!ret, "[%d] Expected FillConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumCharsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = FillConsoleOutputCharacterW(output_handle, 'a', 0, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = FillConsoleOutputCharacterW(output_handle, 'a', 1, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1711,4 +1777,5 @@ START_TEST(console) test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); test_WriteConsoleOutputAttribute(hConOut); + test_FillConsoleOutputCharacterW(hConOut); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for FillConsoleOutputAttribute.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 51d05e241ab612fd82998c766875854e38141b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d05e241ab612fd82998c766… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:47 2011 -0600 kernel32: Improve parameter validation for FillConsoleOutputAttribute. --- dlls/kernel32/console.c | 12 +++++-- dlls/kernel32/tests/console.c | 72 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d365df2..9589cfc 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -802,6 +802,14 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, WORD attr, DWORD TRACE("(%p,%d,%d,(%dx%d),%p)\n", hConsoleOutput, attr, length, coord.X, coord.Y, lpNumAttrsWritten); + if (!lpNumAttrsWritten) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *lpNumAttrsWritten = 0; + SERVER_START_REQ( fill_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -812,9 +820,7 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, WORD attr, DWORD req->data.attr = attr; req->count = length; if ((ret = !wine_server_call_err( req ))) - { - if (lpNumAttrsWritten) *lpNumAttrsWritten = reply->written; - } + *lpNumAttrsWritten = reply->written; } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index bfd8a2b..455aecd 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1784,6 +1784,77 @@ static void test_FillConsoleOutputCharacterW(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_FillConsoleOutputAttribute(HANDLE output_handle) +{ + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + WORD attr; + DWORD length; + COORD coord; + LPDWORD lpNumAttrsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, FOREGROUND_BLUE, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, FOREGROUND_BLUE, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, FOREGROUND_BLUE, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumAttrsWritten) count = 0xdeadbeef; + ret = FillConsoleOutputAttribute(invalid_table[i].hConsoleOutput, + invalid_table[i].attr, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumAttrsWritten); + ok(!ret, "[%d] Expected FillConsoleOutputAttribute to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumAttrsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = FillConsoleOutputAttribute(output_handle, FOREGROUND_BLUE, 0, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = FillConsoleOutputAttribute(output_handle, FOREGROUND_BLUE, 1, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); + + count = 0xdeadbeef; + ret = FillConsoleOutputAttribute(output_handle, ~0, 1, origin, &count); + ok(ret == TRUE, "Expected FillConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1845,4 +1916,5 @@ START_TEST(console) test_WriteConsoleOutputAttribute(hConOut); test_FillConsoleOutputCharacterA(hConOut); test_FillConsoleOutputCharacterW(hConOut); + test_FillConsoleOutputAttribute(hConOut); }

1 0

Michael Stefaniuc : urlmon: Don' t use DEFINE_THIS2 for the Protocol vtbl functions.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 5db4caee8ea79d0817e44cded0928d64f768535b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db4caee8ea79d0817e44cded… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 4 10:59:54 2011 +0100 urlmon: Don't use DEFINE_THIS2 for the Protocol vtbl functions. --- dlls/urlmon/ftp.c | 11 ++++++----- dlls/urlmon/gopher.c | 9 +++++---- dlls/urlmon/http.c | 13 +++++++------ dlls/urlmon/urlmon_main.h | 3 +-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 854f169..c9d43b8 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -50,12 +50,15 @@ static inline FtpProtocol *impl_from_IWinInetHttpInfo(IWinInetHttpInfo *iface) return CONTAINING_RECORD(iface, FtpProtocol, IWinInetHttpInfo_iface); } -#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(FtpProtocol, base, iface) +static inline FtpProtocol *impl_from_Protocol(Protocol *prot) +{ + return CONTAINING_RECORD(prot, FtpProtocol, base); +} static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request_flags, HINTERNET internet_session, IInternetBindInfo *bind_info) { - FtpProtocol *This = ASYNCPROTOCOL_THIS(prot); + FtpProtocol *This = impl_from_Protocol(prot); BSTR url; HRESULT hres; @@ -82,7 +85,7 @@ static HRESULT FtpProtocol_end_request(Protocol *prot) static HRESULT FtpProtocol_start_downloading(Protocol *prot) { - FtpProtocol *This = ASYNCPROTOCOL_THIS(prot); + FtpProtocol *This = impl_from_Protocol(prot); DWORD size; BOOL res; @@ -104,8 +107,6 @@ static void FtpProtocol_on_error(Protocol *prot, DWORD error) FIXME("(%p) %d - stub\n", prot, error); } -#undef ASYNCPROTOCOL_THIS - static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_open_request, FtpProtocol_end_request, diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index 5964882..0058836 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -32,12 +32,15 @@ typedef struct { #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) -#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(GopherProtocol, base, iface) +static inline GopherProtocol *impl_from_Protocol(Protocol *prot) +{ + return CONTAINING_RECORD(prot, GopherProtocol, base); +} static HRESULT GopherProtocol_open_request(Protocol *prot, IUri *uri, DWORD request_flags, HINTERNET internet_session, IInternetBindInfo *bind_info) { - GopherProtocol *This = ASYNCPROTOCOL_THIS(prot); + GopherProtocol *This = impl_from_Protocol(prot); BSTR url; HRESULT hres; @@ -75,8 +78,6 @@ static void GopherProtocol_on_error(Protocol *prot, DWORD error) FIXME("(%p) %d - stub\n", prot, error); } -#undef ASYNCPROTOCOL_THIS - static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_open_request, GopherProtocol_end_request, diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index a62323b..7904229 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -122,12 +122,15 @@ static ULONG send_http_request(HttpProtocol *This) return res ? 0 : GetLastError(); } -#define ASYNCPROTOCOL_THIS(iface) DEFINE_THIS2(HttpProtocol, base, iface) +static inline HttpProtocol *impl_from_Protocol(Protocol *prot) +{ + return CONTAINING_RECORD(prot, HttpProtocol, base); +} static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request_flags, HINTERNET internet_session, IInternetBindInfo *bind_info) { - HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); + HttpProtocol *This = impl_from_Protocol(prot); LPWSTR addl_header = NULL, post_cookie = NULL; IServiceProvider *service_provider = NULL; IHttpNegotiate2 *http_negotiate2 = NULL; @@ -306,7 +309,7 @@ static HRESULT HttpProtocol_end_request(Protocol *protocol) static HRESULT HttpProtocol_start_downloading(Protocol *prot) { - HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); + HttpProtocol *This = impl_from_Protocol(prot); LPWSTR content_type, content_length, ranges; DWORD len = sizeof(DWORD); DWORD status_code; @@ -374,7 +377,7 @@ static HRESULT HttpProtocol_start_downloading(Protocol *prot) static void HttpProtocol_close_connection(Protocol *prot) { - HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); + HttpProtocol *This = impl_from_Protocol(prot); if(This->http_negotiate) { IHttpNegotiate_Release(This->http_negotiate); @@ -393,8 +396,6 @@ static void HttpProtocol_on_error(Protocol *prot, DWORD error) FIXME("(%p) %d - stub\n", prot, error); } -#undef ASYNCPROTOCOL_THIS - static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_open_request, HttpProtocol_end_request, diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 719c2eb..e47faf5 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -62,8 +62,7 @@ extern LONG URLMON_refCount; static inline void URLMON_LockModule(void) { InterlockedIncrement( &URLMON_refCount ); } static inline void URLMON_UnlockModule(void) { InterlockedDecrement( &URLMON_refCount ); } -#define DEFINE_THIS2(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,ifc))) -#define DEFINE_THIS(cls,ifc,iface) DEFINE_THIS2(cls,lp ## ifc ## Vtbl,iface) +#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl))) IInternetProtocolInfo *get_protocol_info(LPCWSTR); HRESULT get_protocol_handler(IUri*,CLSID*,BOOL*,IClassFactory**);

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleOutputAttribute.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 8ec12b5110039f3c63a04ad83ba6b3d87dabf4e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec12b5110039f3c63a04ad83… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:34 2011 -0600 kernel32: Improve parameter validation for WriteConsoleOutputAttribute. --- dlls/kernel32/console.c | 12 ++++- dlls/kernel32/tests/console.c | 84 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d56ea68..2c310bd 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -694,6 +694,14 @@ BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, CONST WORD *attr TRACE("(%p,%p,%d,%dx%d,%p)\n", hConsoleOutput,attr,length,coord.X,coord.Y,lpNumAttrsWritten); + if ((length > 0 && !attr) || !lpNumAttrsWritten) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *lpNumAttrsWritten = 0; + SERVER_START_REQ( write_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -703,9 +711,7 @@ BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, CONST WORD *attr req->wrap = TRUE; wine_server_add_data( req, attr, length * sizeof(WORD) ); if ((ret = !wine_server_call_err( req ))) - { - if (lpNumAttrsWritten) *lpNumAttrsWritten = reply->written; - } + *lpNumAttrsWritten = reply->written; } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 79f644a..0ed73c0 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1569,6 +1569,89 @@ static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_WriteConsoleOutputAttribute(HANDLE output_handle) +{ + WORD attr = FOREGROUND_BLUE; + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + CONST WORD *attr; + DWORD length; + COORD coord; + LPDWORD lpNumAttrsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &attr, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, &attr, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumAttrsWritten) count = 0xdeadbeef; + ret = WriteConsoleOutputAttribute(invalid_table[i].hConsoleOutput, + invalid_table[i].attr, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumAttrsWritten); + ok(!ret, "[%d] Expected WriteConsoleOutputAttribute to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumAttrsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleOutputAttribute(output_handle, NULL, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputAttribute(output_handle, &attr, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputAttribute(output_handle, &attr, 1, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputAttribute to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1627,4 +1710,5 @@ START_TEST(console) test_WriteConsoleInputW(hConIn); test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); + test_WriteConsoleOutputAttribute(hConOut); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleOutputCharacterA.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 5f70cd6509752de4cc571495e6b44222e267e000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f70cd6509752de4cc571495e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:29 2011 -0600 kernel32: Improve parameter validation for WriteConsoleOutputCharacterA. --- dlls/kernel32/console.c | 24 +++++++++--- dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 41ac019..d56ea68 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -640,18 +640,30 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO COORD coord, LPDWORD lpNumCharsWritten ) { BOOL ret; - LPWSTR strW; - DWORD lenW; + LPWSTR strW = NULL; + DWORD lenW = 0; TRACE("(%p,%s,%d,%dx%d,%p)\n", hConsoleOutput, debugstr_an(str, length), length, coord.X, coord.Y, lpNumCharsWritten); - lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 ); + if (length > 0) + { + if (!str) + { + SetLastError( ERROR_INVALID_ACCESS ); + return FALSE; + } - if (lpNumCharsWritten) *lpNumCharsWritten = 0; + lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 ); - if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) return FALSE; - MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, strW, lenW ); + if (!(strW = HeapAlloc( GetProcessHeap(), 0, lenW * sizeof(WCHAR) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, strW, lenW ); + } ret = WriteConsoleOutputCharacterW( hConsoleOutput, strW, lenW, coord, lpNumCharsWritten ); HeapFree( GetProcessHeap(), 0, strW ); diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index c4d51ab..79f644a 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1401,6 +1401,90 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_WriteConsoleOutputCharacterA(HANDLE output_handle) +{ + static const char output[] = {'a', 0}; + + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + LPCSTR str; + DWORD length; + COORD coord; + LPDWORD lpNumCharsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, output, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, output, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, output, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumCharsWritten) count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterA(invalid_table[i].hConsoleOutput, + invalid_table[i].str, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumCharsWritten); + ok(!ret, "[%d] Expected WriteConsoleOutputCharacterA to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumCharsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterA(output_handle, NULL, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterA(output_handle, output, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterA(output_handle, output, 1, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterA to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) { static const WCHAR outputW[] = {'a',0}; @@ -1541,5 +1625,6 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_WriteConsoleOutputCharacterA(hConOut); test_WriteConsoleOutputCharacterW(hConOut); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleOutputCharacterW.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 2281c29b46da8a68334dbbce05bf73ec5ddc16bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=2281c29b46da8a68334dbbce0… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:26 2011 -0600 kernel32: Improve parameter validation for WriteConsoleOutputCharacterW. --- dlls/kernel32/console.c | 12 ++++- dlls/kernel32/tests/console.c | 85 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 571d0cc..41ac019 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1729,6 +1729,14 @@ BOOL WINAPI WriteConsoleOutputCharacterW( HANDLE hConsoleOutput, LPCWSTR str, DW TRACE("(%p,%s,%d,%dx%d,%p)\n", hConsoleOutput, debugstr_wn(str, length), length, coord.X, coord.Y, lpNumCharsWritten); + if ((length > 0 && !str) || !lpNumCharsWritten) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + + *lpNumCharsWritten = 0; + SERVER_START_REQ( write_console_output ) { req->handle = console_handle_unmap(hConsoleOutput); @@ -1738,9 +1746,7 @@ BOOL WINAPI WriteConsoleOutputCharacterW( HANDLE hConsoleOutput, LPCWSTR str, DW req->wrap = TRUE; wine_server_add_data( req, str, length * sizeof(WCHAR) ); if ((ret = !wine_server_call_err( req ))) - { - if (lpNumCharsWritten) *lpNumCharsWritten = reply->written; - } + *lpNumCharsWritten = reply->written; } SERVER_END_REQ; return ret; diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 2f3ed6e..c4d51ab 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1401,6 +1401,90 @@ static void test_WriteConsoleInputW(HANDLE input_handle) ok(count == 1, "Expected count to be 1, got %u\n", count); } +static void test_WriteConsoleOutputCharacterW(HANDLE output_handle) +{ + static const WCHAR outputW[] = {'a',0}; + + COORD origin = {0, 0}; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE hConsoleOutput; + LPCWSTR str; + DWORD length; + COORD coord; + LPDWORD lpNumCharsWritten; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 0, origin, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, outputW, 1, origin, &count, 0, ERROR_INVALID_HANDLE}, + {output_handle, NULL, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, NULL, 1, origin, &count, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 0, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {output_handle, outputW, 1, origin, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].lpNumCharsWritten) count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(invalid_table[i].hConsoleOutput, + invalid_table[i].str, + invalid_table[i].length, + invalid_table[i].coord, + invalid_table[i].lpNumCharsWritten); + ok(!ret, "[%d] Expected WriteConsoleOutputCharacterW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].lpNumCharsWritten) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, NULL, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 0, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleOutputCharacterW(output_handle, outputW, 1, origin, &count); + ok(ret == TRUE, "Expected WriteConsoleOutputCharacterW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1457,4 +1541,5 @@ START_TEST(console) test_GetNumberOfConsoleInputEvents(hConIn); test_WriteConsoleInputA(hConIn); test_WriteConsoleInputW(hConIn); + test_WriteConsoleOutputCharacterW(hConOut); }

1 0

Andrew Nguyen : kernel32: Improve parameter validation for WriteConsoleInputW.
by Alexandre Julliard Jan. 4, 2011

Jan. 4, 2011

Module: wine Branch: master Commit: 0272da5afacad1278731482599317c95b33b53a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0272da5afacad127873148259… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Mon Jan 3 21:25:16 2011 -0600 kernel32: Improve parameter validation for WriteConsoleInputW. --- dlls/kernel32/console.c | 18 +++++++- dlls/kernel32/tests/console.c | 91 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a442657..ab0fbe2 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -504,20 +504,32 @@ BOOL WINAPI WriteConsoleInputA( HANDLE handle, const INPUT_RECORD *buffer, BOOL WINAPI WriteConsoleInputW( HANDLE handle, const INPUT_RECORD *buffer, DWORD count, LPDWORD written ) { + DWORD events_written = 0; BOOL ret; TRACE("(%p,%p,%d,%p)\n", handle, buffer, count, written); - if (written) *written = 0; + if (count > 0 && !buffer) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + SERVER_START_REQ( write_console_input ) { req->handle = console_handle_unmap(handle); wine_server_add_data( req, buffer, count * sizeof(INPUT_RECORD) ); - if ((ret = !wine_server_call_err( req )) && written) - *written = reply->written; + if ((ret = !wine_server_call_err( req ))) + events_written = reply->written; } SERVER_END_REQ; + if (written) *written = events_written; + else + { + SetLastError(ERROR_INVALID_ACCESS); + ret = FALSE; + } return ret; } diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a1388ed..c3323e1 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1221,6 +1221,96 @@ static void test_GetNumberOfConsoleInputEvents(HANDLE input_handle) ok(count != 0xdeadbeef, "Expected output count to initialized\n"); } +static void test_WriteConsoleInputW(HANDLE input_handle) +{ + INPUT_RECORD event, temp; + MOUSE_EVENT_RECORD mouse_event = { {0, 0}, 0, 0, MOUSE_MOVED }; + DWORD count; + BOOL ret; + int i; + + const struct + { + HANDLE handle; + const INPUT_RECORD *buffer; + DWORD count; + LPDWORD written; + DWORD expected_count; + DWORD last_error; + int win7_crash; + } invalid_table[] = + { + {NULL, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {NULL, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {NULL, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {NULL, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, NULL, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {INVALID_HANDLE_VALUE, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 0, &count, 0, ERROR_INVALID_HANDLE}, + {INVALID_HANDLE_VALUE, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {INVALID_HANDLE_VALUE, &event, 1, &count, 0, ERROR_INVALID_HANDLE}, + {input_handle, NULL, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, NULL, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, NULL, 1, &count, 0xdeadbeef, ERROR_INVALID_ACCESS}, + {input_handle, &event, 0, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + {input_handle, &event, 1, NULL, 0xdeadbeef, ERROR_INVALID_ACCESS, 1}, + }; + + event.EventType = MOUSE_EVENT; + event.Event.MouseEvent = mouse_event; + + for (i = 0; i < sizeof(invalid_table)/sizeof(invalid_table[0]); i++) + { + if (invalid_table[i].win7_crash) + continue; + + SetLastError(0xdeadbeef); + if (invalid_table[i].written) count = 0xdeadbeef; + ret = WriteConsoleInputW(invalid_table[i].handle, + invalid_table[i].buffer, + invalid_table[i].count, + invalid_table[i].written); + ok(!ret, "[%d] Expected WriteConsoleInputW to return FALSE, got %d\n", i, ret); + if (invalid_table[i].written) + { + ok(count == invalid_table[i].expected_count, + "[%d] Expected output count to be %u, got %u\n", + i, invalid_table[i].expected_count, count); + } + ok(GetLastError() == invalid_table[i].last_error, + "[%d] Expected last error to be %u, got %u\n", + i, invalid_table[i].last_error, GetLastError()); + } + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, NULL, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, &event, 0, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 0, "Expected count to be 0, got %u\n", count); + + count = 0xdeadbeef; + ret = WriteConsoleInputW(input_handle, &event, 1, &count); + ok(ret == TRUE, "Expected WriteConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); + + /* Discard the queued input event by reading it. */ + count = 0xdeadbeef; + ret = ReadConsoleInputW(input_handle, &temp, 1, &count); + ok(ret == TRUE, "Expected ReadConsoleInputW to return TRUE, got %d\n", ret); + ok(count == 1, "Expected count to be 1, got %u\n", count); +} + START_TEST(console) { HANDLE hConIn, hConOut; @@ -1275,4 +1365,5 @@ START_TEST(console) test_VerifyConsoleIoHandle(hConOut); test_GetSetStdHandle(); test_GetNumberOfConsoleInputEvents(hConIn); + test_WriteConsoleInputW(hConIn); }

1 0