Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 39973: Instead of having DOSKEY print something when it successfully adds an alias, print an error message when it fails. Also implement some options that were missing.
by jmorlan＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: jmorlan Date: Thu Mar 12 07:37:01 2009 New Revision: 39973 URL: http://svn.reactos.org/svn/reactos?rev=39973&view=rev Log: Instead of having DOSKEY print something when it successfully adds an alias, print an error message when it fails. Also implement some options that were missing. Added: trunk/reactos/base/applications/cmdutils/doskey/doskey.h (with props) trunk/reactos/base/applications/cmdutils/doskey/lang/ trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild trunk/reactos/base/applications/cmdutils/doskey/doskey.rc Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Thu Mar 12 07:37:01 2009 @@ -1,71 +1,95 @@ #include <windows.h> #include <stdio.h> #include <tchar.h> - -static VOID -PrintAlias (VOID) -{ - LPTSTR Aliases; - LPTSTR ptr; - DWORD len; - - len = GetConsoleAliasesLength(_T("cmd.exe")); - if (len <= 0) - return; - - /* allocate memory for an extra \0 char to make parsing easier */ - ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); - if (!ptr) - return; - - Aliases = ptr; - - ZeroMemory(Aliases, len + sizeof(TCHAR)); - - if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) - { - while (*Aliases != '\0') - { - _tprintf(_T("%s\n"), Aliases); - Aliases = Aliases + lstrlen(Aliases); - Aliases++; - } - } - HeapFree(GetProcessHeap(), 0 , ptr); -} - -INT SetMacro (LPTSTR param) -{ - LPTSTR ptr, text; - - while (*param == _T(' ')) - param++; +#include "doskey.h" + +#define MAX_STRING 2000 +TCHAR szStringBuf[MAX_STRING]; +LPTSTR pszExeName = _T("cmd.exe"); + +static VOID SetInsert(DWORD dwFlag) +{ + DWORD dwMode; + HANDLE hConsole = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hConsole, &dwMode); + dwMode |= ENABLE_EXTENDED_FLAGS; + SetConsoleMode(hConsole, (dwMode & ~ENABLE_INSERT_MODE) | dwFlag); +} + +static VOID PrintHistory(VOID) +{ + DWORD Length = GetConsoleCommandHistoryLength(pszExeName); + /* On Windows, the ANSI version of GetConsoleCommandHistory requires + * a buffer twice as large as the actual history length. */ + BYTE HistBuf[Length * (sizeof(WCHAR) / sizeof(TCHAR))]; + TCHAR *Hist = (TCHAR *)HistBuf; + TCHAR *HistEnd = (TCHAR *)&HistBuf[Length]; + + if (GetConsoleCommandHistory(Hist, sizeof HistBuf, pszExeName)) + for (; Hist < HistEnd; Hist += _tcslen(Hist) + 1) + _tprintf(_T("%s\n"), Hist); +} + +static INT SetMacro(LPTSTR definition) +{ + TCHAR *name, *nameend, *text, temp; + + name = definition; + while (*name == _T(' ')) + name++; /* error if no '=' found */ - if ((ptr = _tcschr (param, _T('='))) == 0) - return 1; - - text = ptr + 1; - while (*text == _T(' ')) - text++; - - while (ptr > param && ptr[-1] == _T(' ')) - ptr--; - - /* Split rest into name and substitute */ - *ptr++ = _T('\0'); - - if (*param == _T('\0') || _tcschr(param, _T(' '))) - return 1; - - _tprintf(_T("%s, %s\n"), text, param); - - if (ptr[0] == _T('\0')) - AddConsoleAlias(param, NULL, _T("cmd.exe")); - else - AddConsoleAlias(param, text, _T("cmd.exe")); - - return 0; + if ((nameend = _tcschr(name, _T('='))) != NULL) + { + text = nameend + 1; + while (*text == _T(' ')) + text++; + + while (nameend > name && nameend[-1] == _T(' ')) + nameend--; + + /* Split rest into name and substitute */ + temp = *nameend; + *nameend = _T('\0'); + /* Don't allow spaces in the name, since such a macro would be unusable */ + if (!_tcschr(name, _T(' ')) && AddConsoleAlias(name, text, pszExeName)) + return 0; + *nameend = temp; + } + + LoadString(GetModuleHandle(NULL), IDS_INVALID_MACRO_DEF, szStringBuf, MAX_STRING); + _tprintf(szStringBuf, definition); + return 1; +} + +static VOID PrintMacros(LPTSTR pszExeName, LPTSTR Indent) +{ + DWORD Length = GetConsoleAliasesLength(pszExeName); + BYTE AliasBuf[Length]; + TCHAR *Alias = (TCHAR *)AliasBuf; + TCHAR *AliasEnd = (TCHAR *)&AliasBuf[Length]; + + if (GetConsoleAliases(Alias, sizeof AliasBuf, pszExeName)) + for (; Alias < AliasEnd; Alias += _tcslen(Alias) + 1) + _tprintf(_T("%s%s\n"), Indent, Alias); +} + +static VOID PrintAllMacros(VOID) +{ + DWORD Length = GetConsoleAliasExesLength(); + BYTE ExeNameBuf[Length]; + TCHAR *ExeName = (TCHAR *)ExeNameBuf; + TCHAR *ExeNameEnd = (TCHAR *)&ExeNameBuf[Length]; + + if (GetConsoleAliasExes(ExeName, sizeof ExeNameBuf)) + { + for (; ExeName < ExeNameEnd; ExeName += _tcslen(ExeName) + 1) + { + _tprintf(_T("[%s]\n"), ExeName); + PrintMacros(ExeName, _T(" ")); + _tprintf(_T("\n")); + } + } } static VOID ReadFromFile(LPTSTR param) @@ -73,10 +97,16 @@ FILE* fp; TCHAR line[MAX_PATH]; - /* Skip the "/macrofile=" prefix */ - param += 11; - fp = _tfopen(param, _T("r")); + if (!fp) + { +#ifdef UNICODE + _wperror(param); +#else + perror(param); +#endif + return; + } while ( _fgetts(line, MAX_PATH, fp) != NULL) { @@ -85,53 +115,122 @@ if (*end == _T('\n')) *end = _T('\0'); - SetMacro(line); + if (*line) + SetMacro(line); } fclose(fp); return; } +/* Get the start and end of the next command-line argument. */ +static BOOL GetArg(TCHAR **pStart, TCHAR **pEnd) +{ + BOOL bInQuotes = FALSE; + TCHAR *p = *pEnd; + p += _tcsspn(p, _T(" \t")); + if (!*p) + return FALSE; + *pStart = p; + do + { + if (!bInQuotes && (*p == _T(' ') || *p == _T('\t'))) + break; + bInQuotes ^= (*p++ == _T('"')); + } while (*p); + *pEnd = p; + return TRUE; +} + +/* Remove starting and ending quotes from a string, if present */ +static LPTSTR RemoveQuotes(LPTSTR str) +{ + TCHAR *end; + if (*str == _T('"') && *(end = str + _tcslen(str) - 1) == _T('"')) + { + str++; + *end = _T('\0'); + } + return str; +} + int -_tmain (int argc, LPTSTR argv[]) -{ - if (argc < 2) - return 0; - - if (argv[1][0] == '/') - { - if (_tcsnicmp(argv[1], _T("/macrofile"), 10) == 0) - ReadFromFile(argv[1]); - if (_tcscmp(argv[1], _T("/macros")) == 0) - PrintAlias(); - } - else - { - /* Get the full command line using GetCommandLine(). - We can't just pass argv[1] here, because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ - TCHAR* szCommandLine = GetCommandLine(); - - /* Skip the application name */ - if(*szCommandLine == '\"') - { - do - { - szCommandLine++; - } - while(*szCommandLine != '\"'); - szCommandLine++; +_tmain(VOID) +{ + /* Get the full command line using GetCommandLine(). We can't just use argv, + * because then a parameter like "gotoroot=cd \" wouldn't be passed completely. */ + TCHAR *pArgStart; + TCHAR *pArgEnd = GetCommandLine(); + + /* Skip the application name */ + GetArg(&pArgStart, &pArgEnd); + + while (GetArg(&pArgStart, &pArgEnd)) + { + /* NUL-terminate this argument to make processing easier */ + TCHAR tmp = *pArgEnd; + *pArgEnd = _T('\0'); + + if (!_tcscmp(pArgStart, _T("/?"))) + { + LoadString(GetModuleHandle(NULL), IDS_HELP, szStringBuf, MAX_STRING); + _tprintf(szStringBuf); + break; + } + else if (!_tcsnicmp(pArgStart, _T("/EXENAME="), 9)) + { + pszExeName = RemoveQuotes(pArgStart + 9); + } + else if (!_tcsicmp(pArgStart, _T("/H")) || + !_tcsicmp(pArgStart, _T("/HISTORY"))) + { + PrintHistory(); + } + else if (!_tcsnicmp(pArgStart, _T("/LISTSIZE="), 10)) + { + SetConsoleNumberOfCommands(_ttoi(pArgStart + 10), pszExeName); + } + else if (!_tcsicmp(pArgStart, _T("/REINSTALL"))) + { + ExpungeConsoleCommandHistory(pszExeName); + } + else if (!_tcsicmp(pArgStart, _T("/INSERT"))) + { + SetInsert(ENABLE_INSERT_MODE); + } + else if (!_tcsicmp(pArgStart, _T("/OVERSTRIKE"))) + { + SetInsert(0); + } + else if (!_tcsicmp(pArgStart, _T("/M")) || + !_tcsicmp(pArgStart, _T("/MACROS"))) + { + PrintMacros(pszExeName, _T("")); + } + else if (!_tcsnicmp(pArgStart, _T("/M:"), 3) || + !_tcsnicmp(pArgStart, _T("/MACROS:"), 8)) + { + LPTSTR exe = RemoveQuotes(_tcschr(pArgStart, _T(':')) + 1); + if (!_tcsicmp(exe, _T("ALL"))) + PrintAllMacros(); + else + PrintMacros(exe, _T("")); + } + else if (!_tcsnicmp(pArgStart, _T("/MACROFILE="), 11)) + { + ReadFromFile(RemoveQuotes(pArgStart + 11)); } else { - do - { - szCommandLine++; - } - while(*szCommandLine != ' '); - } - - /* Skip the leading whitespace and pass the command line to SetMacro */ - SetMacro(szCommandLine + _tcsspn(szCommandLine, _T(" \t"))); + /* This is the beginning of a macro definition. It includes + * the entire remainder of the line, so first put back the + * character that we replaced with NUL. */ + *pArgEnd = tmp; + return SetMacro(pArgStart); + } + + if (!tmp) break; + pArgEnd++; } return 0; Added: trunk/reactos/base/applications/cmdutils/doskey/doskey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.h (added) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.h [iso-8859-1] Thu Mar 12 07:37:01 2009 @@ -1,0 +1,67 @@ +#define IDS_HELP 0 +#define IDS_INVALID_MACRO_DEF 1 + +#ifndef RC_INVOKED + +#ifdef UNICODE +#define TNAME(x) x##W +#else +#define TNAME(x) x##A +#endif + +/* Missing from include/psdk/wincon.h */ +#ifndef ENABLE_INSERT_MODE +#define ENABLE_INSERT_MODE 0x20 +#endif +#ifndef ENABLE_EXTENDED_FLAGS +#define ENABLE_EXTENDED_FLAGS 0x80 +#endif + +/* Undocumented APIs */ +#ifndef AddConsoleAlias +BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR); +BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR); +#define AddConsoleAlias TNAME(AddConsoleAlias) +#endif +#ifndef ExpungeConsoleCommandHistory +BOOL WINAPI ExpungeConsoleCommandHistoryA(LPSTR); +BOOL WINAPI ExpungeConsoleCommandHistoryW(LPWSTR); +#define ExpungeConsoleCommandHistory TNAME(ExpungeConsoleCommandHistory) +#endif +#ifndef GetConsoleAliases +DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR); +DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR); +#define GetConsoleAliases TNAME(GetConsoleAliases) +#endif +#ifndef GetConsoleAliasesLength +DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); +DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); +#define GetConsoleAliasesLength TNAME(GetConsoleAliasesLength) +#endif +#ifndef GetConsoleAliasExes +DWORD WINAPI GetConsoleAliasExesA(LPSTR, DWORD); +DWORD WINAPI GetConsoleAliasExesW(LPWSTR, DWORD); +#define GetConsoleAliasExes TNAME(GetConsoleAliasExes) +#endif +#ifndef GetConsoleAliasExesLength +DWORD WINAPI GetConsoleAliasExesLengthA(VOID); +DWORD WINAPI GetConsoleAliasExesLengthW(VOID); +#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength) +#endif +#ifndef GetConsoleCommandHistory +DWORD WINAPI GetConsoleCommandHistoryA(LPSTR, DWORD, LPSTR); +DWORD WINAPI GetConsoleCommandHistoryW(LPWSTR, DWORD, LPWSTR); +#define GetConsoleCommandHistory TNAME(GetConsoleCommandHistory) +#endif +#ifndef GetConsoleCommandHistoryLength +DWORD WINAPI GetConsoleCommandHistoryLengthA(LPSTR); +DWORD WINAPI GetConsoleCommandHistoryLengthW(LPWSTR); +#define GetConsoleCommandHistoryLength TNAME(GetConsoleCommandHistoryLength) +#endif +#ifndef SetConsoleNumberOfCommands +BOOL WINAPI SetConsoleNumberOfCommandsA(DWORD, LPSTR); +BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD, LPWSTR); +#define SetConsoleNumberOfCommands TNAME(SetConsoleNumberOfCommands) +#endif + +#endif /* RC_INVOKED */ Propchange: trunk/reactos/base/applications/cmdutils/doskey/doskey.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild [iso-8859-1] Thu Mar 12 07:37:01 2009 @@ -2,6 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe" unicode="yes"> <library>kernel32</library> + <library>user32</library> <file>doskey.c</file> <file>doskey.rc</file> </module> Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc [iso-8859-1] Thu Mar 12 07:37:01 2009 @@ -1,7 +1,8 @@ -/* $Id: find.rc 28350 2007-08-15 14:46:36Z fireball $ */ - #define REACTOS_STR_FILE_DESCRIPTION "W32 doskey command\0" #define REACTOS_STR_INTERNAL_NAME "doskey\0" #define REACTOS_STR_ORIGINAL_FILENAME "doskey.exe\0" #include <reactos/version.rc> +#include <windows.h> +#include "doskey.h" +#include "lang/en-US.rc" Added: trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc [iso-8859-1] Thu Mar 12 07:37:01 2009 @@ -1,0 +1,27 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_HELP, "Manages command-line editing settings, history, and macros.\n\ +\n\ +DOSKEY [/INSERT | /OVERSTRIKE] [/EXENAME=exe] [/HISTORY] [/LISTSIZE=size]\n\ + [/REINSTALL] [/MACROS[:exe | :ALL]] [/MACROFILE=file] [macroname=[text]]\n\ +\n\ + /INSERT Enables insert mode.\n\ + /OVERSTRIKE Disables insert mode.\n\ + /EXENAME=exename Sets the name of the program to view/change history\n\ + and macros for. The default is cmd.exe.\n\ + /HISTORY Displays the command history.\n\ + /LISTSIZE=size Sets the number of commands per history buffer.\n\ + /REINSTALL Clears the command history.\n\ + /MACROS Displays macro definitions.\n\ + /MACROS:exename Displays macro definitions for a specific program.\n\ + /MACROS:ALL Displays macro definitions for all programs.\n\ + /MACROFILE=filename Loads macro definitions from a file.\n\ + macroname Specifies the name of a macro to create.\n\ + text Specifies the replacement text for the macro.\n" + +IDS_INVALID_MACRO_DEF, "Invalid macro definition: %s\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/doskey/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 39972: delete old freetype folder
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 07:00:56 2009 New Revision: 39972 URL: http://svn.reactos.org/svn/reactos?rev=39972&view=rev Log: delete old freetype folder Removed: trunk/reactos/dll/3rdparty/freetype/

1 0

[tkreuzer] 39971: fix library name
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:44:48 2009 New Revision: 39971 URL: http://svn.reactos.org/svn/reactos?rev=39971&view=rev Log: fix library name Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild [iso-8859-1] Thu Mar 12 06:44:48 2009 @@ -2,9 +2,9 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ftfd" type="kernelmodedll" entrypoint="FtfdEnableDriver@12" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="ftfd.dll" crt="libcntpr"> <importlibrary definition="freetype.def" /> - <include base="freetype2">include</include> + <include base="freetype">include</include> <library>win32k</library> - <library>freetype2</library> + <library>freetype</library> <file>enable.c</file> <file>font.c</file> <file>glyph.c</file>

1 0

[tkreuzer] 39970: ok next try ;-)
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:38:57 2009 New Revision: 39970 URL: http://svn.reactos.org/svn/reactos?rev=39970&view=rev Log: ok next try ;-) Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Thu Mar 12 06:38:57 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="freetype" type="staticlibrary" allowwarnings="true"> - <include base="freetype2">include</include> + <include base="freetype">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" />

1 0

[tkreuzer] 39969: fix build
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:35:48 2009 New Revision: 39969 URL: http://svn.reactos.org/svn/reactos?rev=39969&view=rev Log: fix build Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Thu Mar 12 06:35:48 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freetype2" type="staticlibrary" allowwarnings="true"> +<module name="freetype" type="staticlibrary" allowwarnings="true"> <include base="freetype2">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" />

1 0

[tkreuzer] 39968: Remove freetype dll from build, build ftfd instead, the freetype font driver that currently still exports the needed functions directly for win32k.
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:26:23 2009 New Revision: 39968 URL: http://svn.reactos.org/svn/reactos?rev=39968&view=rev Log: Remove freetype dll from build, build ftfd instead, the freetype font driver that currently still exports the needed functions directly for win32k. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/3rdparty/3rdparty.rbuild trunk/reactos/drivers/video/font/directory.rbuild trunk/reactos/lib/3rdparty/3rdparty.rbuild trunk/reactos/lib/3rdparty/freetype/freetype.rbuild trunk/reactos/subsystems/win32/win32k/win32k.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -111,7 +111,6 @@ ; Dynamic Link Libraries -dll\3rdparty\freetype\freetype.dll 1 dll\3rdparty\mesa32\mesa32.dll 1 dll\3rdparty\libjpeg\libjpeg.dll 1 dll\3rdparty\libxslt\libxslt.dll 1 @@ -474,6 +473,7 @@ drivers\video\miniport\vga\vgamp.sys 2 drivers\video\miniport\vbe\vbemp.sys 2 drivers\video\videoprt\videoprt.sys 2 +drivers\video\font\ftfd\ftfd.dll 1 drivers\wdm\audio\filters\kmixer\kmixer.sys 2 drivers\wdm\audio\sysaudio\sysaudio.sys 2 Modified: trunk/reactos/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/3rdparty.rbui… ============================================================================== --- trunk/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="freetype"> - <xi:include href="freetype/freetype.rbuild" /> - </directory> <directory name="mesa32"> <xi:include href="mesa32/mesa32.rbuild" /> </directory> @@ -19,4 +16,4 @@ </directory> </if> </group> - + Modified: trunk/reactos/drivers/video/font/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/directo… ============================================================================== --- trunk/reactos/drivers/video/font/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/directory.rbuild [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -4,5 +4,8 @@ <directory name="bmfd"> <xi:include href="bmfd/bmfd.rbuild" /> </directory> + <directory name="ftfd"> + <xi:include href="ftfd/ftfd.rbuild" /> + </directory> </group> Modified: trunk/reactos/lib/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/3rdparty.rbui… ============================================================================== --- trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/3rdparty.rbuild [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -9,6 +9,9 @@ </directory> <directory name="expat"> <xi:include href="expat/expat.rbuild" /> + </directory> + <directory name="freetype"> + <xi:include href="freetype/freetype.rbuild" /> </directory> <directory name="icu4ros"> <xi:include href="icu4ros/icu4ros.rbuild" /> Modified: trunk/reactos/lib/3rdparty/freetype/freetype.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/freetype/free… ============================================================================== --- trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/freetype/freetype.rbuild [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -1,8 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="freetype" type="kernelmodedll" entrypoint="0" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="freetype.dll" allowwarnings="true" crt="libcntpr"> - <importlibrary definition="freetype.def" /> - <include base="freetype">include</include> +<module name="freetype2" type="staticlibrary" allowwarnings="true"> + <include base="freetype2">include</include> <define name="_DISABLE_TIDENTS" /> <define name="__NTDRIVER__" /> <define name="__NO_CTYPE_INLINES" /> @@ -13,8 +12,6 @@ <if property="NSWPAT" value="1"> <define name="TT_CONFIG_OPTION_BYTECODE_INTERPRETER" /> </if> - <library>win32k</library> - <library>libcntpr</library> <if property="ARCH" value="i386"> <directory name="i386"> <file>setjmplongjmp.s</file> @@ -104,7 +101,4 @@ <file>winfnt.c</file> </directory> </directory> - <file>rosglue.c</file> - <file>sprintf.c</file> - <file>freetype.rc</file> </module> Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Thu Mar 12 06:26:23 2009 @@ -197,7 +197,7 @@ <library>pseh</library> <library>ntoskrnl</library> <library>hal</library> - <library>freetype</library> + <library>ftfd</library> <library>dxguid</library> <file>win32k.rc</file> </module>

1 0

[tkreuzer] 39967: Copy freetype to lib (will be converted to a static lib)
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:16:15 2009 New Revision: 39967 URL: http://svn.reactos.org/svn/reactos?rev=39967&view=rev Log: Copy freetype to lib (will be converted to a static lib) Added: trunk/reactos/lib/3rdparty/freetype/ - copied from r39966, trunk/reactos/dll/3rdparty/freetype/

1 0

[tkreuzer] 39966: WIP 1/x: Move freetype font driver.
by tkreuzer＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: tkreuzer Date: Thu Mar 12 06:00:51 2009 New Revision: 39966 URL: http://svn.reactos.org/svn/reactos?rev=39966&view=rev Log: WIP 1/x: Move freetype font driver. Added: trunk/reactos/drivers/video/font/ftfd/ (props changed) - copied from r39930, trunk/reactos/dll/3rdparty/freetype/ftfd/ trunk/reactos/drivers/video/font/ftfd/freetype.def (with props) trunk/reactos/drivers/video/font/ftfd/freetype.rc (with props) trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild (with props) trunk/reactos/drivers/video/font/ftfd/rosglue.c (with props) trunk/reactos/drivers/video/font/ftfd/sprintf.c (with props) Modified: trunk/reactos/drivers/video/font/ftfd/font.c trunk/reactos/drivers/video/font/ftfd/ftfd.h Propchange: trunk/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Mar 12 06:00:51 2009 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/drivers/video/font/ftfd/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Modified: trunk/reactos/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fo… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/font.c [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -42,6 +42,7 @@ FT_Error fterror; FT_Face ftface; PFTFD_FILE pfile; + ULONG cjSize, cNumFaces; DbgPrint("FtfdLoadFontFile()\n"); @@ -55,50 +56,55 @@ /* Map the font file */ if (!EngMapFontFileFD(*piFile, (PULONG*)&pvView, &cjView)) { - DbgPrint("Could not map font file!\n", cFiles); + DbgPrint("Could not map font file!\n"); return HFF_INVALID; } // HACK!!! pvView = HackFixup(pvView, cjView); - /* Look for faces in the file */ - for (i = 0; i < 100; i++) - { - fterror = FT_New_Memory_Face(gftlibrary, pvView, cjView, i, &ftface); - if (fterror) - { - DbgPrint("Error reading font file (error code: %u)\n", fterror); - break; - } - FT_Done_Face(ftface); - } - - /* Check whether we succeeded finding a face */ - if (i > 0) - { - pfile = EngAllocMem(0, sizeof(FTFD_FILE), 'dftF'); - if (pfile) - { - pfile->cNumFaces = i; - pfile->iFile = *piFile; - pfile->pvView = pvView; - pfile->cjView = cjView; - - DbgPrint("Success! Returning %ld faces\n", i); - - return (ULONG_PTR)pfile; - } - } - - DbgPrint("No faces found in file\n"); - - /* Unmap the file */ - EngUnmapFontFileFD(*piFile); - - /* Failure! */ - return HFF_INVALID; - + fterror = FT_New_Memory_Face(gftlibrary, pvView, cjView, 0, &ftface); + if (fterror) + { + DbgPrint("No faces found in file\n"); + + /* Unmap the file */ + EngUnmapFontFileFD(*piFile); + + /* Failure! */ + return HFF_INVALID; + } + + /* Get number of faces from the first face */ + cNumFaces = ftface->num_faces; + + cjSize = sizeof(FTFD_FILE) + cNumFaces * sizeof(FT_Face); + pfile = EngAllocMem(0, cjSize, 'dftF'); + if (!pfile) + { + DbgPrint("EngAllocMem() failed.\n"); + + /* Unmap the file */ + EngUnmapFontFileFD(*piFile); + + /* Failure! */ + return HFF_INVALID; + } + + pfile->cNumFaces = cNumFaces; + pfile->iFile = *piFile; + pfile->pvView = pvView; + pfile->cjView = cjView; + + for (i = 0; i < pfile->cNumFaces; i++) + { + pfile->aftface[i] = ftface; + FT_Select_Charmap(ftface, FT_ENCODING_UNICODE); + } + + DbgPrint("Success! Returning %ld faces\n", cNumFaces); + + return (ULONG_PTR)pfile; } BOOL @@ -107,11 +113,18 @@ IN ULONG_PTR iFile) { PFTFD_FILE pfile = (PFTFD_FILE)iFile; + ULONG i; DbgPrint("FtfdUnloadFontFile()\n"); // HACK!!! EngFreeMem(pfile->pvView); + + /* Cleanup faces */ + for (i = 0; i < pfile->cNumFaces; i++) + { + FT_Done_Face(pfile->aftface[i]); + } /* Free the memory that was allocated for the font */ EngFreeMem(pfile); @@ -152,13 +165,134 @@ return FD_ERROR; } + +PIFIMETRICS +APIENTRY +FtfdQueryFont( + IN DHPDEV dhpdev, + IN ULONG_PTR iFile, + IN ULONG iFace, + IN ULONG_PTR *pid) +{ + PFTFD_FILE pfile = (PFTFD_FILE)iFile; + PFTFD_IFIMETRICS pifiX; + PIFIMETRICS pifi; + FT_Face ftface; + FT_Error fterror; + + DbgPrint("FtfdQueryFont()\n"); + + /* Validate parameters */ + if (iFace > pfile->cNumFaces || !pid) + { + return NULL; + } + + fterror = FT_New_Memory_Face(gftlibrary, + pfile->pvView, + pfile->cjView, + iFace - 1, + &ftface); + if (fterror) + { + return NULL; + } + + /* Allocate the ifi metrics structure */ + pifiX = EngAllocMem(FL_ZERO_MEMORY, sizeof(FTFD_IFIMETRICS), TAG_IFIMETRICS); + if (!pifiX) + { + DbgPrint("EngAllocMem() failed.\n"); + FT_Done_Face(ftface); + return NULL; + } + + /* Fill IFIMETRICS */ + pifi = &pifiX->ifim; + pifi->cjThis = sizeof(FTFD_IFIMETRICS); + pifi->cjIfiExtra = 0; + pifi->dpwszFamilyName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFamilyName); + pifi->dpwszStyleName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFamilyName); + pifi->dpwszFaceName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFaceName); + pifi->dpwszUniqueName = FIELD_OFFSET(FTFD_IFIMETRICS, wszFaceName); + pifi->dpFontSim = 0; + pifi->lEmbedId = 0; + pifi->lItalicAngle = 0; + pifi->lCharBias = 0; + pifi->dpCharSets = 0; +// pifi->jWinCharSet = pFontInfo->dfCharSet; +// pifi->jWinPitchAndFamily = pFontInfo->dfPitchAndFamily; +// pifi->usWinWeight = GETVAL(pFontInfo->dfWeight); +// pifi->flInfo = pface->flInfo; + pifi->fsSelection = 0; + pifi->fsType = 0; +// pifi->fwdUnitsPerEm = GETVAL(pFontInfo->dfPixHeight); + pifi->fwdLowestPPEm = 0; +// pifi->fwdWinAscender = GETVAL(pFontInfo->dfAscent); + pifi->fwdWinDescender = pifi->fwdUnitsPerEm - pifi->fwdWinAscender; + pifi->fwdMacAscender = pifi->fwdWinAscender; + pifi->fwdMacDescender = - pifi->fwdWinDescender; + pifi->fwdMacLineGap = 0; + pifi->fwdTypoAscender = pifi->fwdWinAscender; + pifi->fwdTypoDescender = - pifi->fwdWinDescender; + pifi->fwdTypoLineGap = 0; +// pifi->fwdAveCharWidth = GETVAL(pFontInfo->dfAvgWidth); +// pifi->fwdMaxCharInc = GETVAL(pFontInfo->dfMaxWidth); +// pifi->fwdCapHeight = pifi->fwdUnitsPerEm / 2; + pifi->fwdXHeight = pifi->fwdUnitsPerEm / 4; + pifi->fwdSubscriptXSize = 0; + pifi->fwdSubscriptYSize = 0; + pifi->fwdSubscriptXOffset = 0; + pifi->fwdSubscriptYOffset = 0; + pifi->fwdSuperscriptXSize = 0; + pifi->fwdSuperscriptYSize = 0; + pifi->fwdSuperscriptXOffset = 0; + pifi->fwdSuperscriptYOffset = 0; + pifi->fwdUnderscoreSize = 01; + pifi->fwdUnderscorePosition = -1; + pifi->fwdStrikeoutSize = 1; + pifi->fwdStrikeoutPosition = pifi->fwdXHeight + 1; +// pifi->chFirstChar = pFontInfo->dfFirstChar; +// pifi->chLastChar = pFontInfo->dfLastChar; +// pifi->chDefaultChar = pFontInfo->dfFirstChar + pFontInfo->dfDefaultChar; +// pifi->chBreakChar = pFontInfo->dfFirstChar + pFontInfo->dfBreakChar; +// pifi->wcFirstChar = pface->wcFirstChar; +// pifi->wcLastChar = pface->wcLastChar; +// pifi->wcDefaultChar = pface->wcDefaultChar; +// pifi->wcBreakChar = pface->wcBreakChar; + pifi->ptlBaseline.x = 1; + pifi->ptlBaseline.y = 0; +// pifi->ptlAspect.x = pFontInfo->dfVertRes; // CHECKME +// pifi->ptlAspect.y = pFontInfo->dfHorizRes; + pifi->ptlCaret.x = 0; + pifi->ptlCaret.y = 1; + pifi->rclFontBox.left = 0; + pifi->rclFontBox.right = pifi->fwdAveCharWidth; + pifi->rclFontBox.top = pifi->fwdWinAscender; + pifi->rclFontBox.bottom = - pifi->fwdWinDescender; + *(DWORD*)&pifi->achVendId = 0x30303030; // FIXME + pifi->cKerningPairs = 0; + pifi->ulPanoseCulture = FM_PANOSE_CULTURE_LATIN; +// pifi->panose = panose; + + /* Set char sets */ + pifiX->ajCharSet[0] = pifi->jWinCharSet; + pifiX->ajCharSet[1] = DEFAULT_CHARSET; + + FT_Done_Face(ftface); + + + return 0; +} + + LONG APIENTRY FtfdQueryFontCaps( ULONG culCaps, ULONG *pulCaps) { - DbgPrint("BmfdQueryFontCaps()\n"); + DbgPrint("FtfdQueryFontCaps()\n"); /* We need room for 2 ULONGs */ if (culCaps < 2) @@ -183,20 +317,98 @@ ULONG iMode, ULONG_PTR *pid) { + PFTFD_FILE pfile = (PFTFD_FILE)iFile; + FT_Face ftface; + FT_Error fterror; + FTFD_CHARPAIR *pcp; + FD_GLYPHSET *pGlyphSet; + FT_ULong charcode; + ULONG i, j, cGlyphs, cRuns, cjSize; + WCRUN *pwcrun; + HGLYPH * phglyphs; + + DbgPrint("FtfdQueryFontTree()\n"); + + fterror = FT_New_Memory_Face(gftlibrary, + pfile->pvView, + pfile->cjView, + iFace - 1, + &ftface); + if (fterror) + { + return NULL; + } + + cGlyphs = ftface->num_glyphs; + cRuns = 1; + + pcp = EngAllocMem(0, cGlyphs * sizeof(FTFD_CHARPAIR), 'pcp '); + if (!pcp) + { + return NULL; + } + + charcode = FT_Get_First_Char(ftface, &pcp[0].index); + for (i = 0; i < cGlyphs && charcode != 0; i++) + { + pcp[i].charcode = charcode; + charcode = FT_Get_Next_Char(ftface, charcode, &pcp[i].index); + if (charcode != pcp[i - 1].charcode + 1) + { + cRuns++; + } + } + + /* Calculate FD_GLYPHSET size */ + cjSize = sizeof(FD_GLYPHSET) + + (cRuns - 1) * sizeof(WCRUN) + + cGlyphs * sizeof(HGLYPH); + + /* Allocate the FD_GLYPHSET structure */ + pGlyphSet = EngAllocMem(0, cjSize, TAG_GLYPHSET); + if (!pGlyphSet) + { + return NULL; + } + + /* Initialize FD_GLYPHSET */ + pGlyphSet->cjThis = cjSize; + pGlyphSet->flAccel = 0; + pGlyphSet->cGlyphsSupported = cGlyphs; + pGlyphSet->cRuns = cRuns; + + /* Initialize 1st WCRUN */ + pwcrun = pGlyphSet->awcrun; + phglyphs = (PHGLYPH)&pGlyphSet->awcrun[cRuns]; + pwcrun[0].wcLow = pcp[0].charcode; + pwcrun[0].cGlyphs = 1; + pwcrun[0].phg = phglyphs; + phglyphs[0] = pcp[0].index; + + /* Walk through all supported chars */ + for (i = 1, j = 0; i < cGlyphs; i++) + { + /* Use glyph index as HGLYPH */ + phglyphs[i] = pcp[i].index; + + /* Check whether we can append the wchar to a run */ + if (pcp[i].charcode == pcp[i - 1].charcode + 1) + { + /* Append to current WCRUN */ + pwcrun[j].cGlyphs++; + } + else + { + /* Add a new WCRUN */ + j++; + pwcrun[j].wcLow = pcp[i].charcode; + pwcrun[j].cGlyphs = 1; + pwcrun[j].phg = &phglyphs[i]; + } + } + return NULL; } - -PIFIMETRICS -APIENTRY -FtfdQueryFont( - IN DHPDEV dhpdev, - IN ULONG_PTR iFile, - IN ULONG iFace, - IN ULONG_PTR *pid) -{ - return 0; -} - VOID APIENTRY Added: trunk/reactos/drivers/video/font/ftfd/freetype.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fr… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/freetype.def (added) +++ trunk/reactos/drivers/video/font/ftfd/freetype.def [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -1,0 +1,26 @@ +LIBRARY freetype +EXPORTS + FT_Done_Face + FT_Done_Glyph + FT_Get_Char_Index + FT_Get_First_Char + FT_Get_Glyph + FT_Get_Kerning + FT_Get_Next_Char + FT_Get_PS_Font_Info + FT_Get_Sfnt_Table + FT_Get_WinFNT_Header + FT_Glyph_To_Bitmap + FT_Init_FreeType + FT_Load_Glyph + FT_Load_Sfnt_Table + FT_Matrix_Multiply + FT_MulFix + FT_New_Memory_Face + FT_Outline_Get_Bitmap + FT_Outline_Transform + FT_Outline_Translate + FT_Set_Charmap + FT_Set_Pixel_Sizes + FT_Vector_Transform + FT_Vector_Unit Propchange: trunk/reactos/drivers/video/font/ftfd/freetype.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/font/ftfd/freetype.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/fr… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/freetype.rc (added) +++ trunk/reactos/drivers/video/font/ftfd/freetype.rc [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -1,0 +1,8 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "FreeType font handling library\0" +#define REACTOS_STR_INTERNAL_NAME "freetype\0" +#define REACTOS_STR_ORIGINAL_FILENAME "freetype.dll\0" +#define REACTOS_STR_COMPANY_NAME "ReactOS Development Team/FreeType Team\0" +#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright 1998-2007 ReactOS Team\0" +#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright 1996-2007 FreeType Team\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/video/font/ftfd/freetype.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -15,8 +15,16 @@ extern FT_Library gftlibrary; +#define TAG_GLYPHSET 'GlSt' +#define TAG_IFIMETRICS 'Ifim' + /** Driver specific types *****************************************************/ +typedef struct +{ + FT_UInt index; + FT_ULong charcode; +} FTFD_CHARPAIR; typedef struct { @@ -24,7 +32,19 @@ ULONG cjView; ULONG_PTR iFile; ULONG cNumFaces; + FT_Face aftface[1]; } FTFD_FILE, *PFTFD_FILE; + +//"Bold Italic Underline Strikeout" +#define MAX_STYLESIZE 35 +typedef struct +{ + IFIMETRICS ifim; + BYTE ajCharSet[16]; + WCHAR wszFamilyName[LF_FACESIZE]; + WCHAR wszFaceName[LF_FACESIZE]; + WCHAR wszStyleName[MAX_STYLESIZE]; +} FTFD_IFIMETRICS, *PFTFD_IFIMETRICS; /** Function prototypes *******************************************************/ Added: trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ft… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild (added) +++ trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -1,0 +1,13 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="ftfd" type="kernelmodedll" entrypoint="FtfdEnableDriver@12" baseaddress="${BASEADDRESS_FREETYPE}" installbase="system32" installname="ftfd.dll" crt="libcntpr"> + <importlibrary definition="freetype.def" /> + <include base="freetype2">include</include> + <library>win32k</library> + <library>freetype2</library> + <file>enable.c</file> + <file>font.c</file> + <file>glyph.c</file> + <file>rosglue.c</file> + <file>sprintf.c</file> +</module> Propchange: trunk/reactos/drivers/video/font/ftfd/ftfd.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/font/ftfd/rosglue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/ro… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/rosglue.c (added) +++ trunk/reactos/drivers/video/font/ftfd/rosglue.c [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -1,0 +1,137 @@ +/* $Id: rosglue.c 39928 2009-03-10 02:49:45Z tkreuzer $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: FreeType implementation for ReactOS + * PURPOSE: Glue functions between FreeType + * FILE: thirdparty/freetype/rosglue.c + * PROGRAMMER: Ge van Geldorp (ge(a)gse.nl) + * NOTES: + */ + +#include <windef.h> +#include <wingdi.h> +#include <winddi.h> +#include <stdarg.h> +#include <stdio.h> + +#define NDEBUG +#include <debug.h> + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_FREETYPE TAG('F', 'T', 'Y', 'P') + +/* + * First some generic routines + */ + +ULONG +DbgPrint(IN PCCH Format, IN ...) +{ + va_list args; + + va_start(args, Format); + EngDebugPrint("ft2: ", (PCHAR)Format, args); + va_end(args); + return 0; +} + +/* + * Memory allocation + * + * Because of realloc, we need to keep track of the size of the allocated + * buffer (need to copy the old contents to the new buffer). So, allocate + * extra space for a size_t, store the allocated size in there and return + * the address just past it as the allocated buffer. + */ + +void * +malloc(size_t Size) +{ + void *Object; + + Object = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); + if (NULL != Object) + { + *((size_t *) Object) = Size; + Object = (void *)((size_t *) Object + 1); + } + + return Object; +} + +void * +realloc(void *Object, size_t Size) +{ + void *NewObject; + size_t CopySize; + + NewObject = EngAllocMem(0, sizeof(size_t) + Size, TAG_FREETYPE); + if (NULL != NewObject) + { + *((size_t *) NewObject) = Size; + NewObject = (void *)((size_t *) NewObject + 1); + CopySize = *((size_t *) Object - 1); + if (Size < CopySize) + { + CopySize = Size; + } + memcpy(NewObject, Object, CopySize); + EngFreeMem((size_t *) Object - 1); + } + + return NewObject; +} + +void +free(void *Object) +{ + EngFreeMem((size_t *) Object - 1); +} + +/* + * File I/O + * + * This is easy, we don't want FreeType to do any I/O. So return an + * error on each I/O attempt. Note that errno is not being set, it is + * not used by FreeType. + */ + +FILE * +fopen(const char *FileName, const char *Mode) +{ + DPRINT1("Freetype tries to open file %s\n", FileName); + + return NULL; +} + +int +fseek(FILE *Stream, long Offset, int Origin) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fseek!\n"); + + return -1; +} + +long +ftell(FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't ftell!\n"); + + return -1; +} + +size_t +fread(void *Buffer, size_t Size, size_t Count, FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fread!\n"); + + return 0; +} + +int +fclose(FILE *Stream) +{ + DPRINT1("Doubleplus ungood: freetype shouldn't fclose!\n"); + + return EOF; +} Propchange: trunk/reactos/drivers/video/font/ftfd/rosglue.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/video/font/ftfd/sprintf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/font/ftfd/sp… ============================================================================== --- trunk/reactos/drivers/video/font/ftfd/sprintf.c (added) +++ trunk/reactos/drivers/video/font/ftfd/sprintf.c [iso-8859-1] Thu Mar 12 06:00:51 2009 @@ -1,0 +1,742 @@ +/* + * PROGRAMMERS: David Welch + * Eric Kohl + * + * TODO: + * - Verify the implementation of '%Z'. + */ + +/* + * linux/lib/vsprintf.c + * + * Copyright (C) 1991, 1992 Linus Torvalds + */ + +/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ +/* + * Wirzenius wrote this portably, Torvalds fucked it up :-) + */ + +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> +#include <stdlib.h> +#include <stdio.h> + +#define ZEROPAD 1 /* pad with zero */ +#define SIGN 2 /* unsigned/signed long */ +#define PLUS 4 /* show plus */ +#define SPACE 8 /* space if plus */ +#define LEFT 16 /* left justified */ +#define SPECIAL 32 /* 0x */ +#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ +#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ +typedef struct { + unsigned int mantissal:32; + unsigned int mantissah:20; + unsigned int exponent:11; + unsigned int sign:1; +} double_t; + +static +__inline +int +_isinf(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); +} + +static +__inline +int +_isnan(double __x) +{ + union + { + double* __x; + double_t* x; + } x; + x.__x = &__x; + return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); +} + + +static +__inline +int +do_div(long long *n, int base) +{ + int a; + a = ((unsigned long long) *n) % (unsigned) base; + *n = ((unsigned long long) *n) / (unsigned) base; + return a; +} + + +static int skip_atoi(const char **s) +{ + int i=0; + + while (isdigit(**s)) + i = i*10 + *((*s)++) - '0'; + return i; +} + + +static char * +number(char * buf, char * end, long long num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; + const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { + if (base == 16) + size -= 2; + + } + i = 0; + if ((num == 0) && (precision !=0)) + tmp[i++] = '0'; + else while (num != 0) + tmp[i++] = digits[do_div(&num,base)]; + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + + if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { + if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + + return buf; +} + +static char * +numberf(char * buf, char * end, double num, int base, int size, int precision, int type) +{ + char c,sign,tmp[66]; + const char *digits; + const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; + const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + int i; + long long x; + + /* FIXME + the float version of number is direcly copy of number + */ + + digits = (type & LARGE) ? large_digits : small_digits; + if (type & LEFT) + type &= ~ZEROPAD; + if (base < 2 || base > 36) + return 0; + c = (type & ZEROPAD) ? '0' : ' '; + sign = 0; + if (type & SIGN) { + if (num < 0) { + sign = '-'; + num = -num; + size--; + } else if (type & PLUS) { + sign = '+'; + size--; + } else if (type & SPACE) { + sign = ' '; + size--; + } + } + if (type & SPECIAL) { + if (base == 16) + size -= 2; + else if (base == 8) + size--; + } + i = 0; + if (num == 0) + tmp[i++] = '0'; + else while (num != 0) + { + x = num; + tmp[i++] = digits[do_div(&x,base)]; + num=x; + } + if (i > precision) + precision = i; + size -= precision; + if (!(type&(ZEROPAD+LEFT))) { + while(size-->0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + } + if (sign) { + if (buf <= end) + *buf = sign; + ++buf; + } + if (type & SPECIAL) { + if (base==8) { + if (buf <= end) + *buf = '0'; + ++buf; + } else if (base==16) { + if (buf <= end) + *buf = '0'; + ++buf; + if (buf <= end) + *buf = digits[33]; + ++buf; + } + } + if (!(type & LEFT)) { + while (size-- > 0) { + if (buf <= end) + *buf = c; + ++buf; + } + } + while (i < precision--) { + if (buf <= end) + *buf = '0'; + ++buf; + } + while (i-- > 0) { + if (buf <= end) + *buf = tmp[i]; + ++buf; + } + while (size-- > 0) { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +static char* +string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) +{ + int i; + char c; + + c = (flags & ZEROPAD) ? '0' : ' '; + + if (s == NULL) + { + s = "<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && s[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = c; + ++buf; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = *s++; + ++buf; + } + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + ++buf; + } + return buf; +} + +static char* +stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) +{ + int i; + char c; + + c = (flags & ZEROPAD) ? '0' : ' '; + + if (sw == NULL) + { + sw = L"<NULL>"; + len = 6; + } + else + { + if (len == -1) + { + len = 0; + while ((unsigned int)len < (unsigned int)precision && sw[len]) + len++; + } + else + { + if ((unsigned int)len > (unsigned int)precision) + len = precision; + } + } + if (!(flags & LEFT)) + while (len < field_width--) + { + if (buf <= end) + *buf = c; + buf++; + } + for (i = 0; i < len; ++i) + { + if (buf <= end) + *buf = (unsigned char)(*sw++); + buf++; + } + while (len < field_width--) + { + if (buf <= end) + *buf = ' '; + buf++; + } + return buf; +} + +/* + * @implemented + */ +int __cdecl _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) +{ + int len; + unsigned long long num; + double _double; + + int base; + char *str, *end; + const char *s; + const wchar_t *sw; + + int flags; /* flags to number() */ + + int field_width; /* width of output field */ + int precision; /* min. # of digits for integers; max + number of chars for from string */ + int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ + + /* clear the string buffer with zero so we do not need NULL terment it at end */ + + str = buf; + end = buf + cnt - 1; + if (end < buf - 1) { + end = ((char *) -1); + cnt = end - buf + 1; + } + + for ( ; *fmt ; ++fmt) { + if (*fmt != '%') { + if (str <= end) + *str = *fmt; + ++str; + continue; + } + + /* process flags */ + flags = 0; + repeat: + ++fmt; /* this also skips first '%' */ + switch (*fmt) { + case '-': flags |= LEFT; goto repeat; + case '+': flags |= PLUS; goto repeat; + case ' ': flags |= SPACE; goto repeat; + case '#': flags |= SPECIAL; goto repeat; + case '0': flags |= ZEROPAD; goto repeat; + } + + /* get field width */ + field_width = -1; + if (isdigit(*fmt)) + field_width = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + field_width = va_arg(args, int); + if (field_width < 0) { + field_width = -field_width; + flags |= LEFT; + } + } + + /* get the precision */ + precision = -1; + if (*fmt == '.') { + ++fmt; + if (isdigit(*fmt)) + precision = skip_atoi(&fmt); + else if (*fmt == '*') { + ++fmt; + /* it's the next argument */ + precision = va_arg(args, int); + } + if (precision < 0) + precision = 0; + } + + /* get the conversion qualifier */ + qualifier = -1; + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { + qualifier = *fmt; + ++fmt; + } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { + qualifier = *fmt; + fmt += 3; + } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { + qualifier = 'l'; + fmt += 3; + } else if (*fmt == 'F' && *(fmt+1) == 'p') { + fmt += 1; + flags |= REMOVEHEX; + } + + /* default base */ + base = 10; + + switch (*fmt) { + case 'c': /* finished */ + if (qualifier == 'l' || qualifier == 'w') { + wchar_t sw1[2]; + /* print unicode string */ + sw1[0] = (wchar_t) va_arg(args, int); + sw1[1] = 0; + str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); + } else { + char s1[2]; + /* print ascii string */ + s1[0] = ( unsigned char) va_arg(args, int); + s1[1] = 0; + str = string(str, end, (char *)&s1, -1, field_width, precision, flags); + } + continue; + + case 'C': /* finished */ + if (!(flags & LEFT)) + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + if (qualifier == 'h') { + if (str <= end) + *str = (unsigned char) va_arg(args, int); + ++str; + } else { + if (str <= end) + *str = (unsigned char)(wchar_t) va_arg(args, int); + ++str; + } + while (--field_width > 0) { + if (str <= end) + *str = ' '; + ++str; + } + continue; + + case 's': /* finished */ + if (qualifier == 'l' || qualifier == 'w') { + /* print unicode string */ + sw = va_arg(args, wchar_t *); + str = stringw(str, end, sw, -1, field_width, precision, flags); + } else { + /* print ascii string */ + s = va_arg(args, char *); + str = string(str, end, s, -1, field_width, precision, flags); + } + continue; + + case 'S': + if (qualifier == 'h') { + /* print ascii string */ + s = va_arg(args, char *); + str = string(str, end, s, -1, field_width, precision, flags); + } else { + /* print unicode string */ + sw = va_arg(args, wchar_t *); + str = stringw(str, end, sw, -1, field_width, precision, flags); + } + continue; + + case 'Z': + if (qualifier == 'w') { + /* print counted unicode string */ + PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); + if ((pus == NULL) || (pus->Buffer == NULL)) { + sw = NULL; + len = -1; + } else { + sw = pus->Buffer; + len = pus->Length / sizeof(WCHAR); + } + str = stringw(str, end, sw, len, field_width, precision, flags); + } else { + /* print counted ascii string */ + PANSI_STRING pus = va_arg(args, PANSI_STRING); + if ((pus == NULL) || (pus->Buffer == NULL)) { + s = NULL; + len = -1; + } else { + s = pus->Buffer; + len = pus->Length; + } + str = string(str, end, s, len, field_width, precision, flags); + } + continue; + + case 'p': + if ((flags & LARGE) == 0) + flags |= LARGE; + + if (field_width == -1) { + field_width = 2 * sizeof(void *); + flags |= ZEROPAD; + } + str = number(str, end, + (ULONG_PTR) va_arg(args, void *), 16, + field_width, precision, flags); + continue; + + case 'n': + /* FIXME: What does C99 say about the overflow case here? */ + if (qualifier == 'l') { + long * ip = va_arg(args, long *); + *ip = (str - buf); + } else { + int * ip = va_arg(args, int *); + *ip = (str - buf); + } + continue; + + /* float number formats - set up the flags and "break" */ + case 'e': + case 'E': + case 'f': + case 'g': + case 'G': + _double = (double)va_arg(args, double); + if ( _isnan(_double) ) { + s = "Nan"; + len = 3; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else if ( _isinf(_double) < 0 ) { + s = "-Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else if ( _isinf(_double) > 0 ) { + s = "+Inf"; + len = 4; + while ( len > 0 ) { + if (str <= end) + *str = *s++; + ++str; + len --; + } + } else { + if ( precision == -1 ) + precision = 6; + str = numberf(str, end, (int)_double, base, field_width, precision, flags); + } + + continue; + + + /* integer number formats - set up the flags and "break" */ + case 'o': + base = 8; + break; + + case 'b': + base = 2; + break; + + case 'X': + flags |= LARGE; + case 'x': + base = 16; + break; + + case 'd': + case 'i': + flags |= SIGN; + case 'u': + break; + + default: + if (*fmt) { + if (str <= end) + *str = *fmt; + ++str; + } else + --fmt; + continue; + } + + if (qualifier == 'I') + num = va_arg(args, unsigned long long); + else if (qualifier == 'l') { + if (flags & SIGN) + num = va_arg(args, long); + else + num = va_arg(args, unsigned long); + } + else if (qualifier == 'h') { + if (flags & SIGN) + num = va_arg(args, int); + else + num = va_arg(args, unsigned int); + } + else { + if (flags & SIGN) + num = va_arg(args, int); + else + num = va_arg(args, unsigned int); + } + str = number(str, end, num, base, field_width, precision, flags); + } + if (str <= end) + *str = '\0'; + else if (cnt > 0) + /* don't write out a null byte if the buf size is zero */ + *end = '\0'; + return str-buf; +} + + +/* + * @implemented + */ +int sprintf(char * buf, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=_vsnprintf(buf,MAXLONG,fmt,args); + va_end(args); + return i; +} + + +/* + * @implemented + */ +int _snprintf(char * buf, size_t cnt, const char *fmt, ...) +{ + va_list args; + int i; + + va_start(args, fmt); + i=_vsnprintf(buf,cnt,fmt,args); + va_end(args); + return i; +} + + +/* + * @implemented + */ +int __cdecl vsprintf(char *buf, const char *fmt, va_list args) +{ + return _vsnprintf(buf,MAXLONG,fmt,args); +} + +/* EOF */ Propchange: trunk/reactos/drivers/video/font/ftfd/sprintf.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 39965: Swedish translation by Anton Adell (anton_hahaha *at* hotmail *dot* com). Bug #4245.
by dgorbachev＠svn.reactos.org 12 Mar '09

12 Mar '09

Author: dgorbachev Date: Thu Mar 12 03:05:59 2009 New Revision: 39965 URL: http://svn.reactos.org/svn/reactos?rev=39965&view=rev Log: Swedish translation by Anton Adell (anton_hahaha *at* hotmail *dot* com). Bug #4245. Added: trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc Added: trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc (added) +++ trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc [iso-8859-1] Thu Mar 12 03:05:59 2009 @@ -1,0 +1,17 @@ +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + +IDS_USAGE, "FIND: Skriver ut alla rader i en fil som innehåller en sträng.\n\n\ + FIND [ /C ] [ /I ] [ /N ] [ /V ] \"sträng\" [ fil... ]\n\ + /C Räkna nummren av linjer som innehåller en strängen\n\ + /I Ignorera skiftläge\n\ + /N Antal visade rader, börjar på 1\n\ + /V Skriver ut rader som inte innehåller strängen" + +IDS_NO_SUCH_FILE, "FIND: %s: Ingen sorts fil\n" + +IDS_CANNOT_OPEN, "FIND: %s: Kan inte öppna filen\n" + +END Propchange: trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/find/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/find/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/find/rsrc.rc [iso-8859-1] Thu Mar 12 03:05:59 2009 @@ -16,4 +16,5 @@ #include "lang/pt-BR.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" #include "lang/uk-UA.rc"

1 0

[cgutman] 39964: - Merge aicom-network-fixes up to r39943
by cgutman＠svn.reactos.org 11 Mar '09

11 Mar '09

Author: cgutman Date: Thu Mar 12 01:15:12 2009 New Revision: 39964 URL: http://svn.reactos.org/svn/reactos?rev=39964&view=rev Log: - Merge aicom-network-fixes up to r39943 Removed: trunk/reactos/drivers/network/tcpip/include/bug.h trunk/reactos/drivers/network/tcpip/tcpip/bug.c trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/tcpip/include/precomp.h trunk/reactos/drivers/network/tcpip/tcpip.rbuild trunk/reactos/lib/drivers/ip/network/memtrack.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c Modified: trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/… ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -235,6 +235,9 @@ UINT i; NDIS_STATUS Status; PNIC_ADAPTER Adapter; + NDIS_HANDLE ConfigurationHandle; + UINT *RegNetworkAddress = 0; + UINT RegNetworkAddressLength = 0; ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -281,10 +284,7 @@ if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; - NDIS_HANDLE ConfigurationHandle; UNICODE_STRING Keyword; - UINT *RegNetworkAddress = 0; - UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); if (Status == NDIS_STATUS_SUCCESS) @@ -308,18 +308,6 @@ Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; } - /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ - NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); - if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) - { - int i; - NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", - RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], - RegNetworkAddress[4], RegNetworkAddress[5])); - for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) - Adapter->StationAddress[i] = RegNetworkAddress[i]; - } - NdisCloseConfiguration(ConfigurationHandle); } else @@ -366,6 +354,30 @@ NDIS_DbgPrint(MID_TRACE, ("Status (0x%X).\n", Status)); MiniportHalt((NDIS_HANDLE)Adapter); return Status; + } + + NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); + if (Status == NDIS_STATUS_SUCCESS) + { + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } + + if (Status != NDIS_STATUS_SUCCESS) + { + int i; + for (i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = Adapter->PermanentAddress[i]; } NDIS_DbgPrint(MID_TRACE, ("BOARDDATA:\n")); @@ -659,11 +671,19 @@ * Status of operation */ { + NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; + ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - return NDIS_STATUS_FAILURE; +#ifndef NOCARD + NdisStatus = NICReset((PNIC_ADAPTER)MiniportAdapterContext); +#endif + + *AddressingReset = TRUE; + + return NdisStatus; } Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -699,16 +699,7 @@ PNDIS_CONFIGURATION_PARAMETER ParameterValue = NULL; NDIS_STRING Keyword; UINT *IntArray = 0; - int i; - - /* FIXME - We don't quite support this yet due to buggy code below */ - { - *Status = NDIS_STATUS_FAILURE; - return; - } - - *NetworkAddress = NULL; - *NetworkAddressLength = 6;/* XXX magic constant */ + UINT i,j = 0; NdisInitUnicodeString(&Keyword, L"NetworkAddress"); NdisReadConfiguration(Status, &ParameterValue, ConfigurationHandle, &Keyword, NdisParameterString); @@ -718,8 +709,11 @@ return; } - /* 6 bytes for ethernet, tokenring, fddi, everything else? */ - IntArray = ExAllocatePool(PagedPool, 6*sizeof(UINT)); + while (ParameterValue->ParameterData.StringData.Buffer[j] != '\0') j++; + + *NetworkAddressLength = (UINT)((j/2)+0.5); + + IntArray = ExAllocatePool(PagedPool, (*NetworkAddressLength)*sizeof(UINT)); if(!IntArray) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); @@ -742,7 +736,7 @@ ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); /* convert from string to bytes */ - for(i=0; i<6; i++) + for(i=0; i<(*NetworkAddressLength); i++) { IntArray[i] = (UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i]) << 4) + UnicodeToHexByte((ParameterValue->ParameterData.StringData.Buffer)[2*i+1]); Removed: trunk/reactos/drivers/network/tcpip/include/bug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/bug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/bug.h (removed) @@ -1,6 +1,0 @@ -#ifndef _TCPIP_BUG_H -#define _TCPIP_BUG_H - -VOID TcpipBugCheck( ULONG BugCode ); - -#endif/*_TCPIP_BUG_H*/ Modified: trunk/reactos/drivers/network/tcpip/include/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/precomp.h [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -30,7 +30,6 @@ #include <fileobjs.h> #include <lock.h> #include <wait.h> -#include <bug.h> #include <memtrack.h> #include <oskittcp.h> #include <interface.h> Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -26,7 +26,6 @@ </directory> <directory name="tcpip"> <file>buffer.c</file> - <file>bug.c</file> <file>dispatch.c</file> <file>fileobjs.c</file> <file>iinfo.c</file> Removed: trunk/reactos/drivers/network/tcpip/tcpip/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/bug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/bug.c (removed) @@ -1,11 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/bug.c - * PURPOSE: Bugcheck - * PROGRAMMERS: Art Yerkes - * REVISIONS: - */ -#include "precomp.h" - -VOID TcpipBugCheck( ULONG BugCode ) { KeBugCheck( BugCode ); } Removed: trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/mockbug.c (removed) @@ -1,14 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS TCP/IP protocol driver - * FILE: tcpip/bug.c - * PURPOSE: Bugcheck - * PROGRAMMERS: Art Yerkes - * REVISIONS: - */ -#include "precomp.h" - -VOID TcpipBugCheck( ULONG BugCode ) { - DbgPrint("BugCheck called: %x\n", BugCode); - ASSERT(0); -} Modified: trunk/reactos/lib/drivers/ip/network/memtrack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/mem… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/memtrack.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -124,7 +124,7 @@ if ( ThingInList->Tag != Tag ) { DbgPrint("UNTRACK: TAG DOES NOT MATCH (%x)\n", Thing); ShowTrackedThing("Tag Mismatch (Item in list)", ThingInList, TRUE); - TcpipBugCheck( 0 ); + ASSERT( FALSE ); } ExFreeToNPagedLookasideList( &AllocatedObjectsLookasideList, @@ -139,7 +139,7 @@ } TcpipReleaseSpinLock( &AllocatedObjectsLock, OldIrql ); DbgPrint("UNTRACK: SPECIFIED ALREADY FREE ITEM %x\n", Thing); - TcpipBugCheck( 0 ); + ASSERT( FALSE ); } VOID TrackDumpFL( PCHAR File, ULONG Line ) { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Thu Mar 12 01:15:12 2009 @@ -76,8 +76,6 @@ OskitDumpBuffer( data, len ); return OSK_EINVAL; } - - RemoteAddress.Type = LocalAddress.Type = IP_ADDRESS_V4; if(!(NCE = RouteGetRouteToDestination( &RemoteAddress ))) { TI_DbgPrint(MIN_TRACE,("No route to %s\n", A2S(&RemoteAddress)));

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