Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[jimtabor] 36780: Move GetTextFaceAliasW to text.c.
by jimtabor＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: jimtabor Date: Thu Oct 16 23:34:21 2008 New Revision: 36780 URL: http://svn.reactos.org/svn/reactos?rev=36780&view=rev Log: Move GetTextFaceAliasW to text.c. Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Thu Oct 16 23:34:21 2008 @@ -224,7 +224,7 @@ STDCALL GdiSetLastError(DWORD dwErrCode) { - NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode; + NtCurrentTeb()->LastErrorValue = (ULONG) dwErrCode; } BOOL Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Thu Oct 16 23:34:21 2008 @@ -1237,27 +1237,6 @@ LPSIZE psize) { return NtGdiGetTextExtentExW(hdc,lpwsz,cwc,dxMax,pcCh,pdxOut,psize,0); -} - -/* - * @implemented - */ -INT -STDCALL -GetTextFaceAliasW(HDC hdc, - int cChar, - LPWSTR pszOut) -{ - INT retValue = 0; - if ((!pszOut) || (cChar)) - { - retValue = NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - } - return retValue; } /* Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 23:34:21 2008 @@ -363,18 +363,12 @@ INT nCount, PWSTR pFaceName) { - INT retValue; - if (pFaceName && nCount <= 0) { - retValue = 0; - } - else - { - retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0); - } - - return retValue; + // GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + return NtGdiGetTextFaceW(hDC, nCount, pFaceName, FALSE); } @@ -400,6 +394,25 @@ HeapFree( GetProcessHeap(), 0, nameW ); return res; } + + +/* + * @implemented + */ +INT +STDCALL +GetTextFaceAliasW(HDC hdc, + int cChar, + LPWSTR pszOut) +{ + if ( pszOut && !cChar ) + { + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + return NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE); +} + BOOL STDCALL

1 0

[hyperion] 36779: - test GetTextFaceW instead of GetTextFaceA - test that: - the last error is never set - the buffer size is ignored if the buffer is NULL - the buffer size is returned if the buffer is non-NULL and too small - the function fails if a non-NULL buffer has a size <= 0 - allocate the DC for a GDI test with a GDI routine (CreateCompatibleDC) instead of an USER routine (GetDC)
by hyperion＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: hyperion Date: Thu Oct 16 19:28:47 2008 New Revision: 36779 URL: http://svn.reactos.org/svn/reactos?rev=36779&view=rev Log: - test GetTextFaceW instead of GetTextFaceA - test that: - the last error is never set - the buffer size is ignored if the buffer is NULL - the buffer size is returned if the buffer is non-NULL and too small - the function fails if a non-NULL buffer has a size <= 0 - allocate the DC for a GDI test with a GDI routine (CreateCompatibleDC) instead of an USER routine (GetDC) Modified: trunk/rostests/apitests/gdi32api/tests/GetTextFace.c Modified: trunk/rostests/apitests/gdi32api/tests/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetTextFace.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/tests/GetTextFace.c [iso-8859-1] Thu Oct 16 19:28:47 2008 @@ -4,22 +4,65 @@ { HDC hDC; INT ret; - CHAR Buffer[20]; + INT ret2; + WCHAR Buffer[20]; - hDC = GetDC(NULL); + hDC = CreateCompatibleDC(NULL); ASSERT(hDC); - ret = GetTextFaceA(hDC, 0, NULL); + /* Whether asking for the string size (NULL buffer) ignores the size argument */ + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 0, NULL); TEST(ret != 0); + TEST(GetLastError() == 0xE000BEEF); + ret2 = ret; - ret = GetTextFaceA(hDC, 20, Buffer); + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, -1, NULL); TEST(ret != 0); + TEST(ret == ret2); + TEST(GetLastError() == 0xE000BEEF); + ret2 = ret; - ret = GetTextFaceA(hDC, 0, Buffer); + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 10000, NULL); + TEST(ret != 0); + TEST(ret == ret2); + TEST(GetLastError() == 0xE000BEEF); + ret2 = ret; + + /* Whether the buffer is correctly filled */ + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 20, Buffer); + TEST(ret != 0); + TEST(ret <= 20); + TEST(Buffer[ret - 1] == 0); + TEST(GetLastError() == 0xE000BEEF); + + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 1, Buffer); + TEST(ret == 1); + TEST(Buffer[ret - 1] == 0); + TEST(GetLastError() == 0xE000BEEF); + + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 2, Buffer); + TEST(ret == 2); + TEST(Buffer[ret - 1] == 0); + TEST(GetLastError() == 0xE000BEEF); + + /* Whether invalid buffer sizes are correctly ignored */ + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, 0, Buffer); TEST(ret == 0); + TEST(GetLastError() == 0xE000BEEF); - ret = GetTextFaceA(hDC, 20, NULL); - TEST(ret != 0); + SetLastError(0xE000BEEF); + ret = GetTextFaceW(hDC, -1, Buffer); + TEST(ret == 0); + TEST(GetLastError() == 0xE000BEEF); + + DeleteDC(hDC); return APISTATUS_NORMAL; }

1 0

[cgutman] 36778: - Fix livecd font substitution
by cgutman＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: cgutman Date: Thu Oct 16 19:04:53 2008 New Revision: 36778 URL: http://svn.reactos.org/svn/reactos?rev=36778&view=rev Log: - Fix livecd font substitution Modified: trunk/reactos/boot/bootdata/livecd.inf Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Thu Oct 16 19:04:53 2008 @@ -38,4 +38,15 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","USERPROFILE",0x00020000,"%SystemRoot%\Profiles\Default User" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ALLUSERSPROFILE",0x00020000,"%SystemRoot%\Profiles\All Users" +; Font Substitution +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Courier New",0x00000000,"FreeMono" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Helv",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Sans Serif",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Tahoma",0x00000000,"Tahoma" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Times New Roman",0x00000000,"Liberation Serif" + ; EOF

1 0

[hyperion] 36777: You can't make this shit up.
by hyperion＠svn.reactos.org 17 Oct '08

17 Oct '08

Author: hyperion Date: Thu Oct 16 19:00:55 2008 New Revision: 36777 URL: http://svn.reactos.org/svn/reactos?rev=36777&view=rev Log: You can't make this shit up. Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 19:00:55 2008 @@ -365,7 +365,7 @@ { INT retValue; - if (pFaceName && !nCount) + if (pFaceName && nCount <= 0) { retValue = 0; }

1 0

[hyperion] 36776: The original GetTextFaceW implementation (r28730) was right all along, except GDI APIs don't usually set the last error (GetTextFaceW doesn't). The conditional was non-intuitive but nevertheless correct (tested under Windows Vista SP1). This commit negates the conditional (the AND form is more readable) and switches the "if" branches, and removes the call to SetLastError. If Coverity really flagged this, it could mean the bug is actually in NtGdiGetTextFaceW
by hyperion＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: hyperion Date: Thu Oct 16 18:49:31 2008 New Revision: 36776 URL: http://svn.reactos.org/svn/reactos?rev=36776&view=rev Log: The original GetTextFaceW implementation (r28730) was right all along, except GDI APIs don't usually set the last error (GetTextFaceW doesn't). The conditional was non-intuitive but nevertheless correct (tested under Windows Vista SP1). This commit negates the conditional (the AND form is more readable) and switches the "if" branches, and removes the call to SetLastError. If Coverity really flagged this, it could mean the bug is actually in NtGdiGetTextFaceW Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 18:49:31 2008 @@ -365,14 +365,13 @@ { INT retValue; - if (!pFaceName || (pFaceName && nCount)) + if (pFaceName && !nCount) + { + retValue = 0; + } + else { retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0); - } - else - { - SetLastError(ERROR_INVALID_PARAMETER); - retValue = 0; } return retValue;

1 0

[sginsberg] 36775: - More correct check for GetTextFaceW
by sginsberg＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: sginsberg Date: Thu Oct 16 15:21:00 2008 New Revision: 36775 URL: http://svn.reactos.org/svn/reactos?rev=36775&view=rev Log: - More correct check for GetTextFaceW Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 15:21:00 2008 @@ -365,8 +365,7 @@ { INT retValue; - if ((pFaceName && nCount) || - !(pFaceName && nCount)) + if (!pFaceName || (pFaceName && nCount)) { retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0); }

1 0

[tkreuzer] 36774: Tests for GetTextFace
by tkreuzer＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: tkreuzer Date: Thu Oct 16 15:16:38 2008 New Revision: 36774 URL: http://svn.reactos.org/svn/reactos?rev=36774&view=rev Log: Tests for GetTextFace Added: trunk/rostests/apitests/gdi32api/tests/GetTextFace.c (with props) Modified: trunk/rostests/apitests/gdi32api/testlist.c Modified: trunk/rostests/apitests/gdi32api/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/testlis… ============================================================================== --- trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32api/testlist.c [iso-8859-1] Thu Oct 16 15:16:38 2008 @@ -34,6 +34,7 @@ #include "tests/GetDIBits.c" #include "tests/GetObject.c" #include "tests/GetStockObject.c" +#include "tests/GetTextFace.c" #include "tests/SelectObject.c" #include "tests/SetDCPenColor.c" #include "tests/SetMapMode.c" @@ -74,6 +75,7 @@ { L"GetDIBits", Test_GetDIBits }, { L"GetObject", Test_GetObject }, { L"GetStockObject", Test_GetStockObject }, + { L"GetTextFace", Test_GetTextFace }, { L"SelectObject", Test_SelectObject }, { L"SetDCPenColor", Test_SetDCPenColor }, { L"SetMapMode", Test_SetMapMode }, Added: trunk/rostests/apitests/gdi32api/tests/GetTextFace.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32api/tests/G… ============================================================================== --- trunk/rostests/apitests/gdi32api/tests/GetTextFace.c (added) +++ trunk/rostests/apitests/gdi32api/tests/GetTextFace.c [iso-8859-1] Thu Oct 16 15:16:38 2008 @@ -1,0 +1,25 @@ + +INT +Test_GetTextFace(PTESTINFO pti) +{ + HDC hDC; + INT ret; + CHAR Buffer[20]; + + hDC = GetDC(NULL); + ASSERT(hDC); + + ret = GetTextFaceA(hDC, 0, NULL); + TEST(ret != 0); + + ret = GetTextFaceA(hDC, 20, Buffer); + TEST(ret != 0); + + ret = GetTextFaceA(hDC, 0, Buffer); + TEST(ret == 0); + + ret = GetTextFaceA(hDC, 20, NULL); + TEST(ret != 0); + + return APISTATUS_NORMAL; +} Propchange: trunk/rostests/apitests/gdi32api/tests/GetTextFace.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 36773: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord
by sginsberg＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: sginsberg Date: Thu Oct 16 15:02:22 2008 New Revision: 36773 URL: http://svn.reactos.org/svn/reactos?rev=36773&view=rev Log: - Unbreak GetTextFaceA/W, broken since 28730 by GreatLord Modified: trunk/reactos/dll/win32/gdi32/objects/text.c Modified: trunk/reactos/dll/win32/gdi32/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/te… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 15:02:22 2008 @@ -358,20 +358,24 @@ * @implemented */ INT -STDCALL +WINAPI GetTextFaceW(HDC hDC, - int nCount, - LPWSTR lpFaceName) -{ - INT retValue = 0; - if ((!lpFaceName) || (nCount)) - { - retValue = NtGdiGetTextFaceW(hDC,nCount,lpFaceName,0); + INT nCount, + PWSTR pFaceName) +{ + INT retValue; + + if ((pFaceName && nCount) || + !(pFaceName && nCount)) + { + retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0); } else { SetLastError(ERROR_INVALID_PARAMETER); - } + retValue = 0; + } + return retValue; }

1 0

[tkreuzer] 36772: CmDeleteKey: Copy LastWriteTime from cell to KCB, instead of querying again.
by tkreuzer＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: tkreuzer Date: Thu Oct 16 14:07:28 2008 New Revision: 36772 URL: http://svn.reactos.org/svn/reactos?rev=36772&view=rev Log: CmDeleteKey: Copy LastWriteTime from cell to KCB, instead of querying again. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Thu Oct 16 14:07:28 2008 @@ -1307,7 +1307,7 @@ /* Update the write time */ KeQuerySystemTime(&Parent->LastWriteTime); - KeQuerySystemTime(&Kcb->ParentKcb->KcbLastWriteTime); + Kcb->ParentKcb->KcbLastWriteTime = Parent->LastWriteTime; /* Release the cell */ HvReleaseCell(Hive, ParentCell);

1 0

[pschweitzer] 36771: Apply fix at the right place.......
by pschweitzer＠svn.reactos.org 16 Oct '08

16 Oct '08

Author: pschweitzer Date: Thu Oct 16 13:21:05 2008 New Revision: 36771 URL: http://svn.reactos.org/svn/reactos?rev=36771&view=rev Log: Apply fix at the right place....... Modified: branches/pierre-fsd/lib/rtl/generictable.c Modified: branches/pierre-fsd/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/lib/rtl/generictable… ============================================================================== --- branches/pierre-fsd/lib/rtl/generictable.c [iso-8859-1] (original) +++ branches/pierre-fsd/lib/rtl/generictable.c [iso-8859-1] Thu Oct 16 13:21:05 2008 @@ -352,7 +352,7 @@ else { /* Otherwise, try using the real successor */ - FoundNode = RtlRealSuccessor(*RestartKey); + FoundNode = RtlRealSuccessor(Table->TableRoot); if (FoundNode) Table->TableRoot = RtlSplay(FoundNode); } @@ -390,7 +390,7 @@ else { /* Otherwise, try using the real successor */ - FoundNode = RtlRealSuccessor(Table->TableRoot); + FoundNode = RtlRealSuccessor(*RestartKey); if (FoundNode) *RestartKey = FoundNode; }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008