Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 65839: [FONTVIEW][MPLAY32][MSPAINT][TASKMGR] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935
by akhaldi＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: akhaldi Date: Fri Dec 26 14:18:02 2014 New Revision: 65839 URL: http://svn.reactos.org/svn/reactos?rev=65839&view=rev Log: [FONTVIEW][MPLAY32][MSPAINT][TASKMGR] Chinese (zh-CN) translation update by Henry Tang Ih. CORE-8935 Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc trunk/reactos/base/applications/mplay32/lang/zh-CN.rc trunk/reactos/base/applications/mspaint/lang/zh-CN.rc trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -10,10 +10,10 @@ STRINGTABLE BEGIN - IDS_INSTALL "Install" + IDS_INSTALL "å®è£" IDS_PRINT "åå°" IDS_STRING "ReactOS ç»ææäººä¸ä¸ªèªç±çæä½ç³»ç»ï¼1234567890" - IDS_OPEN "Open Font..." + IDS_OPEN "æå¼åä½æ¡£æ¡..." IDS_ERROR "éè¯¯" IDS_ERROR_NOMEM "æ²¡æè¶³å¤çååæ¥å®ææä½ã" IDS_ERROR_NOFONT "ï¼1ä¸æ¯ä¸ä¸ªææçåä½æ¡£æ¡ã" Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -24,7 +24,7 @@ END POPUP "è®¾å¤(&D)" BEGIN - MENUITEM "å±æ§(%P)", IDM_DEVPROPS + MENUITEM "å±æ§(&P)", IDM_DEVPROPS MENUITEM SEPARATOR MENUITEM "é³éæ§å¶(&V)", IDM_VOLUMECTL END Modified: trunk/reactos/base/applications/mspaint/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -25,29 +25,29 @@ END POPUP "ç¼è¾(&E)" BEGIN - MENUITEM "æ¤é\tCtrl+Z", IDM_EDITUNDO - MENUITEM "éå\tCtrl+Y", IDM_EDITREDO - MENUITEM SEPARATOR - MENUITEM "åªå\tCtrl+X", IDM_EDITCUT - MENUITEM "å¤å¶\tCtrl+C", IDM_EDITCOPY - MENUITEM "ç²è´´\tCtrl+V", IDM_EDITPASTE - MENUITEM "å é¤éä¸åºå\tDel", IDM_EDITDELETESELECTION - MENUITEM "åè½¬éæ©", IDM_EDITINVERTSELECTION - MENUITEM "å¨é¨éæ©\tCtrl+A", IDM_EDITSELECTALL - MENUITEM SEPARATOR - MENUITEM "å¤å¶å°...", IDM_EDITCOPYTO - MENUITEM "ä»...ç²è´´", IDM_EDITPASTEFROM + MENUITEM "æ¤é(&U)\tCtrl+Z", IDM_EDITUNDO + MENUITEM "éå(&R)\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "åªå(&T)\tCtrl+X", IDM_EDITCUT + MENUITEM "å¤å¶(&C)\tCtrl+C", IDM_EDITCOPY + MENUITEM "ç²è´´(&P)\tCtrl+V", IDM_EDITPASTE + MENUITEM "å é¤éä¸åºå(&L)\tDel", IDM_EDITDELETESELECTION + MENUITEM "åè½¬éæ©(&I)", IDM_EDITINVERTSELECTION + MENUITEM "å¨é¨éæ©(&A)\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "å¤å¶å°...(&O)", IDM_EDITCOPYTO + MENUITEM "ä»...ç²è´´(&F)", IDM_EDITPASTEFROM END POPUP "æ¥ç(&V)" BEGIN - MENUITEM "å·¥å·ç®±\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED - MENUITEM "è°è²æ¿\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED - MENUITEM "ç¶ææ ", IDM_VIEWSTATUSBAR, CHECKED - MENUITEM "æåå·¥å·æ ", IDM_FORMATICONBAR, CHECKED, GRAYED - MENUITEM SEPARATOR - POPUP "ç¼©æ¾" + MENUITEM "å·¥å·ç®±(&T)\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "è°è²æ¿(&C)\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "ç¶ææ (&S)", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "æåå·¥å·æ (&E)", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "ç¼©æ¾(&Z)" BEGIN - POPUP "ç¨æ·å®ä¹" + POPUP "ç¨æ·å®ä¹(&U)" BEGIN MENUITEM "12.5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -58,33 +58,33 @@ MENUITEM "800%", IDM_VIEWZOOM800 END MENUITEM SEPARATOR - MENUITEM "æ¾ç¤ºç½æ ¼\tCtrl+G", IDM_VIEWSHOWGRID - MENUITEM "æ¾ç¤ºç¼©ç¥å¾", IDM_VIEWSHOWMINIATURE + MENUITEM "æ¾ç¤ºç½æ ¼(&G)\tCtrl+G", IDM_VIEWSHOWGRID + MENUITEM "æ¾ç¤ºç¼©ç¥å¾(&H)", IDM_VIEWSHOWMINIATURE END - MENUITEM "å¨å±æ¾ç¤º\tCtrl+F", IDM_VIEWFULLSCREEN + MENUITEM "å¨å±æ¾ç¤º(&F)\tCtrl+F", IDM_VIEWFULLSCREEN END POPUP "å¾å(&I)" BEGIN - MENUITEM "æè½¬/éå...\tCtrl+R", IDM_IMAGEROTATEMIRROR - MENUITEM "Stretch/Skew...\tCtrl+W", IDM_IMAGESTRETCHSKEW - MENUITEM "åªè£", IDM_IMAGECROP - MENUITEM "é¢è²åè½¬\tCtrl+I", IDM_IMAGEINVERTCOLORS - MENUITEM "å±æ§...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "æè½¬/éå...(&M)\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "æä¼¸/å¾æ...(&S)\tCtrl+W", IDM_IMAGESTRETCHSKEW + MENUITEM "åªè£(&C)", IDM_IMAGECROP + MENUITEM "é¢è²åè½¬(&I)\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "å±æ§...(&A)\tCtrl+E", IDM_IMAGEATTRIBUTES MENUITEM "å é¤å¾å\tCtrl+Shft+N", IDM_IMAGEDELETEIMAGE - MENUITEM "ä¸éæå¤ç", IDM_IMAGEDRAWOPAQUE + MENUITEM "ä¸éæå¤ç(&D)", IDM_IMAGEDRAWOPAQUE END POPUP "é¢è²(&C)" BEGIN - MENUITEM "ç¼è¾è°è²æ¿...", IDM_COLORSEDITPALETTE - MENUITEM SEPARATOR - MENUITEM "Modern palette", IDM_COLORSMODERNPALETTE - MENUITEM "Old palette", IDM_COLORSOLDPALETTE + MENUITEM "ç¼è¾è°è²æ¿...(&E)", IDM_COLORSEDITPALETTE + MENUITEM SEPARATOR + MENUITEM "æ°è°è²æ¿", IDM_COLORSMODERNPALETTE + MENUITEM "æ§è°è²æ¿", IDM_COLORSOLDPALETTE END POPUP "å¸®å©(&?)" BEGIN - MENUITEM "å¸®å©ä¸»é¢", IDM_HELPHELPTOPICS - MENUITEM SEPARATOR - MENUITEM "ä¿¡æ¯", IDM_HELPINFO + MENUITEM "å¸®å©ä¸»é¢(&H)", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "ä¿¡æ¯(&I)", IDM_HELPINFO END END @@ -117,9 +117,9 @@ CAPTION "æè½¬åéåå¾å" BEGIN GROUPBOX "æè½¬æéå", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 - AUTORADIOBUTTON "æ°´å¹³éå", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP - AUTORADIOBUTTON "åç´éå", IDD_MIRRORROTATERB2, 12, 30, 100, 10 - AUTORADIOBUTTON "æè½¬è§åº¦", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "æ°´å¹³éå(&H)", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "åç´éå(&V)", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "æè½¬è§åº¦(&R)", IDD_MIRRORROTATERB3, 12, 42, 100, 10 AUTORADIOBUTTON "&90Â°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED AUTORADIOBUTTON "&180Â°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED AUTORADIOBUTTON "&270Â°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED @@ -134,21 +134,21 @@ BEGIN EDITTEXT IDD_ATTRIBUTESEDIT1, 48, 40, 35, 12 EDITTEXT IDD_ATTRIBUTESEDIT2, 128, 40, 35, 12 - LTEXT "å®½åº¦ï¼", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 - LTEXT "é«åº¦ï¼", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 + LTEXT "å®½åº¦(&W)ï¼", IDD_ATTRIBUTESTEXT1, 10, 40, 35, 10 + LTEXT "é«åº¦ï¼(&H)", IDD_ATTRIBUTESTEXT2, 90, 40, 35, 10 LTEXT "æä»¶æ¥æï¼", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "æä»¶å¤§å°ï¼", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "åè¾¨çï¼", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "åè¾¨ç(&R)ï¼", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 LTEXT "ä¸å¯ç¨", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 GROUPBOX "åä½", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 - AUTORADIOBUTTON "è±å¯¸", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP - AUTORADIOBUTTON "åç±³", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 - AUTORADIOBUTTON "åç´ ", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 + AUTORADIOBUTTON "è±å¯¸(&I)", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP + AUTORADIOBUTTON "åç±³(&M)", IDD_ATTRIBUTESRB2, 62, 69, 45, 10 + AUTORADIOBUTTON "åç´ (&P)", IDD_ATTRIBUTESRB3, 112, 69, 45, 10 GROUPBOX "é¢è²", IDD_ATTRIBUTESGROUP2, 6, 88, 158, 27 - AUTORADIOBUTTON "é»ç½", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "å½©è²", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "é»ç½(&B)", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "å½©è²(&L)", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 170, 8, 48, 14 PUSHBUTTON "åæ¶", IDCANCEL, 170, 24, 48, 14 PUSHBUTTON "ç¼ºç", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14 @@ -157,9 +157,9 @@ IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 80 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Stretch and skew image" -BEGIN - GROUPBOX "Stretch", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 +CAPTION "æä¼¸åå¾æå¾ç" +BEGIN + GROUPBOX "æä¼¸", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66 ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12 @@ -168,15 +168,15 @@ LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12 LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10 - GROUPBOX "Skew", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 + GROUPBOX "å¾æ", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66 ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32 LTEXT "æ°´å¹³ï¼", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10 ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32 LTEXT "åç´ï¼", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10 EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12 - LTEXT "degrees", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 + LTEXT "åº¦", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10 DEFPUSHBUTTON "ç¡®å®", IDOK, 170, 8, 48, 14 PUSHBUTTON "åæ¶", IDCANCEL, 170, 24, 48, 14 END @@ -210,8 +210,8 @@ IDS_SAVEFILTER "24 ä½ä½å¾æä»¶ (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE "%d åè" IDS_PRINTRES "%d x %d åç´ æ¯ç±³" - IDS_INTNUMBERS "Please enter integral numbers only!" - IDS_PERCENTAGE "The percentage must be between 1 and 500." - IDS_ANGLE "The angle must be between -89 and 89." - IDS_LOADERRORTEXT "The file %s could not be loaded." -END + IDS_INTNUMBERS "åªè¾å¥æ°åç§¯åï¼" + IDS_PERCENTAGE "ç¾åæ¯å¿é¡»å¨1è³500ä¹é´ã" + IDS_ANGLE "è¯¥è§åº¦å¿é¡»å¨-89ä¸89ä¹é´ã" + IDS_LOADERRORTEXT "è¯¥æä»¶ %s æ æ³å è½½ã" +END Modified: trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/zh-CN.rc [iso-8859-1] Fri Dec 26 14:18:02 2014 @@ -52,17 +52,17 @@ MENUITEM "å±å (&C)", ID_WINDOWS_CASCADE MENUITEM "åç½®(&B)", ID_WINDOWS_BRINGTOFRONT END - POPUP "Sh&ut Down" - BEGIN - MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY - MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE - MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF - MENUITEM "&Restart", ID_SHUTDOWN_REBOOT - MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF - MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED - MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER - MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED - MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED + POPUP "å³æº(%U)" + BEGIN + MENUITEM "å¾æº(&B)", ID_SHUTDOWN_STANDBY + MENUITEM "ä¼ç (&H)", ID_SHUTDOWN_HIBERNATE + MENUITEM "å³éçµæº(&U)", ID_SHUTDOWN_POWEROFF + MENUITEM "éæ°å¯å¨(&R)", ID_SHUTDOWN_REBOOT + MENUITEM "éåºç¨æ·(&L) %s", ID_SHUTDOWN_LOGOFF + MENUITEM "åæ¢ç¨æ·(&S)\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED + MENUITEM "éå®è®¡ç®æº(&K)\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER + MENUITEM "æå¼è¿æ¥(&D)", ID_SHUTDOWN_DISCONNECT, GRAYED + MENUITEM "å¼¹åºè®¡ç®æº(&E)", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED END POPUP "å¸®å©(&H)" BEGIN

1 0

[akhaldi] 65838: [WINLOGON][USER32] SetLogonNotifyWindow has only one parameter. Spotted by Giannis Adamopoulos. CORE-8174
by akhaldi＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: akhaldi Date: Fri Dec 26 14:06:23 2014 New Revision: 65838 URL: http://svn.reactos.org/svn/reactos?rev=65838&view=rev Log: [WINLOGON][USER32] SetLogonNotifyWindow has only one parameter. Spotted by Giannis Adamopoulos. CORE-8174 Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/include/reactos/undocuser.h trunk/reactos/win32ss/user/user32/misc/logon.c trunk/reactos/win32ss/user/user32/user32.spec Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -1348,7 +1348,7 @@ } /* Register SAS window to receive SAS notifications */ - if (!SetLogonNotifyWindow(Session->SASWindow, Session->InteractiveWindowStation)) + if (!SetLogonNotifyWindow(Session->SASWindow)) { ERR("WL: Failed to register SAS window\n"); goto cleanup; Modified: trunk/reactos/include/reactos/undocuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/undocuser.… ============================================================================== --- trunk/reactos/include/reactos/undocuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/undocuser.h [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -124,7 +124,7 @@ #define SBRG_BOTTOMLEFTBTN 5 /* the bottom or left button */ BOOL WINAPI UpdatePerUserSystemParameters(DWORD dwReserved, BOOL bEnable); -BOOL WINAPI SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta); +BOOL WINAPI SetLogonNotifyWindow(HWND Wnd); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD_PTR); Modified: trunk/reactos/win32ss/user/user32/misc/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/l… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/logon.c [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -78,7 +78,7 @@ */ BOOL WINAPI -SetLogonNotifyWindow(HWND Wnd, HWINSTA WinSta) +SetLogonNotifyWindow(HWND Wnd) { return NtUserSetLogonNotifyWindow(Wnd); } Modified: trunk/reactos/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/user32… ============================================================================== --- trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/user32.spec [iso-8859-1] Fri Dec 26 14:06:23 2014 @@ -609,7 +609,7 @@ @ stdcall SetKeyboardState(ptr) NtUserSetKeyboardState @ stdcall SetLastErrorEx(long long) @ stdcall SetLayeredWindowAttributes(ptr long long long) NtUserSetLayeredWindowAttributes -@ stdcall SetLogonNotifyWindow(long long) ; Direct call NtUserSetLogonNotifyWindow +@ stdcall SetLogonNotifyWindow(long) ; Direct call NtUserSetLogonNotifyWindow @ stdcall SetMenu(long long) @ stdcall SetMenuContextHelpId(long long) NtUserSetMenuContextHelpId @ stdcall SetMenuDefaultItem(long long long) NtUserSetMenuDefaultItem

1 0

[ekohl] 65837: [NOTEPAD] Fix check mark of the status bar menu item. Fix is based on mudheads patch. CORE-8297 #resolve
by ekohl＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: ekohl Date: Fri Dec 26 14:06:19 2014 New Revision: 65837 URL: http://svn.reactos.org/svn/reactos?rev=65837&view=rev Log: [NOTEPAD] Fix check mark of the status bar menu item. Fix is based on mudheads patch. CORE-8297 #resolve Modified: trunk/reactos/base/applications/notepad/dialog.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/dialog.c [iso-8859-1] Fri Dec 26 14:06:19 2014 @@ -557,7 +557,11 @@ /* Let commdlg manage copy settings */ printer.nCopies = (WORD)PD_USEDEVMODECOPIES; - if (!PrintDlg(&printer)) return; + if (!PrintDlg(&printer)) + { + DeleteObject(font); + return; + } assert(printer.hDC != 0); @@ -568,7 +572,11 @@ di.lpszDatatype = NULL; di.fwType = 0; - if (StartDoc(printer.hDC, &di) <= 0) return; + if (StartDoc(printer.hDC, &di) <= 0) + { + DeleteObject(font); + return; + } /* Get the page dimensions in pixels. */ cWidthPels = GetDeviceCaps(printer.hDC, HORZRES); @@ -579,6 +587,8 @@ pTemp = HeapAlloc(GetProcessHeap(), 0, size * sizeof(TCHAR)); if (!pTemp) { + EndDoc(printer.hDC); + DeleteObject(font); ShowLastError(); return; } @@ -605,6 +615,11 @@ if (StartPage(printer.hDC) <= 0) { static const TCHAR failed[] = _T("StartPage failed"); static const TCHAR error[] = _T("Print Error"); + SelectObject(printer.hDC, old_font); + EndDoc(printer.hDC); + DeleteDC(printer.hDC); + HeapFree(GetProcessHeap(), 0, pTemp); + DeleteObject(font); MessageBox(Globals.hMainWnd, failed, error, MB_ICONEXCLAMATION); return; } @@ -644,9 +659,12 @@ } while (i<size); } + if (old_font != 0) + SelectObject(printer.hDC, old_font); EndDoc(printer.hDC); DeleteDC(printer.hDC); HeapFree(GetProcessHeap(), 0, pTemp); + DeleteObject(font); } VOID DIALOG_FilePrinterSetup(VOID) @@ -743,7 +761,7 @@ SendMessage(Globals.hStatusBar, SB_SIMPLE, (WPARAM)TRUE, (LPARAM)0); } - // Set status bar visible or not accordind the the settings. + // Set status bar visiblity according to the settings. if (Globals.bWrapLongLines == TRUE || Globals.bShowStatusBar == FALSE) { @@ -758,7 +776,7 @@ } // Set check state in show status bar item. - if (Globals.bShowStatusBar == TRUE) + if (bStatusBarVisible) { CheckMenuItem(Globals.hMenu, CMD_STATUSBAR, MF_BYCOMMAND | MF_CHECKED); }

1 0

[ekohl] 65836: [SYSDM] Fix startup and recovery option dialog issues. Patch by Ricardo Hanke. Thanks a lot! CORE-8952 #resolve
by ekohl＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: ekohl Date: Fri Dec 26 13:11:57 2014 New Revision: 65836 URL: http://svn.reactos.org/svn/reactos?rev=65836&view=rev Log: [SYSDM] Fix startup and recovery option dialog issues. Patch by Ricardo Hanke. Thanks a lot! CORE-8952 #resolve Modified: trunk/reactos/dll/cpl/sysdm/startrec.c Modified: trunk/reactos/dll/cpl/sysdm/startrec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/startrec.c?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/startrec.c [iso-8859-1] Fri Dec 26 13:11:57 2014 @@ -22,6 +22,7 @@ INT iFreeLdrIni; } STARTINFO, *PSTARTINFO; +BOOL SaveRecoveryOptions; static VOID SetTimeout(HWND hwndDlg, INT Timeout) @@ -544,13 +545,21 @@ HKEY hKey; DWORD lResult; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\CrashControl", - 0, - KEY_WRITE, - &hKey) != ERROR_SUCCESS) - { - /* Failed to open key */ + lResult = (DWORD)RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + NULL); + if (lResult != ERROR_SUCCESS) + { + /* Failed to open key */ + SetLastError(lResult); + ShowLastWin32Error(hwndDlg); + return; } @@ -587,15 +596,31 @@ { HKEY hKey; WCHAR szName[MAX_PATH]; - DWORD dwValue, dwValueLength, dwType; - - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - L"System\\CurrentControlSet\\Control\\CrashControl", - 0, - KEY_READ, - &hKey) != ERROR_SUCCESS) + DWORD dwValue, dwValueLength, dwType, dwResult; + + dwResult = (DWORD)RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Control\\CrashControl", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_READ, + NULL, + &hKey, + NULL); + if (dwResult != ERROR_SUCCESS) { /* Failed to open key */ + SetLastError(dwResult); + ShowLastWin32Error(hwndDlg); + + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECWRITEEVENT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECSENDALERT), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECRESTART), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECDEBUGCOMBO), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECDUMPFILE), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_STRRECOVERWRITE), FALSE); + + SaveRecoveryOptions = FALSE; return; } @@ -633,7 +658,7 @@ SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); } - if (LoadString(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) + if (LoadStringW(hApplet, IDS_FULL_DUMP, szName, sizeof(szName) / sizeof(WCHAR))) { szName[(sizeof(szName)/sizeof(WCHAR))-1] = L'\0'; SendDlgItemMessageW(hwndDlg, IDC_STRRECDEBUGCOMBO, CB_ADDSTRING, (WPARAM)0, (LPARAM) szName); @@ -653,6 +678,8 @@ SetCrashDlgItems(hwndDlg, pStartInfo); RegCloseKey(hKey); + + SaveRecoveryOptions = TRUE; } @@ -748,7 +775,11 @@ } } - WriteStartupRecoveryOptions(hwndDlg, pStartInfo); + if (SaveRecoveryOptions) + { + WriteStartupRecoveryOptions(hwndDlg, pStartInfo); + } + EndDialog(hwndDlg, LOWORD(wParam)); return TRUE;

1 0

[hbelusca] 65835: [WIN32K]: Anecdotal formatting/renaming changes before reusing this code in other parts of wijn32k.
by hbelusca＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hbelusca Date: Fri Dec 26 12:06:43 2014 New Revision: 65835 URL: http://svn.reactos.org/svn/reactos?rev=65835&view=rev Log: [WIN32K]: Anecdotal formatting/renaming changes before reusing this code in other parts of wijn32k. Modified: trunk/reactos/win32ss/user/ntuser/desktop.c trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -726,7 +726,7 @@ classes will be allocated from the shared heap */ UserRegisterSystemClasses(); - while(TRUE) + while (TRUE) { Ret = co_IntGetPeekMessage(&Msg, 0, 0, 0, PM_REMOVE, TRUE); if (Ret) @@ -1892,9 +1892,9 @@ TRACE("IntMapDesktopView called for desktop object 0x%p\n", pdesk); ppi = PsGetCurrentProcessWin32Process(); - PrevLink = &ppi->HeapMappings.Next; /* Find out if another thread already mapped the desktop heap */ + PrevLink = &ppi->HeapMappings.Next; HeapMapping = *PrevLink; while (HeapMapping != NULL) { @@ -1904,7 +1904,7 @@ return STATUS_SUCCESS; } - PrevLink = &HeapMapping->Next; + PrevLink = &HeapMapping->Next; HeapMapping = HeapMapping->Next; } Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -153,7 +153,7 @@ StartTheTimers(); UserLeave(); - for(;;) + for (;;) { if (!ghMouseDevice) { @@ -300,7 +300,7 @@ * CreateSystemThreads * * Called form dedicated thread in CSRSS. RIT is started in context of this - * thread because it needs valid Win32 process with TEB initialized + * thread because it needs valid Win32 process with TEB initialized. */ DWORD NTAPI CreateSystemThreads(UINT Type) Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Fri Dec 26 12:06:43 2014 @@ -53,7 +53,7 @@ static NTSTATUS -CreateProcessInfo(PEPROCESS Process) +UserCreateProcessInfo(PEPROCESS Process) { PPROCESSINFO ppiCurrent; NTSTATUS Status; @@ -94,7 +94,7 @@ TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); - /* map the global heap into the process */ + /* Map the global heap into the process */ Offset.QuadPart = 0; Status = MmMapViewOfSection(GlobalUserHeapSection, PsGetCurrentProcess(), @@ -133,14 +133,13 @@ KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); - - /* map the gdi handle table to user land */ + /* Map the gdi handle table to user land */ Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; pParams = Process->Peb->ProcessParameters; ppiCurrent->peProcess = Process; - /* setup process flags */ + /* Setup process flags */ ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED; if ( pParams && @@ -150,7 +149,7 @@ ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; } - // Fixme check if this process is allowed. + // FIXME: check if this process is allowed. ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. /* Create pools for GDI object attributes */ @@ -171,7 +170,7 @@ static NTSTATUS -DestroyProcessInfo(PEPROCESS Process) +UserDestroyProcessInfo(PEPROCESS Process) { PPROCESSINFO ppiCurrent, *pppi; @@ -288,11 +287,11 @@ if (Create) { - Status = CreateProcessInfo(Process); + Status = UserCreateProcessInfo(Process); } else { - Status = DestroyProcessInfo(Process); + Status = UserDestroyProcessInfo(Process); } UserLeave();

1 0

[pschweitzer] 65834: [DXDIAG] Update French translation
by pschweitzer＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: pschweitzer Date: Fri Dec 26 11:40:17 2014 New Revision: 65834 URL: http://svn.reactos.org/svn/reactos?rev=65834&view=rev Log: [DXDIAG] Update French translation Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc Modified: trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… ============================================================================== --- trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/dxdiag/lang/fr-FR.rc [iso-8859-1] Fri Dec 26 11:40:17 2014 @@ -216,6 +216,6 @@ IDS_FORMAT_ADAPTER_MEM "%u Mo" IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)" IDS_OPTION_NO "Non" - IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?" - IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface." -END + IDS_D3DTEST_DESCRIPTION "Ceci va dÃ©marrer le test de l'interface Direct3D. Continuer ?" + IDS_D3DTEST_D3Dx "Ce test va utiliser l'interface Direct3D %u accÃ©lÃ©rÃ©e matÃ©riellement." +END

1 0

[hpoussin] 65833: [FREELDR] Support custom SystemPath and ramdisk in setup phase We can now start ReactOS installation via PXE boot.
by hpoussin＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hpoussin Date: Fri Dec 26 11:38:43 2014 New Revision: 65833 URL: http://svn.reactos.org/svn/reactos?rev=65833&view=rev Log: [FREELDR] Support custom SystemPath and ramdisk in setup phase We can now start ReactOS installation via PXE boot. Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] Fri Dec 26 11:38:43 2014 @@ -952,8 +952,8 @@ // // Open the .inf file // - FileId = FsOpenFile(FileName); - if (!FileId) + ret = ArcOpen((PCHAR)FileName, OpenReadOnly, &FileId); + if (ret != ESUCCESS) { return FALSE; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Fri Dec 26 11:38:43 2014 @@ -138,6 +138,12 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem, IN USHORT OperatingSystemVersion) { + ULONG_PTR SectionId; + PCSTR SectionName = OperatingSystem->SystemPartition; + CHAR SettingsValue[80]; + BOOLEAN HasSection; + CHAR BootOptions2[256]; + PCHAR File; CHAR FileName[512]; CHAR BootPath[512]; LPCSTR LoadOptions; @@ -151,25 +157,74 @@ LPCSTR SystemPath; LPCSTR SourcePaths[] = { - "\\", /* Only for floppy boot */ + "", /* Only for floppy boot */ #if defined(_M_IX86) - "\\I386\\", + "I386\\", #elif defined(_M_MPPC) - "\\PPC\\", + "PPC\\", #elif defined(_M_MRX000) - "\\MIPS\\", + "MIPS\\", #endif - "\\reactos\\", + "reactos\\", NULL }; - /* Get boot path */ - MachDiskGetBootPath(BootPath, sizeof(BootPath)); + /* Get OS setting value */ + SettingsValue[0] = ANSI_NULL; + IniOpenSection("Operating Systems", &SectionId); + IniReadSettingByName(SectionId, SectionName, SettingsValue, sizeof(SettingsValue)); + + /* Open the operating system section specified in the .ini file */ + HasSection = IniOpenSection(SectionName, &SectionId); + + UiDrawBackdrop(); + UiDrawProgressBarCenter(1, 100, "Loading NT..."); + + /* Read the system path is set in the .ini file */ + if (!HasSection || + !IniReadSettingByName(SectionId, "SystemPath", BootPath, sizeof(BootPath))) + { + MachDiskGetBootPath(BootPath, sizeof(BootPath)); + } + + /* Append a backslash */ + if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') + strcat(BootPath, "\\"); + + /* Read booting options */ + if (!HasSection || !IniReadSettingByName(SectionId, "Options", BootOptions2, sizeof(BootOptions2))) + { + /* Get options after the title */ + PCSTR p = SettingsValue; + while (*p == ' ' || *p == '"') + p++; + while (*p != '\0' && *p != '"') + p++; + strcpy(BootOptions2, p); + TRACE("BootOptions: '%s'\n", BootOptions2); + } + + /* Check if a ramdisk file was given */ + File = strstr(BootOptions2, "/RDPATH="); + if (File) + { + /* Copy the file name and everything else after it */ + strcpy(FileName, File + 8); + + /* Null-terminate */ + *strstr(FileName, " ") = ANSI_NULL; + + /* Load the ramdisk */ + RamDiskLoadVirtualFile(FileName); + } + + TRACE("BootPath: '%s'\n", BootPath); /* And check if we booted from floppy */ BootFromFloppy = strstr(BootPath, "fdisk") != NULL; /* Open 'txtsetup.sif' from any of source paths */ + File = BootPath + strlen(BootPath); for (i = BootFromFloppy ? 0 : 1; ; i++) { SystemPath = SourcePaths[i]; @@ -178,10 +233,10 @@ ERR("Failed to open txtsetup.sif\n"); return; } - sprintf(FileName, "%stxtsetup.sif", SystemPath); - if (InfOpenFile (&InfHandle, FileName, &ErrorLine)) + sprintf(File, "%stxtsetup.sif", SystemPath); + if (InfOpenFile (&InfHandle, BootPath, &ErrorLine)) { - strcat(BootPath, SystemPath); + sprintf(File, "%s", SystemPath); break; } }

1 0

[hpoussin] 65832: [FREELDR] Merge setupldr_pe and freeldr_pe
by hpoussin＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hpoussin Date: Fri Dec 26 11:38:39 2014 New Revision: 65832 URL: http://svn.reactos.org/svn/reactos?rev=65832&view=rev Log: [FREELDR] Merge setupldr_pe and freeldr_pe Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/bootmgr.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Dec 26 11:38:39 2014 @@ -169,9 +169,14 @@ list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S) endif() +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") + list(APPEND FREELDR_BASE_SOURCE windows/setupldr.c) +endif() + list(APPEND FREELDR_BASE_SOURCE bootmgr.c # This file is compiled with custom definitions freeldr.c + inffile/inffile.c rtl/libsupp.c) if(NOT MSVC) @@ -233,62 +238,9 @@ add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys) -list(APPEND SETUPLDR_SOURCE inffile/inffile.c) - -if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") - list(APPEND SETUPLDR_SOURCE windows/setupldr.c) -endif() - -add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) -add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE}) - -if(NOT MSVC AND SEPARATE_DBG) - set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) - set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER) -endif() - -if(MSVC) - add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") - add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text") -else() - add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") - add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds") -endif() - -add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP) -add_target_compile_definitions(setupldr_pe_dbg FREELDR_REACTOS_SETUP) - -set_image_base(setupldr_pe 0x10000) -set_subsystem(setupldr_pe native) -set_entrypoint(setupldr_pe RealEntryPoint) - -set_image_base(setupldr_pe_dbg 0x10000) -set_subsystem(setupldr_pe_dbg native) -set_entrypoint(setupldr_pe_dbg RealEntryPoint) - -if(ARCH STREQUAL "i386") - target_link_libraries(setupldr_pe mini_hal) - target_link_libraries(setupldr_pe_dbg mini_hal) -endif() - -target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr) -target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr) - -if(STACK_PROTECTOR) - target_link_libraries(setupldr_pe gcc_ssp) - target_link_libraries(setupldr_pe_dbg gcc_ssp) -elseif(RUNTIME_CHECKS) - target_link_libraries(setupldr_pe runtmchk) - target_link_libraries(setupldr_pe_dbg runtmchk) - add_target_link_flags(setupldr_pe "/MERGE:.rtc=.text") -endif() - -add_dependencies(setupldr_pe asm) -add_dependencies(setupldr_pe_dbg asm) - concatenate_files( ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin - setupldr_pe + freeldr_pe ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Fri Dec 26 11:38:39 2014 @@ -35,9 +35,7 @@ OS_LOADING_METHOD Load; } OSLoadingMethods[] = { -#ifdef FREELDR_REACTOS_SETUP {"ReactOSSetup", 0 , LoadReactOSSetup }, -#endif #ifdef _M_IX86 {"BootSector" , 0 , LoadAndBootBootSector},

1 0

[hpoussin] 65831: [NTFS] Be verbose only on unimplemented FSCTL requests we're supposed to handle
by hpoussin＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hpoussin Date: Fri Dec 26 11:38:35 2014 New Revision: 65831 URL: http://svn.reactos.org/svn/reactos?rev=65831&view=rev Log: [NTFS] Be verbose only on unimplemented FSCTL requests we're supposed to handle Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Fri Dec 26 11:38:35 2014 @@ -798,6 +798,27 @@ DeviceExt = DeviceObject->DeviceExtension; switch (Stack->Parameters.FileSystemControl.FsControlCode) { + case FSCTL_CREATE_USN_JOURNAL: + case FSCTL_DELETE_USN_JOURNAL: + case FSCTL_ENUM_USN_DATA: + case FSCTL_EXTEND_VOLUME: + //case FSCTL_GET_RETRIEVAL_POINTER_BASE: + case FSCTL_GET_RETRIEVAL_POINTERS: + case FSCTL_LOCK_VOLUME: + //case FSCTL_LOOKUP_STREAM_FROM_CLUSTER: + case FSCTL_MARK_HANDLE: + case FSCTL_MOVE_FILE: + case FSCTL_QUERY_USN_JOURNAL: + case FSCTL_READ_FILE_USN_DATA: + case FSCTL_READ_USN_JOURNAL: + //case FSCTL_SHRINK_VOLUME: + case FSCTL_UNLOCK_VOLUME: + case FSCTL_WRITE_USN_CLOSE_RECORD: + UNIMPLEMENTED; + DPRINT1("Unimplemented user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); + Status = STATUS_NOT_IMPLEMENTED; + break; + case FSCTL_GET_NTFS_VOLUME_DATA: Status = GetNfsVolumeData(DeviceExt, Irp); break; @@ -811,7 +832,7 @@ break; default: - DPRINT1("Invalid user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); + DPRINT("Invalid user request: %x\n", Stack->Parameters.FileSystemControl.FsControlCode); Status = STATUS_INVALID_DEVICE_REQUEST; break; }

1 0

[hpoussin] 65830: [NTOS:CC] Fix some debug prints
by hpoussin＠svn.reactos.org 26 Dec '14

26 Dec '14

Author: hpoussin Date: Fri Dec 26 11:38:31 2014 New Revision: 65830 URL: http://svn.reactos.org/svn/reactos?rev=65830&view=rev Log: [NTOS:CC] Fix some debug prints Modified: trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -230,14 +230,13 @@ RtlCopyMemory(&Map->Callbacks, Callbacks, sizeof(*Callbacks)); /* For now ... */ - DPRINT("FileSizes->ValidDataLength %08x%08x\n", - FileSizes->ValidDataLength.HighPart, - FileSizes->ValidDataLength.LowPart); + DPRINT("FileSizes->ValidDataLength %I64x\n", + FileSizes->ValidDataLength.QuadPart); InitializeListHead(&Map->AssociatedBcb); InitializeListHead(&Map->PrivateCacheMaps); InsertTailList(&CcpAllSharedCacheMaps, &Map->Entry); - DPRINT("New Map %x\n", Map); + DPRINT("New Map %p\n", Map); } /* We don't have a private cache map. Link it with the shared cache map to serve as a held reference. When the list in the shared cache map @@ -423,11 +422,9 @@ PVOID PinnedBcb, PinnedBuffer; PNOCC_CACHE_MAP Map = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("S %08x%08x E %08x%08x\n", - StartOffset->u.HighPart, - StartOffset->u.LowPart, - EndOffset->u.HighPart, - EndOffset->u.LowPart); + DPRINT("S %I64x E %I64x\n", + StartOffset->QuadPart, + EndOffset->QuadPart); if (!Map) { @@ -449,9 +446,8 @@ ToWrite = MIN(UpperBound.QuadPart - LowerBound.QuadPart, (PAGE_SIZE - LowerBound.QuadPart) & (PAGE_SIZE - 1)); - DPRINT("Zero last half %08x%08x %x\n", - Target.u.HighPart, - Target.u.LowPart, + DPRINT("Zero last half %I64x %lx\n", + Target.QuadPart, ToWrite); Status = MiSimpleRead(FileObject, @@ -467,7 +463,7 @@ RtlRaiseStatus(Status); } - DPRINT1("RtlZeroMemory(%x,%x)\n", + DPRINT1("RtlZeroMemory(%p, %lx)\n", ZeroBuf + LowerBound.QuadPart - Target.QuadPart, ToWrite); @@ -494,9 +490,8 @@ while (UpperBound.QuadPart - Target.QuadPart > PAGE_SIZE) { - DPRINT("Zero full page %08x%08x\n", - Target.u.HighPart, - Target.u.LowPart); + DPRINT("Zero full page %I64x\n", + Target.QuadPart); Status = MiSimpleWrite(FileObject, &Target, @@ -515,9 +510,8 @@ if (UpperBound.QuadPart > Target.QuadPart) { ToWrite = UpperBound.QuadPart - Target.QuadPart; - DPRINT("Zero first half %08x%08x %x\n", - Target.u.HighPart, - Target.u.LowPart, + DPRINT("Zero first half %I64x %lx\n", + Target.QuadPart, ToWrite); Status = MiSimpleRead(FileObject, @@ -563,10 +557,9 @@ if (Bcb->FileOffset.QuadPart + Bcb->Length >= LowerBound.QuadPart && Bcb->FileOffset.QuadPart < UpperBound.QuadPart) { - DPRINT("Bcb #%x (@%08x%08x)\n", + DPRINT("Bcb #%x (@%I64x)\n", Bcb - CcCacheSections, - Bcb->FileOffset.u.HighPart, - Bcb->FileOffset.u.LowPart); + Bcb->FileOffset.QuadPart); Target.QuadPart = MAX(Bcb->FileOffset.QuadPart, LowerBound.QuadPart); Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -486,10 +486,9 @@ return FALSE; } - DPRINT("CcMapData(F->%x,%08x%08x:%d)\n", + DPRINT("CcMapData(F->%x, %I64x:%d)\n", FileObject, - FileOffset->HighPart, - FileOffset->LowPart, + FileOffset->QuadPart, Length); ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); @@ -510,10 +509,9 @@ *BcbResult = Bcb; *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); - DPRINT("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", + DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%x) %wZ\n", Bcb - CcCacheSections, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->BaseAddress, Bcb->Length, *Buffer, @@ -524,9 +522,8 @@ goto cleanup; } - DPRINT("File size %08x%08x\n", - Map->FileSizes.ValidDataLength.HighPart, - Map->FileSizes.ValidDataLength.LowPart); + DPRINT("File size %I64x\n", + Map->FileSizes.ValidDataLength.QuadPart); /* Not all files have length, in fact filesystems often use stream file objects for various internal purposes and are loose about the file @@ -635,7 +632,6 @@ * in the NOCC_CACHE_MAP. */ Success = TRUE; - //DPRINT("w1n\n"); Bcb->Length = MIN(Map->FileSizes.ValidDataLength.QuadPart - Target.QuadPart, CACHE_STRIPE); @@ -649,10 +645,9 @@ *Buffer = ((PCHAR)Bcb->BaseAddress) + (int)(FileOffset->QuadPart - Bcb->FileOffset.QuadPart); FaultIn = TRUE; - DPRINT("Bcb #%x Buffer maps (%08x%08x) At %x Length %x (Getting %x:%x) %wZ\n", + DPRINT("Bcb #%x Buffer maps (%I64x) At %x Length %x (Getting %p:%lx) %wZ\n", Bcb - CcCacheSections, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->BaseAddress, Bcb->Length, *Buffer, @@ -663,8 +658,6 @@ ASSERT((EndInterval.QuadPart & ~(CACHE_STRIPE - 1)) == (Bcb->FileOffset.QuadPart & ~(CACHE_STRIPE - 1))); - //DPRINT("TERM!\n"); - cleanup: CcpUnlock(); if (Success) @@ -675,10 +668,9 @@ ULONG i; PCHAR FaultIn = Bcb->BaseAddress; - DPRINT("Faulting in pages at this point: file %wZ %08x%08x:%x\n", + DPRINT("Faulting in pages at this point: file %wZ %I64x:%x\n", &FileObject->FileName, - Bcb->FileOffset.HighPart, - Bcb->FileOffset.LowPart, + Bcb->FileOffset.QuadPart, Bcb->Length); for (i = 0; i < Bcb->Length; i += PAGE_SIZE) @@ -873,15 +865,14 @@ if (Zero) { - DPRINT("Zero fill #%x %08x%08x:%x Buffer %x %wZ\n", + DPRINT("Zero fill #%x %I64x:%x Buffer %x %wZ\n", RealBcb - CcCacheSections, - FileOffset->u.HighPart, - FileOffset->u.LowPart, + FileOffset->QuadPart, Length, *Buffer, &FileObject->FileName); - DPRINT1("RtlZeroMemory(%x,%x)\n", *Buffer, Length); + DPRINT1("RtlZeroMemory(%p, %lx)\n", *Buffer, Length); RtlZeroMemory(*Buffer, Length); } } Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Dec 26 11:38:31 2014 @@ -389,7 +389,7 @@ FileSizes.ValidDataLength = FileInfo.EndOfFile; FileSizes.FileSize = FileInfo.EndOfFile; } - DPRINT("Got %08x\n", FileSizes.ValidDataLength.u.LowPart); + DPRINT("Got %I64x\n", FileSizes.ValidDataLength.QuadPart); /* * FIXME: Revise this once a locking order for file size changes is @@ -399,15 +399,12 @@ */ if (UMaximumSize != NULL && UMaximumSize->QuadPart) { - DPRINT("Taking maximum %x\n", UMaximumSize->LowPart); + DPRINT("Taking maximum %I64x\n", UMaximumSize->QuadPart); MaximumSize.QuadPart = UMaximumSize->QuadPart; } else { - DPRINT("Got file size %08x%08x\n", - FileSizes.FileSize.u.HighPart, - FileSizes.FileSize.u.LowPart); - + DPRINT("Got file size %I64x\n", FileSizes.FileSize.QuadPart); MaximumSize.QuadPart = FileSizes.FileSize.QuadPart; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs