Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jmorlan] 39892: Implement SETLOCAL and ENDLOCAL commands. Make delayed expansion optional (disabled by default, enabled by CMD /V switch or with SETLOCAL)
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 21:05:45 2009 New Revision: 39892 URL: http://svn.reactos.org/svn/reactos?rev=39892&view=rev Log: Implement SETLOCAL and ENDLOCAL commands. Make delayed expansion optional (disabled by default, enabled by CMD /V switch or with SETLOCAL) Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/setlocal.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] Fri Mar 6 21:05:45 2009 @@ -189,6 +189,9 @@ /* Preserve echo state across batch calls */ bEcho = bc->bEcho; + while (bc->setlocal) + cmd_endlocal(_T("")); + bc = bc->prev; } @@ -239,16 +242,23 @@ } else { + struct _SETLOCAL *setlocal = NULL; /* If a batch file runs another batch file as part of a compound command * (e.g. "x.bat & somethingelse") then the first file gets terminated. */ - if (Cmd != NULL) + if (bc && Cmd != NULL) + { + /* Get its SETLOCAL stack so it can be migrated to the new context */ + setlocal = bc->setlocal; + bc->setlocal = NULL; ExitBatch(NULL); + } /* Create a new context. This function will not * return until this context has been exited */ new.prev = bc; bc = &new; bc->RedirList = NULL; + bc->setlocal = setlocal; } GetFullPathName(fullname, sizeof(bc->BatchFilePath) / sizeof(TCHAR), bc->BatchFilePath, NULL); 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] Fri Mar 6 21:05:45 2009 @@ -18,6 +18,7 @@ BOOL bEcho; /* Preserve echo flag across batch calls */ REDIRECTION *RedirList; PARSED_COMMAND *current; + struct _SETLOCAL *setlocal; } BATCH_CONTEXT, *LPBATCH_CONTEXT; typedef struct tagFORCONTEXT Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -157,6 +157,7 @@ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */ BOOL bChildProcessRunning = FALSE; +BOOL bDelayedExpansion = FALSE; DWORD dwChildProcessId = 0; OSVERSIONINFO osvi; HANDLE hIn; @@ -1295,7 +1296,7 @@ if (!SubstituteForVars(Line, Buf1)) return NULL; - if (!_tcschr(Buf1, _T('!'))) + if (!bDelayedExpansion || !_tcschr(Buf1, _T('!'))) return cmd_dup(Buf1); /* FIXME: Delayed substitutions actually aren't quite the same as @@ -1663,6 +1664,10 @@ SetScreenColor (wColor, TRUE); } #endif + else if (_totlower(ptr[1]) == _T('v')) + { + bDelayedExpansion = _tcsnicmp(&ptr[2], _T(":off"), 4); + } } } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -59,6 +59,7 @@ extern BOOL bCtrlBreak; extern BOOL bIgnoreEcho; extern BOOL bExit; +extern BOOL bDelayedExpansion; extern INT nErrorLevel; extern SHORT maxx; extern SHORT maxy; Modified: trunk/reactos/base/shell/cmd/setlocal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/setlocal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/setlocal.c [iso-8859-1] Fri Mar 6 21:05:45 2009 @@ -1,5 +1,5 @@ /* - * GOTO.C - goto internal batch command. + * SETLOCAL.C - setlocal and endlocal internal batch commands. * * History: * @@ -9,19 +9,109 @@ #include <precomp.h> +typedef struct _SETLOCAL { + struct _SETLOCAL *Prev; + BOOL DelayedExpansion; + LPTSTR Environment; +} SETLOCAL; -/* unimplemented */ +/* Create a copy of the current environment */ +static LPTSTR DuplicateEnvironment() +{ + LPTSTR Environ = GetEnvironmentStrings(); + LPTSTR End, EnvironCopy; + if (!Environ) + return NULL; + for (End = Environ; *End; End += _tcslen(End) + 1) + ; + EnvironCopy = cmd_alloc((End + 1 - Environ) * sizeof(TCHAR)); + if (EnvironCopy) + memcpy(EnvironCopy, Environ, (End + 1 - Environ) * sizeof(TCHAR)); + FreeEnvironmentStrings(Environ); + return EnvironCopy; +} -/* our current default is delayedexpansion */ +INT cmd_setlocal(LPTSTR param) +{ + SETLOCAL *Saved; -INT cmd_setlocal (LPTSTR param) + /* SETLOCAL only works inside a batch file */ + if (!bc) + return 0; + + Saved = cmd_alloc(sizeof(SETLOCAL)); + if (!Saved) + { + error_out_of_memory(); + return 1; + } + Saved->Prev = bc->setlocal; + Saved->DelayedExpansion = bDelayedExpansion; + Saved->Environment = DuplicateEnvironment(); + if (!Saved->Environment) + { + error_out_of_memory(); + cmd_free(Saved); + return 1; + } + bc->setlocal = Saved; + + nErrorLevel = 0; + + if (*param == _T('\0')) + /* nothing */; + else if (!_tcsicmp(param, _T("enabledelayedexpansion"))) + bDelayedExpansion = TRUE; + else if (!_tcsicmp(param, _T("disabledelayedexpansion"))) + bDelayedExpansion = FALSE; + else + error_invalid_parameter_format(param); + + return nErrorLevel; +} + +/* endlocal doesn't take any params */ +INT cmd_endlocal(LPTSTR param) { + LPTSTR Environ, Name, Value; + SETLOCAL *Saved; + + /* Pop a SETLOCAL struct off of this batch file's stack */ + if (!bc || !(Saved = bc->setlocal)) + return 0; + bc->setlocal = Saved->Prev; + + bDelayedExpansion = Saved->DelayedExpansion; + + /* First, clear out the environment. Since making any changes to the + * environment invalidates pointers obtained from GetEnvironmentStrings(), + * we must make a copy of it and get the variable names from that */ + Environ = DuplicateEnvironment(); + if (Environ) + { + for (Name = Environ; *Name; Name += _tcslen(Name) + 1) + { + if (!(Value = _tcschr(Name + 1, _T('=')))) + continue; + *Value++ = _T('\0'); + SetEnvironmentVariable(Name, NULL); + Name = Value; + } + cmd_free(Environ); + } + + /* Now, restore variables from the copy saved by cmd_setlocal */ + for (Name = Saved->Environment; *Name; Name += _tcslen(Name) + 1) + { + if (!(Value = _tcschr(Name + 1, _T('=')))) + continue; + *Value++ = _T('\0'); + SetEnvironmentVariable(Name, Value); + Name = Value; + } + + cmd_free(Saved->Environment); + cmd_free(Saved); return 0; } -/* endlocal doesn't take any params */ -INT cmd_endlocal (LPTSTR param) -{ - return 0; -} -

1 0

[dchapyshev] 39891: - Fix exceptions in some cases (if CriticalSection->DebugInfo = NULL)
by dchapyshev＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: dchapyshev Date: Fri Mar 6 21:03:04 2009 New Revision: 39891 URL: http://svn.reactos.org/svn/reactos?rev=39891&view=rev Log: - Fix exceptions in some cases (if CriticalSection->DebugInfo = NULL) Modified: trunk/reactos/lib/rtl/critical.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=398… ============================================================================== --- trunk/reactos/lib/rtl/critical.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/critical.c [iso-8859-1] Fri Mar 6 21:03:04 2009 @@ -358,14 +358,21 @@ /* Protect List */ RtlEnterCriticalSection(&RtlCriticalSectionLock); - /* Remove it from the list */ - RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); + if (CriticalSection->DebugInfo) + { + /* Remove it from the list */ + RemoveEntryList(&CriticalSection->DebugInfo->ProcessLocksList); + RtlZeroMemory(CriticalSection->DebugInfo, sizeof(RTL_CRITICAL_SECTION_DEBUG)); + } /* Unprotect */ RtlLeaveCriticalSection(&RtlCriticalSectionLock); - /* Free it */ - RtlpFreeDebugInfo(CriticalSection->DebugInfo); + if (CriticalSection->DebugInfo) + { + /* Free it */ + RtlpFreeDebugInfo(CriticalSection->DebugInfo); + } /* Wipe it out */ RtlZeroMemory(CriticalSection, sizeof(RTL_CRITICAL_SECTION));

1 0

[jmorlan] 39890: - Ignore special characters in a REM line. - Make the \n-printing in batch files with ECHO on more consistant with how Windows does it.
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 20:27:42 2009 New Revision: 39890 URL: http://svn.reactos.org/svn/reactos?rev=39890&view=rev Log: - Ignore special characters in a REM line. - Make the \n-printing in batch files with ECHO on more consistant with how Windows does it. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/parser.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] Fri Mar 6 20:27:42 2009 @@ -285,6 +285,7 @@ /* Echo batch file line */ if (bEcho && Cmd->Type != C_QUIET) { + ConOutChar(_T('\n')); PrintPrompt(); EchoCommand(Cmd); ConOutChar(_T('\n')); @@ -292,14 +293,8 @@ bc->current = Cmd; ExecuteCommand(Cmd); - if (bEcho && !bIgnoreEcho && Cmd->Type != C_QUIET) - ConOutChar(_T('\n')); FreeCommand(Cmd); - bIgnoreEcho = FALSE; - } - - /* Don't print a newline for this command */ - bIgnoreEcho = TRUE; + } TRACE ("Batch: returns TRUE\n"); Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Fri Mar 6 20:27:42 2009 @@ -522,12 +522,22 @@ return NULL; } +/* Parse a REM command */ +static PARSED_COMMAND *ParseRem(void) +{ + /* Just ignore the rest of the line */ + while (CurChar && CurChar != _T('\n')) + ParseChar(); + return NULL; +} + static PARSED_COMMAND *ParseCommandPart(void) { TCHAR ParsedLine[CMDLINE_LENGTH]; TCHAR *Pos; DWORD TailOffset; PARSED_COMMAND *Cmd; + PARSED_COMMAND *(*Func)(void); REDIRECTION *RedirList = NULL; int Type; @@ -595,8 +605,9 @@ TailOffset = Pos - ParsedLine; /* Check for special forms */ - if (_tcsicmp(ParsedLine, _T("for")) == 0 || - _tcsicmp(ParsedLine, _T("if")) == 0) + if ((Func = ParseFor, _tcsicmp(ParsedLine, _T("for")) == 0) || + (Func = ParseIf, _tcsicmp(ParsedLine, _T("if")) == 0) || + (Func = ParseRem, _tcsicmp(ParsedLine, _T("rem")) == 0)) { ParseToken(0, STANDARD_SEPS); /* Do special parsing only if it's not followed by /? */ @@ -608,7 +619,7 @@ FreeRedirection(RedirList); return NULL; } - return _totlower(*ParsedLine) == _T('f') ? ParseFor() : ParseIf(); + return Func(); } Pos = _stpcpy(Pos, _T(" /?")); }

1 0

[jmorlan] 39889: FAT(X)IsDirectoryEmpty: When done with one page, go to the next one instead of reading the same page over again. Fixes inability to remove directories that previously had many files in them.
by jmorlan＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: jmorlan Date: Fri Mar 6 20:23:29 2009 New Revision: 39889 URL: http://svn.reactos.org/svn/reactos?rev=39889&view=rev Log: FAT(X)IsDirectoryEmpty: When done with one page, go to the next one instead of reading the same page over again. Fixes inability to remove directories that previously had many files in them. Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c Modified: trunk/reactos/drivers/filesystems/fastfat/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/direntry.c [iso-8859-1] Fri Mar 6 20:23:29 2009 @@ -72,6 +72,7 @@ } FatDirEntry += Index % FAT_ENTRIES_PER_PAGE; + FileOffset.QuadPart += PAGE_SIZE; } if (FAT_ENTRY_END(FatDirEntry)) @@ -125,6 +126,7 @@ } FatXDirEntry += Index % FATX_ENTRIES_PER_PAGE; + FileOffset.QuadPart += PAGE_SIZE; } if (FATX_ENTRY_END(FatXDirEntry))

1 0

[mkupfer] 39888: - more improved version, reduced calls, allocate ressources if needed only
by mkupfer＠svn.reactos.org 06 Mar '09

06 Mar '09

Author: mkupfer Date: Fri Mar 6 19:47:44 2009 New Revision: 39888 URL: http://svn.reactos.org/svn/reactos?rev=39888&view=rev Log: - more improved version, reduced calls, allocate ressources if needed only Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Mar 6 19:47:44 2009 @@ -1234,64 +1234,58 @@ return TRUE; } -/* Ported from WINE20020904 */ -/* Draw a menu control coming from DrawFrameControl() */ static BOOL UITOOLS95_DrawFrameMenu(HDC dc, LPRECT r, UINT uFlags) { - RECT myr; - int SmallDiam = UITOOLS_MakeSquareRect(r, &myr); - BOOL retval = TRUE; - /* Start using Marlett-font instead of basic drawing */ LOGFONT lf; HFONT hFont, hOldFont; COLORREF clrsave; - + INT bkmode; + TCHAR Symbol; + switch(uFlags & 0xff) + { + case DFCS_MENUARROW: + Symbol = '8'; + break; + + case DFCS_MENUBULLET: + Symbol = 'h'; + break; + + case DFCS_MENUCHECK: + Symbol = 'a'; + break; + + default: +/* + DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); +*/ + return FALSE; + } + /* acquire ressources only if valid menu */ ZeroMemory(&lf, sizeof(LOGFONT)); - lf.lfHeight = SmallDiam; + lf.lfHeight = r->bottom - r->top; lf.lfWidth = 0; lf.lfWeight = FW_NORMAL; lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); hFont = CreateFontIndirect(&lf); + /* save font and text color */ hOldFont = SelectObject(dc, hFont); + clrsave = GetTextColor(dc); + bkmode = GetBkMode(dc); + /* set color and drawing mode */ SetBkMode(dc, TRANSPARENT); - clrsave = GetTextColor(dc); SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - FillRect(dc, r, (HBRUSH)GetStockObject(WHITE_BRUSH)); - - switch(uFlags & 0xff) - { - case DFCS_MENUARROW: - // FIXME: is "8" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("8"), 1); - break; - - case DFCS_MENUBULLET: - // FIXME: is "h" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("h"), 1); - break; - - case DFCS_MENUCHECK: - // FIXME: is "a" the correct symbol? - TextOut(dc, myr.left, myr.top, TEXT("a"), 1); - break; - - default: -/* - DbgPrint("Invalid menu; flags=0x%04x\n", uFlags); -*/ - retval = FALSE; - break; - } - + /* draw selected symbol */ + TextOut(dc, r->left, r->top, &Symbol, 1); + /* restore previous settings */ SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); + SetBkMode(dc, bkmode); DeleteObject(hFont); - - return retval; -} - + return TRUE; +} BOOL WINAPI

1 0

[gedmurphy] 39887: Don't leak font objects
by gedmurphy＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: gedmurphy Date: Fri Mar 6 01:31:11 2009 New Revision: 39887 URL: http://svn.reactos.org/svn/reactos?rev=39887&view=rev Log: Don't leak font objects Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Fri Mar 6 01:31:11 2009 @@ -814,6 +814,7 @@ SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); SelectObject(dc, hOldFont); + DeleteObject(hFont); return TRUE; } @@ -1286,6 +1287,7 @@ SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); + DeleteObject(hFont); return retval; }

1 0

[janderwald] 39886: - Setup winmm entries for wdmaud.drv if they dont exist yet
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 17:40:14 2009 New Revision: 39886 URL: http://svn.reactos.org/svn/reactos?rev=39886&view=rev Log: - Setup winmm entries for wdmaud.drv if they dont exist yet Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Thu Mar 5 17:40:14 2009 @@ -166,6 +166,10 @@ PVOID Context; BOOL Result; SC_HANDLE hSCManager, hService; + WCHAR WaveName[20]; + HKEY hKey; + DWORD BufferSize; + ULONG Index; if (!IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_SOUND) && !IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_MEDIA)) @@ -242,6 +246,23 @@ CloseServiceHandle(hService); } CloseServiceHandle(hSCManager); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Drivers32", 0, GENERIC_READ | GENERIC_WRITE, &hKey) == ERROR_SUCCESS) + { + szBuffer[Length] = '\0'; + pBuffer = PathAddBackslashW(szBuffer); + wcscpy(pBuffer, L"system32\\wdmaud.drv"); + + for(Index = 1; Index <= 4; Index++) + { + swprintf(WaveName, L"wave%u", Index); + if (RegQueryValueExW(hKey, WaveName, 0, NULL, NULL, &BufferSize) != ERROR_MORE_DATA) + { + RegSetValueExW(hKey, WaveName, 0, REG_SZ, (LPBYTE)szBuffer, (wcslen(szBuffer)+1) * sizeof(WCHAR)); + } + } + RegCloseKey(hKey); + } return ERROR_DI_DO_DEFAULT;

1 0

[janderwald] 39885: - Add wdmaud.drv to bootcd
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 17:35:10 2009 New Revision: 39885 URL: http://svn.reactos.org/svn/reactos?rev=39885&view=rev Log: - Add wdmaud.drv to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff 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 5 17:35:10 2009 @@ -422,6 +422,7 @@ dll\win32\wuapi\wuapi.dll 1 dll\win32\winmm\midimap\midimap.dll 1 dll\win32\winmm\wavemap\msacm32.drv 1 optional +dll\win32\wdmaud.drv\wdmaud.drv 1 ; Shell Extensions dll\shellext\deskadp\deskadp.dll 1

1 0

[janderwald] 39884: - Implement Pin object functions - Remove test sample function, as silverblade will implement those
by janderwald＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: janderwald Date: Thu Mar 5 16:50:54 2009 New Revision: 39884 URL: http://svn.reactos.org/svn/reactos?rev=39884&view=rev Log: - Implement Pin object functions - Remove test sample function, as silverblade will implement those Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/filter.c [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -207,8 +207,7 @@ /* is the request for a new pin */ if (!wcsncmp(KS_NAME_PIN, Buffer, wcslen(KS_NAME_PIN))) { - UNIMPLEMENTED - Status = STATUS_UNSUCCESSFUL; + Status = CreatePin(Irp); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/kmixer.h [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -23,5 +23,9 @@ KMixAllocateDeviceHeader( IN PKMIXER_DEVICE_EXT DeviceExtension); +NTSTATUS +CreatePin( + IN PIRP Irp); + #endif Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Thu Mar 5 16:50:54 2009 @@ -8,137 +8,207 @@ #include "kmixer.h" - - -NTSTATUS -PerformSampleRateConversion( - PUCHAR Buffer, - ULONG BufferLength, - ULONG OldRate, - ULONG NewRate, - ULONG BytesPerSample, - ULONG NumChannels, - PVOID * Result, - PULONG ResultLength) -{ - KFLOATING_SAVE FloatSave; +NTSTATUS +NTAPI +Pin_fnDeviceIoControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + //TODO + // silverblade + // Perform Sample Rate Conversion + // Stream Mixing + // Up/down sampling + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnRead( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnRead called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +PinWriteCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PIRP CIrp = (PIRP)Context; + + CIrp->IoStatus.Status = STATUS_SUCCESS; + CIrp->IoStatus.Information = 0; + IoCompleteRequest(CIrp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnWrite( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnWrite called DeviceObject %p Irp %p\n", DeviceObject); + + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnFlush( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnFlush called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnClose( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnClose called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +Pin_fnQuerySecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + DPRINT1("Pin_fnQuerySecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS +NTAPI +Pin_fnSetSecurity( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + + DPRINT1("Pin_fnSetSecurity called DeviceObject %p Irp %p\n", DeviceObject); + + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN +NTAPI +Pin_fnFastDeviceIoControl( + PFILE_OBJECT FileObject, + BOOLEAN Wait, + PVOID InputBuffer, + ULONG InputBufferLength, + PVOID OutputBuffer, + ULONG OutputBufferLength, + ULONG IoControlCode, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastDeviceIoControl called DeviceObject %p Irp %p\n", DeviceObject); + + + return FALSE; +} + + +BOOLEAN +NTAPI +Pin_fnFastRead( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastRead called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; + +} + +BOOLEAN +NTAPI +Pin_fnFastWrite( + PFILE_OBJECT FileObject, + PLARGE_INTEGER FileOffset, + ULONG Length, + BOOLEAN Wait, + ULONG LockKey, + PVOID Buffer, + PIO_STATUS_BLOCK IoStatus, + PDEVICE_OBJECT DeviceObject) +{ + DPRINT1("Pin_fnFastWrite called DeviceObject %p Irp %p\n", DeviceObject); + + return FALSE; +} + +static KSDISPATCH_TABLE PinTable = +{ + Pin_fnDeviceIoControl, + Pin_fnRead, + Pin_fnWrite, + Pin_fnFlush, + Pin_fnClose, + Pin_fnQuerySecurity, + Pin_fnSetSecurity, + Pin_fnFastDeviceIoControl, + Pin_fnFastRead, + Pin_fnFastWrite, +}; + +NTSTATUS +CreatePin( + IN PIRP Irp) +{ NTSTATUS Status; - ULONG Index; - SRC_STATE * State; - SRC_DATA Data; - PUCHAR ResultOut; - int error; - PFLOAT FloatIn, FloatOut; - ULONG NumSamples; - ULONG NewSamples; - - /* first acquire float save context */ - Status = KeSaveFloatingPointState(&FloatSave); - - if (!NT_SUCCESS(Status)) - { - DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); - return Status; - } - - NumSamples = BufferLength / BytesPerSample; - - FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); - if (!FloatIn) - { - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)OldRate / (FLOAT)NewRate))) + 1; - - FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); - if (!FloatOut) - { - ExFreePool(FloatIn); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - ResultOut = ExAllocatePool(NonPagedPool, NewRate * BytesPerSample * NumChannels); - if (!FloatOut) - { - ExFreePool(FloatIn); - ExFreePool(FloatOut); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_INSUFFICIENT_RESOURCES; - } - - State = src_new(SRC_LINEAR, NumChannels, &error); - if (!State) - { - DPRINT1("KeSaveFloatingPointState failed with %x\n", Status); - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - /* fixme use asm */ - if (BytesPerSample == 1) - { - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Buffer[Index]; - } - else if (BytesPerSample == 2) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Res[Index]; - } - else - { - UNIMPLEMENTED - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - Data.data_in = FloatIn; - Data.data_out = FloatOut; - Data.input_frames = NumSamples; - Data.output_frames = NewSamples; - Data.src_ratio = (double)NewRate / (double)OldRate; - - error = src_process(State, &Data); - if (error) - { - DPRINT1("src_process failed with %x\n", error); - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; - } - - if (BytesPerSample == 1) - { - for(Index = 0; Index < Data.output_frames_gen; Index++) - ResultOut[Index] = lrintf(FloatOut[Index]); - } - else if (BytesPerSample == 2) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < Data.output_frames_gen; Index++) - Res[Index] = lrintf(FloatOut[Index]); - } - - *Result = ResultOut; - *ResultLength = NewRate * BytesPerSample * NumChannels; - ExFreePool(FloatIn); - ExFreePool(FloatOut); - KeRestoreFloatingPointState(&FloatSave); - return STATUS_SUCCESS; -} - + KSOBJECT_HEADER ObjectHeader; + + /* allocate object header */ + Status = KsAllocateObjectHeader(&ObjectHeader, 0, NULL, Irp, &PinTable); + return Status; +} void * calloc(size_t Elements, size_t ElementSize) {

1 0

[dchapyshev] 39882: - Add more check of parametres in GetDIBits
by dchapyshev＠svn.reactos.org 05 Mar '09

05 Mar '09

Author: dchapyshev Date: Thu Mar 5 15:22:35 2009 New Revision: 39882 URL: http://svn.reactos.org/svn/reactos?rev=39882&view=rev Log: - Add more check of parametres in GetDIBits Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Thu Mar 5 15:22:35 2009 @@ -418,7 +418,13 @@ } } } - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + + if ((ULONG)lpvBits & (sizeof(DWORD) - 1)) + { + pvSafeBits = RtlAllocateHeap(RtlGetProcessHeap(), 0, cjBmpScanSize); + if (!pvSafeBits) + return Ret; + } } Ret = NtGdiGetDIBitsInternal(hDC, @@ -430,9 +436,12 @@ uUsage, cjBmpScanSize, 0); - if ( lpvBits != pvSafeBits) - { - RtlCopyMemory( lpvBits, pvSafeBits, cjBmpScanSize); + if (lpvBits != pvSafeBits) + { + if (Ret) + { + RtlCopyMemory(lpvBits, pvSafeBits, cjBmpScanSize); + } RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); } return Ret;

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