Ros-diffs December 2005

ros-diffs@reactos.org

40 participants
704 discussions

[turner] 19906: Crtl-C gives a new line when reading input

by turner＠svn.reactos.com

Crtl-C gives a new line when reading input Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-12-05 01:56:40 UTC (rev 19905) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-12-05 02:59:29 UTC (rev 19906) @@ -1449,7 +1449,7 @@ ConOutPuts (commandline); } - if (*commandline) + if (*commandline && !CheckCtrlBreak(BREAK_INPUT)) { ParseCommandLine (commandline); if (bEcho && !bIgnoreEcho && (!bIsBatch || bEchoThisLine)) @@ -1469,8 +1469,25 @@ BOOL WINAPI BreakHandler (DWORD dwCtrlType) { + DWORD dwWritten; + INPUT_RECORD rec; static BOOL SelfGenerated = FALSE; + + rec.EventType = KEY_EVENT; + rec.Event.KeyEvent.bKeyDown = TRUE; + rec.Event.KeyEvent.wRepeatCount = 1; + rec.Event.KeyEvent.wVirtualKeyCode = _T('C'); + rec.Event.KeyEvent.wVirtualScanCode = _T('C') - 35; + rec.Event.KeyEvent.uChar.AsciiChar = _T('C'); + rec.Event.KeyEvent.uChar.UnicodeChar = _T('C'); + rec.Event.KeyEvent.dwControlKeyState = RIGHT_CTRL_PRESSED; + WriteConsoleInput( + hIn, + &rec, + 1, + &dwWritten); + if ((dwCtrlType != CTRL_C_EVENT) && (dwCtrlType != CTRL_BREAK_EVENT)) { _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-12-05 01:56:40 UTC (rev 19905) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-12-05 02:59:29 UTC (rev 19906) @@ -409,8 +409,9 @@ #endif break; - + case _T('M'): + case _T('C'): /* ^M does the same as return */ if(!(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) @@ -513,10 +514,12 @@ } #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) + if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2)) && + !(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) #else ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2)) && + !(ir.Event.KeyEvent.dwControlKeyState & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) #endif /* _UNICODE */ { /* insert character into string... */

18 years, 9 months

[turner] 19905: ^M should run the command

by turner＠svn.reactos.com

^M should run the command Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-12-05 00:51:05 UTC (rev 19904) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-12-05 01:56:40 UTC (rev 19905) @@ -138,6 +138,7 @@ WORD wLastKey = 0; TCHAR ch; BOOL bContinue=FALSE;/*is TRUE the second case will not be executed*/ + BOOL bReturn = FALSE; TCHAR szPath[MAX_PATH]; /* get screen size */ @@ -156,6 +157,9 @@ do { + + bReturn = FALSE; + ConInKey (&ir); if (ir.Event.KeyEvent.dwControlKeyState & @@ -406,6 +410,14 @@ #endif break; + case _T('M'): + /* ^M does the same as return */ + if(!(ir.Event.KeyEvent.dwControlKeyState & + (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED))) + { + break; + } + case VK_RETURN: /* end input, return to main */ #ifdef FEATURE_HISTORY @@ -415,6 +427,7 @@ #endif ConInDummy (); ConOutChar (_T('\n')); + bReturn = TRUE; break; case VK_ESCAPE: @@ -497,65 +510,57 @@ } break; - default: + } #ifdef _UNICODE - ch = ir.Event.KeyEvent.uChar.UnicodeChar; - if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) + ch = ir.Event.KeyEvent.uChar.UnicodeChar; + if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) #endif /* _UNICODE */ - { - /* insert character into string... */ - if (bInsert && current != charcount) - { - /* If this character insertion will cause screen scrolling, - * adjust the saved origin of the command prompt. */ - tempscreen = _tcslen(str + current) + curx; - if ((tempscreen % maxx) == (maxx - 1) && - (tempscreen / maxx) + cury == (maxy - 1)) - { - orgy--; - cury--; - } + { + /* insert character into string... */ + if (bInsert && current != charcount) + { + /* If this character insertion will cause screen scrolling, + * adjust the saved origin of the command prompt. */ + tempscreen = _tcslen(str + current) + curx; + if ((tempscreen % maxx) == (maxx - 1) && + (tempscreen / maxx) + cury == (maxy - 1)) + { + orgy--; + cury--; + } - for (count = charcount; count > current; count--) - str[count] = str[count - 1]; - str[current++] = ch; - if (curx == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutPrintf (_T("%s"), &str[current - 1]); - SetCursorXY (curx, cury); - charcount++; - } - else - { - if (current == charcount) - charcount++; - str[current++] = ch; - if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) - orgy--, cury--; - if (GetCursorX () == maxx - 1) - curx = 0, cury++; - else - curx++; - ConOutChar (ch); - } - } -#if 0 - else - { - MessageBeep (-1); - } -#endif - break; - - } + for (count = charcount; count > current; count--) + str[count] = str[count - 1]; + str[current++] = ch; + if (curx == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutPrintf (_T("%s"), &str[current - 1]); + SetCursorXY (curx, cury); + charcount++; + } + else + { + if (current == charcount) + charcount++; + str[current++] = ch; + if (GetCursorX () == maxx - 1 && GetCursorY () == maxy - 1) + orgy--, cury--; + if (GetCursorX () == maxx - 1) + curx = 0, cury++; + else + curx++; + ConOutChar (ch); + } + } + wLastKey = ir.Event.KeyEvent.wVirtualKeyCode; } - while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); + while (!bReturn); SetCursorType (bInsert, TRUE); }

18 years, 9 months

[weiden] 19904: update the hardware page on device status changes

by weiden＠svn.reactos.com

update the hardware page on device status changes Modified: trunk/reactos/lib/devmgr/advprop.c Modified: trunk/reactos/lib/devmgr/hwpage.c _____ Modified: trunk/reactos/lib/devmgr/advprop.c --- trunk/reactos/lib/devmgr/advprop.c 2005-12-05 00:21:55 UTC (rev 19903) +++ trunk/reactos/lib/devmgr/advprop.c 2005-12-05 00:51:05 UTC (rev 19904) @@ -679,10 +679,11 @@ case WM_DEVICECHANGE: { - /* FIXME - don't call UpdateDevInfo in all events */ + /* FIXME - don't call UpdateDevInfo for all events */ UpdateDevInfo(hwndDlg, dap, TRUE); + Ret = TRUE; break; } _____ Modified: trunk/reactos/lib/devmgr/hwpage.c --- trunk/reactos/lib/devmgr/hwpage.c 2005-12-05 00:21:55 UTC (rev 19903) +++ trunk/reactos/lib/devmgr/hwpage.c 2005-12-05 00:51:05 UTC (rev 19904) @@ -122,15 +122,21 @@ DisplaySelectedDeviceProperties(IN PHARDWARE_PAGE_DATA hpd) { PHWDEVINFO HwDevInfo; + SP_DEVINFO_DATA DevInfoData; BOOL Ret = FALSE; HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); if (HwDevInfo != NULL) { + /* make a copy of the SP_DEVINFO_DATA structure on the stack, it may + become invalid in case the devices are updated */ + DevInfoData = HwDevInfo->DevInfoData; + + /* display the advanced properties */ Ret = DisplayDeviceAdvancedProperties(hpd->hWnd, NULL, HwDevInfo->ClassDevInfo->hDevInfo, - &HwDevInfo->DevInfoData, + &DevInfoData, hpd->hComCtl32, NULL, 0) != -1; @@ -341,12 +347,59 @@ } +static BOOL +DeviceIdMatch(IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + IN LPCWSTR lpDeviceId) +{ + DWORD DevIdLen; + LPWSTR lpQueriedDeviceId; + BOOL Ret = FALSE; + + if (!SetupDiGetDeviceInstanceId(DeviceInfoSet, + DeviceInfoData, + NULL, + 0, + &DevIdLen) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if (DevIdLen == wcslen(lpDeviceId) + 1) + { + lpQueriedDeviceId = HeapAlloc(GetProcessHeap(), + 0, + DevIdLen * sizeof(WCHAR)); + if (lpQueriedDeviceId != NULL) + { + if (SetupDiGetDeviceInstanceId(DeviceInfoSet, + DeviceInfoData, + lpQueriedDeviceId, + DevIdLen, + NULL)) + { + Ret = (wcscmp(lpDeviceId, + lpQueriedDeviceId) == 0); + } + + HeapFree(GetProcessHeap(), + 0, + lpQueriedDeviceId); + } + } + } + + return Ret; +} + + static VOID -FillDevicesListViewControl(IN PHARDWARE_PAGE_DATA hpd) +FillDevicesListViewControl(IN PHARDWARE_PAGE_DATA hpd, + IN LPCWSTR lpSelectDeviceId OPTIONAL, + IN GUID *SelectedClassGuid OPTIONAL) { PHWCLASSDEVINFO ClassDevInfo, LastClassDevInfo; PHWDEVINFO HwDevInfo, LastHwDevInfo; WCHAR szBuffer[255]; + BOOL SelectedInClass; INT ItemCount = 0; BuildDevicesList(hpd); @@ -361,10 +414,13 @@ HwDevInfo = ClassDevInfo->HwDevInfo; LastHwDevInfo = HwDevInfo + ClassDevInfo->ItemCount; + SelectedInClass = (SelectedClassGuid != NULL && + IsEqualGUID(SelectedClassGuid, + &ClassDevInfo->Guid)); while (HwDevInfo != LastHwDevInfo) { INT iItem; - LVITEM li; + LVITEM li = {0}; /* get the device name */ if (!HwDevInfo->HideDevice && @@ -375,8 +431,14 @@ { li.mask = LVIF_PARAM | LVIF_STATE | LVIF_TEXT | LVIF_IMAGE; li.iItem = ItemCount; - li.iSubItem = 0; - li.state = (ItemCount == 0 ? LVIS_SELECTED : 0); + if ((ItemCount == 0 && lpSelectDeviceId == NULL) || + (SelectedInClass && + DeviceIdMatch(ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + lpSelectDeviceId))) + { + li.state = LVIS_SELECTED; + } li.stateMask = LVIS_SELECTED; li.pszText = szBuffer; li.iImage = ClassDevInfo->ImageIndex; @@ -415,6 +477,67 @@ } +static VOID +UpdateDevicesListViewControl(IN PHARDWARE_PAGE_DATA hpd) +{ + PHWDEVINFO HwDevInfo; + GUID SelectedClassGuid = {0}; + LPWSTR lpDeviceId = NULL; + + /* if a device currently is selected, remember the device id so we can + select the device after the update if still present */ + HwDevInfo = (PHWDEVINFO)ListViewGetSelectedItemData(hpd->hWndDevList); + if (HwDevInfo != NULL) + { + DWORD DevIdLen; + if (!SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + NULL, + 0, + &DevIdLen) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + SelectedClassGuid = HwDevInfo->DevInfoData.ClassGuid; + lpDeviceId = HeapAlloc(GetProcessHeap(), + 0, + DevIdLen * sizeof(WCHAR)); + if (lpDeviceId != NULL && + !SetupDiGetDeviceInstanceId(HwDevInfo->ClassDevInfo->hDevInfo, + &HwDevInfo->DevInfoData, + lpDeviceId, + DevIdLen, + NULL)) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceId); + lpDeviceId = NULL; + } + } + } + + /* clear the devices list view control */ + ListView_DeleteAllItems(hpd->hWndDevList); + + /* free the device list */ + FreeDevicesList(hpd); + + /* build rebuild the device list and fill the list box again */ + FillDevicesListViewControl(hpd, + lpDeviceId, + (lpDeviceId != NULL ? + &SelectedClassGuid : + NULL)); + + if (lpDeviceId != NULL) + { + HeapFree(GetProcessHeap(), + 0, + lpDeviceId); + } +} + + static LRESULT CALLBACK ParentSubWndProc(IN HWND hwnd, @@ -439,6 +562,16 @@ HIWORD(lParam), SWP_NOZORDER); } + else if (uMsg == WM_DEVICECHANGE && IsWindowVisible(hpd->hWnd)) + { + /* forward a WM_DEVICECHANGE message to the hardware + page which wouldn't get the message itself as it is + a child window */ + SendMessage(hpd->hWnd, + WM_DEVICECHANGE, + wParam, + lParam); + } /* pass the message the the old window proc */ return CallWindowProc(hpd->ParentOldWndProc, @@ -739,6 +872,14 @@ break; } + case WM_DEVICECHANGE: + { + /* FIXME - don't call UpdateDevicesListViewControl for all events */ + UpdateDevicesListViewControl(hpd); + Ret = TRUE; + break; + } + case WM_INITDIALOG: { hpd = (PHARDWARE_PAGE_DATA)lParam; @@ -808,7 +949,9 @@ InitializeDevicesList(hpd); /* fill the devices list view control */ - FillDevicesListViewControl(hpd); + FillDevicesListViewControl(hpd, + NULL, + NULL); /* decide whether to show or hide the troubleshoot button */ EnableTroubleShoot(hpd,

18 years, 9 months

[weiden] 19903: fixed SetHandleInformation to take dwMask into account. This was accidently removed in r11165. Thanks to mygfya

by weiden＠svn.reactos.com

fixed SetHandleInformation to take dwMask into account. This was accidently removed in r11165. Thanks to mygfya Modified: trunk/reactos/lib/kernel32/misc/handle.c _____ Modified: trunk/reactos/lib/kernel32/misc/handle.c --- trunk/reactos/lib/kernel32/misc/handle.c 2005-12-05 00:18:32 UTC (rev 19902) +++ trunk/reactos/lib/kernel32/misc/handle.c 2005-12-05 00:21:55 UTC (rev 19903) @@ -112,8 +112,11 @@ &BytesWritten); if (NT_SUCCESS(Status)) { - HandleInfo.Inherit = (dwFlags & HANDLE_FLAG_INHERIT) != 0; - HandleInfo.ProtectFromClose = (dwFlags & HANDLE_FLAG_PROTECT_FROM_CLOSE) != 0; + if (dwMask & HANDLE_FLAG_INHERIT) + HandleInfo.Inherit = (dwFlags & HANDLE_FLAG_INHERIT) != 0; + if (dwMask & HANDLE_FLAG_PROTECT_FROM_CLOSE) + HandleInfo.ProtectFromClose = (dwFlags & HANDLE_FLAG_PROTECT_FROM_CLOSE) != 0; + Status = NtSetInformationObject (hObject, ObjectHandleInformation, &HandleInfo,

18 years, 9 months

[greatlrd] 19902: prepare for new sync of dxdiag.dll from wine.

by greatlrd＠svn.reactos.com

prepare for new sync of dxdiag.dll from wine. Modified: trunk/reactos/w32api/include/strmif.h Modified: trunk/reactos/w32api/include/vfw.h _____ Modified: trunk/reactos/w32api/include/strmif.h --- trunk/reactos/w32api/include/strmif.h 2005-12-04 23:54:27 UTC (rev 19901) +++ trunk/reactos/w32api/include/strmif.h 2005-12-05 00:18:32 UTC (rev 19902) @@ -4390,20 +4390,7 @@ #ifndef _WINGDI_ -typedef struct _RGNDATAHEADER { - DWORD dwSize; - DWORD iType; - DWORD nCount; - DWORD nRgnSize; - RECT rcBound; -} RGNDATAHEADER; - -typedef struct _RGNDATA { - RGNDATAHEADER rdh; - char Buffer[1]; -} RGNDATA; - #endif /* _WINGDI_ for wine */ #endif /*********************************************************************** ****** _____ Modified: trunk/reactos/w32api/include/vfw.h --- trunk/reactos/w32api/include/vfw.h 2005-12-04 23:54:27 UTC (rev 19901) +++ trunk/reactos/w32api/include/vfw.h 2005-12-05 00:18:32 UTC (rev 19902) @@ -13,9 +13,6 @@ #if !defined (_OLE2_H) && !defined (__OBJC__) #include <ole2.h> #endif -#if !defined NOMMREG -#include <mmreg.h> -#endif #define VFWAPI WINAPI #define VFWAPIV WINAPIV

18 years, 9 months

[greatlrd] 19901: prepare fixing vfw.h header so it can be compile without include/wine again

by greatlrd＠svn.reactos.com

prepare fixing vfw.h header so it can be compile without include/wine again Modified: trunk/reactos/lib/avifil32/acmstream.c Modified: trunk/reactos/lib/avifil32/api.c Modified: trunk/reactos/lib/avifil32/avifile.c Modified: trunk/reactos/lib/avifil32/editstream.c Modified: trunk/reactos/lib/avifil32/extrachunk.c Modified: trunk/reactos/lib/avifil32/factory.c Modified: trunk/reactos/lib/avifil32/getframe.c Modified: trunk/reactos/lib/avifil32/icmstream.c Modified: trunk/reactos/lib/avifil32/regsvr.c Modified: trunk/reactos/lib/avifil32/tmpfile.c Modified: trunk/reactos/lib/avifil32/wavfile.c _____ Modified: trunk/reactos/lib/avifil32/acmstream.c --- trunk/reactos/lib/avifil32/acmstream.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/acmstream.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -28,6 +28,7 @@ #include "winerror.h" #include "windowsx.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "msacm.h" _____ Modified: trunk/reactos/lib/avifil32/api.c --- trunk/reactos/lib/avifil32/api.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/api.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -35,6 +35,7 @@ #include "ole2.h" #include "shellapi.h" #include "shlobj.h" +#include "mmreg.h" #include "vfw.h" #include "msacm.h" _____ Modified: trunk/reactos/lib/avifil32/avifile.c --- trunk/reactos/lib/avifil32/avifile.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/avifile.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -42,6 +42,7 @@ #include "winerror.h" #include "windowsx.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/editstream.c --- trunk/reactos/lib/avifil32/editstream.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/editstream.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -28,6 +28,7 @@ #include "winerror.h" #include "windowsx.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/extrachunk.c --- trunk/reactos/lib/avifil32/extrachunk.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/extrachunk.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -24,6 +24,7 @@ #include "wingdi.h" #include "winuser.h" #include "windowsx.h" +#include "mmreg.h" #include "vfw.h" #include "wine/debug.h" _____ Modified: trunk/reactos/lib/avifil32/factory.c --- trunk/reactos/lib/avifil32/factory.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/factory.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -30,6 +30,7 @@ #include "winerror.h" #include "ole2.h" +#include "mmreg.h" #include "vfw.h" #include "wine/debug.h" _____ Modified: trunk/reactos/lib/avifil32/getframe.c --- trunk/reactos/lib/avifil32/getframe.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/getframe.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -26,7 +26,9 @@ #include "windowsx.h" #include "wingdi.h" #include "winuser.h" + #include "vfw.h" +#include "mmreg.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/icmstream.c --- trunk/reactos/lib/avifil32/icmstream.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/icmstream.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -29,6 +29,7 @@ #include "windowsx.h" #include "mmsystem.h" #include "vfw.h" +#include "mmreg.h" #include "msacm.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/regsvr.c --- trunk/reactos/lib/avifil32/regsvr.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/regsvr.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -30,6 +30,7 @@ #include "winerror.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/tmpfile.c --- trunk/reactos/lib/avifil32/tmpfile.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/tmpfile.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -28,6 +28,7 @@ #include "winerror.h" #include "windowsx.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "avifile_private.h" _____ Modified: trunk/reactos/lib/avifil32/wavfile.c --- trunk/reactos/lib/avifil32/wavfile.c 2005-12-04 23:53:19 UTC (rev 19900) +++ trunk/reactos/lib/avifil32/wavfile.c 2005-12-04 23:54:27 UTC (rev 19901) @@ -28,6 +28,7 @@ #include "winerror.h" #include "windowsx.h" #include "mmsystem.h" +#include "mmreg.h" #include "vfw.h" #include "msacm.h"

18 years, 9 months

[greatlrd] 19900: prepare fixing vfw.h header so it can be compile without include/wine again

by greatlrd＠svn.reactos.com

prepare fixing vfw.h header so it can be compile without include/wine again Modified: trunk/reactos/include/wine/msacm.h _____ Modified: trunk/reactos/include/wine/msacm.h --- trunk/reactos/include/wine/msacm.h 2005-12-04 23:07:56 UTC (rev 19899) +++ trunk/reactos/include/wine/msacm.h 2005-12-04 23:53:19 UTC (rev 19900) @@ -21,6 +21,8 @@ #ifndef __WINE_MSACM_H #define __WINE_MSACM_H +#include <mmreg.h> + #ifdef __cplusplus extern "C" { #endif /* defined(__cplusplus) */

18 years, 9 months

[arty] 19899: Added kbdhe. Was missing.

by arty＠svn.reactos.com

Added kbdhe. Was missing. Modified: trunk/reactos/lib/keyboard/directory.xml _____ Modified: trunk/reactos/lib/keyboard/directory.xml --- trunk/reactos/lib/keyboard/directory.xml 2005-12-04 23:00:41 UTC (rev 19898) +++ trunk/reactos/lib/keyboard/directory.xml 2005-12-04 23:07:56 UTC (rev 19899) @@ -14,6 +14,9 @@ <directory name="kbdgr"> <xi:include href="kbdgr/kbdgr.xml" /> </directory> + <directory name="kbdhe"> + <xi:include href="kbdhe/kbdhe.xml" /> + </directory> <directory name="kbdhu"> <xi:include href="kbdhu/kbdhu.xml" /> </directory>

18 years, 9 months

[greatlrd] 19898: wrote and adding missing dx headers

by greatlrd＠svn.reactos.com

wrote and adding missing dx headers Added: trunk/reactos/w32api/include/ksuuids.h _____ Added: trunk/reactos/w32api/include/ksuuids.h --- trunk/reactos/w32api/include/ksuuids.h 2005-12-04 22:34:07 UTC (rev 19897) +++ trunk/reactos/w32api/include/ksuuids.h 2005-12-04 23:00:41 UTC (rev 19898) @@ -0,0 +1,50 @@ +#ifndef __KSUUIDS__ +#define __KSUUIDS__ + +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PROVIDER,0xE06D8031, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2Video,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DolbyAC3,0xE06D80e4, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_DVD_RateChange,0x3577EB09, 0x9582, 0x477F, 0xB2, 0x9C, 0xB0, 0xC4, 0x52, 0xA4, 0xFF, 0x9A) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdKaraoke,0xAE4720AE, 0xAA71, 0x42D8, 0xB8, 0x2A, 0xFF, 0xFD, 0xF5, 0x8B, 0x76, 0xFD) +OUR_GUID_ENTRY(AM_KSPROPSETID_FrameStep,0xC830ACBD, 0xAB07, 0x492F, 0x88, 0x52, 0x45, 0xB6, 0x98, 0x7C, 0x29, 0x79) +OUR_GUID_ENTRY(AM_KSCATEGORY_CAPTURE,0x65E8773DL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_VIDEO,0x6994AD05L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVTUNER,0xa799a800L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_LPCM_AUDIO,0xE06D8032, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_DSI,0xE06D8030, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_PROGRAM,0xE06D8022, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_TRANSPORT,0xE06D8023, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DTS,0xE06D8033, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_SDDS,0xE06D8034, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIATYPE_DVD_ENCRYPTED_PACK,0xED0B916A, 0x044D, 0x11D1, 0xAA, 0x78, 0x00, 0xC0, 0x04F, 0xC3, 0x1D, 0x60) +OUR_GUID_ENTRY(MEDIATYPE_DVD_NAVIGATION,0xE06D802E, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_NAVIGATION_PCI,0xE06D802F, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_AUDIO,0xE06D802B, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DOLBY_AC3,0xE06D802C, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(IID_IKsPin,0xb61178D1L, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) +OUR_GUID_ENTRY(IID_IKsInterfaceHandler,0xD3ABC7E0L, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsDataTypeHandler,0x5FFBAA02L, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) +OUR_GUID_ENTRY(AM_KSCATEGORY_RENDER,0x65E8773EL, 0x8F56, 0x11D0, 0xA3, 0xB9, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_DATACOMPRESSOR,0x1E84C900L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSCATEGORY_AUDIO,0x6994AD04L, 0x93EF, 0x11D0, 0xA3, 0xCC, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(FORMAT_MPEG2Audio,0xE06D80e5, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_DVD_LPCMAudio,0xE06D80E6, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_KSPROPSETID_AC3,0xBFABE720, 0x6E1F, 0x11D0, 0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00) +OUR_GUID_ENTRY(AM_KSPROPSETID_DvdSubPic,0xAC390460, 0x43AF, 0x11D0, 0xbd, 0x6A, 0x00, 0x35, 0x05, 0xc1, 0x03, 0xA9) +OUR_GUID_ENTRY(AM_KSPROPSETID_CopyProt,0x0E8A0A40, 0x6AEF, 0x11D0, 0x9E, 0xD0, 0x00, 0xA0, 0x24, 0xCA, 0x19, 0xB3) +OUR_GUID_ENTRY(AM_KSPROPSETID_TSRateChange,0xA503C5C0, 0x1D1D, 0x11D1, 0xAD, 0x80, 0x44, 0x45, 0x53, 0x54, 0x0, 0x0) +OUR_GUID_ENTRY(IID_IKsPinFactory, 0xCD5EBE6BL, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PACK,0x36523B13, 0x8EE5, 0x11D1, 0x8C, 0xA3, 0x00, 0x60, 0xB0, 0x57, 0x66, 0x4A) +OUR_GUID_ENTRY(MEDIATYPE_MPEG2_PES,0xE06D8020, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(MEDIASUBTYPE_MPEG2_VIDEO,0xE06D8026, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_MPEG2_VIDEO,0xE06D80e3, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x5F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(FORMAT_VIDEOINFO2,0xF72A76A0L, 0xEB0A, 0x11D0, 0xAC, 0xE4, 0x0, 0x0, 0xC0, 0xCC, 0x16, 0xBA) +OUR_GUID_ENTRY(MEDIASUBTYPE_DVD_SUBPICTURE,0xE06D802d, 0xDB46, 0x11CF, 0xB4, 0xD1, 0x00, 0x80, 0x05F, 0x6C, 0xBB, 0xEA) +OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) +OUR_GUID_ENTRY(IID_IKsControl,0x28F54685L, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(AM_KSCATEGORY_CROSSBAR,0xa799a801L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO,0xa799a802L, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xA0, 0x24, 0x01, 0xdc, 0xD4) +OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC,0x07dAD660L, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) +OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER,0x0A4252A0L, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) + +#endif Property changes on: trunk/reactos/w32api/include/ksuuids.h ___________________________________________________________________ Name: svn:eol-style + native

18 years, 9 months

[gvg] 19897: Limit selection to window border

by gvg＠svn.reactos.com

Limit selection to window border Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c _____ Modified: trunk/reactos/subsys/csrss/win32csr/guiconsole.c --- trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-12-04 22:33:52 UTC (rev 19896) +++ trunk/reactos/subsys/csrss/win32csr/guiconsole.c 2005-12-04 22:34:07 UTC (rev 19897) @@ -725,7 +725,15 @@ rc.left = GuiData->SelectionStart.x; rc.top = GuiData->SelectionStart.y; rc.right = (pt.x >= 0 ? (pt.x / GuiData->CharWidth) + 1 : 0); + if (Console->Size.X < rc.right) + { + rc.right = Console->Size.X; + } rc.bottom = (pt.y >= 0 ? (pt.y / GuiData->CharHeight) + 1 : 0); + if (Console->Size.Y < rc.bottom) + { + rc.bottom = Console->Size.Y; + } /* exchange left/top with right/bottom if required */ if(rc.left >= rc.right)

18 years, 9 months

← Newer
1
...
57
58
59
60
61
62
63
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2005