Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dreimer] 63813: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment You are crazy fast in translating... Commited, thx ^^
by dreimer＠svn.reactos.org 06 Aug '14

06 Aug '14

Author: dreimer Date: Wed Aug 6 09:54:57 2014 New Revision: 63813 URL: http://svn.reactos.org/svn/reactos?rev=63813&view=rev Log: [TRANSLATION] Turkish Translation Update by Erdem Ersoy CORE-7861 #resolve #comment You are crazy fast in translating... Commited, thx ^^ Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc trunk/reactos/base/applications/mplay32/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/base/applications/screensavers/logon/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/lang/Tr.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/dll/cpl/access/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/input/lang/tr-TR.rc trunk/reactos/dll/cpl/main/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/comdlg32/rsrc.rc trunk/reactos/dll/win32/credui/lang/credui_Tr.rc trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc trunk/reactos/dll/win32/getuname/getuname.rc trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc trunk/reactos/dll/win32/localui/lang/ui_Tr.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/logon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… Modified: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/rsrc.rc… Modified: trunk/reactos/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/lang/cred… Modified: trunk/reactos/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/lang/cry… Modified: trunk/reactos/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptdlg/lang/cr… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/tr-T… Modified: trunk/reactos/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/getuname/getunam… Modified: trunk/reactos/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/lang/jsc… Modified: trunk/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… Modified: trunk/reactos/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/localui/lang/ui_… Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… Modified: trunk/reactos/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/lang/msv… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled…

1 0

[tfaber] 63812: [NTOS:IO] - Fail with the correct status code if MDL allocation fails CORE-8410
by tfaber＠svn.reactos.org 05 Aug '14

05 Aug '14

Author: tfaber Date: Tue Aug 5 18:47:25 2014 New Revision: 63812 URL: http://svn.reactos.org/svn/reactos?rev=63812&view=rev Log: [NTOS:IO] - Fail with the correct status code if MDL allocation fails CORE-8410 Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Tue Aug 5 18:47:25 2014 @@ -2350,6 +2350,8 @@ { /* Allocate an MDL */ Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); + if (!Mdl) + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); MmProbeAndLockPages(Mdl, PreviousMode, IoWriteAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -3269,6 +3271,8 @@ { /* Allocate an MDL */ Mdl = IoAllocateMdl(Buffer, Length, FALSE, TRUE, Irp); + if (!Mdl) + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); MmProbeAndLockPages(Mdl, PreviousMode, IoReadAccess); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)

1 0

[dquintana] 63811: [SHELL32] * Improve the view menu handler a bit. Now the view menu properly marks the current view as expected.
by dquintana＠svn.reactos.org 05 Aug '14

05 Aug '14

Author: dquintana Date: Tue Aug 5 01:15:41 2014 New Revision: 63811 URL: http://svn.reactos.org/svn/reactos?rev=63811&view=rev Log: [SHELL32] * Improve the view menu handler a bit. Now the view menu properly marks the current view as expected. Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Tue Aug 5 01:15:41 2014 @@ -1095,15 +1095,13 @@ if (!hSubMenu) return; - __debugbreak(); - - DWORD item; - item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_BIGICON, FALSE); - item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_SMALLICON, FALSE); - item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_LISTVIEW, FALSE); - item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_REPORTVIEW, FALSE); - - if (item == -1) + // FIXME: I believe windows has all of the items initially in the menu, + // and actively calls DeleteMenu on the items that should not be disaplyed. + + MENUITEMINFOW mii = { 0 }; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_STATE; + if (::GetMenuItemInfoW(hSubMenu, FCIDM_SHVIEW_BIGICON, FALSE, &mii) == 0) { HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001"); @@ -1112,9 +1110,9 @@ INT count = ::GetMenuItemCount(menubase); for (int i = 0; i < count; i++) { - MENUITEMINFOW mii = { 0 }; WCHAR label[128]; + ZeroMemory(&mii, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; mii.dwTypeData = label; @@ -1131,18 +1129,12 @@ ::DestroyMenu(menubase); } - DbgPrint("View mode is %d\n", m_FolderSettings.ViewMode); - if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST) { - UINT iItem = FCIDM_SHVIEW_BIGICON + m_FolderSettings.ViewMode - FVM_FIRST; - DbgPrint("Checking item %d ...\n", iItem); - item = SHCheckMenuItem(hSubMenu, iItem, TRUE); - DbgPrint("SHCheckMenuItem returned %d\n", item); - if (item == -1) - { - DbgPrint("GetLastError returned %d\n", GetLastError()); - } + UINT iItemFirst = FCIDM_SHVIEW_BIGICON; + UINT iItemLast = iItemFirst + FVM_LAST - FVM_FIRST; + UINT iItem = iItemFirst + m_FolderSettings.ViewMode - FVM_FIRST; + CheckMenuRadioItem(hSubMenu, iItemFirst, iItemLast, iItem, MF_BYCOMMAND); } }

1 0

[hbelusca] 63810: Partial merge of the condrv_restructure branch, including: - some consrv/condrv code refactoring for a better code separation, - make kernel32 / winsrv console CSR structures Win2...
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 21:33:20 2014 New Revision: 63810 URL: http://svn.reactos.org/svn/reactos?rev=63810&view=rev Log: Partial merge of the condrv_restructure branch, including: - some consrv/condrv code refactoring for a better code separation, - make kernel32 / winsrv console CSR structures Win2k3-compliant (see CORE-7931); only Alloc/Attach/FreeConsole APIs are still not Win2k3-compliant. - fixes for CsrCaptureMessageString and implementation of CsrCaptureMessageMultiUnicodeStringsInPlace . CORE-7931 #comment Partial merge of the condrv_restructure branch in revision 63810. Added: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c - copied unchanged from r63808, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/dummyterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c - copied unchanged from r63808, branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/terminal.c trunk/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h - copied unchanged from r63808, branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h trunk/reactos/win32ss/user/winsrv/consrv/include/rect.h - copied unchanged from r63808, branches/condrv_restructure/win32ss/user/winsrv/consrv/include/rect.h Removed: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c Modified: trunk/reactos/ (props changed) trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/win32/kernel32/client/console/alias.c trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/history.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/dll/win32/kernel32/client/handle.c trunk/reactos/dll/win32/kernel32/include/console.h trunk/reactos/include/reactos/subsys/csr/csr.h trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/winsrv/consrv.cmake trunk/reactos/win32ss/user/winsrv/consrv/alias.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.c trunk/reactos/win32ss/user/winsrv/consrv/coninput.h trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h trunk/reactos/win32ss/user/winsrv/consrv/console.c trunk/reactos/win32ss/user/winsrv/consrv/console.h trunk/reactos/win32ss/user/winsrv/consrv/consrv.h trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h trunk/reactos/win32ss/user/winsrv/consrv/handle.c trunk/reactos/win32ss/user/winsrv/consrv/handle.h trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h trunk/reactos/win32ss/user/winsrv/consrv/include/console.h trunk/reactos/win32ss/user/winsrv/consrv/include/term.h trunk/reactos/win32ss/user/winsrv/consrv/init.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h trunk/reactos/win32ss/user/winsrv/consrv/procinit.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… Modified: trunk/reactos/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… Modified: trunk/reactos/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… Modified: trunk/reactos/include/reactos/subsys/csr/csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… Modified: trunk/reactos/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Removed: trunk/reactos/win32ss/user/winsrv/consrv/condrv/dummyfrontend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/coninput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/conoutput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontendctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/term.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lineinput.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/procinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…

1 0

[dquintana] 63809: [BROWSEUI] * Find the menu index so that the forwarded WM_INITMENUPOPUP has all the info shell32 needs. [SHELL32] * Begin implementing dynamic menu editing, which is used by the ...
by dquintana＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: dquintana Date: Mon Aug 4 21:19:22 2014 New Revision: 63809 URL: http://svn.reactos.org/svn/reactos?rev=63809&view=rev Log: [BROWSEUI] * Find the menu index so that the forwarded WM_INITMENUPOPUP has all the info shell32 needs. [SHELL32] * Begin implementing dynamic menu editing, which is used by the shell views in order to change, add or remove items from the filebrowser menus. Some menu items may be temporarily lost until this is finished. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/shlview.cpp Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Aug 4 21:19:22 2014 @@ -3161,12 +3161,38 @@ LRESULT CShellBrowser::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - HMENU theMenu; + HMENU theMenu; + LPARAM menuIndex = lParam; theMenu = reinterpret_cast<HMENU>(wParam); - if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_VIEW)) + + if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_FILE)) + { + menuIndex = 0; + } + else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_EDIT)) + { + menuIndex = 1; + } + else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_VIEW)) + { UpdateViewMenu(theMenu); - return RelayMsgToShellView(uMsg, wParam, lParam, bHandled); + menuIndex = 2; + } + else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_FAVORITES)) + { + menuIndex = 3; + } + else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_TOOLS)) + { + menuIndex = 4; + } + else if (theMenu == SHGetMenuFromID(fCurrentMenuBar, FCIDM_MENU_HELP)) + { + menuIndex = 5; + } + + return RelayMsgToShellView(uMsg, wParam, menuIndex, bHandled); } LRESULT CShellBrowser::RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) Modified: branches/shell-experiments/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shlview.cpp [iso-8859-1] Mon Aug 4 21:19:22 2014 @@ -243,6 +243,7 @@ LRESULT OnChangeNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCustomItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSettingChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); static ATL::CWndClassInfo& GetWndClassInfo() { @@ -294,6 +295,7 @@ MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser) MESSAGE_HANDLER(WM_SETTINGCHANGE, OnSettingChange) + MESSAGE_HANDLER(WM_INITMENUPOPUP, OnInitMenuPopup) END_MSG_MAP() BEGIN_COM_MAP(CDefView) @@ -1050,16 +1052,35 @@ { TRACE("(%p)->(submenu=%p) stub\n", this, hSubMenu); - if (hSubMenu) - { /*insert This item at the beginning of the menu */ - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+4, MFT_STRING, L"Properties", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+3, MFT_STRING, L"Rename", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+2, MFT_STRING, L"Delete", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+1, MFT_STRING, L"Create Shortcut", MFS_DISABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED); - } + if (!hSubMenu) + return; + + /* Cleanup the items added previously */ + for (int i = 0; i < GetMenuItemCount(hSubMenu); ) + { + MENUITEMINFOW mii; + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID; + GetMenuItemInfoW(hSubMenu, i, TRUE, &mii); + + if (mii.wID < 0x8000) + { + DeleteMenu(hSubMenu, i, MF_BYPOSITION); + } + else + { + i++; + } + } + + /* Insert This item at the beginning of the menu. */ + _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+4, MFT_STRING, L"Properties", MFS_DISABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+3, MFT_STRING, L"Rename", MFS_DISABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+2, MFT_STRING, L"Delete", MFS_DISABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM+1, MFT_STRING, L"Create Shortcut", MFS_DISABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + _InsertMenuItemW(hSubMenu, 0, TRUE, IDM_MYFILEITEM, MFT_STRING, L"New", MFS_ENABLED); TRACE("--\n"); } @@ -1071,21 +1092,57 @@ { TRACE("(%p)->(submenu=%p)\n", this, hSubMenu); - if (hSubMenu) - { - /*add a separator at the correct position in the menu*/ - MENUITEMINFOW mii; - static WCHAR view[] = L"View"; + if (!hSubMenu) + return; + + __debugbreak(); + + DWORD item; + item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_BIGICON, FALSE); + item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_SMALLICON, FALSE); + item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_LISTVIEW, FALSE); + item |= SHCheckMenuItem(hSubMenu, FCIDM_SHVIEW_REPORTVIEW, FALSE); + + if (item == -1) + { + HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001"); _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_DATA; - mii.fType = MFT_STRING; - mii.dwTypeData = view; - mii.hSubMenu = LoadMenuW(shell32_hInstance, L"MENU_001"); - InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); + + INT count = ::GetMenuItemCount(menubase); + for (int i = 0; i < count; i++) + { + MENUITEMINFOW mii = { 0 }; + WCHAR label[128]; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STATE | MIIM_ID | MIIM_SUBMENU | MIIM_CHECKMARKS | MIIM_DATA | MIIM_STRING | MIIM_BITMAP | MIIM_FTYPE; + mii.dwTypeData = label; + mii.cch = _countof(label); + ::GetMenuItemInfoW(menubase, i, TRUE, &mii); + + DbgPrint("Adding item %d label %S type %d\n", mii.wID, mii.dwTypeData, mii.fType); + + mii.fType |= MFT_RADIOCHECK; + + ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); + } + + ::DestroyMenu(menubase); + } + + DbgPrint("View mode is %d\n", m_FolderSettings.ViewMode); + + if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST) + { + UINT iItem = FCIDM_SHVIEW_BIGICON + m_FolderSettings.ViewMode - FVM_FIRST; + DbgPrint("Checking item %d ...\n", iItem); + item = SHCheckMenuItem(hSubMenu, iItem, TRUE); + DbgPrint("SHCheckMenuItem returned %d\n", item); + if (item == -1) + { + DbgPrint("GetLastError returned %d\n", GetLastError()); + } } } @@ -1357,9 +1414,6 @@ void CDefView::DoActivate(UINT uState) { - MENUITEMINFOA mii; - CHAR szText[MAX_PATH]; - TRACE("%p uState=%x\n", this, uState); /*don't do anything if the state isn't really changing */ @@ -1368,71 +1422,24 @@ return; } - OnDeactivate(); - - /*only do This if we are active */ - if(uState != SVUIA_DEACTIVATE) - { - // FIXME: windows does not do this. - - // temporary solution (HACK): wipe the contents and refill - { - OLEMENUGROUPWIDTHS omw = { { 0 } }; - - INT mic = GetMenuItemCount(m_hMenu); - for (int i = 0; i < mic; i++) - { - DeleteMenu(m_hMenu, 0, MF_BYPOSITION); - } - - m_pShellBrowser->InsertMenusSB(m_hMenu, &omw); - } - - /*merge the menus */ - + if (uState == SVUIA_DEACTIVATE) + { + OnDeactivate(); + } + else + { if(m_hMenu) { - /*build the top level menu get the menu item's text*/ - strcpy(szText, "dummy 31"); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU | MIIM_TYPE | MIIM_STATE; - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; - mii.dwTypeData = szText; - mii.hSubMenu = BuildFileMenu(); - - /*get the view menu so we can merge with it*/ - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - - if (GetMenuItemInfoA(m_hMenu, FCIDM_MENU_VIEW, FALSE, &mii)) - { - MergeViewMenu(mii.hSubMenu); - } - - /*add the items that should only be added if we have the focus*/ - if (SVUIA_ACTIVATE_FOCUS == uState) - { - /*get the file menu so we can merge with it */ - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_SUBMENU; - - if (GetMenuItemInfoA(m_hMenu, FCIDM_MENU_FILE, FALSE, &mii)) - { - MergeFileMenu(mii.hSubMenu); - } - - ::SetFocus(m_hWndList); - } - TRACE("-- before fnSetMenuSB\n"); m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd); } - } + + if (SVUIA_ACTIVATE_FOCUS == uState) + { + ::SetFocus(m_hWndList); + } + } + m_uState = uState; TRACE("--\n"); } @@ -1870,6 +1877,51 @@ } /********************************************************** +* CDefView::OnInitMenuPopup +*/ +LRESULT CDefView::OnInitMenuPopup(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + MENUITEMINFOW mii = { 0 }; + HMENU hSubmenu = (HMENU) wParam; + + DbgPrint("OnInitMenuPopup lParam=%d\n", lParam); + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_ID | MIIM_SUBMENU; + + if (!GetMenuItemInfoW(this->m_hMenu, lParam, TRUE, &mii)) + { + DbgPrint("OnInitMenuPopup GetMenuItemInfoW failed!\n"); + return FALSE; + } + + UINT menuItemId = mii.wID; + + if (mii.hSubMenu != hSubmenu) + { + DbgPrint("OnInitMenuPopup submenu does not match!!!!\n"); + return FALSE; + } + + DbgPrint("OnInitMenuPopup id=%d\n", menuItemId); + + switch (menuItemId) + { + case FCIDM_MENU_FILE: + MergeFileMenu(hSubmenu); + break; + case FCIDM_MENU_EDIT: + //MergeEditMenu(hSubmenu); + break; + case FCIDM_MENU_VIEW: + MergeViewMenu(hSubmenu); + break; + } + + return FALSE; +} + +/********************************************************** * * * The INTERFACE of the IShellView object

1 0

[hbelusca] 63808: [CONDRV]: Quick fix for ASCII strings for ConDrvWriteConsoleOutputString. [CONSRV]: Commit something forgotten from previous revision.
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 21:09:46 2014 New Revision: 63808 URL: http://svn.reactos.org/svn/reactos?rev=63808&view=rev Log: [CONDRV]: Quick fix for ASCII strings for ConDrvWriteConsoleOutputString. [CONSRV]: Commit something forgotten from previous revision. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Aug 4 21:09:46 2014 @@ -966,6 +966,12 @@ { Status = STATUS_NO_MEMORY; } + + // FIXME: Quick fix: fix the CodeType and CodeSize since the + // ASCII string was converted into UNICODE. + // A proper fix needs to be written. + CodeType = CODE_UNICODE; + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); } else { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c [iso-8859-1] Mon Aug 4 21:09:46 2014 @@ -24,13 +24,6 @@ /* GLOBALS ********************************************************************/ -#define GetNextConsole(Console) \ - CONTAINING_RECORD(Console->Entry.Flink, TUI_CONSOLE_DATA, Entry) - -#define GetPrevConsole(Console) \ - CONTAINING_RECORD(Console->Entry.Blink, TUI_CONSOLE_DATA, Entry) - - /* TUI Console Window Class name */ #define TUI_CONSOLE_WINDOW_CLASS L"TuiConsoleWindowClass" @@ -45,6 +38,13 @@ PCONSOLE Console; /* Pointer to the owned console */ // TUI_CONSOLE_INFO TuiInfo; /* TUI terminal settings */ } TUI_CONSOLE_DATA, *PTUI_CONSOLE_DATA; + +#define GetNextConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Flink, TUI_CONSOLE_DATA, Entry) + +#define GetPrevConsole(Console) \ + CONTAINING_RECORD(Console->Entry.Blink, TUI_CONSOLE_DATA, Entry) + /* List of the maintained virtual consoles and its lock */ static LIST_ENTRY VirtConsList;

1 0

[hbelusca] 63807: [KERNEL32]: Remove some FASTCALL.
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 20:25:34 2014 New Revision: 63807 URL: http://svn.reactos.org/svn/reactos?rev=63807&view=rev Log: [KERNEL32]: Remove some FASTCALL. Modified: branches/condrv_restructure/dll/win32/kernel32/client/handle.c branches/condrv_restructure/dll/win32/kernel32/include/console.h Modified: branches/condrv_restructure/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/handle.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/handle.c [iso-8859-1] Mon Aug 4 20:25:34 2014 @@ -16,7 +16,6 @@ /* PRIVATE FUNCTIONS **********************************************************/ HANDLE -FASTCALL TranslateStdHandle(IN HANDLE hHandle) { PRTL_USER_PROCESS_PARAMETERS Ppb = NtCurrentPeb()->ProcessParameters; Modified: branches/condrv_restructure/dll/win32/kernel32/include/console.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/include/console.h [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/include/console.h [iso-8859-1] Mon Aug 4 20:25:34 2014 @@ -56,7 +56,7 @@ HANDLE WINAPI GetConsoleInputWaitHandle(VOID); -HANDLE FASTCALL +HANDLE TranslateStdHandle(HANDLE hHandle); VOID

1 0

[hbelusca] 63806: [CONSRV] - Few code reshuffling before more restructuration. - Some type fixes.
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 20:23:33 2014 New Revision: 63806 URL: http://svn.reactos.org/svn/reactos?rev=63806&view=rev Log: [CONSRV] - Few code reshuffling before more restructuration. - Some type fixes. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -66,103 +66,18 @@ } -/* - * This pre-processing code MUST be IN consrv ONLY - */ -static ULONG -PreprocessInput(PCONSOLE Console, - PINPUT_RECORD InputEvent, - ULONG NumEventsToWrite) -{ - ULONG NumEvents; - - /* - * Loop each event, and for each, check for pause or unpause - * and perform adequate behaviour. - */ - for (NumEvents = NumEventsToWrite; NumEvents > 0; --NumEvents) - { - /* Check for pause or unpause */ - if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) - { - WORD vk = InputEvent->Event.KeyEvent.wVirtualKeyCode; - if (!(Console->PauseFlags & PAUSED_FROM_KEYBOARD)) - { - DWORD cks = InputEvent->Event.KeyEvent.dwControlKeyState; - if (Console->InputBuffer.Mode & ENABLE_LINE_INPUT && - (vk == VK_PAUSE || - (vk == 'S' && (cks & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) && - !(cks & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))))) - { - ConioPause(Console, PAUSED_FROM_KEYBOARD); - - /* Skip the event */ - RtlMoveMemory(InputEvent, - InputEvent + 1, - (NumEvents - 1) * sizeof(INPUT_RECORD)); - --NumEventsToWrite; - continue; - } - } - else - { - if ((vk < VK_SHIFT || vk > VK_CAPITAL) && vk != VK_LWIN && - vk != VK_RWIN && vk != VK_NUMLOCK && vk != VK_SCROLL) - { - ConioUnpause(Console, PAUSED_FROM_KEYBOARD); - - /* Skip the event */ - RtlMoveMemory(InputEvent, - InputEvent + 1, - (NumEvents - 1) * sizeof(INPUT_RECORD)); - --NumEventsToWrite; - continue; - } - } - } - - /* Go to the next event */ - ++InputEvent; - } - - return NumEventsToWrite; -} - -/* - * This post-processing code MUST be IN consrv ONLY - */ -static VOID -PostprocessInput(PCONSOLE Console) -{ - CsrNotifyWait(&Console->ReadWaitQueue, - FALSE, - NULL, - NULL); - if (!IsListEmpty(&Console->ReadWaitQueue)) - { - CsrDereferenceWait(&Console->ReadWaitQueue); - } -} - NTSTATUS -ConioAddInputEvents(PCONSOLE Console, - PINPUT_RECORD InputRecords, // InputEvent - ULONG NumEventsToWrite, - PULONG NumEventsWritten, - BOOLEAN AppendToEnd) +ConDrvAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, // InputEvent + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd) { NTSTATUS Status = STATUS_SUCCESS; ULONG i = 0; BOOLEAN SetWaitEvent = FALSE; if (NumEventsWritten) *NumEventsWritten = 0; - - /* - * This pre-processing code MUST be IN consrv ONLY!! - */ - NumEventsToWrite = PreprocessInput(Console, InputRecords, NumEventsToWrite); - if (NumEventsToWrite == 0) return STATUS_SUCCESS; - /* * When adding many single events, in the case of repeated mouse move or @@ -300,6 +215,39 @@ Done: if (NumEventsWritten) *NumEventsWritten = i; + return Status; +} + + +ULONG +PreprocessInput(PCONSOLE Console, + PINPUT_RECORD InputEvent, + ULONG NumEventsToWrite); +VOID +PostprocessInput(PCONSOLE Console); + +NTSTATUS +ConioAddInputEvents(PCONSOLE Console, + PINPUT_RECORD InputRecords, // InputEvent + ULONG NumEventsToWrite, + PULONG NumEventsWritten, + BOOLEAN AppendToEnd) +{ + NTSTATUS Status = STATUS_SUCCESS; + + if (NumEventsWritten) *NumEventsWritten = 0; + + /* + * This pre-processing code MUST be IN consrv ONLY!! + */ + NumEventsToWrite = PreprocessInput(Console, InputRecords, NumEventsToWrite); + if (NumEventsToWrite == 0) return STATUS_SUCCESS; + + Status = ConDrvAddInputEvents(Console, + InputRecords, + NumEventsToWrite, + NumEventsWritten, + AppendToEnd); /* * This post-processing code MUST be IN consrv ONLY!! @@ -307,9 +255,10 @@ // if (NT_SUCCESS(Status)) if (Status == STATUS_SUCCESS) PostprocessInput(Console); - return STATUS_SUCCESS; -} - + return Status; +} + +/* Move elsewhere...*/ NTSTATUS ConioProcessInputEvent(PCONSOLE Console, PINPUT_RECORD InputEvent) @@ -377,17 +326,15 @@ if (Console->LineBuffer == NULL) { /* Starting a new line */ - Console->LineMaxSize = (WORD)max(256, NumCharsToRead); + Console->LineMaxSize = max(256, NumCharsToRead); Console->LineBuffer = ConsoleAllocHeap(0, Console->LineMaxSize * sizeof(WCHAR)); if (Console->LineBuffer == NULL) return STATUS_NO_MEMORY; - Console->LineComplete = FALSE; - Console->LineUpPressed = FALSE; + Console->LinePos = Console->LineSize = ReadControl->nInitialChars; + Console->LineComplete = Console->LineUpPressed = FALSE; Console->LineInsertToggle = Console->InsertMode; Console->LineWakeupMask = ReadControl->dwCtrlWakeupMask; - Console->LineSize = ReadControl->nInitialChars; - Console->LinePos = Console->LineSize; /* * Pre-filling the buffer is only allowed in the Unicode API, @@ -597,6 +544,7 @@ /* Now, add the events */ // if (NumEventsWritten) *NumEventsWritten = 0; + // ConDrvAddInputEvents Status = ConioAddInputEvents(Console, InputRecord, NumEventsToWrite, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/console.c [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -260,7 +260,7 @@ Console->InsertMode = ConsoleInfo->InsertMode; Console->LineBuffer = NULL; - Console->LineMaxSize = Console->LineSize = Console->LinePos = 0; + Console->LinePos = Console->LineMaxSize = Console->LineSize = 0; Console->LineComplete = Console->LineUpPressed = FALSE; Console->LineInsertToggle = Console->InsertMode; // LineWakeupMask Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -233,16 +233,6 @@ SY += YDelta; DY += YDelta; } -} - -DWORD -ConioEffectiveCursorSize(PCONSOLE Console, DWORD Scale) -{ - DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100; - /* If line input in progress, perhaps adjust for insert toggle */ - if (Console->LineBuffer && !Console->LineComplete && (Console->InsertMode ? !Console->LineInsertToggle : Console->LineInsertToggle)) - return (Size * 2 <= Scale) ? (Size * 2) : (Size / 2); - return Size; } NTSTATUS Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/coninput.c [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -35,6 +35,88 @@ /* PRIVATE FUNCTIONS **********************************************************/ + +/* + * This pre-processing code MUST be IN consrv ONLY + */ +/* static */ ULONG +PreprocessInput(PCONSOLE Console, + PINPUT_RECORD InputEvent, + ULONG NumEventsToWrite) +{ + ULONG NumEvents; + + /* + * Loop each event, and for each, check for pause or unpause + * and perform adequate behaviour. + */ + for (NumEvents = NumEventsToWrite; NumEvents > 0; --NumEvents) + { + /* Check for pause or unpause */ + if (InputEvent->EventType == KEY_EVENT && InputEvent->Event.KeyEvent.bKeyDown) + { + WORD vk = InputEvent->Event.KeyEvent.wVirtualKeyCode; + if (!(Console->PauseFlags & PAUSED_FROM_KEYBOARD)) + { + DWORD cks = InputEvent->Event.KeyEvent.dwControlKeyState; + if (Console->InputBuffer.Mode & ENABLE_LINE_INPUT && + (vk == VK_PAUSE || + (vk == 'S' && (cks & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED)) && + !(cks & (LEFT_ALT_PRESSED | RIGHT_ALT_PRESSED))))) + { + ConioPause(Console, PAUSED_FROM_KEYBOARD); + + /* Skip the event */ + RtlMoveMemory(InputEvent, + InputEvent + 1, + (NumEvents - 1) * sizeof(INPUT_RECORD)); + --NumEventsToWrite; + continue; + } + } + else + { + if ((vk < VK_SHIFT || vk > VK_CAPITAL) && vk != VK_LWIN && + vk != VK_RWIN && vk != VK_NUMLOCK && vk != VK_SCROLL) + { + ConioUnpause(Console, PAUSED_FROM_KEYBOARD); + + /* Skip the event */ + RtlMoveMemory(InputEvent, + InputEvent + 1, + (NumEvents - 1) * sizeof(INPUT_RECORD)); + --NumEventsToWrite; + continue; + } + } + } + + /* Go to the next event */ + ++InputEvent; + } + + return NumEventsToWrite; +} + +/* + * This post-processing code MUST be IN consrv ONLY + */ +/* static */ VOID +PostprocessInput(PCONSOLE Console) +{ + CsrNotifyWait(&Console->ReadWaitQueue, + FALSE, + NULL, + NULL); + if (!IsListEmpty(&Console->ReadWaitQueue)) + { + CsrDereferenceWait(&Console->ReadWaitQueue); + } +} + + + + static NTSTATUS WaitBeforeReading(IN PGET_INPUT_INFO InputInfo, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/input.c [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -204,4 +204,14 @@ KeyState[VK_CONTROL]); } +DWORD +ConioEffectiveCursorSize(PCONSOLE Console, DWORD Scale) +{ + DWORD Size = (Console->ActiveBuffer->CursorInfo.dwSize * Scale + 99) / 100; + /* If line input in progress, perhaps adjust for insert toggle */ + if (Console->LineBuffer && !Console->LineComplete && (Console->InsertMode ? !Console->LineInsertToggle : Console->LineInsertToggle)) + return (Size * 2 <= Scale) ? (Size * 2) : (Size / 2); + return Size; +} + /* EOF */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -282,16 +282,16 @@ CONSOLE_INPUT_BUFFER InputBuffer; /* Input buffer of the console */ UINT InputCodePage; - /** Put those things in TEXTMODE_SCREEN_BUFFER ?? **/ - PWCHAR LineBuffer; /* Current line being input, in line buffered mode */ - ULONG LineMaxSize; /* Maximum size of line in characters (including CR+LF) */ - ULONG LineSize; /* Current size of line */ - ULONG LinePos; /* Current position within line */ + /** Put those things in CONSOLE_INPUT_BUFFER ?? **/ + PWCHAR LineBuffer; /* Current line being input, in line buffered mode */ + ULONG LineMaxSize; /* Maximum size of line in characters (including CR+LF) */ + ULONG LineSize; /* Current size of line */ + ULONG LinePos; /* Current position within line */ BOOLEAN LineComplete; /* User pressed enter, ready to send back to client */ BOOLEAN LineUpPressed; BOOLEAN LineInsertToggle; /* Replace character over cursor instead of inserting */ - ULONG LineWakeupMask; /* Bitmap of which control characters will end line input */ - /***************************************************/ + ULONG LineWakeupMask; /* Bitmap of which control characters will end line input */ + /*************************************************/ BOOLEAN InsertMode; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Mon Aug 4 20:23:33 2014 @@ -142,6 +142,9 @@ /* coninput.c */ VOID NTAPI ConioProcessKey(PCONSOLE Console, MSG* msg); +DWORD ConioEffectiveCursorSize(PCONSOLE Console, + DWORD Scale); + NTSTATUS ConioAddInputEvents(PCONSOLE Console, PINPUT_RECORD InputRecords, @@ -178,7 +181,5 @@ PWCHAR Buffer, DWORD Length, BOOL Attrib); -DWORD ConioEffectiveCursorSize(PCONSOLE Console, - DWORD Scale); /* EOF */

1 0

[hbelusca] 63805: [CONSRV]: Cosmetic changes only.
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 17:53:00 2014 New Revision: 63805 URL: http://svn.reactos.org/svn/reactos?rev=63805&view=rev Log: [CONSRV]: Cosmetic changes only. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Mon Aug 4 17:53:00 2014 @@ -34,6 +34,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN OUT PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size) { if (Buffer == NULL || Console == NULL) @@ -44,7 +45,7 @@ /* Initialize the header with the default type */ ConSrvInitObject(&(*Buffer)->Header, SCREEN_BUFFER, Console); - (*Buffer)->Vtbl = NULL; + (*Buffer)->Vtbl = Vtbl; return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/graphics.c [iso-8859-1] Mon Aug 4 17:53:00 2014 @@ -34,6 +34,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN OUT PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size); VOID CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); @@ -58,10 +59,10 @@ Status = CONSOLE_SCREEN_BUFFER_Initialize((PCONSOLE_SCREEN_BUFFER*)&NewBuffer, Console, + &GraphicsVtbl, sizeof(GRAPHICS_SCREEN_BUFFER)); if (!NT_SUCCESS(Status)) return Status; NewBuffer->Header.Type = GRAPHICS_BUFFER; - NewBuffer->Vtbl = &GraphicsVtbl; /* * Remember the handle to the process so that we can close or unmap Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Mon Aug 4 17:53:00 2014 @@ -40,6 +40,7 @@ NTSTATUS CONSOLE_SCREEN_BUFFER_Initialize(OUT PCONSOLE_SCREEN_BUFFER* Buffer, IN OUT PCONSOLE Console, + IN PCONSOLE_SCREEN_BUFFER_VTBL Vtbl, IN SIZE_T Size); VOID CONSOLE_SCREEN_BUFFER_Destroy(IN OUT PCONSOLE_SCREEN_BUFFER Buffer); @@ -60,10 +61,10 @@ Status = CONSOLE_SCREEN_BUFFER_Initialize((PCONSOLE_SCREEN_BUFFER*)&NewBuffer, Console, + &TextVtbl, sizeof(TEXTMODE_SCREEN_BUFFER)); if (!NT_SUCCESS(Status)) return Status; NewBuffer->Header.Type = TEXTMODE_BUFFER; - NewBuffer->Vtbl = &TextVtbl; NewBuffer->Buffer = ConsoleAllocHeap(HEAP_ZERO_MEMORY, TextModeInfo->ScreenBufferSize.X * @@ -751,11 +752,8 @@ ASSERT(Console == ScreenBuffer->Header.Console); ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCharsToWrite == 0)); - // if (Console->PauseFlags & (PAUSED_FROM_KEYBOARD | PAUSED_FROM_SCROLLBAR | PAUSED_FROM_SELECTION)) - if (Console->PauseFlags && Console->UnpauseEvent != NULL) - { - return STATUS_PENDING; - } + /* Stop here if the console is paused */ + if (Console->UnpauseEvent != NULL) return STATUS_PENDING; if (Unicode) { Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/consrv.h [iso-8859-1] Mon Aug 4 17:53:00 2014 @@ -56,7 +56,7 @@ HANDLE ConsoleHandle; HANDLE ParentConsoleHandle; - BOOL ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. + BOOLEAN ConsoleApp; // TRUE if it is a CUI app, FALSE otherwise. RTL_CRITICAL_SECTION HandleTableLock; ULONG HandleTableSize; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Mon Aug 4 17:53:00 2014 @@ -945,11 +945,9 @@ static VOID OnPaint(PGUI_CONSOLE_DATA GuiData) { - PCONSOLE_SCREEN_BUFFER ActiveBuffer; + PCONSOLE_SCREEN_BUFFER ActiveBuffer = GuiData->ActiveBuffer; PAINTSTRUCT ps; RECT rcPaint; - - ActiveBuffer = GuiData->ActiveBuffer; BeginPaint(GuiData->hWindow, &ps); if (ps.hdc != NULL &&

1 0

[hbelusca] 63804: [KERNEL32][CONSRV] Fix few MSVC dword -> short warnings (basically). Thanks GCC for not having noticed them...
by hbelusca＠svn.reactos.org 04 Aug '14

04 Aug '14

Author: hbelusca Date: Mon Aug 4 17:13:43 2014 New Revision: 63804 URL: http://svn.reactos.org/svn/reactos?rev=63804&view=rev Log: [KERNEL32][CONSRV] Fix few MSVC dword -> short warnings (basically). Thanks GCC for not having noticed them... Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c branches/condrv_restructure/dll/win32/kernel32/client/console/console.c branches/condrv_restructure/dll/win32/kernel32/client/console/history.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Mon Aug 4 17:13:43 2014 @@ -20,9 +20,9 @@ static BOOL IntAddConsoleAlias(LPCVOID Source, - DWORD SourceBufferLength, + USHORT SourceBufferLength, LPCVOID Target, - DWORD TargetBufferLength, + USHORT TargetBufferLength, LPCVOID lpExeName, BOOLEAN bUnicode) { @@ -31,9 +31,9 @@ PCSR_CAPTURE_BUFFER CaptureBuffer; ULONG CapturedStrings; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -43,7 +43,7 @@ /* Determine the needed sizes */ ConsoleAliasRequest->SourceLength = SourceBufferLength; - ConsoleAliasRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + ConsoleAliasRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); ConsoleAliasRequest->Unicode = ConsoleAliasRequest->Unicode2 = bUnicode; @@ -120,9 +120,8 @@ LPCWSTR lpTarget, LPCWSTR lpExeName) { - DWORD SourceBufferLength, TargetBufferLength; - SourceBufferLength = wcslen(lpSource) * sizeof(WCHAR); - TargetBufferLength = (lpTarget ? wcslen(lpTarget) * sizeof(WCHAR) : 0); + USHORT SourceBufferLength = (USHORT)wcslen(lpSource) * sizeof(WCHAR); + USHORT TargetBufferLength = (USHORT)(lpTarget ? wcslen(lpTarget) * sizeof(WCHAR) : 0); DPRINT1("AddConsoleAliasW entered with lpSource '%S' lpTarget '%S' lpExeName '%S'\n", lpSource, lpTarget, lpExeName); @@ -145,9 +144,8 @@ LPCSTR lpTarget, LPCSTR lpExeName) { - DWORD SourceBufferLength, TargetBufferLength; - SourceBufferLength = strlen(lpSource) * sizeof(CHAR); - TargetBufferLength = (lpTarget ? strlen(lpTarget) * sizeof(CHAR) : 0); + USHORT SourceBufferLength = (USHORT)strlen(lpSource) * sizeof(CHAR); + USHORT TargetBufferLength = (USHORT)(lpTarget ? strlen(lpTarget) * sizeof(CHAR) : 0); DPRINT1("AddConsoleAliasA entered with lpSource '%s' lpTarget '%s' lpExeName '%s'\n", lpSource, lpTarget, lpExeName); @@ -163,9 +161,9 @@ static DWORD IntGetConsoleAlias(LPVOID Source, - DWORD SourceBufferLength, + USHORT SourceBufferLength, LPVOID Target, - DWORD TargetBufferLength, + USHORT TargetBufferLength, LPVOID lpExeName, BOOLEAN bUnicode) { @@ -173,7 +171,7 @@ PCONSOLE_ADDGETALIAS ConsoleAliasRequest = &ApiMessage.Data.ConsoleAliasRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (Source == NULL || Target == NULL) { @@ -181,7 +179,7 @@ return 0; } - if (lpExeName == NULL || dwNumChars == 0) + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -191,7 +189,7 @@ /* Determine the needed sizes */ ConsoleAliasRequest->SourceLength = SourceBufferLength; - ConsoleAliasRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + ConsoleAliasRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); ConsoleAliasRequest->Unicode = ConsoleAliasRequest->Unicode2 = bUnicode; @@ -240,9 +238,9 @@ } /* Copy the returned target string into the user buffer */ - memcpy(Target, - ConsoleAliasRequest->Target, - ConsoleAliasRequest->TargetLength); + RtlCopyMemory(Target, + ConsoleAliasRequest->Target, + ConsoleAliasRequest->TargetLength); /* Release the capture buffer and exit */ CsrFreeCaptureBuffer(CaptureBuffer); @@ -265,7 +263,7 @@ lpSource, lpExeName); return IntGetConsoleAlias(lpSource, - wcslen(lpSource) * sizeof(WCHAR), + (USHORT)wcslen(lpSource) * sizeof(WCHAR), lpTargetBuffer, TargetBufferLength, lpExeName, @@ -287,7 +285,7 @@ lpSource, lpExeName); return IntGetConsoleAlias(lpSource, - strlen(lpSource) * sizeof(CHAR), + (USHORT)strlen(lpSource) * sizeof(CHAR), lpTargetBuffer, TargetBufferLength, lpExeName, @@ -305,9 +303,9 @@ PCONSOLE_GETALLALIASES GetAllAliasesRequest = &ApiMessage.Data.GetAllAliasesRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -316,7 +314,7 @@ GetAllAliasesRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; /* Determine the needed sizes */ - GetAllAliasesRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetAllAliasesRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); GetAllAliasesRequest->Unicode = GetAllAliasesRequest->Unicode2 = bUnicode; @@ -354,9 +352,9 @@ } /* Copy the returned aliases string into the user buffer */ - memcpy(AliasBuffer, - GetAllAliasesRequest->AliasesBuffer, - GetAllAliasesRequest->AliasesBufferLength); + RtlCopyMemory(AliasBuffer, + GetAllAliasesRequest->AliasesBuffer, + GetAllAliasesRequest->AliasesBufferLength); /* Release the capture buffer and exit */ CsrFreeCaptureBuffer(CaptureBuffer); @@ -410,16 +408,16 @@ PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest = &ApiMessage.Data.GetAllAliasesLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } GetAllAliasesLengthRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - GetAllAliasesLengthRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetAllAliasesLengthRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); GetAllAliasesLengthRequest->Unicode = GetAllAliasesLengthRequest->Unicode2 = bUnicode; @@ -511,9 +509,9 @@ return 0; } - memcpy(lpExeNameBuffer, - GetAliasesExesRequest->ExeNames, - GetAliasesExesRequest->Length); + RtlCopyMemory(lpExeNameBuffer, + GetAliasesExesRequest->ExeNames, + GetAliasesExesRequest->Length); CsrFreeCaptureBuffer(CaptureBuffer); Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] Mon Aug 4 17:13:43 2014 @@ -1887,10 +1887,10 @@ PCONSOLE_GETSETCONSOLETITLE TitleRequest = &ApiMessage.Data.TitleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpConsoleTitle ? (bUnicode ? wcslen(lpConsoleTitle) : strlen(lpConsoleTitle)) : 0); + ULONG NumChars = (ULONG)(lpConsoleTitle ? (bUnicode ? wcslen(lpConsoleTitle) : strlen(lpConsoleTitle)) : 0); TitleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - TitleRequest->Length = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + TitleRequest->Length = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); TitleRequest->Unicode = bUnicode; CaptureBuffer = CsrAllocateCaptureBuffer(1, TitleRequest->Length); Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] Mon Aug 4 17:13:43 2014 @@ -58,16 +58,16 @@ PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest = &ApiMessage.Data.ExpungeCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return; } ExpungeCommandHistoryRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - ExpungeCommandHistoryRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + ExpungeCommandHistoryRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); ExpungeCommandHistoryRequest->Unicode = ExpungeCommandHistoryRequest->Unicode2 = bUnicode; @@ -106,9 +106,9 @@ PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &ApiMessage.Data.GetCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; @@ -116,7 +116,7 @@ GetCommandHistoryRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; GetCommandHistoryRequest->HistoryLength = cbHistory; - GetCommandHistoryRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetCommandHistoryRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); GetCommandHistoryRequest->Unicode = GetCommandHistoryRequest->Unicode2 = bUnicode; @@ -153,9 +153,9 @@ return 0; } - memcpy(lpHistory, - GetCommandHistoryRequest->History, - GetCommandHistoryRequest->HistoryLength); + RtlCopyMemory(lpHistory, + GetCommandHistoryRequest->History, + GetCommandHistoryRequest->HistoryLength); CsrFreeCaptureBuffer(CaptureBuffer); @@ -170,16 +170,16 @@ PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &ApiMessage.Data.GetCommandHistoryLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } GetCommandHistoryLengthRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; - GetCommandHistoryLengthRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetCommandHistoryLengthRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); GetCommandHistoryLengthRequest->Unicode = GetCommandHistoryLengthRequest->Unicode2 = bUnicode; @@ -225,9 +225,9 @@ PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest = &ApiMessage.Data.SetHistoryNumberCommandsRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); - - if (lpExeName == NULL || dwNumChars == 0) + USHORT NumChars = (USHORT)(lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); + + if (lpExeName == NULL || NumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -235,7 +235,7 @@ SetHistoryNumberCommandsRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; SetHistoryNumberCommandsRequest->NumCommands = dwNumCommands; - SetHistoryNumberCommandsRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + SetHistoryNumberCommandsRequest->ExeLength = NumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); SetHistoryNumberCommandsRequest->Unicode = SetHistoryNumberCommandsRequest->Unicode2 = bUnicode; Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Mon Aug 4 17:13:43 2014 @@ -422,7 +422,7 @@ typedef struct { HANDLE ConsoleHandle; - DWORD Length; + ULONG Length; PVOID Title; BOOLEAN Unicode; } CONSOLE_GETSETCONSOLETITLE, *PCONSOLE_GETSETCONSOLETITLE; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Mon Aug 4 17:13:43 2014 @@ -284,9 +284,9 @@ /** Put those things in TEXTMODE_SCREEN_BUFFER ?? **/ PWCHAR LineBuffer; /* Current line being input, in line buffered mode */ - WORD LineMaxSize; /* Maximum size of line in characters (including CR+LF) */ - WORD LineSize; /* Current size of line */ - WORD LinePos; /* Current position within line */ + ULONG LineMaxSize; /* Maximum size of line in characters (including CR+LF) */ + ULONG LineSize; /* Current size of line */ + ULONG LinePos; /* Current position within line */ BOOLEAN LineComplete; /* User pressed enter, ready to send back to client */ BOOLEAN LineUpPressed; BOOLEAN LineInsertToggle; /* Replace character over cursor instead of inserting */

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