Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[ion] 59862: [NTDLL]: Don't give every process a KernelCallbackTable. Only GUI processes need one. [USER32]: Initialize the KernelCallbackTable when loaded in GUI process. Also, store it statically...

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 28 22:35:28 2013 New Revision: 59862 URL: http://svn.reactos.org/svn/reactos?rev=59862&view=rev Log: [NTDLL]: Don't give every process a KernelCallbackTable. Only GUI processes need one. [USER32]: Initialize the KernelCallbackTable when loaded in GUI process. Also, store it statically instead of requiring a heap allocation (just like Windows). Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/win32ss/user/user32/misc/dllmain.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Wed Aug 28 22:35:28 2013 @@ -1696,18 +1696,6 @@ return STATUS_NO_MEMORY; } - // FIXME: Is it located properly? - /* Initialize table of callbacks for the kernel. */ - Peb->KernelCallbackTable = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(PVOID) * - (USER32_CALLBACK_MAXIMUM + 1)); - if (!Peb->KernelCallbackTable) - { - DPRINT1("Failed to create callback table\n"); - ZwTerminateProcess(NtCurrentProcess(), STATUS_INSUFFICIENT_RESOURCES); - } - /* Allocate an Activation Context Stack */ Status = RtlAllocateActivationContextStack(&Teb->ActivationContextStackPointer); if (!NT_SUCCESS(Status)) return Status; Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Wed Aug 28 22:35:28 2013 @@ -194,34 +194,28 @@ { } +PVOID apfnDispatch[USER32_CALLBACK_MAXIMUM + 1] = +{ + User32CallWindowProcFromKernel, + User32CallSendAsyncProcForKernel, + User32LoadSysMenuTemplateForKernel, + User32SetupDefaultCursors, + User32CallHookProcFromKernel, + User32CallEventProcFromKernel, + User32CallLoadMenuFromKernel, + User32CallClientThreadSetupFromKernel, + User32CallClientLoadLibraryFromKernel, + User32CallGetCharsetInfo, +}; + BOOL Init(VOID) { USERCONNECT UserCon; - PVOID *KernelCallbackTable; - /* Set up the kernel callbacks. */ - KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable; - KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] = - (PVOID)User32CallWindowProcFromKernel; - KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] = - (PVOID)User32CallSendAsyncProcForKernel; - KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] = - (PVOID)User32LoadSysMenuTemplateForKernel; - KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] = - (PVOID)User32SetupDefaultCursors; - KernelCallbackTable[USER32_CALLBACK_HOOKPROC] = - (PVOID)User32CallHookProcFromKernel; - KernelCallbackTable[USER32_CALLBACK_EVENTPROC] = - (PVOID)User32CallEventProcFromKernel; - KernelCallbackTable[USER32_CALLBACK_LOADMENU] = - (PVOID)User32CallLoadMenuFromKernel; - KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] = - (PVOID)User32CallClientThreadSetupFromKernel; - KernelCallbackTable[USER32_CALLBACK_CLIENTLOADLIBRARY] = - (PVOID)User32CallClientLoadLibraryFromKernel; - KernelCallbackTable[USER32_CALLBACK_GETCHARSETINFO] = - (PVOID)User32CallGetCharsetInfo; + /* Set PEB data */ + NtCurrentPeb()->KernelCallbackTable = apfnDispatch; + NtCurrentPeb()->PostProcessInitRoutine = NULL; NtUserProcessConnect( NtCurrentProcess(), &UserCon,

11 years, 2 months

[akhaldi] 59861: [TRANSLATIONS] * Turkish translation update and improvements by Erdem Ersoy. CORE-7408 #resolve #comment Committed in r59861. Thanks.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 28 22:06:34 2013 New Revision: 59861 URL: http://svn.reactos.org/svn/reactos?rev=59861&view=rev Log: [TRANSLATIONS] * Turkish translation update and improvements by Erdem Ersoy. CORE-7408 #resolve #comment Committed in r59861. Thanks. Added: trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc (with props) Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc trunk/reactos/base/applications/mmc/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/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/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/winhlp32/Tr.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -1,5 +1,5 @@ /* - * TRANSLATORS: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT Modified: trunk/reactos/base/applications/mmc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mmc/lang… ============================================================================== --- trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mmc/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -1,5 +1,5 @@ /* - * TRANSLATORS: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) */ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT @@ -8,7 +8,7 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "&Yeni\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT END @@ -23,14 +23,14 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "New\tStrg+N", IDM_FILE_NEW + MENUITEM "&Yeni\tStrg+N", IDM_FILE_NEW MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å\tAlt+F4", IDM_FILE_EXIT END - POPUP "&Windows" + POPUP "&Pencereler" BEGIN - MENUITEM "List", IDM_WINDOWS_LIST + MENUITEM "&Dizelgele", IDM_WINDOWS_LIST END POPUP "&YardÄ±m" Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -37,7 +37,7 @@ MENUITEM "&Dizelge", ID_VIEW_LIST MENUITEM "&AyrÄ±ntÄ±lar", ID_VIEW_DETAILS MENUITEM SEPARATOR - MENUITEM "D&eÄiÅtir...", ID_VIEW_CUST, GRAYED + MENUITEM "&HusÃ»sileÅtir...", ID_VIEW_CUST, GRAYED END POPUP "&YardÄ±m" BEGIN @@ -200,7 +200,7 @@ BEGIN IDS_SERVICES_STARTED "BaÅladÄ±" IDS_SERVICES_STOPPED "Durdu" - IDS_SERVICES_AUTO "Kendi Kendine" + IDS_SERVICES_AUTO "KendiliÄinden" IDS_SERVICES_MAN "Elle" IDS_SERVICES_DIS "Devre DÄ±ÅÄ±" END Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -50,7 +50,7 @@ MENUITEM SEPARATOR MENUITEM "&Sayfa YapÄ±sÄ±...", CMD_PAGE_SETUP MENUITEM "Ya&zdÄ±r...\tCtrl+P", CMD_PRINT - MENUITEM "Yaz&Ä±cÄ± SeÃ§enekleri...", CMD_PRINTER_SETUP + MENUITEM "Yaz&Ä±cÄ± AyarlarÄ±...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", CMD_EXIT END Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -8,7 +8,7 @@ BEGIN POPUP "&KÃ¼tÃ¼k" BEGIN - MENUITEM "&SeÃ§enekler...", ID_SETTINGS + MENUITEM "&Ayarlar...", ID_SETTINGS MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", ID_EXIT END @@ -59,7 +59,7 @@ IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "SeÃ§enekler" +CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "UmÃ»mÃ®", -1, 4, 2, 240, 61 @@ -117,7 +117,7 @@ IDS_TOOLTIP_INSTALL "Kur" IDS_TOOLTIP_UNINSTALL "KaldÄ±r" IDS_TOOLTIP_MODIFY "DeÄiÅtir" - IDS_TOOLTIP_SETTINGS "SeÃ§enekler" + IDS_TOOLTIP_SETTINGS "Ayarlar" IDS_TOOLTIP_REFRESH "Yenile" IDS_TOOLTIP_EXIT "ÃÄ±kÄ±Å" END Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -520,7 +520,7 @@ STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "GÃ¶rev YÃ¶neticisi'ndeki bilgilerin kendiliÄinden yenilenmesini durdurur. " + ID_VIEW_UPDATESPEED_PAUSED "GÃ¶rev YÃ¶neticisi'ndeki bilgilerin kendiliÄinden yenilenmesini durdurur." ID_WINDOWS_TILEHORIZONTALLY "MasaÃ¼stÃ¼ndeki pencereleri yatay olarak sÄ±ralar." ID_WINDOWS_TILEVERTICALLY "MasaÃ¼stÃ¼ndeki pencereleri dikey olarak sÄ±ralar." ID_WINDOWS_MINIMIZE "Pencereleri simge durumuna kÃ¼Ã§Ã¼ltÃ¼r." Modified: trunk/reactos/base/applications/winhlp32/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… ============================================================================== --- trunk/reactos/base/applications/winhlp32/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/winhlp32/Tr.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -31,7 +31,7 @@ MENUITEM "&AÃ§...", MNID_FILE_OPEN MENUITEM SEPARATOR MENUITEM "&YazdÄ±r...", MNID_FILE_PRINT - MENUITEM "Ya&zÄ±cÄ± seÃ§enekleri...", MNID_FILE_SETUP + MENUITEM "Ya&zÄ±cÄ± AyarlarÄ±...", MNID_FILE_SETUP MENUITEM SEPARATOR MENUITEM "&ÃÄ±kÄ±Å", MNID_FILE_EXIT } Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… ============================================================================== --- trunk/reactos/base/applications/wordpad/lang/Tr.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/wordpad/lang/Tr.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -1,8 +1,8 @@ /* * Turkish Resources for ReactOS Wordpad * - * Copyright: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org) - * 2013 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + * Copyrights: 2006 Fatih AÅÄ±cÄ± (fasici(a)linux-sevenler.org) + * 2013 Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -72,7 +72,7 @@ MENUITEM "&Ãizgilik", ID_TOGGLE_RULER MENUITEM "&Durum ÃubuÄu", ID_TOGGLE_STATUSBAR MENUITEM SEPARATOR - MENUITEM "&SeÃ§enekler...", ID_VIEWPROPERTIES + MENUITEM "&HusÃ»siyetler...", ID_VIEWPROPERTIES END POPUP "&Ekle" BEGIN @@ -225,7 +225,7 @@ STRINGTABLE BEGIN - STRING_VIEWPROPS_TITLE, "SeÃ§enekler" + STRING_VIEWPROPS_TITLE, "HusÃ»siyetler" STRING_VIEWPROPS_TEXT, "Metin" STRING_VIEWPROPS_RICHTEXT, "GeliÅmiÅ Metin" END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -80,6 +80,9 @@ #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif +#ifdef LANGUAGE_TR_TR + #include "lang/tr-TR.rc" +#endif #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif Added: trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc [iso-8859-1] Wed Aug 28 22:06:34 2013 @@ -0,0 +1,151 @@ +/* + * TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + */ + +LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&ZamÃ¢nÄ± Ayarla", ID_SHELL_CMD_ADJUST_DAT + MENUITEM "&Bildirimleri HusÃ»sileÅtir...", ID_SHELL_CMD_CUST_NOTIF + MENUITEM SEPARATOR + MENUITEM "&Pencereleri Basamakla", ID_SHELL_CMD_CASCADE_WND + MENUITEM "P&encereleri Ãst Ãste SÄ±rala", ID_SHELL_CMD_TILE_WND_H + MENUITEM "Pe&ncereleri Yan Yana SÄ±rala", ID_SHELL_CMD_TILE_WND_V + MENUITEM "&MasaÃ¼stÃ¼nÃ¼ GÃ¶ster", ID_SHELL_CMD_SHOW_DESKTOP + MENUITEM "&Geri Al", ID_SHELL_CMD_UNDO_ACTION + MENUITEM SEPARATOR + MENUITEM "G&Ã¶rev YÃ¶neticisi", ID_SHELL_CMD_OPEN_TASKMGR + MENUITEM SEPARATOR + MENUITEM "GÃ¶&rev ÃubuÄunu Kilitle", ID_LOCKTASKBAR + MENUITEM "&HusÃ»siyetler", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&YazÄ±lÄ±mlar", IDM_PROGRAMS + BEGIN + MENUITEM "(BoÅ)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "Y&er Ä°mleri", IDM_FAVORITES + BEGIN + MENUITEM "(BoÅ)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Belgeler", IDM_DOCUMENTS + BEGIN + MENUITEM "(BoÅ)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Ayarlar", IDM_SETTINGS + BEGIN + MENUITEM "&Denetim MasasÄ±", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM "", -1, MFT_SEPARATOR + MENUITEM "&GÃ¼venlik...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&AÄ BaÄlantÄ±larÄ±", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&YazÄ±cÄ±lar ve BelgegeÃ§erler", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "G&Ã¶rev ÃubuÄu ve BaÅlat SeÃ§kesi", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "A&ra", IDM_SEARCH + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + END + MENUITEM "Yar&dÄ±m ve Destek", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "&ÃalÄ±ÅtÄ±r...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "E&Åle", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "&Oturumu Kapat %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "Ba&ÄlantÄ±yÄ± Kes...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Undock Computer", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "B&ilgisayarÄ± Kapat...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + + +IDD_TASKBARPROP_TASKBAR DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "GÃ¶rev ÃubuÄu" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "GÃ¶rev ÃubuÄunun GÃ¶rÃ¼nÃ¼mÃ¼", IDC_STATIC, 6,6,240,104 + CONTROL "", IDC_TASKBARPROP_TASKBARBITMAP, "Static", SS_BITMAP | SS_SUNKEN, 13,18,224,21 + AUTOCHECKBOX "&GÃ¶rev ÃubuÄunu Kilitle", IDC_TASKBARPROP_LOCK, 13,45,200,10 + AUTOCHECKBOX "G&Ã¶rev ÃubuÄunu KendiliÄinden Gizle", IDC_TASKBARPROP_HIDE, 13,58,200,10 + AUTOCHECKBOX "GÃ¶&rev ÃubuÄunu Pencerelerin ÃstÃ¼nde Tut", IDC_TASKBARPROP_ONTOP, 13,71,200,10 + AUTOCHECKBOX "&Benzer GÃ¶rev ÃubuÄu DÃ¼Ämelerini KÃ¼meleÅtir", IDC_TASKBARPROP_GROUP, 13,84,200,10 + AUTOCHECKBOX "&HÄ±zlÄ± BaÅlat'Ä± GÃ¶ster", IDC_TASKBARPROP_SHOWQL, 13,97,200,10 +END + +IDD_TASKBARPROP_STARTMENU DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "BaÅlat SeÃ§kesi" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + AUTORADIOBUTTON "&GeliÅmiÅ BaÅlat SeÃ§kesi", IDC_TASKBARPROP_STARTMENU, 7,7,105,10 + LTEXT "GeliÅmiÅ BaÅlat SeÃ§kesi; dizinlere, sÄ±k kullanÄ±lan yazÄ±lÄ±mlara ve aramaya kolayca ulaÅmanÄ±za olanak saÄlar.", IDC_STATIC, 20,17,150,24, WS_DISABLED + PUSHBUTTON "&HusÃ»sileÅtir...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED + AUTORADIOBUTTON "&Eski BaÅlat SeÃ§kesi", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED + LTEXT "Eski BaÅlat SeÃ§kesi, eski gÃ¶rÃ¼nÃ¼m ve eski iÅlevliÄi saÄlar.",-1,20,57,150,24, WS_DISABLED + PUSHBUTTON "H&usÃ»sileÅtir...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED + GROUPBOX "Gizlilik",IDC_STATIC, 7,100,238,42 + AUTOCHECKBOX "&Son KullanÄ±lan KÃ¼tÃ¼klerin Dizelgesini Sakla ve GÃ¶rÃ¼ntÃ¼le", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED + AUTOCHECKBOX "S&on KullanÄ±lan YazÄ±lÄ±mlarÄ±n Dizelgesini Sakla ve GÃ¶rÃ¼ntÃ¼le",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED +END + +IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Bildirim AlanÄ±" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + CONTROL "", IDC_TASKBARPROP_NOTIFICATIONBITMAP, "Static", SS_BITMAP | SS_SUNKEN,7,6,238,21, WS_DISABLED + GROUPBOX "Simgeler", IDC_STATIC, 6,33,240,58, WS_DISABLED + LTEXT "YakÄ±n zamanda kullanmadÄ±ÄÄ±nÄ±z simgeleri gizleyerek bildirim alanÄ±nÄ±n ÅiÅmesini Ã¶nleyebilirsiniz.", IDC_STATIC, 13,48,223,16, WS_DISABLED + AUTOCHECKBOX "E&dilgin Simgeleri Gizle", IDC_TASKBARPROP_HIDEICONS, 13,70,125,10, WS_DISABLED + PUSHBUTTON "&HusÃ»sileÅtir...", IDC_TASKBARPROP_ICONCUST, 188,70,50,14, WS_DISABLED + GROUPBOX "Dizge Simgeleri", IDC_STATIC, 6,97,240,84, WS_DISABLED + LTEXT "Her zaman gÃ¶rÃ¼ntÃ¼lenecek dizge simgelerini seÃ§iniz:", IDC_STATIC, 13,112,223,16, WS_DISABLED + AUTOCHECKBOX "&Saat", IDC_TASKBARPROP_CLOCK, 13,126,200,10, WS_DISABLED + AUTOCHECKBOX "S&es AyÃ¢rÄ±", IDC_TASKBARPROP_VOLUME, 13,139,200,10, WS_DISABLED + AUTOCHECKBOX "&AÄ", IDC_TASKBARPROP_NETWORK, 13,152,200,10, WS_DISABLED + AUTOCHECKBOX "&GÃ¼Ã§", IDC_TASKBARPROP_POWER, 13,164,200,10, WS_DISABLED + +END + +IDD_TASKBARPROP_TOOLBARS DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "AraÃ§ ÃubuklarÄ±" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + LTEXT "GÃ¶rev Ã§ubuÄuna hangi araÃ§ Ã§ubuklarÄ±nÄ±n ekleneceÄini seÃ§ebilirsiniz:", IDC_STATIC, 7,7,223,12, WS_DISABLED + CONTROL "", IDC_TASKBARPROP_DESKBANDLIST, "SysTreeView32",WS_BORDER | WS_TABSTOP | WS_DISABLED, 7,20,236,160, WS_EX_CLIENTEDGE +END + +IDD_TASKBARPROP_ADVANCED DIALOGEX 0, 0, 252, 218 +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "GeliÅmiÅ" +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "GeliÅmiÅ SeÃ§enekler", IDC_STATIC, 6,6,240,121 + AUTOCHECKBOX "&SÃ¢niyeleri GÃ¶ster", IDC_TASKBARPROP_SECONDS, 13,18,200,10 + AUTOCHECKBOX "&Pencere Ãnizlemelerini GÃ¶ster", IDC_TASKBARPROP_WNDPREV, 13,31,200,10 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "BaÅlat" + IDS_PROPERTIES "&HusÃ»siyetler" + IDS_OPEN_ALL_USERS "&TÃ¼m KullanÄ±cÄ±lar'da AÃ§" + IDS_EXPLORE_ALL_USERS "T&Ã¼m KullanÄ±cÄ±lar'da AraÅtÄ±r" + IDS_STARTUP_ERROR "Dizge, gerekli deÄerlerin, bozuk olduÄundan ya da olmadÄ±ÄÄ±ndan Gezgin'i baÅlatamadÄ±." +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TASKBAR_STARTMENU_PROP_CAPTION "GÃ¶rev ÃubuÄu ve BaÅlat SeÃ§kesi" +END Propchange: trunk/reactos/base/shell/explorer-new/lang/tr-TR.rc ------------------------------------------------------------------------------ svn:eol-style = native

11 years, 2 months

[akhaldi] 59860: [CMAKE/VS] * Introduce the support for organizing the solution into a hierarchy of folders that matches our codebase layout. * You can enable this feature by adding -DUSE_FOLDER_ST...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 28 21:37:54 2013 New Revision: 59860 URL: http://svn.reactos.org/svn/reactos?rev=59860&view=rev Log: [CMAKE/VS] * Introduce the support for organizing the solution into a hierarchy of folders that matches our codebase layout. * You can enable this feature by adding -DUSE_FOLDER_STRUCTURE=1 to your configure phase (the VSSolution one). * Based on a patch by Yuntian Zhang with my improvements. CORE-7412 Modified: trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/cmake/msvc.cmake 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] Wed Aug 28 21:37:54 2013 @@ -345,6 +345,32 @@ _add_executable(${name} ${ARGN}) add_clean_target(${name}) endfunction() +elseif(USE_FOLDER_STRUCTURE) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + string(LENGTH ${CMAKE_SOURCE_DIR} CMAKE_SOURCE_DIR_LENGTH) + + function(add_custom_target name) + _add_custom_target(${name} ${ARGN}) + string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) + set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") + endfunction() + + function(add_library name) + _add_library(${name} ${ARGN}) + get_target_property(_target_excluded ${name} EXCLUDE_FROM_ALL) + if(_target_excluded AND ${name} MATCHES "^lib.*") + set_property(TARGET "${name}" PROPERTY FOLDER "Importlibs") + else() + string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) + set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") + endif() + endfunction() + + function(add_executable name) + _add_executable(${name} ${ARGN}) + string(SUBSTRING ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR_LENGTH} -1 CMAKE_CURRENT_SOURCE_DIR_RELATIVE) + set_property(TARGET "${name}" PROPERTY FOLDER "${CMAKE_CURRENT_SOURCE_DIR_RELATIVE}") + endfunction() endif() if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59860… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Aug 28 21:37:54 2013 @@ -45,6 +45,9 @@ if(MSVC_IDE) add_compile_flags("/MP") + if(NOT DEFINED USE_FOLDER_STRUCTURE) + set(USE_FOLDER_STRUCTURE FALSE) + endif() endif() if(${_MACHINE_ARCH_FLAG} MATCHES X86)

11 years, 2 months

[ion] 59859: [NDK]: Fix Vista vs Server 2003 definition of SECTION_IMAGE_INFORMATION. [NTOSKRNL]: Gut out almost all the fields in the ReactOS-specific MM_IMAGE_SECTION, and replace them with the N...

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 28 21:09:16 2013 New Revision: 59859 URL: http://svn.reactos.org/svn/reactos?rev=59859&view=rev Log: [NDK]: Fix Vista vs Server 2003 definition of SECTION_IMAGE_INFORMATION. [NTOSKRNL]: Gut out almost all the fields in the ReactOS-specific MM_IMAGE_SECTION, and replace them with the NT SECTION_IMAGE_INFORMATION structure instead. Make NtQuerySection simply return a copy of these fields (as on Windows). [NTOSKRNL]: Update the PE loader code to now store information in SECTION_IMAGE_INFORMATION. Also store LoaderFlags and DllCharacteristics, which were not stored/returned to users before (in NtQuerySection). [NTOSKRNL]: An entrypoint of NULL should also set ImageContainsCode to FALSE. [NTOSKRNL]: Implement MmGetImageInformation, which is used by NtQueryInformationProcess(ProcessImageInformation). Also implement this latter info class. [NTOSKRNL]: Delete ps_i.h, nobody uses this anymore. Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/ps_i.h trunk/reactos/ntoskrnl/mm/ARM3/section.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ps/query.c 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] Wed Aug 28 21:09:16 2013 @@ -343,11 +343,30 @@ USHORT ImageCharacteristics; USHORT DllCharacteristics; USHORT Machine; - UCHAR ImageContainsCode; - UCHAR Spare1; + BOOLEAN ImageContainsCode; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + struct + { + UCHAR ComPlusNativeReady:1; + UCHAR ComPlusILOnly:1; + UCHAR ImageDynamicallyRelocated:1; + UCHAR ImageMappedFlat:1; + UCHAR Reserved:4; + }; + UCHAR ImageFlags; + }; +#else + BOOLEAN Spare1; +#endif ULONG LoaderFlags; ULONG ImageFileSize; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG CheckSum; +#else ULONG Reserved[1]; +#endif } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; #ifndef NTOS_MODE_USER Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -216,18 +216,9 @@ typedef struct _MM_IMAGE_SECTION_OBJECT { - ULONG_PTR ImageBase; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG_PTR EntryPoint; - USHORT Subsystem; - USHORT ImageCharacteristics; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - USHORT Machine; - BOOLEAN Executable; + SECTION_IMAGE_INFORMATION ImageInformation; + PVOID BasedAddress; ULONG NrSegments; - ULONG ImageSize; PMM_SECTION_SEGMENT Segments; } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT; @@ -1548,6 +1539,12 @@ /* section.c *****************************************************************/ +VOID +NTAPI +MmGetImageInformation( + OUT PSECTION_IMAGE_INFORMATION ImageInformation +); + PFILE_OBJECT NTAPI MmGetFileObjectForSection( Modified: trunk/reactos/ntoskrnl/include/internal/ps_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_i.h [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -6,602 +6,3 @@ * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ - -// -// Process Information Classes -// -static const INFORMATION_CLASS_INFO PsProcessInfoClass[] = -{ - /* ProcessBasicInformation */ - IQS_SAME - ( - PROCESS_BASIC_INFORMATION, - ULONG, - ICIF_QUERY - ), - - /* ProcessQuotaLimits */ - IQS_SAME - ( - QUOTA_LIMITS, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessIoCounters */ - IQS_SAME - ( - IO_COUNTERS, - ULONG, - ICIF_QUERY - ), - - /* ProcessVmCounters */ - IQS_SAME - ( - VM_COUNTERS, - ULONG, - ICIF_QUERY - ), - - /* ProcessTimes */ - IQS_SAME - ( - KERNEL_USER_TIMES, - ULONG, - ICIF_QUERY - ), - - /* ProcessBasePriority */ - IQS_SAME - ( - KPRIORITY, - ULONG, - ICIF_SET - ), - - /* ProcessRaisePriority */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_SET - ), - - /* ProcessDebugPort */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_QUERY - ), - - /* ProcessExceptionPort */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_SET - ), - - /* ProcessAccessToken */ - IQS_SAME - ( - PROCESS_ACCESS_TOKEN, - ULONG, - ICIF_SET - ), - - /* ProcessLdtInformation */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessLdtSize */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessDefaultHardErrorMode */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessIoPortHandlers */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessPooledUsageAndLimits */ - IQS_SAME - ( - POOLED_USAGE_AND_LIMITS, - ULONG, - ICIF_QUERY - ), - - /* ProcessWorkingSetWatch */ - IQS_SAME - ( - PROCESS_WS_WATCH_INFORMATION, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessUserModeIOPL */ - IQS_SAME - ( - UCHAR, - ULONG, - ICIF_SET - ), - - /* ProcessEnableAlignmentFaultFixup */ - IQS_SAME - ( - BOOLEAN, - ULONG, - ICIF_SET - ), - - /* ProcessPriorityClass */ - IQS_SAME - ( - PROCESS_PRIORITY_CLASS, - USHORT, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessWx86Information */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessHandleCount */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessAffinityMask */ - IQS_SAME - ( - KAFFINITY, - ULONG, - ICIF_SET - ), - - /* ProcessPriorityBoost */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessDeviceMap */ - IQS - ( - ((PROCESS_DEVICEMAP_INFORMATION*)0)->Query, - ((PROCESS_DEVICEMAP_INFORMATION*)0)->Set, - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessSessionInformation */ - IQS_SAME - ( - PROCESS_SESSION_INFORMATION, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessForegroundInformation */ - IQS_SAME - ( - BOOLEAN, - ULONG, - ICIF_SET - ), - - /* ProcessWow64Information */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ProcessImageFileName */ - IQS_SAME - ( - UNICODE_STRING, - ULONG, - ICIF_QUERY | ICIF_SIZE_VARIABLE - ), - - /* ProcessLUIDDeviceMapsEnabled */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessBreakOnTermination */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ProcessDebugObjectHandle */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessDebugFlags */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessHandleTracing */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessIoPriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessExecuteFlags */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessTlsInformation */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessCookie */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessImageInformation */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessCycleTime */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessPagePriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), - - /* ProcessInstrumentationCallback */ - IQS_SAME - ( - UCHAR, - UCHAR, - 0 - ), -}; - -// -// Thread Information Classes -// -static const INFORMATION_CLASS_INFO PsThreadInfoClass[] = -{ - /* ThreadBasicInformation */ - IQS_SAME - ( - THREAD_BASIC_INFORMATION, - ULONG, - ICIF_QUERY - ), - - /* ThreadTimes */ - IQS_SAME - ( - KERNEL_USER_TIMES, - ULONG, - ICIF_QUERY - ), - - /* ThreadPriority */ - IQS_SAME - ( - KPRIORITY, - ULONG, - ICIF_QUERY - ), - - /* ThreadBasePriority */ - IQS_SAME - ( - LONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadAffinityMask */ - IQS_SAME - ( - KAFFINITY, - ULONG, - ICIF_QUERY - ), - - /* ThreadImpersonationToken */ - IQS_SAME - ( - HANDLE, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ThreadDescriptorTableEntry */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadEnableAlignmentFaultFixup */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadEventPair_Reusable */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadQuerySetWin32StartAddress */ - IQS_SAME - ( - PVOID, - ULONG, - ICIF_QUERY | ICIF_SET - ), - - /* ThreadZeroTlsCell */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPerformanceCount */ - IQS_SAME - ( - LARGE_INTEGER, - ULONG, - ICIF_QUERY - ), - - /* ThreadAmILastThread */ - IQS_SAME - ( - BOOLEAN, - BOOLEAN, - ICIF_QUERY - ), - - /* ThreadIdealProcessor */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPriorityBoost */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSetTlsArrayAddress */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsIoPending */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadHideFromDebugger */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - - /* ThreadPriorityBoost */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSetTlsArrayAddress */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsIoPending */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadHideFromDebugger */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadBreakOnTermination */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadSwitchLegacyState */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIsTerminated */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadLastSystemCall */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadIoPriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadCycleTime */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadPagePriority */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadActualBasePriority */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), - - /* ThreadTebInformation */ - IQS_SAME - ( - ULONG, - ULONG, - ICIF_QUERY - ), - - /* ThreadCSwitchMon */ - IQS_SAME - ( - UCHAR, - UCHAR, - ICIF_QUERY - ), -}; Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -1495,6 +1495,22 @@ return ((PROS_SECTION_OBJECT)SectionObject)->FileObject; } +VOID +NTAPI +MmGetImageInformation (OUT PSECTION_IMAGE_INFORMATION ImageInformation) +{ + PSECTION_OBJECT SectionObject; + + /* Get the section object of this process*/ + SectionObject = PsGetCurrentProcess()->SectionObject; + ASSERT(SectionObject != NULL); + ASSERT(MiIsRosSectionObject(SectionObject) == TRUE); + + /* Return the image information */ + DPRINT1("HERE!\n"); + *ImageInformation = ((PROS_SECTION_OBJECT)SectionObject)->ImageSection->ImageInformation; +} + NTSTATUS NTAPI MmGetFileNameForFileObject(IN PFILE_OBJECT FileObject, Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -156,7 +156,7 @@ } /* Reserve system PTEs needed */ - PteCount = ROUND_TO_PAGES(Section->ImageSection->ImageSize) >> PAGE_SHIFT; + PteCount = ROUND_TO_PAGES(Section->ImageSection->ImageInformation.ImageFileSize) >> PAGE_SHIFT; PointerPte = MiReserveSystemPtes(PteCount, SystemPteSpace); if (!PointerPte) { @@ -3040,7 +3040,7 @@ ASSERT(Status != STATUS_ALREADY_COMMITTED); /* Get the size of the driver */ - DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageSize; + DriverSize = ((PROS_SECTION_OBJECT)Section)->ImageSection->ImageInformation.ImageFileSize; /* Make sure we're not being loaded into session space */ if (!Flags) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -199,6 +199,7 @@ ULONG cbHeadersSize = 0; ULONG nSectionAlignment; ULONG nFileAlignment; + ULONG ImageBase; const IMAGE_DOS_HEADER * pidhDosHeader; const IMAGE_NT_HEADERS32 * pinhNtHeader; const IMAGE_OPTIONAL_HEADER32 * piohOptHeader; @@ -389,17 +390,54 @@ /* PE32 */ case IMAGE_NT_OPTIONAL_HDR32_MAGIC: { - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase)) - ImageSectionObject->ImageBase = piohOptHeader->ImageBase; + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, ImageBase)) + ImageBase = piohOptHeader->ImageBase; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfImage)) - ImageSectionObject->ImageSize = piohOptHeader->SizeOfImage; + ImageSectionObject->ImageInformation.ImageFileSize = piohOptHeader->SizeOfImage; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackReserve)) - ImageSectionObject->StackReserve = piohOptHeader->SizeOfStackReserve; + ImageSectionObject->ImageInformation.MaximumStackSize = piohOptHeader->SizeOfStackReserve; if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfStackCommit)) - ImageSectionObject->StackCommit = piohOptHeader->SizeOfStackCommit; + ImageSectionObject->ImageInformation.CommittedStackSize = piohOptHeader->SizeOfStackCommit; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) + { + ImageSectionObject->ImageInformation.SubSystemType = piohOptHeader->Subsystem; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) && + RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion)) + { + ImageSectionObject->ImageInformation.SubSystemMinorVersion = piohOptHeader->MinorSubsystemVersion; + ImageSectionObject->ImageInformation.SubSystemMajorVersion = piohOptHeader->MajorSubsystemVersion; + } + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + ImageSectionObject->ImageInformation.TransferAddress = (PVOID) (ImageBase + + piohOptHeader->AddressOfEntryPoint); + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) + ImageSectionObject->ImageInformation.ImageContainsCode = piohOptHeader->SizeOfCode != 0; + else + ImageSectionObject->ImageInformation.ImageContainsCode = TRUE; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + if (piohOptHeader->AddressOfEntryPoint == 0) + { + ImageSectionObject->ImageInformation.ImageContainsCode = FALSE; + } + } + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, LoaderFlags)) + ImageSectionObject->ImageInformation.LoaderFlags = piohOptHeader->LoaderFlags; + + if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, DllCharacteristics)) + ImageSectionObject->ImageInformation.DllCharacteristics = piohOptHeader->DllCharacteristics; break; } @@ -413,10 +451,9 @@ if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, ImageBase)) { + ImageBase = pioh64OptHeader->ImageBase; if(pioh64OptHeader->ImageBase > MAXULONG_PTR) DIE(("ImageBase exceeds the address space\n")); - - ImageSectionObject->ImageBase = (ULONG_PTR)pioh64OptHeader->ImageBase; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfImage)) @@ -424,7 +461,7 @@ if(pioh64OptHeader->SizeOfImage > MAXULONG_PTR) DIE(("SizeOfImage exceeds the address space\n")); - ImageSectionObject->ImageSize = pioh64OptHeader->SizeOfImage; + ImageSectionObject->ImageInformation.ImageFileSize = pioh64OptHeader->SizeOfImage; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackReserve)) @@ -432,7 +469,7 @@ if(pioh64OptHeader->SizeOfStackReserve > MAXULONG_PTR) DIE(("SizeOfStackReserve exceeds the address space\n")); - ImageSectionObject->StackReserve = (ULONG_PTR)pioh64OptHeader->SizeOfStackReserve; + ImageSectionObject->ImageInformation.MaximumStackSize = (ULONG_PTR) pioh64OptHeader->SizeOfStackReserve; } if(RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfStackCommit)) @@ -440,42 +477,59 @@ if(pioh64OptHeader->SizeOfStackCommit > MAXULONG_PTR) DIE(("SizeOfStackCommit exceeds the address space\n")); - ImageSectionObject->StackCommit = (ULONG_PTR)pioh64OptHeader->SizeOfStackCommit; + ImageSectionObject->ImageInformation.CommittedStackSize = (ULONG_PTR) pioh64OptHeader->SizeOfStackCommit; } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, Subsystem)) + { + ImageSectionObject->ImageInformation.SubSystemType = pioh64OptHeader->Subsystem; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, MinorSubsystemVersion) && + RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, MajorSubsystemVersion)) + { + ImageSectionObject->ImageInformation.SubSystemMinorVersion = pioh64OptHeader->MinorSubsystemVersion; + ImageSectionObject->ImageInformation.SubSystemMajorVersion = pioh64OptHeader->MajorSubsystemVersion; + } + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + ImageSectionObject->ImageInformation.TransferAddress = (PVOID) (ImageBase + + pioh64OptHeader->AddressOfEntryPoint); + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, SizeOfCode)) + ImageSectionObject->ImageInformation.ImageContainsCode = pioh64OptHeader->SizeOfCode != 0; + else + ImageSectionObject->ImageInformation.ImageContainsCode = TRUE; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, AddressOfEntryPoint)) + { + if (pioh64OptHeader->AddressOfEntryPoint == 0) + { + ImageSectionObject->ImageInformation.ImageContainsCode = FALSE; + } + } + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, LoaderFlags)) + ImageSectionObject->ImageInformation.LoaderFlags = pioh64OptHeader->LoaderFlags; + + if (RTL_CONTAINS_FIELD(pioh64OptHeader, cbOptHeaderSize, DllCharacteristics)) + ImageSectionObject->ImageInformation.DllCharacteristics = pioh64OptHeader->DllCharacteristics; break; } } /* [1], section 3.4.2 */ - if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) + if((ULONG_PTR)ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) - { - ImageSectionObject->Subsystem = piohOptHeader->Subsystem; - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MinorSubsystemVersion) && - RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, MajorSubsystemVersion)) - { - ImageSectionObject->MinorSubsystemVersion = piohOptHeader->MinorSubsystemVersion; - ImageSectionObject->MajorSubsystemVersion = piohOptHeader->MajorSubsystemVersion; - } - } - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) - { - ImageSectionObject->EntryPoint = ImageSectionObject->ImageBase + - piohOptHeader->AddressOfEntryPoint; - } - - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) - ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; - else - ImageSectionObject->Executable = TRUE; - - ImageSectionObject->ImageCharacteristics = pinhNtHeader->FileHeader.Characteristics; - ImageSectionObject->Machine = pinhNtHeader->FileHeader.Machine; + ImageSectionObject->ImageInformation.ImageCharacteristics = pinhNtHeader->FileHeader.Characteristics; + ImageSectionObject->ImageInformation.Machine = pinhNtHeader->FileHeader.Machine; + ImageSectionObject->ImageInformation.GpValue = 0; + ImageSectionObject->ImageInformation.ZeroBits = 0; + ImageSectionObject->BasedAddress = (PVOID)ImageBase; /* SECTION HEADERS */ nStatus = STATUS_INVALID_IMAGE_FORMAT; @@ -3597,18 +3651,18 @@ * Some defaults */ /* FIXME? are these values platform-dependent? */ - if(ImageSectionObject->StackReserve == 0) - ImageSectionObject->StackReserve = 0x40000; - - if(ImageSectionObject->StackCommit == 0) - ImageSectionObject->StackCommit = 0x1000; - - if(ImageSectionObject->ImageBase == 0) - { - if(ImageSectionObject->ImageCharacteristics & IMAGE_FILE_DLL) - ImageSectionObject->ImageBase = 0x10000000; + if (ImageSectionObject->ImageInformation.MaximumStackSize == 0) + ImageSectionObject->ImageInformation.MaximumStackSize = 0x40000; + + if(ImageSectionObject->ImageInformation.CommittedStackSize == 0) + ImageSectionObject->ImageInformation.CommittedStackSize = 0x1000; + + if(ImageSectionObject->BasedAddress == NULL) + { + if(ImageSectionObject->ImageInformation.ImageCharacteristics & IMAGE_FILE_DLL) + ImageSectionObject->BasedAddress = (PVOID)0x10000000; else - ImageSectionObject->ImageBase = 0x00400000; + ImageSectionObject->BasedAddress = (PVOID)0x00400000; } /* @@ -4237,21 +4291,12 @@ _SEH2_TRY { - memset(Sii, 0, sizeof(SECTION_IMAGE_INFORMATION)); if (Section->AllocationAttributes & SEC_IMAGE) { PMM_IMAGE_SECTION_OBJECT ImageSectionObject; ImageSectionObject = Section->ImageSection; - Sii->TransferAddress = (PVOID)ImageSectionObject->EntryPoint; - Sii->MaximumStackSize = ImageSectionObject->StackReserve; - Sii->CommittedStackSize = ImageSectionObject->StackCommit; - Sii->SubSystemType = ImageSectionObject->Subsystem; - Sii->SubSystemMinorVersion = ImageSectionObject->MinorSubsystemVersion; - Sii->SubSystemMajorVersion = ImageSectionObject->MajorSubsystemVersion; - Sii->ImageCharacteristics = ImageSectionObject->ImageCharacteristics; - Sii->Machine = ImageSectionObject->Machine; - Sii->ImageContainsCode = ImageSectionObject->Executable; + *Sii = ImageSectionObject->ImageInformation; } if (ResultLength != NULL) @@ -4386,11 +4431,10 @@ SectionSegments = ImageSectionObject->Segments; NrSegments = ImageSectionObject->NrSegments; - ImageBase = (ULONG_PTR)*BaseAddress; if (ImageBase == 0) { - ImageBase = ImageSectionObject->ImageBase; + ImageBase = (ULONG_PTR)ImageSectionObject->BasedAddress; } ImageSize = 0; @@ -4405,7 +4449,7 @@ } } - ImageSectionObject->ImageSize = (ULONG)ImageSize; + ImageSectionObject->ImageInformation.ImageFileSize = (ULONG)ImageSize; /* Check for an illegal base address */ if ((ImageBase + ImageSize) > (ULONG_PTR)MmHighestUserAddress) Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=59… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Wed Aug 28 21:09:16 2013 @@ -16,9 +16,6 @@ /* FIXME: From winbase.h... what to do? */ #define SEM_NOALIGNMENTFAULTEXCEPT 0x04 - -/* Include Information Class Tables */ -#include "internal/ps_i.h" /* Debugging Level */ ULONG PspTraceLevel = 0; @@ -108,7 +105,8 @@ _SEH2_END; } - if((ProcessInformationClass == ProcessCookie) && + if (((ProcessInformationClass == ProcessCookie) || + (ProcessInformationClass == ProcessImageInformation)) && (ProcessHandle != NtCurrentProcess())) { /* @@ -823,8 +821,30 @@ break; case ProcessImageInformation: - DPRINT1("Image Information Query Not implemented: %lx\n", ProcessInformationClass); - Status = STATUS_NOT_IMPLEMENTED; + + /* Set the length required and validate it */ + Length = sizeof(SECTION_IMAGE_INFORMATION); + if (ProcessInformationLength != Length) + { + /* Break out */ + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH to protect write */ + _SEH2_TRY + { + MmGetImageInformation((PSECTION_IMAGE_INFORMATION)ProcessInformation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Indicate success */ + Status = STATUS_SUCCESS; break; case ProcessDebugObjectHandle:

11 years, 2 months

[hbelusca] 59858: Just fix a typo.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 28 20:12:35 2013 New Revision: 59858 URL: http://svn.reactos.org/svn/reactos?rev=59858&view=rev Log: Just fix a typo. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Aug 28 20:12:35 2013 @@ -360,7 +360,7 @@ SIZE_T MmTotalCommitLimitMaximum; /* - * These value tune certain user parameters. They have default values set here, + * These values tune certain user parameters. They have default values set here, * as well as in the code, and can be overwritten by registry settings. */ SIZE_T MmHeapSegmentReserve = 1 * _1MB;

11 years, 2 months

[ion] 59857: [RTL]: Correctly read PEB or Kernel Variables for Heap Tuning. [NTOSKRNL]: MmCreatePeb should correctly fill out the Heap PEB parameters. [NTOSKRNL]: MmInitSystem and mminit.c should c...

by ion＠svn.reactos.org

Author: ion Date: Wed Aug 28 18:57:29 2013 New Revision: 59857 URL: http://svn.reactos.org/svn/reactos?rev=59857&view=rev Log: [RTL]: Correctly read PEB or Kernel Variables for Heap Tuning. [NTOSKRNL]: MmCreatePeb should correctly fill out the Heap PEB parameters. [NTOSKRNL]: MmInitSystem and mminit.c should correctly initialize and hold the Heap Tuning Parameters. [NTOSKRNL]: CmControlVector should read the registry Heap Tuning Parameters into the real Mm variables, instaed of "Dummy". This removes heap hacks and makes Windows NTDLL happy. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/rtlp.h trunk/reactos/ntoskrnl/config/cmdata.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -173,6 +173,22 @@ /* meaningless in user mode */ } #endif + +VOID +NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters) +{ + PPEB Peb; + + /* Get PEB */ + Peb = RtlGetCurrentPeb(); + + /* Apply defaults for non-set parameters */ + if (!Parameters->SegmentCommit) Parameters->SegmentCommit = Peb->HeapSegmentCommit; + if (!Parameters->SegmentReserve) Parameters->SegmentReserve = Peb->HeapSegmentReserve; + if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = Peb->HeapDeCommitFreeBlockThreshold; + if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = Peb->HeapDeCommitTotalFreeThreshold; +} BOOLEAN NTAPI Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=59857&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -1223,7 +1223,6 @@ PVOID CommittedAddress = NULL, UncommittedAddress = NULL; PHEAP Heap = NULL; RTL_HEAP_PARAMETERS SafeParams = {0}; - PPEB Peb; ULONG_PTR MaximumUserModeAddress; SYSTEM_BASIC_INFORMATION SystemInformation; MEMORY_BASIC_INFORMATION MemoryInfo; @@ -1276,32 +1275,10 @@ if (NtGlobalFlags & FLG_USER_STACK_TRACE_DB) Flags |= HEAP_CAPTURE_STACK_BACKTRACES; - - /* Get PEB */ - Peb = RtlGetCurrentPeb(); - - /* Apply defaults for non-set parameters */ - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = Peb->HeapSegmentCommit; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = Peb->HeapSegmentReserve; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = Peb->HeapDeCommitFreeBlockThreshold; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = Peb->HeapDeCommitTotalFreeThreshold; - } - else - { - /* Apply defaults for non-set parameters */ -#if 0 - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = MmHeapSegmentCommit; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = MmHeapSegmentReserve; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; -#endif - } - - // FIXME: Move to memory manager - if (!Parameters->SegmentCommit) Parameters->SegmentCommit = PAGE_SIZE * 2; - if (!Parameters->SegmentReserve) Parameters->SegmentReserve = 1048576; - if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = PAGE_SIZE; - if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = 65536; + } + + /* Set tunable parameters */ + RtlpSetHeapParameters(Parameters); /* Get the max um address */ Status = ZwQuerySystemInformation(SystemBasicInformation, Modified: trunk/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtlp.h?rev=59857&r… ============================================================================== --- trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtlp.h [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -52,6 +52,10 @@ VOID NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters); + +VOID +NTAPI RtlpSetExceptionList(PEXCEPTION_REGISTRATION_RECORD NewExceptionList); BOOLEAN Modified: trunk/reactos/ntoskrnl/config/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmdata.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmdata.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -523,6 +523,14 @@ }, { + L"Session Manager\\Memory Management", + L"MinimumStackCommitInBytes", + &MmMinimumStackCommitInBytes, + NULL, + NULL + }, + + { L"Session Manager\\Executive", L"AdditionalCriticalWorkerThreads", &DummyData, @@ -613,7 +621,7 @@ { L"Session Manager", L"CriticalSectionTimeout", - &DummyData, + &MmCritsectTimeoutSeconds, NULL, NULL }, @@ -621,15 +629,14 @@ { L"Session Manager", L"HeapSegmentReserve", - &DummyData, - NULL, - NULL - }, - + &MmHeapSegmentReserve, + NULL, + NULL + }, { L"Session Manager", L"HeapSegmentCommit", - &DummyData, + &MmHeapSegmentCommit, NULL, NULL }, @@ -637,7 +644,7 @@ { L"Session Manager", L"HeapDeCommitTotalFreeThreshold", - &DummyData, + &MmHeapDeCommitTotalFreeThreshold, NULL, NULL }, @@ -645,7 +652,7 @@ { L"Session Manager", L"HeapDeCommitFreeBlockThreshold", - &DummyData, + &MmHeapDeCommitFreeBlockThreshold, NULL, NULL }, Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -680,11 +680,13 @@ extern PFN_NUMBER MiHighNonPagedPoolThreshold; extern PFN_NUMBER MmMinimumFreePages; extern PFN_NUMBER MmPlentyFreePages; +extern SIZE_T MmMinimumStackCommitInBytes; extern PFN_COUNT MiExpansionPoolPagesInitialCharge; extern PFN_NUMBER MmResidentAvailablePages; extern PFN_NUMBER MmResidentAvailableAtInit; extern ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; extern PFN_NUMBER MmTotalSystemDriverPages; +extern ULONG MmCritsectTimeoutSeconds; extern PVOID MiSessionImageStart; extern PVOID MiSessionImageEnd; extern PMMPTE MiHighestUserPte; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -358,6 +358,16 @@ // FIXME: They should be moved elsewhere since it's not an "init" setting? SIZE_T MmTotalCommitLimit; SIZE_T MmTotalCommitLimitMaximum; + +/* + * These value tune certain user parameters. They have default values set here, + * as well as in the code, and can be overwritten by registry settings. + */ +SIZE_T MmHeapSegmentReserve = 1 * _1MB; +SIZE_T MmHeapSegmentCommit = 2 * PAGE_SIZE; +SIZE_T MmHeapDeCommitTotalFreeThreshold = 64 * _1KB; +SIZE_T MmHeapDeCommitFreeBlockThreshold = PAGE_SIZE; +SIZE_T MmMinimumStackCommitInBytes = 0; /* Internal setting used for debugging memory descriptors */ BOOLEAN MiDbgEnableMdDump = @@ -2176,6 +2186,27 @@ DPRINT("System PTE count has been tuned to %d (%d bytes)\n", MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + /* Check if no values are set for the heap limits */ + if (MmHeapSegmentReserve == 0) + { + MmHeapSegmentReserve = 2 * _1MB; + } + + if (MmHeapSegmentCommit == 0) + { + MmHeapSegmentCommit = 2 * PAGE_SIZE; + } + + if (MmHeapDeCommitTotalFreeThreshold == 0) + { + MmHeapDeCommitTotalFreeThreshold = 64 * _1KB; + } + + if (MmHeapDeCommitFreeBlockThreshold == 0) + { + MmHeapDeCommitFreeBlockThreshold = PAGE_SIZE; + } + /* Initialize the working set lock */ ExInitializePushLock(&MmSystemCacheWs.WorkingSetMutex); Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -687,13 +687,12 @@ Peb->NumberOfProcessors = KeNumberProcessors; Peb->BeingDebugged = (BOOLEAN)(Process->DebugPort != NULL); Peb->NtGlobalFlag = NtGlobalFlag; - /*Peb->HeapSegmentReserve = MmHeapSegmentReserve; - Peb->HeapSegmentCommit = MmHeapSegmentCommit; - Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; - Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ + Peb->HeapSegmentReserve = MmHeapSegmentReserve; + Peb->HeapSegmentCommit = MmHeapSegmentCommit; + Peb->HeapDeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; + Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; Peb->CriticalSectionTimeout = MmCriticalSectionTimeout; - /*Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; - */ + Peb->MinimumStackCommit = MmMinimumStackCommitInBytes; Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); Peb->ProcessHeaps = (PVOID*)(Peb + 1); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Wed Aug 28 18:57:29 2013 @@ -234,6 +234,17 @@ } } #endif + +VOID +NTAPI +RtlpSetHeapParameters(IN PRTL_HEAP_PARAMETERS Parameters) +{ + /* Apply defaults for non-set parameters */ + if (!Parameters->SegmentCommit) Parameters->SegmentCommit = MmHeapSegmentCommit; + if (!Parameters->SegmentReserve) Parameters->SegmentReserve = MmHeapSegmentReserve; + if (!Parameters->DeCommitFreeBlockThreshold) Parameters->DeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold; + if (!Parameters->DeCommitTotalFreeThreshold) Parameters->DeCommitTotalFreeThreshold = MmHeapDeCommitTotalFreeThreshold; +} VOID NTAPI

11 years, 2 months

[aandrejevic] 59856: [SOFT386] Implement short conditional jump opcodes.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 28 17:52:21 2013 New Revision: 59856 URL: http://svn.reactos.org/svn/reactos?rev=59856&view=rev Log: [SOFT386] Implement short conditional jump opcodes. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Wed Aug 28 17:52:21 2013 @@ -136,22 +136,22 @@ NULL, // TODO: OPCODE 0x6D NOT SUPPORTED NULL, // TODO: OPCODE 0x6E NOT SUPPORTED NULL, // TODO: OPCODE 0x6F NOT SUPPORTED - NULL, // TODO: OPCODE 0x70 NOT SUPPORTED - NULL, // TODO: OPCODE 0x71 NOT SUPPORTED - NULL, // TODO: OPCODE 0x72 NOT SUPPORTED - NULL, // TODO: OPCODE 0x73 NOT SUPPORTED - NULL, // TODO: OPCODE 0x74 NOT SUPPORTED - NULL, // TODO: OPCODE 0x75 NOT SUPPORTED - NULL, // TODO: OPCODE 0x76 NOT SUPPORTED - NULL, // TODO: OPCODE 0x77 NOT SUPPORTED - NULL, // TODO: OPCODE 0x78 NOT SUPPORTED - NULL, // TODO: OPCODE 0x79 NOT SUPPORTED - NULL, // TODO: OPCODE 0x7A NOT SUPPORTED - NULL, // TODO: OPCODE 0x7B NOT SUPPORTED - NULL, // TODO: OPCODE 0x7C NOT SUPPORTED - NULL, // TODO: OPCODE 0x7D NOT SUPPORTED - NULL, // TODO: OPCODE 0x7E NOT SUPPORTED - NULL, // TODO: OPCODE 0x7F NOT SUPPORTED + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, + Soft386OpcodeShortConditionalJmp, NULL, // TODO: OPCODE 0x80 NOT SUPPORTED NULL, // TODO: OPCODE 0x81 NOT SUPPORTED NULL, // TODO: OPCODE 0x82 NOT SUPPORTED @@ -648,3 +648,95 @@ return TRUE; } + +BOOLEAN +FASTCALL +Soft386OpcodeShortConditionalJmp(PSOFT386_STATE State, UCHAR Opcode) +{ + BOOLEAN Jump = FALSE; + CHAR Offset = 0; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xF0) == 0x70); + + /* Fetch the offset */ + if (!Soft386FetchByte(State, (PUCHAR)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + switch ((Opcode & 0x0F) >> 1) + { + /* JO / JNO */ + case 0: + { + Jump = State->Flags.Of; + break; + } + + /* JC / JNC */ + case 1: + { + Jump = State->Flags.Cf; + break; + } + + /* JZ / JNZ */ + case 2: + { + Jump = State->Flags.Zf; + break; + } + + /* JBE / JNBE */ + case 3: + { + Jump = State->Flags.Cf || State->Flags.Zf; + break; + } + + /* JS / JNS */ + case 4: + { + Jump = State->Flags.Sf; + break; + } + + /* JP / JNP */ + case 5: + { + Jump = State->Flags.Pf; + break; + } + + /* JL / JNL */ + case 6: + { + Jump = State->Flags.Sf != State->Flags.Of; + break; + } + + /* JLE / JNLE */ + case 7: + { + Jump = (State->Flags.Sf != State->Flags.Of) || State->Flags.Zf; + break; + } + } + + if ((Opcode & 0xF0) & 1) + { + /* Invert the result */ + Jump = !Jump; + } + + if (Jump) + { + /* Move the instruction pointer */ + State->InstPtr.Long += Offset; + } + + /* Return success */ + return TRUE; +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Wed Aug 28 17:52:21 2013 @@ -79,4 +79,12 @@ UCHAR Opcode ); +BOOLEAN +FASTCALL +Soft386OpcodeShortConditionalJmp +( + PSOFT386_STATE State, + UCHAR Opcode +); + #endif // _OPCODES_H_

11 years, 2 months

[hbelusca] 59855: [KERNEL32] - Add brackets around "case XXX:" so that I'm able to (un)fold regions of code when debugging and reading. - Temporarily skip AppCompat functionality added by Alex, in ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 28 13:23:09 2013 New Revision: 59855 URL: http://svn.reactos.org/svn/reactos?rev=59855&view=rev Log: [KERNEL32] - Add brackets around "case XXX:" so that I'm able to (un)fold regions of code when debugging and reading. - Temporarily skip AppCompat functionality added by Alex, in order to "fix" (read: hack-fix) launch of .bat/.cmd files. Indeed, when .bat/.cmd files get started with the CreateProcess function, a call to NtCreateSection fails with status STATUS_INVALID_IMAGE_NOT_MZ, as expected (line 2952). But the new AppCompat code (lines 3028 and 3031-3033 and following, and 3114), executed whenever the status code from NtCreateSection is STATUS_SUCCESS or STATUS_INVALID_IMAGE_NOT_MZ or something else, overwrites the status code by other values, so that, after we return to the main code path (lines 3174 and following), the status code isn't STATUS_INVALID_IMAGE_NOT_MZ anymore but STATUS_SUCCESS or whatever, and then, we fail to run the .bat/.cmd file (that should be done at lines 3314-3316 and following). To Alex_Ionescu: Have a look at this and fix it properly!! Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Wed Aug 28 13:23:09 2013 @@ -2382,7 +2382,7 @@ /* Zero out the initial core variables and handles */ QuerySection = FALSE; InJob = FALSE; - SkipSaferAndAppCompat = FALSE; + SkipSaferAndAppCompat = TRUE; // HACK for making .bat/.cmd launch working again. ParameterFlags = 0; Flags = 0; DebugHandle = NULL; @@ -3174,6 +3174,7 @@ switch (Status) { case STATUS_INVALID_IMAGE_WIN_16: + { /* 16-bit binary. Should we use WOW or does the caller force VDM? */ if (!(dwCreationFlags & CREATE_FORCEDOS)) { @@ -3308,9 +3309,12 @@ } // There is no break here on purpose, so FORCEDOS drops down! + } + case STATUS_INVALID_IMAGE_PROTECT: case STATUS_INVALID_IMAGE_NOT_MZ: case STATUS_INVALID_IMAGE_NE_FORMAT: + { /* We're launching an executable application */ BinarySubType = BINARY_TYPE_EXE; @@ -3493,21 +3497,27 @@ /* We've already done all these checks, don't do them again */ SkipSaferAndAppCompat = TRUE; goto AppNameRetry; + } case STATUS_INVALID_IMAGE_WIN_64: + { /* 64-bit binaries are not allowed to run on 32-bit ReactOS */ DPRINT1("64-bit binary, failing\n"); SetLastError(ERROR_EXE_MACHINE_TYPE_MISMATCH); Result = FALSE; goto Quickie; + } case STATUS_FILE_IS_OFFLINE: + { /* Set the correct last error for this */ DPRINT1("File is offline, failing\n"); SetLastError(ERROR_FILE_OFFLINE); break; + } default: + { /* Any other error, convert it to a generic Win32 error */ if (!NT_SUCCESS(Status)) { @@ -3520,6 +3530,7 @@ /* Otherwise, this must be success */ ASSERT(Status == STATUS_SUCCESS); break; + } } /* Is this not a WOW application, but a WOW32 VDM was requested for it? */

11 years, 2 months

[akhaldi] 59854: [CMAKE] * Add the proper subsystem version when using a recent MSVC toolchain.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 28 12:32:09 2013 New Revision: 59854 URL: http://svn.reactos.org/svn/reactos?rev=59854&view=rev Log: [CMAKE] * Add the proper subsystem version when using a recent MSVC toolchain. Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59854… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Aug 28 12:32:09 2013 @@ -100,7 +100,11 @@ endfunction() function(set_subsystem MODULE SUBSYSTEM) - add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") + if(NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 17) + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM},5.0") + else() + add_target_link_flags(${MODULE} "/SUBSYSTEM:${SUBSYSTEM}") + endif() endfunction() function(set_image_base MODULE IMAGE_BASE)

11 years, 2 months

[akhaldi] 59853: [CRT] * Annotate timeb_s.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 28 11:52:25 2013 New Revision: 59853 URL: http://svn.reactos.org/svn/reactos?rev=59853&view=rev Log: [CRT] * Annotate timeb_s.h. Modified: trunk/reactos/include/crt/sec_api/sys/timeb_s.h Modified: trunk/reactos/include/crt/sec_api/sys/timeb_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/sys/ti… ============================================================================== --- trunk/reactos/include/crt/sec_api/sys/timeb_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/sys/timeb_s.h [iso-8859-1] Wed Aug 28 11:52:25 2013 @@ -15,8 +15,8 @@ #if defined(MINGW_HAS_SECURE_API) - _CRTIMP errno_t __cdecl _ftime32_s(struct __timeb32 *_Time); - _CRTIMP errno_t __cdecl _ftime64_s(struct __timeb64 *_Time); + _CRTIMP errno_t __cdecl _ftime32_s(_Out_ struct __timeb32 *_Time); + _CRTIMP errno_t __cdecl _ftime64_s(_Out_ struct __timeb64 *_Time); #ifndef _USE_32BIT_TIME_T #define _ftime_s _ftime64_s

11 years, 2 months

← Newer
1
...
5
6
7
8
9
10
11
...
33
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 2013