* Sync up to trunk head (r64829).

svn path=/branches/shell-experiments/; revision=64830
This commit is contained in:
Amine Khaldi 2014-10-19 18:45:40 +00:00
commit 609ba8d717
709 changed files with 6443 additions and 5701 deletions

View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8.12)
if(POLICY CMP0017)
# Shadow cmake provided modules

View file

@ -1,10 +1,8 @@
set_cpp()
add_definitions(-DUSER_MODE)
include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata)
add_executable(atactl atactl.cpp atactl.rc)
set_module_type(atactl win32cui)
add_importlibs(atactl advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all)

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,10 +1,6 @@
add_executable(cmd_help
help.c
help.rc)
add_executable(cmd_help help.c help.rc)
set_module_type(cmd_help win32cui UNICODE)
add_importlibs(cmd_help msvcrt kernel32 user32)
add_importlibs(cmd_help user32 msvcrt kernel32)
set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help")
add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_executable(hostname hostname.c hostname.rc)
set_module_type(hostname win32cui UNICODE)
add_importlibs(hostname user32 msvcrt kernel32)
add_cd_file(TARGET hostname DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
add_executable(lodctr lodctr_main.c)
set_module_type(lodctr win32cui UNICODE)
add_importlibs(lodctr loadperf msvcrt kernel32)
add_cd_file(TARGET lodctr DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(mode mode.c mode.rc)
set_module_type(mode win32cui UNICODE)
set_target_properties(mode PROPERTIES SUFFIX ".com")
add_importlibs(mode user32 msvcrt kernel32)
add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(more more.c more.rc)
set_module_type(more win32cui)
set_target_properties(more PROPERTIES SUFFIX ".com")
add_importlibs(more user32 msvcrt kernel32)
add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

View file

@ -1,3 +1,9 @@
/*
Translators: Claudia Cotună
Michael Stefaniuc
Ștefan Fulea (stefan dot fulea at mail dot md)
*/
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
@ -6,7 +12,7 @@ STRINGTABLE
STRING_ADD_USAGE, "REG ADD nume_cheie [/v nume_valoare | /ve] [/t tip] [/s separator] [/d date] [/f]\n"
STRING_DELETE_USAGE, "REG DELETE nume_cheie [/v nume_valoare | /ve | /va] [/f]\n"
STRING_QUERY_USAGE, "REG QUERY nume_cheie [/v nume_valoare | /ve] [/s]\n"
STRING_SUCCESS, "Operațiunea a fost finalizată cu succes\n"
STRING_SUCCESS, "Operația a fost îndeplinită cu succes\n"
STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n"
STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"

View file

@ -4,7 +4,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
{
STRING_USAGE, "Usage: taskkill [/?] [/f] [/im NumeProces | /pid IdProces]\n"
STRING_USAGE, "Utilizare: taskkill [/?] [/f] [/im NumeProces | /pid IdProces]\n"
STRING_INVALID_OPTION, "Eroare: Opțiune specificată nevalidă sau necunoscută.\n"
STRING_INVALID_PARAM, "Eroare: Parametrul de comandă specificat este nevalid.\n"
STRING_MISSING_OPTION, "Eroare: Trebuie specificată una dintre opțiunile /im sau /pid.\n"

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -1,6 +1,5 @@
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
list(APPEND SOURCE

View file

@ -4,7 +4,7 @@
* FILE: base/applications/games/solitaire/lang/ro-RO.rc
* PURPOSE: Romanian Language File for Solitaire
* TRANSLATORS:
* Petre Dumitriu
* Petru Dumitriu (petrimetri at gmail dot com)
* Ștefan Fulea (stefan dot fulea at mail dot md)
*/

View file

@ -3,7 +3,7 @@
* LICENSE: See COPYING in top level directory
* FILE: base/applications/games/spider/lang/tr-TR.rc
* PURPOSE: Turkish Resource File for ReactOS Spider Solitaire
* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
*/
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATORS: 2006 Fatih Aşıcı, 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATORS: 2006 Fatih Aşıcı; 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -3,4 +3,5 @@ add_executable(kbswitch kbswitch.c kbswitch.rc)
set_module_type(kbswitch win32gui UNICODE)
add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
add_subdirectory(kbsdll)

View file

@ -1,5 +1,4 @@
spec2def(kbsdll.dll kbsdll.spec)
list(APPEND SOURCE
@ -8,7 +7,6 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
add_library(kbsdll SHARED ${SOURCE})
set_module_type(kbsdll win32dll UNICODE)
add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -3,7 +3,7 @@
* LICENSE: GPL - See COPYING in the top level directory
* FILE: base/applications/magnify/lang/tr-TR.rc
* PURPOSE: Turkish Resource File for RecatOS Magnifier
* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
*/
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -15,16 +15,16 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "I&eșire", IDM_EXIT
END
POPUP "&Play"
POPUP "&Lectură"
BEGIN
MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
MENUITEM "St&op\tCtrl+S", IDC_STOP
MENUITEM "Lecturează/&Pauză\tCtrl+P", IDC_PLAY
MENUITEM "&Oprește\tCtrl+S", IDC_STOP
MENUITEM SEPARATOR
MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
MENUITEM "&Repetă\tCtrl+T", IDM_REPEAT
END
POPUP "&View"
POPUP "&Afișare"
BEGIN
MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
MENUITEM "&Mod fereastră-solitară", IDM_SWITCHVIEW
END
POPUP "&Dispozitiv"
BEGIN

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -2,7 +2,9 @@
add_executable(eventvwr eventvwr.c eventvwr.rc)
set_module_type(eventvwr win32gui UNICODE)
add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(eventvwr ntdll)
endif()
add_cd_file(TARGET eventvwr DESTINATION reactos/system32 FOR all)

View file

@ -1,4 +1,7 @@
/* 2011.10.19 - Fulea Ștefan: minor changes */
/*
Translators: Petru Dumitriu (petrimetri at gmail dot com)
Ștefan Fulea (stefan dot fulea at mail dot md)
*/
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@ -14,28 +17,28 @@ BEGIN
BEGIN
MENUITEM "Co&nectare la…", ID_CONNECT, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Pornește", ID_START, GRAYED
MENUITEM "P&ornește", ID_START, GRAYED
MENUITEM "&Oprește", ID_STOP, GRAYED
MENUITEM "&Suspendă", ID_PAUSE, GRAYED
MENUITEM "Contin&uă", ID_RESUME, GRAYED
MENUITEM "S&uspendă", ID_PAUSE, GRAYED
MENUITEM "&Continuă", ID_RESUME, GRAYED
MENUITEM "&Repornește", ID_RESTART, GRAYED
MENUITEM SEPARATOR
MENUITEM "Împrospătea&ză", ID_REFRESH
MENUITEM SEPARATOR
MENUITEM "Mo&dificare…", ID_EDIT, GRAYED
MENUITEM "&Creare…", ID_CREATE, GRAYED
MENUITEM "Cre&are…", ID_CREATE, GRAYED
MENUITEM "&Eliminare…", ID_DELETE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Propr&ietăți…", ID_PROP, GRAYED
MENUITEM "&Proprietăți…", ID_PROP, GRAYED
END
POPUP "&Afișare"
BEGIN
MENUITEM "Pictograme m&ari", ID_VIEW_LARGE
MENUITEM "Pictograme m&ici", ID_VIEW_SMALL
MENUITEM "D&ale", ID_VIEW_LARGE
MENUITEM "&Pictograme", ID_VIEW_SMALL
MENUITEM "&Listă", ID_VIEW_LIST
MENUITEM "&Detalii", ID_VIEW_DETAILS
MENUITEM SEPARATOR
MENUITEM "&Particularizare…", ID_VIEW_CUST, GRAYED
MENUITEM "Pa&rticularizare…", ID_VIEW_CUST, GRAYED
END
POPUP "&?"
BEGIN
@ -48,10 +51,10 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM "&Pornește", ID_START, GRAYED
MENUITEM "P&ornește", ID_START, GRAYED
MENUITEM "&Oprește", ID_STOP, GRAYED
MENUITEM "&Suspendă", ID_PAUSE, GRAYED
MENUITEM "Contin&uă", ID_RESUME, GRAYED
MENUITEM "S&uspendă", ID_PAUSE, GRAYED
MENUITEM "&Continuă", ID_RESUME, GRAYED
MENUITEM "&Repornește", ID_RESTART, GRAYED
MENUITEM SEPARATOR
MENUITEM "Împrospătea&ză", ID_REFRESH
@ -59,7 +62,7 @@ BEGIN
MENUITEM "Mo&dificare…", ID_EDIT, GRAYED
MENUITEM "&Eliminare…", ID_DELETE, GRAYED
MENUITEM SEPARATOR
MENUITEM "Propr&ietăți…", ID_PROP, GRAYED
MENUITEM "&Proprietăți…", ID_PROP, GRAYED
MENUITEM SEPARATOR
MENUITEM "&Manual…", ID_HELP
END
@ -86,10 +89,10 @@ BEGIN
EDITTEXT IDC_DESCRIPTION, 70, 46, 176, 24, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_READONLY
EDITTEXT IDC_EXEPATH, 6, 86, 240, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_READONLY
COMBOBOX IDC_START_TYPE, 70, 107, 176, 40, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST
PUSHBUTTON "&Pornește", IDC_START, 6, 155, 54, 15, WS_DISABLED
PUSHBUTTON "P&ornește", IDC_START, 6, 155, 54, 15, WS_DISABLED
PUSHBUTTON "&Oprește", IDC_STOP, 68, 155, 54, 15, WS_DISABLED
PUSHBUTTON "&Suspendă", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED
PUSHBUTTON "Contin&uă", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
PUSHBUTTON "S&uspendă", IDC_PAUSE, 130, 155, 54, 15, WS_DISABLED
PUSHBUTTON "&Continuă", IDC_RESUME, 192, 155, 54, 15, WS_DISABLED
LTEXT "Nume serviciu:", IDC_STATIC, 4, 11, 53, 11
LTEXT "Nume afișat:", IDC_STATIC, 4, 29, 53, 11
LTEXT "Descriere:", IDC_STATIC, 4, 51, 53, 11
@ -100,7 +103,7 @@ BEGIN
LTEXT "Aici se pot specifica parametrii de pornire aplicabili lansării serviciului.", IDC_STATIC, 6, 177, 240, 15
LTEXT "Parametri de pornire:", IDC_STATIC, 6, 200, 68, 11
EDITTEXT IDC_START_PARAM, 78, 199, 168, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
PUSHBUTTON "&Editare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
PUSHBUTTON "Mo&dificare", IDC_EDIT, 192, 215, 54, 15, WS_DISABLED
END
IDD_DLG_DEPEND DIALOGEX 6, 6, 253, 225
@ -150,7 +153,7 @@ BEGIN
LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15
EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL |
WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY
PUSHBUTTON "&Da", IDOK, 26, 129, 54, 13
PUSHBUTTON "D&a", IDOK, 26, 129, 54, 13
DEFPUSHBUTTON "N&u", IDCANCEL, 102, 129, 54, 13
END
@ -163,7 +166,7 @@ BEGIN
LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25
LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL
LTEXT "Doriți oprirea acestor servicii?", IDC_STATIC, 15, 110, 150, 10
DEFPUSHBUTTON "&Da", IDOK, 60, 129, 54, 14
DEFPUSHBUTTON "D&a", IDOK, 60, 129, 54, 14
PUSHBUTTON "N&u", IDCANCEL, 120, 129, 54, 14
END

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -13,13 +13,13 @@ BEGIN
POPUP "&Fișier"
BEGIN
MENUITEM "&Nou\tCtrl+N", IDM_FILENEW
MENUITEM "&Deschidere…\tCtrl+D", IDM_FILEOPEN
MENUITEM "Pă&strează\tCtrl+S", IDM_FILESAVE
MENUITEM "&Păstrare în…", IDM_FILESAVEAS
MENUITEM "&Deschidere…\tCtrl+O", IDM_FILEOPEN
MENUITEM "&Păstrează\tCtrl+S", IDM_FILESAVE
MENUITEM "Păst&rare în…", IDM_FILESAVEAS
MENUITEM SEPARATOR
MENUITEM "Pune pe fundal (în ca&rou)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Pune pe fundal (&centrată)", IDM_FILEASWALLPAPERCENTERED
MENUITEM "Pune pe fundal (e&xtinsă)", IDM_FILEASWALLPAPERSTRETCHED
MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE
MENUITEM "Decor de birou (&centrat)", IDM_FILEASWALLPAPERCENTERED
MENUITEM "Decor de birou (e&xtins)", IDM_FILEASWALLPAPERSTRETCHED
MENUITEM SEPARATOR
MENUITEM "I&eșire\tAlt+F4", IDM_FILEEXIT
END
@ -32,11 +32,11 @@ BEGIN
MENUITEM "&Copiază\tCtrl+C", IDM_EDITCOPY
MENUITEM "&Lipește\tCtrl+V", IDM_EDITPASTE
MENUITEM "Șt&erge selecția\tDel", IDM_EDITDELETESELECTION
MENUITEM "&Inversează selecția", IDM_EDITINVERTSELECTION
MENUITEM "In&versează selecția", IDM_EDITINVERTSELECTION
MENUITEM "Selecte&ază tot\tCtrl+A", IDM_EDITSELECTALL
MENUITEM SEPARATOR
MENUITEM "C&opiere în…", IDM_EDITCOPYTO
MENUITEM "L&ipire din…", IDM_EDITPASTEFROM
MENUITEM "Lipire di&n…", IDM_EDITPASTEFROM
END
POPUP "&Afișare"
BEGIN
@ -63,15 +63,15 @@ BEGIN
END
MENUITEM "Pe t&ot ecranul\tCtrl+F", IDM_VIEWFULLSCREEN
END
POPUP "&Imagine"
POPUP "I&magine"
BEGIN
MENUITEM "R&otire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR
MENUITEM "&Rotire/Oglindire…\tCtrl+R", IDM_IMAGEROTATEMIRROR
MENUITEM "Întin&dere/Înclinare…\tCtrl+W", IDM_IMAGESTRETCHSKEW
MENUITEM "&Recoltează", IDM_IMAGECROP
MENUITEM "Recoltea&ză", IDM_IMAGECROP
MENUITEM "In&versează culorile\tCtrl+I", IDM_IMAGEINVERTCOLORS
MENUITEM "&Atribute…\tCtrl+E", IDM_IMAGEATTRIBUTES
MENUITEM "Șt&erge imaginea", IDM_IMAGEDELETEIMAGE
MENUITEM "&Mod opac", IDM_IMAGEDRAWOPAQUE
MENUITEM "Mod &opac", IDM_IMAGEDRAWOPAQUE
END
POPUP "&Culori"
BEGIN
@ -91,7 +91,7 @@ END
ID_ACCELERATORS ACCELERATORS
BEGIN
"^N", IDM_FILENEW
"^D", IDM_FILEOPEN
"^O", IDM_FILEOPEN
"^S", IDM_FILESAVE
"^Z", IDM_EDITUNDO
"^Y", IDM_EDITREDO
@ -151,7 +151,7 @@ BEGIN
AUTORADIOBUTTON "Color", IDD_ATTRIBUTESRB5, 92, 100, 35, 10
DEFPUSHBUTTON "Con&firmă", IDOK, 170, 8, 48, 14
PUSHBUTTON "A&nulează", IDCANCEL, 170, 24, 48, 14
PUSHBUTTON "I&mplicite", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14
PUSHBUTTON "Impli&cite", IDD_ATTRIBUTESSTANDARD, 170, 40, 48, 14
END
IDD_STRETCHSKEW DIALOGEX 100, 100, 225, 150
@ -161,20 +161,20 @@ CAPTION "Întindere și înclinare imagine"
BEGIN
GROUPBOX "Întindere", IDD_STRETCHSKEWGROUPSTRETCH, 6, 6, 158, 66
ICON IDI_HORZSTRETCH, IDD_STRETCHSKEWICONHSTRETCH, 12, 18, 32, 32
LTEXT "Orizontală:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10
LTEXT "&Orizontală:", IDD_STRETCHSKEWTEXTHSTRETCH, 45, 24, 40, 10
EDITTEXT IDD_STRETCHSKEWEDITHSTRETCH, 90, 23, 32, 12
LTEXT "%", IDD_STRETCHSKEWTEXTHPERCENT, 125, 24, 15, 10
ICON IDI_VERTSTRETCH, IDD_STRETCHSKEWICONVSTRETCH, 12, 43, 32, 32
LTEXT "Verticală:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10
LTEXT "&Verticală:", IDD_STRETCHSKEWTEXTVSTRETCH, 45, 49, 40, 10
EDITTEXT IDD_STRETCHSKEWEDITVSTRETCH, 90, 48, 32, 12
LTEXT "%", IDD_STRETCHSKEWTEXTVPERCENT, 125, 49, 15, 10
GROUPBOX "Înclinare", IDD_STRETCHSKEWGROUPSKEW, 6, 76, 158, 66
ICON IDI_HORZSKEW, IDD_STRETCHSKEWICONHSKEW, 12, 88, 32, 32
LTEXT "Orizontală:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10
LTEXT "Ori&zontală:", IDD_STRETCHSKEWTEXTHSKEW, 45, 94, 40, 10
EDITTEXT IDD_STRETCHSKEWEDITHSKEW, 90, 93, 32, 12
LTEXT "grade", IDD_STRETCHSKEWTEXTHDEG, 125, 94, 30, 10
ICON IDI_VERTSKEW, IDD_STRETCHSKEWICONVSKEW, 12, 113, 32, 32
LTEXT "Verticală:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10
LTEXT "V&erticală:", IDD_STRETCHSKEWTEXTVSKEW, 45, 119, 40, 10
EDITTEXT IDD_STRETCHSKEWEDITVSKEW, 90, 118, 32, 12
LTEXT "grade", IDD_STRETCHSKEWTEXTVDEG, 125, 119, 30, 10
DEFPUSHBUTTON "Con&firmă", IDOK, 170, 8, 48, 14

View file

@ -3,7 +3,7 @@
* LICENSE: LGPL
* FILE: base/applications/mspaint/lang/tr-TR.rc
* PURPOSE: Turkish Resource file for ReactOS Paint
* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
*/
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,8 +1,5 @@
add_executable(arp arp.c arp.rc)
set_module_type(arp win32cui)
add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all)

View file

@ -1,12 +1,9 @@
add_executable(dwnl dwnl.c)
set_module_type(dwnl win32cui UNICODE)
target_link_libraries(dwnl uuid)
add_importlibs(dwnl urlmon wininet msvcrt kernel32)
if(MSVC)
add_importlibs(dwnl ntdll)
endif()

View file

@ -1,8 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
add_executable(netsh netsh.c)
target_link_libraries(netsh wine)
set_module_type(netsh win32cui UNICODE)

View file

@ -2,8 +2,10 @@
add_definitions(-D__USE_W32_SOCKETS)
add_executable(ping ping.c ping.rc)
set_module_type(ping win32cui UNICODE)
add_importlibs(ping ws2_32 msvcrt kernel32)
add_importlibs(ping user32 ws2_32 msvcrt kernel32)
if(MSVC)
add_importlibs(ping ntdll)
endif()
add_cd_file(TARGET ping DESTINATION reactos/system32 FOR all)

View file

@ -114,30 +114,6 @@ static VOID DisplayBuffer(
}
#endif /* !NDEBUG */
LPWSTR
MyLoadString(UINT uID)
{
HRSRC hres;
HGLOBAL hResData;
WCHAR *pwsz;
UINT string_num, i;
hres = FindResourceW(NULL, MAKEINTRESOURCEW((LOWORD(uID) >> 4) + 1), RT_STRING);
if (!hres) return NULL;
hResData = LoadResource(NULL, hres);
if (!hResData) return NULL;
pwsz = LockResource(hResData);
if (!pwsz) return NULL;
string_num = uID & 15;
for (i = 0; i < string_num; i++)
pwsz += *pwsz + 1;
return pwsz + 1;
}
void FormatOutput(UINT uID, ...)
{
va_list valist;
@ -146,15 +122,18 @@ void FormatOutput(UINT uID, ...)
CHAR AnsiBuf[1024];
LPWSTR pBuf = Buf;
PCHAR pAnsiBuf = AnsiBuf;
LPWSTR Format;
WCHAR Format[1024];
DWORD written;
UINT DataLength;
int AnsiLength;
va_start(valist, uID);
Format = MyLoadString(uID);
if (!Format) return;
if (!LoadString(GetModuleHandle(NULL), uID,
Format, sizeof(Format) / sizeof(WCHAR)))
{
return;
}
DataLength = FormatMessage(FORMAT_MESSAGE_FROM_STRING, Format, 0, 0, Buf,\
sizeof(Buf) / sizeof(WCHAR), &valist);
@ -272,7 +251,7 @@ static BOOL ParseCmdline(int argc, LPWSTR argv[])
if (i + 1 < argc)
{
DataSize = wcstoul(argv[++i], NULL, 0);
if (DataSize > ICMP_MAXSIZE - sizeof(ICMP_ECHO_PACKET) - sizeof(IPv4_HEADER))
{
FormatOutput(IDS_BAD_VALUE_OPTION_L, ICMP_MAXSIZE - \
@ -484,7 +463,7 @@ static VOID QueryTime(PLARGE_INTEGER Time)
}
}
static VOID TimeToMsString(LPWSTR String, LARGE_INTEGER Time)
static VOID TimeToMsString(LPWSTR String, ULONG Length, LARGE_INTEGER Time)
{
WCHAR Convstr[40];
LARGE_INTEGER LargeTime;
@ -494,8 +473,8 @@ static VOID TimeToMsString(LPWSTR String, LARGE_INTEGER Time)
_i64tow(LargeTime.QuadPart, Convstr, 10);
wcscpy(String, Convstr);
ms = MyLoadString(IDS_MS);
wcscat(String, ms);
ms = String + wcslen(String);
LoadString(GetModuleHandle(NULL), IDS_MS, ms, Length - (ms - String));
}
/* Locate the ICMP data and print it. Returns TRUE if the packet was good,
@ -555,16 +534,13 @@ static BOOL DecodeResponse(PCHAR buffer, UINT size, PSOCKADDR_IN from)
if ((RelativeTime.QuadPart / TicksPerMs.QuadPart) < 1)
{
LPWSTR ms1;
wcscpy(Sign, L"<");
ms1 = MyLoadString(IDS_1MS);
wcscpy(Time, ms1);
LoadString(GetModuleHandle(NULL), IDS_1MS, Time, sizeof(Time) / sizeof(WCHAR));
}
else
{
wcscpy(Sign, L"=");
TimeToMsString(Time, RelativeTime);
TimeToMsString(Time, sizeof(Time) / sizeof(WCHAR), RelativeTime);
}
@ -740,9 +716,9 @@ int wmain(int argc, LPWSTR argv[])
if (!MinRTTSet)
MinRTT = MaxRTT;
TimeToMsString(MinTime, MinRTT);
TimeToMsString(MaxTime, MaxRTT);
TimeToMsString(AvgTime, AvgRTT);
TimeToMsString(MinTime, sizeof(MinTime) / sizeof(WCHAR), MinRTT);
TimeToMsString(MaxTime, sizeof(MaxTime) / sizeof(WCHAR), MaxRTT);
TimeToMsString(AvgTime, sizeof(AvgTime) / sizeof(WCHAR), AvgRTT);
/* Print statistics */
FormatOutput(IDS_PING_STATISTICS, TargetIP);

View file

@ -1,7 +1,5 @@
add_executable(route route.c route.rc)
set_module_type(route win32cui UNICODE)
add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
add_cd_file(TARGET route DESTINATION reactos/system32 FOR all)

View file

@ -1,13 +1,11 @@
add_definitions(-D__USE_W32_SOCKETS)
add_executable(tracert tracert.c tracert.rc)
set_module_type(tracert win32cui)
add_importlibs(tracert ws2_32 msvcrt kernel32)
if(MSVC)
add_importlibs(tracert ntdll)
add_importlibs(tracert ntdll)
endif()
add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_executable(whois whois.c whois.rc)
set_module_type(whois win32cui)
add_importlibs(whois ws2_32 msvcrt kernel32)
add_cd_file(TARGET whois DESTINATION reactos/system32 FOR all)

View file

@ -2,8 +2,8 @@
include_directories(
BEFORE include
${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio)
add_executable(wlanconf wlanconf.c wlanconf.rc)
add_executable(wlanconf wlanconf.c wlanconf.rc)
set_module_type(wlanconf win32cui UNICODE)
add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32)
add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all)

View file

@ -1,3 +1,8 @@
/*
Translators: Petru Dumitriu (petrimetri at gmail dot com)
Ștefan Fulea (stefan dot fulea at mail dot md)
*/
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
ID_ACCEL ACCELERATORS
@ -8,7 +13,7 @@ BEGIN
"^G", CMD_GOTO
"H", CMD_REPLACE, VIRTKEY, CONTROL
"^N", CMD_NEW
"^D", CMD_OPEN
"^O", CMD_OPEN
"^P", CMD_PRINT
"^S", CMD_SAVE
"^V", CMD_PASTE
@ -23,13 +28,13 @@ BEGIN
POPUP "&Fișier"
BEGIN
MENUITEM "&Nou\tCtrl+N", CMD_NEW
MENUITEM "&Deschidere…\tCtrl+D", CMD_OPEN
MENUITEM "Pă&strează\tCtrl+S", CMD_SAVE
MENUITEM "&Păstrare în…", CMD_SAVE_AS
MENUITEM "&Deschidere…\tCtrl+O", CMD_OPEN
MENUITEM "&Păstrează\tCtrl+S", CMD_SAVE
MENUITEM "Păst&rare în…", CMD_SAVE_AS
MENUITEM SEPARATOR
MENUITEM "&Configurare pagină…", CMD_PAGE_SETUP
MENUITEM "&Imprimă\tCtrl+P", CMD_PRINT
MENUITEM "Configurare i&mprimantă…", CMD_PRINTER_SETUP
MENUITEM "I&mprimă\tCtrl+P", CMD_PRINT
MENUITEM "C&onfigurare imprimantă…", CMD_PRINTER_SETUP
MENUITEM SEPARATOR
MENUITEM "I&eșire", CMD_EXIT
END
@ -45,9 +50,9 @@ BEGIN
MENUITEM "&Găsire…\tCtrl+F", CMD_SEARCH
MENUITEM "Găsește &următoarea\tF3", CMD_SEARCH_NEXT
MENUITEM "Î&nlocuiește\tCtrl+H", CMD_REPLACE
MENUITEM "&Salt la…\tCtrl+G", CMD_GOTO
MENUITEM "S&alt la…\tCtrl+G", CMD_GOTO
MENUITEM SEPARATOR
MENUITEM "Selecte&ază tot\tCtrl+A", CMD_SELECT_ALL
MENUITEM "Selectea&ză tot\tCtrl+A", CMD_SELECT_ALL
MENUITEM "Inserează &oră și dată\tF5", CMD_TIME_DATE
END
POPUP "F&ormatare"
@ -76,12 +81,12 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg"
CAPTION "Configurare pagină"
BEGIN
LTEXT "&Antet:", 0x140, 10, 07, 40, 15
LTEXT "Ant&et:", 0x140, 10, 07, 40, 15
EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP
LTEXT "&Subsol:", 0x142, 10, 24, 40, 15
LTEXT "Su&bsol:", 0x142, 10, 24, 40, 15
EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP
GROUPBOX "&Margini:", 0x144, 10, 43, 160, 45
LTEXT "S&tânga:", 0x145, 20, 55, 30, 10, WS_CHILD
GROUPBOX "Margini:", 0x144, 10, 43, 160, 45
LTEXT "Stâng&a:", 0x145, 20, 55, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP
LTEXT "S&us:", 0x148, 20, 73, 30, 10, WS_CHILD
EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP

View file

@ -1,4 +1,4 @@
/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu@gmail.com), 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu@gmail.com); 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -65,13 +65,13 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Generale", -1, 4, 2, 240, 61
AUTOCHECKBOX "&Păstrează poziția ferestrei", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12
AUTOCHECKBOX "&Actualizează la pornire lista aplicațiilor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
AUTOCHECKBOX "&Menține jurnal de instalare/dezinstalare a aplicațiilor", IDC_LOG_ENABLED, 15, 46, 219, 12
AUTOCHECKBOX "&Actualizează la pornire lista programelor disponibile", IDC_UPDATE_AVLIST, 15, 29, 222, 12
AUTOCHECKBOX "&Menține jurnal de instalare/dezinstalare a programelor", IDC_LOG_ENABLED, 15, 46, 219, 12
GROUPBOX "Descărcări", -1, 4, 65, 240, 51
LTEXT "Dosarul pentru descărcări:", -1, 16, 75, 100, 9
EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL
PUSHBUTTON "Spe&cificare…", IDC_CHOOSE, 187, 85, 50, 14
AUTOCHECKBOX "Șt&erge instalatorul aplicației după instalare", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
AUTOCHECKBOX "Șt&erge aplicația de instalare după instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12
PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14
PUSHBUTTON "Con&firmă", IDOK, 116, 124, 60, 14
PUSHBUTTON "A&nulează", IDCANCEL, 181, 124, 60, 14

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,5 +1,5 @@
add_executable(setup16 main.c)
set_module_type(setup16 win32gui UNICODE)
add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi)
add_importlibs(setup16 user32 gdi32 advapi32 shell32 setupapi msvcrt kernel32)
add_cd_file(TARGET setup16 DESTINATION reactos/system32 FOR all)

View file

@ -7,6 +7,6 @@ list(APPEND SOURCE
add_executable(shutdown ${SOURCE} shutdown.rc)
set_module_type(shutdown win32cui UNICODE)
add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32)
add_importlibs(shutdown advapi32 user32 powrprof msvcrt kernel32)
add_pch(shutdown precomp.h SOURCE)
add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all)

View file

@ -14,6 +14,6 @@ list(APPEND SOURCE
add_executable(sndrec32 ${SOURCE} rsrc.rc)
set_module_type(sndrec32 win32gui UNICODE)
add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32)
add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 shell32 msvcrt kernel32)
add_pch(sndrec32 stdafx.h SOURCE)
add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all)

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,8 @@
/* Ștefan Fulea (stefan dot fulea at mail dot md) */
/*
Translators: Petru Dumitriu (petrimetri at gmail dot com)
Ștefan Fulea (stefan dot fulea at mail dot md)
*/
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
@ -28,37 +32,37 @@ BEGIN
MENUITEM "&Stagnantă", ID_VIEW_UPDATESPEED_PAUSED
END
MENUITEM SEPARATOR
MENUITEM "Pictograme m&ari", ID_VIEW_LARGE
MENUITEM "Pictograme m&ici", ID_VIEW_SMALL
MENUITEM "D&ale", ID_VIEW_LARGE
MENUITEM "&Pictograme", ID_VIEW_SMALL
MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED
MENUITEM "&Selectare coloane…", ID_VIEW_SELECTCOLUMNS
POPUP "Istoric &procesor"
MENUITEM "Selectare &coloane…", ID_VIEW_SELECTCOLUMNS
POPUP "Ist&oric procesor"
BEGIN
MENUITEM "Grafic general &comun", ID_VIEW_CPUHISTORY_ONEGRAPHALL
MENUITEM "Grafice &individuale", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
MENUITEM "Grafice indi&viduale", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU, CHECKED
END
MENUITEM "Afișează &timpi nucleu", ID_VIEW_SHOWKERNELTIMES
MENUITEM "Afișea&ză timpi nucleu", ID_VIEW_SHOWKERNELTIMES
END
POPUP "F&erestre"
POPUP "Fe&restre"
BEGIN
MENUITEM "Aranjări &orizontale", ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Aranjări &verticale", ID_WINDOWS_TILEVERTICALLY
MENUITEM "Mi&nimizează", ID_WINDOWS_MINIMIZE
MENUITEM "Ma&ximizează", ID_WINDOWS_MAXIMIZE
MENUITEM "Aranjări în casca&dă", ID_WINDOWS_CASCADE
MENUITEM "&Aduce în prim plan", ID_WINDOWS_BRINGTOFRONT
MENUITEM "Ad&uce în prim plan", ID_WINDOWS_BRINGTOFRONT
END
POPUP "Sh&ut Down"
POPUP "Î&nchidere calculator"
BEGIN
MENUITEM "Stand &By", ID_SHUTDOWN_STANDBY
MENUITEM "&Hibernate", ID_SHUTDOWN_HIBERNATE
MENUITEM "T&urn Off", ID_SHUTDOWN_POWEROFF
MENUITEM "&Restart", ID_SHUTDOWN_REBOOT
MENUITEM "&Log Off %s", ID_SHUTDOWN_LOGOFF
MENUITEM "&Switch User\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
MENUITEM "Loc&k Computer\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
MENUITEM "&Disconnect", ID_SHUTDOWN_DISCONNECT, GRAYED
MENUITEM "&Eject Computer", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
MENUITEM "Intră în starea de &veche", ID_SHUTDOWN_STANDBY
MENUITEM "Intră în &hibernare", ID_SHUTDOWN_HIBERNATE
MENUITEM "Î&nchide calculatorul", ID_SHUTDOWN_POWEROFF
MENUITEM "&Repornește calculatorul", ID_SHUTDOWN_REBOOT
MENUITEM "&Deautentifică-mă (%s)", ID_SHUTDOWN_LOGOFF
MENUITEM "&Comută utilizator\tWinKey+L", ID_SHUTDOWN_SWITCHUSER, GRAYED
MENUITEM "&Blochează calculatorul\tWinKey+L", ID_SHUTDOWN_LOCKCOMPUTER
MENUITEM "Deconectea&ză", ID_SHUTDOWN_DISCONNECT, GRAYED
MENUITEM "&Elimină calculator", ID_SHUTDOWN_EJECT_COMPUTER, GRAYED
END
POPUP "&?"
BEGIN
@ -84,8 +88,8 @@ BEGIN
BEGIN
MENUITEM "Activitate nouă (E&xecutare…)", ID_FILE_NEW
MENUITEM SEPARATOR
MENUITEM "Pictograme m&ari", ID_VIEW_LARGE
MENUITEM "Pictograme m&ici", ID_VIEW_SMALL
MENUITEM "D&ale", ID_VIEW_LARGE
MENUITEM "&Pictograme", ID_VIEW_SMALL
MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED
END
END
@ -95,7 +99,7 @@ BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "&Comută la", ID_APPLICATION_PAGE_SWITCHTO
MENUITEM "&Aduce în prim plan", ID_WINDOWS_BRINGTOFRONT
MENUITEM "Ad&uce în prim-plan", ID_WINDOWS_BRINGTOFRONT
MENUITEM SEPARATOR
MENUITEM "Aranjări &orizontale", ID_WINDOWS_TILEHORIZONTALLY
MENUITEM "Aranjări &verticale", ID_WINDOWS_TILEVERTICALLY
@ -103,8 +107,8 @@ BEGIN
MENUITEM "Ma&ximizează", ID_WINDOWS_MAXIMIZE
MENUITEM "Aranjări în casca&dă", ID_WINDOWS_CASCADE
MENUITEM SEPARATOR
MENUITEM "Op&rește", ID_APPLICATION_PAGE_ENDTASK
MENUITEM "&Salt la proces", ID_APPLICATION_PAGE_GOTOPROCESS
MENUITEM "Opr&ește", ID_APPLICATION_PAGE_ENDTASK
MENUITEM "S&alt la proces", ID_APPLICATION_PAGE_GOTOPROCESS
END
END
@ -123,16 +127,16 @@ IDR_PROCESS_PAGE_CONTEXT MENU
BEGIN
POPUP "DUMMY"
BEGIN
MENUITEM "Op&rește procesul", ID_PROCESS_PAGE_ENDPROCESS
MENUITEM "Opr&ește procesul", ID_PROCESS_PAGE_ENDPROCESS
MENUITEM "Oprește &arborele de procese", ID_PROCESS_PAGE_ENDPROCESSTREE
MENUITEM "&Depanează", ID_PROCESS_PAGE_DEBUG
MENUITEM SEPARATOR
POPUP "&Stabilire prioritate"
POPUP "Sta&bilire prioritate"
BEGIN
MENUITEM "Prioritate de &timp real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
MENUITEM "Prioritate î&naltă", ID_PROCESS_PAGE_SETPRIORITY_HIGH
MENUITEM "Regim p&rioritar", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
MENUITEM "Regim n&ormal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL
MENUITEM "Prioritate de timp &real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME
MENUITEM "Prioritate în&altă", ID_PROCESS_PAGE_SETPRIORITY_HIGH
MENUITEM "Regim pri&oritar", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL
MENUITEM "Regim &normal", ID_PROCESS_PAGE_SETPRIORITY_NORMAL
MENUITEM "Regim n&eprioritar", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL
MENUITEM "Prioritate &minimă", ID_PROCESS_PAGE_SETPRIORITY_LOW
END
@ -163,7 +167,7 @@ BEGIN
WS_BORDER | WS_TABSTOP, 7, 7, 233, 177
PUSHBUTTON "E&xecutare…", IDC_NEWTASK, 187, 189, 53, 14
PUSHBUTTON "&Comută la", IDC_SWITCHTO, 131, 189, 53, 14, WS_DISABLED
PUSHBUTTON "&Temină", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
PUSHBUTTON "Închid&e", IDC_ENDTASK, 75, 189, 53, 14, WS_DISABLED
END
IDD_PROCESS_PAGE DIALOGEX 0, 0, 247, 210
@ -172,7 +176,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "List2", IDC_PROCESSLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL |
LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 7, 233, 177
PUSHBUTTON "Op&rește procesul", IDC_ENDPROCESS, 171, 189, 69, 14
PUSHBUTTON "Opr&ește procesul", IDC_ENDPROCESS, 171, 189, 69, 14
CONTROL "Afișea&ză procesele tuturor utilizatorilor", IDC_SHOWALLPROCESSES, "Button",
BS_AUTOCHECKBOX | WS_TABSTOP, 7, 191, 150, 10
END
@ -335,8 +339,8 @@ BEGIN
ID_OPTIONS_MINIMIZEONUSE "Gestionarul se minimizează automat când se comută la o aplicație."
ID_OPTIONS_HIDEWHENMINIMIZED "La minimizare, ascunde Gestionarul de activități în zona de notificare."
ID_VIEW_REFRESH "Forțează Gestionarul să se actualizeze acum, indiferent Rata de împrospătare."
ID_VIEW_LARGE "Afișează aplicațiile reprezentându-le ca pictograme mari."
ID_VIEW_SMALL "Afișează aplicațiile reprezentându-le ca pictograme mici."
ID_VIEW_LARGE "Afișează aplicațiile reprezentându-le ca dale (pictograme mari)."
ID_VIEW_SMALL "Afișează aplicațiile reprezentându-le ca pictograme (mici)."
ID_VIEW_DETAILS "Afișează informații despre fiecare aplicație."
ID_VIEW_UPDATESPEED_HIGH "Actualizează fereastra de două ori pe secundă."
ID_VIEW_UPDATESPEED_NORMAL "Actualizează fereastra o dată la două secunde."
@ -355,11 +359,11 @@ BEGIN
ID_HELP_TOPICS "Afișează Manualul de utilizare al Gestionarului."
ID_HELP_ABOUT "Afișează informații despre program, versiune și drepturi de autor."
ID_FILE_EXIT "Închide Gestionarul de activități."
ID_OPTIONS_SHOW16BITTASKS "Afișează programele pe 16 biți executate în mediul ntvdm.exe"
ID_OPTIONS_SHOW16BITTASKS "Afișează programele pe 16 biți executate în mediul ntvdm.exe”."
ID_VIEW_SELECTCOLUMNS "Specificarea informațiilor afișate în compartimentul „Procese”."
ID_VIEW_SHOWKERNELTIMES "Include și activitatea nucleului în graficele de performanță"
ID_VIEW_CPUHISTORY_ONEGRAPHALL "Folosește un singur grafic pentru toate procesoarele"
ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Folosește câte un grafic pentru fiecare procesor"
ID_VIEW_SHOWKERNELTIMES "Include și activitatea nucleului în graficele de performanță."
ID_VIEW_CPUHISTORY_ONEGRAPHALL "Folosește un singur grafic pentru toate procesoarele."
ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Folosește câte un grafic pentru fiecare procesor."
ID_APPLICATION_PAGE_SWITCHTO "Aduce fereastra aplicației selectate în prim plan, activând-o."
END
@ -367,17 +371,17 @@ STRINGTABLE
BEGIN
ID_ENDTASK "Comandă închiderea aplicației selectate."
ID_GOTOPROCESS "Arată procesul aplicației selectate."
ID_RESTORE "Restabilește Gestionarul."
ID_RESTORE "Restabilește Gestionarul de activități."
ID_PROCESS_PAGE_ENDPROCESS "Comandă închiderea procesului selectat."
ID_PROCESS_PAGE_ENDPROCESSTREE "Închide procesul și toate procesele pornite de acesta."
ID_PROCESS_PAGE_DEBUG "Atașează aplicația de depanare la acest proces."
ID_PROCESS_PAGE_SETAFFINITY "Restricționează execuția procesului pe anumite procesoare."
ID_PROCESS_PAGE_SETPRIORITY_REALTIME "Desemnează prioritate maximă"
ID_PROCESS_PAGE_SETPRIORITY_HIGH "Desemnează prioritate înaltă"
ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "Desemnează regim prioritar"
ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Desemnează prioritate ordinară"
ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Desemnează regim neprioritar"
ID_PROCESS_PAGE_SETPRIORITY_LOW "Desemnează prioritate minimă"
ID_PROCESS_PAGE_SETPRIORITY_REALTIME "Desemnează prioritate maximă."
ID_PROCESS_PAGE_SETPRIORITY_HIGH "Desemnează prioritate înaltă."
ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL "Desemnează regim prioritar."
ID_PROCESS_PAGE_SETPRIORITY_NORMAL "Desemnează prioritate ordinară."
ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Desemnează regim neprioritar."
ID_PROCESS_PAGE_SETPRIORITY_LOW "Desemnează prioritate minimă."
END
STRINGTABLE

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -4,6 +4,7 @@
* Copyright 1996 Ulrich Schmid
* Copyright 2002 Sylvain Petreolle <spetreolle@yahoo.fr>
* Copyright 2009 Michael Stefaniuc
* Copyright 2014 Ștefan Fulea
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -29,32 +30,32 @@ MAIN_MENU MENU
POPUP "&Fișier" {
MENUITEM "&Deschide", MNID_FILE_OPEN
MENUITEM SEPARATOR
MENUITEM "&Tipărește", MNID_FILE_PRINT
MENUITEM "&Setare imprimantă", MNID_FILE_SETUP
MENUITEM "I&mprimare…", MNID_FILE_PRINT
MENUITEM "&Configurare imprimantă…", MNID_FILE_SETUP
MENUITEM SEPARATOR
MENUITEM "&Ieșire", MNID_FILE_EXIT
MENUITEM "I&eșire", MNID_FILE_EXIT
}
POPUP "&Editare" {
MENUITEM "&Copiază...", MNID_EDIT_COPYDLG
MENUITEM "&Copiere…", MNID_EDIT_COPYDLG
MENUITEM SEPARATOR
MENUITEM "&Adnotează...", MNID_EDIT_ANNOTATE
MENUITEM "&Adnotare…", MNID_EDIT_ANNOTATE
}
POPUP "&Se&mn de carte" {
MENUITEM "&Definește...", MNID_BKMK_DEFINE
POPUP "Se&mn de carte" {
MENUITEM "&Definire…", MNID_BKMK_DEFINE
}
POPUP "&Opțiuni" {
MENUITEM "Istorie", MNID_OPTS_HISTORY
MENUITEM "Ist&oric", MNID_OPTS_HISTORY
POPUP "&Font"
BEGIN
MENUITEM "Mic", MNID_OPTS_FONTS_SMALL
MENUITEM "Normal", MNID_OPTS_FONTS_NORMAL
MENUITEM "Mare", MNID_OPTS_FONTS_LARGE
MENUITEM "&Mic", MNID_OPTS_FONTS_SMALL
MENUITEM "&Normal", MNID_OPTS_FONTS_NORMAL
MENUITEM "M&are", MNID_OPTS_FONTS_LARGE
END
}
POPUP "&Ajutor" {
MENUITEM "Ajut&or despre ajutor", MNID_HELP_HELPON
MENUITEM "În&totdeauna deasupra", MNID_HELP_HELPTOP
MENUITEM "&Informații...", MNID_HELP_ABOUT
POPUP "&?" {
MENUITEM "&Despre…", MNID_HELP_HELPON
MENUITEM "Î&ntotdeauna deasupra", MNID_HELP_HELPTOP
MENUITEM "In&formații…", MNID_HELP_ABOUT
}
}
@ -62,10 +63,10 @@ CONTEXT_MENU MENU
BEGIN
POPUP ""
BEGIN
MENUITEM "Adnotare...", MNID_CTXT_ANNOTATE
MENUITEM "Adnotare", MNID_CTXT_ANNOTATE
MENUITEM "Copiază", MNID_CTXT_COPY
MENUITEM "Tipărește...", MNID_CTXT_PRINT
POPUP "Fonturi"
MENUITEM "Imprimare…", MNID_CTXT_PRINT
POPUP "Font"
BEGIN
MENUITEM "Mic", MNID_CTXT_FONTS_SMALL
MENUITEM "Normal", MNID_CTXT_FONTS_NORMAL
@ -76,20 +77,20 @@ END
STRINGTABLE
{
STID_WINE_HELP, "Ajutor Wine"
STID_WINE_HELP, "Manual"
STID_WHERROR, "EROARE"
STID_WARNING, "AVERTISMENT"
STID_INFO, "Informație"
STID_NOT_IMPLEMENTED, "Neimplementat"
STID_HLPFILE_ERROR_s, "Eroare la citirea fișierului de ajutor „%s”"
STID_INDEX, "&Index"
STID_HLPFILE_ERROR_s, "Eroare la citirea manualului „%s”"
STID_INDEX, "Inde&x"
STID_CONTENTS, "Rezumat"
STID_BACK, "În&apoi"
STID_BACK, "Înap&oi"
STID_ALL_FILES, "Toate fișierele (*.*)"
STID_HELP_FILES_HLP, "Fișierele de ajutor (*.hlp)"
STID_FILE_NOT_FOUND_s "Fișierul „%s” nu poate fi găsit. Vreți să-l cautați?"
STID_NO_RICHEDIT "Nu am găsit o implementare pentru richedit... Abandonez"
STID_PSH_INDEX, "Subiecte de ajutor:"
STID_HELP_FILES_HLP, "Fișierele manual (*.hlp)"
STID_FILE_NOT_FOUND_s "Fișierul „%s” nu poate fi găsit. Doriți să-l căutați?"
STID_NO_RICHEDIT "Nu s-a găsit o implementare pentru richedit… Operația este abandonată"
STID_PSH_INDEX, "Subiecte în manual:"
}
IDD_INDEX DIALOG 0, 0, 200, 190

View file

@ -2,7 +2,6 @@
remove_definitions(-D_WIN32_IE=0x600)
add_definitions(-D__ROS_LONG64__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
list(APPEND SOURCE
@ -13,7 +12,6 @@ list(APPEND SOURCE
rsrc.rc)
add_executable(wordpad ${SOURCE})
set_module_type(wordpad win32gui)
target_link_libraries(wordpad wine uuid)
add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)

View file

@ -2,7 +2,7 @@
* Copyright 2004 Krzysztof Foltman
* Copyright 2010 Claudia Cotună
* Michael Stefaniuc
* 2011 Fulea Ștefan
* 2011 Ștefan Fulea
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -29,34 +29,34 @@ BEGIN
BEGIN
MENUITEM "&Nou…\tCtrl+N", ID_FILE_NEW
MENUITEM "&Deschidere…\tCtrl+O", ID_FILE_OPEN
MENUITEM "Pă&strează\tCtrl+S", ID_FILE_SAVE
MENUITEM "&Păstrare în…", ID_FILE_SAVEAS
MENUITEM "&Pă&trează\tCtrl+S", ID_FILE_SAVE
MENUITEM "Păst&rare în…", ID_FILE_SAVEAS
MENUITEM SEPARATOR
MENUITEM "&Imprimare…\tCtrl+P", ID_PRINT
MENUITEM "I&mprimare…\tCtrl+P", ID_PRINT
MENUITEM "Pre&vizionare imprimare…", ID_PREVIEW
MENUITEM "&Opțiuni pagină…", ID_PRINTSETUP
MENUITEM "&Configurare pagină…", ID_PRINTSETUP
MENUITEM SEPARATOR
MENUITEM "I&eșire", ID_FILE_EXIT
END
POPUP "&Editare"
BEGIN
MENUITEM "Des&face\tCtrl+Z", ID_EDIT_UNDO
MENUITEM "&Reface\tCtrl+Y", ID_EDIT_REDO
MENUITEM "Desface\tCtrl+&Z", ID_EDIT_UNDO
MENUITEM "Reface\tCtrl+&Y", ID_EDIT_REDO
MENUITEM SEPARATOR
MENUITEM "&Decupează\tCtrl+X", ID_EDIT_CUT
MENUITEM "&Copiază\tCtrl+C", ID_EDIT_COPY
MENUITEM "&Lipește\tCtrl+V", ID_EDIT_PASTE
MENUITEM "Șt&erge\tDEL", ID_EDIT_CLEAR
MENUITEM "Selecte&ază tot\tCtrl+A", ID_EDIT_SELECTALL
MENUITEM "Decupează\tCtrl+&X", ID_EDIT_CUT
MENUITEM "Copiază\tCtrl+&C", ID_EDIT_COPY
MENUITEM "Lipește\tCtrl+&V", ID_EDIT_PASTE
MENUITEM "Șterge\tD&EL", ID_EDIT_CLEAR
MENUITEM "Selectează tot\tCtrl+&A", ID_EDIT_SELECTALL
MENUITEM SEPARATOR
MENUITEM "Că&utare…\tCrtl+F", ID_FIND
MENUITEM "Căutare…\tCrtl+&F", ID_FIND
MENUITEM "Caută u&rmătorul\tF3", ID_FIND_NEXT
MENUITEM "Î&nlocuire…\tCtrl+H", ID_REPLACE
MENUITEM "Înlocuire…\tCtrl+&H", ID_REPLACE
MENUITEM SEPARATOR
MENUITEM "Nem&odificabil", ID_EDIT_READONLY
MENUITEM "&Nemodificabil", ID_EDIT_READONLY
MENUITEM "&Modificat", ID_EDIT_MODIFIED
MENUITEM SEPARATOR
POPUP "&Suplimente"
POPUP "S&uplimente"
BEGIN
MENUITEM "&Detalii pentru selecție", ID_EDIT_SELECTIONINFO
MENUITEM "Format &caracter", ID_EDIT_CHARFORMAT
@ -74,7 +74,7 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Opțiuni…", ID_VIEWPROPERTIES
END
POPUP "&Inserare"
POPUP "I&nserare"
BEGIN
MENUITEM "&Data și ora…", ID_DATETIME
END

View file

@ -1,7 +1,7 @@
/*
* Turkish Resources for ReactOS Wordpad
*
* Copyrights: 2006 Fatih Aşıcı (fasici@linux-sevenler.org), 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
* Copyrights: 2006 Fatih Aşıcı (fasici@linux-sevenler.org); 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

View file

@ -1,7 +1,7 @@
/*
* Turkish Resources for ReactOS Write
*
* Copyright: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
* Copyright: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

View file

@ -14,15 +14,9 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/irot_s.c)
include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
add_executable(rpcss ${SOURCE} rpcss.rc)
target_link_libraries(rpcss
${PSEH_LIB}
wine)
target_link_libraries(rpcss ${PSEH_LIB} wine)
set_module_type(rpcss win32cui UNICODE)
add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(rpcss rpcss.h SOURCE)
add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,6 @@
add_executable(spoolsv spoolsv.c spoolsv.rc)
target_link_libraries(spoolsv wine)
set_module_type(spoolsv win32cui UNICODE)
add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all)

View file

@ -5,7 +5,6 @@ add_executable(telnetd
telnetd.rc)
target_link_libraries(telnetd wine)
set_module_type(telnetd win32cui)
add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll)
add_cd_file(TARGET telnetd DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
add_executable(thmsvc thmsvc.c thmsvc.rc)
target_link_libraries(thmsvc wine)
set_module_type(thmsvc win32cui UNICODE)
add_importlibs(thmsvc uxtheme advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET thmsvc DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)
add_library(umpnpmgr SHARED
@ -12,10 +10,7 @@ add_library(umpnpmgr SHARED
${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr.def)
target_link_libraries(umpnpmgr
wdmguid
${PSEH_LIB})
target_link_libraries(umpnpmgr wdmguid ${PSEH_LIB})
set_module_type(umpnpmgr win32dll UNICODE)
add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll)
add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl)
list(APPEND SOURCE

View file

@ -3,7 +3,7 @@
* FILE: base/setup/reactos/lang/ro-RO.rc
* PURPOSE: Romanian Language File for ReactOS GUI first stage setup
* TRANSLATORS:
* Petre Dumitriu (petrimetri-at-gmail-dot-com)
* Petru Dumitriu (petrimetri at gmail dot com)
* Ștefan Fulea (stefan dot fulea at mail dot md)
*/

View file

@ -1,4 +1,4 @@
/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu@gmail.com), 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu@gmail.com); 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,7 +1,5 @@
add_executable(setup setup.c setup.rc)
set_module_type(setup win32gui UNICODE)
add_importlibs(setup userenv msvcrt kernel32 ntdll)
add_cd_file(TARGET setup DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,6 @@
add_definitions(${I18N_DEFS})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${REACTOS_SOURCE_DIR}/lib/inflib

View file

@ -107,7 +107,7 @@ static MUI_ENTRY roROWelcomePageEntries[] =
{
8,
21,
"\x07 Tastaîi L pentru Termenii ­i Condiîiile de Licenîiere",
"\x07 Tastaîi L pentru Termenii ­i Condiîiile de Licenîiere.",
TEXT_STYLE_NORMAL
},
{
@ -325,13 +325,13 @@ static MUI_ENTRY roROLicensePageEntries[] =
{
8,
18,
"c<EFBFBD>t ­i internaîional. Licenîierea se referÇ doar la",
"c<EFBFBD>t ­i internaîional. Licenîierea se referÇ doar la distri-",
TEXT_STYLE_NORMAL
},
{
8,
19,
"distribuirea sistemului ReactOS cÇtre pÇrîi terîe.",
"buirea sistemului ReactOS cÇtre pÇrîi terîe.",
TEXT_STYLE_NORMAL
},
{
@ -413,7 +413,7 @@ static MUI_ENTRY roRODevicePageEntries[] =
{
6,
8,
"Configurarea dispozitivelor de bazÇ.",
"Configurare dispozitive de bazÇ",
TEXT_STYLE_NORMAL
},
{
@ -478,13 +478,13 @@ static MUI_ENTRY roRODevicePageEntries[] =
{
6,
24,
"selectaîi \"Accept configuraîia dispozitivelor\", apoi",
"selectaîi \"Accept configuraîia dispozitivelor\", apoi confirmaîi",
TEXT_STYLE_NORMAL
},
{
6,
25,
"confirmaîi-o apÇs<EFBFBD>nd ENTER.",
"apÇs<EFBFBD>nd ENTER.",
TEXT_STYLE_NORMAL
},
{
@ -575,7 +575,7 @@ static MUI_ENTRY roROComputerPageEntries[] =
{
6,
8,
"Doriîi specificarea arhitecturii de calcul?",
"Doriîi specificarea unei alte arhitecturi de calcul?",
TEXT_STYLE_NORMAL
},
{
@ -627,19 +627,19 @@ static MUI_ENTRY roROFlushPageEntries[] =
{
10,
6,
"Verificarea stocÇrii datelor necesare.",
"Se verificÇ stocarea datelor necesare.",
TEXT_STYLE_NORMAL
},
{
10,
8,
"La final, calculatorul va fi repornit automat.",
"Aceasta poate dura c<>teva momente.",
TEXT_STYLE_NORMAL
},
{
10,
9,
"A­teptaîi...",
"La final, calculatorul va fi repornit automat.",
TEXT_STYLE_NORMAL
},
{
@ -679,7 +679,7 @@ static MUI_ENTRY roROQuitPageEntries[] =
{
10,
9,
"­i toate CD-ROM din unitÇîile CD.",
"­i toate mediile CD-ROM din unitÇîile CD.",
TEXT_STYLE_NORMAL
},
{
@ -770,13 +770,13 @@ static MUI_ENTRY roROSuccessPageEntries[] =
{
10,
8,
"Scoateîi discul flexibil din unitatea A: ­i toate CD-ROM",
"Scoateîi discul flexibil din unitatea A: ­i toate mediile",
TEXT_STYLE_NORMAL
},
{
10,
9,
"din unitÇîile CD.",
"CD-ROM din unitÇîile CD.",
TEXT_STYLE_NORMAL
},
{
@ -857,13 +857,13 @@ static MUI_ENTRY roROSelectPartitionEntries[] =
{
6,
8,
"UrmÇtoarea listÇ cuprinde partiîiile existente precum",
"UrmÇtoarea listÇ cuprinde partiîiile existente, precum ­i",
TEXT_STYLE_NORMAL
},
{
6,
9,
"­i spaîiul nefolosit pentru crearea de noi partiîii.",
"spaîiul liber disponibil pentru crearea de noi partiîii.",
TEXT_STYLE_NORMAL
},
{
@ -1041,7 +1041,7 @@ static MUI_ENTRY roROBootLoaderEntries[] =
{
6,
8,
"Instalarea aplicaîiei de iniîializare a calculatorului",
"Instalare aplicaîie de iniîializare a calculatorului",
TEXT_STYLE_NORMAL
},
{
@ -1198,7 +1198,7 @@ static MUI_ENTRY roROPrepareCopyEntries[] =
{
6,
8,
"Se fac pregÇtirile necesare pentru copierea de fi­iere.",
"Se fac pregÇtirile necesare pentru copierea de fi­iere...",
TEXT_STYLE_NORMAL
},
{
@ -1702,7 +1702,7 @@ MUI_STRING roROStrings[] =
{STRING_INSTALLCREATEPARTITION,
" ENTER = Instalare P/E = Creare partiîie PrimarÇ/ExtinsÇ F3 = Ie­ire"},
{STRING_INSTALLCREATELOGICAL,
" ENTER = Install L = Create Logical Partition F3 = Quit"},
" ENTER = Instalare L = Creare partiîie LogicÇ F3 = Ie­ire"},
{STRING_INSTALLDELETEPARTITION,
" ENTER = Instalare D = ¸tergere partiîie F3 = Ie­ire"},
{STRING_DELETEPARTITION,
@ -1720,7 +1720,7 @@ MUI_STRING roROStrings[] =
{STRING_CREATEPARTITION,
" ENTER = Creare partiîie ESC = Anulare F3 = Ie­ire"},
{STRING_PARTFORMAT,
"AceastÇ Partiîie urmeazÇ sÇ fie formatatÇ."},
"AceastÇ partiîie urmeazÇ sÇ fie formatatÇ."},
{STRING_NONFORMATTEDPART,
"Alegeîi sÇ instalaîi ReactOS pe partiîie nouÇ sau neformatatÇ."},
{STRING_INSTALLONPART,

View file

@ -11,7 +11,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Asistent de instalare module video"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Instalatorul ReactOS a descoperit faptul că ReactOS este executat în VMware(r).", -1, 117, 8, 140, 24
LTEXT "Asistentul de instalare a descoperit faptul că ReactOS este executat în VMware(r).", -1, 117, 8, 140, 24
LTEXT "Dacă doriți instalarea modulelor pilot VMware(r) SVGA, apăsați pe „Înainte”, altfel omiteți această instalare apăsând „Anulează”.", -1, 117, 130, 140, 34
END
@ -20,7 +20,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Asistent de instalare module video"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Instalatorul ReactOS nu are inclus modulul pilot VMware(r) SVGA.\n\nDe aceea, mergeți la „VM” din meniul stației de lucru VMware(r) și alegeți instalarea instrumentelor VMware\n\n\nApăsați „Înainte” pentru a continua sau „Anulează” pentru a omite instalarea modulului pilot video SVGA.", -1, 25, 25, 225, 85
LTEXT "Asistentul de instalare nu are inclus modulul pilot VMware(r) SVGA.\n\nDe aceea, mergeți la „VM” din meniul stației de lucru VMware(r) și alegeți instalarea instrumentelor VMware\n\n\nApăsați „Înainte” pentru a continua sau „Anulează” pentru a omite instalarea modulului pilot video SVGA.", -1, 25, 25, 225, 85
END
IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@ -58,7 +58,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Asistent de instalare module video"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Instalatorul ReactOS nu a reușit instalarea modulului pilot VMware(r) SVGA.\n\n\nAlegeți „Sfârșit” pentru a reveni la instalarea ReactOS.", -1, 25, 25, 225, 85
LTEXT "Asistentul de instalare nu a reușit instalarea modulului pilot VMware(r) SVGA.\n\n\nAlegeți „Sfârșit” pentru a reveni la instalarea ReactOS.", -1, 25, 25, 225, 85
END
IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT
@ -67,9 +67,9 @@ CAPTION "Asistent de instalare module video"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Modulul pilot video VMware(r) SVGA este deja instalat.\n\nPuteți în continuare să:", -1, 25, 5, 225, 30
PUSHBUTTON "Configurați preferințele ecranului", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON
PUSHBUTTON "Utilizați un alt modul pilot video", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON
PUSHBUTTON "Dezinstalați modulul pilot VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON
PUSHBUTTON "&Configurați preferințele ecranului", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON
PUSHBUTTON "&Utilizați un alt modul pilot video", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON
PUSHBUTTON "&Dezinstalați modulul pilot VMware(r) SVGA", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON
LTEXT "Alegeți „Înainte” pentru a continua sau „Anulează” pentru a părăsi acest asistent.", -1, 25, 93, 225, 19
END
@ -89,14 +89,14 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Asistent de instalare module video"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
LTEXT "Instalatorul ReactOS e pe cale de a vă dezinstala modulul pilot VMware(r) SVGA!!!\n\n\nApăsați „Sfârșit” pentru a dezinstala modulul pilot sau „Anulează” pentru a-l lăsa așa cum este.", -1, 25, 25, 225, 85
LTEXT "Asistentul de instalare e pe cale de a vă dezinstala modulul pilot VMware(r) SVGA!!!\n\n\nApăsați „Sfârșit” pentru a dezinstala modulul pilot sau „Anulează” pentru a-l lăsa așa cum este.", -1, 25, 25, 225, 85
END
STRINGTABLE
BEGIN
IDS_WIZARD_NAME "VMware(r) depistat"
IDS_FAILEDTOLOCATEDRIVERS "Instalatorul ReactOS Setup nu a reușit găsirea fișierelor necesare.\nVerificați dacă este introdus suportul CD-ROM cu instrumentele VMware(r)."
IDS_FAILEDTOCOPYFILES "Instalatorul ReactOS nu a reușit să copieze fișierele necesare.\nVerificați dacă este introdus suportul CD-ROM cu instrumentele VMware(r).\n"
IDS_FAILEDTOLOCATEDRIVERS "Asistentul de instalare nu a reușit găsirea fișierelor necesare.\nVerificați dacă este introdus suportul CD-ROM cu instrumentele VMware(r)."
IDS_FAILEDTOCOPYFILES "Asistentul de instalare nu a reușit să copieze fișierele necesare.\nVerificați dacă este introdus suportul CD-ROM cu instrumentele VMware(r).\n"
IDS_FAILEDTOACTIVATEDRIVER "Activarea modulului pilot VMware(r) SVGA a eșuat!"
IDS_FAILEDTOSELVGADRIVER "Activarea modulului pilot VMware(r) VGA a eșuat!"
IDS_FAILEDTOSELVBEDRIVER "Activarea modulului pilot VMware(r) VBE a eșuat!"
@ -113,9 +113,9 @@ END
STRINGTABLE
BEGIN
IDS_SEARCHINGFORCDROM "Accesarea suportului CD-ROM cu instrumentele VMware(r)…"
IDS_SEARCHINGFORCDROM "Se accesează suportul CD-ROM cu instrumentele VMware(r)…"
IDS_COPYINGFILES "Se copie fișierele…"
IDS_ENABLINGDRIVER "Activarea modulului pilot VMware(r) SVGA…"
IDS_ENABLINGDRIVER "Se activează modulul pilot VMware(r) SVGA…"
END
STRINGTABLE

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -556,7 +556,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
/* Used to find and assemble the string that is returned */
TCHAR szBaseWord[MAX_PATH];
TCHAR szPrefix[MAX_PATH];
TCHAR szOrginal[MAX_PATH];
TCHAR szOriginal[MAX_PATH];
TCHAR szSearchPath[MAX_PATH];
/* Save the strings used last time, so if they hit tab again */
static TCHAR LastReturned[MAX_PATH];
@ -586,9 +586,9 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
if (!_tcsnicmp (line, _T("rd "), 3) || !_tcsnicmp (line, _T("cd "), 3))
ShowAll = FALSE;
/* Copy the string, str can be edited and orginal should not be */
/* Copy the string, str can be edited and original should not be */
_tcscpy(str,strIN);
_tcscpy(szOrginal,strIN);
_tcscpy(szOriginal,strIN);
/* Look to see if the cusor is not at the end of the string */
if ((cusor + 1) < _tcslen(str))
@ -656,8 +656,8 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
hFile = FindFirstFile (szSearchPath, &file);
if (hFile == INVALID_HANDLE_VALUE)
{
/* Assemble the orginal string and return */
_tcscpy(strOut,szOrginal);
/* Assemble the original string and return */
_tcscpy(strOut,szOriginal);
return;
}
@ -685,8 +685,8 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
{
/* Don't leak old buffer */
cmd_free(oldFileList);
/* Assemble the orginal string and return */
_tcscpy(strOut,szOrginal);
/* Assemble the original string and return */
_tcscpy(strOut,szOriginal);
FindClose(hFile);
ConOutFormatMessage (GetLastError());
return;
@ -698,11 +698,10 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
FindClose(hFile);
/* Check the size of the list to see if we
found any matches */
/* Check the size of the list to see if we found any matches */
if (FileListSize == 0)
{
_tcscpy(strOut,szOrginal);
_tcscpy(strOut,szOriginal);
if (FileList != NULL)
cmd_free(FileList);
return;
@ -712,7 +711,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
qsort(FileList,FileListSize,sizeof(FileName), compare);
/* Find the next/previous */
if (!_tcscmp(szOrginal,LastReturned))
if (_tcslen(szOriginal) && !_tcscmp(szOriginal,LastReturned))
{
if (bNext)
{
@ -734,8 +733,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
Sel = 0;
}
/* nothing found that matched last time
so return the first thing in the list */
/* nothing found that matched last time so return the first thing in the list */
strOut[0] = _T('\0');
/* Special character in the name */
@ -792,7 +790,7 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
}
}
if (szPrefix[_tcslen(szPrefix) - 1] == _T('\"') || NeededQuote)
if (NeededQuote || (_tcslen(szPrefix) && szPrefix[_tcslen(szPrefix) - 1] == _T('\"')))
_tcscat(strOut,_T("\""));
_tcscpy(LastReturned,strOut);

View file

@ -23,21 +23,6 @@ list(APPEND SOURCE
add_executable(explorer ${SOURCE} explorer.rc)
target_link_libraries(explorer uuid wine)
set_module_type(explorer win32gui UNICODE)
add_importlibs(explorer
advapi32
gdi32
user32
comctl32
ole32
oleaut32
shell32
browseui
shlwapi
shdocvw
version
uxtheme
msvcrt
kernel32
ntdll)
add_importlibs(explorer advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 browseui shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
add_pch(explorer precomp.h SOURCE)
add_cd_file(TARGET explorer DESTINATION reactos FOR all)

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -54,7 +54,6 @@ add_executable(explorer_old
target_link_libraries(explorer_old comsupp wine uuid)
set_module_type(explorer_old win32gui UNICODE)
add_importlibs(explorer_old advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll)
add_pch(explorer_old precomp.h SOURCE)
add_dependencies(explorer_old psdk)

View file

@ -31,7 +31,7 @@ BEGIN
MENUITEM "Aranjare &automată", ID_WINDOW_AUTOSORT
MENUITEM "Aranjare s&imboluri", ID_WINDOW_ARRANGE
END
POPUP "&Instrumente"
POPUP "I&nstrumente"
BEGIN
MENUITEM "&Opțiuni", ID_TOOLS_OPTIONS
END
@ -94,7 +94,7 @@ BEGIN
MENUITEM "Pe &tot ecranul\tCtrl+Shift+S", ID_VIEW_FULLSCREEN
MENUITEM "&MDI", ID_VIEW_MDI
END
POPUP "&Instrumente"
POPUP "I&nstrumente"
BEGIN
MENUITEM "&Opțiuni", ID_TOOLS_OPTIONS
END

View file

@ -1,8 +1,6 @@
add_executable(autochk WIN32 autochk.c autochk.rc)
set_module_type(autochk nativecui)
target_link_libraries(autochk nt)
add_importlibs(autochk ntdll)
add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
add_executable(bootok bootok.c bootok.rc)
set_module_type(bootok win32cui UNICODE)
add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET bootok DESTINATION reactos/system32 FOR all)

View file

@ -42,9 +42,11 @@ list(APPEND SOURCE
add_executable(diskpart ${SOURCE} diskpart.rc)
set_module_type(diskpart win32cui UNICODE)
add_importlibs(diskpart user32 msvcrt advapi32 kernel32)
add_importlibs(diskpart user32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(diskpart ntdll)
add_importlibs(diskpart ntdll)
endif()
add_pch(diskpart diskpart.h SOURCE)
add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_executable(expand expand.c expand.rc)
set_module_type(expand win32cui)
add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET expand DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(format format.c format.rc)
set_module_type(format win32cui)
set_target_properties(format PROPERTIES SUFFIX ".com")
add_importlibs(format user32 fmifs msvcrt kernel32 ntdll)
add_cd_file(TARGET format DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
add_executable(lsass lsass.c lsass.rc)
set_module_type(lsass win32gui UNICODE)
add_importlibs(lsass advapi32 lsasrv samsrv msvcrt kernel32 ntdll)
add_cd_file(TARGET lsass DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
list(APPEND SOURCE
@ -9,7 +8,6 @@ list(APPEND SOURCE
precomp.h)
add_executable(msiexec ${SOURCE} rsrc.rc)
set_module_type(msiexec win32gui)
target_link_libraries(msiexec uuid wine)
add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)

View file

@ -1,3 +1,4 @@
add_executable(rundll32 rundll32.c rundll32.rc)
set_module_type(rundll32 win32gui UNICODE)
add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE

View file

@ -1,16 +1,14 @@
/*
* FILE: base/system/runonce/lang/ro-RO.rc
* ReactOS Project (http://www.reactos.org)
* TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum to fulea.stefan)
* CHANGE LOG: 2011-08-29 initial translation
* 2011-11-05 minor change
* TRANSLATOR: Ștefan Fulea (stefan dot fulea at mail dot md)
*/
LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
IDD_RUNONCE_DLG DIALOG 0, 0, 239, 170
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "Instalatorul ReactOS"
CAPTION "Asistent de instalare"
FONT 8, "MS Shell Dlg"
BEGIN
LTEXT "Se instalează următoarele elemente:", -1, 38, 8, 196, 18

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -6,7 +6,6 @@ include_directories(
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
list(APPEND SOURCE
config.c
controlset.c

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -3,7 +3,7 @@
* FILE: base/system/winlogon/lang/ro-RO.rc
* PURPOSE: Romanian Language File for Winlogon
* TRANSLATORS:
* Petre Dumitriu
* Petru Dumitriu (petrimetri at gmail dot com)
* Ștefan Fulea (stefan dot fulea at mail dot md)
*/

View file

@ -1,4 +1,4 @@
/* TRANSLATOR: 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATOR: 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -28,8 +28,7 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn)
add_custom_target(
reactos_cab_inf
@ -41,4 +40,3 @@ add_cd_file(
FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
DESTINATION reactos
NO_CAB FOR bootcd regtest)

View file

@ -1,19 +1,18 @@
if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00)
CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0)
CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00)
CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00)
CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000)
CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000)
CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00)
CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0)
CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00)
CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00)
CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000)
CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000)
add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all)
add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all)
add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all)
add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all)
add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all)
add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all)
add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all)
add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all)
add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all)
add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all)
add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all)
add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all)
endif()

View file

@ -1,4 +1,4 @@
/* TRANSLATORS: 2005 un.real, 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
/* TRANSLATORS: 2005 un.real; 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT

View file

@ -210,9 +210,13 @@ endif()
target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr)
target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
if (STACK_PROTECTOR)
if(STACK_PROTECTOR)
target_link_libraries(freeldr_pe gcc_ssp)
target_link_libraries(freeldr_pe_dbg gcc_ssp)
elseif(RUNTIME_CHECKS)
target_link_libraries(freeldr_pe runtmchk)
target_link_libraries(freeldr_pe_dbg runtmchk)
add_target_link_flags(freeldr_pe "/MERGE:.rtc=.text")
endif()
add_dependencies(freeldr_pe asm)
@ -229,8 +233,7 @@ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys)
list(APPEND SETUPLDR_SOURCE
inffile/inffile.c)
list(APPEND SETUPLDR_SOURCE inffile/inffile.c)
if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
@ -271,9 +274,13 @@ endif()
target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr)
target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
if (STACK_PROTECTOR)
if(STACK_PROTECTOR)
target_link_libraries(setupldr_pe gcc_ssp)
target_link_libraries(setupldr_pe_dbg gcc_ssp)
elseif(RUNTIME_CHECKS)
target_link_libraries(setupldr_pe runtmchk)
target_link_libraries(setupldr_pe_dbg runtmchk)
add_target_link_flags(setupldr_pe "/MERGE:.rtc=.text")
endif()
add_dependencies(setupldr_pe asm)

View file

@ -121,7 +121,7 @@ CallRealMode_return:
/* 64-bit stack pointer */
stack64:
.double STACK64ADDR
.double STACKADDR
PUBLIC FrldrBootDrive
FrldrBootDrive:

View file

@ -257,7 +257,7 @@ stack16:
/* 32-bit stack pointer */
stack32:
.long STACK32ADDR
.long STACKADDR
.align 4 /* force 4-byte alignment */
gdt:

View file

@ -86,11 +86,11 @@ i386PrintFrames(PKTRAP_FRAME TrapFrame)
PrintText("Frames:\n");
#ifdef _M_IX86
for (Frame = (FRAME*)TrapFrame->Ebp;
Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR;
Frame != 0 && (ULONG_PTR)Frame < STACKADDR;
Frame = Frame->Next)
#else
for (Frame = (FRAME*)TrapFrame->TrapFrame;
Frame != 0 && (ULONG_PTR)Frame < STACK32ADDR;
Frame != 0 && (ULONG_PTR)Frame < STACKADDR;
Frame = Frame->Next)
#endif
{
@ -171,6 +171,44 @@ i386PrintExceptionText(ULONG TrapIndex, PKTRAP_FRAME TrapFrame, PKSPECIAL_REGIST
InstructionPointer[6], InstructionPointer[7]);
}
VOID
NTAPI
FrLdrBugCheckWithMessage(
ULONG BugCode,
PCHAR File,
ULONG Line,
PSTR Format,
...)
{
CHAR Buffer[1024];
va_list argptr;
/* Blue screen for the win */
MachVideoClearScreen(SCREEN_ATTR);
i386_ScreenPosX = 0;
i386_ScreenPosY = 0;
PrintText("A problem has been detected and FreeLoader boot has been aborted.\n\n");
PrintText("%ld: %s\n\n", BugCode, BugCodeStrings[BugCode]);
if (File)
{
PrintText("Location: %s:%ld\n\n", File, Line);
}
va_start(argptr, Format);
_vsnprintf(Buffer, sizeof(Buffer), Format, argptr);
va_end(argptr);
Buffer[sizeof(Buffer) - 1] = 0;
i386PrintText(Buffer);
_disable();
__halt();
for (;;);
}
void
NTAPI
FrLdrBugCheckEx(

View file

@ -28,15 +28,15 @@
DBG_DEFAULT_CHANNEL(MEMORY);
#define MAX_BIOS_DESCRIPTORS 32
#define STACK_BASE_PAGE (STACKLOW / PAGE_SIZE)
#define FREELDR_BASE_PAGE (FREELDR_BASE / PAGE_SIZE)
#define DISKBUF_BASE_PAGE (DISKREADBUFFER / PAGE_SIZE)
#define STACK_BASE_PAGE (STACKLOWLIMIT / PAGE_SIZE)
#define STACK_END_PAGE (STACK32ADDR / PAGE_SIZE)
#define BIOSBUF_BASE_PAGE (BIOSCALLBUFFER / PAGE_SIZE)
#define STACK_PAGE_COUNT (FREELDR_BASE_PAGE - STACK_BASE_PAGE)
#define FREELDR_PAGE_COUNT (DISKBUF_BASE_PAGE - FREELDR_BASE_PAGE)
#define DISKBUF_PAGE_COUNT (STACK_BASE_PAGE - DISKBUF_BASE_PAGE)
#define STACK_PAGE_COUNT (STACK_END_PAGE - STACK_BASE_PAGE)
#define DISKBUF_PAGE_COUNT (0x10)
#define BIOSBUF_PAGE_COUNT (1)
BIOS_MEMORY_MAP PcBiosMemoryMap[MAX_BIOS_DESCRIPTORS];
@ -44,16 +44,17 @@ ULONG PcBiosMapCount;
FREELDR_MEMORY_DESCRIPTOR PcMemoryMap[MAX_BIOS_DESCRIPTORS + 1] =
{
{ LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors
{ LoaderFirmwareTemporary, 0x01, FREELDR_BASE_PAGE - 1 }, // freeldr stack + cmdline
{ LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image
{ LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER
{ LoaderOsloaderStack, STACK_BASE_PAGE, STACK_PAGE_COUNT }, // prot mode stack.
{ LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER
{ LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video
{ LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video
{ LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory
{ 0, 0, 0 }, // end of map
{ LoaderFirmwarePermanent, 0x00, 1 }, // realmode int vectors
{ LoaderFirmwareTemporary, 0x01, STACK_BASE_PAGE - 1 }, // freeldr stack + cmdline
{ LoaderOsloaderStack, STACK_BASE_PAGE, FREELDR_BASE_PAGE - STACK_BASE_PAGE }, // prot mode stack.
{ LoaderLoadedProgram, FREELDR_BASE_PAGE, FREELDR_PAGE_COUNT }, // freeldr image
{ LoaderFirmwareTemporary, DISKBUF_BASE_PAGE, DISKBUF_PAGE_COUNT }, // Disk read buffer for int 13h. DISKREADBUFFER
{ LoaderFirmwareTemporary, BIOSBUF_BASE_PAGE, BIOSBUF_PAGE_COUNT }, // BIOSCALLBUFFER
{ LoaderFirmwarePermanent, 0x9F, 0x1 }, // EBDA
{ LoaderFirmwarePermanent, 0xA0, 0x50 }, // ROM / Video
{ LoaderSpecialMemory, 0xF0, 0x10 }, // ROM / Video
{ LoaderSpecialMemory, 0xFFF, 1 }, // unusable memory
{ 0, 0, 0 }, // end of map
};
ULONG
@ -163,187 +164,241 @@ GetExtendedMemoryConfiguration(ULONG* pMemoryAtOneMB /* in KB */, ULONG* pMemory
static ULONG
PcMemGetConventionalMemorySize(VOID)
{
REGS Regs;
REGS Regs;
TRACE("GetConventionalMemorySize()\n");
TRACE("GetConventionalMemorySize()\n");
/* Int 12h
* BIOS - GET MEMORY SIZE
*
* Return:
* AX = kilobytes of contiguous memory starting at absolute address 00000h
*
* This call returns the contents of the word at 0040h:0013h;
* in PC and XT, this value is set from the switches on the motherboard
*/
Regs.w.ax = 0;
Int386(0x12, &Regs, &Regs);
/* Int 12h
* BIOS - GET MEMORY SIZE
*
* Return:
* AX = kilobytes of contiguous memory starting at absolute address 00000h
*
* This call returns the contents of the word at 0040h:0013h;
* in PC and XT, this value is set from the switches on the motherboard
*/
Regs.w.ax = 0;
Int386(0x12, &Regs, &Regs);
TRACE("Int12h\n");
TRACE("AX = 0x%x\n\n", Regs.w.ax);
TRACE("Int12h\n");
TRACE("AX = 0x%x\n\n", Regs.w.ax);
return (ULONG)Regs.w.ax;
return (ULONG)Regs.w.ax;
}
static
ULONG
PcMemGetBiosMemoryMap(PFREELDR_MEMORY_DESCRIPTOR MemoryMap, ULONG MaxMemoryMapSize)
{
REGS Regs;
ULONG MapCount = 0;
ULONGLONG RealBaseAddress, RealSize;
TYPE_OF_MEMORY MemoryType;
ASSERT(PcBiosMapCount == 0);
REGS Regs;
ULONG MapCount = 0;
ULONGLONG RealBaseAddress, RealSize;
TYPE_OF_MEMORY MemoryType;
ULONG Size;
ASSERT(PcBiosMapCount == 0);
TRACE("GetBiosMemoryMap()\n");
TRACE("GetBiosMemoryMap()\n");
/* Int 15h AX=E820h
* Newer BIOSes - GET SYSTEM MEMORY MAP
*
* AX = E820h
* EAX = 0000E820h
* EDX = 534D4150h ('SMAP')
* EBX = continuation value or 00000000h to start at beginning of map
* ECX = size of buffer for result, in bytes (should be >= 20 bytes)
* ES:DI -> buffer for result
* Return:
* CF clear if successful
* EAX = 534D4150h ('SMAP')
* ES:DI buffer filled
* EBX = next offset from which to copy or 00000000h if all done
* ECX = actual length returned in bytes
* CF set on error
* AH = error code (86h)
*/
Regs.x.ebx = 0x00000000;
while (PcBiosMapCount < MAX_BIOS_DESCRIPTORS)
/* Make sure the usable memory is large enough. To do this we check the 16
bit value at address 0x413 inside the BDA, which gives us the usable size
in KB */
Size = (*(PUSHORT)(ULONG_PTR)0x413) * 1024;
if (Size < 0x9F000)
{
/* Setup the registers for the BIOS call */
Regs.x.eax = 0x0000E820;
Regs.x.edx = 0x534D4150; /* ('SMAP') */
/* Regs.x.ebx = 0x00000001; Continuation value already set */
Regs.x.ecx = sizeof(BIOS_MEMORY_MAP);
Regs.w.es = BIOSCALLBUFSEGMENT;
Regs.w.di = BIOSCALLBUFOFFSET;
Int386(0x15, &Regs, &Regs);
FrLdrBugCheckWithMessage(
MEMORY_INIT_FAILURE,
__FILE__,
__LINE__,
"The BIOS reported a usable memory range up to 0x%x, which is too small!\n",
Size);
}
TRACE("Memory Map Entry %d\n", PcBiosMapCount);
TRACE("Int15h AX=E820h\n");
TRACE("EAX = 0x%x\n", Regs.x.eax);
TRACE("EBX = 0x%x\n", Regs.x.ebx);
TRACE("ECX = 0x%x\n", Regs.x.ecx);
TRACE("CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE");
/* Get the address of the Extended BIOS Data Area (EBDA).
* Int 15h, AH=C1h
* SYSTEM - RETURN EXTENDED-BIOS DATA-AREA SEGMENT ADDRESS (PS)
*
* Return:
* CF set on error
* CF clear if successful
* ES = segment of data area
*/
Regs.x.eax = 0x0000C100;
Int386(0x15, &Regs, &Regs);
/* If the BIOS didn't return 'SMAP' in EAX then
* it doesn't support this call. If CF is set, we're done */
if (Regs.x.eax != 0x534D4150 || !INT386_SUCCESS(Regs))
/* If the function fails, there is no EBDA */
if (INT386_SUCCESS(Regs))
{
/* Check if this is high enough */
ULONG EbdaBase = (ULONG)Regs.w.es << 4;
if (EbdaBase < 0x9F000)
{
break;
FrLdrBugCheckWithMessage(
MEMORY_INIT_FAILURE,
__FILE__,
__LINE__,
"The location of your EBDA is 0x%lx, which is too low!\n"
"If you see this, please report to the ReactOS team!",
EbdaBase);
}
/* Copy data to global buffer */
RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx);
/* Calculate the (max) size of the EBDA */
Size = 0xA0000 - EbdaBase;
TRACE("BaseAddress: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].BaseAddress);
TRACE("Length: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].Length);
TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type);
TRACE("Reserved: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Reserved);
TRACE("\n");
/* Check if this is free memory */
if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryUsable)
{
MemoryType = LoaderFree;
/* Align up base of memory area */
RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL);
/* Calculate the length after aligning the base */
RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress +
PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress;
RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL);
}
else
{
if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryReserved)
MemoryType = LoaderFirmwarePermanent;
else
MemoryType = LoaderSpecialMemory;
/* Align down base of memory area */
RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL);
/* Calculate the length after aligning the base */
RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress +
PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress;
RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL);
}
/* Check if we can add this descriptor */
if ((RealSize >= MM_PAGE_SIZE) && (MapCount < MaxMemoryMapSize))
{
/* Add the descriptor */
MapCount = AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
(PFN_NUMBER)(RealBaseAddress / MM_PAGE_SIZE),
(PFN_NUMBER)(RealSize / MM_PAGE_SIZE),
MemoryType);
}
(EbdaBase / MM_PAGE_SIZE),
(Size / MM_PAGE_SIZE),
LoaderFirmwarePermanent);
}
PcBiosMapCount++;
/* Int 15h AX=E820h
* Newer BIOSes - GET SYSTEM MEMORY MAP
*
* AX = E820h
* EAX = 0000E820h
* EDX = 534D4150h ('SMAP')
* EBX = continuation value or 00000000h to start at beginning of map
* ECX = size of buffer for result, in bytes (should be >= 20 bytes)
* ES:DI -> buffer for result
* Return:
* CF clear if successful
* EAX = 534D4150h ('SMAP')
* ES:DI buffer filled
* EBX = next offset from which to copy or 00000000h if all done
* ECX = actual length returned in bytes
* CF set on error
* AH = error code (86h)
*/
Regs.x.ebx = 0x00000000;
/* If the continuation value is zero or the
* carry flag is set then this was
* the last entry so we're done */
if (Regs.x.ebx == 0x00000000)
while (PcBiosMapCount < MAX_BIOS_DESCRIPTORS)
{
/* Setup the registers for the BIOS call */
Regs.x.eax = 0x0000E820;
Regs.x.edx = 0x534D4150; /* ('SMAP') */
/* Regs.x.ebx = 0x00000001; Continuation value already set */
Regs.x.ecx = sizeof(BIOS_MEMORY_MAP);
Regs.w.es = BIOSCALLBUFSEGMENT;
Regs.w.di = BIOSCALLBUFOFFSET;
Int386(0x15, &Regs, &Regs);
TRACE("Memory Map Entry %d\n", PcBiosMapCount);
TRACE("Int15h AX=E820h\n");
TRACE("EAX = 0x%x\n", Regs.x.eax);
TRACE("EBX = 0x%x\n", Regs.x.ebx);
TRACE("ECX = 0x%x\n", Regs.x.ecx);
TRACE("CF set = %s\n", (Regs.x.eflags & EFLAGS_CF) ? "TRUE" : "FALSE");
/* If the BIOS didn't return 'SMAP' in EAX then
* it doesn't support this call. If CF is set, we're done */
if (Regs.x.eax != 0x534D4150 || !INT386_SUCCESS(Regs))
{
TRACE("End Of System Memory Map!\n\n");
break;
break;
}
/* Copy data to global buffer */
RtlCopyMemory(&PcBiosMemoryMap[PcBiosMapCount], (PVOID)BIOSCALLBUFFER, Regs.x.ecx);
TRACE("BaseAddress: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].BaseAddress);
TRACE("Length: 0x%llx\n", PcBiosMemoryMap[PcBiosMapCount].Length);
TRACE("Type: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Type);
TRACE("Reserved: 0x%lx\n", PcBiosMemoryMap[PcBiosMapCount].Reserved);
TRACE("\n");
/* Check if this is free memory */
if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryUsable)
{
MemoryType = LoaderFree;
/* Align up base of memory area */
RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL);
/* Calculate the length after aligning the base */
RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress +
PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress;
RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL);
}
else
{
if (PcBiosMemoryMap[PcBiosMapCount].Type == BiosMemoryReserved)
MemoryType = LoaderFirmwarePermanent;
else
MemoryType = LoaderSpecialMemory;
/* Align down base of memory area */
RealBaseAddress = PcBiosMemoryMap[PcBiosMapCount].BaseAddress & ~(MM_PAGE_SIZE - 1ULL);
/* Calculate the length after aligning the base */
RealSize = PcBiosMemoryMap[PcBiosMapCount].BaseAddress +
PcBiosMemoryMap[PcBiosMapCount].Length - RealBaseAddress;
RealSize = (RealSize + MM_PAGE_SIZE - 1) & ~(MM_PAGE_SIZE - 1ULL);
}
/* Check if we can add this descriptor */
if ((RealSize >= MM_PAGE_SIZE) && (MapCount < MaxMemoryMapSize))
{
/* Add the descriptor */
MapCount = AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
(PFN_NUMBER)(RealBaseAddress / MM_PAGE_SIZE),
(PFN_NUMBER)(RealSize / MM_PAGE_SIZE),
MemoryType);
}
PcBiosMapCount++;
/* If the continuation value is zero or the
* carry flag is set then this was
* the last entry so we're done */
if (Regs.x.ebx == 0x00000000)
{
TRACE("End Of System Memory Map!\n\n");
break;
}
}
return MapCount;
return MapCount;
}
PFREELDR_MEMORY_DESCRIPTOR
PcMemGetMemoryMap(ULONG *MemoryMapSize)
{
ULONG i, EntryCount;
ULONG ExtendedMemorySizeAtOneMB;
ULONG ExtendedMemorySizeAtSixteenMB;
ULONG i, EntryCount;
ULONG ExtendedMemorySizeAtOneMB;
ULONG ExtendedMemorySizeAtSixteenMB;
EntryCount = PcMemGetBiosMemoryMap(PcMemoryMap, MAX_BIOS_DESCRIPTORS);
EntryCount = PcMemGetBiosMemoryMap(PcMemoryMap, MAX_BIOS_DESCRIPTORS);
/* If the BIOS didn't provide a memory map, synthesize one */
if (0 == EntryCount)
/* If the BIOS didn't provide a memory map, synthesize one */
if (0 == EntryCount)
{
GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB);
GetExtendedMemoryConfiguration(&ExtendedMemorySizeAtOneMB, &ExtendedMemorySizeAtSixteenMB);
/* Conventional memory */
AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
0,
PcMemGetConventionalMemorySize() * 1024 / PAGE_SIZE,
LoaderFree);
/* Conventional memory */
AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
0,
PcMemGetConventionalMemorySize() * 1024 / PAGE_SIZE,
LoaderFree);
/* Extended memory */
EntryCount = AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
1024 * 1024 / PAGE_SIZE,
ExtendedMemorySizeAtOneMB * 1024 / PAGE_SIZE,
LoaderFree);
if (ExtendedMemorySizeAtSixteenMB != 0)
{
/* Extended memory at 16MB */
/* Extended memory */
EntryCount = AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
0x1000000 / PAGE_SIZE,
ExtendedMemorySizeAtSixteenMB * 64 * 1024 / PAGE_SIZE,
LoaderFree);
}
MAX_BIOS_DESCRIPTORS,
1024 * 1024 / PAGE_SIZE,
ExtendedMemorySizeAtOneMB * 1024 / PAGE_SIZE,
LoaderFree);
if (ExtendedMemorySizeAtSixteenMB != 0)
{
/* Extended memory at 16MB */
EntryCount = AddMemoryDescriptor(PcMemoryMap,
MAX_BIOS_DESCRIPTORS,
0x1000000 / PAGE_SIZE,
ExtendedMemorySizeAtSixteenMB * 64 * 1024 / PAGE_SIZE,
LoaderFree);
}
}
TRACE("Dumping resulting memory map:\n");
@ -355,9 +410,9 @@ PcMemGetMemoryMap(ULONG *MemoryMapSize)
MmGetSystemMemoryMapTypeString(PcMemoryMap[i].MemoryType));
}
*MemoryMapSize = EntryCount;
*MemoryMapSize = EntryCount;
return PcMemoryMap;
return PcMemoryMap;
}
/* EOF */

Some files were not shown because too many files have changed in this diff Show more