Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[jgardou] 63837: [CMAKE] - separate the custom target and the custom command generating reactos.cab, so that it isn't regenerated each time a bootcd is built Note to make user: I tried a hack so th...

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 7 18:20:46 2014 New Revision: 63837 URL: http://svn.reactos.org/svn/reactos?rev=63837&view=rev Log: [CMAKE] - separate the custom target and the custom command generating reactos.cab, so that it isn't regenerated each time a bootcd is built Note to make user: I tried a hack so that the sequence 'make module/fast reactos_cab/fast bootcd/fast' still works, but this is untested. Please use ninja if you really want fast dependency resolution. Modified: trunk/reactos/boot/bootdata/CMakeLists.txt trunk/reactos/boot/bootdata/packages/CMakeLists.txt trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/CMakeLists.t… ============================================================================== --- trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/CMakeLists.txt [iso-8859-1] Thu Aug 7 18:20:46 2014 @@ -18,10 +18,14 @@ COMMAND native-utf16le ${_hive} ${_converted_hive} DEPENDS native-utf16le ${_hive}) list(APPEND _converted_common_hives ${_converted_hive}) - add_cd_file(FILE ${_converted_hive} DESTINATION reactos NO_CAB FOR bootcd regtest) endforeach() add_custom_target(converted_hives DEPENDS ${_converted_common_hives}) +add_cd_file(TARGET converted_hives + FILE ${_converted_common_hives} + DESTINATION reactos + NO_CAB + FOR bootcd regtest) # livecd hives list(APPEND _livecd_hives @@ -84,7 +88,7 @@ add_link(NAME ${name} CMD_LINE_ARGS ${app} ICON ${app} PATH livecd_start.cmd GUID "{450D8FBA-AD25-11D0-98A8-0800361B1103}" MINIMIZE) list(APPEND LIVECD_SHORTCUTS "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk") add_cd_file(FILE "${CMAKE_CURRENT_BINARY_DIR}/${name}.lnk" - TARGET livecd_links + TARGET livecd_links DESTINATION ${dest} FOR livecd) endmacro(add_livecd_shortcut) Modified: trunk/reactos/boot/bootdata/packages/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/CMa… ============================================================================== --- trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/CMakeLists.txt [iso-8859-1] Thu Aug 7 18:20:46 2014 @@ -15,12 +15,18 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn "") +# This finalizes reactos.dff by concat-ing the two files: one generated and one static containing the optional file. +# please keep it this way as it permits to add files to reactos.dff.in without having to run cmake again +# and also avoids rebuilding reactos.cab in case nothing changes after a cmake run add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff COMMAND ${CMAKE_COMMAND} -D SRC1=${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in -D SRC2=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn - -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff + -D DST=${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff -P ${CMAKE_CURRENT_BINARY_DIR}/concat.cmake + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff + ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn ) @@ -34,10 +40,15 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff native-cabman) # Then we create the actual cab file using a custom target -# Please do not change this into custom command + custom target. This breaks reactos.cab dependencies on modules -# and you can't do something like "make gdi32/fast reactos_cab/fast bootcd/fast" -add_custom_target(reactos_cab +add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab COMMAND native-cabman -C ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff -RC ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf -L ${CMAKE_CURRENT_BINARY_DIR} -N -P ${REACTOS_SOURCE_DIR} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf native-cabman) -add_cd_file(TARGET reactos_cab FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf DESTINATION reactos NO_CAB FOR bootcd regtest) +add_custom_target(reactos_cab DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab) + +add_cd_file( + TARGET reactos_cab + FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.cab ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf + DESTINATION reactos + NO_CAB FOR bootcd regtest) Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Thu Aug 7 18:20:46 2014 @@ -318,6 +318,12 @@ if(_CD_TARGET) #manage dependency add_dependencies(reactos_cab ${_CD_TARGET}) + # add this so that the combination make target/fast reactos_cab/fast bootcd/fast properly detects that reactos.cab must be rebuilt + if (CMAKE_BUILD_TOOL STREQUAL "make") + add_custom_command(TARGET ${_CD_TARGET} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E touch ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff) + endif() endif() endif() endif() #end bootcd

10 years, 4 months

[dquintana] 63836: [SHELL32] * Populate edit and view menu on first activation. TODO: enable/disable edit menu items in OnInitMenuPopup. * Add Edit menu to resources (en-US only, other langs TODO) ...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Aug 7 15:21:24 2014 New Revision: 63836 URL: http://svn.reactos.org/svn/reactos?rev=63836&view=rev Log: [SHELL32] * Populate edit and view menu on first activation. TODO: enable/disable edit menu items in OnInitMenuPopup. * Add Edit menu to resources (en-US only, other langs TODO) * Repurpose BuildFileMenu to build the menu for the selection. This needs improvements as it uses all the items from the context menu at the moment. * Add items to the File menu when shown. Modified: branches/shell-experiments/dll/win32/browseui/shellbrowser.cpp branches/shell-experiments/dll/win32/shell32/lang/en-US.rc branches/shell-experiments/dll/win32/shell32/shlview.cpp branches/shell-experiments/dll/win32/shell32/shresdef.h 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] Thu Aug 7 15:21:24 2014 @@ -32,6 +32,47 @@ extern HRESULT IUnknown_ShowDW(IUnknown * punk, BOOL fShow); #include "newatlinterfaces.h" + +static void DbgDumpMenuInternal(HMENU hmenu, char* padding, int padlevel) +{ + WCHAR label[128]; + + padding[padlevel] = '.'; + padding[padlevel + 1] = '.'; + padding[padlevel + 2] = 0; + + int count = GetMenuItemCount(hmenu); + for (int i = 0; i < count; i++) + { + MENUITEMINFOW mii = { 0 }; + + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STATE | MIIM_ID; + mii.dwTypeData = label; + mii.cch = _countof(label); + + GetMenuItemInfo(hmenu, i, TRUE, &mii); + + if (mii.fType & MFT_BITMAP) + DbgPrint("%s%2d - %08x: BITMAP %08p (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.hbmpItem, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); + else if (mii.fType & MFT_SEPARATOR) + DbgPrint("%s%2d - %08x ---SEPARATOR---\n", padding, i, mii.wID); + else + DbgPrint("%s%2d - %08x: %S (state=%d, has submenu=%s)\n", padding, i, mii.wID, mii.dwTypeData, mii.fState, mii.hSubMenu ? "TRUE" : "FALSE"); + + if (mii.hSubMenu) + DbgDumpMenuInternal(mii.hSubMenu, padding, padlevel + 2); + + } + + padding[padlevel] = 0; +} + +static void DbgDumpMenu(HMENU hmenu) +{ + char padding[128]; + DbgDumpMenuInternal(hmenu, padding, 0); +} /* TODO: @@ -1851,7 +1892,17 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::InsertMenusSB(HMENU hmenuShared, LPOLEMENUGROUPWIDTHS lpMenuWidths) { HMENU mainMenu = LoadMenu(_AtlBaseModule.GetResourceInstance(), MAKEINTRESOURCE(IDM_CABINET_MAINMENU)); + + //DbgPrint("Menu from shell32:\n"); + //DbgDumpMenu(hmenuShared); + + //DbgPrint("Menu from browseui:\n"); + //DbgDumpMenu(mainMenu); + Shell_MergeMenus(hmenuShared, mainMenu, 0, 0, FCIDM_BROWSERLAST, MM_SUBMENUSHAVEIDS); + + //DbgPrint("Merged menu:\n"); + //DbgDumpMenu(hmenuShared); int GCCU(itemCount3) = GetMenuItemCount(hmenuShared); Unused(itemCount3); @@ -1868,6 +1919,9 @@ { CComPtr<IShellMenu> shellMenu; HRESULT hResult; + + //DbgPrint("SetMenuSB:\n"); + //DbgDumpMenu(hmenuShared); if (hmenuShared && IsMenu(hmenuShared) == FALSE) return E_FAIL; @@ -3192,7 +3246,15 @@ menuIndex = 5; } - return RelayMsgToShellView(uMsg, wParam, menuIndex, bHandled); + //DbgPrint("Before relay:\n"); + //DbgDumpMenu(theMenu); + + LRESULT ret = RelayMsgToShellView(uMsg, wParam, menuIndex, bHandled); + + //DbgPrint("After relay:\n"); + //DbgDumpMenu(theMenu); + + return ret; } LRESULT CShellBrowser::RelayMsgToShellView(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) Modified: branches/shell-experiments/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu Aug 7 15:21:24 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ 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] Thu Aug 7 15:21:24 2014 @@ -87,6 +87,7 @@ HWND m_hWndParent; FOLDERSETTINGS m_FolderSettings; HMENU m_hMenu; + BOOL m_menusLoaded; UINT m_uState; UINT m_cidl; LPITEMIDLIST *m_apidl; @@ -125,8 +126,8 @@ static INT CALLBACK fill_list(LPVOID ptr, LPVOID arg); HRESULT FillList(); HMENU BuildFileMenu(); - void MergeFileMenu(HMENU hSubMenu); - void MergeViewMenu(HMENU hSubMenu); + void PrepareShowFileMenu(HMENU hSubMenu); + void PrepareShowViewMenu(HMENU hSubMenu); UINT GetSelections(); HRESULT OpenSelectedItems(); void OnDeactivate(); @@ -360,6 +361,7 @@ m_FolderSettings.fFlags = 0; m_FolderSettings.ViewMode = 0; m_hMenu = NULL; + m_menusLoaded = FALSE; m_uState = 0; m_cidl = 0; m_apidl = NULL; @@ -999,56 +1001,34 @@ * #### Handling of the menus #### */ -/********************************************************** -* ShellView_BuildFileMenu() -*/ HMENU CDefView::BuildFileMenu() -{ WCHAR szText[MAX_PATH]; - MENUITEMINFOW mii; - int nTools, i; - HMENU hSubMenu; - - TRACE("(%p)\n", this); - - hSubMenu = CreatePopupMenu(); - if (hSubMenu) - { - /*get the number of items in our global array*/ - for(nTools = 0; Tools[nTools].idCommand != -1; nTools++) {} - - /*add the menu items*/ - for(i = 0; i < nTools; i++) - { - LoadStringW(shell32_hInstance, Tools[i].idMenuString, szText, MAX_PATH); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_TYPE | MIIM_ID | MIIM_STATE; - - if(BTNS_SEP != Tools[i].bStyle) /* no separator*/ - { - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; - mii.dwTypeData = szText; - mii.wID = Tools[i].idCommand; - } - else - { - mii.fType = MFT_SEPARATOR; - } - /* tack This item onto the end of the menu */ - InsertMenuItemW(hSubMenu, (UINT) - 1, TRUE, &mii); - } - } - - TRACE("-- return (menu=%p)\n", hSubMenu); - return hSubMenu; -} - -/********************************************************** -* ShellView_MergeFileMenu() -*/ -void CDefView::MergeFileMenu(HMENU hSubMenu) +{ + HRESULT hr; + CComPtr<IContextMenu> cm; + + GetSelections(); + + LPCITEMIDLIST * apidl = (LPCITEMIDLIST *)m_apidl; + + hr = m_pSFParent->GetUIObjectOf(m_hWnd, m_cidl, apidl, IID_NULL_PPV_ARG(IContextMenu, &cm)); + if (FAILED(hr)) + return NULL; + + HMENU hmenu = CreatePopupMenu(); + + //FIXME: get proper numbers ? + const UINT first = 0x7800; + const UINT last = 0x7A00; + hr = cm->QueryContextMenu(hmenu, 0, first, last, 0); + if (FAILED(hr)) + return NULL; + + // TODO: filter or something + + return hmenu; +} + +void CDefView::PrepareShowFileMenu(HMENU hSubMenu) { TRACE("(%p)->(submenu=%p) stub\n", this, hSubMenu); @@ -1075,44 +1055,23 @@ /* 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, 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"); -} - -/********************************************************** -* ShellView_MergeViewMenu() -*/ -void CDefView::MergeViewMenu(HMENU hSubMenu) -{ - TRACE("(%p)->(submenu=%p)\n", this, hSubMenu); - - if (!hSubMenu) - return; - - // 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"); - - _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); - - INT count = ::GetMenuItemCount(menubase); + HMENU menubase = BuildFileMenu(); + if (menubase) + { + int count = ::GetMenuItemCount(menubase); + for (int i = 0; i < count; i++) { WCHAR label[128]; - ZeroMemory(&mii, sizeof(mii)); + MENUITEMINFOW mii = { 0 }; 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; @@ -1123,11 +1082,22 @@ mii.fType |= MFT_RADIOCHECK; - ::InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, &mii); + ::InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, &mii); } + _InsertMenuItemW(hSubMenu, IDM_MYFILEITEM, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + ::DestroyMenu(menubase); } + TRACE("--\n"); +} + +void CDefView::PrepareShowViewMenu(HMENU hSubMenu) +{ + TRACE("(%p)->(submenu=%p)\n", this, hSubMenu); + + if (!hSubMenu) + return; if (m_FolderSettings.ViewMode >= FVM_FIRST && m_FolderSettings.ViewMode <= FVM_LAST) { @@ -1422,8 +1392,80 @@ { if(m_hMenu) { - TRACE("-- before fnSetMenuSB\n"); - m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd); + if (!m_menusLoaded) + { + MENUITEMINFOW mii = { 0 }; + + /* initialize EDIT menu */ + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_EDIT, FALSE, &mii)) + { + HMENU hSubMenu = mii.hSubMenu; + + HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_003"); + + int count = ::GetMenuItemCount(menubase); + for (int i = 0; i < count; i++) + { + 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; + 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); + } + + /* initialize VIEW menu */ + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_SUBMENU; + if (::GetMenuItemInfoW(m_hMenu, FCIDM_MENU_VIEW, FALSE, &mii)) + { + HMENU menubase = ::LoadMenuW(shell32_hInstance, L"MENU_001"); + + HMENU hSubMenu = mii.hSubMenu; + + _InsertMenuItemW(hSubMenu, FCIDM_MENU_VIEW_SEP_OPTIONS, FALSE, 0, MFT_SEPARATOR, NULL, MFS_ENABLED); + + int count = ::GetMenuItemCount(menubase); + for (int i = 0; i < count; i++) + { + 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; + 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); + } + + + TRACE("-- before fnSetMenuSB\n"); + m_pShellBrowser->SetMenuSB(m_hMenu, 0, m_hWnd); + + m_menusLoaded = TRUE; + } } if (SVUIA_ACTIVATE_FOCUS == uState) @@ -1900,13 +1942,13 @@ switch (menuItemId) { case FCIDM_MENU_FILE: - MergeFileMenu(hSubmenu); + PrepareShowFileMenu(hSubmenu); break; case FCIDM_MENU_EDIT: - //MergeEditMenu(hSubmenu); + //PrepareShowEditMenu(hSubmenu); break; case FCIDM_MENU_VIEW: - MergeViewMenu(hSubmenu); + PrepareShowViewMenu(hSubmenu); break; } Modified: branches/shell-experiments/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shresdef.h [iso-8859-1] Thu Aug 7 15:21:24 2014 @@ -492,6 +492,8 @@ #define FCIDM_SHVIEW_INSERT 0x701A #define FCIDM_SHVIEW_UNDO 0x701B #define FCIDM_SHVIEW_INSERTLINK 0x701C +#define FCIDM_SHVIEW_COPYTO 0x701E +#define FCIDM_SHVIEW_MOVETO 0x701F #define FCIDM_SHVIEW_SELECTALL 0x7021 #define FCIDM_SHVIEW_INVERTSELECTION 0x7022

10 years, 4 months

[jgardou] 63835: [CHARMAP] - Correctly include local header

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 7 15:19:32 2014 New Revision: 63835 URL: http://svn.reactos.org/svn/reactos?rev=63835&view=rev Log: [CHARMAP] - Correctly include local header Modified: trunk/reactos/base/applications/charmap/about.c trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/lrgcell.c trunk/reactos/base/applications/charmap/map.c trunk/reactos/base/applications/charmap/settings.c Modified: trunk/reactos/base/applications/charmap/about.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/about.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/about.c [iso-8859-1] Thu Aug 7 15:19:32 2014 @@ -7,7 +7,7 @@ * */ -#include <precomp.h> +#include "precomp.h" static INT_PTR Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/charmap.c [iso-8859-1] Thu Aug 7 15:19:32 2014 @@ -7,7 +7,7 @@ * */ -#include <precomp.h> +#include "precomp.h" #include <commctrl.h> #include <richedit.h> Modified: trunk/reactos/base/applications/charmap/lrgcell.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lrgcell.c [iso-8859-1] Thu Aug 7 15:19:32 2014 @@ -7,7 +7,7 @@ * */ -#include <precomp.h> +#include "precomp.h" static HFONT Modified: trunk/reactos/base/applications/charmap/map.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/map.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/map.c [iso-8859-1] Thu Aug 7 15:19:32 2014 @@ -7,7 +7,7 @@ * */ -#include <precomp.h> +#include "precomp.h" #include <stdlib.h> Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/settings.c [iso-8859-1] Thu Aug 7 15:19:32 2014 @@ -7,7 +7,7 @@ * */ -#include <precomp.h> +#include "precomp.h" #include <winreg.h> #include <windowsx.h>

10 years, 4 months

[hbelusca] 63834: Second partial merge of the condrv_restructure branch, including additions from revisions 63818, 63819, 63820 and 63831. CORE-7931 #comment Second partial merge of the condrv_rest...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 7 13:16:49 2014 New Revision: 63834 URL: http://svn.reactos.org/svn/reactos?rev=63834&view=rev Log: Second partial merge of the condrv_restructure branch, including additions from revisions 63818, 63819, 63820 and 63831. CORE-7931 #comment Second partial merge of the condrv_restructure branch in revision 63834. Modified: trunk/reactos/ (props changed) trunk/reactos/dll/cpl/console/console.c trunk/reactos/dll/cpl/console/layout.c trunk/reactos/dll/win32/kernel32/client/console/console.c trunk/reactos/dll/win32/kernel32/client/console/readwrite.c trunk/reactos/include/reactos/subsys/win/conmsg.h trunk/reactos/win32ss/user/winsrv/consrv/console.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/guisettings.h trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Aug 7 13:16:49 2014 @@ -3,7 +3,7 @@ /branches/GSoC_2011/TcpIpDriver:51551-53074,53076-53119 /branches/GSoC_Network:51545-51546 /branches/cmake-bringup:50484,50693,50719,51544-52564 -/branches/condrv_restructure:63104-63808 +/branches/condrv_restructure:63104-63833 /branches/header-work:45691-47721 /branches/kd++:58883-58973 /branches/ntvdm:59241-63176 Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -115,7 +115,8 @@ wcsncpy(GuiInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !! // GuiInfo->FaceName[0] = L'\0'; GuiInfo->FontFamily = FF_DONTCARE; - GuiInfo->FontSize = 0; + GuiInfo->FontSize.X = 0; + GuiInfo->FontSize.Y = 0; GuiInfo->FontWeight = FW_DONTCARE; GuiInfo->UseRasterFonts = TRUE; Modified: trunk/reactos/dll/cpl/console/layout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/layout.c?r… ============================================================================== --- trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/layout.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -120,8 +120,8 @@ hBrush = CreateSolidBrush(nbkColor); if (!hBrush) return FALSE; - Font = CreateFontW(LOWORD(GuiInfo->FontSize), - 0, // HIWORD(GuiInfo->FontSize), + Font = CreateFontW(GuiInfo->FontSize.X, + 0, // GuiInfo->FontSize.Y, 0, TA_BASELINE, GuiInfo->FontWeight, Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -1076,24 +1076,37 @@ WINAPI FreeConsole(VOID) { - // AG: I'm not sure if this is correct (what happens to std handles?) - // but I just tried to reverse what AllocConsole() does... - - NTSTATUS Status; - CONSOLE_API_MESSAGE ApiMessage; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFree), - sizeof(CONSOLE_FREECONSOLE)); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_FREECONSOLE FreeConsoleRequest = &ApiMessage.Data.FreeConsoleRequest; + HANDLE ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + + /* We must have a non-trivial handle to close */ + if (ConsoleHandle == NULL) // IsConsoleHandle(ConsoleHandle) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Set up the data to send to the Console Server */ + FreeConsoleRequest->ConsoleHandle = ConsoleHandle; + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepFree), + sizeof(*FreeConsoleRequest)); + + /* Check for success */ + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* Reset the console handle */ NtCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; + /* Close the associated input handle */ CloseHandle(InputWaitHandle); InputWaitHandle = INVALID_HANDLE_VALUE; @@ -1311,7 +1324,7 @@ BaseSetLastNTError(ApiMessage.Status); } - DPRINT1("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); + DPRINT("GetLargestConsoleWindowSize, X = %d, Y = %d\n", GetLargestWindowSizeRequest->Size.X, GetLargestWindowSizeRequest->Size.Y); return GetLargestWindowSizeRequest->Size; } @@ -2602,22 +2615,67 @@ } -/* - * @unimplemented - */ -BOOL WINAPI GetConsoleKeyboardLayoutNameA(LPSTR name) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL WINAPI GetConsoleKeyboardLayoutNameW(LPWSTR name) -{ - STUB; - return 0; +BOOL +IntGetConsoleKeyboardLayoutName(OUT PVOID pszLayoutName, + IN BOOL bAnsi) +{ + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest = &ApiMessage.Data.GetKbdLayoutNameRequest; + + /* Set up the data to send to the Console Server */ + GetKbdLayoutNameRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetKbdLayoutNameRequest->Ansi = bAnsi; + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetKeyboardLayoutName), + sizeof(*GetKbdLayoutNameRequest)); + + /* Check for success */ + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + /* Retrieve the results */ + _SEH2_TRY + { + /* Copy only KL_NAMELENGTH == 9 characters, ANSI or UNICODE */ + if (bAnsi) + strncpy(pszLayoutName, (PCHAR)GetKbdLayoutNameRequest->LayoutBuffer, KL_NAMELENGTH); + else + wcsncpy(pszLayoutName, (PWCHAR)GetKbdLayoutNameRequest->LayoutBuffer, KL_NAMELENGTH); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; + + return TRUE; +} + +/* + * @implemented (undocumented) + */ +BOOL +WINAPI +GetConsoleKeyboardLayoutNameA(OUT LPSTR pszLayoutName) +{ + return IntGetConsoleKeyboardLayoutName(pszLayoutName, TRUE); +} + +/* + * @implemented (undocumented) + */ +BOOL +WINAPI +GetConsoleKeyboardLayoutNameW(OUT LPWSTR pszLayoutName) +{ + return IntGetConsoleKeyboardLayoutName(pszLayoutName, FALSE); } /* Modified: trunk/reactos/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -399,7 +399,7 @@ _SEH2_END; NumCells = SizeX * SizeY; - DPRINT1("IntReadConsoleOutput: (%d x %d)\n", SizeX, SizeY); + DPRINT("IntReadConsoleOutput: (%d x %d)\n", SizeX, SizeY); /* * For optimization purposes, Windows (and hence ReactOS, too, for @@ -869,7 +869,7 @@ _SEH2_END; NumCells = SizeX * SizeY; - DPRINT1("IntWriteConsoleOutput: (%d x %d)\n", SizeX, SizeY); + DPRINT("IntWriteConsoleOutput: (%d x %d)\n", SizeX, SizeY); /* * For optimization purposes, Windows (and hence ReactOS, too, for Modified: trunk/reactos/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/win… ============================================================================== --- trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -164,6 +164,7 @@ DWORD dwHotKey; DWORD dwStartupFlags; CONSOLE_PROPERTIES; + BOOLEAN ConsoleNeeded; // Used for GUI apps only. LPTHREAD_START_ROUTINE CtrlDispatcher; LPTHREAD_START_ROUTINE ImeDispatcher; @@ -281,7 +282,7 @@ typedef struct { - ULONG Dummy; + HANDLE ConsoleHandle; } CONSOLE_FREECONSOLE, *PCONSOLE_FREECONSOLE; typedef struct @@ -793,6 +794,13 @@ HANDLE EventHandle; } CONSOLE_SETINPUTOUTPUTCP, *PCONSOLE_SETINPUTOUTPUTCP; +typedef struct +{ + HANDLE ConsoleHandle; + CHAR LayoutBuffer[KL_NAMELENGTH * sizeof(WCHAR)]; // Can hold up to 9 wchars + BOOL Ansi; +} CONSOLE_GETKBDLAYOUTNAME, *PCONSOLE_GETKBDLAYOUTNAME; + typedef struct _CONSOLE_API_MESSAGE { PORT_MESSAGE Header; @@ -886,9 +894,10 @@ CONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest; CONSOLE_SETHISTORYMODE SetHistoryModeRequest; - /* Input and Output Code Pages */ + /* Input and Output Code Pages; keyboard */ CONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest; CONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest; + CONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: trunk/reactos/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/console.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -999,50 +999,63 @@ CSR_API(SrvGetConsoleKeyboardLayoutName) { + NTSTATUS Status; + PCONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetKbdLayoutNameRequest; + PCONSOLE Console; + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* Retrieve the keyboard layout name of the system */ + if (GetKbdLayoutNameRequest->Ansi) + GetKeyboardLayoutNameA((PCHAR)GetKbdLayoutNameRequest->LayoutBuffer); + else + GetKeyboardLayoutNameW((PWCHAR)GetKbdLayoutNameRequest->LayoutBuffer); + + ConSrvReleaseConsole(Console, TRUE); + return STATUS_SUCCESS; +} + +CSR_API(SrvGetConsoleCharType) +{ DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleCharType) +CSR_API(SrvSetConsoleLocalEUDC) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleLocalEUDC) +CSR_API(SrvSetConsoleCursorMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleCursorMode) +CSR_API(SrvGetConsoleCursorMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleCursorMode) +CSR_API(SrvGetConsoleNlsMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleNlsMode) +CSR_API(SrvSetConsoleNlsMode) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvSetConsoleNlsMode) +CSR_API(SrvGetConsoleLangId) { DPRINT1("%s not yet implemented\n", __FUNCTION__); return STATUS_NOT_IMPLEMENTED; } -CSR_API(SrvGetConsoleLangId) -{ - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -506,8 +506,8 @@ GuiData->hWindow = hWnd; - GuiData->Font = CreateFontW(LOWORD(GuiData->GuiInfo.FontSize), - 0, // HIWORD(GuiData->GuiInfo.FontSize), + GuiData->Font = CreateFontW(GuiData->GuiInfo.FontSize.X, + 0, // GuiData->GuiInfo.FontSize.Y, 0, TA_BASELINE, GuiData->GuiInfo.FontWeight, @@ -2321,6 +2321,19 @@ break; } + /* + * Undocumented message sent by Windows' console.dll for applying console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ + case WM_SETCONSOLEINFO: + { + DPRINT1("WM_SETCONSOLEINFO message\n"); + GuiApplyWindowsConsoleSettings(GuiData, (HANDLE)wParam); + break; + } + case PM_CONSOLE_BEEP: DPRINT1("Beep !!\n"); Beep(800, 200); Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -98,7 +98,8 @@ } else if (!wcscmp(szValueName, L"FontSize")) { - TermInfo->FontSize = Value; + TermInfo->FontSize.X = LOWORD(Value); + TermInfo->FontSize.Y = HIWORD(Value); RetVal = TRUE; } else if (!wcscmp(szValueName, L"FontWeight")) @@ -159,7 +160,10 @@ SetConsoleSetting(L"FaceName", REG_SZ, (wcslen(TermInfo->FaceName) + 1) * sizeof(WCHAR), TermInfo->FaceName, L'\0'); // wcsnlen SetConsoleSetting(L"FontFamily", REG_DWORD, sizeof(DWORD), &TermInfo->FontFamily, FF_DONTCARE); - SetConsoleSetting(L"FontSize", REG_DWORD, sizeof(DWORD), &TermInfo->FontSize, 0); + + Storage = MAKELONG(TermInfo->FontSize.X, TermInfo->FontSize.Y); + SetConsoleSetting(L"FontSize", REG_DWORD, sizeof(DWORD), &Storage, 0); + SetConsoleSetting(L"FontWeight", REG_DWORD, sizeof(DWORD), &TermInfo->FontWeight, FW_DONTCARE); Storage = TermInfo->FullScreen; @@ -200,7 +204,8 @@ wcsncpy(TermInfo->FaceName, L"VGA", LF_FACESIZE); // HACK: !! // TermInfo->FaceName[0] = L'\0'; TermInfo->FontFamily = FF_DONTCARE; - TermInfo->FontSize = 0; + TermInfo->FontSize.X = 0; + TermInfo->FontSize.Y = 0; TermInfo->FontWeight = FW_DONTCARE; TermInfo->UseRasterFonts = TRUE; @@ -544,4 +549,180 @@ return; } +/* + * Function for dealing with the undocumented message and structure used by + * Windows' console.dll for setting console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +VOID +GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData, + HANDLE hClientSection) +{ + NTSTATUS Status = STATUS_SUCCESS; + PCONSOLE Console = GuiData->Console; + PCONSOLE_PROCESS_DATA ProcessData; + HANDLE hSection = NULL; + ULONG ViewSize = 0; + PCONSOLE_STATE_INFO pConInfo = NULL; + CONSOLE_INFO ConInfo; + GUI_CONSOLE_INFO GuiInfo; + SIZE_T Length; + + if (!ConDrvValidateConsoleUnsafe(Console, CONSOLE_RUNNING, TRUE)) return; + + /* Get the console leader process, our client */ + ProcessData = ConSrvGetConsoleLeaderProcess(Console); + + /* Duplicate the section handle for ourselves */ + Status = NtDuplicateObject(ProcessData->Process->ProcessHandle, + hClientSection, + NtCurrentProcess(), + &hSection, + 0, 0, DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error when mapping client handle, Status = %lu\n", Status); + goto Quit; + } + + /* Get a view of the shared section */ + Status = NtMapViewOfSection(hSection, + NtCurrentProcess(), + (PVOID*)&pConInfo, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error when mapping view of file, Status = %lu\n", Status); + goto Quit; + } + + _SEH2_TRY + { + /* Check that the section is well-sized */ + if ( (ViewSize < sizeof(CONSOLE_STATE_INFO)) || + (pConInfo->cbSize != sizeof(CONSOLE_STATE_INFO)) ) + { + DPRINT1("Error: section bad-sized: sizeof(Section) < sizeof(CONSOLE_STATE_INFO)\n"); + Status = STATUS_INVALID_VIEW_SIZE; + _SEH2_YIELD(goto Quit); + } + + // TODO: Check that GuiData->hWindow == pConInfo->hConsoleWindow + + /* Retrieve terminal informations */ + + // Console information + ConInfo.HistoryBufferSize = pConInfo->HistoryBufferSize; + ConInfo.NumberOfHistoryBuffers = pConInfo->NumberOfHistoryBuffers; + ConInfo.HistoryNoDup = !!pConInfo->HistoryNoDup; + ConInfo.QuickEdit = !!pConInfo->QuickEdit; + ConInfo.InsertMode = !!pConInfo->InsertMode; + ConInfo.ScreenBufferSize = pConInfo->ScreenBufferSize; + ConInfo.ConsoleSize = pConInfo->WindowSize; + ConInfo.CursorSize = pConInfo->CursorSize; + ConInfo.ScreenAttrib = pConInfo->ScreenColors; + ConInfo.PopupAttrib = pConInfo->PopupColors; + memcpy(&ConInfo.Colors, pConInfo->ColorTable, sizeof(ConInfo.Colors)); + ConInfo.CodePage = pConInfo->CodePage; + /**ConInfo.ConsoleTitle[MAX_PATH + 1] = pConInfo->ConsoleTitle; // FIXME: memcpy**/ +#if 0 + /* Title of the console, original one corresponding to the one set by the console leader */ + Length = min(sizeof(pConInfo->ConsoleTitle) / sizeof(pConInfo->ConsoleTitle[0]) - 1, + Console->OriginalTitle.Length / sizeof(WCHAR)); + wcsncpy(pSharedInfo->ci.ConsoleTitle, Console->OriginalTitle.Buffer, Length); +#endif + // ULONG ConInfo.InputBufferSize = pConInfo-> + // BOOLEAN ConInfo.CursorBlinkOn = pConInfo-> + // BOOLEAN ConInfo.ForceCursorOff = pConInfo-> + + + // Terminal information + Length = min(wcslen(pConInfo->FaceName) + 1, LF_FACESIZE); // wcsnlen + wcsncpy(GuiInfo.FaceName, pConInfo->FaceName, LF_FACESIZE); + GuiInfo.FaceName[Length] = L'\0'; + + GuiInfo.FontFamily = pConInfo->FontFamily; + GuiInfo.FontSize = pConInfo->FontSize; + GuiInfo.FontWeight = pConInfo->FontWeight; + GuiInfo.FullScreen = !!pConInfo->FullScreen; + GuiInfo.AutoPosition = !!pConInfo->AutoPosition; + GuiInfo.WindowOrigin = pConInfo->WindowPosition; + // BOOL GuiInfo.UseRasterFonts = pConInfo-> + // WORD GuiInfo.ShowWindow = pConInfo-> + + + + /* + * If we don't set the default parameters, + * apply them, otherwise just save them. + */ +#if 0 + if (pConInfo->ShowDefaultParams == FALSE) +#endif + { + /* Set the console informations */ + ConSrvApplyUserSettings(Console, &ConInfo); + + /* Set the terminal informations */ + + // memcpy(&GuiData->GuiInfo, &GuiInfo, sizeof(GUI_CONSOLE_INFO)); + + /* Move the window to the user's values */ + GuiData->GuiInfo.AutoPosition = GuiInfo.AutoPosition; + GuiData->GuiInfo.WindowOrigin = GuiInfo.WindowOrigin; + GuiConsoleMoveWindow(GuiData); + + InvalidateRect(GuiData->hWindow, NULL, TRUE); + + /* + * Apply full-screen mode. + */ + if (GuiInfo.FullScreen != GuiData->GuiInfo.FullScreen) + { + SwitchFullScreen(GuiData, GuiInfo.FullScreen); + } + } + +#if 0 + /* + * Save settings if needed + */ + // FIXME: Do it in the console properties applet ?? + if (SaveSettings) + { + DWORD ProcessId = HandleToUlong(ProcessData->Process->ClientId.UniqueProcess); + ConSrvWriteUserSettings(&ConInfo, ProcessId); + GuiConsoleWriteUserSettings(&GuiInfo, ConInfo.ConsoleTitle, ProcessId); + } +#endif + + Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + DPRINT1("GuiApplyUserSettings - Caught an exception, Status = %08X\n", Status); + } + _SEH2_END; + +Quit: + /* Finally, close the section and return */ + if (hSection) + { + NtUnmapViewOfSection(NtCurrentProcess(), pConInfo); + NtClose(hSection); + } + + LeaveCriticalSection(&Console->Lock); + return; +} + /* EOF */ Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -14,7 +14,16 @@ #ifndef WM_APP #define WM_APP 0x8000 #endif -#define PM_APPLY_CONSOLE_INFO (WM_APP + 100) +/* Message sent by ReactOS' console.dll for applying console info */ +#define PM_APPLY_CONSOLE_INFO (WM_APP + 100) + +/* + * Undocumented message sent by Windows' console.dll for applying console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +#define WM_SETCONSOLEINFO (WM_USER + 201) /* STRUCTURES *****************************************************************/ @@ -22,9 +31,9 @@ { // FONTSIGNATURE FontSignature; WCHAR FaceName[LF_FACESIZE]; - UINT FontFamily; - DWORD FontSize; - DWORD FontWeight; + ULONG FontFamily; + COORD FontSize; + ULONG FontWeight; BOOL UseRasterFonts; BOOL FullScreen; /* Whether the console is displayed in full-screen or windowed mode */ @@ -34,6 +43,46 @@ BOOL AutoPosition; POINT WindowOrigin; } GUI_CONSOLE_INFO, *PGUI_CONSOLE_INFO; + +/* + * Undocumented structure used by Windows' console.dll for setting console info. + * See http://www.catch22.net/sites/default/source/files/setconsoleinfo.c + * and http://www.scn.rain.com/~neighorn/PDF/MSBugPaper.pdf + * for more information. + */ +#pragma pack(push, 1) +typedef struct _CONSOLE_STATE_INFO +{ + ULONG cbSize; + COORD ScreenBufferSize; + COORD WindowSize; + POINT WindowPosition; // WindowPosX and Y + + COORD FontSize; + ULONG FontFamily; + ULONG FontWeight; + WCHAR FaceName[LF_FACESIZE]; + + ULONG CursorSize; + BOOL FullScreen; + BOOL QuickEdit; + BOOL AutoPosition; + BOOL InsertMode; + + USHORT ScreenColors; // ScreenAttributes + USHORT PopupColors; // PopupAttributes + BOOL HistoryNoDup; + ULONG HistoryBufferSize; + ULONG NumberOfHistoryBuffers; + + COLORREF ColorTable[16]; + + ULONG CodePage; + HWND HWnd; + + WCHAR ConsoleTitle[256]; +} CONSOLE_STATE_INFO, *PCONSOLE_STATE_INFO; +#pragma pack(pop) #ifndef CONSOLE_H__ // If we aren't included by console.dll @@ -59,6 +108,9 @@ GuiApplyUserSettings(PGUI_CONSOLE_DATA GuiData, HANDLE hClientSection, BOOL SaveSettings); +VOID +GuiApplyWindowsConsoleSettings(PGUI_CONSOLE_DATA GuiData, + HANDLE hClientSection); #endif Modified: trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/include/settings.h [iso-8859-1] Thu Aug 7 13:16:49 2014 @@ -10,6 +10,8 @@ #pragma once /* STRUCTURES *****************************************************************/ + +#pragma pack(push, 1) /* * Structure used to hold terminal-specific information @@ -69,6 +71,8 @@ TERMINAL_INFO TerminalInfo; /* Frontend-specific parameters */ } CONSOLE_PROPS, *PCONSOLE_PROPS; +#pragma pack(pop) + /* FUNCTIONS ******************************************************************/ #ifndef CONSOLE_H__ // If we aren't included by console.dll

10 years, 4 months

[tfaber] 63833: [NTOS:OB] - Mark object types as not having ObjectCreateInfo on creation. Otherwise ObpObjectType's TypeList gets corrupted when a handle to an object type is created (as kmtest:ObT...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Aug 7 13:02:59 2014 New Revision: 63833 URL: http://svn.reactos.org/svn/reactos?rev=63833&view=rev Log: [NTOS:OB] - Mark object types as not having ObjectCreateInfo on creation. Otherwise ObpObjectType's TypeList gets corrupted when a handle to an object type is created (as kmtest:ObTypes does) and ObpIncrementHandleCount tries to insert the list entry a second time. CORE-8423 #resolve Modified: trunk/reactos/ntoskrnl/ob/oblife.c Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Thu Aug 7 13:02:59 2014 @@ -1231,8 +1231,15 @@ /* Get creator info and insert it into the type list */ CreatorInfo = OBJECT_HEADER_TO_CREATOR_INFO(Header); - if (CreatorInfo) InsertTailList(&ObpTypeObjectType->TypeList, - &CreatorInfo->TypeList); + if (CreatorInfo) + { + InsertTailList(&ObpTypeObjectType->TypeList, + &CreatorInfo->TypeList); + + /* CORE-8423: Avoid inserting this a second time if someone creates a + * handle to the object type (bug in Windows 2003) */ + Header->Flags &= ~OB_FLAG_CREATE_INFO; + } /* Set the index and the entry into the object type array */ LocalObjectType->Index = ObpTypeObjectType->TotalNumberOfObjects;

10 years, 4 months

[hbelusca] 63832: Sync with trunk r63831.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 7 12:54:03 2014 New Revision: 63832 URL: http://svn.reactos.org/svn/reactos?rev=63832&view=rev Log: Sync with trunk r63831. Added: branches/condrv_restructure/dll/win32/cards/COPYING - copied unchanged from r63831, trunk/reactos/dll/win32/cards/COPYING Modified: branches/condrv_restructure/ (props changed) branches/condrv_restructure/CMakeLists.txt branches/condrv_restructure/base/applications/calc/lang/tr-TR.rc branches/condrv_restructure/base/applications/games/spider/spider.cpp branches/condrv_restructure/base/applications/games/spider/spider.h branches/condrv_restructure/base/applications/games/spider/spigame.cpp branches/condrv_restructure/base/applications/mplay32/lang/tr-TR.rc branches/condrv_restructure/base/applications/mscutils/servman/lang/tr-TR.rc branches/condrv_restructure/base/applications/mspaint/lang/tr-TR.rc branches/condrv_restructure/base/applications/notepad/lang/tr-TR.rc branches/condrv_restructure/base/applications/rapps/lang/tr-TR.rc branches/condrv_restructure/base/applications/rapps/rapps/ghostscript.txt branches/condrv_restructure/base/applications/rapps/rapps/ghostview.txt branches/condrv_restructure/base/applications/rapps/rapps/miktex.txt branches/condrv_restructure/base/applications/rapps/rapps/net20.txt branches/condrv_restructure/base/applications/rapps/rapps/nirlauncher.txt branches/condrv_restructure/base/applications/rapps/rapps/qmmp.txt branches/condrv_restructure/base/applications/rapps/rapps/smplayer.txt branches/condrv_restructure/base/applications/regedit/lang/tr-TR.rc branches/condrv_restructure/base/applications/screensavers/logon/lang/tr-TR.rc branches/condrv_restructure/base/applications/sndrec32/lang/tr-TR.rc branches/condrv_restructure/base/applications/taskmgr/lang/tr-TR.rc branches/condrv_restructure/base/applications/winhlp32/lang/Tr.rc branches/condrv_restructure/base/applications/wordpad/lang/Tr.rc branches/condrv_restructure/base/setup/usetup/lang/tr-TR.h branches/condrv_restructure/base/shell/explorer/CMakeLists.txt branches/condrv_restructure/dll/cpl/access/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/desk/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/input/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/main/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/mmsys/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/powercfg/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/sysdm/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/cs-CZ.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/de-DE.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/en-US.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/he-IL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/pl-PL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/ro-RO.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/sq-AL.rc branches/condrv_restructure/dll/cpl/wined3dcfg/lang/tr-TR.rc branches/condrv_restructure/dll/win32/avifil32/lang/avifile_Tr.rc branches/condrv_restructure/dll/win32/browseui/CMakeLists.txt branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken1.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken11.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken12.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken3.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken4.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken6.bmp branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken8.bmp branches/condrv_restructure/dll/win32/cards/res/default/Background_6.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Ace.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Eight.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Five.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Four.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Jack.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_King.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Nine.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Queen.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Seven.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Six.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Ten.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Three.bmp branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Two.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Ace.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Eight.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Five.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Four.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Jack.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_King.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Nine.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Queen.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Seven.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Six.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Ten.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Three.bmp branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Two.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Ace.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Eight.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Five.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Four.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Jack.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_King.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Nine.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Queen.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Seven.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Six.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Ten.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Three.bmp branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Two.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Ace.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Eight.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Five.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Four.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Jack.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_King.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Nine.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Queen.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Seven.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Six.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Ten.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Three.bmp branches/condrv_restructure/dll/win32/cards/res/default/Spades_Two.bmp branches/condrv_restructure/dll/win32/comctl32/lang/comctl_Tr.rc branches/condrv_restructure/dll/win32/comctl32/rsrc.rc branches/condrv_restructure/dll/win32/comdlg32/lang/cdlg_Tr.rc branches/condrv_restructure/dll/win32/comdlg32/rsrc.rc branches/condrv_restructure/dll/win32/credui/lang/credui_Tr.rc branches/condrv_restructure/dll/win32/crypt32/lang/crypt32_Tr.rc branches/condrv_restructure/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc branches/condrv_restructure/dll/win32/cryptui/lang/cryptui_Tr.rc branches/condrv_restructure/dll/win32/devmgr/lang/tr-TR.rc branches/condrv_restructure/dll/win32/getuname/getuname.rc branches/condrv_restructure/dll/win32/jscript/lang/jscript_Tr.rc branches/condrv_restructure/dll/win32/kernel32/winnls/lang/tr-TR.rc branches/condrv_restructure/dll/win32/localui/lang/ui_Tr.rc branches/condrv_restructure/dll/win32/msgina/lang/tr-TR.rc branches/condrv_restructure/dll/win32/msvfw32/lang/msvfw32_Tr.rc branches/condrv_restructure/dll/win32/oledlg/lang/oledlg_Tr.rc branches/condrv_restructure/drivers/filesystems/npfs/datasup.c branches/condrv_restructure/drivers/filesystems/npfs/readsup.c branches/condrv_restructure/drivers/filesystems/npfs/waitsup.c branches/condrv_restructure/include/ndk/mmtypes.h branches/condrv_restructure/include/reactos/libs/pseh/pseh3.h branches/condrv_restructure/lib/pseh/i386/pseh3.c branches/condrv_restructure/ntoskrnl/CMakeLists.txt branches/condrv_restructure/ntoskrnl/config/i386/cmhardwr.c branches/condrv_restructure/ntoskrnl/include/internal/i386/ke.h branches/condrv_restructure/ntoskrnl/include/internal/mm.h branches/condrv_restructure/ntoskrnl/io/iomgr/iofunc.c branches/condrv_restructure/ntoskrnl/mm/ARM3/miarm.h branches/condrv_restructure/ntoskrnl/mm/ARM3/pagfault.c branches/condrv_restructure/ntoskrnl/mm/ARM3/pfnlist.c branches/condrv_restructure/ntoskrnl/mm/ARM3/section.c branches/condrv_restructure/ntoskrnl/mm/ARM3/virtual.c branches/condrv_restructure/ntoskrnl/mm/balance.c branches/condrv_restructure/ntoskrnl/mm/pagefile.c branches/condrv_restructure/ntoskrnl/mm/section.c branches/condrv_restructure/ntoskrnl/ntkrnlmp/CMakeLists.txt branches/condrv_restructure/ntoskrnl/ob/oblife.c branches/condrv_restructure/win32ss/gdi/ntgdi/cliprgn.c branches/condrv_restructure/win32ss/user/ntuser/menu.c branches/condrv_restructure/win32ss/user/user32/misc/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/condrv_restructure/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/CMakeLists.t… Modified: branches/condrv_restructure/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/games/spider/spider.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/games/spider/spider.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/net20.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/screensavers/logon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/winhlp32/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/e… Modified: branches/condrv_restructure/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/acce… Modified: branches/condrv_restructure/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/desk… Modified: branches/condrv_restructure/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/inpu… Modified: branches/condrv_restructure/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/main… Modified: branches/condrv_restructure/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/mmsy… Modified: branches/condrv_restructure/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/powe… Modified: branches/condrv_restructure/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/sysd… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/wine… Modified: branches/condrv_restructure/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/av… Modified: branches/condrv_restructure/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/br… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken1.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken11.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken12.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken3.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken4.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken6.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/bavarian/Ruecken8.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/cards/res/default/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ca… Modified: branches/condrv_restructure/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/co… Modified: branches/condrv_restructure/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/co… Modified: branches/condrv_restructure/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/co… Modified: branches/condrv_restructure/dll/win32/comdlg32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/co… Modified: branches/condrv_restructure/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/cr… Modified: branches/condrv_restructure/dll/win32/crypt32/lang/crypt32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/cr… Modified: branches/condrv_restructure/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/cr… Modified: branches/condrv_restructure/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/cr… Modified: branches/condrv_restructure/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/de… Modified: branches/condrv_restructure/dll/win32/getuname/getuname.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ge… Modified: branches/condrv_restructure/dll/win32/jscript/lang/jscript_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/js… Modified: branches/condrv_restructure/dll/win32/kernel32/winnls/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/localui/lang/ui_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/lo… Modified: branches/condrv_restructure/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ms… Modified: branches/condrv_restructure/dll/win32/msvfw32/lang/msvfw32_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ms… Modified: branches/condrv_restructure/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ol… Modified: branches/condrv_restructure/drivers/filesystems/npfs/datasup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/drivers/filesystems/npfs/readsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/drivers/filesystems/npfs/waitsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/ndk/… Modified: branches/condrv_restructure/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/lib/pseh/i386/pseh3.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/pseh/i38… Modified: branches/condrv_restructure/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/CMa… Modified: branches/condrv_restructure/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/con… Modified: branches/condrv_restructure/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/inc… Modified: branches/condrv_restructure/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/inc… Modified: branches/condrv_restructure/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/io/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/ntoskrnl/ntkrnlmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/ntk… Modified: branches/condrv_restructure/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/ob/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/cliprgn.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…

10 years, 4 months

[hbelusca] 63831: [CONSRV]: Add a DPRINT for diagnostics purposes...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Aug 7 12:36:40 2014 New Revision: 63831 URL: http://svn.reactos.org/svn/reactos?rev=63831&view=rev Log: [CONSRV]: Add a DPRINT for diagnostics purposes... Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c 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] Thu Aug 7 12:36:40 2014 @@ -2329,6 +2329,7 @@ */ case WM_SETCONSOLEINFO: { + DPRINT1("WM_SETCONSOLEINFO message\n"); GuiApplyWindowsConsoleSettings(GuiData, (HANDLE)wParam); break; }

10 years, 4 months

[jgardou] 63830: [WIN32K] - Among a thousand ways to screw a commit, choose dysxelia

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 7 11:08:06 2014 New Revision: 63830 URL: http://svn.reactos.org/svn/reactos?rev=63830&view=rev Log: [WIN32K] - Among a thousand ways to screw a commit, choose dysxelia Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Aug 7 11:08:06 2014 @@ -1151,7 +1151,7 @@ KeAttachProcess(&Process->Pcb); } - while (!IsEmptyList(&Win32Process->MenuListHead)) + while (!IsListEmpty(&Win32Process->MenuListHead)) { MenuObject = CONTAINING_RECORD(Win32Process->MenuListHead.Flink, MENU, ListEntry); TRACE("Menus are stuck on the process list!\n");

10 years, 4 months

[jgardou] 63829: [WIN32K] - Among a thousand ways to loop over a list, choose the simple one.

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 7 10:59:54 2014 New Revision: 63829 URL: http://svn.reactos.org/svn/reactos?rev=63829&view=rev Log: [WIN32K] - Among a thousand ways to loop over a list, choose the simple one. Modified: trunk/reactos/win32ss/user/ntuser/menu.c Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Thu Aug 7 10:59:54 2014 @@ -1143,7 +1143,6 @@ IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process) { PEPROCESS CurrentProcess; - PLIST_ENTRY LastHead = NULL; PMENU MenuObject; CurrentProcess = PsGetCurrentProcess(); @@ -1152,10 +1151,8 @@ KeAttachProcess(&Process->Pcb); } - while (Win32Process->MenuListHead.Flink != &(Win32Process->MenuListHead) && - Win32Process->MenuListHead.Flink != LastHead) - { - LastHead = Win32Process->MenuListHead.Flink; + while (!IsEmptyList(&Win32Process->MenuListHead)) + { MenuObject = CONTAINING_RECORD(Win32Process->MenuListHead.Flink, MENU, ListEntry); TRACE("Menus are stuck on the process list!\n"); IntDestroyMenuObject(MenuObject, FALSE, TRUE);

10 years, 4 months

[jgardou] 63828: [NDK] - Correct definition of SECTION_OBJECT

by jgardou＠svn.reactos.org

Author: jgardou Date: Thu Aug 7 10:59:48 2014 New Revision: 63828 URL: http://svn.reactos.org/svn/reactos?rev=63828&view=rev Log: [NDK] - Correct definition of SECTION_OBJECT Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Thu Aug 7 10:59:48 2014 @@ -639,6 +639,7 @@ { PVOID StartingVa; PVOID EndingVa; + PVOID Parent; PVOID LeftChild; PVOID RightChild; PSEGMENT_OBJECT Segment;

10 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
23
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 August 2014