Ros-diffs March 2009

ros-diffs@reactos.org

28 participants
483 discussions

[jmorlan] 40024: Replace a couple hacks supporting specific cases of enhanced variable substitution (%~var) with a more general implementation. All tests in rostests/win32/cmd/script_testsuite can now be passed using ReactOS cmd in Windows, though still not yet in ReactOS itself.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Sun Mar 15 07:54:41 2009 New Revision: 40024 URL: http://svn.reactos.org/svn/reactos?rev=40024&view=rev Log: Replace a couple hacks supporting specific cases of enhanced variable substitution (%~var) with a more general implementation. All tests in rostests/win32/cmd/script_testsuite can now be passed using ReactOS cmd in Windows, though still not yet in ReactOS itself. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.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] Sun Mar 15 07:54:41 2009 @@ -81,16 +81,18 @@ * */ -LPTSTR FindArg (INT n) +LPTSTR FindArg(TCHAR Char, BOOL *IsParam0) { LPTSTR pp; + INT n = Char - _T('0'); TRACE ("FindArg: (%d)\n", n); - if (bc == NULL) + if (bc == NULL || n < 0 || n > 9) return NULL; n += bc->shiftlevel; + *IsParam0 = (n == 0); pp = bc->params; /* Step up the strings till we reach the end */ 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] Sun Mar 15 07:54:41 2009 @@ -44,7 +44,7 @@ extern TCHAR textline[BATCH_BUFFSIZE]; /* Buffer for reading Batch file lines */ -LPTSTR FindArg (INT); +LPTSTR FindArg (TCHAR, BOOL *); LPTSTR BatchParams (LPTSTR, LPTSTR); VOID ExitBatch (LPTSTR); BOOL Batch (LPTSTR, LPTSTR, LPTSTR, PARSED_COMMAND *); 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] Sun Mar 15 07:54:41 2009 @@ -989,52 +989,242 @@ return NULL; } - +/* Handle the %~var syntax */ +static LPTSTR +GetEnhancedVar(TCHAR **pFormat, LPTSTR (*GetVar)(TCHAR, BOOL *)) +{ + static const TCHAR ModifierTable[] = _T("dpnxfsatz"); + enum { + M_DRIVE = 1, /* D: drive letter */ + M_PATH = 2, /* P: path */ + M_NAME = 4, /* N: filename */ + M_EXT = 8, /* X: extension */ + M_FULL = 16, /* F: full path (drive+path+name+ext) */ + M_SHORT = 32, /* S: full path (drive+path+name+ext), use short names */ + M_ATTR = 64, /* A: attributes */ + M_TIME = 128, /* T: modification time */ + M_SIZE = 256, /* Z: file size */ + } Modifiers = 0; + + TCHAR *Format, *FormatEnd; + LPTSTR Variable; + TCHAR *VarEnd; + BOOL VariableIsParam0; + TCHAR FullPath[MAX_PATH]; + TCHAR FixedPath[MAX_PATH], *Filename, *Extension; + HANDLE hFind; + WIN32_FIND_DATA w32fd; + TCHAR *In, *Out; + + static TCHAR Result[CMDLINE_LENGTH]; + + /* There is ambiguity between modifier characters and FOR variables; + * the rule that cmd uses is to pick the longest possible match. + * For example, if there is a %n variable, then out of %~anxnd, + * %~anxn will be substituted rather than just %~an. */ + + /* First, go through as many modifier characters as possible */ + FormatEnd = Format = *pFormat; + while (*FormatEnd && _tcschr(ModifierTable, _totlower(*FormatEnd))) + FormatEnd++; + + /* TODO: check for $PATH: syntax */ + + /* Now backtrack if necessary to get a variable name match */ + while (!(Variable = GetVar(*FormatEnd, &VariableIsParam0))) + { + if (FormatEnd == Format) + return NULL; + FormatEnd--; + } + + for (; Format < FormatEnd; Format++) + Modifiers |= 1 << (_tcschr(ModifierTable, _totlower(*Format)) - ModifierTable); + + *pFormat = FormatEnd + 1; + + /* Exclude the leading and trailing quotes */ + VarEnd = &Variable[_tcslen(Variable)]; + if (*Variable == _T('"')) + { + Variable++; + if (VarEnd > Variable && VarEnd[-1] == _T('"')) + VarEnd--; + } + + if ((char *)VarEnd - (char *)Variable >= sizeof Result) + return _T(""); + memcpy(Result, Variable, (char *)VarEnd - (char *)Variable); + Result[VarEnd - Variable] = _T('\0'); + + /* For plain %~var with no modifiers, just return the variable without quotes */ + if (Modifiers == 0) + return Result; + + if (VariableIsParam0) + { + /* Special case: If the variable is %0 and modifier characters are present, + * use the batch file's path (which includes the .bat/.cmd extension) + * rather than the actual %0 variable (which might not). */ + _tcscpy(FullPath, bc->BatchFilePath); + } + else + { + /* Convert the variable, now without quotes, to a full path */ + if (!GetFullPathName(Result, MAX_PATH, FullPath, NULL)) + return _T(""); + } + + /* Next step is to change the path to fix letter case (e.g. + * C:\ReAcToS -> C:\ReactOS) and, if requested with the S modifier, + * replace long filenames with short. */ + + In = FullPath; + Out = FixedPath; + + /* Copy drive letter */ + *Out++ = *In++; + *Out++ = *In++; + *Out++ = *In++; + /* Loop over each \-separated component in the path */ + do { + TCHAR *Next = _tcschr(In, _T('\\')); + if (Next) + *Next++ = _T('\0'); + /* Use FindFirstFile to get the correct name */ + if (Out + _tcslen(In) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, In); + hFind = FindFirstFile(FixedPath, &w32fd); + /* If it doesn't exist, just leave the name as it was given */ + if (hFind != INVALID_HANDLE_VALUE) + { + LPTSTR FixedComponent = w32fd.cFileName; + if (*w32fd.cAlternateFileName && + ((Modifiers & M_SHORT) || !_tcsicmp(In, w32fd.cAlternateFileName))) + { + FixedComponent = w32fd.cAlternateFileName; + } + FindClose(hFind); + + if (Out + _tcslen(FixedComponent) + 1 >= &FixedPath[MAX_PATH]) + return _T(""); + _tcscpy(Out, FixedComponent); + } + Filename = Out; + Out += _tcslen(Out); + *Out++ = _T('\\'); + + In = Next; + } while (In != NULL); + Out[-1] = _T('\0'); + + /* Build the result string. Start with attributes, modification time, and + * file size. If the file didn't exist, these fields will all be empty. */ + Out = Result; + if (hFind != INVALID_HANDLE_VALUE) + { + if (Modifiers & M_ATTR) + { + static const struct { + TCHAR Character; + WORD Value; + } *Attrib, Table[] = { + { _T('d'), FILE_ATTRIBUTE_DIRECTORY }, + { _T('r'), FILE_ATTRIBUTE_READONLY }, + { _T('a'), FILE_ATTRIBUTE_ARCHIVE }, + { _T('h'), FILE_ATTRIBUTE_HIDDEN }, + { _T('s'), FILE_ATTRIBUTE_SYSTEM }, + { _T('c'), FILE_ATTRIBUTE_COMPRESSED }, + { _T('o'), FILE_ATTRIBUTE_OFFLINE }, + { _T('t'), FILE_ATTRIBUTE_TEMPORARY }, + { _T('l'), FILE_ATTRIBUTE_REPARSE_POINT }, + }; + for (Attrib = Table; Attrib != &Table[9]; Attrib++) + { + *Out++ = w32fd.dwFileAttributes & Attrib->Value + ? Attrib->Character + : _T('-'); + } + *Out++ = _T(' '); + } + if (Modifiers & M_TIME) + { + FILETIME ft; + SYSTEMTIME st; + FileTimeToLocalFileTime(&w32fd.ftLastWriteTime, &ft); + FileTimeToSystemTime(&ft, &st); + + /* TODO: This probably should be locale-dependent */ + Out += _stprintf(Out, + _T("%02d/%02d/%04d %02d:%02d %cM "), + st.wMonth, st.wDay, st.wYear, + (st.wHour + 11) % 12 + 1, st.wMinute, + (st.wHour >= 12) ? _T('P') : _T('A')); + } + if (Modifiers & M_SIZE) + { + ULARGE_INTEGER Size; + Size.LowPart = w32fd.nFileSizeLow; + Size.HighPart = w32fd.nFileSizeHigh; + Out += _stprintf(Out, _T("%I64u "), Size.QuadPart); + } + } + + /* Now add the requested parts of the name. + * With the F or S modifiers, add all parts to form the full path. */ + Extension = _tcsrchr(Filename, _T('.')); + if (Modifiers & (M_DRIVE | M_FULL | M_SHORT)) + { + *Out++ = FixedPath[0]; + *Out++ = FixedPath[1]; + } + if (Modifiers & (M_PATH | M_FULL | M_SHORT)) + { + memcpy(Out, &FixedPath[2], (char *)Filename - (char *)&FixedPath[2]); + Out += Filename - &FixedPath[2]; + } + if (Modifiers & (M_NAME | M_FULL | M_SHORT)) + { + while (*Filename && Filename != Extension) + *Out++ = *Filename++; + } + if (Modifiers & (M_EXT | M_FULL | M_SHORT)) + { + if (Extension) + Out = _stpcpy(Out, Extension); + } + + /* Trim trailing space which otherwise would appear as a + * result of using the A/T/Z modifiers but no others. */ + while (Out != &Result[0] && Out[-1] == _T(' ')) + Out--; + *Out = _T('\0'); + + return Result; +} LPCTSTR -GetBatchVar ( LPCTSTR varName, UINT* varNameLen ) -{ - static LPTSTR ret = NULL; - static UINT retlen = 0; - DWORD len; +GetBatchVar(TCHAR *varName, UINT *varNameLen) +{ + LPCTSTR ret; + TCHAR *varNameEnd; + BOOL dummy; *varNameLen = 1; switch ( *varName ) { case _T('~'): - varName++; - if (_tcsncicmp(varName, _T("dp0"), 3) == 0) - { - *varNameLen = 4; - len = _tcsrchr(bc->BatchFilePath, _T('\\')) + 1 - bc->BatchFilePath; - if (!GrowIfNecessary(len + 1, &ret, &retlen)) - return NULL; - memcpy(ret, bc->BatchFilePath, len * sizeof(TCHAR)); - ret[len] = _T('\0'); - return ret; - } - - *varNameLen = 2; - if (*varName >= _T('0') && *varName <= _T('9')) { - LPTSTR arg = FindArg(*varName - _T('0')); - - if (*arg != _T('"')) - return arg; - - /* Exclude the leading and trailing quotes */ - arg++; - len = _tcslen(arg); - if (arg[len - 1] == _T('"')) - len--; - - if (!GrowIfNecessary(len + 1, &ret, &retlen)) - return NULL; - memcpy(ret, arg, len * sizeof(TCHAR)); - ret[len] = _T('\0'); - return ret; - } - break; + varNameEnd = varName + 1; + ret = GetEnhancedVar(&varNameEnd, FindArg); + if (!ret) + { + error_syntax(varName); + return NULL; + } + *varNameLen = varNameEnd - varName; + return ret; case _T('0'): case _T('1'): case _T('2'): @@ -1045,7 +1235,7 @@ case _T('7'): case _T('8'): case _T('9'): - return FindArg(*varName - _T('0')); + return FindArg(*varName, &dummy); case _T('*'): // @@ -1212,26 +1402,41 @@ #undef APPEND1 } +/* Search the list of FOR contexts for a variable */ +static LPTSTR FindForVar(TCHAR Var, BOOL *IsParam0) +{ + FOR_CONTEXT *Ctx; + *IsParam0 = FALSE; + for (Ctx = fc; Ctx != NULL; Ctx = Ctx->prev) + if ((UINT)(Var - Ctx->firstvar) < Ctx->varcount) + return Ctx->values[Var - Ctx->firstvar]; + return NULL; +} + BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest) { TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; while (*Src) { - if (Src[0] == _T('%') && Src[1] != _T('\0')) - { - /* This might be a variable. Search the list of contexts for it */ - FOR_CONTEXT *Ctx = fc; - while (Ctx && (UINT)(Src[1] - Ctx->firstvar) >= Ctx->varcount) - Ctx = Ctx->prev; - if (Ctx) - { - /* Found it */ - LPTSTR Value = Ctx->values[Src[1] - Ctx->firstvar]; + if (Src[0] == _T('%')) + { + BOOL Dummy; + LPTSTR End = &Src[2]; + LPTSTR Value = NULL; + + if (Src[1] == _T('~')) + Value = GetEnhancedVar(&End, FindForVar); + + if (!Value) + Value = FindForVar(Src[1], &Dummy); + + if (Value) + { if (Dest + _tcslen(Value) > DestEnd) return FALSE; Dest = _stpcpy(Dest, Value); - Src += 2; + Src = End; continue; } }

16 years, 2 months

[jimtabor] 40023: - Add Font attribute support for NtGdiHfontCreate.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Mar 15 07:42:45 2009 New Revision: 40023 URL: http://svn.reactos.org/svn/reactos?rev=40023&view=rev Log: - Add Font attribute support for NtGdiHfontCreate. Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c Modified: trunk/reactos/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/font.c [iso-8859-1] Sun Mar 15 07:42:45 2009 @@ -816,6 +816,18 @@ } TEXTOBJ_UnlockText(TextObj); + if (pvCliData && hNewFont) + { + // FIXME: use GDIOBJ_InsertUserData + KeEnterCriticalRegion(); + { + INT Index = GDI_HANDLE_GET_INDEX((HGDIOBJ)hNewFont); + PGDI_TABLE_ENTRY Entry = &GdiHandleTable->Entries[Index]; + Entry->UserData = pvCliData; + } + KeLeaveCriticalRegion(); + } + return hNewFont; }

16 years, 2 months

[dgorbachev] 40022: Add multimedia player to syssetup. Mario Kacmar, bug #4274. Fix formatting.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 15 05:37:06 2009 New Revision: 40022 URL: http://svn.reactos.org/svn/reactos?rev=40022&view=rev Log: Add multimedia player to syssetup. Mario Kacmar, bug #4274. Fix formatting. Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/resource.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/install.c [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -772,10 +772,11 @@ { CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CALC, _T("%SystemRoot%\\system32\\calc.exe"), IDS_CMT_CALC, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_CMD, _T("%SystemRoot%\\system32\\cmd.exe"), IDS_CMT_CMD, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_MPLAY32, _T("%SystemRoot%\\system32\\mplay32.exe"), IDS_CMT_MPLAY32, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_NOTEPAD, _T("%SystemRoot%\\system32\\notepad.exe"), IDS_CMT_NOTEPAD, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); + CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_WORDPAD, _T("%SystemRoot%\\system32\\wordpad.exe"), IDS_CMT_WORDPAD, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_SNAP, _T("%SystemRoot%\\system32\\screenshot.exe"), IDS_CMT_SCREENSHOT, TRUE); - CreateShortcut(CSIDL_PROGRAMS, szFolder, IDS_SHORT_RDESKTOP, _T("%SystemRoot%\\system32\\mstsc.exe"), IDS_CMT_RDESKTOP, TRUE); } /* Create System Tools subfolder and fill if the exe is available */ Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -200,6 +200,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Ïðèíàäëåæíîñòè" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Ïóñêàíå íà èç÷èñëèòåëÿ" IDS_CMT_CMD "Îòâàðÿíå íà êîìàíäíèÿ ïðîçîðåö" IDS_CMT_EXPLORER "Ïóñêàíå íà èçñëåäîâàòåëÿ" @@ -255,6 +256,7 @@ IDS_SHORT_DOWNLOADER "Ñâàëè!.lnk" IDS_SHORT_SERVICE "Óïðàâèòåë íà óñëóãèòå.lnk" IDS_SHORT_DEVICE "Óïðàâèòåë íà óñòðîéñòâàòà.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Èç÷èñëèòåë.lnk" IDS_SHORT_REGEDIT "Îáðàáîòêà íà ðåãèñòúðà.lnk" IDS_SHORT_NOTEPAD "Áåëåæíèê.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -196,6 +196,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Pøísluenství" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Spustit Kalkulaèku" IDS_CMT_CMD "Otevøít Pøíkazový øádek" IDS_CMT_EXPLORER "Spustit Explorer" @@ -251,6 +252,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Správce slueb.lnk" IDS_SHORT_DEVICE "Správce zaøízení.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Kalkulaèka.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Poznámkový blok.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -196,6 +196,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Zubehör" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Starte Taschenrechner" IDS_CMT_CMD "Öffne Kommandozeilenfenster" IDS_CMT_EXPLORER "Starte Explorer" @@ -251,6 +252,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Dienste-Manager.lnk" IDS_SHORT_DEVICE "Geräte-Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Rechner.lnk" IDS_SHORT_REGEDIT "Registrierungseditor.lnk" IDS_SHORT_NOTEPAD "Editor.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "ÂïçèÞìáôá" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Áñéèìïìç÷áíÞ" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "ÅîåñåõíçôÞò" @@ -252,6 +253,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Õðçñåóßåò.lnk" IDS_SHORT_DEVICE "Äéá÷åßñéóç óõóêåõþí.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Áñéèìïìç÷áíÞ.lnk" IDS_SHORT_REGEDIT "ÅðåîåñãáóôÞò ìçôñþïõ.lnk" IDS_SHORT_NOTEPAD "ÓçìåéùìáôÜñéï.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -199,82 +199,84 @@ IDS_ACCESSORIES "Accessories" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" + IDS_CMT_DEVMGMT "Launch Device Manager" + IDS_CMT_EVENTVIEW "Launch Event Viewer" IDS_CMT_EXPLORER "Launch Explorer" + IDS_CMT_MPLAY32 "Launch Multimedia Player" + IDS_CMT_MSCONFIG "Launch System Configuration program" IDS_CMT_NOTEPAD "Launch Text Editor" + IDS_CMT_RDESKTOP "Launch Remote Desktop" IDS_CMT_REGEDIT "Launch Registry Editor" + IDS_CMT_SERVMAN "Launch Service Manager" + IDS_CMT_SCREENSHOT "Take screenshot" IDS_CMT_WORDPAD "Launch Document Editor" - IDS_CMT_SCREENSHOT "Take screenshot" - IDS_CMT_DEVMGMT "Launch Device Manager" - IDS_CMT_SERVMAN "Launch Service Manager" - IDS_CMT_RDESKTOP "Launch Remote Desktop" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Games" - IDS_CMT_SOLITAIRE "Solitaire" - IDS_CMT_WINEMINE "WineMine" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System Tools" - IDS_CMT_CHARMAP "Character Map" - IDS_CMT_KBSWITCH "Keyboard Layout Switcher" -END - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Accessibility" - IDS_CMT_MAGNIFY "Magnify" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "ReactOS Setup" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Games" + IDS_CMT_SOLITAIRE "Solitaire" + IDS_CMT_WINEMINE "WineMine" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "System Tools" + IDS_CMT_CHARMAP "Character Map" + IDS_CMT_KBSWITCH "Keyboard Layout Switcher" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Accessibility" + IDS_CMT_MAGNIFY "Magnify" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS Setup" IDS_UNKNOWN_ERROR "Unknown error" IDS_REGISTERING_COMPONENTS "Registering components..." - IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " - IDS_GETPROCADDR_FAILED "GetProcAddr failed: " + IDS_LOADLIBRARY_FAILED "LoadLibrary failed: " + IDS_GETPROCADDR_FAILED "GetProcAddr failed: " IDS_REGSVR_FAILED "DllRegisterServer failed: " - IDS_DLLINSTALL_FAILED "DllInstall failed: " - IDS_TIMEOUT "Timeout during registration" + IDS_DLLINSTALL_FAILED "DllInstall failed: " + IDS_TIMEOUT "Timeout during registration" IDS_REASON_UNKNOWN "" END STRINGTABLE BEGIN + IDS_SHORT_CALC "Calculator.lnk" + IDS_SHORT_CHARMAP "Character Map.lnk" IDS_SHORT_CMD "Command Prompt.lnk" + IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_EVENTVIEW "Event Viewer.lnk" IDS_SHORT_EXPLORER "ReactOS Explorer.lnk" - IDS_SHORT_DOWNLOADER "Download !.lnk" + IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" + IDS_SHORT_MAGNIFY "Magnify.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" + IDS_SHORT_MSCONFIG "System Configuration.lnk" + IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_RDESKTOP "Remote Desktop.lnk" + IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" - IDS_SHORT_DEVICE "Device Manager.lnk" - IDS_SHORT_CALC "Calculator.lnk" - IDS_SHORT_REGEDIT "Regedit.lnk" - IDS_SHORT_NOTEPAD "Notepad.lnk" - IDS_SHORT_WORDPAD "WordPad.lnk" IDS_SHORT_SNAP "SnapShot.lnk" IDS_SHORT_SOLITAIRE "Solitaire.lnk" IDS_SHORT_WINEMINE "WineMine.lnk" - IDS_SHORT_CHARMAP "Character Map.lnk" - IDS_SHORT_MAGNIFY "Magnify.lnk" - IDS_SHORT_RDESKTOP "Remote Desktop.lnk" - IDS_SHORT_KBSWITCH "Keyboard Layout Switcher.lnk" - IDS_SHORT_EVENTVIEW "Event Viewer.lnk" - IDS_SHORT_MSCONFIG "System Configuration.lnk" -END - -STRINGTABLE -BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." + IDS_SHORT_WORDPAD "WordPad.lnk" +END + +STRINGTABLE +BEGIN + IDS_WZD_NAME "Setup cannot continue until you enter your name." + IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." + IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." + IDS_WZD_PASSWORDEMPTY "You must enter a password !" + IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." + IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." + IDS_WZD_LOCALTIME "Setup was unable to set the local time." END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -206,6 +206,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accesorios" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Ejecutar Calculadora" IDS_CMT_CMD "Abrir Símbolo del sistema" IDS_CMT_EXPLORER "Ejecutar Explorador" @@ -261,6 +262,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Administrador de Servicios.lnk" IDS_SHORT_DEVICE "Administrador de Dispositivos.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculadora.lnk" IDS_SHORT_REGEDIT "Editor de registro.lnk" IDS_SHORT_NOTEPAD "Bloc de notas.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessoires" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Lancer la Calculatrice" IDS_CMT_CMD "Ouvrir l'invite de commandes" IDS_CMT_EXPLORER "Lancer Explorer" @@ -251,6 +252,7 @@ IDS_SHORT_DOWNLOADER "Télécharger !.lnk" IDS_SHORT_SERVICE "Gestionnaire de services.lnk" IDS_SHORT_DEVICE "Gestionnaire de périphériques.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculatrice.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -209,6 +209,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -264,6 +265,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -195,6 +195,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Aksesoris" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Jalankan Kalkulator" IDS_CMT_CMD "Buka prompt perintah" IDS_CMT_EXPLORER "Jalankan Explorer" @@ -249,6 +250,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -188,6 +188,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessori" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Calcolatrice" IDS_CMT_CMD "Apri la finestra dei comandi" IDS_CMT_EXPLORER "Lancia Explorer" @@ -242,6 +243,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -251,6 +252,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -197,6 +197,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Accessories" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Launch Calculator" IDS_CMT_CMD "Open command prompt" IDS_CMT_EXPLORER "Launch Explorer" @@ -251,6 +252,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -200,6 +200,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Tilbehør" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Start Kalkulator" IDS_CMT_CMD "Åpne command prompt" IDS_CMT_EXPLORER "Start Explorer" @@ -254,6 +255,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -205,6 +205,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Akcesoria" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Uruchom Kalkulator" IDS_CMT_CMD "Uruchom konsolê" IDS_CMT_EXPLORER "Uruchom Eksplorator" @@ -260,6 +261,7 @@ IDS_SHORT_DOWNLOADER "Download!.lnk" IDS_SHORT_SERVICE "Mened¿er us³ug.lnk" IDS_SHORT_DEVICE "Mened¿er urz¹dzeñ.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Kalkulator.lnk" IDS_SHORT_REGEDIT "Edytor rejestru.lnk" IDS_SHORT_NOTEPAD "Notatnik.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -178,6 +178,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Ñòàíäàðòíûå" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Çàïóñòèòü êàëüêóëÿòîð" IDS_CMT_CMD "Îòêðûòü êîìàíäíóþ ñòðîêó" IDS_CMT_EXPLORER "Çàïóñòèòü Ïðîâîäíèê" @@ -233,6 +234,7 @@ IDS_SHORT_DOWNLOADER "Ñêà÷àòü !.lnk" IDS_SHORT_SERVICE "Äèñïåò÷åð ñëóæá.lnk" IDS_SHORT_DEVICE "Äèñïåò÷åð óñòðîéñòâ.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Êàëüêóëÿòîð.lnk" IDS_SHORT_REGEDIT "Ðåäàêòîð ðååñòðà.lnk" IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 09-02-2008 - * LAST CHANGE: 16-06-2008 + * LAST CHANGE: 14-03-2009 * THANKS TO : Filip Navara and Kamil Hornicek and all good people ;-) */ @@ -182,6 +182,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Prísluenstvo" + IDS_CMT_MPLAY32 "Spusti Multimediálny prehrávaè" IDS_CMT_CALC "Spusti Kalkulaèku" IDS_CMT_CMD "Otvori Príkazový riadok" IDS_CMT_EXPLORER "Spusti Prieskumníka" @@ -237,6 +238,7 @@ IDS_SHORT_DOWNLOADER "ahaj!.lnk" IDS_SHORT_SERVICE "Správca sluieb.lnk" IDS_SHORT_DEVICE "Správca zariadení.lnk" + IDS_SHORT_MPLAY32 "Multimediálny prehrávaè.lnk" IDS_SHORT_CALC "Kalkulaèka.lnk" IDS_SHORT_REGEDIT "Editor registrov.lnk" IDS_SHORT_NOTEPAD "Poznámkový blok.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -186,6 +186,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "Äîïîì³æí³ ïðîãðàìè" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" @@ -241,6 +242,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "Service Manager.lnk" IDS_SHORT_DEVICE "Device Manager.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "Calculator.lnk" IDS_SHORT_REGEDIT "Regedit.lnk" IDS_SHORT_NOTEPAD "Notepad.lnk" Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -185,6 +185,7 @@ STRINGTABLE BEGIN IDS_ACCESSORIES "¸½¼þ" + IDS_CMT_MPLAY32 "Launch Multimedia Player" IDS_CMT_CALC "¼ÆËãÆ÷" IDS_CMT_CMD "ÃüÁîÌáÊ¾·û" IDS_CMT_EXPLORER "ReactOS ×ÊÔ´¹ÜÀíÆ÷" @@ -239,6 +240,7 @@ IDS_SHORT_DOWNLOADER "Download !.lnk" IDS_SHORT_SERVICE "·þÎñ.lnk" IDS_SHORT_DEVICE "Éè±¸¹ÜÀí.lnk" + IDS_SHORT_MPLAY32 "Multimedia Player.lnk" IDS_SHORT_CALC "¼ÆËãÆ÷.lnk" IDS_SHORT_REGEDIT "×¢²á±í±à¼Æ÷.lnk" IDS_SHORT_NOTEPAD "¼ÇÊÂ±¾.lnk" Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Mar 15 05:37:06 2009 @@ -19,137 +19,139 @@ #ifndef RESOURCE_H #define RESOURCE_H -#define IDB_WATERMARK 100 -#define IDB_HEADER 101 +#define IDB_WATERMARK 100 +#define IDB_HEADER 101 -#define IDC_STATIC -1 +#define IDC_STATIC -1 -#define IDD_WELCOMEPAGE 1000 -#define IDC_WELCOMETITLE 1001 +#define IDD_WELCOMEPAGE 1000 +#define IDC_WELCOMETITLE 1001 -#define IDD_ACKPAGE 1010 -#define IDC_PROJECTS 1011 -#define IDC_VIEWGPL 1012 +#define IDD_ACKPAGE 1010 +#define IDC_PROJECTS 1011 +#define IDC_VIEWGPL 1012 -#define IDD_OWNERPAGE 1020 -#define IDC_OWNERNAME 1021 -#define IDC_OWNERORGANIZATION 1022 +#define IDD_OWNERPAGE 1020 +#define IDC_OWNERNAME 1021 +#define IDC_OWNERORGANIZATION 1022 -#define IDD_COMPUTERPAGE 1030 -#define IDC_COMPUTERNAME 1031 -#define IDC_ADMINPASSWORD1 1032 -#define IDC_ADMINPASSWORD2 1033 +#define IDD_COMPUTERPAGE 1030 +#define IDC_COMPUTERNAME 1031 +#define IDC_ADMINPASSWORD1 1032 +#define IDC_ADMINPASSWORD2 1033 -#define IDD_LOCALEPAGE 1040 -#define IDC_LOCALETEXT 1041 -#define IDC_CUSTOMLOCALE 1042 -#define IDC_LAYOUTTEXT 1043 -#define IDC_CUSTOMLAYOUT 1044 +#define IDD_LOCALEPAGE 1040 +#define IDC_LOCALETEXT 1041 +#define IDC_CUSTOMLOCALE 1042 +#define IDC_LAYOUTTEXT 1043 +#define IDC_CUSTOMLAYOUT 1044 -#define IDD_DATETIMEPAGE 1050 -#define IDC_DATEPICKER 1051 -#define IDC_TIMEPICKER 1052 -#define IDC_TIMEZONELIST 1053 -#define IDC_AUTODAYLIGHT 1054 +#define IDD_DATETIMEPAGE 1050 +#define IDC_DATEPICKER 1051 +#define IDC_TIMEPICKER 1052 +#define IDC_TIMEZONELIST 1053 +#define IDC_AUTODAYLIGHT 1054 -#define IDD_PROCESSPAGE 1060 -#define IDC_ACTIVITY 1061 -#define IDC_ITEM 1062 -#define IDC_PROCESSPROGRESS 1063 +#define IDD_PROCESSPAGE 1060 +#define IDC_ACTIVITY 1061 +#define IDC_ITEM 1062 +#define IDC_PROCESSPROGRESS 1063 -#define IDD_FINISHPAGE 1070 -#define IDC_FINISHTITLE 1071 -#define IDC_RESTART_PROGRESS 1072 +#define IDD_FINISHPAGE 1070 +#define IDC_FINISHTITLE 1071 +#define IDC_RESTART_PROGRESS 1072 -#define IDD_GPL 2100 -#define IDC_GPL_TEXT 2101 +#define IDD_GPL 2100 +#define IDC_GPL_TEXT 2101 -#define IDD_STATUSWINDOW_DLG 2200 -#define IDC_STATUSLABEL 2201 +#define IDD_STATUSWINDOW_DLG 2200 +#define IDC_STATUSLABEL 2201 -#define IDS_ACKTITLE 3010 -#define IDS_ACKSUBTITLE 3011 +#define IDS_ACKTITLE 3010 +#define IDS_ACKSUBTITLE 3011 -#define IDS_OWNERTITLE 3020 -#define IDS_OWNERSUBTITLE 3021 +#define IDS_OWNERTITLE 3020 +#define IDS_OWNERSUBTITLE 3021 -#define IDS_COMPUTERTITLE 3030 -#define IDS_COMPUTERSUBTITLE 3031 +#define IDS_COMPUTERTITLE 3030 +#define IDS_COMPUTERSUBTITLE 3031 -#define IDS_LOCALETITLE 3040 -#define IDS_LOCALESUBTITLE 3041 +#define IDS_LOCALETITLE 3040 +#define IDS_LOCALESUBTITLE 3041 -#define IDS_DATETIMETITLE 3050 -#define IDS_DATETIMESUBTITLE 3051 +#define IDS_DATETIMETITLE 3050 +#define IDS_DATETIMESUBTITLE 3051 -#define IDS_PROCESSTITLE 3060 -#define IDS_PROCESSSUBTITLE 3061 +#define IDS_PROCESSTITLE 3060 +#define IDS_PROCESSSUBTITLE 3061 -#define IDS_ACKPROJECTS 3100 +#define IDS_ACKPROJECTS 3100 -#define IDS_ACCESSORIES 3200 -#define IDS_GAMES 3201 -#define IDS_SYS_TOOLS 3202 -#define IDS_SYS_ACCESSIBILITY 3203 +#define IDS_ACCESSORIES 3200 +#define IDS_GAMES 3201 +#define IDS_SYS_TOOLS 3202 +#define IDS_SYS_ACCESSIBILITY 3203 -#define IDS_CMT_CMD 3210 -#define IDS_CMT_EXPLORER 3211 -#define IDS_CMT_NOTEPAD 3213 -#define IDS_CMT_REGEDIT 3214 -#define IDS_CMT_CALC 3215 -#define IDS_CMT_SOLITAIRE 3216 -#define IDS_CMT_WINEMINE 3217 -#define IDS_CMT_SERVMAN 3219 -#define IDS_CMT_WORDPAD 3220 -#define IDS_CMT_SCREENSHOT 3221 -#define IDS_CMT_DOWNLOADER 3222 -#define IDS_CMT_DEVMGMT 3223 -#define IDS_CMT_CHARMAP 3224 -#define IDS_CMT_MAGNIFY 3225 -#define IDS_CMT_RDESKTOP 3226 -#define IDS_CMT_KBSWITCH 3227 -#define IDS_CMT_EVENTVIEW 3228 -#define IDS_CMT_MSCONFIG 3229 +#define IDS_CMT_CALC 3210 +#define IDS_CMT_CHARMAP 3211 +#define IDS_CMT_CMD 3212 +#define IDS_CMT_DEVMGMT 3213 +#define IDS_CMT_DOWNLOADER 3214 +#define IDS_CMT_EVENTVIEW 3215 +#define IDS_CMT_EXPLORER 3216 +#define IDS_CMT_KBSWITCH 3217 +#define IDS_CMT_MAGNIFY 3218 +#define IDS_CMT_MPLAY32 3219 +#define IDS_CMT_MSCONFIG 3220 +#define IDS_CMT_NOTEPAD 3221 +#define IDS_CMT_RDESKTOP 3222 +#define IDS_CMT_REGEDIT 3223 +#define IDS_CMT_SERVMAN 3224 +#define IDS_CMT_SCREENSHOT 3225 +#define IDS_CMT_SOLITAIRE 3226 +#define IDS_CMT_WINEMINE 3227 +#define IDS_CMT_WORDPAD 3228 -#define IDS_REACTOS_SETUP 3300 -#define IDS_UNKNOWN_ERROR 3301 -#define IDS_REGISTERING_COMPONENTS 3302 -#define IDS_LOADLIBRARY_FAILED 3303 -#define IDS_GETPROCADDR_FAILED 3304 -#define IDS_REGSVR_FAILED 3305 -#define IDS_DLLINSTALL_FAILED 3306 -#define IDS_TIMEOUT 3307 -#define IDS_REASON_UNKNOWN 3308 +#define IDS_REACTOS_SETUP 3300 +#define IDS_UNKNOWN_ERROR 3301 +#define IDS_REGISTERING_COMPONENTS 3302 +#define IDS_LOADLIBRARY_FAILED 3303 +#define IDS_GETPROCADDR_FAILED 3304 +#define IDS_REGSVR_FAILED 3305 +#define IDS_DLLINSTALL_FAILED 3306 +#define IDS_TIMEOUT 3307 +#define IDS_REASON_UNKNOWN 3308 -#define IDS_SHORT_CMD 3400 -#define IDS_SHORT_EXPLORER 3401 -#define IDS_SHORT_DOWNLOADER 3402 -#define IDS_SHORT_SERVICE 3404 -#define IDS_SHORT_DEVICE 3405 -#define IDS_SHORT_CALC 3406 -#define IDS_SHORT_REGEDIT 3407 -#define IDS_SHORT_NOTEPAD 3408 -#define IDS_SHORT_WORDPAD 3409 -#define IDS_SHORT_SNAP 3410 -#define IDS_SHORT_SOLITAIRE 3411 -#define IDS_SHORT_WINEMINE 3412 -#define IDS_SHORT_CHARMAP 3413 -#define IDS_SHORT_MAGNIFY 3414 -#define IDS_SHORT_RDESKTOP 3415 -#define IDS_SHORT_KBSWITCH 3416 -#define IDS_SHORT_EVENTVIEW 3417 -#define IDS_SHORT_MSCONFIG 3418 +#define IDS_SHORT_CALC 3400 +#define IDS_SHORT_CHARMAP 3401 +#define IDS_SHORT_CMD 3402 +#define IDS_SHORT_DEVICE 3403 +#define IDS_SHORT_DOWNLOADER 3404 +#define IDS_SHORT_EVENTVIEW 3405 +#define IDS_SHORT_EXPLORER 3406 +#define IDS_SHORT_KBSWITCH 3407 +#define IDS_SHORT_MAGNIFY 3408 +#define IDS_SHORT_MPLAY32 3409 +#define IDS_SHORT_MSCONFIG 3410 +#define IDS_SHORT_NOTEPAD 3411 +#define IDS_SHORT_RDESKTOP 3412 +#define IDS_SHORT_REGEDIT 3413 +#define IDS_SHORT_SERVICE 3414 +#define IDS_SHORT_SNAP 3415 +#define IDS_SHORT_SOLITAIRE 3416 +#define IDS_SHORT_WINEMINE 3417 +#define IDS_SHORT_WORDPAD 3418 -#define IDS_WZD_NAME 3450 -#define IDS_WZD_SETCOMPUTERNAME 3451 -#define IDS_WZD_COMPUTERNAME 3452 -#define IDS_WZD_PASSWORDEMPTY 3453 -#define IDS_WZD_PASSWORDMATCH 3454 -#define IDS_WZD_PASSWORDCHAR 3455 -#define IDS_WZD_LOCALTIME 3456 +#define IDS_WZD_NAME 3450 +#define IDS_WZD_SETCOMPUTERNAME 3451 +#define IDS_WZD_COMPUTERNAME 3452 +#define IDS_WZD_PASSWORDEMPTY 3453 +#define IDS_WZD_PASSWORDMATCH 3454 +#define IDS_WZD_PASSWORDCHAR 3455 +#define IDS_WZD_LOCALTIME 3456 -#define IDS_STATUS_INSTALL_DEV 3500 +#define IDS_STATUS_INSTALL_DEV 3500 -#define IDR_GPL 4000 +#define IDR_GPL 4000 #endif /* RESOURCE_H */

16 years, 2 months

[dgorbachev] 40021: Uncomment locks, remove unnecessary stuff.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 15 05:05:40 2009 New Revision: 40021 URL: http://svn.reactos.org/svn/reactos?rev=40021&view=rev Log: Uncomment locks, remove unnecessary stuff. Modified: trunk/reactos/ntoskrnl/mm/hypermap.c Modified: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sun Mar 15 05:05:40 2009 @@ -14,11 +14,8 @@ /* GLOBALS ********************************************************************/ -#define MI_ZEROING_PTES 255 - PMMPTE MmFirstReservedMappingPte; PMMPTE MmLastReservedMappingPte; -PMMPTE MmFirstReservedZeroingPte; MMPTE HyperTemplatePte; PEPROCESS HyperProcess; KIRQL HyperIrql; @@ -30,21 +27,19 @@ MiInitHyperSpace(VOID) { PMMPTE PointerPte; - + // // Get the hyperspace PTE and zero out the page table // PointerPte = MiAddressToPte(HYPER_SPACE); RtlZeroMemory(PointerPte, PAGE_SIZE); - + // // Setup mapping PTEs // MmFirstReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_START); MmLastReservedMappingPte = MiAddressToPte(MI_MAPPING_RANGE_END); MmFirstReservedMappingPte->u.Hard.PageFrameNumber = MI_HYPERSPACE_PTES; - MmFirstReservedZeroingPte = MiAddressToPte(MI_ZERO_PTE); - MmFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZEROING_PTES; } PVOID @@ -78,7 +73,7 @@ // Acquire the hyperlock // ASSERT(Process == PsGetCurrentProcess()); - //KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); + KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); // // Now get the first free PTE @@ -129,8 +124,8 @@ // // Release the hyperlock // - //ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - //KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); } PVOID

16 years, 2 months

[dgorbachev] 40020: Trying to use r39938 variant again...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 15 04:23:47 2009 New Revision: 40020 URL: http://svn.reactos.org/svn/reactos?rev=40020&view=rev Log: Trying to use r39938 variant again... Modified: trunk/reactos/ntoskrnl/mm/hypermap.c Modified: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sun Mar 15 04:23:47 2009 @@ -139,7 +139,6 @@ { MMPTE TempPte; PMMPTE PointerPte; - PFN_NUMBER Offset; PVOID Address; // @@ -154,47 +153,24 @@ TempPte.u.Hard.PageFrameNumber = Page; // - // Pick the first zeroing PTE + // Get the Zero PTE and its address // - PointerPte = MmFirstReservedZeroingPte; + PointerPte = MiAddressToPte(MI_ZERO_PTE); + Address = (PVOID)((ULONG_PTR)PointerPte << 10); // - // Now get the first free PTE + // Invalidate the old address // - Offset = PFN_FROM_PTE(PointerPte); - if (!Offset) - { - // - // Reset the PTEs - // - Offset = MI_ZEROING_PTES; - KeFlushProcessTb(); - } - - // - // Prepare the next PTE - // - PointerPte->u.Hard.PageFrameNumber = Offset - 1; + __invlpg(Address); // // Write the current PTE // - PointerPte += Offset; + TempPte.u.Hard.PageFrameNumber = Page; *PointerPte = TempPte; // // Return the address // - Address = (PVOID)((ULONG_PTR)PointerPte << 10); return Address; } - -VOID -NTAPI -MiUnmapPageInZeroSpace(IN PVOID Address) -{ - // - // Blow away the mapping - // - MiAddressToPte(Address)->u.Long = 0; -}

16 years, 2 months

[dgorbachev] 40019: Disable locks for now.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 15 03:27:59 2009 New Revision: 40019 URL: http://svn.reactos.org/svn/reactos?rev=40019&view=rev Log: Disable locks for now. Modified: trunk/reactos/ntoskrnl/mm/hypermap.c Modified: trunk/reactos/ntoskrnl/mm/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/hypermap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/hypermap.c [iso-8859-1] Sun Mar 15 03:27:59 2009 @@ -78,7 +78,7 @@ // Acquire the hyperlock // ASSERT(Process == PsGetCurrentProcess()); - KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); + //KeAcquireSpinLock(&Process->HyperSpaceLock, OldIrql); // // Now get the first free PTE @@ -129,8 +129,8 @@ // // Release the hyperlock // - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); + //ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + //KeReleaseSpinLock(&Process->HyperSpaceLock, OldIrql); } PVOID

16 years, 2 months

[dgorbachev] 40018: - Use MmCreateHyperspaceMapping() again. - Delete hyperspace mapping before releasing cache segment (bug #4249).

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Sun Mar 15 00:29:37 2009 New Revision: 40018 URL: http://svn.reactos.org/svn/reactos?rev=40018&view=rev Log: - Use MmCreateHyperspaceMapping() again. - Delete hyperspace mapping before releasing cache segment (bug #4249). Modified: trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Mar 15 00:29:37 2009 @@ -1076,18 +1076,18 @@ { ULONG StartOffset, EndOffset, Offset; PULONG Pde; - + if (Address < MmSystemRangeStart) { KeBugCheck(MEMORY_MANAGEMENT); } - + StartOffset = ADDR_TO_PDE_OFFSET(Address); EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); - + if (Process != NULL && Process != PsGetCurrentProcess()) { - Pde = MiMapPageToZeroInHyperSpace(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); } else { @@ -1099,6 +1099,10 @@ { InterlockedCompareExchangePte(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); } + } + if (Pde != (PULONG)PAGEDIRECTORY_MAP) + { + MmDeleteHyperspaceMapping(Pde); } } Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Mar 15 00:29:37 2009 @@ -691,7 +691,8 @@ return Status; } } - PageAddr = MiMapPageToZeroInHyperSpace(*Page); + + PageAddr = MmCreateHyperspaceMapping(*Page); CacheSegOffset = BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset; Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) @@ -705,6 +706,7 @@ else { memcpy(PageAddr, (char*)BaseAddress + FileOffset - BaseOffset, CacheSegOffset); + MmDeleteHyperspaceMapping(PageAddr); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); Status = CcRosGetCacheSegment(Bcb, FileOffset + CacheSegOffset, @@ -729,6 +731,7 @@ return Status; } } + PageAddr = MmCreateHyperspaceMapping(*Page); if (Length < PAGE_SIZE) { memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, Length - CacheSegOffset); @@ -738,6 +741,7 @@ memcpy((char*)PageAddr + CacheSegOffset, BaseAddress, PAGE_SIZE - CacheSegOffset); } } + MmDeleteHyperspaceMapping(PageAddr); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); } return(STATUS_SUCCESS);

16 years, 2 months

[mjmartin] 40017: - Fix few more wine tests for services; return correct param values for GetServiceDisplayNameW and GetServiceKeyNameW when service name is not found.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Mar 14 22:35:34 2009 New Revision: 40017 URL: http://svn.reactos.org/svn/reactos?rev=40017&view=rev Log: - Fix few more wine tests for services; return correct param values for GetServiceDisplayNameW and GetServiceKeyNameW when service name is not found. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Mar 14 22:35:34 2009 @@ -2772,11 +2772,11 @@ { DPRINT1("Could not find a service!\n"); - /* If the service could not be found and lpcchBuffer is 0, windows - puts null in lpDisplayName and puts 1 in lpcchBuffer */ - if (*lpcchBuffer == 0) - { - *lpcchBuffer = 1; + /* If the service could not be found and lpcchBuffer is less than 2, windows + puts null in lpDisplayName and puts 2 in lpcchBuffer */ + if (*lpcchBuffer < 2) + { + *lpcchBuffer = 2; if (lpDisplayName != NULL) { *lpDisplayName = '\0'; @@ -2846,9 +2846,9 @@ { DPRINT1("Could not find a service!\n"); - /* If the service could not be found and lpcchBuffer is 0, windows + /* If the service could not be found and lpcchBuffer is less than 2, windows puts null in lpDisplayName and puts 2 in lpcchBuffer */ - if (*lpcchBuffer == 0) + if (*lpcchBuffer < 2) { *lpcchBuffer = 2; if (lpServiceName != NULL)

16 years, 2 months

[janderwald] 40016: [20:33] Stefan100: the code inside an ASSERT won't be executed on release

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Mar 14 22:34:25 2009 New Revision: 40016 URL: http://svn.reactos.org/svn/reactos?rev=40016&view=rev Log: [20:33] Stefan100: the code inside an ASSERT won't be executed on release Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Sat Mar 14 22:34:25 2009 @@ -154,7 +154,8 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); - ASSERT(This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice) == STATUS_SUCCESS); + Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice); + ASSERT(Status == STATUS_SUCCESS); ASSERT(SubDevice != NULL); Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor);

16 years, 2 months

[janderwald] 40015: - Silence a few debug prints - Add a tag for each queued irp which will be used by the future IPortPinWavePci object - Add support for basic support for capture devices - Implement IPortWavePciStream object

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Mar 14 21:57:51 2009 New Revision: 40015 URL: http://svn.reactos.org/svn/reactos?rev=40015&view=rev Log: - Silence a few debug prints - Add a tag for each queued irp which will be used by the future IPortPinWavePci object - Add support for basic support for capture devices - Implement IPortWavePciStream object Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c (with props) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -150,9 +150,7 @@ ISubdevice *SubDevice = NULL; SUBDEVICE_DESCRIPTOR * Descriptor; NTSTATUS Status; -#if defined(DBG) IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; -#endif IoStack = IoGetCurrentIrpStackLocation(Irp); ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/guids.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -24,6 +24,7 @@ const GUID IID_IDrmPort2 = {0x1ACCE59CL, 0x7311, 0x4B6B, {0x9F, 0xBA, 0xCC, 0x3B, 0xA5, 0x9A, 0xCD, 0xCE}}; const GUID IID_IInterruptSync = {0x22C6AC63L, 0x851B, 0x11D0, {0x9A, 0x7F, 0x00, 0xAA, 0x00, 0x38, 0xAC, 0xFE}}; const GUID IID_IPortWavePci = {0xb4c90a50L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; +const GUID IID_IPortWavePciStream = {0xb4c90a51L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IPortMidi = {0xb4c90a40L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportMidi = {0xb4c90a41L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; const GUID IID_IMiniportWavePci = {0xb4c90a52L, 0x5791, 0x11d0, {0x86, 0xf9, 0x00, 0xa0, 0xc9, 0x11, 0xb5, 0x44}}; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -194,7 +194,8 @@ STDMETHOD_(NTSTATUS, Init)(THIS_ IN KSPIN_CONNECT *ConnectDetails, IN PKSDATAFORMAT DataFormat, - IN PDEVICE_OBJECT DeviceObject); + IN PDEVICE_OBJECT DeviceObject, + IN ULONG FrameSize); STDMETHOD_(NTSTATUS, AddMapping)(THIS_ IN PUCHAR Buffer, @@ -219,9 +220,17 @@ STDMETHOD_(VOID, UpdateFormat)(THIS_ IN PKSDATAFORMAT DataFormat); - -}; - + STDMETHOD_(NTSTATUS, GetMappingWithTag)(THIS_ + IN PVOID Tag, + OUT PPHYSICAL_ADDRESS PhysicalAddress, + OUT PVOID *VirtualAddress, + OUT PULONG ByteCount, + OUT PULONG Flags); + + STDMETHOD_(VOID, ReleaseMappingWithTag)(THIS_ + IN PVOID Tag); + +}; /***************************************************************************** Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -106,7 +106,7 @@ IN PVOID ServiceContext) { IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; - DPRINT1("IInterruptSynchronizedRoutine This %p SyncRoutine %p Context %p\n", This, This->SyncRoutine, This->DynamicContext); + //DPRINT1("IInterruptSynchronizedRoutine This %p SyncRoutine %p Context %p\n", This, This->SyncRoutine, This->DynamicContext); return This->SyncRoutine((IInterruptSync*)&This->lpVtbl, This->DynamicContext); } @@ -120,7 +120,7 @@ KIRQL OldIrql; IInterruptSyncImpl * This = (IInterruptSyncImpl*)iface; - DPRINT1("IInterruptSync_fnCallSynchronizedRoutine This %p Routine %p DynamicContext %p Irql %x Interrupt %p\n", This, Routine, DynamicContext, KeGetCurrentIrql(), This->Interrupt); + //DPRINT1("IInterruptSync_fnCallSynchronizedRoutine This %p Routine %p DynamicContext %p Irql %x Interrupt %p\n", This, Routine, DynamicContext, KeGetCurrentIrql(), This->Interrupt); if (!This->Interrupt) { @@ -169,7 +169,7 @@ BOOL Success; IInterruptSyncImpl * This = (IInterruptSyncImpl*)ServiceContext; - DPRINT("IInterruptServiceRoutine\n"); + DPRINT("IInterruptServiceRoutine Mode %u\n", This->Mode); if (This->Mode == InterruptSyncModeNormal) { @@ -249,7 +249,7 @@ Descriptor->u.Interrupt.Vector, Descriptor->u.Interrupt.Level, Descriptor->u.Interrupt.Level, //FIXME - LevelSensitive, //FIXME + Descriptor->Flags, TRUE, Descriptor->u.Interrupt.Affinity, FALSE); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -18,6 +18,10 @@ PIRP Irp; KDPC Dpc; + ULONG NumTags; + PVOID * Tag; + LONG ReferenceCount; + }IRP_MAPPING, *PIRP_MAPPING; typedef struct @@ -38,6 +42,10 @@ KSPIN_LOCK Lock; LIST_ENTRY ListHead; + PVOID LastTag; + BOOL OutOfMapping; + ULONG MaxFrameSize; + }IIrpQueueImpl; VOID @@ -119,12 +127,16 @@ IN IIrpQueue *iface, IN KSPIN_CONNECT *ConnectDetails, IN PKSDATAFORMAT DataFormat, - IN PDEVICE_OBJECT DeviceObject) + IN PDEVICE_OBJECT DeviceObject, + IN ULONG FrameSize) { IIrpQueueImpl * This = (IIrpQueueImpl*)iface; This->ConnectDetails = ConnectDetails; This->DataFormat = (PKSDATAFORMAT_WAVEFORMATEX)DataFormat; + This->MaxFrameSize = FrameSize; + This->LastTag = (PVOID)0x12345678; + InitializeListHead(&This->ListHead); KeInitializeSpinLock(&This->Lock); @@ -142,7 +154,8 @@ PIRP_MAPPING Mapping; IIrpQueueImpl * This = (IIrpQueueImpl*)iface; - Mapping = ExAllocatePool(NonPagedPool, sizeof(IRP_MAPPING)); + + Mapping = AllocateItem(NonPagedPool, sizeof(IRP_MAPPING), TAG_PORTCLASS); if (!Mapping) return STATUS_UNSUCCESSFUL; @@ -150,9 +163,15 @@ Mapping->Irp = Irp; KeInitializeDpc(&Mapping->Dpc, DpcRoutine, (PVOID)Mapping); + if (This->MaxFrameSize) + { + Mapping->NumTags = max((Mapping->Header->DataUsed / This->MaxFrameSize) + 1, 1); + Mapping->Tag = AllocateItem(NonPagedPool, sizeof(PVOID) * This->NumMappings, TAG_PORTCLASS); + } + This->NumDataAvailable += Mapping->Header->DataUsed; - DPRINT1("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); + DPRINT("IIrpQueue_fnAddMapping NumMappings %u SizeOfMapping %lu NumDataAvailable %lu Irp %p\n", This->NumMappings, Mapping->Header->DataUsed, This->NumDataAvailable, Irp); /* FIXME use InterlockedCompareExchangePointer */ if (InterlockedCompareExchange((volatile long *)&This->FirstMap, (LONG)Mapping, (LONG)0) != 0) @@ -160,6 +179,8 @@ (void)InterlockedIncrement((volatile long*)&This->NumMappings); + + if (Irp) { Irp->IoStatus.Status = STATUS_PENDING; @@ -200,6 +221,7 @@ PIRP_MAPPING Mapping; This->CurrentOffset += BytesWritten; + This->NumDataAvailable -= BytesWritten; if (This->FirstMap->Header->DataUsed <=This->CurrentOffset) { @@ -207,11 +229,9 @@ Mapping = (PIRP_MAPPING)ExInterlockedRemoveHeadList(&This->ListHead, &This->Lock); InterlockedDecrement(&This->NumMappings); - This->NumDataAvailable -= This->FirstMap->Header->DataUsed; KeInsertQueueDpc(&This->FirstMap->Dpc, (PVOID)This->FirstMap, NULL); (void)InterlockedExchangePointer((PVOID volatile*)&This->FirstMap, (PVOID)Mapping); - } } @@ -270,6 +290,137 @@ } +NTSTATUS +NTAPI +IIrpQueue_fnGetMappingWithTag( + IN IIrpQueue *iface, + IN PVOID Tag, + OUT PPHYSICAL_ADDRESS PhysicalAddress, + OUT PVOID *VirtualAddress, + OUT PULONG ByteCount, + OUT PULONG Flags) +{ + KIRQL OldIrql; + PIRP_MAPPING CurMapping; + PIRP_MAPPING Result; + PLIST_ENTRY CurEntry; + ULONG Index; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + *Flags = 0; + Result = NULL; + + KeAcquireSpinLock(&This->Lock, &OldIrql); + + CurEntry = This->ListHead.Flink; + + while (CurEntry != &This->ListHead) + { + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + for(Index = 0; Index < CurMapping->NumTags; Index++) + { + if (This->LastTag == (PVOID)0x12345678) + { + CurMapping->Tag[Index] = Tag; + CurMapping->ReferenceCount++; + Result = CurMapping; + if (Index + 1 == CurMapping->NumTags - 1) + { + /* indicate end of packet */ + *Flags = 1; + } + break; + } + + + if (CurMapping->Tag[Index] == This->LastTag) + { + if (Index + 1 < CurMapping->NumTags) + { + CurMapping->Tag[Index+1] = Tag; + CurMapping->ReferenceCount++; + Result = CurMapping; + + if (Index + 1 == CurMapping->NumTags - 1) + { + /* indicate end of packet */ + *Flags = 1; + } + break; + } + + CurEntry = CurEntry->Flink; + if (&This->ListHead == CurEntry) + { + This->OutOfMapping = TRUE; + break; + } + Result = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + Result->Tag[0] = Tag; + Result->ReferenceCount++; + break; + } + } + CurEntry = CurEntry->Flink; + } + + KeReleaseSpinLock(&This->Lock, OldIrql); + if (!Result) + return STATUS_UNSUCCESSFUL; + + Result->Tag = Tag; + *PhysicalAddress = MmGetPhysicalAddress(Result->Header->Data); + *VirtualAddress = Result->Header->Data; + *ByteCount = Result->Header->DataUsed; + This->LastTag = Tag; + return STATUS_SUCCESS; +} + +VOID +NTAPI +IIrpQueue_fnReleaseMappingWithTag( + IN IIrpQueue *iface, + IN PVOID Tag) +{ + KIRQL OldIrql; + PIRP_MAPPING CurMapping; + PLIST_ENTRY CurEntry; + ULONG Index; + IIrpQueueImpl * This = (IIrpQueueImpl*)iface; + + KeAcquireSpinLock(&This->Lock, &OldIrql); + CurEntry = This->ListHead.Flink; + + while (CurEntry != &This->ListHead) + { + CurMapping = CONTAINING_RECORD(CurEntry, IRP_MAPPING, Entry); + for(Index = 0; Index < CurMapping->NumTags; Index++) + { + if (CurMapping->Tag[Index] == Tag) + { + CurMapping->ReferenceCount--; + if (!CurMapping->ReferenceCount) + { + RemoveEntryList(&CurMapping->Entry); + if (CurMapping->Irp) + { + CurMapping->Irp->IoStatus.Information = CurMapping->Header->FrameExtent; + CurMapping->Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(CurMapping->Irp, IO_SOUND_INCREMENT); + } + ExFreePool(CurMapping->Header->Data); + ExFreePool(CurMapping->Header); + ExFreePool(CurMapping->Tag); + ExFreePool(CurMapping); + } + break; + } + } + CurEntry = CurEntry->Flink; + } + + KeReleaseSpinLock(&This->Lock, OldIrql); +} static IIrpQueueVtbl vt_IIrpQueue = { @@ -284,7 +435,9 @@ IIrpQueue_fnMinMappings, IIrpQueue_fnMinimumDataAvailable, IIrpQueue_fnCancelBuffers, - IIrpQueue_fnUpdateFormat + IIrpQueue_fnUpdateFormat, + IIrpQueue_fnGetMappingWithTag, + IIrpQueue_fnReleaseMappingWithTag }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -28,6 +28,7 @@ ULONG ActiveIrpOffset; ULONG DelayedRequestInProgress; ULONG FrameSize; + BOOL Capture; }IPortPinWaveCyclicImpl; @@ -113,10 +114,22 @@ return; BytesToCopy = min(BufferLength, BufferSize); - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, - (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, - Buffer, - BytesToCopy); + + + if (This->Capture) + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + Buffer, + (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, + BytesToCopy); + } + else + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, + Buffer, + BytesToCopy); + } This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); This->CommonBufferOffset += BytesToCopy; @@ -145,10 +158,21 @@ return; BytesToCopy = min(BufferLength, BufferSize); - This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, - (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, - Buffer, - BytesToCopy); + + if (This->Capture) + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + Buffer, + (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, + BytesToCopy); + } + else + { + This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, + (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, + Buffer, + BytesToCopy); + } This->IrpQueue->lpVtbl->UpdateMapping(This->IrpQueue, BytesToCopy); This->CommonBufferOffset += BytesToCopy; @@ -197,7 +221,6 @@ Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); DPRINT("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, BufferSize); - if (Position < This->CommonBufferOffset) { UpdateCommonBufferOverlap(This, Position); @@ -230,7 +253,6 @@ IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; if (IsEqualGUIDAligned(refiid, &IID_IIrpTarget) || - //IsEqualGUIDAligned(refiid, &IID_IPortPinWaveCyclic) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { *Output = &This->lpVtbl; @@ -702,7 +724,32 @@ OUT PIO_STATUS_BLOCK StatusBlock, IN PDEVICE_OBJECT DeviceObject) { - return STATUS_SUCCESS; + NTSTATUS Status; + PCONTEXT_WRITE Packet; + PIRP Irp; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + DPRINT1("IPortPinWaveCyclic_fnFastRead entered\n"); + + Packet = (PCONTEXT_WRITE)Buffer; + + Irp = Packet->Irp; + StatusBlock->Status = STATUS_PENDING; + + Status = This->IrpQueue->lpVtbl->AddMapping(This->IrpQueue, Buffer, Length, Irp); + + if (!NT_SUCCESS(Status)) + return FALSE; + + if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) + { + /* some should initiate a state request but didnt do it */ + DPRINT1("Starting stream with %lu mappings Offset %u\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), This->ActiveIrpOffset); + + This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); + This->State = KSSTATE_RUN; + } + return TRUE; } /* @@ -753,7 +800,7 @@ if (This->IrpQueue->lpVtbl->MinimumDataAvailable(This->IrpQueue) == TRUE && This->State != KSSTATE_RUN) { /* some should initiate a state request but didnt do it */ - DPRINT1("Starting stream with %lu mappings\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue)); + DPRINT1("Starting stream with %lu mappings Offset %u\n", This->IrpQueue->lpVtbl->NumMappings(This->IrpQueue), This->ActiveIrpOffset); This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_RUN); This->State = KSSTATE_RUN; @@ -777,6 +824,8 @@ NTSTATUS Status; PKSDATAFORMAT DataFormat; PDEVICE_OBJECT DeviceObject; + BOOL Capture; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; Port->lpVtbl->AddRef(Port); @@ -804,13 +853,32 @@ if (!NT_SUCCESS(Status)) return Status; - Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject); + Status = This->IrpQueue->lpVtbl->Init(This->IrpQueue, ConnectDetails, DataFormat, DeviceObject, 0); + if (!NT_SUCCESS(Status)) + { + This->IrpQueue->lpVtbl->Release(This->IrpQueue); + return Status; + } + + if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_IN) + { + Capture = FALSE; + } + else if (KsPinDescriptor->Communication == KSPIN_COMMUNICATION_SINK && KsPinDescriptor->DataFlow == KSPIN_DATAFLOW_OUT) + { + Capture = TRUE; + } + else + { + DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + KeBugCheck(0); + } Status = This->Miniport->lpVtbl->NewStream(This->Miniport, &This->Stream, NULL, NonPagedPool, - FALSE, //FIXME + Capture, ConnectDetails->PinId, This->Format, &This->DmaChannel, @@ -834,9 +902,9 @@ This->CommonBufferOffset = 0; This->CommonBufferSize = This->DmaChannel->lpVtbl->AllocatedBufferSize(This->DmaChannel); This->CommonBuffer = This->DmaChannel->lpVtbl->SystemAddress(This->DmaChannel); + This->Capture = Capture; //Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); - return STATUS_SUCCESS; } @@ -879,15 +947,16 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI IPortPinWaveCyclic_fnGetIrpStream( IN IPortPinWaveCyclic* iface) { - UNIMPLEMENTED; - return NULL; + IPortPinWaveCyclicImpl * This = (IPortPinWaveCyclicImpl*)iface; + + return (PVOID)This->IrpQueue; } Added: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c (added) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -1,0 +1,167 @@ +#include "private.h" + +typedef struct +{ + IPortWavePciStreamVtbl * lpVtbl; + IIrpQueue *Queue; + LONG ref; + + +}IPortWavePciStreamImpl; + +static +NTSTATUS +NTAPI +IPortWavePciStream_fnQueryInterface( + IPortWavePciStream* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + + DPRINT("IPortWavePciStream_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IPortWavePciStream) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtbl; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IPortWavePciStream_fnAddRef( + IPortWavePciStream* iface) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + DPRINT("IPortWavePciStream_fnAddRef entered\n"); + + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IPortWavePciStream_fnRelease( + IPortWavePciStream* iface) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + + InterlockedDecrement(&This->ref); + + DPRINT("IPortWavePciStream_fnRelease entered %u\n", This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +static +NTSTATUS +NTAPI +IPortWavePciStream_fnGetMapping( + IN IPortWavePciStream *iface, + IN PVOID Tag, + OUT PPHYSICAL_ADDRESS PhysicalAddress, + OUT PVOID *VirtualAddress, + OUT PULONG ByteCount, + OUT PULONG Flags) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + + return This->Queue->lpVtbl->GetMappingWithTag(This->Queue, Tag, PhysicalAddress, VirtualAddress, ByteCount, Flags); +} + +static +NTSTATUS +NTAPI +IPortWavePciStream_fnReleaseMapping( + IN IPortWavePciStream *iface, + IN PVOID Tag) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + This->Queue->lpVtbl->ReleaseMappingWithTag(This->Queue, Tag); + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +IPortWavePciStream_fnTerminatePacket( + IN IPortWavePciStream *iface) +{ + UNIMPLEMENTED + return STATUS_SUCCESS; +} + + +static IPortWavePciStreamVtbl vt_PortWavePciStream = +{ + IPortWavePciStream_fnQueryInterface, + IPortWavePciStream_fnAddRef, + IPortWavePciStream_fnRelease, + IPortWavePciStream_fnGetMapping, + IPortWavePciStream_fnReleaseMapping, + IPortWavePciStream_fnTerminatePacket +}; + +NTSTATUS +NTAPI +NewIPortWavePciStream( + OUT PPORTWAVEPCISTREAM *Stream, + IN KSPIN_CONNECT *ConnectDetails, + IN PKSDATAFORMAT DataFormat, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG FrameSize) +{ + IIrpQueue * Queue; + IPortWavePciStreamImpl * This; + NTSTATUS Status; + + Status = NewIrpQueue(&Queue); + if (!NT_SUCCESS(Status)) + return Status; + + Status = Queue->lpVtbl->Init(Queue, ConnectDetails, DataFormat, DeviceObject, FrameSize); + if (!NT_SUCCESS(Status)) + { + Queue->lpVtbl->Release(Queue); + return Status; + } + + This = AllocateItem(NonPagedPool, sizeof(IPortWavePciStreamImpl), TAG_PORTCLASS); + if (!This) + { + Queue->lpVtbl->Release(Queue); + return STATUS_INSUFFICIENT_RESOURCES; + } + + This->lpVtbl = &vt_PortWavePciStream; + This->ref = 1; + This->Queue = Queue; + + *Stream = (PPORTWAVEPCISTREAM)&This->lpVtbl; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IPortWavePciStream_AddMapping( + IN IPortWavePciStream *iface, + IN PUCHAR Buffer, + IN ULONG BufferSize, + IN PIRP Irp) +{ + IPortWavePciStreamImpl * This = (IPortWavePciStreamImpl*)iface; + return This->Queue->lpVtbl->AddMapping(This->Queue, Buffer, BufferSize, Irp); +} + Propchange: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepcistream.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -37,6 +37,7 @@ <file>port_topology.c</file> <file>port_wavepci.c</file> <file>port_wavecyclic.c</file> + <file>port_wavepcistream.c</file> <file>propertyhandler.c</file> <file>miniport.c</file> <file>miniport_dmus.c</file> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Sat Mar 14 21:57:51 2009 @@ -241,6 +241,22 @@ GetDeviceObject( IPortWaveCyclic* iface); +NTSTATUS +NTAPI +IPortWavePciStream_AddMapping( + IN IPortWavePciStream *iface, + IN PUCHAR Buffer, + IN ULONG BufferSize, + IN PIRP Irp); + +NTSTATUS +NTAPI +NewIPortWavePciStream( + OUT PPORTWAVEPCISTREAM *Stream, + IN KSPIN_CONNECT *ConnectDetails, + IN PKSDATAFORMAT DataFormat, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG FrameSize); #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\

16 years, 2 months

← Newer
1
...
26
27
28
29
30
31
32
...
49
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2009