Ros-diffs February 2011

ros-diffs@reactos.org

18 participants
352 discussions

[fireball] 50646: - Edijs: Properly load window size and position. See issue #5872 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 10 11:18:00 2011 New Revision: 50646 URL: http://svn.reactos.org/svn/reactos?rev=50646&view=rev Log: - Edijs: Properly load window size and position. See issue #5872 for more details. Modified: trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/settings.c [iso-8859-1] Thu Feb 10 11:18:00 2011 @@ -134,10 +134,10 @@ QueryBool(hKey, _T("fWrap"), &Globals.bWrapLongLines); QueryBool(hKey, _T("fStatusBar"), &Globals.bShowStatusBar); - QueryByte(hKey, _T("iWindowPosX"), (LPBYTE)&Globals.main_rect.left); - QueryByte(hKey, _T("iWindowPosX"), (LPBYTE)&Globals.main_rect.top); - QueryByte(hKey, _T("iWindowPosDX"), (LPBYTE)&dx); - QueryByte(hKey, _T("iWindowPosDY"), (LPBYTE)&dy); + QueryDword(hKey, _T("iWindowPosX"), (DWORD*)&Globals.main_rect.left); + QueryDword(hKey, _T("iWindowPosY"), (DWORD*)&Globals.main_rect.top); + QueryDword(hKey, _T("iWindowPosDX"), (DWORD*)&dx); + QueryDword(hKey, _T("iWindowPosDY"), (DWORD*)&dy); Globals.main_rect.right = Globals.main_rect.left + dx; Globals.main_rect.bottom = Globals.main_rect.top + dy;

13 years, 10 months

[tkreuzer] 50645: Fix build of shlwapi

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 11:03:43 2011 New Revision: 50645 URL: http://svn.reactos.org/svn/reactos?rev=50645&view=rev Log: Fix build of shlwapi Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc [iso-8859-1] Thu Feb 10 11:03:43 2011 @@ -32,17 +32,17 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Ne jelení&tse meg ezt az üzenetet mégegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Mégse", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Igen", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Nem", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "Ne jelenÃ&tse meg ezt az Ã¼zenetet mÃ©gegyszer", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&MÃ©gse" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Igen" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Nem" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE { - IDS_BYTES_FORMAT "%ld bájt" - IDS_TIME_INTERVAL_HOURS " óra" + IDS_BYTES_FORMAT "%ld bÃ¡jt" + IDS_TIME_INTERVAL_HOURS " Ã³ra" IDS_TIME_INTERVAL_MINUTES " perc" IDS_TIME_INTERVAL_SECONDS " mp" } Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc [iso-8859-1] Thu Feb 10 11:03:43 2011 @@ -2,8 +2,8 @@ * Portuguese resources for shlwapi * * Copyright 2004 Marcelo Duarte - * Copyright 2006 Américo José Melo - * Copyright 2010 Gustavo Henrique Milaré + * Copyright 2006 AmÃ©rico JosÃ© Melo + * Copyright 2010 Gustavo Henrique MilarÃ© * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -33,11 +33,11 @@ { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "NÃ£o &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&OK" IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Cancelar" IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sim" IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&NÃ£o" IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE

13 years, 10 months

[tkreuzer] 50644: fix taskmgr build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 10:51:26 2011 New Revision: 50644 URL: http://svn.reactos.org/svn/reactos?rev=50644&view=rev Log: fix taskmgr build Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Thu Feb 10 10:51:26 2011 @@ -14,85 +14,85 @@ IDR_TASKMANAGER MENU DISCARDABLE BEGIN - POPUP "ÆtÆ@ÆCÆâ¹(&F)" - BEGIN - MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÂIâÂ¹(&X)", ID_FILE_EXIT - END - POPUP "ÆIÆvÆVÆâ¡Æâ(&O)" - BEGIN - MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP + POPUP "t@C(&F)" + BEGIN + MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "^XN }l[WÌI¹(&X)", ID_FILE_EXIT + END + POPUP "IvV(&O)" + BEGIN + MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP , CHECKED - MENUITEM "âÂ¢Å½gâpÅ½Å¾âÃÂÃÂÂ¬â°Â»(&M)", ID_OPTIONS_MINIMIZEONUSE + MENUITEM "¢gpÉÅ¬»(&M)", ID_OPTIONS_MINIMIZEONUSE , CHECKED - MENUITEM "ÂÃÂÂ¬â°Â»Å½Å¾âÃâ°BâÂ·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED + MENUITEM "Å¬»ÉB·(&H)", ID_OPTIONS_HIDEWHENMINIMIZED , CHECKED - MENUITEM "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)", ID_OPTIONS_SHOW16BITTASKS + MENUITEM "16 rbg ^XNÌ\\¦(&S)", ID_OPTIONS_SHOW16BITTASKS , CHECKED END - POPUP "â¢\\Å½Â¦(&V)" - BEGIN - MENUITEM "ÂÃÂVâÃÂÃ³âÃâÃÂXÂV(&R)", ID_VIEW_REFRESH - POPUP "ÂXÂVâÃâ¢pâx(&U)" + POPUP "\\¦(&V)" + BEGIN + MENUITEM "ÅVÌóÔÉXV(&R)", ID_VIEW_REFRESH + POPUP "XVÌpx(&U)" BEGIN - MENUITEM "Ââ(&H)", ID_VIEW_UPDATESPEED_HIGH - MENUITEM "âÃÂÃ(&N)", ID_VIEW_UPDATESPEED_NORMAL + MENUITEM "(&H)", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "Êí(&N)", ID_VIEW_UPDATESPEED_NORMAL , CHECKED - MENUITEM "âÃ¡(&L)", ID_VIEW_UPDATESPEED_LOW - MENUITEM "ËÃªÅ½Å¾âÃ¢Å½~(&P)", ID_VIEW_UPDATESPEED_PAUSED + MENUITEM "á(&L)", ID_VIEW_UPDATESPEED_LOW + MENUITEM "êâ~(&P)", ID_VIEW_UPDATESPEED_PAUSED END MENUITEM SEPARATOR - MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE - MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL - MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED - MENUITEM "âÃ±âÃâIâÃ°(&S)...", ID_VIEW_SELECTCOLUMNS - POPUP "CPU âÃâÅ¡âÃ°(&C)" + MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE + MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL + MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "ñÌIð(&S)...", ID_VIEW_SELECTCOLUMNS + POPUP "CPU Ìð(&C)" BEGIN - MENUITEM "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL - - MENUITEM "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + MENUITEM "·×ÄÌ CPU Å 1 Ot(&O)",ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "CPU ²ÆÉ 1 Ot(&P)", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU , CHECKED END - MENUITEM "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)", ID_VIEW_SHOWKERNELTIMES - END - POPUP "ÆEÆBÆâÆhÆE(&W)" - BEGIN - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT - END - POPUP "ÆwÆâ¹Æv(&H)" - BEGIN - MENUITEM "ÆgÆsÆbÆNâÃÅÅ¸ÂÃµ(&H)", ID_HELP_TOPICS - MENUITEM SEPARATOR - MENUITEM "ÆoÂ[ÆWÆâ¡ÆâÂÃ®â¢Ã±(&A)", ID_HELP_ABOUT + MENUITEM "J[lÔð\\¦·é(&S)", ID_VIEW_SHOWKERNELTIMES + END + POPUP "EBhE(&W)" + BEGIN + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + END + POPUP "wv(&H)" + BEGIN + MENUITEM "gsbNÌõ(&H)", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "o[Wîñ(&A)", ID_HELP_ABOUT END END IDR_WINDOWSMENU MENU DISCARDABLE BEGIN - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT END IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÅ½ÃÂs(&N)", ID_FILE_NEW - MENUITEM SEPARATOR - MENUITEM "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)", ID_VIEW_LARGE - MENUITEM "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)", ID_VIEW_SMALL - MENUITEM "ÂÃÂÃ(&D)", ID_VIEW_DETAILS, CHECKED + MENUITEM "Vµ¢^XNÌÀs(&N)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "å«¢ACR(&G)", ID_VIEW_LARGE + MENUITEM "¬³¢ACR(&M)", ID_VIEW_SMALL + MENUITEM "Ú×(&D)", ID_VIEW_DETAILS, CHECKED END END @@ -100,17 +100,17 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÂÃâÃ¨âÃâÂ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO - MENUITEM "Å½Ã¨âOâÃâ¢\\Å½Â¦(&B)", ID_WINDOWS_BRINGTOFRONT - MENUITEM SEPARATOR - MENUITEM "ÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&H)", ID_WINDOWS_TILEHORIZONTALLY - MENUITEM "ÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦(&V)", ID_WINDOWS_TILEVERTICALLY - MENUITEM "ÂÃÂÂ¬â°Â»(&M)", ID_WINDOWS_MINIMIZE - MENUITEM "ÂÃâÃ¥â°Â»(&X)", ID_WINDOWS_MAXIMIZE - MENUITEM "ÂdâÃâÃâ¢\\Å½Â¦(&C)", ID_WINDOWS_CASCADE - MENUITEM SEPARATOR - MENUITEM "Æ^ÆXÆNâÃÂIâÂ¹(&E)", ID_APPLICATION_PAGE_ENDTASK - MENUITEM "ÆvÆÂÆZÆXâÃâ¢\\Å½Â¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS + MENUITEM "ØèÖ¦(&S)", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "èOÉ\\¦(&B)", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "ãºÉÀ×Ä\\¦(&H)", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "¶EÉÀ×Ä\\¦(&V)", ID_WINDOWS_TILEVERTICALLY + MENUITEM "Å¬»(&M)", ID_WINDOWS_MINIMIZE + MENUITEM "Åå»(&X)", ID_WINDOWS_MAXIMIZE + MENUITEM "dËÄ\\¦(&C)", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "^XNÌI¹(&E)", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "vZXÌ\\¦(&G)", ID_APPLICATION_PAGE_GOTOPROCESS END END @@ -119,10 +119,10 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÅÂ³âÃÆTÆCÆYâÃâÃâÂ·(&R)", ID_RESTORE - MENUITEM "â¢ÃâÂ¶âÃ©(&C)", ID_FILE_EXIT - MENUITEM SEPARATOR - MENUITEM "ÂÃâÃÅ½Ã¨âOâÃâ¢\\Å½Â¦(&A)", ID_OPTIONS_ALWAYSONTOP + MENUITEM "³ÌTCYÉß·(&R)", ID_RESTORE + MENUITEM "Â¶é(&C)", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "íÉèOÉ\\¦(&A)", ID_OPTIONS_ALWAYSONTOP END END @@ -130,28 +130,28 @@ BEGIN POPUP "DUMMY" BEGIN - MENUITEM "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)", ID_PROCESS_PAGE_ENDPROCESS - MENUITEM "ÆvÆÂÆZÆX ÆcÆÅ Â[âÃÂIâÂ¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE - - MENUITEM "ÆfÆoÆbÆO(&D)", ID_PROCESS_PAGE_DEBUG - MENUITEM SEPARATOR - POPUP "âDÂÃ¦âxâÃÂÃâÃ¨(&P)" + MENUITEM "vZXÌI¹(&E)", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "vZX c[ÌI¹(&T)", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "fobO(&D)", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "DæxÌÝè(&P)" BEGIN - MENUITEM "ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME - - MENUITEM "Ââ(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH - - MENUITEM "âÃÂÃËÃÂÃ£(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - - MENUITEM "âÃÂÃ(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL - - MENUITEM "âÃÂÃËÃâ°Âº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - - MENUITEM "âÃ¡(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW + MENUITEM "A^C(&R)", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "(&H)", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "ÊíÈã(&A)", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "Êí(&N)", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "ÊíÈº(&B)", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "á(&L)", ID_PROCESS_PAGE_SETPRIORITY_LOW END - MENUITEM "Å ÃÅWâÃÂÃâÃ¨(&A)...", ID_PROCESS_PAGE_SETAFFINITY - MENUITEM "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹âÃâ¢ÃÂX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS + MENUITEM "ÖWÌÝè(&A)...", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "fobO `lÌÏX(&C)...", ID_PROCESS_PAGE_DEBUGCHANNELS END END @@ -166,7 +166,7 @@ STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Task Manager" +CAPTION "^XN }l[W" MENU IDR_TASKMANAGER FONT 9, "MS UI Gothic" BEGIN @@ -179,9 +179,9 @@ BEGIN CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "ÂVâÂµâÂ¢Æ^ÆXÆN(&N)...",IDC_NEWTASK,187,189,53,14 - PUSHBUTTON "ÂÃâÃ¨âÃâÂ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED - PUSHBUTTON "Æ^ÆXÆNâÃÂIâÂ¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED + PUSHBUTTON "Vµ¢^XN(&N)...",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "ØèÖ¦(&S)",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "^XNÌI¹(&E)",IDC_ENDTASK,75,189,53,14,WS_DISABLED END IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 @@ -191,8 +191,8 @@ CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 - PUSHBUTTON "ÆvÆÂÆZÆXâÃÂIâÂ¹(&E)",IDC_ENDPROCESS,171,189,69,14 - CONTROL "âSÆâ Â[ÆUÂ[âÃÆvÆÂÆZÆXâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)",IDC_SHOWALLPROCESSES, + PUSHBUTTON "vZXÌI¹(&E)",IDC_ENDPROCESS,171,189,69,14 + CONTROL "S[U[ÌvZXð\\¦·é(&S)",IDC_SHOWALLPROCESSES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END @@ -201,77 +201,77 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS UI Gothic" BEGIN - GROUPBOX "CPU Å½gâpâÂ¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT - GROUPBOX "MEM Usage",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT - GROUPBOX "Ââ¡Åv",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "ÆRÆ~ÆbÆg Æ`ÆÆÂ[ÆW (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "â¢Â¨âÂÆÂÆâÆÅ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT - GROUPBOX "ÆJÂ[ÆlÆâ¹ ÆÂÆâÆÅ (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT - LTEXT "ÆnÆâÆhÆâ¹",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 - LTEXT "ÆXÆÅÆbÆh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 - LTEXT "ÆvÆÂÆZÆX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + GROUPBOX "CPU gp¦",IDC_CPU_USAGE_FRAME,5,5,60,54,0,WS_EX_TRANSPARENT + GROUPBOX "gpÊ",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT,WS_EX_TRANSPARENT + GROUPBOX "v",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "R~bg `[W (KB)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "¨ (KB)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "J[l (KB)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "nh",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Xbh",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "vZX",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 - LTEXT "ÂÂ§ÅÃâl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER - LTEXT "ÂÃâÃ¥âl",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + LTEXT "v",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "§Àl",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8,NOT WS_BORDER + LTEXT "Åål",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 - LTEXT "Available",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 - LTEXT "ÆVÆXÆeÆâ¬ ÆLÆÆÆbÆVÆâ¦",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + LTEXT "v",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "pÂ\\",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "VXe LbV",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Ââ¡Åv",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 - LTEXT "ÆyÂ[ÆW",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 - LTEXT "âÃ±ÆyÂ[ÆW",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + LTEXT "v",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "y[W",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "ñy[W",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP - GROUPBOX "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT - GROUPBOX "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT - PUSHBUTTON "CPU Å½gâpâÂ¦âÃâ¢\\Å½Â¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâ¢\\Å½Â¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + GROUPBOX "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "gpÊÌð",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "CPU gp¦Ì\\¦",IDC_CPU_USAGE_GRAPH,12,17,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "gpÊÌ\\¦",IDC_MEM_USAGE_GRAPH,12,75,47,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE + PUSHBUTTON "CPU gp¦Ìð",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE - PUSHBUTTON "ÆÂÆâÆÅ Å½gâpâÃâÃâÅ¡âÃ°",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + PUSHBUTTON "gpÊÌð",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, 153,37,NOT WS_TABSTOP,WS_EX_CLIENTEDGE END IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÆfÆoÆbÆO Æ`ÆÆÆâÆlÆâ¹" +CAPTION "fobO `l" FONT 9, "MS UI Gothic" BEGIN CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | LVS_SORTASCENDING,7,7,233,177 - PUSHBUTTON "â¢ÃâÂ¶âÃ©",IDOK,171,189,69,14 + PUSHBUTTON "Â¶é",IDOK,171,189,69,14 END IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "ÆvÆÂÆZÆbÆTâÃÅ ÃÅW" +CAPTION "vZbTÌÖW" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,120,133,50,14 - PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,174,133,50,14 - LTEXT "ÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃÂÃâÃ¨âÃÂAâÃâÃ CPU âÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·ÂB", + PUSHBUTTON "LZ",IDCANCEL,174,133,50,14 + LTEXT "vZbTÌÖWÌÝèÍAÇÌ CPU ÅvZXðÀs·é©ð§äµÜ·B", IDC_STATIC,5,5,220,16 CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 11,28,37,10 @@ -341,62 +341,62 @@ IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "âÃ±âÃâIâÃ°" +CAPTION "ñÌIð" FONT 9, "MS UI Gothic" BEGIN DEFPUSHBUTTON "OK",IDOK,84,178,50,14 - PUSHBUTTON "ÆLÆÆÆâÆZÆâ¹",IDCANCEL,138,178,50,14 - LTEXT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ [ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·ÂB", + PUSHBUTTON "LZ",IDCANCEL,138,178,50,14 + LTEXT "^XN }l[WÌ [vZX] y[WÉ\\¦·éñðIðµÜ·B", IDC_STATIC,7,7,181,17 - CONTROL "ÆCÆÂÂ[ÆWâÂ¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + CONTROL "C[W¼(&I)",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,28,56,10 - CONTROL "PID (ÆvÆÂÆZÆX ID)(&P)",IDC_PID,"Button", + CONTROL "PID (vZX ID)(&P)",IDC_PID,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 - CONTROL "CPU Å½gâpâÂ¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU gp¦(&C)",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,50,53,10 - CONTROL "CPU Å½Å¾Å Ã(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + CONTROL "CPU Ô(&E)",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,61,48,10 - CONTROL "ÆÂÆâÆÅ Å½gâpâÃ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + CONTROL "gpÊ(&M)",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,72,63,10 - CONTROL "ÆÂÆâÆÅ Å½gâpâÃÆfÆâ¹Æ^(&D)",IDC_MEMORYUSAGEDELTA,"Button", + CONTROL "gpÊf^(&D)",IDC_MEMORYUSAGEDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 - CONTROL "ÂÃâÃ¥ÆÂÆâÆÅ Å½gâpâÃ(&K)",IDC_PEAKMEMORYUSAGE,"Button", + CONTROL "ÅågpÊ(&K)",IDC_PEAKMEMORYUSAGE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 - CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + CONTROL "y[W tHg(&F)",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,105,53,10 - CONTROL "USER ÆIÆuÆWÆFÆNÆg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "USER IuWFNg(&U)",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,116,62,10 - CONTROL "I/O âÃâÃÅ½Ã¦âÃ¨",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O ÇÝæè",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,127,49,10 - CONTROL "I/O Read Bytes",IDC_IOREADBYTES,"Button", + CONTROL "I/O ÇÝæèoCg",IDC_IOREADBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 - CONTROL "ÆZÆbÆVÆâ¡Æâ ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + CONTROL "ZbV ID(&S)",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,149,50,10 - CONTROL "Æâ Â[ÆUÂ[âÂ¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + CONTROL "[U[¼(&N)",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,160,51,10 - CONTROL "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^(&A)",IDC_PAGEFAULTSDELTA,"Button", + CONTROL "y[W tHg f^(&A)",IDC_PAGEFAULTSDELTA,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 - CONTROL "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", + CONTROL "¼z TCY(&V)",IDC_VIRTUALMEMORYSIZE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 - CONTROL "ÆyÂ[ÆW ÆvÂ[Æâ¹(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + CONTROL "y[W v[(&G)",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,50,53,10 - CONTROL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹(&O)",IDC_NONPAGEDPOOL,"Button", + CONTROL "ñy[W v[(&O)",IDC_NONPAGEDPOOL,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 - CONTROL "Å Ã®â{âDÂÃ¦âx(&R)",IDC_BASEPRIORITY,"Button", + CONTROL "î{Dæx(&R)",IDC_BASEPRIORITY,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 - CONTROL "ÆnÆâÆhÆâ¹âÃÂâ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "nhÌ(&H)",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,83,59,10 - CONTROL "ÆXÆÅÆbÆhâÃÂâ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + CONTROL "XbhÌ(&T)",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,94,59,10 - CONTROL "GDI ÆIÆuÆWÆFÆNÆg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + CONTROL "GDI IuWFNg",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,105,55,10 - CONTROL "I/O Writes",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O «Ý",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,116,49,10 - CONTROL "I/O Write Bytes",IDC_IOWRITEBYTES,"Button", + CONTROL "I/O «ÝoCg",IDC_IOWRITEBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 - CONTROL "I/O âÂ»âÃâÂ¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + CONTROL "I/O »Ì¼",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,107,138,46,10 - CONTROL "I/O Other Bytes",IDC_IOOTHERBYTES,"Button", + CONTROL "I/O »Ì¼ÌoCg",IDC_IOOTHERBYTES,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 END @@ -521,135 +521,135 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Task Manager" - IDC_TASKMGR "Task Manager" + IDS_APP_TITLE "^XN }l[W" + IDC_TASKMGR "^XN }l[W" IDS_IDLE_PROCESS "System Idle Process" END STRINGTABLE DISCARDABLE BEGIN - ID_FILE_NEW "ÂVâÂµâÂ¢ÆvÆÂÆOÆâ°Æâ¬âÃ°Å½ÃÂsâÂµâÃâÂ·" - ID_OPTIONS_ALWAYSONTOP "ÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ¢ÅÃâÃ¨ÂAÂÃâÃÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªâÃâÂ©âÃâÂ·âÃâÃâÃÆEÆBÆâÆhÆEâÃ¦âÃ¨âÃ Å½Ã¨âOâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ·" + ID_FILE_NEW "Vµ¢vOðÀsµÜ·" + ID_OPTIONS_ALWAYSONTOP "Å¬»³êÈ¢ÀèAíÉ^XN }l[WªÙ©Ì·×ÄÌEBhEæèàèOÉ\\¦³êÜ·" ID_OPTIONS_MINIMIZEONUSE - "[ÂÃâÃ¨âÃâÂ¦] ââ¬ÂÃ¬âÃ°Å½ÃÂsâÂ·âÃ©âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÂªÂÃÂÂ¬â°Â»âÂ³âÃªâÃâÂ·" - ID_OPTIONS_HIDEWHENMINIMIZED "ÂÃÂÂ¬â°Â»âÂ³âÃªâÂ½âÃâÂ«âÃÂAÆ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°â°BâÂµâÃâÂ·" - ID_VIEW_REFRESH "[ÂXÂVâÃâ¢pâx] âÃÂÃâÃ¨âÃâÂ©âÂ©âÃâÃ§âÂ¸ÂAÂÂ¡âÂ·âÂ®Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_LARGE "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_SMALL "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆââÃ°Å½gâÃâÃÆ^ÆXÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_DETAILS "Å eÆ^ÆXÆNâÃÂÃ®â¢Ã±âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_HIGH "âËâ¢b 2 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_NORMAL "2 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" - ID_VIEW_UPDATESPEED_LOW "4 â¢bâÃ 1 â°Ã±â¢\\Å½Â¦âÃ°ÂXÂVâÂµâÃâÂ·" + "[ØèÖ¦] ìðÀs·éÆA^XN }l[WªÅ¬»³êÜ·" + ID_OPTIONS_HIDEWHENMINIMIZED "Å¬»³ê½Æ«ÉA^XN }l[WðBµÜ·" + ID_VIEW_REFRESH "[XVÌpx] ÌÝèÉ©©íç¸A¡·®^XN }l[WðXVµÜ·" + ID_VIEW_LARGE "å«¢ACRðgÁÄ^XNð\\¦µÜ·" + ID_VIEW_SMALL "¬³¢ACRðgÁÄ^XNð\\¦µÜ·" + ID_VIEW_DETAILS "e^XNÌîñð\\¦µÜ·" + ID_VIEW_UPDATESPEED_HIGH "b 2 ñ\\¦ðXVµÜ·" + ID_VIEW_UPDATESPEED_NORMAL "2 bÉ 1 ñ\\¦ðXVµÜ·" + ID_VIEW_UPDATESPEED_LOW "4 bÉ 1 ñ\\¦ðXVµÜ·" END STRINGTABLE DISCARDABLE BEGIN - ID_VIEW_UPDATESPEED_PAUSED "â¢\\Å½Â¦âÃ°Å½Â©âÂ®âIâÃÂXÂVâÂµâÃâÂ¹âÃ±" + ID_VIEW_UPDATESPEED_PAUSED "\\¦ð©®IÉXVµÜ¹ñ" ID_WINDOWS_TILEHORIZONTALLY - "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÃ£â°ÂºâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_TILEVERTICALLY "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃ§âÃâÂ¢âÃ¦âÂ¤âÃÂÂ¶â°EâÃâ¢ÃâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_MINIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃÂÂ¬â°Â»âÂµâÃâÂ·" - ID_WINDOWS_MAXIMIZE "ÆEÆBÆâÆhÆEâÃ°ÂÃâÃ¥â°Â»âÂµâÃâÂ·" - ID_WINDOWS_CASCADE "ÆfÆXÆNÆgÆbÆvÂÃ£âÃÆEÆBÆâÆhÆEâÃ°ÂdâÃâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_WINDOWS_BRINGTOFRONT "ÆEÆBÆâÆhÆEâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµâÃâÂ·âÂªÂAÂÃâÃ¨âÃâÂ¦âÃâÂ¹âÃ±ÂB" - ID_HELP_TOPICS "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃÆwÆâ¹Æv ÆgÆsÆbÆNâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_HELP_ABOUT "ÆvÆÂÆOÆâ°Æâ¬ÂÃ®â¢Ã±ÂAÆoÂ[ÆWÆâ¡ÆââÃÂâ ÂAâËÂÃ¬ÅÂ âÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_FILE_EXIT "Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆ ÆAÆvÆÅ ÆPÂ[ÆVÆâ¡ÆââÃ°ÂIâÂ¹âÂµâÃâÂ·" + "fXNgbvãÅEBhEðdÈçÈ¢æ¤ÉãºÉÀ×Ä\\¦µÜ·" + ID_WINDOWS_TILEVERTICALLY "fXNgbvãÅEBhEðdÈçÈ¢æ¤É¶EÉÀ×Ä\\¦µÜ·" + ID_WINDOWS_MINIMIZE "EBhEðÅ¬»µÜ·" + ID_WINDOWS_MAXIMIZE "EBhEðÅå»µÜ·" + ID_WINDOWS_CASCADE "fXNgbvãÅEBhEðdËÄ\\¦µÜ·" + ID_WINDOWS_BRINGTOFRONT "EBhEðèOÉ\\¦µÜ·ªAØèÖ¦Ü¹ñB" + ID_HELP_TOPICS "^XN }l[WÌwv gsbNð\\¦µÜ·" + ID_HELP_ABOUT "vOîñAo[WÔAì ð\\¦µÜ·" + ID_FILE_EXIT "^XN }l[W AvP[VðI¹µÜ·" ID_OPTIONS_SHOW16BITTASKS - "16 ÆrÆbÆg Æ^ÆXÆNâÃ°ÂAÅ ÃËAâ¢tâÂ¯âÃ§âÃªâÂ½ ntvdm.exe âÃâ°ÂºâÃâ¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_SELECTCOLUMNS "[ÆvÆÂÆZÆX] ÆyÂ[ÆWâÃâ¢\\Å½Â¦âÂ·âÃ©âÃ±âÃ°âIâÃ°âÂµâÃâÂ·" - ID_VIEW_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°ÆpÆtÆHÂ[Æ}ÆâÆX ÆOÆâ°ÆtÂÃ£âÃâ¢\\Å½Â¦âÂµâÃâÂ·" + "16 rbg ^XNðAÖAt¯çê½ ntvdm.exe ÌºÉ\\¦µÜ·" + ID_VIEW_SELECTCOLUMNS "[vZX] y[WÉ\\¦·éñðIðµÜ·" + ID_VIEW_SHOWKERNELTIMES "J[lÔðptH[}X OtãÉ\\¦µÜ·" ID_VIEW_CPUHISTORY_ONEGRAPHALL - "1 âÃâÃâÅ¡âÃ°ÆOÆâ°ÆtâÃ CPU Å½gâpâÂ¦âÃÂâ¡ÅvâÃ°â¢\\Å½Â¦âÂµâÃâÂ·" - ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU Å½gâpâÂ¦âÃâÅ¡âÃ°âÃ° CPU âÂ²âÃâÃÆOÆâ°ÆtâÃâ¢\\Å½Â¦âÂµâÃâÂ·" + "1 ÂÌðOtÅ CPU gp¦Ìvð\\¦µÜ·" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "CPU gp¦Ìðð CPU ²ÆÉOtÅ\\¦µÜ·" ID_APPLICATION_PAGE_SWITCHTO - "Æ^ÆXÆNâÃ°Å½Ã¨âOâÃâ¢\\Å½Â¦âÂµÂAÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" + "^XNðèOÉ\\¦µAtH[JXðØèÖ¦Ü·" END STRINGTABLE DISCARDABLE BEGIN - ID_ENDTASK "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÂIâÂ¹âÂ·âÃ©âÃ¦âÂ¤Å½wÅ½Â¦âÂµâÃâÂ·" - ID_GOTOPROCESS "âIâÃ°âÂ³âÃªâÃâÂ¢âÃ©Æ^ÆXÆNâÃÆvÆÂÆZÆXâÃÆtÆHÂ[ÆJÆXâÃ°ÂÃâÃ¨âÃâÂ¦âÃâÂ·" - ID_RESTORE "â°BâÃªâÃâÂ¢âÂ½Æ^ÆXÆN Æ}ÆlÂ[ÆWÆÆâÃ°ÅÂ³âÃâÃâÂµâÃâÂ·" - ID_PROCESS_PAGE_ENDPROCESS "ÆVÆXÆeÆâ¬âÂ©âÃ§ÆvÆÂÆZÆXâÃ°ÂÃÂÅâÂµâÃâÂ·" + ID_ENDTASK "Ið³êÄ¢é^XNÉI¹·éæ¤w¦µÜ·" + ID_GOTOPROCESS "Ið³êÄ¢é^XNÌvZXÉtH[JXðØèÖ¦Ü·" + ID_RESTORE "BêÄ¢½^XN }l[Wð³ÉßµÜ·" + ID_PROCESS_PAGE_ENDPROCESS "VXe©çvZXðíµÜ·" ID_PROCESS_PAGE_ENDPROCESSTREE - "âÂ±âÃÆvÆÂÆZÆXâÃÅ½qÆvÆÂÆZÆXâÃ°âÂ·âÃâÃÂÃÂÅâÂµâÃâÂ·" - ID_PROCESS_PAGE_DEBUG "âÂ±âÃÆvÆÂÆZÆXâÃÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·" + "±ÌvZXÆqvZXð·×ÄíµÜ·" + ID_PROCESS_PAGE_DEBUG "±ÌvZXÉfobKðYtµÜ·" ID_PROCESS_PAGE_SETAFFINITY - "âÃâÃÆvÆÂÆZÆbÆTâÃÆvÆÂÆZÆXâÃ°Å½ÃÂsâÂ·âÃ©âÂ©âÃ°ÂÂ§ÅÃ¤âÂµâÃâÂ·" + "ÇÌvZbTÅvZXðÀs·é©ð§äµÜ·" ID_PROCESS_PAGE_SETPRIORITY_REALTIME - "ÆvÆÂÆZÆXâÃ°ÆÅ ÆAÆâ¹Æ^ÆCÆâ¬âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" - ID_PROCESS_PAGE_SETPRIORITY_HIGH "ÆvÆÂÆZÆXâÃ°ÂââDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðA^CDæxNXÉÝèµÜ·" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "vZXðDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃÂÃ£âÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíÈãÌDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_NORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíDæxNXÉÝèµÜ·" ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL - "ÆvÆÂÆZÆXâÃ°âÃÂÃËÃâ°ÂºâÃâDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" - ID_PROCESS_PAGE_SETPRIORITY_LOW "ÆvÆÂÆZÆXâÃ°âÃ¡âDÂÃ¦âxÆNÆâ°ÆXâÃÂÃâÃ¨âÂµâÃâÂ·" + "vZXðÊíÈºÌDæxNXÉÝèµÜ·" + ID_PROCESS_PAGE_SETPRIORITY_LOW "vZXðáDæxNXÉÝèµÜ·" END STRINGTABLE DISCARDABLE BEGIN - IDS_TAB_APPS "Applications" - IDS_TAB_PROCESSES "ÆvÆÂÆZÆX" - IDS_TAB_PERFORMANCE "ÆpÆtÆHÂ[Æ}ÆâÆX" - IDS_TAB_TASK "Æ^ÆXÆN" - IDS_TAB_STATUS "Status" - IDS_TAB_IMAGENAME "ÆCÆÂÂ[ÆWâÂ¼" + IDS_TAB_APPS "AvP[V" + IDS_TAB_PROCESSES "vZX" + IDS_TAB_PERFORMANCE "ptH[}X" + IDS_TAB_TASK "^XN" + IDS_TAB_STATUS "óÔ" + IDS_TAB_IMAGENAME "C[W¼" IDS_TAB_PID "PID" - IDS_TAB_USERNAME "Æâ Â[ÆUÂ[âÂ¼" - IDS_TAB_SESSIONID "ÆZÆbÆVÆâ¡Æâ ID" + IDS_TAB_USERNAME "[U[¼" + IDS_TAB_SESSIONID "ZbV ID" IDS_TAB_CPU "CPU" - IDS_TAB_CPUTIME "CPU Time" - IDS_TAB_MEMUSAGE "Mem Usage" - IDS_TAB_PEAKMEMUSAGE "Peak Mem Usage" - IDS_TAB_MEMDELTA "ÆÂÆâÆÅ ÆfÆâ¹Æ^" - IDS_TAB_PAGEFAULT "ÆyÂ[ÆW ÆtÆHÆâ¹Æg" - IDS_TAB_PFDELTA "ÆyÂ[ÆW ÆtÆHÆâ¹Æg ÆfÆâ¹Æ^" - IDS_TAB_VMSIZE "â°Â¼âzÆÂÆâÆÅ ÆTÆCÆY" - IDS_TAB_PAGEDPOOL "ÆyÂ[ÆW ÆvÂ[Æâ¹" - IDS_TAB_NPPOOL "âÃ±ÆyÂ[ÆW ÆvÂ[Æâ¹" - IDS_TAB_BASEPRI "Å Ã®â{âDÂÃ¦âx" - IDS_TAB_HANDLES "ÆnÆâÆhÆâ¹" - IDS_TAB_THREADS "ÆXÆÅÆbÆh" - IDS_TAB_USERPBJECTS "USER ÆIÆuÆWÆFÆNÆg" - IDS_TAB_GDIOBJECTS "GDI ÆIÆuÆWÆFÆNÆg" - IDS_TAB_IOREADS "I/O âÃâÃÅ½Ã¦âÃ¨" - IDS_TAB_IOWRITES "I/O Writes" - IDS_TAB_IOOTHER "I/O âÂ»âÃâÂ¼" - IDS_TAB_IOREADBYTES "I/O Read Bytes" - IDS_TAB_IOWRITESBYTES "I/O Write Bytes" - IDS_TAB_IOOTHERBYTES "I/O Other Bytes" - IDS_MENU_SELECTCOLUMNS "âÃ±âÃâIâÃ°(&S)..." - IDS_MENU_16BITTASK "16 ÆrÆbÆg Æ^ÆXÆNâÃâ¢\\Å½Â¦(&S)" - IDS_MENU_WINDOWS "ÆEÆBÆâÆhÆE(&W)" - IDS_MENU_LARGEICONS "âÃ¥âÂ«âÂ¢ÆAÆCÆRÆâ(&G)" - IDS_MENU_SMALLICONS "ÂÂ¬âÂ³âÂ¢ÆAÆCÆRÆâ(&M)" - IDS_MENU_DETAILS "ÂÃÂÃ(&D)" - IDS_MENU_ONEGRAPHALLCPUS "âÂ·âÃâÃâÃ CPU âÃ 1 ÆOÆâ°Æt(&O)" - IDS_MENU_ONEGRAPHPERCPU "CPU âÂ²âÃâÃ 1 ÆOÆâ°Æt(&P)" - IDS_MENU_CPUHISTORY "CPU âÅ¡âÃ°(&C)" - IDS_MENU_SHOWKERNELTIMES "ÆJÂ[ÆlÆâ¹Å½Å¾Å ÃâÃ°â¢\\Å½Â¦âÂ·âÃ©(&S)" - IDS_CREATENEWTASK "ÂVâÂµâÂ¢Æ^ÆXÆNâÃÂÃ¬ÂÂ¬" - IDS_CREATENEWTASK_DESC "Å½ÃÂsâÂ·âÃ©ÆvÆÂÆOÆâ°Æâ¬âÂ¼ÂAâÃâÂ½âÃÅ JâÂÆtÆHÆâ¹Æ_âÃ¢ÆhÆLÆâ¦ÆÂÆâÆgâÂ¼ÂAÆCÆâÆ^Â[ÆlÆbÆg ÆÅ Æ\\Â[ÆXâÂ¼âÃ°âÃ¼âÃâÂµâÃâÂâÂ¾âÂ³âÂ¢ÂB" - IDS_MSG_ACCESSPROCESSAFF "ÆvÆÂÆZÆXâÃÅ ÃÅWâÃâÃÆAÆNÆZÆXâÃâÂ½âÃÂÃâÃ¨âÂªâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_PROCESSONEPRO "ÆvÆÂÆZÆXâÃÂAÂÂâÃâÂâÃâÃ 1 âÃâÃÆvÆÂÆZÆbÆTâÃÅ ÃÅWâÃ°Å½ÂâÂ½âÃâÂ¯âÃªâÃâÃâÃ¨âÃâÂ¹âÃ±ÂB" - IDS_MSG_INVALIDOPTION "Invalid Option" - IDS_MSG_UNABLEDEBUGPROCESS "ÆfÆoÆbÆKâÃ°âYâ¢tâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_WARNINGDEBUG "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃ°ÆfÆoÆbÆOâÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÃ©â°Ãâ\\ÂÂ«âÂªâÂ âÃ¨âÃâÂ·ÂB\nÆfÆoÆbÆKâÃ°âYâ¢tâÂµâÃâÂ·âÂ©?" - IDS_MSG_TASKMGRWARNING "Task Manager Warning" - IDS_MSG_WARNINGTERMINATING "ÅxÂÂ: ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âÃÂAÆfÂ[Æ^âÂªÅ½Â¸âÃâÃªâÂ½âÃ¨ÂAÆVÆXÆeÆâ¬âÂª\nâ¢sËÃâÃ¨âÃâÃâÃâÂ½âÃ¨âÂ·âÃ©âÃâÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂ·âÃ©âOâÃÂAÂÃ³âÃâÃâÂ½âÃÆfÂ[Æ^âÃ°â¢ÃâÂ¶âÂ·âÃ©âÂ©âÃâÂ¤âÂ©âÃ\nÅ mâFÆÂÆbÆZÂ[ÆWâÃâ¢\\Å½Â¦âÂ³âÃªâÃâÂ¹âÃ±ÂBÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÂµâÃâÂ·âÂ©?" - IDS_MSG_UNABLETERMINATEPRO "ÆvÆÂÆZÆXâÃ°ÂIâÂ¹âÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_UNABLECHANGEPRIORITY "âDÂÃ¦âxâÃ°â¢ÃÂXâÃâÂ«âÃâÂ¹âÃ±" - IDS_MSG_WARNINGCHANGEPRIORITY "ÅxÂÂ: âÂ±âÃÆvÆÂÆZÆXâÃâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂ·âÃ©âÃÂAÆVÆXÆeÆâ¬âÂªâ¢sËÃâÃ¨âÃ\nâÃâÃ©âÃâÃÂAâ\\Å ÃºâÂµâÃâÂ¢Åâ¹â°ÃâÃâÃâÃ©âÂ±âÃâÂªâÂ âÃ¨âÃâÂ·ÂB\nâDÂÃ¦âxÆNÆâ°ÆXâÃ°â¢ÃÂXâÂµâÃâÂ·âÂ©?" - IDS_MSG_TRAYICONCPUUSAGE "CPU Å½gâpâÂ¦: %d%%" - IDS_STATUS_MEMUSAGE "ÆÂÆâÆÅ Å½gâpâÃ: %dKB / %dKB" - IDS_STATUS_CPUUSAGE "CPU Å½gâpâÂ¦: %3d%%" - IDS_STATUS_PROCESSES "ÆvÆÂÆZÆX: %d" - IDS_Not_Responding "â°Å¾âÅ¡âÃâÂµ" - IDS_Running "Å½ÃÂsââ " + IDS_TAB_CPUTIME "CPU Ô" + IDS_TAB_MEMUSAGE "gpÊ" + IDS_TAB_PEAKMEMUSAGE "ÅågpÊ" + IDS_TAB_MEMDELTA " f^" + IDS_TAB_PAGEFAULT "y[W tHg" + IDS_TAB_PFDELTA "y[W tHg f^" + IDS_TAB_VMSIZE "¼z TCY" + IDS_TAB_PAGEDPOOL "y[W v[" + IDS_TAB_NPPOOL "ñy[W v[" + IDS_TAB_BASEPRI "î{Dæx" + IDS_TAB_HANDLES "nh" + IDS_TAB_THREADS "Xbh" + IDS_TAB_USERPBJECTS "USER IuWFNg" + IDS_TAB_GDIOBJECTS "GDI IuWFNg" + IDS_TAB_IOREADS "I/O ÇÝæè" + IDS_TAB_IOWRITES "I/O «Ý" + IDS_TAB_IOOTHER "I/O »Ì¼" + IDS_TAB_IOREADBYTES "I/O ÇÝæèoCg" + IDS_TAB_IOWRITESBYTES "I/O «ÝoCg" + IDS_TAB_IOOTHERBYTES "I/O »Ì¼ÌoCg" + IDS_MENU_SELECTCOLUMNS "ñÌIð(&S)..." + IDS_MENU_16BITTASK "16 rbg ^XNÌ\\¦(&S)" + IDS_MENU_WINDOWS "EBhE(&W)" + IDS_MENU_LARGEICONS "å«¢ACR(&G)" + IDS_MENU_SMALLICONS "¬³¢ACR(&M)" + IDS_MENU_DETAILS "Ú×(&D)" + IDS_MENU_ONEGRAPHALLCPUS "·×ÄÌ CPU Å 1 Ot(&O)" + IDS_MENU_ONEGRAPHPERCPU "CPU ²ÆÉ 1 Ot(&P)" + IDS_MENU_CPUHISTORY "CPU ð(&C)" + IDS_MENU_SHOWKERNELTIMES "J[lÔð\\¦·é(&S)" + IDS_CREATENEWTASK "Vµ¢^XNÌì¬" + IDS_CREATENEWTASK_DESC "Às·évO¼AÜ½ÍJtH_âhLg¼AC^[lbg \\[X¼ðüÍµÄ¾³¢B" + IDS_MSG_ACCESSPROCESSAFF "vZXÌÖWÖÌANZXÜ½ÍÝèªÅ«Ü¹ñ" + IDS_MSG_PROCESSONEPRO "vZXÍAÈÆà 1 ÂÌvZbTÆÖWð½È¯êÎÈèÜ¹ñB" + IDS_MSG_INVALIDOPTION "³øÈIvV" + IDS_MSG_UNABLEDEBUGPROCESS "fobKðYtÅ«Ü¹ñ" + IDS_MSG_WARNINGDEBUG "x: ±ÌvZXðfobO·éÆAf[^ª¸íêéÂ\\«ª èÜ·B\nfobKðYtµÜ·©?" + IDS_MSG_TASKMGRWARNING "^XN }l[WÌx" + IDS_MSG_WARNINGTERMINATING "x: vZXðI¹·éÆAf[^ª¸íê½èAVXeª\nsÀèÉÈÁ½è·éÈÇÌA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nvZXðI¹·éOÉAóÔÜ½Íf[^ðÛ¶·é©Ç¤©Ì\nmFbZ[WÍ\\¦³êÜ¹ñBvZXðI¹µÜ·©?" + IDS_MSG_UNABLETERMINATEPRO "vZXðI¹Å«Ü¹ñ" + IDS_MSG_UNABLECHANGEPRIORITY "DæxðÏXÅ«Ü¹ñ" + IDS_MSG_WARNINGCHANGEPRIORITY "x: ±ÌvZXÌDæxNXðÏX·éÆAVXeªsÀèÉ\nÈéÈÇA\\úµÈ¢ÊÉÈé±Æª èÜ·B\nDæxNXðÏXµÜ·©?" + IDS_MSG_TRAYICONCPUUSAGE "CPU gp¦: %d%%" + IDS_STATUS_MEMUSAGE "gpÊ: %dKB / %dKB" + IDS_STATUS_CPUUSAGE "CPU gp¦: %3d%%" + IDS_STATUS_PROCESSES "vZX: %d" + IDS_Not_Responding "Èµ" + IDS_Running "Às" END

13 years, 10 months

[tkreuzer] 50643: Merge resource file related changes from cmake branch part 2

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 10:45:45 2011 New Revision: 50643 URL: http://svn.reactos.org/svn/reactos?rev=50643&view=rev Log: Merge resource file related changes from cmake branch part 2 Modified: trunk/reactos/dll/win32/browseui/browseui.rc trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/kernel32/nls/azl.nls trunk/reactos/dll/win32/kernel32/nls/csy.nls trunk/reactos/dll/win32/kernel32/nls/far.nls trunk/reactos/dll/win32/kernel32/nls/fos.nls trunk/reactos/dll/win32/kernel32/nls/hrv.nls trunk/reactos/dll/win32/kernel32/nls/mon.nls trunk/reactos/dll/win32/mpr/mpr_Bg.rc trunk/reactos/dll/win32/mpr/mpr_Cs.rc trunk/reactos/dll/win32/mpr/mpr_Da.rc trunk/reactos/dll/win32/mpr/mpr_De.rc trunk/reactos/dll/win32/mpr/mpr_En.rc trunk/reactos/dll/win32/mpr/mpr_Es.rc trunk/reactos/dll/win32/mpr/mpr_Fr.rc trunk/reactos/dll/win32/mpr/mpr_Hu.rc trunk/reactos/dll/win32/mpr/mpr_It.rc trunk/reactos/dll/win32/mpr/mpr_Ja.rc trunk/reactos/dll/win32/mpr/mpr_Ko.rc trunk/reactos/dll/win32/mpr/mpr_Lt.rc trunk/reactos/dll/win32/mpr/mpr_Nl.rc trunk/reactos/dll/win32/mpr/mpr_No.rc trunk/reactos/dll/win32/mpr/mpr_Pl.rc trunk/reactos/dll/win32/mpr/mpr_Pt.rc trunk/reactos/dll/win32/mpr/mpr_Ro.rc trunk/reactos/dll/win32/mpr/mpr_Ru.rc trunk/reactos/dll/win32/mpr/mpr_Si.rc trunk/reactos/dll/win32/mpr/mpr_Sv.rc trunk/reactos/dll/win32/mpr/mpr_Tr.rc trunk/reactos/dll/win32/mpr/mpr_Uk.rc trunk/reactos/dll/win32/mpr/mpr_Zh.rc trunk/reactos/dll/win32/shdoclc/Es.rc trunk/reactos/dll/win32/shdocvw/De.rc trunk/reactos/dll/win32/shdocvw/En.rc trunk/reactos/dll/win32/shdocvw/Es.rc trunk/reactos/dll/win32/shdocvw/Fr.rc trunk/reactos/dll/win32/shdocvw/He.rc trunk/reactos/dll/win32/shdocvw/It.rc trunk/reactos/dll/win32/shdocvw/Ko.rc trunk/reactos/dll/win32/shdocvw/Lt.rc trunk/reactos/dll/win32/shdocvw/Nl.rc trunk/reactos/dll/win32/shdocvw/Pt.rc trunk/reactos/dll/win32/shdocvw/Ro.rc trunk/reactos/dll/win32/shdocvw/Si.rc trunk/reactos/dll/win32/shdocvw/Sr.rc trunk/reactos/dll/win32/shdocvw/Sv.rc trunk/reactos/dll/win32/shdocvw/Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Da.rc trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Lt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Si.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc trunk/reactos/dll/win32/shlwapi/shlwapi_Zh.rc trunk/reactos/dll/win32/wininet/wininet_Bg.rc trunk/reactos/dll/win32/wininet/wininet_Cs.rc trunk/reactos/dll/win32/wininet/wininet_Da.rc trunk/reactos/dll/win32/wininet/wininet_De.rc trunk/reactos/dll/win32/wininet/wininet_En.rc trunk/reactos/dll/win32/wininet/wininet_Es.rc trunk/reactos/dll/win32/wininet/wininet_Fi.rc trunk/reactos/dll/win32/wininet/wininet_Fr.rc trunk/reactos/dll/win32/wininet/wininet_Hu.rc trunk/reactos/dll/win32/wininet/wininet_It.rc trunk/reactos/dll/win32/wininet/wininet_Ja.rc trunk/reactos/dll/win32/wininet/wininet_Ko.rc trunk/reactos/dll/win32/wininet/wininet_Lt.rc trunk/reactos/dll/win32/wininet/wininet_Nl.rc trunk/reactos/dll/win32/wininet/wininet_No.rc trunk/reactos/dll/win32/wininet/wininet_Pl.rc trunk/reactos/dll/win32/wininet/wininet_Pt.rc trunk/reactos/dll/win32/wininet/wininet_Ro.rc trunk/reactos/dll/win32/wininet/wininet_Ru.rc trunk/reactos/dll/win32/wininet/wininet_Si.rc trunk/reactos/dll/win32/wininet/wininet_Sv.rc trunk/reactos/dll/win32/wininet/wininet_Tr.rc trunk/reactos/dll/win32/wininet/wininet_Uk.rc trunk/reactos/dll/win32/wininet/wininet_Zh.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/browseui/browseui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… Modified: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Modified: trunk/reactos/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/azl… Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/csy… Modified: trunk/reactos/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/far… Modified: trunk/reactos/dll/win32/kernel32/nls/fos.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fos… Modified: trunk/reactos/dll/win32/kernel32/nls/hrv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hrv… Modified: trunk/reactos/dll/win32/kernel32/nls/mon.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mon… Modified: trunk/reactos/dll/win32/mpr/mpr_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Bg.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Cs.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Da.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_De.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_En.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Es.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Fr.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Hu.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_It.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ja.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ko.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Lt.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Nl.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_No.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pl.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Pt.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ro.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Ru.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Si.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Sv.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Tr.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Uk.rc?re… Modified: trunk/reactos/dll/win32/mpr/mpr_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/mpr_Zh.rc?re… Modified: trunk/reactos/dll/win32/shdoclc/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdoclc/Es.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/De.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/En.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Es.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Fr.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/He.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/It.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ko.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Lt.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Nl.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Pt.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Ro.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Si.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sr.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Sv.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Uk.rc?re… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/shlwapi/shlwapi_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/shlwapi_… Modified: trunk/reactos/dll/win32/wininet/wininet_Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_… Modified: trunk/reactos/dll/win32/wininet/wininet_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet_…

13 years, 10 months

[fireball] 50642: - Add new-style syscall definitions in win32k_arwinss.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 10 10:41:01 2011 New Revision: 50642 URL: http://svn.reactos.org/svn/reactos?rev=50642&view=rev Log: - Add new-style syscall definitions in win32k_arwinss. Added: branches/arwinss/reactos/subsystems/win32/win32k/sys-stubs.S - copied unchanged from r50633, trunk/reactos/subsystems/win32/win32k/sys-stubs.S branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h (with props) Added: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h (added) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Thu Feb 10 10:41:01 2011 @@ -1,0 +1,98 @@ +// SVC_(<NAME>, <ARG_COUNT>) +// +// +SVC_(wine_server_call, 1) +SVC_(NtGdiGetStockObject, 1) +SVC_(RosGdiAlphaBlend, 11) +SVC_(RosGdiBitBlt, 9) +SVC_(RosGdiCreateBitmap, 3) +SVC_(RosGdiCreateDIBSection, 4) +SVC_(RosGdiDeleteBitmap, 1) +SVC_(RosGdiGetBitmapBits, 3) +SVC_(RosGdiGetDIBits, 8) +SVC_(RosGdiGetPixel, 3) +SVC_(RosGdiPatBlt, 6) +SVC_(RosGdiSetBitmapBits, 3) +SVC_(RosGdiSetDIBColorTable, 4) +SVC_(RosGdiSetDIBits, 7) +SVC_(RosGdiSetDIBitsToDevice, 12) +SVC_(RosGdiStretchBlt, 11) +SVC_(RosGdiCreateDC, 6) +SVC_(RosGdiDeleteDC, 1) +SVC_(RosGdiGetDCOrgEx, 2) +SVC_(RosGdiPaintRgn, 2) +SVC_(RosGdiSelectBitmap, 2) +SVC_(RosGdiSelectBrush, 2) +SVC_(RosGdiSelectFont, 3) +SVC_(RosGdiSelectPen, 3) +SVC_(RosGdiSetBkColor, 2) +SVC_(RosGdiSetDCBrushColor, 2) +SVC_(RosGdiSetDCOrg, 3) +SVC_(RosGdiSetBrushOrg, 3) +SVC_(RosGdiSetDCPenColor, 2) +SVC_(RosGdiSetDeviceClipping, 4) +SVC_(RosGdiSetDeviceGammaRamp, 2) +SVC_(RosGdiSetPixel, 4) +SVC_(RosGdiSetPixelFormat, 3) +SVC_(RosGdiSetTextColor, 2) +SVC_(RosGdiChoosePixelFormat, 2) +SVC_(RosGdiDescribePixelFormat, 4) +SVC_(RosGdiEnumDeviceFonts, 4) +SVC_(RosGdiGetCharWidth, 4) +SVC_(RosGdiGetDeviceCaps, 2) +SVC_(RosGdiGetDeviceGammaRamp, 2) +SVC_(RosGdiSetWindow, 5) +SVC_(RosGdiGetICMProfile, 3) +SVC_(RosGdiGetNearestColor, 2) +SVC_(RosGdiGetPixelFormat, 1) +SVC_(RosGdiGetSystemPaletteEntries, 4) +SVC_(RosGdiGetTextExtentExPoint, 7) +SVC_(RosGdiGetTextMetrics, 2) +SVC_(RosGdiArc, 10) +SVC_(RosGdiEllipse, 5) +SVC_(RosGdiExtEscape, 6) +SVC_(RosGdiExtFloodFill, 5) +SVC_(RosGdiExtTextOut, 10) +SVC_(RosGdiLineTo, 5) +SVC_(RosGdiPolyPolygon, 4) +SVC_(RosGdiPolyPolyline, 4) +SVC_(RosGdiPolygon, 3) +SVC_(RosGdiPolyline, 3) +SVC_(RosGdiRealizeDefaultPalette, 1) +SVC_(RosGdiRealizePalette, 3) +SVC_(RosGdiRectangle, 2) +SVC_(RosGdiRoundRect, 7) +SVC_(RosGdiSwapBuffers, 1) +SVC_(RosGdiUnrealizePalette, 1) +SVC_(RosUserSetCursor, 1) +SVC_(RosUserGetCursorPos, 1) +SVC_(RosUserSetCursorPos, 2) +SVC_(RosUserClipCursor, 1) +SVC_(RosUserChangeDisplaySettings, 5) +SVC_(RosUserEnumDisplayMonitors, 3) +SVC_(RosUserEnumDisplaySettings, 4) +SVC_(RosUserGetMonitorInfo, 2) +SVC_(RosUserGetKeyboardLayout, 1) +SVC_(RosUserGetKeyboardLayoutName, 1) +SVC_(RosUserLoadKeyboardLayoutEx, 7) +SVC_(RosUserActivateKeyboardLayout, 2) +SVC_(RosUserUnloadKeyboardLayout, 1) +SVC_(RosUserSetAsyncKeyboardState, 1) +SVC_(RosUserGetAsyncKeyboardState, 1) +SVC_(RosUserVkKeyScanEx, 3) +SVC_(RosUserGetKeyNameText, 3) +SVC_(RosUserToUnicodeEx, 7) +SVC_(RosUserMapVirtualKeyEx, 4) +SVC_(RosUserGetAsyncKeyState, 1) +SVC_(RosUserSetMonitorInfo, 2) +SVC_(RosUserRegisterShellHookWindow, 1) +SVC_(RosUserDeRegisterShellHookWindow, 1) +SVC_(RosUserBuildShellHookHwndList, 2) +SVC_(SwmNewWindow, 4) +SVC_(SwmAddDesktopWindow, 3) +SVC_(SwmDestroyWindow, 1) +SVC_(SwmSetForeground, 1) +SVC_(SwmPosChanged, 5) +SVC_(SwmGetWindowFromPoint, 2) +SVC_(SwmShowWindow, 3) +SVC_(NtUserInitialize, 3) Propchange: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.h ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 10 months

[tkreuzer] 50641: Merge resource file related changes from cmake branch part 1

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 10:39:34 2011 New Revision: 50641 URL: http://svn.reactos.org/svn/reactos?rev=50641&view=rev Log: Merge resource file related changes from cmake branch part 1 Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/find/lang/bg-BG.rc trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/find/lang/el-GR.rc trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc trunk/reactos/base/applications/cmdutils/find/lang/fr-FR.rc trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc trunk/reactos/base/applications/cmdutils/find/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc trunk/reactos/base/applications/findstr/lang/bg-BG.rc trunk/reactos/base/applications/findstr/lang/ca-ES.rc trunk/reactos/base/applications/findstr/lang/cs-CZ.rc trunk/reactos/base/applications/findstr/lang/de-DE.rc trunk/reactos/base/applications/findstr/lang/el-GR.rc trunk/reactos/base/applications/findstr/lang/en-US.rc trunk/reactos/base/applications/findstr/lang/es-ES.rc trunk/reactos/base/applications/findstr/lang/fr-FR.rc trunk/reactos/base/applications/findstr/lang/it-IT.rc trunk/reactos/base/applications/findstr/lang/lt-LT.rc trunk/reactos/base/applications/findstr/lang/no-NO.rc trunk/reactos/base/applications/findstr/lang/pl-PL.rc trunk/reactos/base/applications/findstr/lang/pt-BR.rc trunk/reactos/base/applications/findstr/lang/ru-RU.rc trunk/reactos/base/applications/findstr/lang/sk-SK.rc trunk/reactos/base/applications/findstr/lang/sv-SE.rc trunk/reactos/base/applications/findstr/lang/uk-UA.rc trunk/reactos/base/applications/games/winmine/lang/da-DK.rc trunk/reactos/base/applications/network/ping/lang/de-DE.rc trunk/reactos/base/applications/network/ping/lang/en-US.rc trunk/reactos/base/applications/network/ping/lang/fr-FR.rc trunk/reactos/base/applications/network/ping/lang/it-IT.rc trunk/reactos/base/applications/network/ping/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/notepad/lang/cs-CZ.rc trunk/reactos/base/applications/notepad/lang/da-DK.rc trunk/reactos/base/applications/notepad/lang/de-DE.rc trunk/reactos/base/applications/notepad/lang/el-GR.rc trunk/reactos/base/applications/notepad/lang/es-ES.rc trunk/reactos/base/applications/notepad/lang/eu-ES.rc trunk/reactos/base/applications/notepad/lang/fi-FI.rc trunk/reactos/base/applications/notepad/lang/fr-FR.rc trunk/reactos/base/applications/notepad/lang/hu-HU.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/id-ID.rc trunk/reactos/base/applications/notepad/lang/it-IT.rc trunk/reactos/base/applications/notepad/lang/nl-NL.rc trunk/reactos/base/applications/notepad/lang/no-NO.rc trunk/reactos/base/applications/notepad/lang/pl-PL.rc trunk/reactos/base/applications/notepad/lang/pt-PT.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ru-RU.rc trunk/reactos/base/applications/notepad/lang/sk-SK.rc trunk/reactos/base/applications/notepad/lang/sl-SI.rc trunk/reactos/base/applications/notepad/lang/sv-SE.rc trunk/reactos/base/applications/notepad/lang/th-TH.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/zh-CN.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ro.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/cmdutils/find/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/findstr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/findstr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/games/winmine/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/eu-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it…

13 years, 10 months

[tkreuzer] 50640: Merge all amd64 related changes from cmake branch

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 10 10:30:43 2011 New Revision: 50640 URL: http://svn.reactos.org/svn/reactos?rev=50640&view=rev Log: Merge all amd64 related changes from cmake branch Modified: trunk/reactos/include/ndk/amd64/ketypes.h trunk/reactos/include/xdk/amd64/ke.h trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/amd64/seh.s trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S trunk/reactos/lib/sdk/crt/math/amd64/atan.S trunk/reactos/lib/sdk/crt/math/amd64/atan2.S trunk/reactos/lib/sdk/crt/math/amd64/ceil.S trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S trunk/reactos/lib/sdk/crt/math/amd64/exp.S trunk/reactos/lib/sdk/crt/math/amd64/fabs.S trunk/reactos/lib/sdk/crt/math/amd64/floor.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S trunk/reactos/lib/sdk/crt/math/amd64/fmod.S trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S trunk/reactos/lib/sdk/crt/math/amd64/log.S trunk/reactos/lib/sdk/crt/math/amd64/log10.S trunk/reactos/lib/sdk/crt/math/amd64/pow.S trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S trunk/reactos/lib/sdk/crt/math/amd64/tan.S trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/ke/amd64/thrdini.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/mm/amd64/init.c trunk/reactos/tools/rsym/rsym64.h Modified: trunk/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/amd64/ketypes.… ============================================================================== --- trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -81,6 +81,7 @@ #define CR4_PGE 0x80 #define CR4_FXSR 0x200 #define CR4_XMMEXCPT 0x400 +#define CR4_CHANNELS 0x800 // // EFlags @@ -98,6 +99,39 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 +#define EFLAGS_TF_MASK 0x0100 +#define EFLAGS_TF_SHIFT 0x0008 +#define EFLAGS_ID_MASK 0x200000 +#define EFLAGS_IF_MASK 0x0200 +#define EFLAGS_IF_SHIFT 0x0009 + +// +// Machine Specific Registers +// +#define MSR_EFER 0xC0000080 +#define MSR_STAR 0xC0000081 +#define MSR_LSTAR 0xC0000082 +#define MSR_CSTAR 0xC0000083 +#define MSR_SYSCALL_MASK 0xC0000084 +#define MSR_FS_BASE 0xC0000100 +#define MSR_GS_BASE 0xC0000101 +#define MSR_GS_SWAP 0xC0000102 +#define MSR_MCG_STATUS 0x017A +#define MSR_AMD_ACCESS 0x9C5A203A + +// +// Flags in MSR_EFER +// +#define MSR_LMA 0x0400 +#define MSR_LME 0x0100 +#define MSR_SCE 0x0001 +#define MSR_NXE 0x0800 +#define MSR_PAT 0x0277 +#define MSR_DEGUG_CTL 0x01D9 +#define MSR_LAST_BRANCH_FROM 0x01DB +#define MSR_LAST_BRANCH_TO 0x01DC +#define MSR_LAST_EXCEPTION_FROM 0x01DD +#define MSR_LAST_EXCEPTION_TO 0x01DE // // IPI Types @@ -114,6 +148,15 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// Service Table +// +#define NUMBER_SERVICE_TABLES 2 +#define SERVICE_NUMBER_MASK 0xFFF +#define SERVICE_TABLE_SHIFT 7 +#define SERVICE_TABLE_MASK 0x20 +#define SERVICE_TABLE_TEST 0x20 // // HAL Variables @@ -143,6 +186,8 @@ #else #define SYNCH_LEVEL (IPI_LEVEL - 2) #endif + +#define NMI_STACK_SIZE 0x2000 // // Trap Frame Definition @@ -863,6 +908,56 @@ UINT64 Return; } KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; +typedef struct _DISPATCHER_CONTEXT +{ + ULONG64 ControlPc; + PVOID ImageBase; + PVOID FunctionEntry; + PVOID EstablisherFrame; + ULONG64 TargetIp; + PVOID ContextRecord; + PVOID LanguageHandler; + PVOID HandlerData; + PVOID HistoryTable; + ULONG ScopeIndex; +} DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT; + + +typedef struct _KSTART_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 Return; +} KSTART_FRAME, *PKSTART_FRAME; + +typedef struct _KSWITCH_FRAME +{ + ULONG64 P1Home; + ULONG64 P2Home; + ULONG64 P3Home; + ULONG64 P4Home; + ULONG64 P5Home; + ULONG64 ApcBypass; + ULONG64 Rbp; + ULONG64 Return; +} KSWITCH_FRAME, *PKSWITCH_FRAME; + +typedef struct _KTIMER_TABLE_ENTRY +{ + ULONG_PTR Lock; + LIST_ENTRY Entry; + ULARGE_INTEGER Time; +} KTIMER_TABLE_ENTRY, *PKTIMER_TABLE_ENTRY; + +typedef struct _KTIMER_TABLE +{ + KTIMER* TimerExpiry[64]; + KTIMER_TABLE_ENTRY TimerEntries[256]; +} KTIMER_TABLE, *PKTIMER_TABLE; + // // Inline function to get current KPRCB // Modified: trunk/reactos/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/amd64/ke.h?rev… ============================================================================== --- trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/amd64/ke.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -67,7 +67,7 @@ { KIRQL OldIrql; - OldIrql = __readcr8(); + OldIrql = (KIRQL)__readcr8(); //ASSERT(OldIrql <= NewIrql); __writecr8(NewIrql); return OldIrql; Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,21 +10,25 @@ #include <asm.inc> +/* CODE **********************************************************************/ +.code64 PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" -.proc _chkstk +FUNC _chkstk + .endprolog UNIMPLEMENTED chkstk ret -.endp +ENDFUNC _chkstk -.proc _alloca_probe +FUNC _alloca_probe + .endprolog UNIMPLEMENTED alloca_probe ret -.endp +ENDFUNC _alloca_probe END /* EOF */ Modified: trunk/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -17,42 +17,43 @@ /* GLOBALS *******************************************************************/ -.globl _global_unwind2 -.globl _local_unwind2 -.globl _abnormal_termination -.globl _except_handler2 -.globl _except_handler3 +PUBLIC _global_unwind2 +PUBLIC _local_unwind2 +PUBLIC _abnormal_termination +PUBLIC _except_handler2 +PUBLIC _except_handler3 -/* FUNCTIONS *****************************************************************/ +/* CODE **********************************************************************/ +.code64 -.func _unwind_handler -_unwind_handler: +FUNC _unwind_handler + .endprolog ret -.endfunc +ENDFUNC _unwind_handler -.func _global_unwind2 -_global_unwind2: +FUNC _global_unwind2 + .endprolog ret -.endfunc +ENDFUNC _global_unwind2 -.func _abnormal_termination -_abnormal_termination: +FUNC _abnormal_termination + .endprolog ret -.endfunc +ENDFUNC _abnormal_termination -.func _local_unwind2 -_local_unwind2: +FUNC _local_unwind2 + .endprolog ret -.endfunc +ENDFUNC _local_unwind2 -.func _except_handler2 -_except_handler2: +FUNC _except_handler2 + .endprolog ret -.endfunc +ENDFUNC _except_handler2 -.func _except_handler3 -_except_handler3: +FUNC _except_handler3 + .endprolog ret -.endfunc +ENDFUNC _except_handler3 END Modified: trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/all… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,18 +10,21 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* DATA **********************************************************************/ +.code64 PUBLIC _fltused _fltused: - .long 0x9875 + .long HEX(9875) -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -.proc alldiv +FUNC alldiv + .endprolog UNIMPLEMENTED alldiv ret -.endp alldiv +ENDFUNC alldiv + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan atan: UNIMPLEMENTED atan ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan2 atan2: UNIMPLEMENTED atan2 ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceil @@ -20,3 +19,4 @@ UNIMPLEMENTED ceil ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceilf @@ -39,7 +38,7 @@ fstp dword ptr [rsp] movss xmm0, [rsp] - + add rsp, 16 ret Modified: trunk/reactos/lib/sdk/crt/math/amd64/exp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/exp… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC exp Modified: trunk/reactos/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fab… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,12 +10,12 @@ #include <asm.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -PUBLIC fabs -fabs: +PUBLIC _fabs +_fabs: UNIMPLEMENTED fabs ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floor Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floorf Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,10 +10,11 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 -PUBLIC fmod -fmod: +PUBLIC _fmod +_fmod: UNIMPLEMENTED fmod ret Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC fmodf fmodf: Modified: trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/lde… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC ldexp ldexp: Modified: trunk/reactos/lib/sdk/crt/math/amd64/log.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/log.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/log.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,9 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log log: UNIMPLEMENTED log ret + +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/log10.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,10 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log10 log10: UNIMPLEMENTED log10 ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/pow.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/pow… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,10 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC pow pow: UNIMPLEMENTED pow ret +END Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrt sqrt: Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrtf sqrtf: Modified: trunk/reactos/lib/sdk/crt/math/amd64/tan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/tan… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC tan tan: Modified: trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/amd64/s… ============================================================================== --- trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -11,41 +11,45 @@ #include <asm.inc> #include <ksamd64.inc> -#define JUMP_BUFFER_Frame 0x00 -#define JUMP_BUFFER_Rbx 0x08 -#define JUMP_BUFFER_Rsp 0x10 -#define JUMP_BUFFER_Rbp 0x18 -#define JUMP_BUFFER_Rsi 0x20 -#define JUMP_BUFFER_Rdi 0x28 -#define JUMP_BUFFER_R12 0x30 -#define JUMP_BUFFER_R13 0x38 -#define JUMP_BUFFER_R14 0x40 -#define JUMP_BUFFER_R15 0x48 -#define JUMP_BUFFER_Rip 0x50 -#define JUMP_BUFFER_Spare 0x58 -#define JUMP_BUFFER_Xmm6 0x60 -#define JUMP_BUFFER_Xmm7 0x70 -#define JUMP_BUFFER_Xmm8 0x80 -#define JUMP_BUFFER_Xmm9 0x90 -#define JUMP_BUFFER_Xmm10 0xa0 -#define JUMP_BUFFER_Xmm11 0xb0 -#define JUMP_BUFFER_Xmm12 0xc0 -#define JUMP_BUFFER_Xmm13 0xd0 -#define JUMP_BUFFER_Xmm14 0xe0 -#define JUMP_BUFFER_Xmm15 0xf0 +#define JUMP_BUFFER_Frame 0 /* 0x00 */ +#define JUMP_BUFFER_Rbx 8 /* 0x08 */ +#define JUMP_BUFFER_Rsp 16 /* 0x10 */ +#define JUMP_BUFFER_Rbp 24 /* 0x18 */ +#define JUMP_BUFFER_Rsi 32 /* 0x20 */ +#define JUMP_BUFFER_Rdi 40 /* 0x28 */ +#define JUMP_BUFFER_R12 48 /* 0x30 */ +#define JUMP_BUFFER_R13 56 /* 0x38 */ +#define JUMP_BUFFER_R14 64 /* 0x40 */ +#define JUMP_BUFFER_R15 72 /* 0x48 */ +#define JUMP_BUFFER_Rip 80 /* 0x50 */ +#define JUMP_BUFFER_Spare 88 /* 0x58 */ +#define JUMP_BUFFER_Xmm6 96 /* 0x60 */ +#define JUMP_BUFFER_Xmm7 112 /* 0x70 */ +#define JUMP_BUFFER_Xmm8 128 /* 0x80 */ +#define JUMP_BUFFER_Xmm9 144 /* 0x90 */ +#define JUMP_BUFFER_Xmm10 160 /* 0xa0 */ +#define JUMP_BUFFER_Xmm11 176 /* 0xb0 */ +#define JUMP_BUFFER_Xmm12 192 /* 0xc0 */ +#define JUMP_BUFFER_Xmm13 208 /* 0xd0 */ +#define JUMP_BUFFER_Xmm14 224 /* 0xe0 */ +#define JUMP_BUFFER_Xmm15 240 /* 0xf0 */ /* FUNCTIONS ******************************************************************/ +.code64 -/* +/*! * int _setjmp(jmp_buf env); * - * Parameters: <rcx> - jmp_buf env - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmp -.proc _setjmp +FUNC _setjmp + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -73,18 +77,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmp +ENDFUNC _setjmp -/* +/*! * int _setjmpex(jmp_buf _Buf,void *_Ctx); * - * Parameters: <rcx> - jmp_buf env - * <rdx> - frame - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \param <rdx> - frame + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmpex -.proc _setjmpex +FUNC _setjmpex + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -112,19 +119,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmpex +ENDFUNC _setjmpex -/* +/*! * void longjmp(jmp_buf env, int value); * - * Parameters: <rcx> - jmp_buf setup by _setjmp - * <rdx> - int value to return - * Returns: Doesn't return - * Notes: Non-local goto + * \param <rcx> - jmp_buf setup by _setjmp + * \param <rdx> - int value to return + * \return Doesn't return + * \note Non-local goto */ PUBLIC longjmp -.proc longjmp +FUNC longjmp + + .endprolog // FIXME: handle frame @@ -152,9 +161,9 @@ /* return param2 or 1 if it was 0 */ mov rax, rdx test rax, rax - jnz 2f + jnz l2 inc rax -2: jmp r8 -.endp longjmp +l2: jmp r8 +ENDFUNC longjmp END Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -131,6 +131,7 @@ Temp >>= 16; return (PVOID)Temp; } +#define MiPdeToAddress MiPteToAddress BOOLEAN FORCEINLINE @@ -157,8 +158,6 @@ MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte, IN PMMPTE PointerPte) { - ULONG_PTR Offset; - /* Store the Address */ NewPte->u.Long = (ULONG64)PointerPte; @@ -197,9 +196,11 @@ // FIXME, only copied from x86 #define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) +#define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) #define MI_PAGE_DISABLE_CACHE(x) ((x)->u.Hard.CacheDisable = 1) #define MI_PAGE_WRITE_THROUGH(x) ((x)->u.Hard.WriteThrough = 1) #define MI_PAGE_WRITE_COMBINED(x) ((x)->u.Hard.WriteThrough = 0) +#define MI_IS_PAGE_LARGE(x) ((x)->u.Hard.LargePage == 1) #if !defined(CONFIG_SMP) #define MI_IS_PAGE_WRITEABLE(x) ((x)->u.Hard.Write == 1) #else @@ -231,8 +232,13 @@ #define MI_MAPPING_RANGE_START (ULONG)HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + \ MI_HYPERSPACE_PTES * PAGE_SIZE) -#define MI_ZERO_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ - PAGE_SIZE) +#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + \ + PAGE_SIZE) +#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + \ + PAGE_SIZE) +#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + \ + PAGE_SIZE) + /* On x86, these two are the same */ #define MMPDE MMPTE Modified: trunk/reactos/ntoskrnl/ke/amd64/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/thrdini.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/thrdini.c [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -12,24 +12,9 @@ #define NDEBUG #include <debug.h> -typedef struct _KSWITCHFRAME -{ - PVOID ExceptionList; - BOOLEAN ApcBypassDisable; - PVOID RetAddr; -} KSWITCHFRAME, *PKSWITCHFRAME; - -typedef struct _KSTART_FRAME -{ - PKSYSTEM_ROUTINE SystemRoutine; - PKSTART_ROUTINE StartRoutine; - PVOID StartContext; - BOOLEAN UserThread; -} KSTART_FRAME, *PKSTART_FRAME; - typedef struct _KUINIT_FRAME { - KSWITCHFRAME CtxSwitchFrame; + KSWITCH_FRAME CtxSwitchFrame; KSTART_FRAME StartFrame; KTRAP_FRAME TrapFrame; //FX_SAVE_AREA FxSaveArea; @@ -37,7 +22,7 @@ typedef struct _KKINIT_FRAME { - KSWITCHFRAME CtxSwitchFrame; + KSWITCH_FRAME CtxSwitchFrame; KSTART_FRAME StartFrame; //FX_SAVE_AREA FxSaveArea; } KKINIT_FRAME, *PKKINIT_FRAME; @@ -55,7 +40,7 @@ //PFX_SAVE_AREA FxSaveArea; //PFXSAVE_FORMAT FxSaveFormat; PKSTART_FRAME StartFrame; - PKSWITCHFRAME CtxSwitchFrame; + PKSWITCH_FRAME CtxSwitchFrame; PKTRAP_FRAME TrapFrame; CONTEXT LocalContext; PCONTEXT Context = NULL; @@ -140,7 +125,7 @@ Thread->PreviousMode = UserMode; /* Tell KiThreadStartup of that too */ - StartFrame->UserThread = TRUE; +// StartFrame->UserThread = TRUE; } else { @@ -170,18 +155,18 @@ Thread->PreviousMode = KernelMode; /* Tell KiThreadStartup of that too */ - StartFrame->UserThread = FALSE; +// StartFrame->UserThread = FALSE; } /* Now setup the remaining data for KiThreadStartup */ - StartFrame->StartContext = StartContext; - StartFrame->StartRoutine = StartRoutine; - StartFrame->SystemRoutine = SystemRoutine; +// StartFrame->StartContext = StartContext; +// StartFrame->StartRoutine = StartRoutine; +// StartFrame->SystemRoutine = SystemRoutine; /* And set up the Context Switch Frame */ - CtxSwitchFrame->RetAddr = KiThreadStartup; - CtxSwitchFrame->ApcBypassDisable = TRUE; - CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; +// CtxSwitchFrame->RetAddr = KiThreadStartup; +// CtxSwitchFrame->ApcBypassDisable = TRUE; +// CtxSwitchFrame->ExceptionList = EXCEPTION_CHAIN_END;; /* Save back the new value of the kernel stack. */ Thread->KernelStack = (PVOID)CtxSwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -76,7 +76,7 @@ #define TRAPFLAG_SYSTEMSERVICE (TRAPFLAG_VOLATILES|TRAPFLAG_DEBUG) #define TRAPFLAG_ALL HEX(ff) -/* +/* * Stack Layout: * |-------------------| * | KTRAP_FRAME | @@ -89,7 +89,7 @@ */ /* - * ENTER_TRAP_FRAME - Allocate SIZE_KTRAP_FRAME and save registers to it + * ENTER_TRAP_FRAME - Allocate KTRAP_FRAME_LENGTH and save registers to it */ MACRO(ENTER_TRAP_FRAME, Flags) LOCAL dont_swap @@ -107,8 +107,8 @@ endif /* Make room for a KTRAP_FRAME */ - sub rsp, (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) - .allocstack (SIZE_KTRAP_FRAME - SIZE_INITIAL_FRAME) + sub rsp, (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) + .allocstack (KTRAP_FRAME_LENGTH - SIZE_INITIAL_FRAME) .endprolog /* Save rbp */ @@ -278,12 +278,12 @@ .PROC InternalDispatchException /* Allocate stack space for EXCEPTION_RECORD and KEXCEPTION_FRAME */ - sub rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME - .allocstack (SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME) + sub rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH + .allocstack (EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH) .endprolog /* Set up EXCEPTION_RECORD */ - lea rcx, [rsp + SIZE_KEXCEPTION_FRAME] + lea rcx, [rsp + KEXCEPTION_FRAME_LENGTH] mov [rcx + EXCEPTION_RECORD_ExceptionCode], eax xor rax, rax mov [rcx + EXCEPTION_RECORD_ExceptionFlags], eax @@ -341,7 +341,7 @@ movdqa xmm14, [rsp + KEXCEPTION_FRAME_Xmm14] movdqa xmm15, [rsp + KEXCEPTION_FRAME_Xmm15] - add rsp, SIZE_EXCEPTION_RECORD + SIZE_KEXCEPTION_FRAME + add rsp, EXCEPTION_RECORD_LENGTH + KEXCEPTION_FRAME_LENGTH ret .ENDP InternalDispatchException @@ -516,7 +516,7 @@ KiInvalidOpcodeKernel: /* Kernel mode fault */ - + /* Dispatch the exception */ mov eax, STATUS_ILLEGAL_INSTRUCTION mov edx, 3 @@ -837,7 +837,7 @@ mov r10, 0 mov r11, 0 call InternalDispatchException - + LEAVE_TRAP_FRAME iretq .ENDP KiRaiseAssertion Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -27,10 +27,16 @@ /* GLOBALS *****************************************************************/ /* Template PTE and PDE for a kernel page */ -MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; -MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; -MMPTE PrototypePte = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | PTE_PROTOTYPE | 0xFFFFF000}; +MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; +MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}}; + +/* Template PDE for a demand-zero page */ +MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; +MMPTE DemandZeroPte = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}}; + +/* Template PTE for prototype page */ +MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE; @@ -413,7 +419,7 @@ TmplPte.u.Flush.Write = 1; HyperTemplatePte = TmplPte; - /* Create PDPTs (72 KB) for shared system address space, + /* Create PDPTs (72 KB) for shared system address space, * skip page tables and hyperspace */ /* Loop the PXEs */ @@ -492,7 +498,7 @@ /* Page-align the nonpaged pool size */ MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - + /* Now, check if there was a registry size for the maximum size */ if (!MmMaximumNonPagedPoolInBytes) { @@ -501,7 +507,7 @@ MmMaximumNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / 256 * MmMaxAdditionNonPagedPoolPerMb; } - + /* Don't let the maximum go too high */ if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) { @@ -517,7 +523,7 @@ { /* Put non paged pool after the PFN database */ MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; - MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - + MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - (ULONG64)MmNonPagedPoolStart; } @@ -688,7 +694,7 @@ PMMPTE Pte; MMPTE TmplPte; ULONG Size, BitMapSize; - + /* Default size for paged pool is 4 times non paged pool */ MmSizeOfPagedPoolInBytes = 4 * MmMaximumNonPagedPoolInBytes; @@ -767,7 +773,7 @@ // Allocate the allocation bitmap, which tells us which regions have not yet // been mapped into memory - MmPagedPoolInfo.PagedPoolAllocationMap = + MmPagedPoolInfo.PagedPoolAllocationMap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.PagedPoolAllocationMap); @@ -783,7 +789,7 @@ // Given the allocation bitmap and a base address, we can therefore figure // out which page is the last page of that allocation, and thus how big the // entire allocation is. - MmPagedPoolInfo.EndOfPagedPoolBitmap = + MmPagedPoolInfo.EndOfPagedPoolBitmap = ExAllocatePoolWithTag(NonPagedPool, Size, ' mM'); ASSERT(MmPagedPoolInfo.EndOfPagedPoolBitmap); @@ -859,7 +865,7 @@ //MmPagedPoolSize = MM_PAGED_POOL_SIZE; //ASSERT((PCHAR)MmPagedPoolBase + MmPagedPoolSize < (PCHAR)MmNonPagedSystemStart); - + HalInitializeBios(0, LoaderBlock); } @@ -871,7 +877,7 @@ MiSyncARM3WithROS(IN PVOID AddressStart, IN PVOID AddressEnd) { - + } NTSTATUS Modified: trunk/reactos/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym64.h?rev=50… ============================================================================== --- trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] Thu Feb 10 10:30:43 2011 @@ -10,6 +10,7 @@ #endif +#define IMAGE_FILE_MACHINE_I386 0x14c #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_DIRECTORY_ENTRY_IMPORT 1 #define IMAGE_DIRECTORY_ENTRY_EXCEPTION 3

13 years, 10 months

[fireball] 50639: - Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue. See issue #5870 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 9 21:22:47 2011 New Revision: 50639 URL: http://svn.reactos.org/svn/reactos?rev=50639&view=rev Log: - Add a missing ORing of the registry-loaded GlobalFlags value in ExpInitializeExecutive. Thanks to Robert Horvath for spotting the issue. See issue #5870 for more details. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=506… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Wed Feb 9 21:22:47 2011 @@ -1061,6 +1061,9 @@ if (CmNtCSDReleaseType == 1) CmNtSpBuildNumber |= 1830 << 16; } + /* Add loaded CmNtGlobalFlag value */ + NtGlobalFlag |= CmNtGlobalFlag; + /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KeBugCheck(PHASE0_INITIALIZATION_FAILED); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Wed Feb 9 21:22:47 2011 @@ -1585,6 +1585,7 @@ extern WCHAR CmInstallUILanguageId[]; extern ULONG CmInstallUILanguageIdLength; extern ULONG CmInstallUILanguageIdType; +extern ULONG CmNtGlobalFlag; extern LANGID PsInstallUILanguageId; extern LANGID PsDefaultUILanguageId; extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[];

13 years, 10 months

[fireball] 50638: - Robert Horvath: Add GlobalFlag entry in hivesys_{arch}.inf with the default value 0x0. See issue #5870 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 9 20:50:28 2011 New Revision: 50638 URL: http://svn.reactos.org/svn/reactos?rev=50638&view=rev Log: - Robert Horvath: Add GlobalFlag entry in hivesys_{arch}.inf with the default value 0x0. See issue #5870 for more details. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -886,6 +886,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -740,6 +740,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Feb 9 20:50:28 2011 @@ -979,6 +979,7 @@ ; Session Manager stuff HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","BootExecute", 0x00010000, \ "autocheck autochk *" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","GlobalFlag", 0x00010003, 0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager","ObjectDirectories",0x00010000, \ "\Windows", \ "\RPC Control"

13 years, 10 months

[fireball] 50637: - Robert Horvath: LocalUnlock has to be different from GlobalUnlock. The subtle difference between LocalUnlock and GlobalUnlock, is, that the former will return FALSE and set ERRO...

by fireball＠svn.reactos.org

Author: fireball Date: Wed Feb 9 20:42:44 2011 New Revision: 50637 URL: http://svn.reactos.org/svn/reactos?rev=50637&view=rev Log: - Robert Horvath: LocalUnlock has to be different from GlobalUnlock. The subtle difference between LocalUnlock and GlobalUnlock, is, that the former will return FALSE and set ERROR_NOT_LOCKED on LMEM_FIXED allocations. Fixes 1 kernel32:heap failure. See issue #5869 for more details. Modified: trunk/reactos/dll/win32/kernel32/mem/local.c Modified: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/local.c [iso-8859-1] Wed Feb 9 20:42:44 2011 @@ -441,8 +441,62 @@ NTAPI LocalUnlock(HLOCAL hMem) { - /* This is the same as a Global Unlock */ - return GlobalUnlock(hMem); + PBASE_HEAP_HANDLE_ENTRY HandleEntry; + BOOL RetVal = TRUE; + + /* Check if this was a simple allocated heap entry */ + if (!((ULONG_PTR)hMem & BASE_HEAP_IS_HANDLE_ENTRY)) + { + /* Fail, because LocalUnlock is not supported on LMEM_FIXED allocations */ + SetLastError(ERROR_NOT_LOCKED); + return FALSE; + } + + /* Otherwise, lock the heap */ + RtlLockHeap(hProcessHeap); + + /* Get the handle entry */ + HandleEntry = BaseHeapGetEntry(hMem); + BASE_TRACE_HANDLE(HandleEntry, hMem); + + _SEH2_TRY + { + /* Make sure it's valid */ + if (!BaseHeapValidateEntry(HandleEntry)) + { + /* It's not, fail */ + BASE_TRACE_FAILURE(); + SetLastError(ERROR_INVALID_HANDLE); + RetVal = FALSE; + } + else + { + /* Otherwise, decrement lock count, unless we're already at 0*/ + if (!HandleEntry->LockCount--) + { + /* In which case we simply lock it back and fail */ + HandleEntry->LockCount++; + SetLastError(ERROR_NOT_LOCKED); + RetVal = FALSE; + } + else if (!HandleEntry->LockCount) + { + /* Nothing to unlock */ + SetLastError(NO_ERROR); + RetVal = FALSE; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_PARAMETER); + RetVal = FALSE; + } + _SEH2_END + + /* All done. Unlock the heap and return the pointer */ + RtlUnlockHeap(hProcessHeap); + return RetVal; } /* EOF */

13 years, 10 months

← Newer
1
...
27
28
29
30
31
32
33
...
36
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 February 2011