Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

[tkreuzer] 28086: rename NtGdiGetDCState to IntGdiGetDCState
by tkreuzer＠svn.reactos.org 02 Aug '07

02 Aug '07

Author: tkreuzer Date: Thu Aug 2 04:10:15 2007 New Revision: 28086 URL: http://svn.reactos.org/svn/reactos?rev=28086&view=rev Log: rename NtGdiGetDCState to IntGdiGetDCState Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Thu Aug 2 04:10:15 2007 @@ -253,5 +253,7 @@ INT Width, INT Height); +HDC STDCALL IntGdiGetDCState(HDC hDC); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Thu Aug 2 04:10:15 2007 @@ -130,7 +130,7 @@ if (NULL == defaultDCstate) // Ultra HAX! Dedicated to GvG! { // This is a cheesy way to do this. // But, due to the right way of creating gdi handles there is no choice. - defaultDCstate = NtGdiGetDCState(pDce->hDC); + defaultDCstate = IntGdiGetDCState(pDce->hDC); DC_SetOwnership( defaultDCstate, NULL); } Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Aug 2 04:10:15 2007 @@ -1230,7 +1230,7 @@ } HDC STDCALL -NtGdiGetDCState(HDC hDC) +IntGdiGetDCState(HDC hDC) { PDC newdc, dc; HDC hnewdc; @@ -1874,7 +1874,7 @@ DPRINT("NtGdiSaveDC(%lx)\n", hDC); - if (!(hdcs = NtGdiGetDCState(hDC))) + if (!(hdcs = IntGdiGetDCState(hDC))) { return 0; }

1 0

[cwittich] 28085: fix a memory leak
by cwittich＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: cwittich Date: Thu Aug 2 02:50:58 2007 New Revision: 28085 URL: http://svn.reactos.org/svn/reactos?rev=28085&view=rev Log: fix a memory leak Modified: trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/misc.c (original) +++ trunk/reactos/base/shell/cmd/misc.c Thu Aug 2 02:50:58 2007 @@ -473,7 +473,12 @@ } if (!dwRead && !len) + { +#ifdef _UNICODE + cmd_free(lpString); +#endif return FALSE; + } lpString[len++] = _T('\0'); #ifdef _UNICODE Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c (original) +++ trunk/reactos/base/shell/cmd/type.c Thu Aug 2 02:50:58 2007 @@ -97,13 +97,13 @@ NULL); ConErrPrintf (_T("%s - %s"), argv[i], errmsg); LocalFree (errmsg); - nErrorLevel = 1; + nErrorLevel = 1; continue; } do { - bRet = FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR)); + bRet = FileGetString (hFile, buff, sizeof(buff) / sizeof(TCHAR)); if(bPaging) { if(bRet)

1 0

[cwittich] 28084: fix a memory leak
by cwittich＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: cwittich Date: Thu Aug 2 02:41:35 2007 New Revision: 28084 URL: http://svn.reactos.org/svn/reactos?rev=28084&view=rev Log: fix a memory leak Modified: trunk/reactos/base/shell/cmd/chcp.c Modified: trunk/reactos/base/shell/cmd/chcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/chcp.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/chcp.c (original) +++ trunk/reactos/base/shell/cmd/chcp.c Thu Aug 2 02:41:35 2007 @@ -41,6 +41,7 @@ /* display active code page number */ LoadString(CMD_ModuleHandle, STRING_CHCP_ERROR1, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, InputCodePage); + freep (arg); return 0; } @@ -50,6 +51,7 @@ LoadString(CMD_ModuleHandle, STRING_ERROR_INVALID_PARAM_FORMAT, szMsg, RC_STRING_MAX_SIZE); ConErrPrintf(szMsg, param); nErrorLevel = 1; + freep (arg); return 1; }

1 0

[cwittich] 28083: don't double free hFile See issue #2499 for more details.
by cwittich＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: cwittich Date: Thu Aug 2 02:04:04 2007 New Revision: 28083 URL: http://svn.reactos.org/svn/reactos?rev=28083&view=rev Log: don't double free hFile See issue #2499 for more details. Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c Thu Aug 2 02:04:04 2007 @@ -612,7 +612,6 @@ { DWORD Attributes; - FindClose(hFile); Attributes = GetFileAttributesW(lpDeleteFile); if (Attributes != INVALID_FILE_ATTRIBUTES) {

1 0

[frik85] 28082: RosCMS v3 RosCMS v3 is a major rewrite of the two year old RosCMS v2 (the ReactOS Content Management System). It took a development-timeframe of almost five months to implement a completely new experience, RosCMS has grown from a ReactOS website centric content management system that consisted of several HTML-tables and forms over the years with it's latest incarnation to a (so called) web-application. The new RosCMS user interface is based internally on asynchronous requests bet
by frik85＠svn.reactos.org 01 Aug '07

01 Aug '07

1 0

[weiden] 28081: Special handling for some fake dos devices
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 23:50:28 2007 New Revision: 28081 URL: http://svn.reactos.org/svn/reactos?rev=28081&view=rev Log: Special handling for some fake dos devices Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 23:50:28 2007 @@ -1320,6 +1320,20 @@ } else if (pszFilePart != NULL) *pszFilePart = _T('\0'); + else + { + len = _tcslen(szTemp); + if (len > 0 && szTemp[len - 1] != _T('\\') && + GetFileAttributes(szTemp) == INVALID_FILE_ATTRIBUTES && + GetLastError() == ERROR_PATH_NOT_FOUND) + { + /* Special case for some fake dos devices, such as con: + GetFullPathName doesn't return a pszFilePart pointer + so we're going to fix this ourselves */ + while (len > 0 && szTemp[len - 1] != _T('\\')) + szTemp[--len] = _T('\0'); + } + } len = _tcslen(szTemp); if ((len != 3 || szTemp[len - 2] != _T(':')) && szTemp[len - 1] == _T('\\'))

1 0

[gedmurphy] 28080: add the new cards to the branch
by gedmurphy＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: gedmurphy Date: Wed Aug 1 23:31:12 2007 New Revision: 28080 URL: http://svn.reactos.org/svn/reactos?rev=28080&view=rev Log: add the new cards to the branch Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/cards.h branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Background_1.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Ace.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Eight.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Five.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Four.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Jack.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_King.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Nine.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Queen.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Seven.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Six.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Ten.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Three.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Two.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Ace.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Eight.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Five.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Four.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Jack.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_King.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Nine.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Queen.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Seven.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Six.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Ten.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Three.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Two.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/FreeCard.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Ace.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Eight.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Five.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Four.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Jack.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_King.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Nine.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Queen.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Seven.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Six.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Ten.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Three.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Two.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Joker.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/OSign.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Ace.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Eight.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Five.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Four.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Jack.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_King.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Nine.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Queen.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Seven.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Six.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Ten.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Three.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Two.bmp branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/XSign.bmp Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_3/reactos/dll/win32/cards/cards.h (original) +++ branches/ros-branch-0_3_3/reactos/dll/win32/cards/cards.h Wed Aug 1 23:31:12 2007 @@ -46,9 +46,9 @@ #define CARD_WIDTH 71 #define CARD_HEIGHT 96 */ -/* Oxymoron's card dimensions */ -#define CARD_WIDTH 73 -#define CARD_HEIGHT 97 +/* MacSolitaireX's card dimensions */ +#define CARD_WIDTH 72 +#define CARD_HEIGHT 96 #define ISREDCARD(x) (x >= 13 && x <= 39) Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Joker.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/OSign.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available. Modified: branches/ros-branch-0_3_3/reactos/dll/win32/cards/res/XSign.bmp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/dll/wi… ============================================================================== Binary files - no diff available.

1 0

[jimtabor] 28079: Move meta code from painting to arc. Including the new Pie function with ifed out.
by jimtabor＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: jimtabor Date: Wed Aug 1 23:26:55 2007 New Revision: 28079 URL: http://svn.reactos.org/svn/reactos?rev=28079&view=rev Log: Move meta code from painting to arc. Including the new Pie function with ifed out. Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c trunk/reactos/dll/win32/gdi32/objects/painting.c Modified: trunk/reactos/dll/win32/gdi32/objects/arc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/ar… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/arc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/arc.c Wed Aug 1 23:26:55 2007 @@ -1,79 +1,193 @@ -#include "precomp.h" - -BOOL -WINAPI -Arc( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXStartArc, - int nYStartArc, - int nXEndArc, - int nYEndArc -) -{ - return NtGdiArcInternal(GdiTypeArc, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXStartArc, - nYStartArc, - nXEndArc, - nYEndArc); -} - -BOOL -WINAPI -ArcTo( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXRadial1, - int nYRadial1, - int nXRadial2, - int nYRadial2) -{ - return NtGdiArcInternal(GdiTypeArcTo, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXRadial1, - nYRadial1, - nXRadial2, - nYRadial2); -} - -BOOL -WINAPI -Chord( - HDC hDC, - int nLeftRect, - int nTopRect, - int nRightRect, - int nBottomRect, - int nXRadial1, - int nYRadial1, - int nXRadial2, - int nYRadial2) -{ - return NtGdiArcInternal(GdiTypeChord, - hDC, - nLeftRect, - nTopRect, - nRightRect, - nBottomRect, - nXRadial1, - nYRadial1, - nXRadial2, - nYRadial2); -} - - +#include "precomp.h" + +BOOL +WINAPI +Arc( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXStartArc, + int nYStartArc, + int nXEndArc, + int nYEndArc +) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) +// Call Wine (rewrite of) MFDRV_MetaParam8 + return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { +// Call Wine (rewrite of) EMFDRV_ArcChordPie + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeArc, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXStartArc, + nYStartArc, + nXEndArc, + nYEndArc); +} + +BOOL +WINAPI +ArcTo( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return FALSE; //No meta support for ArcTo + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeArcTo, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + +BOOL +WINAPI +Chord( + HDC hDC, + int nLeftRect, + int nTopRect, + int nRightRect, + int nBottomRect, + int nXRadial1, + int nYRadial1, + int nXRadial2, + int nYRadial2) +{ +#if 0 +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD); + return Ret; + } + return FALSE; + } + } +#endif + return NtGdiArcInternal(GdiTypeChord, + hDC, + nLeftRect, + nTopRect, + nRightRect, + nBottomRect, + nXRadial1, + nYRadial1, + nXRadial2, + nYRadial2); +} + + +#if 0 +/* + * @unimplemented + */ +BOOL +STDCALL +Pie( + HDC hDC, + int a1, + int a2, + int a3, + int a4, + int a5, + int a6, + int a7, + int a8 + ) +{ +// Handle something other than a normal dc object. + if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) + { + if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) + return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) + else + { + PLDC pLDC = GdiGetLDC(hDC); + if ( !pLDC ) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (pLDC->iType == LDC_EMFLDC) + { + BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE); + return Ret; + } + return FALSE; + } + } + return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); +} +#endif + Modified: trunk/reactos/dll/win32/gdi32/objects/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/painting.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/painting.c Wed Aug 1 23:26:55 2007 @@ -234,176 +234,6 @@ } -/* - * @unimplemented - */ -BOOL -STDCALL -NewArc( - HDC hDC, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 - ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) -// Call Wine (rewrite of) MFDRV_MetaParam8 - return MFDRV_MetaParam8( hDC, META_ARC, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { -// Call Wine (rewrite of) EMFDRV_ArcChordPie - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARC); - return Ret; - } - return FALSE; - } - } - return NtGdiArcInternal(GdiTypeArc, hDC, a1, a2, a3, a4, a5, a6, a7, a8); -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -NewArcTo( - HDC hDC, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 - ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return FALSE; //No meta support for ArcTo - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_ARCTO); - return Ret; - } - return FALSE; - } - } - return NtGdiArcInternal(GdiTypeArcTo, hDC, a1, a2, a3, a4, a5, a6, a7, a8); -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -Chord( - HDC hDC, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 - ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam8( hDC, META_CHORD, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_CHORD); - return Ret; - } - return FALSE; - } - } - return NtGdiArcInternal(GdiTypeChord, hDC, a1, a2, a3, a4, a5, a6, a7, a8); -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -NewPie( - HDC hDC, - int a1, - int a2, - int a3, - int a4, - int a5, - int a6, - int a7, - int a8 - ) -{ -// Handle something other than a normal dc object. - if (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC) - { - if (GDI_HANDLE_GET_TYPE(hDC) == GDI_OBJECT_TYPE_METADC) - return MFDRV_MetaParam8( hDC, META_PIE, a1, a2, a3, a4, a5, a6, a7, a8) - else - { - PLDC pLDC = GdiGetLDC(hDC); - if ( !pLDC ) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (pLDC->iType == LDC_EMFLDC) - { - BOOL Ret = EMFDRV_ArcChordPie( hDC, a1, a2, a3, a4, a5, a6, a7, a8, EMR_PIE); - return Ret; - } - return FALSE; - } - } - return NtGdiArcInternal(GdiTypePie, hDC, a1, a2, a3, a4, a5, a6, a7, a8); -} - - BOOL STDCALL Ellipse(HDC hDC, INT Left, INT Top, INT Right, INT Bottom)

1 0

[weiden] 28078: Don't output "file not found" messages in recursive searches
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 22:55:47 2007 New Revision: 28078 URL: http://svn.reactos.org/svn/reactos?rev=28078&view=rev Log: Don't output "file not found" messages in recursive searches Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 22:55:47 2007 @@ -875,7 +875,8 @@ /* Here we check if we didn't find anything */ if (!(ulFiles + ulDirs)) { - error_file_not_found(); + if (!lpFlags->bRecursive || (TotalSummary && lpFlags->bRecursive)) + error_file_not_found(); return 1; }

1 0

[weiden] 28077: Fix displaying the free space on the volume
by weiden＠svn.reactos.org 01 Aug '07

01 Aug '07

Author: weiden Date: Wed Aug 1 22:36:23 2007 New Revision: 28077 URL: http://svn.reactos.org/svn/reactos?rev=28077&view=rev Log: Fix displaying the free space on the volume Modified: trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/lang/en-US.rc Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Wed Aug 1 22:36:23 2007 @@ -898,7 +898,6 @@ } else { - /* Print File Summary */ /* Condition to print summary is: If we are not in bare format and if we have results! */ @@ -908,7 +907,6 @@ ConOutPrintfPaging(FALSE,szMsg,ulFiles, szBuffer); else ConOutPrintf(szMsg,ulFiles, szBuffer); - } /* Print total directories and freespace */ @@ -1785,9 +1783,10 @@ CommandDir(LPTSTR first, LPTSTR rest) { TCHAR dircmd[256]; /* A variable to store the DIRCMD enviroment variable */ - TCHAR volume[MAX_PATH]; + TCHAR path[MAX_PATH]; TCHAR prev_volume[MAX_PATH]; LPTSTR* params = NULL; + LPTSTR pszFilePart; INT entries = 0; UINT loop = 0; DIRSWITCHFLAGS stFlags; @@ -1881,13 +1880,20 @@ ChangedVolume = TRUE; if (!stFlags.bBareFormat && - GetVolumePathName(params[loop], volume, sizeof(volume) / sizeof(TCHAR))) - { - if (!_tcscmp(volume, prev_volume)) + GetVolumePathName(params[loop], path, sizeof(path) / sizeof(TCHAR))) + { + if (!_tcscmp(path, prev_volume)) ChangedVolume = FALSE; else - _tcscpy(prev_volume, volume); - } + _tcscpy(prev_volume, path); + } + else if (GetFullPathName(params[loop], sizeof(path) / sizeof(TCHAR), path, &pszFilePart) != 0) + { + if (pszFilePart != NULL) + *pszFilePart = _T('\0'); + } + else + _tcscpy(path, params[loop]); if (ChangedVolume && !stFlags.bBareFormat) { if (!PrintDirectoryHeader (params[loop], &stFlags)) { @@ -1904,7 +1910,7 @@ } /* print the footer */ - PrintSummary(params[loop], + PrintSummary(path, recurse_file_cnt, recurse_dir_cnt, recurse_bytes, Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/en-US.rc (original) +++ trunk/reactos/base/shell/cmd/lang/en-US.rc Wed Aug 1 22:36:23 2007 @@ -206,7 +206,7 @@ STRING_DIR_HELP3, " Volume in drive %c has no label.\n" STRING_DIR_HELP4, " Volume Serial Number is %04X-%04X\n" STRING_DIR_HELP5, "\n Total Files Listed:\n%16i File(s)% 14s bytes\n" -STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes\n" +STRING_DIR_HELP6, "%16i Dir(s)% 15s bytes free\n" STRING_DIR_HELP7, "\n Directory of %s\n\n" STRING_DIR_HELP8, "%16i File(s)% 14s bytes\n"

1 0

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 August 2007