Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 40474: Various fixes to the way cmd handles errorlevel and the "return values" of commands: - Changed type of return values from BOOL to INT, with 0 indicating success and any other value indicating failure. If the left side of an || operator returns nonzero, errorlevel is set to that value. - The return value of a batch file or FOR is the return value of the last command executed in it. An empty batch file returns 0, unless it was CALLed, in which case it returns errorlevel. - CALL se
by jmorlan＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: jmorlan Date: Mon Apr 13 03:51:15 2009 New Revision: 40474 URL: http://svn.reactos.org/svn/reactos?rev=40474&view=rev Log: Various fixes to the way cmd handles errorlevel and the "return values" of commands: - Changed type of return values from BOOL to INT, with 0 indicating success and any other value indicating failure. If the left side of an || operator returns nonzero, errorlevel is set to that value. - The return value of a batch file or FOR is the return value of the last command executed in it. An empty batch file returns 0, unless it was CALLed, in which case it returns errorlevel. - CALL sets errorlevel to the return value of whatever was called. - Running a GUI program doesn't change errorlevel, but always returns 0. - CMD /C uses the command's return value, not errorlevel, as the process exit code. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/if.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -203,11 +203,12 @@ * */ -BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) +INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) { BATCH_CONTEXT new; LPFOR_CONTEXT saved_fc; INT i; + INT ret = 0; HANDLE hFile; SetLastError(0); @@ -221,7 +222,7 @@ if (hFile == INVALID_HANDLE_VALUE) { ConErrResPuts(STRING_BATCH_ERROR); - return FALSE; + return 1; } if (bc != NULL && Cmd == bc->current) @@ -238,10 +239,19 @@ else { struct _SETLOCAL *setlocal = NULL; - /* If a batch file runs another batch file as part of a compound command - * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - if (bc && Cmd != NULL) + + if (Cmd == NULL) { + /* This is a CALL. CALL will set errorlevel to our return value, so + * in order to keep the value of errorlevel unchanged in the case + * of calling an empty batch file, we must return that same value. */ + ret = nErrorLevel; + } + else if (bc) + { + /* If a batch file runs another batch file as part of a compound command + * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ + /* Get its SETLOCAL stack so it can be migrated to the new context */ setlocal = bc->setlocal; bc->setlocal = NULL; @@ -272,7 +282,7 @@ if (bc->raw_params == NULL) { error_out_of_memory(); - return FALSE; + return 1; } /* Check if this is a "CALL :label" */ @@ -303,14 +313,14 @@ } bc->current = Cmd; - ExecuteCommand(Cmd); + ret = ExecuteCommand(Cmd); FreeCommand(Cmd); } TRACE ("Batch: returns TRUE\n"); fc = saved_fc; - return TRUE; + return ret; } VOID AddBatchRedirection(REDIRECTION **RedirList) Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -47,7 +47,7 @@ LPTSTR FindArg (TCHAR, BOOL *); LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (); -BOOL Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); +INT Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); LPTSTR ReadBatchLine(); VOID AddBatchRedirection(REDIRECTION **); Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -73,10 +73,12 @@ /* CALL :label - call a subroutine of the current batch file */ while (*param == _T(' ')) param++; - return !Batch(bc->BatchFilePath, first, param, NULL); + nErrorLevel = Batch(bc->BatchFilePath, first, param, NULL); + return nErrorLevel; } - return !DoCommand(first, param, NULL); + nErrorLevel = DoCommand(first, param, NULL); + return nErrorLevel; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -308,7 +308,7 @@ * Rest - rest of command line */ -static BOOL +static INT Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd) { TCHAR szFullName[MAX_PATH]; @@ -363,7 +363,7 @@ } if (!working) ConErrResPuts (STRING_FREE_ERROR1); - return working; + return !working; } /* get the PATH environment variable and parse it */ @@ -372,7 +372,7 @@ if (!SearchForExecutable(First, szFullName)) { error_bad_command(first); - return FALSE; + return 1; } GetConsoleTitle (szWindowTitle, MAX_PATH); @@ -384,7 +384,7 @@ while (*rest == _T(' ')) rest++; TRACE ("[BATCH: %s %s]\n", debugstr_aw(szFullName), debugstr_aw(rest)); - Batch (szFullName, first, rest, Cmd); + dwExitCode = Batch(szFullName, first, rest, Cmd); } else { @@ -448,17 +448,13 @@ GetExitCodeProcess (prci.hProcess, &dwExitCode); nErrorLevel = (INT)dwExitCode; } - else - { - nErrorLevel = 0; - } CloseHandle (prci.hProcess); } else { TRACE ("[ShellExecute failed!: %s]\n", debugstr_aw(Full)); error_bad_command (first); - nErrorLevel = 1; + dwExitCode = 1; } // restore console mode @@ -472,7 +468,7 @@ OutputCodePage = GetConsoleOutputCP(); SetConsoleTitle (szWindowTitle); - return nErrorLevel == 0; + return dwExitCode; } @@ -485,7 +481,7 @@ * rest - rest of command line */ -BOOL +INT DoCommand(LPTSTR first, LPTSTR rest, PARSED_COMMAND *Cmd) { TCHAR com[_tcslen(first) + _tcslen(rest) + 2]; /* full command line */ @@ -530,7 +526,7 @@ if (_tcsicmp(cmdptr->name, _T("echo")) != 0) while (_istspace(*param)) param++; - return !cmdptr->func(param); + return cmdptr->func(param); } } @@ -543,14 +539,16 @@ * full input/output redirection and piping are supported */ -VOID ParseCommandLine (LPTSTR cmd) -{ +INT ParseCommandLine (LPTSTR cmd) +{ + INT Ret = 0; PARSED_COMMAND *Cmd = ParseCommand(cmd); if (Cmd) { - ExecuteCommand(Cmd); + Ret = ExecuteCommand(Cmd); FreeCommand(Cmd); } + return Ret; } /* Execute a command without waiting for it to finish. If it's an internal @@ -679,27 +677,27 @@ #endif } -BOOL +INT ExecuteCommand(PARSED_COMMAND *Cmd) { PARSED_COMMAND *Sub; LPTSTR First, Rest; - BOOL Success = TRUE; + INT Ret = 0; if (!PerformRedirection(Cmd->Redirections)) - return FALSE; + return 1; switch (Cmd->Type) { case C_COMMAND: - Success = FALSE; + Ret = 1; First = DoDelayedExpansion(Cmd->Command.First); if (First) { Rest = DoDelayedExpansion(Cmd->Command.Rest); if (Rest) { - Success = DoCommand(First, Rest, Cmd); + Ret = DoCommand(First, Rest, Cmd); cmd_free(Rest); } cmd_free(First); @@ -709,31 +707,36 @@ case C_BLOCK: case C_MULTI: for (Sub = Cmd->Subcommands; Sub; Sub = Sub->Next) - Success = ExecuteCommand(Sub); + Ret = ExecuteCommand(Sub); break; case C_IFFAILURE: + Sub = Cmd->Subcommands; + Ret = ExecuteCommand(Sub); + if (Ret != 0) + { + nErrorLevel = Ret; + Ret = ExecuteCommand(Sub->Next); + } + break; case C_IFSUCCESS: Sub = Cmd->Subcommands; - Success = ExecuteCommand(Sub); - if (Success == (Cmd->Type - C_IFFAILURE)) - { - Sub = Sub->Next; - Success = ExecuteCommand(Sub); - } + Ret = ExecuteCommand(Sub); + if (Ret == 0) + Ret = ExecuteCommand(Sub->Next); break; case C_PIPE: ExecutePipeline(Cmd); break; case C_IF: - Success = ExecuteIf(Cmd); + Ret = ExecuteIf(Cmd); break; case C_FOR: - Success = ExecuteFor(Cmd); + Ret = ExecuteFor(Cmd); break; } UndoRedirection(Cmd->Redirections, NULL); - return Success; + return Ret; } BOOL @@ -1402,7 +1405,7 @@ return SubstituteVars(ip, commandline, _T('%')); } -static INT +static VOID ProcessInput() { PARSED_COMMAND *Cmd; @@ -1416,8 +1419,6 @@ ExecuteCommand(Cmd); FreeCommand(Cmd); } - - return nErrorLevel; } @@ -1614,6 +1615,7 @@ TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; TCHAR lpBuffer[2]; + INT nExitCode; //INT len; TCHAR *ptr, *cmdLine, option = 0; @@ -1760,9 +1762,12 @@ { /* Do the /C or /K command */ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); - ParseCommandLine(commandline); + nExitCode = ParseCommandLine(commandline); if (option != _T('K')) + { + nErrorLevel = nExitCode; bExit = TRUE; + } } } @@ -1806,7 +1811,6 @@ HANDLE hConsole; TCHAR startPath[MAX_PATH]; CONSOLE_SCREEN_BUFFER_INFO Info; - INT nExitCode; lpOriginalEnvironment = DuplicateEnvironment(); @@ -1839,15 +1843,15 @@ Initialize(); /* call prompt routine */ - nExitCode = ProcessInput(); + ProcessInput(); /* do the cleanup */ Cleanup(); cmd_free(lpOriginalEnvironment); - cmd_exit(nExitCode); - return(nExitCode); + cmd_exit(nErrorLevel); + return(nErrorLevel); } /* EOF */ Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -102,16 +102,16 @@ /* Prototypes for CMD.C */ INT ConvertULargeInteger(ULONGLONG num, LPTSTR des, INT len, BOOL bPutSeperator); HANDLE RunFile(DWORD, LPTSTR, LPTSTR, LPTSTR, INT); -VOID ParseCommandLine (LPTSTR); +INT ParseCommandLine(LPTSTR); struct _PARSED_COMMAND; -BOOL ExecuteCommand(struct _PARSED_COMMAND *Cmd); +INT ExecuteCommand(struct _PARSED_COMMAND *Cmd); LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); BOOL SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim); BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); LPTSTR DoDelayedExpansion(LPTSTR Line); -BOOL DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); +INT DoCommand(LPTSTR first, LPTSTR rest, struct _PARSED_COMMAND *Cmd); BOOL ReadLine(TCHAR *commandline, BOOL bMore); int cmd_main (int argc, const TCHAR *argv[]); @@ -254,7 +254,7 @@ #define FOR_LOOP 4 /* /L */ #define FOR_RECURSIVE 8 /* /R */ INT cmd_for (LPTSTR); -BOOL ExecuteFor(struct _PARSED_COMMAND *Cmd); +INT ExecuteFor(struct _PARSED_COMMAND *Cmd); /* Prototypes for FREE.C */ @@ -283,7 +283,7 @@ enum { IF_CMDEXTVERSION, IF_DEFINED, IF_ERRORLEVEL, IF_EXIST, IF_STRINGEQ, /* == */ IF_EQU, IF_GTR, IF_GEQ, IF_LSS, IF_LEQ, IF_NEQ }; -BOOL ExecuteIf(struct _PARSED_COMMAND *Cmd); +INT ExecuteIf(struct _PARSED_COMMAND *Cmd); /* Prototypes for INTERNAL.C */ Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=4… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -69,7 +69,7 @@ } /* Execute a single instance of a FOR command */ -static void RunInstance(PARSED_COMMAND *Cmd) +static INT RunInstance(PARSED_COMMAND *Cmd) { if (bEcho && !bDisableBatchEcho && Cmd->Subcommands->Type != C_QUIET) { @@ -80,7 +80,7 @@ ConOutChar(_T('\n')); } /* Just run the command (variable expansion is done in DoDelayedExpansion) */ - ExecuteCommand(Cmd->Subcommands); + return ExecuteCommand(Cmd->Subcommands); } /* Check if this FOR should be terminated early */ @@ -117,7 +117,7 @@ return Contents; } -static BOOL ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +static INT ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { LPTSTR Delims = _T(" \t"); TCHAR Eol = _T(';'); @@ -129,6 +129,7 @@ LPTSTR Variables[32]; TCHAR *Start, *End; INT i; + INT Ret = 0; if (Cmd->For.Params) { @@ -228,7 +229,7 @@ { error: error_syntax(Param); - return FALSE; + return 1; } } } @@ -270,7 +271,7 @@ if (!InputFile) { error_bad_command(Start + 1); - return FALSE; + return 1; } FullInput = ReadFileContents(InputFile, Buffer); _pclose(InputFile); @@ -286,7 +287,7 @@ if (!InputFile) { error_sfile_not_found(Start); - return FALSE; + return 1; } FullInput = ReadFileContents(InputFile, Buffer); fclose(InputFile); @@ -295,7 +296,7 @@ if (!FullInput) { error_out_of_memory(); - return FALSE; + return 1; } /* Loop over the input line by line */ @@ -337,20 +338,21 @@ /* Don't run unless the line had enough tokens to fill at least one variable */ if (*Variables[0]) - RunInstance(Cmd); + Ret = RunInstance(Cmd); } while (!Exiting(Cmd) && (In = NextLine) != NULL); cmd_free(FullInput); } - return TRUE; + return Ret; } /* FOR /L: Do a numeric loop */ -static void ForLoop(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +static INT ForLoop(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) { enum { START, STEP, END }; INT params[3] = { 0, 0, 0 }; INT i; + INT Ret = 0; TCHAR *Start, *End = List; for (i = 0; i < 3 && GetNextElement(&Start, &End); i++) @@ -361,17 +363,19 @@ (params[STEP] >= 0 ? (i <= params[END]) : (i >= params[END]))) { _itot(i, Buffer, 10); - RunInstance(Cmd); + Ret = RunInstance(Cmd); i += params[STEP]; } + return Ret; } /* Process a FOR in one directory. Stored in Buffer (up to BufPos) is a * string which is prefixed to each element of the list. In a normal FOR * it will be empty, but in FOR /R it will be the directory name. */ -static void ForDir(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +static INT ForDir(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) { TCHAR *Start, *End = List; + INT Ret = 0; while (!Exiting(Cmd) && GetNextElement(&Start, &End)) { if (BufPos + (End - Start) > &Buffer[CMDLINE_LENGTH]) @@ -402,22 +406,24 @@ _tcscmp(w32fd.cFileName, _T("..")) == 0) continue; _tcscpy(FilePart, w32fd.cFileName); - RunInstance(Cmd); + Ret = RunInstance(Cmd); } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); FindClose(hFind); } else { - RunInstance(Cmd); - } - } + Ret = RunInstance(Cmd); + } + } + return Ret; } /* FOR /R: Process a FOR in each directory of a tree, recursively. */ -static void ForRecursive(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +static INT ForRecursive(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) { HANDLE hFind; WIN32_FIND_DATA w32fd; + INT Ret = 0; if (BufPos[-1] != _T('\\')) { @@ -425,12 +431,12 @@ *BufPos = _T('\0'); } - ForDir(Cmd, List, Buffer, BufPos); + Ret = ForDir(Cmd, List, Buffer, BufPos); _tcscpy(BufPos, _T("*")); hFind = FindFirstFile(Buffer, &w32fd); if (hFind == INVALID_HANDLE_VALUE) - return; + return Ret; do { if (!(w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) @@ -438,9 +444,10 @@ if (_tcscmp(w32fd.cFileName, _T(".")) == 0 || _tcscmp(w32fd.cFileName, _T("..")) == 0) continue; - ForRecursive(Cmd, List, Buffer, _stpcpy(BufPos, w32fd.cFileName)); + Ret = ForRecursive(Cmd, List, Buffer, _stpcpy(BufPos, w32fd.cFileName)); } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); FindClose(hFind); + return Ret; } BOOL @@ -449,18 +456,18 @@ TCHAR Buffer[CMDLINE_LENGTH]; /* Buffer to hold the variable value */ LPTSTR BufferPtr = Buffer; LPFOR_CONTEXT lpNew; - BOOL Success = TRUE; + INT Ret; LPTSTR List = DoDelayedExpansion(Cmd->For.List); if (!List) - return FALSE; + return 1; /* Create our FOR context */ lpNew = cmd_alloc(sizeof(FOR_CONTEXT)); if (!lpNew) { cmd_free(List); - return FALSE; + return 1; } lpNew->prev = fc; lpNew->firstvar = Cmd->For.Variable; @@ -472,21 +479,21 @@ if (Cmd->For.Switches & FOR_F) { - Success = ForF(Cmd, List, Buffer); + Ret = ForF(Cmd, List, Buffer); } else if (Cmd->For.Switches & FOR_LOOP) { - ForLoop(Cmd, List, Buffer); + Ret = ForLoop(Cmd, List, Buffer); } else if (Cmd->For.Switches & FOR_RECURSIVE) { DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."), MAX_PATH, Buffer, NULL); - ForRecursive(Cmd, List, Buffer, &Buffer[Len]); + Ret = ForRecursive(Cmd, List, Buffer, &Buffer[Len]); } else { - ForDir(Cmd, List, Buffer, Buffer); + Ret = ForDir(Cmd, List, Buffer, Buffer); } /* Remove our context, unless someone already did that */ @@ -495,7 +502,7 @@ cmd_free(lpNew); cmd_free(List); - return Success; + return Ret; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=40… ============================================================================== --- trunk/reactos/base/shell/cmd/if.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/if.c [iso-8859-1] Mon Apr 13 03:51:15 2009 @@ -63,7 +63,7 @@ return 1; } -BOOL ExecuteIf(PARSED_COMMAND *Cmd) +INT ExecuteIf(PARSED_COMMAND *Cmd) { INT result = FALSE; /* when set cause 'then' clause to be executed */ LPTSTR param; @@ -73,13 +73,13 @@ { Left = DoDelayedExpansion(Cmd->If.LeftArg); if (!Left) - return FALSE; + return 1; } Right = DoDelayedExpansion(Cmd->If.RightArg); if (!Right) { cmd_free(Left); - return FALSE; + return 1; } if (Cmd->If.Operator == IF_CMDEXTVERSION) @@ -91,7 +91,7 @@ { error_syntax(Right); cmd_free(Right); - return FALSE; + return 1; } result = (2 >= n); } @@ -108,7 +108,7 @@ { error_syntax(Right); cmd_free(Right); - return FALSE; + return 1; } result = (nErrorLevel >= n); } @@ -166,7 +166,7 @@ /* full condition was false, do the "else" command if there is one */ if (Cmd->Subcommands->Next) return ExecuteCommand(Cmd->Subcommands->Next); - return TRUE; + return 0; } }

1 0

[gschneider] 40473: - Add parameter validity check to GetTextFaceA (same as in GetTextFaceW)
by gschneider＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: gschneider Date: Sun Apr 12 22:44:00 2009 New Revision: 40473 URL: http://svn.reactos.org/svn/reactos?rev=40473&view=rev Log: - Add parameter validity check to GetTextFaceA (same as in 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] Sun Apr 12 22:44:00 2009 @@ -383,8 +383,19 @@ WINAPI GetTextFaceA( HDC hdc, INT count, LPSTR name ) { - INT res = GetTextFaceW(hdc, 0, NULL); - LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); + INT res; + LPWSTR nameW; + + /* Validate parameters */ + if (name && count <= 0) + { + /* Set last error and return failure */ + GdiSetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + res = GetTextFaceW(hdc, 0, NULL); + nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 ); GetTextFaceW( hdc, res, nameW ); if (name)

1 0

[fireball] 40472: - FOSDEM 2009 is over.
by fireball＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: fireball Date: Sun Apr 12 16:09:22 2009 New Revision: 40472 URL: http://svn.reactos.org/svn/reactos?rev=40472&view=rev Log: - FOSDEM 2009 is over. Removed: branches/ros-branch-0_3_8-fosdem/

1 0

[cgutman] 40471: - Don't close the connection handle and dereference the connection object when we run out of memory because it will cause a crash when AfdCleanupSocket tries to do the same - Fixes bug 4362
by cgutman＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: cgutman Date: Sun Apr 12 09:07:15 2009 New Revision: 40471 URL: http://svn.reactos.org/svn/reactos?rev=40471&view=rev Log: - Don't close the connection handle and dereference the connection object when we run out of memory because it will cause a crash when AfdCleanupSocket tries to do the same - Fixes bug 4362 Modified: trunk/reactos/drivers/network/afd/afd/listen.c Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sun Apr 12 09:07:15 2009 @@ -143,9 +143,6 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { - /* Is this correct? */ - TdiCloseDevice( FCB->Connection.Handle, - FCB->Connection.Object ); Status = STATUS_NO_MEMORY; } else { UINT AddressType =

1 0

[jmorlan] 40470: - RtlSetEnvironmentVariable: Removing a variable that didn't exist in the first place should still returns STATUS_SUCCESS. - Removing a variable can be done by using a pointer to a UNICODE_STRING with a NULL Buffer as the value, as well as just passing NULL as the value.
by jmorlan＠svn.reactos.org 12 Apr '09

12 Apr '09

Author: jmorlan Date: Sun Apr 12 08:41:33 2009 New Revision: 40470 URL: http://svn.reactos.org/svn/reactos?rev=40470&view=rev Log: - RtlSetEnvironmentVariable: Removing a variable that didn't exist in the first place should still returns STATUS_SUCCESS. - Removing a variable can be done by using a pointer to a UNICODE_STRING with a NULL Buffer as the value, as well as just passing NULL as the value. Modified: trunk/reactos/dll/win32/kernel32/misc/env.c trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/dll/win32/kernel32/misc/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/en… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/env.c [iso-8859-1] Sun Apr 12 08:41:33 2009 @@ -244,21 +244,12 @@ RtlInitUnicodeString (&VarName, lpName); - if (lpValue) - { - RtlInitUnicodeString (&VarValue, - lpValue); - - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - &VarValue); - } - else - { - Status = RtlSetEnvironmentVariable (NULL, - &VarName, - NULL); - } + RtlInitUnicodeString (&VarValue, + lpValue); + + Status = RtlSetEnvironmentVariable (NULL, + &VarName, + &VarValue); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/lib/rtl/env.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/env.c?rev=40470&r1… ============================================================================== --- trunk/reactos/lib/rtl/env.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/env.c [iso-8859-1] Sun Apr 12 08:41:33 2009 @@ -354,7 +354,7 @@ } found: - if (Value != NULL) + if (Value != NULL && Value->Buffer != NULL) { hole_len = tail - hole; /* calculate new environment size */ @@ -472,10 +472,6 @@ memmove(head, tail, (env_end - tail) * sizeof(WCHAR)); - } - else - { - Status = STATUS_VARIABLE_NOT_FOUND; } }

1 0

[gschneider] 40469: - Don't copy data to null buffer, just return the string length in this case - Fix some buffer calculation problems, handle buffer termination if it's shorter than the font string - Fixes >= 10 gdi32 font winetests (NtGdiGetTextFaceW/NtGdiGetTextFaceA related)
by gschneider＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: gschneider Date: Sun Apr 12 01:24:25 2009 New Revision: 40469 URL: http://svn.reactos.org/svn/reactos?rev=40469&view=rev Log: - Don't copy data to null buffer, just return the string length in this case - Fix some buffer calculation problems, handle buffer termination if it's shorter than the font string - Fixes >= 10 gdi32 font winetests (NtGdiGetTextFaceW/NtGdiGetTextFaceA related) Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/text.c [iso-8859-1] Sun Apr 12 01:24:25 2009 @@ -326,6 +326,7 @@ HFONT hFont; PTEXTOBJ TextObj; NTSTATUS Status; + INT fLen, ret; /* FIXME: Handle bAliasName */ @@ -341,16 +342,32 @@ TextObj = RealizeFontInit(hFont); ASSERT(TextObj != NULL); - Count = min(Count, wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName)); - Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + fLen = wcslen(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName) + 1; + + if (FaceName != NULL) + { + Count = min(Count, fLen); + Status = MmCopyToCaller(FaceName, TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfFaceName, Count * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + TEXTOBJ_UnlockText(TextObj); + SetLastNtError(Status); + return 0; + } + /* Terminate if we copied only part of the font name */ + if (Count > 0 && Count < fLen) + { + FaceName[Count - 1] = '\0'; + } + ret = Count; + } + else + { + ret = fLen; + } + TEXTOBJ_UnlockText(TextObj); - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - return 0; - } - - return Count; + return ret; } W32KAPI

1 0

[tkreuzer] 40468: remove doenloader from rosapps build
by tkreuzer＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: tkreuzer Date: Sun Apr 12 00:29:31 2009 New Revision: 40468 URL: http://svn.reactos.org/svn/reactos?rev=40468&view=rev Log: remove doenloader from rosapps build Modified: trunk/rosapps/applications/applications.rbuild Modified: trunk/rosapps/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.… ============================================================================== --- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Sun Apr 12 00:29:31 2009 @@ -11,10 +11,6 @@ <directory name="devutils"> <xi:include href="devutils/directory.rbuild" /> - </directory> - - <directory name="downloader"> - <xi:include href="downloader/downloader.rbuild" /> </directory> <!--

1 0

[fireball] 40467: - Delete cis, expat-rbuild, old_reactx, winldr and xen branches.
by fireball＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: fireball Date: Sun Apr 12 00:18:48 2009 New Revision: 40467 URL: http://svn.reactos.org/svn/reactos?rev=40467&view=rev Log: - Delete cis, expat-rbuild, old_reactx, winldr and xen branches. Removed: branches/cis/ branches/expat-rbuild/ branches/old_reactx/ branches/winldr/ branches/xen/

1 0

[sginsberg] 40466: - Reapply the gdi32 bitmap font test ROS-HACK -- the tests still fail on the build server
by sginsberg＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: sginsberg Date: Sun Apr 12 00:15:26 2009 New Revision: 40466 URL: http://svn.reactos.org/svn/reactos?rev=40466&view=rev Log: - Reapply the gdi32 bitmap font test ROS-HACK -- the tests still fail on the build server Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Sun Apr 12 00:15:26 2009 @@ -284,6 +284,9 @@ TEXTMETRICA tm_orig; SIZE size_orig; INT ret, i, width_orig, height_orig, scale, lfWidth; + + skip("ROS-HACK: Skipping bitmap font tests!\n"); + return; hdc = GetDC(0);

1 0

[tkreuzer] 40465: [FORMATTING] Fix indentation, no code change
by tkreuzer＠svn.reactos.org 11 Apr '09

11 Apr '09

Author: tkreuzer Date: Sat Apr 11 23:04:06 2009 New Revision: 40465 URL: http://svn.reactos.org/svn/reactos?rev=40465&view=rev Log: [FORMATTING] Fix indentation, no code change Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/dib/dib32bpp.c [iso-8859-1] Sat Apr 11 23:04:06 2009 @@ -26,19 +26,19 @@ VOID DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c) { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - - *addr = c; + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + + *addr = c; } ULONG DIB_32BPP_GetPixel(SURFOBJ *SurfObj, LONG x, LONG y) { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - - return (ULONG)(*addr); + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + + return (ULONG)(*addr); } @@ -47,234 +47,250 @@ { - PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y1 * SurfObj->lDelta; - PDWORD addr = (PDWORD)byteaddr + x; - LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD) - - byteaddr = (PBYTE)addr; - while(y1++ < y2) - { - *addr = (DWORD)c; - addr += lDelta; - } + PBYTE byteaddr = (PBYTE)SurfObj->pvScan0 + y1 * SurfObj->lDelta; + PDWORD addr = (PDWORD)byteaddr + x; + LONG lDelta = SurfObj->lDelta >> 2; // >> 2 == / sizeof(DWORD) + + byteaddr = (PBYTE)addr; + while (y1++ < y2) + { + *addr = (DWORD)c; + addr += lDelta; + } } BOOLEAN DIB_32BPP_BitBltSrcCopy(PBLTINFO BltInfo) { - LONG i, j, sx, sy, xColor, f1; - PBYTE SourceBits, DestBits, SourceLine, DestLine; - PBYTE SourceBits_4BPP, SourceLine_4BPP; - PDWORD Source32, Dest32; - - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - - switch(BltInfo->SourceSurface->iBitmapFormat) - { - case BMF_1BPP: - - sx = BltInfo->SourcePoint.x; - sy = BltInfo->SourcePoint.y; - - for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) - { - sx = BltInfo->SourcePoint.x; - for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) - { - if(DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) - { - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); - } else { - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); - } - sx++; - } - sy++; - } - break; - - case BMF_4BPP: - SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + (BltInfo->SourcePoint.x >> 1); - - for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) - { - SourceLine_4BPP = SourceBits_4BPP; - sx = BltInfo->SourcePoint.x; - f1 = sx & 1; - - for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) - { - xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, - (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1))); - DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor); - if(f1 == 1) { SourceLine_4BPP++; f1 = 0; } else { f1 = 1; } - sx++; - } - - SourceBits_4BPP += BltInfo->SourceSurface->lDelta; - } - break; - - case BMF_8BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = *SourceBits; - *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 1; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_16BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = *((PWORD) SourceBits); - *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 2; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_24BPP: - SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 3 * BltInfo->SourcePoint.x; - DestLine = DestBits; - - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - SourceBits = SourceLine; - DestBits = DestLine; - - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - xColor = (*(SourceBits + 2) << 0x10) + - (*(SourceBits + 1) << 0x08) + - (*(SourceBits)); - *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); - SourceBits += 3; - DestBits += 4; - } - - SourceLine += BltInfo->SourceSurface->lDelta; - DestLine += BltInfo->DestSurface->lDelta; - } - break; - - case BMF_32BPP: - if (NULL == BltInfo->XlateSourceToDest || 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL)) - { - if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); - SourceBits += BltInfo->SourceSurface->lDelta; - DestBits += BltInfo->DestSurface->lDelta; - } - } - else - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) - { - RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); - SourceBits -= BltInfo->SourceSurface->lDelta; - DestBits -= BltInfo->DestSurface->lDelta; - } - } - } - else - { - if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) - { - SourceBits = ((PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x); - for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) - { - if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) - { - Dest32 = (DWORD *) DestBits; - Source32 = (DWORD *) SourceBits; - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); - } - } + LONG i, j, sx, sy, xColor, f1; + PBYTE SourceBits, DestBits, SourceLine, DestLine; + PBYTE SourceBits_4BPP, SourceLine_4BPP; + PDWORD Source32, Dest32; + + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + + (BltInfo->DestRect.top * BltInfo->DestSurface->lDelta) + + 4 * BltInfo->DestRect.left; + + switch (BltInfo->SourceSurface->iBitmapFormat) + { + case BMF_1BPP: + + sx = BltInfo->SourcePoint.x; + sy = BltInfo->SourcePoint.y; + + for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) + { + sx = BltInfo->SourcePoint.x; + for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) + { + if (DIB_1BPP_GetPixel(BltInfo->SourceSurface, sx, sy) == 0) + { + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 0)); + } else { + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, 1)); + } + sx++; + } + sy++; + } + break; + + case BMF_4BPP: + SourceBits_4BPP = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + + (BltInfo->SourcePoint.x >> 1); + + for (j=BltInfo->DestRect.top; j<BltInfo->DestRect.bottom; j++) + { + SourceLine_4BPP = SourceBits_4BPP; + sx = BltInfo->SourcePoint.x; + f1 = sx & 1; + + for (i=BltInfo->DestRect.left; i<BltInfo->DestRect.right; i++) + { + xColor = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, + (*SourceLine_4BPP & altnotmask[f1]) >> (4 * (1 - f1))); + DIB_32BPP_PutPixel(BltInfo->DestSurface, i, j, xColor); + if (f1 == 1) { + SourceLine_4BPP++; + f1 = 0; + } else { + f1 = 1; + } + sx++; + } + + SourceBits_4BPP += BltInfo->SourceSurface->lDelta; + } + break; + + case BMF_8BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = *SourceBits; + *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 1; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_16BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 2 * BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = *((PWORD) SourceBits); + *((PDWORD) DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 2; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_24BPP: + SourceLine = (PBYTE)BltInfo->SourceSurface->pvScan0 + + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + + 3 * BltInfo->SourcePoint.x; + DestLine = DestBits; + + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + SourceBits = SourceLine; + DestBits = DestLine; + + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + xColor = (*(SourceBits + 2) << 0x10) + + (*(SourceBits + 1) << 0x08) + + (*(SourceBits)); + *((PDWORD)DestBits) = (DWORD)XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, xColor); + SourceBits += 3; + DestBits += 4; + } + + SourceLine += BltInfo->SourceSurface->lDelta; + DestLine += BltInfo->DestSurface->lDelta; + } + break; + + case BMF_32BPP: + if (NULL == BltInfo->XlateSourceToDest || + 0 != (BltInfo->XlateSourceToDest->flXlate & XO_TRIVIAL)) + { + if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); + SourceBits += BltInfo->SourceSurface->lDelta; + DestBits += BltInfo->DestSurface->lDelta; + } + } else - { - Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) - { - *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); - } - } - SourceBits += BltInfo->SourceSurface->lDelta; - DestBits += BltInfo->DestSurface->lDelta; - } - } - else - { - SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; - DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; - for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) - { - if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) - { - Dest32 = (DWORD *) DestBits; - Source32 = (DWORD *) SourceBits; - for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) - { - *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); - } - } + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + + ((BltInfo->SourcePoint.y + + BltInfo->DestRect.bottom + - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + + 4 * BltInfo->SourcePoint.x; + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; + for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) + { + RtlMoveMemory(DestBits, SourceBits, 4 * (BltInfo->DestRect.right - BltInfo->DestRect.left)); + SourceBits -= BltInfo->SourceSurface->lDelta; + DestBits -= BltInfo->DestSurface->lDelta; + } + } + } + else + { + if (BltInfo->DestRect.top < BltInfo->SourcePoint.y) + { + SourceBits = ((PBYTE)BltInfo->SourceSurface->pvScan0 + (BltInfo->SourcePoint.y * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x); + for (j = BltInfo->DestRect.top; j < BltInfo->DestRect.bottom; j++) + { + if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) + { + Dest32 = (DWORD *) DestBits; + Source32 = (DWORD *) SourceBits; + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); + } + } + else + { + Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) + { + *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); + } + } + SourceBits += BltInfo->SourceSurface->lDelta; + DestBits += BltInfo->DestSurface->lDelta; + } + } else - { - Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); - for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) - { - *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); - } - } - SourceBits -= BltInfo->SourceSurface->lDelta; - DestBits -= BltInfo->DestSurface->lDelta; - } - } - } - break; - - default: - DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat)); - return FALSE; - } - - return TRUE; + { + SourceBits = (PBYTE)BltInfo->SourceSurface->pvScan0 + ((BltInfo->SourcePoint.y + BltInfo->DestRect.bottom - BltInfo->DestRect.top - 1) * BltInfo->SourceSurface->lDelta) + 4 * BltInfo->SourcePoint.x; + DestBits = (PBYTE)BltInfo->DestSurface->pvScan0 + ((BltInfo->DestRect.bottom - 1) * BltInfo->DestSurface->lDelta) + 4 * BltInfo->DestRect.left; + for (j = BltInfo->DestRect.bottom - 1; BltInfo->DestRect.top <= j; j--) + { + if (BltInfo->DestRect.left < BltInfo->SourcePoint.x) + { + Dest32 = (DWORD *) DestBits; + Source32 = (DWORD *) SourceBits; + for (i = BltInfo->DestRect.left; i < BltInfo->DestRect.right; i++) + { + *Dest32++ = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32++); + } + } + else + { + Dest32 = (DWORD *) DestBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + Source32 = (DWORD *) SourceBits + (BltInfo->DestRect.right - BltInfo->DestRect.left - 1); + for (i = BltInfo->DestRect.right - 1; BltInfo->DestRect.left <= i; i--) + { + *Dest32-- = XLATEOBJ_iXlate(BltInfo->XlateSourceToDest, *Source32--); + } + } + SourceBits -= BltInfo->SourceSurface->lDelta; + DestBits -= BltInfo->DestSurface->lDelta; + } + } + } + break; + + default: + DPRINT1("DIB_32BPP_Bitblt: Unhandled Source BPP: %u\n", BitsPerFormat(BltInfo->SourceSurface->iBitmapFormat)); + return FALSE; + } + + return TRUE; } BOOLEAN @@ -282,61 +298,61 @@ RECTL* DestRect, RECTL *SourceRect, XLATEOBJ *ColorTranslation, ULONG iTransColor) { - ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; - ULONG *DestBits; - - LONG DstHeight; - LONG DstWidth; - LONG SrcHeight; - LONG SrcWidth; - - DstHeight = DestRect->bottom - DestRect->top; - DstWidth = DestRect->right - DestRect->left; - SrcHeight = SourceRect->bottom - SourceRect->top; - SrcWidth = SourceRect->right - SourceRect->left; - - DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + - (DestRect->left << 2) + - DestRect->top * DestSurf->lDelta); - wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); - - for(Y = DestRect->top; Y < DestRect->bottom; Y++) - { - SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; - for(X = DestRect->left; X < DestRect->right; X++, DestBits++) - { - SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; - if (SourceX >= 0 && SourceY >= 0 && - SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) - { - Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); - if(Source != iTransColor) + ULONG X, Y, SourceX, SourceY = 0, Source = 0, wd; + ULONG *DestBits; + + LONG DstHeight; + LONG DstWidth; + LONG SrcHeight; + LONG SrcWidth; + + DstHeight = DestRect->bottom - DestRect->top; + DstWidth = DestRect->right - DestRect->left; + SrcHeight = SourceRect->bottom - SourceRect->top; + SrcWidth = SourceRect->right - SourceRect->left; + + DestBits = (ULONG*)((PBYTE)DestSurf->pvScan0 + + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + wd = DestSurf->lDelta - ((DestRect->right - DestRect->left) << 2); + + for (Y = DestRect->top; Y < DestRect->bottom; Y++) + { + SourceY = SourceRect->top+(Y - DestRect->top) * SrcHeight / DstHeight; + for (X = DestRect->left; X < DestRect->right; X++, DestBits++) { - *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + SourceX = SourceRect->left+(X - DestRect->left) * SrcWidth / DstWidth; + if (SourceX >= 0 && SourceY >= 0 && + SourceSurf->sizlBitmap.cx > SourceX && SourceSurf->sizlBitmap.cy > SourceY) + { + Source = DIB_GetSourceIndex(SourceSurf, SourceX, SourceY); + if (Source != iTransColor) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, Source); + } + } } - } - } - - DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); - } - - return TRUE; + + DestBits = (ULONG*)((ULONG_PTR)DestBits + wd); + } + + return TRUE; } typedef union { - ULONG ul; - struct { - UCHAR red; - UCHAR green; - UCHAR blue; - UCHAR alpha; - } col; + ULONG ul; + struct { + UCHAR red; + UCHAR green; + UCHAR blue; + UCHAR alpha; + } col; } NICEPIXEL32; static __inline UCHAR Clamp8(ULONG val) { - return (val > 255) ? 255 : val; + return (val > 255) ? 255 : val; } BOOLEAN @@ -344,77 +360,77 @@ RECTL* SourceRect, CLIPOBJ* ClipRegion, XLATEOBJ* ColorTranslation, BLENDOBJ* BlendObj) { - INT Rows, Cols, SrcX, SrcY; - register PULONG Dst; - ULONG DstDelta; - BLENDFUNCTION BlendFunc; - register NICEPIXEL32 DstPixel, SrcPixel; - UCHAR Alpha, SrcBpp; - - DPRINT("DIB_32BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", - SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, - DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); - - ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && - DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); - - BlendFunc = BlendObj->BlendFunction; - if (BlendFunc.BlendOp != AC_SRC_OVER) - { - DPRINT1("BlendOp != AC_SRC_OVER\n"); - return FALSE; - } - if (BlendFunc.BlendFlags != 0) - { - DPRINT1("BlendFlags != 0\n"); - return FALSE; - } - if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) - { - DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); - return FALSE; - } - if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && - BitsPerFormat(Source->iBitmapFormat) != 32) - { - DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); - return FALSE; - } - - Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + - (DestRect->left << 2)); - DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); - SrcBpp = BitsPerFormat(Source->iBitmapFormat); - - Rows = DestRect->bottom - DestRect->top; - SrcY = SourceRect->top; - while (--Rows >= 0) - { - Cols = DestRect->right - DestRect->left; - SrcX = SourceRect->left; - while (--Cols >= 0) - { - SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); - SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; - SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; - - Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? - SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; - - DstPixel.ul = *Dst; - DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); - DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); - DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); - DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); - *Dst++ = DstPixel.ul; - } - Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); - SrcY++; - } - - return TRUE; + INT Rows, Cols, SrcX, SrcY; + register PULONG Dst; + ULONG DstDelta; + BLENDFUNCTION BlendFunc; + register NICEPIXEL32 DstPixel, SrcPixel; + UCHAR Alpha, SrcBpp; + + DPRINT("DIB_32BPP_AlphaBlend: srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", + SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, + DestRect->left, DestRect->top, DestRect->right, DestRect->bottom); + + ASSERT(DestRect->bottom - DestRect->top == SourceRect->bottom - SourceRect->top && + DestRect->right - DestRect->left == SourceRect->right - SourceRect->left); + + BlendFunc = BlendObj->BlendFunction; + if (BlendFunc.BlendOp != AC_SRC_OVER) + { + DPRINT1("BlendOp != AC_SRC_OVER\n"); + return FALSE; + } + if (BlendFunc.BlendFlags != 0) + { + DPRINT1("BlendFlags != 0\n"); + return FALSE; + } + if ((BlendFunc.AlphaFormat & ~AC_SRC_ALPHA) != 0) + { + DPRINT1("Unsupported AlphaFormat (0x%x)\n", BlendFunc.AlphaFormat); + return FALSE; + } + if ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0 && + BitsPerFormat(Source->iBitmapFormat) != 32) + { + DPRINT1("Source bitmap must be 32bpp when AC_SRC_ALPHA is set\n"); + return FALSE; + } + + Dst = (PULONG)((ULONG_PTR)Dest->pvScan0 + (DestRect->top * Dest->lDelta) + + (DestRect->left << 2)); + DstDelta = Dest->lDelta - ((DestRect->right - DestRect->left) << 2); + SrcBpp = BitsPerFormat(Source->iBitmapFormat); + + Rows = DestRect->bottom - DestRect->top; + SrcY = SourceRect->top; + while (--Rows >= 0) + { + Cols = DestRect->right - DestRect->left; + SrcX = SourceRect->left; + while (--Cols >= 0) + { + SrcPixel.ul = DIB_GetSource(Source, SrcX++, SrcY, ColorTranslation); + SrcPixel.col.red = SrcPixel.col.red * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.green = SrcPixel.col.green * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.blue = SrcPixel.col.blue * BlendFunc.SourceConstantAlpha / 255; + SrcPixel.col.alpha = (SrcBpp == 32) ? (SrcPixel.col.alpha * BlendFunc.SourceConstantAlpha / 255) : BlendFunc.SourceConstantAlpha; + + Alpha = ((BlendFunc.AlphaFormat & AC_SRC_ALPHA) != 0) ? + SrcPixel.col.alpha : BlendFunc.SourceConstantAlpha; + + DstPixel.ul = *Dst; + DstPixel.col.red = Clamp8(DstPixel.col.red * (255 - Alpha) / 255 + SrcPixel.col.red); + DstPixel.col.green = Clamp8(DstPixel.col.green * (255 - Alpha) / 255 + SrcPixel.col.green); + DstPixel.col.blue = Clamp8(DstPixel.col.blue * (255 - Alpha) / 255 + SrcPixel.col.blue); + DstPixel.col.alpha = Clamp8(DstPixel.col.alpha * (255 - Alpha) / 255 + SrcPixel.col.alpha); + *Dst++ = DstPixel.ul; + } + Dst = (PULONG)((ULONG_PTR)Dst + DstDelta); + SrcY++; + } + + return TRUE; } /* EOF */

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs