diff --git a/CMakeLists.txt b/CMakeLists.txt index 68d31b7aeb9..a5f5645866a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.8.12) if(POLICY CMP0017) # Shadow cmake provided modules diff --git a/base/applications/atactl/CMakeLists.txt b/base/applications/atactl/CMakeLists.txt index c1885825833..0070358fae4 100644 --- a/base/applications/atactl/CMakeLists.txt +++ b/base/applications/atactl/CMakeLists.txt @@ -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) diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index ccfcf0276c6..090a4e4b8e6 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -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 diff --git a/base/applications/charmap/lang/tr-TR.rc b/base/applications/charmap/lang/tr-TR.rc index d39cf78b400..d341c57e22c 100644 --- a/base/applications/charmap/lang/tr-TR.rc +++ b/base/applications/charmap/lang/tr-TR.rc @@ -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 diff --git a/base/applications/cmdutils/help/CMakeLists.txt b/base/applications/cmdutils/help/CMakeLists.txt index 4a2adc0d121..cce3258e592 100644 --- a/base/applications/cmdutils/help/CMakeLists.txt +++ b/base/applications/cmdutils/help/CMakeLists.txt @@ -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) diff --git a/base/applications/cmdutils/hostname/CMakeLists.txt b/base/applications/cmdutils/hostname/CMakeLists.txt index fec5032e916..50b38605c12 100644 --- a/base/applications/cmdutils/hostname/CMakeLists.txt +++ b/base/applications/cmdutils/hostname/CMakeLists.txt @@ -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) diff --git a/base/applications/cmdutils/lodctr/CMakeLists.txt b/base/applications/cmdutils/lodctr/CMakeLists.txt index 6cfbd44558c..9c2feaa2b16 100644 --- a/base/applications/cmdutils/lodctr/CMakeLists.txt +++ b/base/applications/cmdutils/lodctr/CMakeLists.txt @@ -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) diff --git a/base/applications/cmdutils/mode/CMakeLists.txt b/base/applications/cmdutils/mode/CMakeLists.txt index 354c426dd2b..bf53b6af767 100644 --- a/base/applications/cmdutils/mode/CMakeLists.txt +++ b/base/applications/cmdutils/mode/CMakeLists.txt @@ -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) diff --git a/base/applications/cmdutils/more/CMakeLists.txt b/base/applications/cmdutils/more/CMakeLists.txt index 28fab89b700..9abb01648b6 100644 --- a/base/applications/cmdutils/more/CMakeLists.txt +++ b/base/applications/cmdutils/more/CMakeLists.txt @@ -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) diff --git a/base/applications/cmdutils/reg/lang/ro-RO.rc b/base/applications/cmdutils/reg/lang/ro-RO.rc index eb5a1bad8f5..6301650bc81 100644 --- a/base/applications/cmdutils/reg/lang/ro-RO.rc +++ b/base/applications/cmdutils/reg/lang/ro-RO.rc @@ -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" diff --git a/base/applications/cmdutils/taskkill/lang/ro-RO.rc b/base/applications/cmdutils/taskkill/lang/ro-RO.rc index 16b150197d7..3efa3b23aba 100644 --- a/base/applications/cmdutils/taskkill/lang/ro-RO.rc +++ b/base/applications/cmdutils/taskkill/lang/ro-RO.rc @@ -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" diff --git a/base/applications/fontview/lang/tr-TR.rc b/base/applications/fontview/lang/tr-TR.rc index 19755a4f403..f6cb3442d2d 100644 --- a/base/applications/fontview/lang/tr-TR.rc +++ b/base/applications/fontview/lang/tr-TR.rc @@ -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 diff --git a/base/applications/games/solitaire/CMakeLists.txt b/base/applications/games/solitaire/CMakeLists.txt index 5172ccb304a..552812129b5 100644 --- a/base/applications/games/solitaire/CMakeLists.txt +++ b/base/applications/games/solitaire/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_RUNTIME) - include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib) list(APPEND SOURCE diff --git a/base/applications/games/solitaire/lang/ro-RO.rc b/base/applications/games/solitaire/lang/ro-RO.rc index ed6a1f975ed..13e948f271d 100644 --- a/base/applications/games/solitaire/lang/ro-RO.rc +++ b/base/applications/games/solitaire/lang/ro-RO.rc @@ -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) */ diff --git a/base/applications/games/spider/lang/tr-TR.rc b/base/applications/games/spider/lang/tr-TR.rc index 6057b15e5af..29db01e18da 100644 --- a/base/applications/games/spider/lang/tr-TR.rc +++ b/base/applications/games/spider/lang/tr-TR.rc @@ -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 diff --git a/base/applications/games/winmine/lang/tr-TR.rc b/base/applications/games/winmine/lang/tr-TR.rc index b099f26c890..3ada667c5d4 100644 --- a/base/applications/games/winmine/lang/tr-TR.rc +++ b/base/applications/games/winmine/lang/tr-TR.rc @@ -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 diff --git a/base/applications/kbswitch/CMakeLists.txt b/base/applications/kbswitch/CMakeLists.txt index 6fe41a541c7..23d7831a200 100644 --- a/base/applications/kbswitch/CMakeLists.txt +++ b/base/applications/kbswitch/CMakeLists.txt @@ -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) diff --git a/base/applications/kbswitch/kbsdll/CMakeLists.txt b/base/applications/kbswitch/kbsdll/CMakeLists.txt index 8484ee6e39c..b192592cde0 100644 --- a/base/applications/kbswitch/kbsdll/CMakeLists.txt +++ b/base/applications/kbswitch/kbsdll/CMakeLists.txt @@ -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) diff --git a/base/applications/kbswitch/lang/tr-TR.rc b/base/applications/kbswitch/lang/tr-TR.rc index 612c24585e7..5d8073d811a 100644 --- a/base/applications/kbswitch/lang/tr-TR.rc +++ b/base/applications/kbswitch/lang/tr-TR.rc @@ -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 diff --git a/base/applications/magnify/lang/tr-TR.rc b/base/applications/magnify/lang/tr-TR.rc index 5eb162d02f0..e7e45fac8ad 100644 --- a/base/applications/magnify/lang/tr-TR.rc +++ b/base/applications/magnify/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mmc/lang/tr-TR.rc b/base/applications/mmc/lang/tr-TR.rc index 517b0249cd1..e8a79119867 100644 --- a/base/applications/mmc/lang/tr-TR.rc +++ b/base/applications/mmc/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mplay32/lang/ro-RO.rc b/base/applications/mplay32/lang/ro-RO.rc index fc217178e5a..d2d4d757efa 100644 --- a/base/applications/mplay32/lang/ro-RO.rc +++ b/base/applications/mplay32/lang/ro-RO.rc @@ -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 diff --git a/base/applications/mscutils/devmgmt/lang/tr-TR.rc b/base/applications/mscutils/devmgmt/lang/tr-TR.rc index 76638bff41d..eb84a0ee557 100644 --- a/base/applications/mscutils/devmgmt/lang/tr-TR.rc +++ b/base/applications/mscutils/devmgmt/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc b/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc index 1e8e036f6e1..072db2ad9a8 100644 --- a/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc +++ b/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mscutils/eventvwr/CMakeLists.txt b/base/applications/mscutils/eventvwr/CMakeLists.txt index fff7e3a7048..911f446555f 100644 --- a/base/applications/mscutils/eventvwr/CMakeLists.txt +++ b/base/applications/mscutils/eventvwr/CMakeLists.txt @@ -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) diff --git a/base/applications/mscutils/servman/lang/ro-RO.rc b/base/applications/mscutils/servman/lang/ro-RO.rc index 92992df4277..d17be9c3041 100644 --- a/base/applications/mscutils/servman/lang/ro-RO.rc +++ b/base/applications/mscutils/servman/lang/ro-RO.rc @@ -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 diff --git a/base/applications/mscutils/servman/lang/tr-TR.rc b/base/applications/mscutils/servman/lang/tr-TR.rc index 2735a12be22..247ea5437fe 100644 --- a/base/applications/mscutils/servman/lang/tr-TR.rc +++ b/base/applications/mscutils/servman/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mspaint/lang/ro-RO.rc b/base/applications/mspaint/lang/ro-RO.rc index 13e5bba07fa..5fd3f740a91 100644 --- a/base/applications/mspaint/lang/ro-RO.rc +++ b/base/applications/mspaint/lang/ro-RO.rc @@ -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 (¢rată)", IDM_FILEASWALLPAPERCENTERED - MENUITEM "Pune pe fundal (e&xtinsă)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM "Decor de birou (în c&arou)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Decor de birou (¢rat)", 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 diff --git a/base/applications/mspaint/lang/tr-TR.rc b/base/applications/mspaint/lang/tr-TR.rc index 270af868997..efc551b345f 100644 --- a/base/applications/mspaint/lang/tr-TR.rc +++ b/base/applications/mspaint/lang/tr-TR.rc @@ -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 diff --git a/base/applications/mstsc/lang/tr-TR.rc b/base/applications/mstsc/lang/tr-TR.rc index 3944313cd71..da164cf0862 100644 --- a/base/applications/mstsc/lang/tr-TR.rc +++ b/base/applications/mstsc/lang/tr-TR.rc @@ -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 diff --git a/base/applications/network/arp/CMakeLists.txt b/base/applications/network/arp/CMakeLists.txt index 31e3066e219..7f86c4cb4ba 100644 --- a/base/applications/network/arp/CMakeLists.txt +++ b/base/applications/network/arp/CMakeLists.txt @@ -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) diff --git a/base/applications/network/dwnl/CMakeLists.txt b/base/applications/network/dwnl/CMakeLists.txt index 1e7329b4d83..ac0517d4786 100644 --- a/base/applications/network/dwnl/CMakeLists.txt +++ b/base/applications/network/dwnl/CMakeLists.txt @@ -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() diff --git a/base/applications/network/netsh/CMakeLists.txt b/base/applications/network/netsh/CMakeLists.txt index 4b7f0047b0a..bf0265e1e13 100644 --- a/base/applications/network/netsh/CMakeLists.txt +++ b/base/applications/network/netsh/CMakeLists.txt @@ -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) diff --git a/base/applications/network/ping/CMakeLists.txt b/base/applications/network/ping/CMakeLists.txt index ff77e11fb9d..141802a1638 100644 --- a/base/applications/network/ping/CMakeLists.txt +++ b/base/applications/network/ping/CMakeLists.txt @@ -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) diff --git a/base/applications/network/ping/ping.c b/base/applications/network/ping/ping.c index f0f2f732443..7b8bc6ec2cc 100644 --- a/base/applications/network/ping/ping.c +++ b/base/applications/network/ping/ping.c @@ -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); diff --git a/base/applications/network/route/CMakeLists.txt b/base/applications/network/route/CMakeLists.txt index 3f78a6e16f8..bbb89e43739 100644 --- a/base/applications/network/route/CMakeLists.txt +++ b/base/applications/network/route/CMakeLists.txt @@ -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) diff --git a/base/applications/network/tracert/CMakeLists.txt b/base/applications/network/tracert/CMakeLists.txt index 9b55089ec37..ec605ed89a6 100644 --- a/base/applications/network/tracert/CMakeLists.txt +++ b/base/applications/network/tracert/CMakeLists.txt @@ -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) diff --git a/base/applications/network/whois/CMakeLists.txt b/base/applications/network/whois/CMakeLists.txt index 755fc7a9818..be14ff50665 100644 --- a/base/applications/network/whois/CMakeLists.txt +++ b/base/applications/network/whois/CMakeLists.txt @@ -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) diff --git a/base/applications/network/wlanconf/CMakeLists.txt b/base/applications/network/wlanconf/CMakeLists.txt index fe931b3a442..973abbdc316 100644 --- a/base/applications/network/wlanconf/CMakeLists.txt +++ b/base/applications/network/wlanconf/CMakeLists.txt @@ -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) diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index fdc4e76098d..4a6a07a7f52 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -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 diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 470c2ce968a..14754069dfa 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -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 diff --git a/base/applications/rapps/lang/ro-RO.rc b/base/applications/rapps/lang/ro-RO.rc index 3f86fce3857..cec10d4d637 100644 --- a/base/applications/rapps/lang/ro-RO.rc +++ b/base/applications/rapps/lang/ro-RO.rc @@ -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 diff --git a/base/applications/rapps/lang/tr-TR.rc b/base/applications/rapps/lang/tr-TR.rc index 62c9c7fd19b..b9f4051e519 100644 --- a/base/applications/rapps/lang/tr-TR.rc +++ b/base/applications/rapps/lang/tr-TR.rc @@ -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 diff --git a/base/applications/regedit/clb/lang/tr-TR.rc b/base/applications/regedit/clb/lang/tr-TR.rc index d2fdd97b8f1..89ae8ece682 100644 --- a/base/applications/regedit/clb/lang/tr-TR.rc +++ b/base/applications/regedit/clb/lang/tr-TR.rc @@ -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 diff --git a/base/applications/regedit/lang/tr-TR.rc b/base/applications/regedit/lang/tr-TR.rc index 86a7b72529d..c990a2d575a 100644 --- a/base/applications/regedit/lang/tr-TR.rc +++ b/base/applications/regedit/lang/tr-TR.rc @@ -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 diff --git a/base/applications/screensavers/3dtext/lang/tr-TR.rc b/base/applications/screensavers/3dtext/lang/tr-TR.rc index aab24a011c8..986b113549e 100644 --- a/base/applications/screensavers/3dtext/lang/tr-TR.rc +++ b/base/applications/screensavers/3dtext/lang/tr-TR.rc @@ -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 diff --git a/base/applications/screensavers/logon/lang/tr-TR.rc b/base/applications/screensavers/logon/lang/tr-TR.rc index a0a6c7aa171..187fc403a86 100644 --- a/base/applications/screensavers/logon/lang/tr-TR.rc +++ b/base/applications/screensavers/logon/lang/tr-TR.rc @@ -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 diff --git a/base/applications/setup16/CMakeLists.txt b/base/applications/setup16/CMakeLists.txt index 9f1d652adee..9b8f5b9bcbe 100644 --- a/base/applications/setup16/CMakeLists.txt +++ b/base/applications/setup16/CMakeLists.txt @@ -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) diff --git a/base/applications/shutdown/CMakeLists.txt b/base/applications/shutdown/CMakeLists.txt index 8d553e73c63..3d27bb64cdc 100644 --- a/base/applications/shutdown/CMakeLists.txt +++ b/base/applications/shutdown/CMakeLists.txt @@ -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) diff --git a/base/applications/sndrec32/CMakeLists.txt b/base/applications/sndrec32/CMakeLists.txt index 72697a1c3c6..1319008d8ad 100644 --- a/base/applications/sndrec32/CMakeLists.txt +++ b/base/applications/sndrec32/CMakeLists.txt @@ -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) diff --git a/base/applications/sndvol32/lang/tr-TR.rc b/base/applications/sndvol32/lang/tr-TR.rc index 409507afa5b..f8f9a663bd1 100644 --- a/base/applications/sndvol32/lang/tr-TR.rc +++ b/base/applications/sndvol32/lang/tr-TR.rc @@ -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 diff --git a/base/applications/taskmgr/lang/ro-RO.rc b/base/applications/taskmgr/lang/ro-RO.rc index 3e4514eb3b6..e6c2665acb9 100644 --- a/base/applications/taskmgr/lang/ro-RO.rc +++ b/base/applications/taskmgr/lang/ro-RO.rc @@ -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 diff --git a/base/applications/taskmgr/lang/tr-TR.rc b/base/applications/taskmgr/lang/tr-TR.rc index 3dc3554f24f..1e56cbc2467 100644 --- a/base/applications/taskmgr/lang/tr-TR.rc +++ b/base/applications/taskmgr/lang/tr-TR.rc @@ -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 diff --git a/base/applications/winhlp32/lang/Ro.rc b/base/applications/winhlp32/lang/Ro.rc index 7b3b7f9ea8f..0ae741cf608 100644 --- a/base/applications/winhlp32/lang/Ro.rc +++ b/base/applications/winhlp32/lang/Ro.rc @@ -4,6 +4,7 @@ * Copyright 1996 Ulrich Schmid * Copyright 2002 Sylvain Petreolle * 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 diff --git a/base/applications/wordpad/CMakeLists.txt b/base/applications/wordpad/CMakeLists.txt index 96f5f3c7db0..4a1c36e54f4 100644 --- a/base/applications/wordpad/CMakeLists.txt +++ b/base/applications/wordpad/CMakeLists.txt @@ -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) diff --git a/base/applications/wordpad/lang/Ro.rc b/base/applications/wordpad/lang/Ro.rc index 541a9d4e513..0fb89d61144 100644 --- a/base/applications/wordpad/lang/Ro.rc +++ b/base/applications/wordpad/lang/Ro.rc @@ -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 diff --git a/base/applications/wordpad/lang/Tr.rc b/base/applications/wordpad/lang/Tr.rc index 5f8b8d5b219..95a01737ba0 100644 --- a/base/applications/wordpad/lang/Tr.rc +++ b/base/applications/wordpad/lang/Tr.rc @@ -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 diff --git a/base/applications/write/lang/Tr.rc b/base/applications/write/lang/Tr.rc index 44f6220d9cd..b806c0f6ce1 100644 --- a/base/applications/write/lang/Tr.rc +++ b/base/applications/write/lang/Tr.rc @@ -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 diff --git a/base/services/rpcss/CMakeLists.txt b/base/services/rpcss/CMakeLists.txt index 159479d3ea2..583cc039b88 100644 --- a/base/services/rpcss/CMakeLists.txt +++ b/base/services/rpcss/CMakeLists.txt @@ -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) diff --git a/base/services/spoolsv/CMakeLists.txt b/base/services/spoolsv/CMakeLists.txt index a9ae1b29554..1d4686ce2ff 100644 --- a/base/services/spoolsv/CMakeLists.txt +++ b/base/services/spoolsv/CMakeLists.txt @@ -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) diff --git a/base/services/telnetd/CMakeLists.txt b/base/services/telnetd/CMakeLists.txt index f22c3e88ea9..28a1dbb536a 100644 --- a/base/services/telnetd/CMakeLists.txt +++ b/base/services/telnetd/CMakeLists.txt @@ -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) diff --git a/base/services/thmsvc/CMakeLists.txt b/base/services/thmsvc/CMakeLists.txt index 438f25dbe21..6b6360405bc 100644 --- a/base/services/thmsvc/CMakeLists.txt +++ b/base/services/thmsvc/CMakeLists.txt @@ -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) diff --git a/base/services/umpnpmgr/CMakeLists.txt b/base/services/umpnpmgr/CMakeLists.txt index 5987acf4161..2aad52f943c 100644 --- a/base/services/umpnpmgr/CMakeLists.txt +++ b/base/services/umpnpmgr/CMakeLists.txt @@ -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) diff --git a/base/services/wlansvc/CMakeLists.txt b/base/services/wlansvc/CMakeLists.txt index 7f146da50ab..eb4e57417bd 100644 --- a/base/services/wlansvc/CMakeLists.txt +++ b/base/services/wlansvc/CMakeLists.txt @@ -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 diff --git a/base/setup/reactos/lang/ro-RO.rc b/base/setup/reactos/lang/ro-RO.rc index 7ab4b540b73..7e27fcb1595 100644 --- a/base/setup/reactos/lang/ro-RO.rc +++ b/base/setup/reactos/lang/ro-RO.rc @@ -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) */ diff --git a/base/setup/reactos/lang/tr-TR.rc b/base/setup/reactos/lang/tr-TR.rc index 6f21236e7d4..3d26c858242 100644 --- a/base/setup/reactos/lang/tr-TR.rc +++ b/base/setup/reactos/lang/tr-TR.rc @@ -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 diff --git a/base/setup/setup/CMakeLists.txt b/base/setup/setup/CMakeLists.txt index 482ffe6fd1b..6eae7d22796 100644 --- a/base/setup/setup/CMakeLists.txt +++ b/base/setup/setup/CMakeLists.txt @@ -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) diff --git a/base/setup/usetup/CMakeLists.txt b/base/setup/usetup/CMakeLists.txt index a53984ebb8e..b6125f573b1 100644 --- a/base/setup/usetup/CMakeLists.txt +++ b/base/setup/usetup/CMakeLists.txt @@ -1,5 +1,6 @@ add_definitions(${I18N_DEFS}) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${REACTOS_SOURCE_DIR}/lib/inflib diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h index 13980d63bf1..dcac8972059 100644 --- a/base/setup/usetup/lang/ro-RO.h +++ b/base/setup/usetup/lang/ro-RO.h @@ -107,7 +107,7 @@ static MUI_ENTRY roROWelcomePageEntries[] = { 8, 21, - "\x07 Tastai L pentru Termenii i Condiiile de Liceniere", + "\x07 Tastai L pentru Termenii i Condiiile de Liceniere.", TEXT_STYLE_NORMAL }, { @@ -325,13 +325,13 @@ static MUI_ENTRY roROLicensePageEntries[] = { 8, 18, - "ct i internaional. Licenierea se refer doar la", + "ct i internaional. Licenierea se refer doar la distri-", TEXT_STYLE_NORMAL }, { 8, 19, - "distribuirea sistemului ReactOS ctre pri tere.", + "buirea sistemului ReactOS ctre pri tere.", 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, - "selectai \"Accept configuraia dispozitivelor\", apoi", + "selectai \"Accept configuraia dispozitivelor\", apoi confirmai", TEXT_STYLE_NORMAL }, { 6, 25, - "confirmai-o apsnd ENTER.", + "apsnd ENTER.", TEXT_STYLE_NORMAL }, { @@ -575,7 +575,7 @@ static MUI_ENTRY roROComputerPageEntries[] = { 6, 8, - "Dorii specificarea arhitecturii de calcul?", + "Dorii specificarea unei alte arhitecturi de calcul?", TEXT_STYLE_NORMAL }, { @@ -627,19 +627,19 @@ static MUI_ENTRY roROFlushPageEntries[] = { 10, 6, - "Verificarea stocrii datelor necesare.", + "Se verific stocarea datelor necesare.", TEXT_STYLE_NORMAL }, { 10, 8, - "La final, calculatorul va fi repornit automat.", + "Aceasta poate dura cteva momente.", TEXT_STYLE_NORMAL }, { 10, 9, - "Ateptai...", + "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 unitile CD.", + "i toate mediile CD-ROM din unitile CD.", TEXT_STYLE_NORMAL }, { @@ -770,13 +770,13 @@ static MUI_ENTRY roROSuccessPageEntries[] = { 10, 8, - "Scoatei discul flexibil din unitatea A: i toate CD-ROM", + "Scoatei discul flexibil din unitatea A: i toate mediile", TEXT_STYLE_NORMAL }, { 10, 9, - "din unitile CD.", + "CD-ROM din unitile CD.", TEXT_STYLE_NORMAL }, { @@ -857,13 +857,13 @@ static MUI_ENTRY roROSelectPartitionEntries[] = { 6, 8, - "Urmtoarea list cuprinde partiiile existente precum", + "Urmtoarea list cuprinde partiiile existente, precum i", TEXT_STYLE_NORMAL }, { 6, 9, - "i spaiul nefolosit pentru crearea de noi partiii.", + "spaiul liber disponibil pentru crearea de noi partiii.", TEXT_STYLE_NORMAL }, { @@ -1041,7 +1041,7 @@ static MUI_ENTRY roROBootLoaderEntries[] = { 6, 8, - "Instalarea aplicaiei de iniializare a calculatorului", + "Instalare aplicaie de iniializare a calculatorului", TEXT_STYLE_NORMAL }, { @@ -1198,7 +1198,7 @@ static MUI_ENTRY roROPrepareCopyEntries[] = { 6, 8, - "Se fac pregtirile necesare pentru copierea de fiiere.", + "Se fac pregtirile necesare pentru copierea de fiiere...", TEXT_STYLE_NORMAL }, { @@ -1702,7 +1702,7 @@ MUI_STRING roROStrings[] = {STRING_INSTALLCREATEPARTITION, " ENTER = Instalare P/E = Creare partiie Primar/Extins F3 = Ieire"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = Instalare L = Creare partiie Logic F3 = Ieire"}, {STRING_INSTALLDELETEPARTITION, " ENTER = Instalare D = tergere partiie F3 = Ieire"}, {STRING_DELETEPARTITION, @@ -1720,7 +1720,7 @@ MUI_STRING roROStrings[] = {STRING_CREATEPARTITION, " ENTER = Creare partiie ESC = Anulare F3 = Ieire"}, {STRING_PARTFORMAT, - "Aceast Partiie urmeaz s fie formatat."}, + "Aceast partiie urmeaz s fie formatat."}, {STRING_NONFORMATTEDPART, "Alegei s instalai ReactOS pe partiie nou sau neformatat."}, {STRING_INSTALLONPART, diff --git a/base/setup/vmwinst/lang/ro-RO.rc b/base/setup/vmwinst/lang/ro-RO.rc index f44a31b1164..6c093543b3c 100644 --- a/base/setup/vmwinst/lang/ro-RO.rc +++ b/base/setup/vmwinst/lang/ro-RO.rc @@ -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 diff --git a/base/setup/vmwinst/lang/tr-TR.rc b/base/setup/vmwinst/lang/tr-TR.rc index 4bbf06b54cd..241be142c9e 100644 --- a/base/setup/vmwinst/lang/tr-TR.rc +++ b/base/setup/vmwinst/lang/tr-TR.rc @@ -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 diff --git a/base/setup/welcome/lang/tr-TR.rc b/base/setup/welcome/lang/tr-TR.rc index abde0ea6344..211cc08e17f 100644 --- a/base/setup/welcome/lang/tr-TR.rc +++ b/base/setup/welcome/lang/tr-TR.rc @@ -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 diff --git a/base/shell/cmd/filecomp.c b/base/shell/cmd/filecomp.c index f5b6ac67f23..adacf9092fb 100644 --- a/base/shell/cmd/filecomp.c +++ b/base/shell/cmd/filecomp.c @@ -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); diff --git a/base/shell/explorer-new/CMakeLists.txt b/base/shell/explorer-new/CMakeLists.txt index c4f1757cf76..2672ce321dd 100644 --- a/base/shell/explorer-new/CMakeLists.txt +++ b/base/shell/explorer-new/CMakeLists.txt @@ -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) diff --git a/base/shell/explorer-new/lang/tr-TR.rc b/base/shell/explorer-new/lang/tr-TR.rc index 95ea9523ca6..85c6722a24e 100644 --- a/base/shell/explorer-new/lang/tr-TR.rc +++ b/base/shell/explorer-new/lang/tr-TR.rc @@ -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 diff --git a/base/shell/explorer/CMakeLists.txt b/base/shell/explorer/CMakeLists.txt index 5b2a3394f5f..651b7f52451 100644 --- a/base/shell/explorer/CMakeLists.txt +++ b/base/shell/explorer/CMakeLists.txt @@ -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) diff --git a/base/shell/explorer/explorer-ro.rc b/base/shell/explorer/explorer-ro.rc index 95b121f1ef6..f2ef1371661 100644 --- a/base/shell/explorer/explorer-ro.rc +++ b/base/shell/explorer/explorer-ro.rc @@ -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 diff --git a/base/system/autochk/CMakeLists.txt b/base/system/autochk/CMakeLists.txt index b132b6c3935..ba720da364d 100644 --- a/base/system/autochk/CMakeLists.txt +++ b/base/system/autochk/CMakeLists.txt @@ -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) diff --git a/base/system/bootok/CMakeLists.txt b/base/system/bootok/CMakeLists.txt index 216a0fc8d9e..22bc0ece964 100644 --- a/base/system/bootok/CMakeLists.txt +++ b/base/system/bootok/CMakeLists.txt @@ -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) diff --git a/base/system/diskpart/CMakeLists.txt b/base/system/diskpart/CMakeLists.txt index f1cbf96abe3..7271df646af 100644 --- a/base/system/diskpart/CMakeLists.txt +++ b/base/system/diskpart/CMakeLists.txt @@ -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) diff --git a/base/system/expand/CMakeLists.txt b/base/system/expand/CMakeLists.txt index 5a680bfa97c..db4f8f30462 100644 --- a/base/system/expand/CMakeLists.txt +++ b/base/system/expand/CMakeLists.txt @@ -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) diff --git a/base/system/format/CMakeLists.txt b/base/system/format/CMakeLists.txt index 0907bc0490a..68ca5461923 100644 --- a/base/system/format/CMakeLists.txt +++ b/base/system/format/CMakeLists.txt @@ -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) diff --git a/base/system/lsass/CMakeLists.txt b/base/system/lsass/CMakeLists.txt index def568ae356..46ca92bfec7 100644 --- a/base/system/lsass/CMakeLists.txt +++ b/base/system/lsass/CMakeLists.txt @@ -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) diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt index c267c0947a5..e8c8fba0571 100644 --- a/base/system/msiexec/CMakeLists.txt +++ b/base/system/msiexec/CMakeLists.txt @@ -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) diff --git a/base/system/rundll32/CMakeLists.txt b/base/system/rundll32/CMakeLists.txt index 078d85aa103..9eef981f0b4 100644 --- a/base/system/rundll32/CMakeLists.txt +++ b/base/system/rundll32/CMakeLists.txt @@ -1,3 +1,4 @@ + add_executable(rundll32 rundll32.c rundll32.rc) set_module_type(rundll32 win32gui UNICODE) add_importlibs(rundll32 user32 msvcrt kernel32 ntdll) diff --git a/base/system/rundll32/lang/tr-TR.rc b/base/system/rundll32/lang/tr-TR.rc index e33c668bc4e..1bb23f64cae 100644 --- a/base/system/rundll32/lang/tr-TR.rc +++ b/base/system/rundll32/lang/tr-TR.rc @@ -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 diff --git a/base/system/runonce/lang/ro-RO.rc b/base/system/runonce/lang/ro-RO.rc index 0a38e9015b6..a77b326df4b 100644 --- a/base/system/runonce/lang/ro-RO.rc +++ b/base/system/runonce/lang/ro-RO.rc @@ -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 diff --git a/base/system/runonce/lang/tr-TR.rc b/base/system/runonce/lang/tr-TR.rc index 76de1eab405..c5b5060f49c 100644 --- a/base/system/runonce/lang/tr-TR.rc +++ b/base/system/runonce/lang/tr-TR.rc @@ -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 diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt index c3ea514db36..31b4b58e69e 100644 --- a/base/system/services/CMakeLists.txt +++ b/base/system/services/CMakeLists.txt @@ -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 diff --git a/base/system/userinit/lang/tr-TR.rc b/base/system/userinit/lang/tr-TR.rc index 870c00f1342..c1959d3778e 100644 --- a/base/system/userinit/lang/tr-TR.rc +++ b/base/system/userinit/lang/tr-TR.rc @@ -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 diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index d290b69459c..62f17afdb36 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -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) */ diff --git a/base/system/winlogon/lang/tr-TR.rc b/base/system/winlogon/lang/tr-TR.rc index 3ed9b5e12f6..1cb112ff8bc 100644 --- a/base/system/winlogon/lang/tr-TR.rc +++ b/base/system/winlogon/lang/tr-TR.rc @@ -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 diff --git a/boot/bootdata/packages/CMakeLists.txt b/boot/bootdata/packages/CMakeLists.txt index f9d1e847acc..9c3ca3f50db 100644 --- a/boot/bootdata/packages/CMakeLists.txt +++ b/boot/bootdata/packages/CMakeLists.txt @@ -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) - diff --git a/boot/freeldr/bootsect/CMakeLists.txt b/boot/freeldr/bootsect/CMakeLists.txt index 51b0ebb1d85..881c84d5712 100644 --- a/boot/freeldr/bootsect/CMakeLists.txt +++ b/boot/freeldr/bootsect/CMakeLists.txt @@ -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() - diff --git a/boot/freeldr/fdebug/lang/tr-TR.rc b/boot/freeldr/fdebug/lang/tr-TR.rc index 0f577efb25d..96935a1b1a6 100644 --- a/boot/freeldr/fdebug/lang/tr-TR.rc +++ b/boot/freeldr/fdebug/lang/tr-TR.rc @@ -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 diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 9e8c355ad03..f5b3d1b7de8 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -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) diff --git a/boot/freeldr/freeldr/arch/amd64/entry.S b/boot/freeldr/freeldr/arch/amd64/entry.S index 9379008f9de..47080b39cf4 100644 --- a/boot/freeldr/freeldr/arch/amd64/entry.S +++ b/boot/freeldr/freeldr/arch/amd64/entry.S @@ -121,7 +121,7 @@ CallRealMode_return: /* 64-bit stack pointer */ stack64: - .double STACK64ADDR + .double STACKADDR PUBLIC FrldrBootDrive FrldrBootDrive: diff --git a/boot/freeldr/freeldr/arch/i386/entry.S b/boot/freeldr/freeldr/arch/i386/entry.S index 795cd40afe0..09003cff5f4 100644 --- a/boot/freeldr/freeldr/arch/i386/entry.S +++ b/boot/freeldr/freeldr/arch/i386/entry.S @@ -257,7 +257,7 @@ stack16: /* 32-bit stack pointer */ stack32: - .long STACK32ADDR + .long STACKADDR .align 4 /* force 4-byte alignment */ gdt: diff --git a/boot/freeldr/freeldr/arch/i386/i386bug.c b/boot/freeldr/freeldr/arch/i386/i386bug.c index 1722b6c4294..d31796d16de 100644 --- a/boot/freeldr/freeldr/arch/i386/i386bug.c +++ b/boot/freeldr/freeldr/arch/i386/i386bug.c @@ -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( diff --git a/boot/freeldr/freeldr/arch/i386/pcmem.c b/boot/freeldr/freeldr/arch/i386/pcmem.c index bf045531aa4..76601e4118a 100644 --- a/boot/freeldr/freeldr/arch/i386/pcmem.c +++ b/boot/freeldr/freeldr/arch/i386/pcmem.c @@ -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 */ diff --git a/boot/freeldr/freeldr/debug.c b/boot/freeldr/freeldr/debug.c index dfde53f27d7..22b8cb83e3b 100644 --- a/boot/freeldr/freeldr/debug.c +++ b/boot/freeldr/freeldr/debug.c @@ -444,6 +444,7 @@ char *BugCodeStrings[] = "TEST_BUGCHECK", "MISSING_HARDWARE_REQUIREMENTS", "FREELDR_IMAGE_CORRUPTION", + "MEMORY_INIT_FAILURE", }; ULONG_PTR BugCheckInfo[5]; diff --git a/boot/freeldr/freeldr/include/arch/pc/x86common.h b/boot/freeldr/freeldr/include/arch/pc/x86common.h index 3d5c7ffb4cb..b238a8fd97a 100644 --- a/boot/freeldr/freeldr/include/arch/pc/x86common.h +++ b/boot/freeldr/freeldr/include/arch/pc/x86common.h @@ -11,13 +11,13 @@ //#endif #define STACK16ADDR HEX(6F00) /* The 16-bit stack top will be at 0000:6F00 */ #define BSS_START HEX(6F00) +#define STACKLOW HEX(7000) +#define STACKADDR HEX(F000) /* The 32/64-bit stack top will be at 0000:F000, or 0xF000 */ #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define DISKREADBUFFER HEX(80000) /* Buffer to store data read in from the disk via the BIOS */ -#define STACKLOWLIMIT HEX(90000) -#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ -#define STACK64ADDR HEX(98000) /* The 64-bit stack top will be at 98000 */ -#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ +#define DISKREADBUFFER HEX(8E000) /* Buffer to store data read in from the disk via the BIOS */ +#define BIOSCALLBUFFER HEX(9E000) /* Buffer to store temporary data for any Int386() call */ +/* 9F000- 9FFFF is reserved for the EBDA */ #define DISKREADBUFFER_SIZE HEX(10000) #define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ diff --git a/boot/freeldr/freeldr/include/debug.h b/boot/freeldr/freeldr/include/debug.h index b88c1bd0b49..77a7eed98ac 100644 --- a/boot/freeldr/freeldr/include/debug.h +++ b/boot/freeldr/freeldr/include/debug.h @@ -124,12 +124,22 @@ void NTAPI FrLdrBugCheck(ULONG BugCode); +VOID +NTAPI +FrLdrBugCheckWithMessage( + ULONG BugCode, + PCHAR File, + ULONG Line, + PSTR Format, + ...); + /* Bugcheck codes */ enum _FRLDR_BUGCHECK_CODES { TEST_BUGCHECK, MISSING_HARDWARE_REQUIREMENTS, FREELDR_IMAGE_CORRUPTION, + MEMORY_INIT_FAILURE, }; extern char *BugCodeStrings[]; diff --git a/boot/freeldr/freeldr/mm/meminit.c b/boot/freeldr/freeldr/mm/meminit.c index 80871c79c08..b0db4bdd487 100644 --- a/boot/freeldr/freeldr/mm/meminit.c +++ b/boot/freeldr/freeldr/mm/meminit.c @@ -159,8 +159,8 @@ ArcGetMemoryDescriptor(const FREELDR_MEMORY_DESCRIPTOR* Current) } } - -BOOLEAN +static +VOID MmCheckFreeldrImageFile() { PIMAGE_NT_HEADERS NtHeaders; @@ -172,7 +172,11 @@ MmCheckFreeldrImageFile() if (!NtHeaders) { ERR("Could not get NtHeaders!\n"); - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "Could not get NtHeaders!\n"); } /* Check the file header */ @@ -184,12 +188,21 @@ MmCheckFreeldrImageFile() (FileHeader->SizeOfOptionalHeader != sizeof(IMAGE_OPTIONAL_HEADER))) { ERR("FreeLdr FileHeader is invalid.\n"); - BugCheckInfo[0] = FileHeader->Machine; - BugCheckInfo[1] = FileHeader->NumberOfSections; - BugCheckInfo[2] = FileHeader->PointerToSymbolTable; - BugCheckInfo[3] = FileHeader->NumberOfSymbols; - BugCheckInfo[4] = FileHeader->SizeOfOptionalHeader; - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr FileHeader is invalid.\n" + "Machine == 0x%lx, expected 0x%lx\n" + "NumberOfSections == 0x%lx, expected 0x%lx\n" + "PointerToSymbolTable == 0x%lx, expected 0\n" + "NumberOfSymbols == 0x%lx, expected 0\n" + "SizeOfOptionalHeader == 0x%lx, expected 0x%lx\n", + FileHeader->Machine, IMAGE_FILE_MACHINE_NATIVE, + FileHeader->NumberOfSections, FREELDR_SECTION_COUNT, + FileHeader->PointerToSymbolTable, + FileHeader->NumberOfSymbols, + FileHeader->SizeOfOptionalHeader, sizeof(IMAGE_OPTIONAL_HEADER)); } /* Check the optional header */ @@ -201,15 +214,22 @@ MmCheckFreeldrImageFile() (OptionalHeader->SectionAlignment != OptionalHeader->FileAlignment)) { ERR("FreeLdr OptionalHeader is invalid.\n"); - BugCheckInfo[0] = 0x80000000 | (OptionalHeader->Subsystem << 16) | OptionalHeader->Magic; - BugCheckInfo[1] = OptionalHeader->ImageBase; - BugCheckInfo[2] = OptionalHeader->SizeOfImage; - BugCheckInfo[3] = OptionalHeader->SectionAlignment; - BugCheckInfo[4] = OptionalHeader->FileAlignment; - return FALSE; + FrLdrBugCheckWithMessage( + FREELDR_IMAGE_CORRUPTION, + __FILE__, + __LINE__, + "FreeLdr OptionalHeader is invalid.\n" + "Magic == 0x%lx, expected 0x%lx\n" + "Subsystem == 0x%lx, expected 1 (native)\n" + "ImageBase == 0x%lx, expected 0x%lx\n" + "SizeOfImage == 0x%lx, maximum 0x%lx\n" + "SectionAlignment 0x%lx doesn't match FileAlignment 0x%lx\n", + OptionalHeader->Magic, IMAGE_NT_OPTIONAL_HDR_MAGIC, + OptionalHeader->Subsystem, + OptionalHeader->ImageBase, FREELDR_PE_BASE, + OptionalHeader->SizeOfImage, MAX_FREELDR_PE_SIZE, + OptionalHeader->SectionAlignment, OptionalHeader->FileAlignment); } - - return TRUE; } BOOLEAN MmInitializeMemoryManager(VOID) @@ -221,10 +241,7 @@ BOOLEAN MmInitializeMemoryManager(VOID) TRACE("Initializing Memory Manager.\n"); /* Check the freeldr binary */ - if (!MmCheckFreeldrImageFile()) - { - FrLdrBugCheck(FREELDR_IMAGE_CORRUPTION); - } + MmCheckFreeldrImageFile(); BiosMemoryMap = MachVtbl.GetMemoryMap(&BiosMemoryMapEntryCount); diff --git a/boot/freeldr/install/CMakeLists.txt b/boot/freeldr/install/CMakeLists.txt index cca907cabf5..8379b3172d6 100644 --- a/boot/freeldr/install/CMakeLists.txt +++ b/boot/freeldr/install/CMakeLists.txt @@ -4,5 +4,4 @@ add_executable(installfreeldr EXCLUDE_FROM_ALL volume.c) set_module_type(installfreeldr win32cui) - add_importlibs(installfreeldr msvcrt kernel32) diff --git a/cmake/CMakeMacros.cmake b/cmake/CMakeMacros.cmake index 03e53bd77e1..85eff72da34 100644 --- a/cmake/CMakeMacros.cmake +++ b/cmake/CMakeMacros.cmake @@ -502,14 +502,6 @@ function(add_importlibs _module) if("${LIB}" MATCHES "msvcrt") add_target_compile_definitions(${_module} _DLL __USE_CRTIMP) target_link_libraries(${_module} msvcrtex) - if(MSVC) - if(RUNTIME_CHECKS) - if(NOT ${_module} STREQUAL "kernel32") - add_target_compile_flags(${_module} "/RTC1") - target_link_libraries(${_module} RunTmChk.lib) - endif() - endif() - endif() endif() target_link_libraries(${_module} lib${LIB}) add_dependencies(${_module} lib${LIB}) @@ -533,17 +525,6 @@ function(set_module_type MODULE TYPE) set(__subsystem console) elseif(${TYPE} STREQUAL win32gui) set(__subsystem windows) - elseif(${TYPE} STREQUAL kbdlayout) - set_entrypoint(${MODULE} 0) - set_image_base(${MODULE} 0x5FFF0000) - set_subsystem(${MODULE} native) - if (MSVC) - # Merge the .text and .rdata section into the .data section - add_target_link_flags(${MODULE} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data") - else() - # Use a custom linker script - add_target_link_flags(${MODULE} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") - endif() elseif(NOT ((${TYPE} STREQUAL win32dll) OR (${TYPE} STREQUAL win32ocx) OR (${TYPE} STREQUAL cpl) OR (${TYPE} STREQUAL module))) message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") @@ -618,19 +599,19 @@ function(set_module_type MODULE TYPE) #set base address if(__module_IMAGEBASE) - set_image_base(${MODULE} __module_IMAGEBASE) + set_image_base(${MODULE} ${__module_IMAGEBASE}) elseif(${TYPE} STREQUAL win32dll) if(DEFINED baseaddress_${MODULE}) set_image_base(${MODULE} ${baseaddress_${MODULE}}) else() message(STATUS "${MODULE} has no base address") endif() - elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) + elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) set_image_base(${MODULE} 0x00010000) endif() # Now do some stuff which is specific to each type - if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kernelmodedll)) + if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver) OR (${TYPE} STREQUAL kerneldll)) add_dependencies(${MODULE} bugcodes) if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver)) set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys") diff --git a/cmake/baseaddress.cmake b/cmake/baseaddress.cmake index 8224848b3cb..7a4a1a12ee1 100644 --- a/cmake/baseaddress.cmake +++ b/cmake/baseaddress.cmake @@ -272,7 +272,7 @@ set(baseaddress_wbemdisp 0x70cd0000) set(baseaddress_wbemprox 0x70c70000) set(baseaddress_windowscodecs 0x70b60000) set(baseaddress_windowscodecsext 0x70b30000) -set(baseaddress_wined3d 0x70960000) +set(baseaddress_d3dwine 0x70960000) set(baseaddress_winfax 0x70930000) set(baseaddress_wing32 0x70900000) set(baseaddress_winhttp 0x708a0000) diff --git a/cmake/baseaddress_dwarf.cmake b/cmake/baseaddress_dwarf.cmake index 19d7c899cb7..3082c2552cb 100644 --- a/cmake/baseaddress_dwarf.cmake +++ b/cmake/baseaddress_dwarf.cmake @@ -280,7 +280,7 @@ set(baseaddress_wbemdisp 0x6ec80000) set(baseaddress_wbemprox 0x6ebf0000) set(baseaddress_windowscodecs 0x6ea60000) set(baseaddress_windowscodecsext 0x6ea30000) -set(baseaddress_wined3d 0x6e790000) +set(baseaddress_d3dwine 0x6e790000) set(baseaddress_winfax 0x6e760000) set(baseaddress_wing32 0x6e730000) set(baseaddress_winhttp 0x6e6b0000) diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 3b57f793e5c..05cf755315a 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -88,6 +88,7 @@ endif() if(RUNTIME_CHECKS) add_definitions(-D__RUNTIME_CHECKS__) + add_compile_flags("/RTC1") endif() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE") @@ -232,6 +233,11 @@ function(set_module_type_toolchain MODULE TYPE) elseif(${TYPE} STREQUAL "wdmdriver") add_target_link_flags(${MODULE} "/DRIVER:WDM") endif() + + if(RUNTIME_CHECKS) + target_link_libraries(${MODULE} runtmchk) + endif() + endfunction() # Define those for having real libraries diff --git a/dll/3rdparty/dxtn/CMakeLists.txt b/dll/3rdparty/dxtn/CMakeLists.txt index d4b2425c039..37b33b3549c 100644 --- a/dll/3rdparty/dxtn/CMakeLists.txt +++ b/dll/3rdparty/dxtn/CMakeLists.txt @@ -9,9 +9,5 @@ add_library(dxtn SHARED ${CMAKE_CURRENT_BINARY_DIR}/dxtn.def) set_entrypoint(dxtn 0) - add_importlibs(dxtn msvcrt) - -add_dependencies(dxtn psdk) - add_cd_file(TARGET dxtn DESTINATION reactos/system32 FOR all) diff --git a/dll/3rdparty/libjpeg/CMakeLists.txt b/dll/3rdparty/libjpeg/CMakeLists.txt index bd04bafc395..3203ca2b663 100644 --- a/dll/3rdparty/libjpeg/CMakeLists.txt +++ b/dll/3rdparty/libjpeg/CMakeLists.txt @@ -60,5 +60,4 @@ add_library(libjpeg SHARED set_module_type(libjpeg win32dll) add_importlibs(libjpeg msvcrt kernel32) -add_dependencies(libjpeg psdk) add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index 6ea7bb06e29..03736259bf6 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -55,7 +55,6 @@ add_library(libtiff SHARED ${SOURCE}) set_module_type(libtiff win32dll) target_link_libraries(libtiff zlib getopt) add_importlibs(libtiff user32 msvcrt kernel32 ntdll) -add_dependencies(libtiff psdk) add_pch(libtiff precomp.h SOURCE) add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all) diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt index 648ca8d4a62..690ff020e52 100644 --- a/dll/3rdparty/libxslt/CMakeLists.txt +++ b/dll/3rdparty/libxslt/CMakeLists.txt @@ -39,11 +39,11 @@ add_library(libxslt SHARED ${SOURCE}) set_module_type(libxslt win32dll) target_link_libraries(libxslt libxml2 iconv-static zlib) add_importlibs(libxslt msvcrt ws2_32 kernel32) + if(MSVC) add_importlibs(libxslt ntdll) endif() -add_dependencies(libxslt psdk) add_pch(libxslt precomp.h SOURCE) add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/access/lang/tr-TR.rc b/dll/cpl/access/lang/tr-TR.rc index 09f8bde2d4d..d040802edcc 100644 --- a/dll/cpl/access/lang/tr-TR.rc +++ b/dll/cpl/access/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/appwiz/CMakeLists.txt b/dll/cpl/appwiz/CMakeLists.txt index 9c3ea4827b6..acb3c8307b2 100644 --- a/dll/cpl/appwiz/CMakeLists.txt +++ b/dll/cpl/appwiz/CMakeLists.txt @@ -1,11 +1,9 @@ -include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) - +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(appwiz.cpl appwiz.spec) list(APPEND SOURCE diff --git a/dll/cpl/appwiz/lang/tr-TR.rc b/dll/cpl/appwiz/lang/tr-TR.rc index 81322807f44..b800c3b38ee 100644 --- a/dll/cpl/appwiz/lang/tr-TR.rc +++ b/dll/cpl/appwiz/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/console/CMakeLists.txt b/dll/cpl/console/CMakeLists.txt index 245bc2bab02..c65229af0f8 100644 --- a/dll/cpl/console/CMakeLists.txt +++ b/dll/cpl/console/CMakeLists.txt @@ -20,14 +20,6 @@ add_library(console SHARED set_module_type(console cpl UNICODE) set_target_properties(console PROPERTIES SUFFIX ".dll") - -add_importlibs(console - msvcrt - user32 - gdi32 - comctl32 - kernel32 - ntdll) - +add_importlibs(console user32 gdi32 comctl32 msvcrt kernel32 ntdll) add_pch(console console.h SOURCE) add_cd_file(TARGET console DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/console/lang/ro-RO.rc b/dll/cpl/console/lang/ro-RO.rc index fda9e11e1e9..5f5be0e1b6c 100644 --- a/dll/cpl/console/lang/ro-RO.rc +++ b/dll/cpl/console/lang/ro-RO.rc @@ -4,7 +4,7 @@ * FILE: dll/cpl/console/lang/ro-RO.rc * PURPOSE: Romanian resource file * TRANSLATOR: Petru Dimitriu (petrimetri AT gmail.com) - * 2011-11-07 Fulea Ștefan: minor changes + * Ștefan Fulea (stefan dot fulea at mail dot md) */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -14,26 +14,26 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION CAPTION "Opțiuni" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Mărime cursor", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "M&ică", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 - CONTROL "M&edie", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 - CONTROL "M&are", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Dimensiune cursor", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "Red&usă", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "Me&die", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Mărită", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 GROUPBOX "Mod de afișare", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP - CONTROL "În fe&reastră", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 - CONTROL "Pe &tot ecranul", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + CONTROL "În fere&astră", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "Pe t&ot ecranul", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 GROUPBOX "Istoric pentru comenzi", -1, 7, 85, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "N&umăr de înregistrări:", -1, 14, 101, 70, 12 + LTEXT "Ma&xim înregistrări:", -1, 14, 101, 70, 12 EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 97, 12, 15 - LTEXT "Nu&măr de registre:", -1, 14, 124, 70, 12 + LTEXT "&Cantitate registre:", -1, 14, 124, 70, 12 EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 119, 120, 12, 15 - CHECKBOX "Înlătură dublicatele &vechi", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + CHECKBOX "Înlătură duplicatele &vechi", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 GROUPBOX "Opțiuni de editare", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP - CHECKBOX "Mod E&ditareRapidă", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP - CHECKBOX "Mod In&serție", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "Mod de &editare rapidă”", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "Mod de inse&rție”", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 @@ -42,7 +42,7 @@ CAPTION "Font" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Previzionare:", -1, 10, 10, 94, 10 - LTEXT "&Mărime:", -1, 180, 10, 36, 10 + LTEXT "Mărime:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | WS_VSCROLL LTEXT "F&ont:", -1, 10, 105, 33, 10 @@ -82,7 +82,7 @@ BEGIN CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 92, 13, 14 GROUPBOX "Poziția fereastrei", -1, 130, 116, 115, 64 - LTEXT "&Stânga:", -1, 140, 132, 38, 10 + LTEXT "Stâng&a:", -1, 140, 132, 38, 10 LTEXT "S&us:", -1, 140, 149, 40, 10 EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | @@ -90,7 +90,7 @@ BEGIN EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 238, 146, 13, 14 - CHECKBOX "&Amplasare automată", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 + CHECKBOX "A&mplasare automată", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 diff --git a/dll/cpl/console/lang/tr-TR.rc b/dll/cpl/console/lang/tr-TR.rc index 568d28d4dd6..76652dbe66a 100644 --- a/dll/cpl/console/lang/tr-TR.rc +++ b/dll/cpl/console/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/desk/CMakeLists.txt b/dll/cpl/desk/CMakeLists.txt index 7ff759c6084..41cfa724712 100644 --- a/dll/cpl/desk/CMakeLists.txt +++ b/dll/cpl/desk/CMakeLists.txt @@ -30,21 +30,6 @@ add_library(desk SHARED set_module_type(desk cpl UNICODE) target_link_libraries(desk uuid) - -add_importlibs(desk - msvcrt - user32 - advapi32 - gdi32 - comctl32 - comdlg32 - ole32 - setupapi - shell32 - shlwapi - uxtheme - kernel32 - ntdll) - +add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme msvcrt kernel32 ntdll) add_pch(desk desk.h SOURCE) add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/desk/lang/ro-RO.rc b/dll/cpl/desk/lang/ro-RO.rc index 4a953cd1f2e..9e21949e52e 100644 --- a/dll/cpl/desk/lang/ro-RO.rc +++ b/dll/cpl/desk/lang/ro-RO.rc @@ -1,4 +1,7 @@ -/* Ș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 @@ -32,7 +35,7 @@ BEGIN CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 LTEXT "minute", IDC_MINTEXT, 70, 125, 26, 9 - CONTROL "&Solicită parolă la revenire", IDC_SCREENS_USEPASSCHK, "button", + CONTROL "Solicită pa&rolă la revenire", IDC_SCREENS_USEPASSCHK, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 GROUPBOX "Me&canisme de gestiune a consumului", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Aici veți putea ajusta parametrii actuali pentru gestiunea consumului de energie.", IDC_STATIC, 14, 166, 146, 27 @@ -79,7 +82,7 @@ BEGIN LTEXT "F&ont", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Măr&ime", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + LTEXT "Mă&rime", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL LTEXT "&Culoare", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP diff --git a/dll/cpl/desk/lang/tr-TR.rc b/dll/cpl/desk/lang/tr-TR.rc index b18abe4ec58..5ca4e40980b 100644 --- a/dll/cpl/desk/lang/tr-TR.rc +++ b/dll/cpl/desk/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/hdwwiz/CMakeLists.txt b/dll/cpl/hdwwiz/CMakeLists.txt index accc2fe2538..aa4a1496b07 100644 --- a/dll/cpl/hdwwiz/CMakeLists.txt +++ b/dll/cpl/hdwwiz/CMakeLists.txt @@ -1,18 +1,11 @@ spec2def(hdwwiz.cpl hdwwiz.spec) -add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def) + +add_library(hdwwiz SHARED + hdwwiz.c + hdwwiz.rc + ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def) + set_module_type(hdwwiz cpl UNICODE) - -add_importlibs(hdwwiz - msvcrt - setupapi - advapi32 - comctl32 - rpcrt4 - user32 - gdi32 - devmgr - kernel32 - ntdll) - +add_importlibs(hdwwiz setupapi advapi32 comctl32 rpcrt4 user32 gdi32 devmgr msvcrt kernel32 ntdll) add_cd_file(TARGET hdwwiz DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/hdwwiz/lang/ro-RO.rc b/dll/cpl/hdwwiz/lang/ro-RO.rc index e2067a47c8f..ef1033f175c 100644 --- a/dll/cpl/hdwwiz/lang/ro-RO.rc +++ b/dll/cpl/hdwwiz/lang/ro-RO.rc @@ -3,7 +3,7 @@ * FILE: dll/cpl/hdwwiz/lang/ro-RO.rc * PURPOSE: Romanian Language File for add hardware control panel * TRANSLATORS: - * Petre Dumitriu + * Petru Dumitriu (petrimetri at gmail dot com) * Ștefan Fulea (stefan dot fulea at mail dot md) */ @@ -38,8 +38,8 @@ CAPTION "Asistent de adăugare a componentelor fizice" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Componenta fizică este conectată la calculator?", -1, 20, 11, 275, 8 - AUTORADIOBUTTON "&Da, am conectat deja componenta fizică.", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP - AUTORADIOBUTTON "N&u, încă nu am conectat componenta fizică.", IDC_NOTCONNECTED, 29, 35, 266, 8 + AUTORADIOBUTTON "Componenta fizică &este deja conectată.", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP + AUTORADIOBUTTON "Componenta fizică încă n&u a fost conectată.", IDC_NOTCONNECTED, 29, 35, 266, 8 END IDD_PROBELISTPAGE DIALOG 0, 0, 317, 143 diff --git a/dll/cpl/hdwwiz/lang/tr-TR.rc b/dll/cpl/hdwwiz/lang/tr-TR.rc index 600dc04faf0..da1c959ab58 100644 --- a/dll/cpl/hdwwiz/lang/tr-TR.rc +++ b/dll/cpl/hdwwiz/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/hotplug/CMakeLists.txt b/dll/cpl/hotplug/CMakeLists.txt index c5ec3d68ceb..46c8d3de2dc 100644 --- a/dll/cpl/hotplug/CMakeLists.txt +++ b/dll/cpl/hotplug/CMakeLists.txt @@ -1,25 +1,15 @@ - spec2def(hotplug.dll hotplug.spec) list(APPEND SOURCE hotplug.c - enum.c + enum.c) + +add_library(hotplug SHARED + ${SOURCE} hotplug.rc ${CMAKE_CURRENT_BINARY_DIR}/hotplug.def) -add_library(hotplug SHARED ${SOURCE}) - set_module_type(hotplug win32dll UNICODE) - -add_importlibs(hotplug - msvcrt - user32 - gdi32 - advapi32 - ntdll - setupapi - comctl32 - kernel32) - +add_importlibs(hotplug user32 gdi32 advapi32 setupapi comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET hotplug DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/inetcpl/lang/tr-TR.rc b/dll/cpl/inetcpl/lang/tr-TR.rc index aa5101a2617..d8d66fdb42f 100644 --- a/dll/cpl/inetcpl/lang/tr-TR.rc +++ b/dll/cpl/inetcpl/lang/tr-TR.rc @@ -1,7 +1,7 @@ /* * Turkish resources for the Internet control panel applet * - * 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 diff --git a/dll/cpl/input/CMakeLists.txt b/dll/cpl/input/CMakeLists.txt index 6a262f5da32..a04dbc0026e 100644 --- a/dll/cpl/input/CMakeLists.txt +++ b/dll/cpl/input/CMakeLists.txt @@ -16,14 +16,6 @@ add_library(input SHARED ${CMAKE_CURRENT_BINARY_DIR}/input.def) set_module_type(input win32dll UNICODE) - -add_importlibs(input - msvcrt - advapi32 - user32 - comctl32 - gdi32 - kernel32) - +add_importlibs(input advapi32 user32 comctl32 gdi32 msvcrt kernel32) add_pch(input input.h SOURCE) add_cd_file(TARGET input DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 2518f713420..59c2a56e49a 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/intl/CMakeLists.txt b/dll/cpl/intl/CMakeLists.txt index 22811a68921..47ece397e4f 100644 --- a/dll/cpl/intl/CMakeLists.txt +++ b/dll/cpl/intl/CMakeLists.txt @@ -22,16 +22,6 @@ add_library(intl SHARED ${CMAKE_CURRENT_BINARY_DIR}/intl.def) set_module_type(intl cpl UNICODE) - -add_importlibs(intl - msvcrt - user32 - comctl32 - advapi32 - setupapi - shell32 - kernel32 - ntdll) - +add_importlibs(intl user32 comctl32 advapi32 setupapi shell32 msvcrt kernel32 ntdll) add_pch(intl intl.h SOURCE) add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/joy/CMakeLists.txt b/dll/cpl/joy/CMakeLists.txt index d0759ae1cf8..5bee7b4561d 100644 --- a/dll/cpl/joy/CMakeLists.txt +++ b/dll/cpl/joy/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(joy.cpl joy.spec) -add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def) + +add_library(joy SHARED + joy.c + joy.rc + ${CMAKE_CURRENT_BINARY_DIR}/joy.def) + set_module_type(joy cpl UNICODE) target_link_libraries(joy uuid) - -add_importlibs(joy - user32 - comctl32 - ole32 - shell32 - msvcrt - kernel32 - ntdll) - +add_importlibs(joy user32 comctl32 ole32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET joy DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/joy/lang/tr-TR.rc b/dll/cpl/joy/lang/tr-TR.rc index 95a051e7c81..2983b7b5632 100644 --- a/dll/cpl/joy/lang/tr-TR.rc +++ b/dll/cpl/joy/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/liccpa/lang/tr-TR.rc b/dll/cpl/liccpa/lang/tr-TR.rc index 6468a60eb50..4926eeae6d8 100644 --- a/dll/cpl/liccpa/lang/tr-TR.rc +++ b/dll/cpl/liccpa/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/main/CMakeLists.txt b/dll/cpl/main/CMakeLists.txt index e17d27239e6..e450ddb9f59 100644 --- a/dll/cpl/main/CMakeLists.txt +++ b/dll/cpl/main/CMakeLists.txt @@ -14,17 +14,6 @@ add_library(main SHARED set_module_type(main cpl UNICODE) target_link_libraries(main uuid) - -add_importlibs(main - msvcrt - advapi32 - user32 - comctl32 - devmgr - comdlg32 - shell32 - gdi32 - kernel32) - +add_importlibs(main advapi32 user32 comctl32 devmgr comdlg32 shell32 gdi32 msvcrt kernel32) add_pch(main main.h SOURCE) add_cd_file(TARGET main DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/main/lang/tr-TR.rc b/dll/cpl/main/lang/tr-TR.rc index 35c8618ef23..15af6afd77e 100644 --- a/dll/cpl/main/lang/tr-TR.rc +++ b/dll/cpl/main/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/mmsys/CMakeLists.txt b/dll/cpl/mmsys/CMakeLists.txt index 51b77650d19..2409162138c 100644 --- a/dll/cpl/mmsys/CMakeLists.txt +++ b/dll/cpl/mmsys/CMakeLists.txt @@ -15,21 +15,6 @@ add_library(mmsys SHARED ${CMAKE_CURRENT_BINARY_DIR}/mmsys.def) set_module_type(mmsys cpl UNICODE) - -add_importlibs(mmsys - msvcrt - user32 - comctl32 - devmgr - gdi32 - winmm - advapi32 - shell32 - setupapi - shlwapi - ntdll - kernel32 - comdlg32) - +add_importlibs(mmsys user32 comctl32 devmgr gdi32 winmm advapi32 shell32 setupapi shlwapi comdlg32 msvcrt kernel32 ntdll) add_pch(mmsys mmsys.h SOURCE) add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/mmsys/lang/tr-TR.rc b/dll/cpl/mmsys/lang/tr-TR.rc index b83bb8dafad..9e5ee5b82e5 100644 --- a/dll/cpl/mmsys/lang/tr-TR.rc +++ b/dll/cpl/mmsys/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/ncpa/CMakeLists.txt b/dll/cpl/ncpa/CMakeLists.txt index 4c645543fb5..2d92f48ba16 100644 --- a/dll/cpl/ncpa/CMakeLists.txt +++ b/dll/cpl/ncpa/CMakeLists.txt @@ -1,15 +1,10 @@ - spec2def(ncpa.cpl ncpa.spec) -add_library(ncpa SHARED ncpa.c ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def) +add_library(ncpa SHARED + ncpa.c + ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def) set_module_type(ncpa cpl UNICODE) - -add_importlibs(ncpa - msvcrt - advapi32 - shell32 - kernel32) - +add_importlibs(ncpa advapi32 shell32 msvcrt kernel32) add_cd_file(TARGET ncpa DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/odbccp32/CMakeLists.txt b/dll/cpl/odbccp32/CMakeLists.txt index 10010457c97..950940e9c7a 100644 --- a/dll/cpl/odbccp32/CMakeLists.txt +++ b/dll/cpl/odbccp32/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(odbccp32i.cpl odbccp32.spec) add_library(odbccp32i SHARED @@ -8,6 +7,5 @@ add_library(odbccp32i SHARED ${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def) set_module_type(odbccp32i cpl UNICODE) - add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32) add_cd_file(TARGET odbccp32i DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/powercfg/CMakeLists.txt b/dll/cpl/powercfg/CMakeLists.txt index 93fb40acc72..99f8354fe05 100644 --- a/dll/cpl/powercfg/CMakeLists.txt +++ b/dll/cpl/powercfg/CMakeLists.txt @@ -15,16 +15,6 @@ add_library(powercfg SHARED ${CMAKE_CURRENT_BINARY_DIR}/powercfg.def) set_module_type(powercfg cpl UNICODE) - -add_importlibs(powercfg - msvcrt - user32 - powrprof - comctl32 - shell32 - advapi32 - kernel32 - ntdll) - +add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll) add_pch(powercfg powercfg.h SOURCE) add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/powercfg/lang/ro-RO.rc b/dll/cpl/powercfg/lang/ro-RO.rc index eedf64a53fe..f9d3e363680 100644 --- a/dll/cpl/powercfg/lang/ro-RO.rc +++ b/dll/cpl/powercfg/lang/ro-RO.rc @@ -1,4 +1,7 @@ -/* 2011.11.26 - 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 @@ -92,7 +95,7 @@ CAPTION "Hibernare" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_HIBERNATE, IDI_HIBERNATE, 7, 7, 20, 20 - LTEXT "Intrarea în starea de hibernare presupune stocarea pe disc a întregului conținut de memorie apoi închiderea completă. La revenirea din hibernare, calculatorul revine exact la starea anterioară hibernării.", -1, 37, 6, 210, 35 + LTEXT "Intrarea în starea de hibernare presupune stocarea pe disc a întregului conținut de memorie operativă, urmată de închiderea completă a calculatorului. La revenirea din hibernare, calculatorul revine exact la starea anterioară hibernării.", -1, 37, 6, 210, 35 GROUPBOX "Hibernare", -1, 6, 41, 240, 32 CONTROL "Doresc folosirea funcționalității &Hibernare", IDC_HIBERNATEFILE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 17, 55, 210, 10 GROUPBOX "Spațiul necesar pentru hibernare", -1, 6, 80, 240, 76 diff --git a/dll/cpl/sysdm/CMakeLists.txt b/dll/cpl/sysdm/CMakeLists.txt index c1ea10b71c6..c5ddac54d4c 100644 --- a/dll/cpl/sysdm/CMakeLists.txt +++ b/dll/cpl/sysdm/CMakeLists.txt @@ -20,21 +20,6 @@ add_library(sysdm SHARED ${CMAKE_CURRENT_BINARY_DIR}/sysdm.def) set_module_type(sysdm cpl UNICODE) - -add_importlibs(sysdm - msvcrt - advapi32 - setupapi - user32 - gdi32 - comctl32 - msimg32 - shell32 - shlwapi - ole32 - powrprof - kernel32 - ntdll) - +add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll) add_pch(sysdm precomp.h SOURCE) add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/sysdm/lang/ro-RO.rc b/dll/cpl/sysdm/lang/ro-RO.rc index 1baa62513dc..03923e18001 100644 --- a/dll/cpl/sysdm/lang/ro-RO.rc +++ b/dll/cpl/sysdm/lang/ro-RO.rc @@ -3,7 +3,7 @@ * FILE: dll/cpl/sysdm/lang/ro-RO.rc * PURPOSE: Romanian Language File for System Control Panel Applet * TRANSLATORS: - * Petre Dumitriu + * Petru Dumitriu (petrimetri at gmail dot com) * Ștefan Fulea (stefan dot fulea at mail dot md) */ diff --git a/dll/cpl/telephon/CMakeLists.txt b/dll/cpl/telephon/CMakeLists.txt index cb537055477..000279ceabb 100644 --- a/dll/cpl/telephon/CMakeLists.txt +++ b/dll/cpl/telephon/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(telephon.cpl telephon.spec) -add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def) + +add_library(telephon SHARED + telephon.c + telephon.rc + ${CMAKE_CURRENT_BINARY_DIR}/telephon.def) + set_module_type(telephon cpl UNICODE) target_link_libraries(telephon uuid) - -add_importlibs(telephon - advapi32 - user32 - comctl32 - ole32 - shell32 - msvcrt - kernel32) - +add_importlibs(telephon advapi32 user32 comctl32 ole32 shell32 msvcrt kernel32) add_cd_file(TARGET telephon DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/telephon/lang/tr-TR.rc b/dll/cpl/telephon/lang/tr-TR.rc index 6c7a5fecf57..21cc3b6eb8a 100644 --- a/dll/cpl/telephon/lang/tr-TR.rc +++ b/dll/cpl/telephon/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/timedate/CMakeLists.txt b/dll/cpl/timedate/CMakeLists.txt index 5d87b27e648..21e5c84a7cc 100644 --- a/dll/cpl/timedate/CMakeLists.txt +++ b/dll/cpl/timedate/CMakeLists.txt @@ -17,16 +17,6 @@ add_library(timedate SHARED ${CMAKE_CURRENT_BINARY_DIR}/timedate.def) set_module_type(timedate cpl UNICODE) - -add_importlibs(timedate - advapi32 - user32 - gdi32 - comctl32 - ws2_32 - iphlpapi - msvcrt - kernel32) - +add_importlibs(timedate advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32) add_pch(timedate timedate.h SOURCE) add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/timedate/lang/tr-TR.rc b/dll/cpl/timedate/lang/tr-TR.rc index 70843749209..0747b2a61f0 100644 --- a/dll/cpl/timedate/lang/tr-TR.rc +++ b/dll/cpl/timedate/lang/tr-TR.rc @@ -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 diff --git a/dll/cpl/usrmgr/CMakeLists.txt b/dll/cpl/usrmgr/CMakeLists.txt index 4a8a5ab7bbf..5ef0c1befb3 100644 --- a/dll/cpl/usrmgr/CMakeLists.txt +++ b/dll/cpl/usrmgr/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(usrmgr.cpl usrmgr.spec) list(APPEND SOURCE @@ -19,16 +18,6 @@ add_library(usrmgr SHARED ${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def) set_module_type(usrmgr cpl UNICODE) - -add_importlibs(usrmgr - advapi32 - user32 - gdi32 - comctl32 - netapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(usrmgr advapi32 user32 gdi32 comctl32 netapi32 msvcrt kernel32 ntdll) add_pch(usrmgr usrmgr.h SOURCE) add_cd_file(TARGET usrmgr DESTINATION reactos/system32 FOR all) diff --git a/dll/cpl/wined3dcfg/CMakeLists.txt b/dll/cpl/wined3dcfg/CMakeLists.txt index efef5da4148..fc4b6063463 100644 --- a/dll/cpl/wined3dcfg/CMakeLists.txt +++ b/dll/cpl/wined3dcfg/CMakeLists.txt @@ -12,13 +12,6 @@ add_library(wined3dcfg SHARED ${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def) set_module_type(wined3dcfg cpl UNICODE) - -add_importlibs(wined3dcfg - msvcrt - user32 - comctl32 - advapi32 - kernel32) - +add_importlibs(wined3dcfg user32 comctl32 advapi32 msvcrt kernel32) add_pch(wined3dcfg wined3dcfg.h SOURCE) add_cd_file(TARGET wined3dcfg DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/d3d8thk/CMakeLists.txt b/dll/directx/d3d8thk/CMakeLists.txt index 0c88e5d2dfe..a17a11544f2 100644 --- a/dll/directx/d3d8thk/CMakeLists.txt +++ b/dll/directx/d3d8thk/CMakeLists.txt @@ -1,6 +1,10 @@ spec2def(d3d8thk.dll d3d8thk.spec) -add_library(d3d8thk SHARED d3d8thk.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + +add_library(d3d8thk SHARED + d3d8thk.rc + ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def) + set_entrypoint(d3d8thk 0) add_importlibs(d3d8thk gdi32) add_dependencies(d3d8thk psdk) diff --git a/dll/directx/ddraw/CMakeLists.txt b/dll/directx/ddraw/CMakeLists.txt index 1d69eee2381..73518dfe7d8 100644 --- a/dll/directx/ddraw/CMakeLists.txt +++ b/dll/directx/ddraw/CMakeLists.txt @@ -2,60 +2,45 @@ spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB) list(APPEND SOURCE - cleanup.c - main.c - startup.c - Clipper/clipper_main.c - Clipper/clipper_stubs.c - Color/color_stubs.c - d3d/DirectD3D_main.c - Ddraw/callbacks_dd_hel.c - Ddraw/ddraw_displaymode.c - Ddraw/ddraw_main.c - Ddraw/ddraw_setcooperativelevel.c - Ddraw/ddraw_stubs.c - Ddraw/GetCaps.c - Ddraw/GetDeviceIdentifier.c - Gamma/gamma_stubs.c - Kernel/kernel_stubs.c - Palette/createpalette.c - Palette/palette.c - Surface/callbacks_surf_hel.c - Surface/createsurface.c - Surface/surface_main.c - Surface/surface_stubs.c - Videoport/videoport_stubs.c - Vtable/DirectD3D_Vtable.c - Vtable/DirectD3D2_Vtable.c - Vtable/DirectD3D3_Vtable.c - Vtable/DirectD3D7_Vtable.c - Vtable/DirectDraw_Vtable.c - Vtable/DirectDraw2_Vtable.c - Vtable/DirectDraw4_Vtable.c - Vtable/DirectDraw7_Vtable.c - Vtable/DirectDrawSurface_Vtable.c - Vtable/DirectDrawSurface2_Vtable.c - Vtable/DirectDrawSurface3_Vtable.c - Vtable/DirectDrawSurface4_Vtable.c - Vtable/DirectDrawSurface7_Vtable.c -) + cleanup.c + main.c + startup.c + Clipper/clipper_main.c + Clipper/clipper_stubs.c + Color/color_stubs.c + d3d/DirectD3D_main.c + Ddraw/callbacks_dd_hel.c + Ddraw/ddraw_displaymode.c + Ddraw/ddraw_main.c + Ddraw/ddraw_setcooperativelevel.c + Ddraw/ddraw_stubs.c + Ddraw/GetCaps.c + Ddraw/GetDeviceIdentifier.c + Gamma/gamma_stubs.c + Kernel/kernel_stubs.c + Palette/createpalette.c + Palette/palette.c + Surface/callbacks_surf_hel.c + Surface/createsurface.c + Surface/surface_main.c + Surface/surface_stubs.c + Videoport/videoport_stubs.c + Vtable/DirectD3D_Vtable.c + Vtable/DirectD3D2_Vtable.c + Vtable/DirectD3D3_Vtable.c + Vtable/DirectD3D7_Vtable.c + Vtable/DirectDraw_Vtable.c + Vtable/DirectDraw2_Vtable.c + Vtable/DirectDraw4_Vtable.c + Vtable/DirectDraw7_Vtable.c + Vtable/DirectDrawSurface_Vtable.c + Vtable/DirectDrawSurface2_Vtable.c + Vtable/DirectDrawSurface3_Vtable.c + Vtable/DirectDrawSurface4_Vtable.c + Vtable/DirectDrawSurface7_Vtable.c) add_library(ddraw SHARED ${SOURCE}) - set_module_type(ddraw win32dll) - -target_link_libraries(ddraw - uuid - dxguid - ${PSEH_LIB} -) - -add_importlibs(ddraw - advapi32 - gdi32 - user32 - msvcrt - kernel32 - ntdll) - -add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) \ No newline at end of file +target_link_libraries(ddraw uuid dxguid ${PSEH_LIB}) +add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll) +add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/ksproxy/CMakeLists.txt b/dll/directx/ksproxy/CMakeLists.txt index e3ca96fcf58..122623b7707 100644 --- a/dll/directx/ksproxy/CMakeLists.txt +++ b/dll/directx/ksproxy/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_STL) - spec2def(ksproxy.ax ksproxy.spec) list(APPEND SOURCE @@ -26,7 +25,6 @@ list(APPEND SOURCE add_library(ksproxy SHARED ${SOURCE} ksproxy.rc) set_module_type(ksproxy win32dll) set_target_properties(ksproxy PROPERTIES SUFFIX ".ax") - target_link_libraries(ksproxy strmiids) add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll) add_dependencies(ksproxy dxsdk) diff --git a/dll/directx/ksuser/CMakeLists.txt b/dll/directx/ksuser/CMakeLists.txt index 50993f759c6..d113df95128 100644 --- a/dll/directx/ksuser/CMakeLists.txt +++ b/dll/directx/ksuser/CMakeLists.txt @@ -1,11 +1,12 @@ spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB) -add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) +add_library(ksuser SHARED + ksuser.c + ksuser.rc + ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def) set_module_type(ksuser win32dll) - add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll) -add_dependencies(ksuser psdk bugcodes) +add_dependencies(ksuser bugcodes) add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all) - diff --git a/dll/directx/wine/d3d8/CMakeLists.txt b/dll/directx/wine/d3d8/CMakeLists.txt index cb111aee279..338fded5772 100644 --- a/dll/directx/wine/d3d8/CMakeLists.txt +++ b/dll/directx/wine/d3d8/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3d8.dll d3d8.spec) list(APPEND SOURCE @@ -28,6 +27,6 @@ add_library(d3d8 SHARED set_module_type(d3d8 win32dll UNICODE HOTPATCHABLE) target_link_libraries(d3d8 uuid wine) -add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll) +add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll) add_pch(d3d8 d3d8_private.h SOURCE) add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3d9/CMakeLists.txt b/dll/directx/wine/d3d9/CMakeLists.txt index 330dc93ca07..23370664a4c 100644 --- a/dll/directx/wine/d3d9/CMakeLists.txt +++ b/dll/directx/wine/d3d9/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DUSE_WIN32_OPENGL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -31,6 +30,6 @@ add_library(d3d9 SHARED set_module_type(d3d9 win32dll UNICODE HOTPATCHABLE) target_link_libraries(d3d9 wine) -add_importlibs(d3d9 wined3d msvcrt kernel32 ntdll) +add_importlibs(d3d9 d3dwine msvcrt kernel32 ntdll) add_pch(d3d9 d3d9_private.h SOURCE) add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt index 5b3c473cb9c..7578f2fd662 100644 --- a/dll/directx/wine/d3dcompiler_43/CMakeLists.txt +++ b/dll/directx/wine/d3dcompiler_43/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -DDIRECT3D_VERSION=0x0900) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt b/dll/directx/wine/d3dx9_24/CMakeLists.txt index 72ea5481440..e733766dfc2 100644 --- a/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_24.dll d3dx9_24.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_25/CMakeLists.txt b/dll/directx/wine/d3dx9_25/CMakeLists.txt index 36b42f28e78..ca93608dc33 100644 --- a/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_25.dll d3dx9_25.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_26/CMakeLists.txt b/dll/directx/wine/d3dx9_26/CMakeLists.txt index ba17b989de7..279e45a3742 100644 --- a/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_26.dll d3dx9_26.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt b/dll/directx/wine/d3dx9_27/CMakeLists.txt index 239cec6d611..849686d541a 100644 --- a/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_27.dll d3dx9_27.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt b/dll/directx/wine/d3dx9_28/CMakeLists.txt index 84f5615804f..3d283680d31 100644 --- a/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_28.dll d3dx9_28.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt b/dll/directx/wine/d3dx9_29/CMakeLists.txt index 9ed14f7eeda..07db5a9d739 100644 --- a/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_29.dll d3dx9_29.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt b/dll/directx/wine/d3dx9_30/CMakeLists.txt index caa2af16bfb..f63010bfbf3 100644 --- a/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_30.dll d3dx9_30.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_31/CMakeLists.txt b/dll/directx/wine/d3dx9_31/CMakeLists.txt index c693b9fc5ab..2dd3d71f3e9 100644 --- a/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_31.dll d3dx9_31.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_32/CMakeLists.txt b/dll/directx/wine/d3dx9_32/CMakeLists.txt index e9e35147c34..b77dc548cc1 100644 --- a/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_32.dll d3dx9_32.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_33/CMakeLists.txt b/dll/directx/wine/d3dx9_33/CMakeLists.txt index 2476260ede7..f8438b3993f 100644 --- a/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_33.dll d3dx9_33.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_34/CMakeLists.txt b/dll/directx/wine/d3dx9_34/CMakeLists.txt index 049cdcfa2e1..419e4c63029 100644 --- a/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_34.dll d3dx9_34.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_35/CMakeLists.txt b/dll/directx/wine/d3dx9_35/CMakeLists.txt index b02b02b985b..0447b2528e2 100644 --- a/dll/directx/wine/d3dx9_35/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_35/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_35.dll d3dx9_35.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_36/CMakeLists.txt b/dll/directx/wine/d3dx9_36/CMakeLists.txt index d366786d560..e4e5a451d6a 100644 --- a/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_37/CMakeLists.txt b/dll/directx/wine/d3dx9_37/CMakeLists.txt index 4ba990dd30b..1859f9ab23b 100644 --- a/dll/directx/wine/d3dx9_37/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_37/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_37.dll d3dx9_37.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_38/CMakeLists.txt b/dll/directx/wine/d3dx9_38/CMakeLists.txt index 8ffd5ade4c1..d71dd06d2aa 100644 --- a/dll/directx/wine/d3dx9_38/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_38/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_38.dll d3dx9_38.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_39/CMakeLists.txt b/dll/directx/wine/d3dx9_39/CMakeLists.txt index d4775d73bf2..e2e993582ed 100644 --- a/dll/directx/wine/d3dx9_39/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_39/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_39.dll d3dx9_39.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_40/CMakeLists.txt b/dll/directx/wine/d3dx9_40/CMakeLists.txt index 0e6e4e991ca..c6ed02cf329 100644 --- a/dll/directx/wine/d3dx9_40/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_40/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_40.dll d3dx9_40.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_41/CMakeLists.txt b/dll/directx/wine/d3dx9_41/CMakeLists.txt index 108e25a7a1f..4a22e8148e2 100644 --- a/dll/directx/wine/d3dx9_41/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_41/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_41.dll d3dx9_41.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_42/CMakeLists.txt b/dll/directx/wine/d3dx9_42/CMakeLists.txt index 30748e913b8..dffceee6c5f 100644 --- a/dll/directx/wine/d3dx9_42/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_42/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_42.dll d3dx9_42.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dx9_43/CMakeLists.txt b/dll/directx/wine/d3dx9_43/CMakeLists.txt index 2aa91917d8d..0df66678804 100644 --- a/dll/directx/wine/d3dx9_43/CMakeLists.txt +++ b/dll/directx/wine/d3dx9_43/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dx9_43.dll d3dx9_43.spec) list(APPEND SOURCE diff --git a/dll/directx/wine/d3dxof/CMakeLists.txt b/dll/directx/wine/d3dxof/CMakeLists.txt index 3219363766a..ac37779b077 100644 --- a/dll/directx/wine/d3dxof/CMakeLists.txt +++ b/dll/directx/wine/d3dxof/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/ddraw/CMakeLists.txt b/dll/directx/wine/ddraw/CMakeLists.txt index aa34f1760c7..7de597c3ca0 100644 --- a/dll/directx/wine/ddraw/CMakeLists.txt +++ b/dll/directx/wine/ddraw/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(ddraw SHARED set_module_type(ddraw win32dll HOTPATCHABLE) target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB}) -add_importlibs(ddraw advapi32 gdi32 user32 wined3d msvcrt kernel32 ntdll) +add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll) add_dependencies(ddraw wineheaders) add_pch(ddraw ddraw_private.h SOURCE) add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/dplayx/CMakeLists.txt b/dll/directx/wine/dplayx/CMakeLists.txt index 8b6ba4a54be..2027631f2c6 100644 --- a/dll/directx/wine/dplayx/CMakeLists.txt +++ b/dll/directx/wine/dplayx/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/directx/wine/dsound/CMakeLists.txt b/dll/directx/wine/dsound/CMakeLists.txt index e660e4e8725..57d718850e6 100644 --- a/dll/directx/wine/dsound/CMakeLists.txt +++ b/dll/directx/wine/dsound/CMakeLists.txt @@ -5,7 +5,6 @@ add_definitions( -D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dsound.dll dsound.spec ADD_IMPORTLIB) add_library(dsound SHARED diff --git a/dll/directx/wine/dxgi/CMakeLists.txt b/dll/directx/wine/dxgi/CMakeLists.txt index 3d795229744..8054d4fb3cc 100644 --- a/dll/directx/wine/dxgi/CMakeLists.txt +++ b/dll/directx/wine/dxgi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dxgi.dll dxgi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -23,7 +22,7 @@ add_library(dxgi SHARED set_module_type(dxgi win32dll) target_link_libraries(dxgi uuid dxgi_uuids wine) -add_importlibs(dxgi wined3d user32 msvcrt kernel32 ntdll) +add_importlibs(dxgi d3dwine user32 msvcrt kernel32 ntdll) add_dependencies(dxgi wineheaders) add_pch(dxgi dxgi_private.h SOURCE) add_cd_file(TARGET dxgi DESTINATION reactos/system32 FOR all) diff --git a/dll/directx/wine/quartz/CMakeLists.txt b/dll/directx/wine/quartz/CMakeLists.txt index 50040af12c9..4bfc6e76675 100644 --- a/dll/directx/wine/quartz/CMakeLists.txt +++ b/dll/directx/wine/quartz/CMakeLists.txt @@ -42,7 +42,6 @@ add_library(quartz SHARED version.rc) add_idl_headers(quartz_idlheader fil_data.idl) - add_typelib(control_tlb.idl) list(APPEND quartz_rc_deps @@ -51,7 +50,6 @@ list(APPEND quartz_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/quartz_strmif.rgs) set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${quartz_rc_deps}") - set_module_type(quartz win32dll) target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB}) add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll) diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt index ade664ab1cd..a35703fd731 100644 --- a/dll/directx/wine/wined3d/CMakeLists.txt +++ b/dll/directx/wine/wined3d/CMakeLists.txt @@ -6,7 +6,9 @@ add_definitions( include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB) +# We name this d3dwine.dll, because the Virtualbox additions ship with a custom wined3d.dll +# and it breaks everything if it is installed. +spec2def(d3dwine.dll wined3d.spec ADD_IMPORTLIB) list(APPEND SOURCE arb_program_shader.c @@ -39,18 +41,18 @@ list(APPEND SOURCE wined3d_main.c wined3d_private.h) -add_library(wined3d SHARED +add_library(d3dwine SHARED ${SOURCE} version.rc - ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def) + ${CMAKE_CURRENT_BINARY_DIR}/d3dwine.def) -set_module_type(wined3d win32dll) -target_link_libraries(wined3d wine) +set_module_type(d3dwine win32dll) +target_link_libraries(d3dwine wine) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") - target_link_libraries(wined3d mingwex) + target_link_libraries(d3dwine mingwex) endif() -add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) -add_pch(wined3d wined3d_private.h SOURCE) -add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all) +add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll) +add_pch(d3dwine wined3d_private.h SOURCE) +add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/CMakeLists.txt b/dll/keyboard/CMakeLists.txt index 445de438861..9190fd8f4b5 100644 --- a/dll/keyboard/CMakeLists.txt +++ b/dll/keyboard/CMakeLists.txt @@ -1,81 +1,111 @@ -add_subdirectory(kbda1) -add_subdirectory(kbda2) -add_subdirectory(kbda3) -add_subdirectory(kbdal) -add_subdirectory(kbdarme) -add_subdirectory(kbdarmw) -add_subdirectory(kbdaze) -add_subdirectory(kbdazel) -add_subdirectory(kbdbe) -add_subdirectory(kbdbga) -add_subdirectory(kbdbgm) -add_subdirectory(kbdbgt) -add_subdirectory(kbdblr) -add_subdirectory(kbdbr) -add_subdirectory(kbdbur) -add_subdirectory(kbdcan) -add_subdirectory(kbdcr) -add_subdirectory(kbdcz) -add_subdirectory(kbdcz1) -add_subdirectory(kbdda) -add_subdirectory(kbddv) -add_subdirectory(kbdes) -add_subdirectory(kbdest) -add_subdirectory(kbdfc) -add_subdirectory(kbdfi) -add_subdirectory(kbdfr) -add_subdirectory(kbdgeo) -add_subdirectory(kbdgerg) -add_subdirectory(kbdgneo) -add_subdirectory(kbdgr) -add_subdirectory(kbdgrist) -add_subdirectory(kbdhe) -add_subdirectory(kbdheb) -add_subdirectory(kbdhu) -add_subdirectory(kbdic) -add_subdirectory(kbdinasa) -add_subdirectory(kbdinben) -add_subdirectory(kbdindev) -add_subdirectory(kbdinguj) -add_subdirectory(kbdinmal) -add_subdirectory(kbdir) -add_subdirectory(kbdit) -add_subdirectory(kbdja) -add_subdirectory(kbdkaz) -add_subdirectory(kbdko) -add_subdirectory(kbdla) -add_subdirectory(kbdlt1) -add_subdirectory(kbdlv) -add_subdirectory(kbdmac) -add_subdirectory(kbdne) -add_subdirectory(kbdno) -add_subdirectory(kbdpl) -add_subdirectory(kbdpl1) -add_subdirectory(kbdpo) -add_subdirectory(kbdro) -add_subdirectory(kbdru) -add_subdirectory(kbdru1) -add_subdirectory(kbdsg) -add_subdirectory(kbdsk) -add_subdirectory(kbdsk1) -add_subdirectory(kbdsw) -add_subdirectory(kbdtat) -add_subdirectory(kbdth0) -add_subdirectory(kbdth1) -add_subdirectory(kbdth2) -add_subdirectory(kbdth3) -add_subdirectory(kbdtuf) -add_subdirectory(kbdtuq) -add_subdirectory(kbduk) -add_subdirectory(kbdur) -add_subdirectory(kbdurs) -add_subdirectory(kbdus) -add_subdirectory(kbdusa) -add_subdirectory(kbdusl) -add_subdirectory(kbdusr) -add_subdirectory(kbdusx) -add_subdirectory(kbduzb) -add_subdirectory(kbdvntc) -add_subdirectory(kbdycc) -add_subdirectory(kbdycl) +list(APPEND _keyboard_layouts + kbda1 + kbda2 + kbda3 + kbdal + kbdarme + kbdarmw + kbdaze + kbdazel + kbdbe + kbdbga + kbdbgm + kbdbgt + kbdblr + kbdbr + kbdbur + kbdcan + kbdcr + kbdcz + kbdcz1 + kbdda + kbddv + kbdes + kbdest + kbdfc + kbdfi + kbdfr + kbdgeo + kbdgerg + kbdgneo + kbdgr + kbdgrist + kbdhe + kbdheb + kbdhu + kbdic + kbdinasa + kbdinben + kbdindev + kbdinguj + kbdinmal + kbdir + kbdit + kbdja + kbdkaz + kbdko + kbdla + kbdlt1 + kbdlv + kbdmac + kbdne + kbdno + kbdpl + kbdpl1 + kbdpo + kbdro + kbdru + kbdru1 + kbdsg + kbdsk + kbdsk1 + kbdsw + kbdtat + kbdth0 + kbdth1 + kbdth2 + kbdth3 + kbdtuf + kbdtuq + kbduk + kbdur + kbdurs + kbdus + kbdusa + kbdusl + kbdusr + kbdusx + kbduzb + kbdvntc + kbdycc + kbdycl) + +foreach(_keyboard_layout ${_keyboard_layouts}) + spec2def(${_keyboard_layout}.dll ${_keyboard_layout}/${_keyboard_layout}.spec) + + add_library(${_keyboard_layout} SHARED + ${_keyboard_layout}/${_keyboard_layout}.c + ${_keyboard_layout}/${_keyboard_layout}.rc + ${CMAKE_CURRENT_BINARY_DIR}/${_keyboard_layout}.def) + + target_include_directories(${_keyboard_layout} PRIVATE ${REACTOS_SOURCE_DIR}/ntoskrnl/include) + set_entrypoint(${_keyboard_layout} 0) + set_image_base(${_keyboard_layout} 0x5FFF0000) + set_subsystem(${_keyboard_layout} native) + + if(MSVC) + # Merge the .text and .rdata section into the .data section + add_target_link_flags(${_keyboard_layout} "/ignore:4254 /SECTION:.data,ER /MERGE:.text=.data /MERGE:.rdata=.data /MERGE:.bss=.data /MERGE:.edata=.data") + else() + # Use a custom linker script + add_target_link_flags(${_keyboard_layout} "-Wl,-T,${CMAKE_SOURCE_DIR}/kbdlayout.lds") + endif() + + if(RUNTIME_CHECKS) + target_link_libraries(${_keyboard_layout} runtmchk) + endif() + + add_dependencies(${_keyboard_layout} psdk) + add_cd_file(TARGET ${_keyboard_layout} DESTINATION reactos/system32 FOR all) +endforeach() diff --git a/dll/keyboard/kbda1/CMakeLists.txt b/dll/keyboard/kbda1/CMakeLists.txt deleted file mode 100644 index 4f3aefeaec3..00000000000 --- a/dll/keyboard/kbda1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda1.dll kbda1.spec) - -add_library(kbda1 SHARED kbda1.c kbda1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda1.def) - -set_module_type(kbda1 kbdlayout) - -add_dependencies(kbda1 psdk) - -add_cd_file(TARGET kbda1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbda2/CMakeLists.txt b/dll/keyboard/kbda2/CMakeLists.txt deleted file mode 100644 index 21233aeef17..00000000000 --- a/dll/keyboard/kbda2/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda2.dll kbda2.spec) - -add_library(kbda2 SHARED kbda2.c kbda2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda2.def) - -set_module_type(kbda2 kbdlayout) - -add_dependencies(kbda2 psdk) - -add_cd_file(TARGET kbda2 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbda3/CMakeLists.txt b/dll/keyboard/kbda3/CMakeLists.txt deleted file mode 100644 index 9054d9bbc3d..00000000000 --- a/dll/keyboard/kbda3/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbda3.dll kbda3.spec) - -add_library(kbda3 SHARED kbda3.c kbda3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbda3.def) - -set_module_type(kbda3 kbdlayout) - -add_dependencies(kbda3 psdk) - -add_cd_file(TARGET kbda3 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdal/CMakeLists.txt b/dll/keyboard/kbdal/CMakeLists.txt deleted file mode 100644 index 34b1a76af9f..00000000000 --- a/dll/keyboard/kbdal/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdal.dll kbdal.spec) - -add_library(kbdal SHARED kbdal.c kbdal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdal.def) - -set_module_type(kbdal kbdlayout) - -add_dependencies(kbdal psdk) - -add_cd_file(TARGET kbdal DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdarme/CMakeLists.txt b/dll/keyboard/kbdarme/CMakeLists.txt deleted file mode 100644 index 3cd149cd7a8..00000000000 --- a/dll/keyboard/kbdarme/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdarme.dll kbdarme.spec) - -add_library(kbdarme SHARED kbdarme.c kbdarme.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarme.def) - -set_module_type(kbdarme kbdlayout) - -add_dependencies(kbdarme psdk) - -add_cd_file(TARGET kbdarme DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdarmw/CMakeLists.txt b/dll/keyboard/kbdarmw/CMakeLists.txt deleted file mode 100644 index 25a9739e01b..00000000000 --- a/dll/keyboard/kbdarmw/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdarmw.dll kbdarmw.spec) - -add_library(kbdarmw SHARED kbdarmw.c kbdarmw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdarmw.def) - -set_module_type(kbdarmw kbdlayout) - -add_dependencies(kbdarmw psdk) - -add_cd_file(TARGET kbdarmw DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdaze/CMakeLists.txt b/dll/keyboard/kbdaze/CMakeLists.txt deleted file mode 100644 index f8fae7cb492..00000000000 --- a/dll/keyboard/kbdaze/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdaze.dll kbdaze.spec) - -add_library(kbdaze SHARED kbdaze.c kbdaze.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdaze.def) - -set_module_type(kbdaze kbdlayout) - -add_dependencies(kbdaze psdk) - -add_cd_file(TARGET kbdaze DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdazel/CMakeLists.txt b/dll/keyboard/kbdazel/CMakeLists.txt deleted file mode 100644 index 177f252424c..00000000000 --- a/dll/keyboard/kbdazel/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdazel.dll kbdazel.spec) - -add_library(kbdazel SHARED kbdazel.c kbdazel.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdazel.def) - -set_module_type(kbdazel kbdlayout) - -add_dependencies(kbdazel psdk) - -add_cd_file(TARGET kbdazel DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbe/CMakeLists.txt b/dll/keyboard/kbdbe/CMakeLists.txt deleted file mode 100644 index fc05d3f61b5..00000000000 --- a/dll/keyboard/kbdbe/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbe.dll kbdbe.spec) - -add_library(kbdbe SHARED kbdbe.c kbdbe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbe.def) - -set_module_type(kbdbe kbdlayout) - -add_dependencies(kbdbe psdk) - -add_cd_file(TARGET kbdbe DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbga/CMakeLists.txt b/dll/keyboard/kbdbga/CMakeLists.txt deleted file mode 100644 index 0b3866d37ee..00000000000 --- a/dll/keyboard/kbdbga/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbga.dll kbdbga.spec) - -add_library(kbdbga SHARED kbdbga.c kbdbga.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbga.def) - -set_module_type(kbdbga kbdlayout) - -add_dependencies(kbdbga psdk) - -add_cd_file(TARGET kbdbga DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbgm/CMakeLists.txt b/dll/keyboard/kbdbgm/CMakeLists.txt deleted file mode 100644 index a22331f2c10..00000000000 --- a/dll/keyboard/kbdbgm/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbgm.dll kbdbgm.spec) - -add_library(kbdbgm SHARED kbdbgm.c kbdbgm.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgm.def) - -set_module_type(kbdbgm kbdlayout) - -add_dependencies(kbdbgm psdk) - -add_cd_file(TARGET kbdbgm DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbgt/CMakeLists.txt b/dll/keyboard/kbdbgt/CMakeLists.txt deleted file mode 100644 index 8801f65d090..00000000000 --- a/dll/keyboard/kbdbgt/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbgt.dll kbdbgt.spec) - -add_library(kbdbgt SHARED kbdbgt.c kbdbgt.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbgt.def) - -set_module_type(kbdbgt kbdlayout) - -add_dependencies(kbdbgt psdk) - -add_cd_file(TARGET kbdbgt DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdblr/CMakeLists.txt b/dll/keyboard/kbdblr/CMakeLists.txt deleted file mode 100644 index 48ee15546ca..00000000000 --- a/dll/keyboard/kbdblr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdblr.dll kbdblr.spec) - -add_library(kbdblr SHARED kbdblr.c kbdblr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdblr.def) - -set_module_type(kbdblr kbdlayout) - -add_dependencies(kbdblr psdk) - -add_cd_file(TARGET kbdblr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbr/CMakeLists.txt b/dll/keyboard/kbdbr/CMakeLists.txt deleted file mode 100644 index 0bc694b0ad2..00000000000 --- a/dll/keyboard/kbdbr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbr.dll kbdbr.spec) - -add_library(kbdbr SHARED kbdbr.c kbdbr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbr.def) - -set_module_type(kbdbr kbdlayout) - -add_dependencies(kbdbr psdk) - -add_cd_file(TARGET kbdbr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdbur/CMakeLists.txt b/dll/keyboard/kbdbur/CMakeLists.txt deleted file mode 100644 index ba45e4cb51b..00000000000 --- a/dll/keyboard/kbdbur/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdbur.dll kbdbur.spec) - -add_library(kbdbur SHARED kbdbur.c kbdbur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdbur.def) - -set_module_type(kbdbur kbdlayout) - -add_dependencies(kbdbur psdk) - -add_cd_file(TARGET kbdbur DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdcan/CMakeLists.txt b/dll/keyboard/kbdcan/CMakeLists.txt deleted file mode 100644 index 8e444139e52..00000000000 --- a/dll/keyboard/kbdcan/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcan.dll kbdcan.spec) - -add_library(kbdcan SHARED kbdcan.c kbdcan.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcan.def) - -set_module_type(kbdcan kbdlayout) - -add_dependencies(kbdcan psdk) - -add_cd_file(TARGET kbdcan DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdcr/CMakeLists.txt b/dll/keyboard/kbdcr/CMakeLists.txt deleted file mode 100644 index a8ac224dbe8..00000000000 --- a/dll/keyboard/kbdcr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcr.dll kbdcr.spec) - -add_library(kbdcr SHARED kbdcr.c kbdcr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcr.def) - -set_module_type(kbdcr kbdlayout) - -add_dependencies(kbdcr psdk) - -add_cd_file(TARGET kbdcr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdcz/CMakeLists.txt b/dll/keyboard/kbdcz/CMakeLists.txt deleted file mode 100644 index e235e3816c0..00000000000 --- a/dll/keyboard/kbdcz/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcz.dll kbdcz.spec) - -add_library(kbdcz SHARED kbdcz.c kbdcz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz.def) - -set_module_type(kbdcz kbdlayout) - -add_dependencies(kbdcz psdk) - -add_cd_file(TARGET kbdcz DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdcz1/CMakeLists.txt b/dll/keyboard/kbdcz1/CMakeLists.txt deleted file mode 100644 index 5d094ebb43a..00000000000 --- a/dll/keyboard/kbdcz1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdcz1.dll kbdcz1.spec) - -add_library(kbdcz1 SHARED kbdcz1.c kbdcz1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdcz1.def) - -set_module_type(kbdcz1 kbdlayout) - -add_dependencies(kbdcz1 psdk) - -add_cd_file(TARGET kbdcz1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdda/CMakeLists.txt b/dll/keyboard/kbdda/CMakeLists.txt deleted file mode 100644 index 043e20b027f..00000000000 --- a/dll/keyboard/kbdda/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdda.dll kbdda.spec) - -add_library(kbdda SHARED kbdda.c kbdda.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdda.def) - -set_module_type(kbdda kbdlayout) - -add_dependencies(kbdda psdk) - -add_cd_file(TARGET kbdda DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbddv/CMakeLists.txt b/dll/keyboard/kbddv/CMakeLists.txt deleted file mode 100644 index 11696fb6b98..00000000000 --- a/dll/keyboard/kbddv/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbddv.dll kbddv.spec) - -add_library(kbddv SHARED kbddv.c kbddv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbddv.def) - -set_module_type(kbddv kbdlayout) - -add_dependencies(kbddv psdk) - -add_cd_file(TARGET kbddv DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdes/CMakeLists.txt b/dll/keyboard/kbdes/CMakeLists.txt deleted file mode 100644 index 7f97296e531..00000000000 --- a/dll/keyboard/kbdes/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdes.dll kbdes.spec) - -add_library(kbdes SHARED kbdes.c kbdes.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdes.def) - -set_module_type(kbdes kbdlayout) - -add_dependencies(kbdes psdk) - -add_cd_file(TARGET kbdes DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdest/CMakeLists.txt b/dll/keyboard/kbdest/CMakeLists.txt deleted file mode 100644 index 6f7c39bb22d..00000000000 --- a/dll/keyboard/kbdest/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdest.dll kbdest.spec) - -add_library(kbdest SHARED kbdest.c kbdest.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdest.def) - -set_module_type(kbdest kbdlayout) - -add_dependencies(kbdest psdk) - -add_cd_file(TARGET kbdest DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdfc/CMakeLists.txt b/dll/keyboard/kbdfc/CMakeLists.txt deleted file mode 100644 index 7d40d4e0d70..00000000000 --- a/dll/keyboard/kbdfc/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfc.dll kbdfc.spec) - -add_library(kbdfc SHARED kbdfc.c kbdfc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfc.def) - -set_module_type(kbdfc kbdlayout) - -add_dependencies(kbdfc psdk) - -add_cd_file(TARGET kbdfc DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdfi/CMakeLists.txt b/dll/keyboard/kbdfi/CMakeLists.txt deleted file mode 100644 index 01b8d4b7467..00000000000 --- a/dll/keyboard/kbdfi/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfi.dll kbdfi.spec) - -add_library(kbdfi SHARED kbdfi.c kbdfi.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfi.def) - -set_module_type(kbdfi kbdlayout) - -add_dependencies(kbdfi psdk) - -add_cd_file(TARGET kbdfi DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdfr/CMakeLists.txt b/dll/keyboard/kbdfr/CMakeLists.txt deleted file mode 100644 index 1a32d4694b8..00000000000 --- a/dll/keyboard/kbdfr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdfr.dll kbdfr.spec) - -add_library(kbdfr SHARED kbdfr.c kbdfr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def) - -set_module_type(kbdfr kbdlayout) - -add_dependencies(kbdfr psdk) - -add_cd_file(TARGET kbdfr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdgeo/CMakeLists.txt b/dll/keyboard/kbdgeo/CMakeLists.txt deleted file mode 100644 index cdd7e7f7a66..00000000000 --- a/dll/keyboard/kbdgeo/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgeo.dll kbdgeo.spec) - -add_library(kbdgeo SHARED kbdgeo.c kbdgeo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgeo.def) - -set_module_type(kbdgeo kbdlayout) - -add_dependencies(kbdgeo psdk) - -add_cd_file(TARGET kbdgeo DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdgerg/CMakeLists.txt b/dll/keyboard/kbdgerg/CMakeLists.txt deleted file mode 100644 index 6db4e12511c..00000000000 --- a/dll/keyboard/kbdgerg/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgerg.dll kbdgerg.spec) - -add_library(kbdgerg SHARED kbdgerg.c kbdgerg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgerg.def) - -set_module_type(kbdgerg kbdlayout) - -add_dependencies(kbdgerg psdk) - -add_cd_file(TARGET kbdgerg DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdgneo/CMakeLists.txt b/dll/keyboard/kbdgneo/CMakeLists.txt deleted file mode 100644 index 9fcff4eee1b..00000000000 --- a/dll/keyboard/kbdgneo/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgneo.dll kbdgneo.spec) - -add_library(kbdgneo SHARED kbdgneo.c kbdgneo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgneo.def) - -set_module_type(kbdgneo kbdlayout) - -add_dependencies(kbdgneo psdk) - -add_cd_file(TARGET kbdgneo DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdgr/CMakeLists.txt b/dll/keyboard/kbdgr/CMakeLists.txt deleted file mode 100644 index fcb9f97f585..00000000000 --- a/dll/keyboard/kbdgr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgr.dll kbdgr.spec) - -add_library(kbdgr SHARED kbdgr.c kbdgr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgr.def) - -set_module_type(kbdgr kbdlayout) - -add_dependencies(kbdgr psdk) - -add_cd_file(TARGET kbdgr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdgrist/CMakeLists.txt b/dll/keyboard/kbdgrist/CMakeLists.txt deleted file mode 100644 index 2d3e4cc32bd..00000000000 --- a/dll/keyboard/kbdgrist/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdgrist.dll kbdgrist.spec) - -add_library(kbdgrist SHARED kbdgrist.c kbdgrist.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdgrist.def) - -set_module_type(kbdgrist kbdlayout) - -add_dependencies(kbdgrist psdk) - -add_cd_file(TARGET kbdgrist DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdhe/CMakeLists.txt b/dll/keyboard/kbdhe/CMakeLists.txt deleted file mode 100644 index f3242875ae8..00000000000 --- a/dll/keyboard/kbdhe/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdhe.dll kbdhe.spec) - -add_library(kbdhe SHARED kbdhe.c kbdhe.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhe.def) - -set_module_type(kbdhe kbdlayout) - -add_dependencies(kbdhe psdk) - -add_cd_file(TARGET kbdhe DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdheb/CMakeLists.txt b/dll/keyboard/kbdheb/CMakeLists.txt deleted file mode 100644 index c82b89d30e7..00000000000 --- a/dll/keyboard/kbdheb/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdheb.dll kbdheb.spec) - -add_library(kbdheb SHARED kbdheb.c kbdheb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdheb.def) - -set_module_type(kbdheb kbdlayout) - -add_dependencies(kbdheb psdk) - -add_cd_file(TARGET kbdheb DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdhu/CMakeLists.txt b/dll/keyboard/kbdhu/CMakeLists.txt deleted file mode 100644 index b458f97f510..00000000000 --- a/dll/keyboard/kbdhu/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdhu.dll kbdhu.spec) - -add_library(kbdhu SHARED kbdhu.c kbdhu.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdhu.def) - -set_module_type(kbdhu kbdlayout) - -add_dependencies(kbdhu psdk) - -add_cd_file(TARGET kbdhu DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdic/CMakeLists.txt b/dll/keyboard/kbdic/CMakeLists.txt deleted file mode 100644 index 7155646aab9..00000000000 --- a/dll/keyboard/kbdic/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdic.dll kbdic.spec) - -add_library(kbdic SHARED kbdic.c kbdic.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdic.def) - -set_module_type(kbdic kbdlayout) - -add_dependencies(kbdic psdk) - -add_cd_file(TARGET kbdic DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdinasa/CMakeLists.txt b/dll/keyboard/kbdinasa/CMakeLists.txt deleted file mode 100644 index 69cfdba4a15..00000000000 --- a/dll/keyboard/kbdinasa/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinasa.dll kbdinasa.spec) - -add_library(kbdinasa SHARED kbdinasa.c kbdinasa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinasa.def) - -set_module_type(kbdinasa kbdlayout) - -add_dependencies(kbdinasa psdk) - -add_cd_file(TARGET kbdinasa DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdinben/CMakeLists.txt b/dll/keyboard/kbdinben/CMakeLists.txt deleted file mode 100644 index 154095cb152..00000000000 --- a/dll/keyboard/kbdinben/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinben.dll kbdinben.spec) - -add_library(kbdinben SHARED kbdinben.c kbdinben.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinben.def) - -set_module_type(kbdinben kbdlayout) - -add_dependencies(kbdinben psdk) - -add_cd_file(TARGET kbdinben DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdindev/CMakeLists.txt b/dll/keyboard/kbdindev/CMakeLists.txt deleted file mode 100644 index 7f4a72025c0..00000000000 --- a/dll/keyboard/kbdindev/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdindev.dll kbdindev.spec) - -add_library(kbdindev SHARED kbdindev.c kbdindev.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdindev.def) - -set_module_type(kbdindev kbdlayout) - -add_dependencies(kbdindev psdk) - -add_cd_file(TARGET kbdindev DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdinguj/CMakeLists.txt b/dll/keyboard/kbdinguj/CMakeLists.txt deleted file mode 100644 index 6ed105955ae..00000000000 --- a/dll/keyboard/kbdinguj/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinguj.dll kbdinguj.spec) - -add_library(kbdinguj SHARED kbdinguj.c kbdinguj.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinguj.def) - -set_module_type(kbdinguj kbdlayout) - -add_dependencies(kbdinguj psdk) - -add_cd_file(TARGET kbdinguj DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdinmal/CMakeLists.txt b/dll/keyboard/kbdinmal/CMakeLists.txt deleted file mode 100644 index 629f729696a..00000000000 --- a/dll/keyboard/kbdinmal/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdinmal.dll kbdinmal.spec) - -add_library(kbdinmal SHARED kbdinmal.c kbdinmal.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdinmal.def) - -set_module_type(kbdinmal kbdlayout) - -add_dependencies(kbdinmal psdk) - -add_cd_file(TARGET kbdinmal DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdir/CMakeLists.txt b/dll/keyboard/kbdir/CMakeLists.txt deleted file mode 100644 index 780e6c2f78e..00000000000 --- a/dll/keyboard/kbdir/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdir.dll kbdir.spec) - -add_library(kbdir SHARED kbdir.c kbdir.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdir.def) - -set_module_type(kbdir kbdlayout) - -add_dependencies(kbdir psdk) - -add_cd_file(TARGET kbdir DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdit/CMakeLists.txt b/dll/keyboard/kbdit/CMakeLists.txt deleted file mode 100644 index 1ec7b4bb48d..00000000000 --- a/dll/keyboard/kbdit/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdit.dll kbdit.spec) - -add_library(kbdit SHARED kbdit.c kbdit.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdit.def) - -set_module_type(kbdit kbdlayout) - -add_dependencies(kbdit psdk) - -add_cd_file(TARGET kbdit DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdja/CMakeLists.txt b/dll/keyboard/kbdja/CMakeLists.txt deleted file mode 100644 index 8f3c65368a1..00000000000 --- a/dll/keyboard/kbdja/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdja.dll kbdja.spec) - -add_library(kbdja SHARED kbdja.c kbdja.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdja.def) - -set_module_type(kbdja kbdlayout) - -add_dependencies(kbdja psdk) - -add_cd_file(TARGET kbdja DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdkaz/CMakeLists.txt b/dll/keyboard/kbdkaz/CMakeLists.txt deleted file mode 100644 index bafc2ed79da..00000000000 --- a/dll/keyboard/kbdkaz/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdkaz.dll kbdkaz.spec) - -add_library(kbdkaz SHARED kbdkaz.c kbdkaz.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdkaz.def) - -set_module_type(kbdkaz kbdlayout) - -add_dependencies(kbdkaz psdk) - -add_cd_file(TARGET kbdkaz DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdko/CMakeLists.txt b/dll/keyboard/kbdko/CMakeLists.txt deleted file mode 100644 index e3a1aec8e2e..00000000000 --- a/dll/keyboard/kbdko/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdko.dll kbdko.spec) - -add_library(kbdko SHARED kbdko.c kbdko.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdko.def) - -set_module_type(kbdko kbdlayout) - -add_dependencies(kbdko psdk) - -add_cd_file(TARGET kbdko DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdla/CMakeLists.txt b/dll/keyboard/kbdla/CMakeLists.txt deleted file mode 100644 index 46fa88d7ccf..00000000000 --- a/dll/keyboard/kbdla/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdla.dll kbdla.spec) - -add_library(kbdla SHARED kbdla.c kbdla.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdla.def) - -set_module_type(kbdla kbdlayout) - -add_dependencies(kbdla psdk) - -add_cd_file(TARGET kbdla DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdlt1/CMakeLists.txt b/dll/keyboard/kbdlt1/CMakeLists.txt deleted file mode 100644 index 1356f5984c6..00000000000 --- a/dll/keyboard/kbdlt1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdlt1.dll kbdlt1.spec) - -add_library(kbdlt1 SHARED kbdlt1.c kbdlt1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlt1.def) - -set_module_type(kbdlt1 kbdlayout) - -add_dependencies(kbdlt1 psdk) - -add_cd_file(TARGET kbdlt1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdlv/CMakeLists.txt b/dll/keyboard/kbdlv/CMakeLists.txt deleted file mode 100644 index 7f1b53f17f5..00000000000 --- a/dll/keyboard/kbdlv/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdlv.dll kbdlv.spec) - -add_library(kbdlv SHARED kbdlv.c kbdlv.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdlv.def) - -set_module_type(kbdlv kbdlayout) - -add_dependencies(kbdlv psdk) - -add_cd_file(TARGET kbdlv DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdmac/CMakeLists.txt b/dll/keyboard/kbdmac/CMakeLists.txt deleted file mode 100644 index ef2c4412bf5..00000000000 --- a/dll/keyboard/kbdmac/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdmac.dll kbdmac.spec) - -add_library(kbdmac SHARED kbdmac.c kbdmac.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdmac.def) - -set_module_type(kbdmac kbdlayout) - -add_dependencies(kbdmac psdk) - -add_cd_file(TARGET kbdmac DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdne/CMakeLists.txt b/dll/keyboard/kbdne/CMakeLists.txt deleted file mode 100644 index 93c4701b80c..00000000000 --- a/dll/keyboard/kbdne/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdne.dll kbdne.spec) - -add_library(kbdne SHARED kbdne.c kbdne.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdne.def) - -set_module_type(kbdne kbdlayout) - -add_dependencies(kbdne psdk) - -add_cd_file(TARGET kbdne DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdno/CMakeLists.txt b/dll/keyboard/kbdno/CMakeLists.txt deleted file mode 100644 index 8ecf1895217..00000000000 --- a/dll/keyboard/kbdno/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdno.dll kbdno.spec) - -add_library(kbdno SHARED kbdno.c kbdno.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdno.def) - -set_module_type(kbdno kbdlayout) - -add_dependencies(kbdno psdk) - -add_cd_file(TARGET kbdno DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdpl/CMakeLists.txt b/dll/keyboard/kbdpl/CMakeLists.txt deleted file mode 100644 index 1d5d330a6fa..00000000000 --- a/dll/keyboard/kbdpl/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ - -spec2def(kbdpl.dll kbdpl.spec) - -add_library(kbdpl SHARED kbdpl.c kbdpl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl.def) - -set_module_type(kbdpl kbdlayout) - -add_dependencies(kbdpl psdk) - -add_cd_file(TARGET kbdpl DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdpl1/CMakeLists.txt b/dll/keyboard/kbdpl1/CMakeLists.txt deleted file mode 100644 index f4d30f5aa46..00000000000 --- a/dll/keyboard/kbdpl1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdpl1.dll kbdpl1.spec) - -add_library(kbdpl1 SHARED kbdpl1.c kbdpl1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpl1.def) - -set_module_type(kbdpl1 kbdlayout) - -add_dependencies(kbdpl1 psdk) - -add_cd_file(TARGET kbdpl1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdpo/CMakeLists.txt b/dll/keyboard/kbdpo/CMakeLists.txt deleted file mode 100644 index bef781e263c..00000000000 --- a/dll/keyboard/kbdpo/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdpo.dll kbdpo.spec) - -add_library(kbdpo SHARED kbdpo.c kbdpo.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdpo.def) - -set_module_type(kbdpo kbdlayout) - -add_dependencies(kbdpo psdk) - -add_cd_file(TARGET kbdpo DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdro/CMakeLists.txt b/dll/keyboard/kbdro/CMakeLists.txt deleted file mode 100644 index aa3c3dabd11..00000000000 --- a/dll/keyboard/kbdro/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdro.dll kbdro.spec) - -add_library(kbdro SHARED kbdro.c kbdro.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdro.def) - -set_module_type(kbdro kbdlayout) - -add_dependencies(kbdro psdk) - -add_cd_file(TARGET kbdro DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdru/CMakeLists.txt b/dll/keyboard/kbdru/CMakeLists.txt deleted file mode 100644 index 0e4250cd014..00000000000 --- a/dll/keyboard/kbdru/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdru.dll kbdru.spec) - -add_library(kbdru SHARED kbdru.c kbdru.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru.def) - -set_module_type(kbdru kbdlayout) - -add_dependencies(kbdru psdk) - -add_cd_file(TARGET kbdru DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdru1/CMakeLists.txt b/dll/keyboard/kbdru1/CMakeLists.txt deleted file mode 100644 index 847a4391f76..00000000000 --- a/dll/keyboard/kbdru1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdru1.dll kbdru1.spec) - -add_library(kbdru1 SHARED kbdru1.c kbdru1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdru1.def) - -set_module_type(kbdru1 kbdlayout) - -add_dependencies(kbdru1 psdk) - -add_cd_file(TARGET kbdru1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdsg/CMakeLists.txt b/dll/keyboard/kbdsg/CMakeLists.txt deleted file mode 100644 index 3046bc5c1a1..00000000000 --- a/dll/keyboard/kbdsg/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsg.dll kbdsg.spec) - -add_library(kbdsg SHARED kbdsg.c kbdsg.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsg.def) - -set_module_type(kbdsg kbdlayout) - -add_dependencies(kbdsg psdk) - -add_cd_file(TARGET kbdsg DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdsk/CMakeLists.txt b/dll/keyboard/kbdsk/CMakeLists.txt deleted file mode 100644 index d7d8e914d2f..00000000000 --- a/dll/keyboard/kbdsk/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsk.dll kbdsk.spec) - -add_library(kbdsk SHARED kbdsk.c kbdsk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk.def) - -set_module_type(kbdsk kbdlayout) - -add_dependencies(kbdsk psdk) - -add_cd_file(TARGET kbdsk DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdsk1/CMakeLists.txt b/dll/keyboard/kbdsk1/CMakeLists.txt deleted file mode 100644 index ecd0da9b2cb..00000000000 --- a/dll/keyboard/kbdsk1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsk1.dll kbdsk1.spec) - -add_library(kbdsk1 SHARED kbdsk1.c kbdsk1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsk1.def) - -set_module_type(kbdsk1 kbdlayout) - -add_dependencies(kbdsk1 psdk) - -add_cd_file(TARGET kbdsk1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdsw/CMakeLists.txt b/dll/keyboard/kbdsw/CMakeLists.txt deleted file mode 100644 index 2a03ad7ee38..00000000000 --- a/dll/keyboard/kbdsw/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdsw.dll kbdsw.spec) - -add_library(kbdsw SHARED kbdsw.c kbdsw.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdsw.def) - -set_module_type(kbdsw kbdlayout) - -add_dependencies(kbdsw psdk) - -add_cd_file(TARGET kbdsw DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdtat/CMakeLists.txt b/dll/keyboard/kbdtat/CMakeLists.txt deleted file mode 100644 index d0eb34353d7..00000000000 --- a/dll/keyboard/kbdtat/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtat.dll kbdtat.spec) - -add_library(kbdtat SHARED kbdtat.c kbdtat.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtat.def) - -set_module_type(kbdtat kbdlayout) - -add_dependencies(kbdtat psdk) - -add_cd_file(TARGET kbdtat DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdth0/CMakeLists.txt b/dll/keyboard/kbdth0/CMakeLists.txt deleted file mode 100644 index 0e964860d47..00000000000 --- a/dll/keyboard/kbdth0/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth0.dll kbdth0.spec) - -add_library(kbdth0 SHARED kbdth0.c kbdth0.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth0.def) - -set_module_type(kbdth0 kbdlayout) - -add_dependencies(kbdth0 psdk) - -add_cd_file(TARGET kbdth0 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdth1/CMakeLists.txt b/dll/keyboard/kbdth1/CMakeLists.txt deleted file mode 100644 index 799384c49c1..00000000000 --- a/dll/keyboard/kbdth1/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth1.dll kbdth1.spec) - -add_library(kbdth1 SHARED kbdth1.c kbdth1.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth1.def) - -set_module_type(kbdth1 kbdlayout) - -add_dependencies(kbdth1 psdk) - -add_cd_file(TARGET kbdth1 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdth2/CMakeLists.txt b/dll/keyboard/kbdth2/CMakeLists.txt deleted file mode 100644 index a81d8d10be3..00000000000 --- a/dll/keyboard/kbdth2/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth2.dll kbdth2.spec) - -add_library(kbdth2 SHARED kbdth2.c kbdth2.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth2.def) - -set_module_type(kbdth2 kbdlayout) - -add_dependencies(kbdth2 psdk) - -add_cd_file(TARGET kbdth2 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdth3/CMakeLists.txt b/dll/keyboard/kbdth3/CMakeLists.txt deleted file mode 100644 index d9591a197cf..00000000000 --- a/dll/keyboard/kbdth3/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdth3.dll kbdth3.spec) - -add_library(kbdth3 SHARED kbdth3.c kbdth3.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdth3.def) - -set_module_type(kbdth3 kbdlayout) - -add_dependencies(kbdth3 psdk) - -add_cd_file(TARGET kbdth3 DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdtuf/CMakeLists.txt b/dll/keyboard/kbdtuf/CMakeLists.txt deleted file mode 100644 index 2ca390f814a..00000000000 --- a/dll/keyboard/kbdtuf/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtuf.dll kbdtuf.spec) - -add_library(kbdtuf SHARED kbdtuf.c kbdtuf.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuf.def) - -set_module_type(kbdtuf kbdlayout) - -add_dependencies(kbdtuf psdk) - -add_cd_file(TARGET kbdtuf DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdtuq/CMakeLists.txt b/dll/keyboard/kbdtuq/CMakeLists.txt deleted file mode 100644 index bbb9c81a2f2..00000000000 --- a/dll/keyboard/kbdtuq/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdtuq.dll kbdtuq.spec) - -add_library(kbdtuq SHARED kbdtuq.c kbdtuq.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdtuq.def) - -set_module_type(kbdtuq kbdlayout) - -add_dependencies(kbdtuq psdk) - -add_cd_file(TARGET kbdtuq DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbduk/CMakeLists.txt b/dll/keyboard/kbduk/CMakeLists.txt deleted file mode 100644 index 217c70d8354..00000000000 --- a/dll/keyboard/kbduk/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbduk.dll kbduk.spec) - -add_library(kbduk SHARED kbduk.c kbduk.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduk.def) - -set_module_type(kbduk kbdlayout) - -add_dependencies(kbduk psdk) - -add_cd_file(TARGET kbduk DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdur/CMakeLists.txt b/dll/keyboard/kbdur/CMakeLists.txt deleted file mode 100644 index 90de8728e72..00000000000 --- a/dll/keyboard/kbdur/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdur.dll kbdur.spec) - -add_library(kbdur SHARED kbdur.c kbdur.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdur.def) - -set_module_type(kbdur kbdlayout) - -add_dependencies(kbdur psdk) - -add_cd_file(TARGET kbdur DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdurs/CMakeLists.txt b/dll/keyboard/kbdurs/CMakeLists.txt deleted file mode 100644 index 8a37c1b4c65..00000000000 --- a/dll/keyboard/kbdurs/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdurs.dll kbdurs.spec) - -add_library(kbdurs SHARED kbdurs.c kbdurs.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdurs.def) - -set_module_type(kbdurs kbdlayout) - -add_dependencies(kbdurs psdk) - -add_cd_file(TARGET kbdurs DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdus/CMakeLists.txt b/dll/keyboard/kbdus/CMakeLists.txt deleted file mode 100644 index 56d7b11b49a..00000000000 --- a/dll/keyboard/kbdus/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdus.dll kbdus.spec) - -add_library(kbdus SHARED kbdus.c kbdus.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdus.def) - -set_module_type(kbdus kbdlayout) - -add_dependencies(kbdus psdk) - -add_cd_file(TARGET kbdus DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdusa/CMakeLists.txt b/dll/keyboard/kbdusa/CMakeLists.txt deleted file mode 100644 index 2f87a3ef968..00000000000 --- a/dll/keyboard/kbdusa/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusa.dll kbdusa.spec) - -add_library(kbdusa SHARED kbdusa.c kbdusa.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusa.def) - -set_module_type(kbdusa kbdlayout) - -add_dependencies(kbdusa psdk) - -add_cd_file(TARGET kbdusa DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdusl/CMakeLists.txt b/dll/keyboard/kbdusl/CMakeLists.txt deleted file mode 100644 index 1734b170b2f..00000000000 --- a/dll/keyboard/kbdusl/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusl.dll kbdusl.spec) - -add_library(kbdusl SHARED kbdusl.c kbdusl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusl.def) - -set_module_type(kbdusl kbdlayout) - -add_dependencies(kbdusl psdk) - -add_cd_file(TARGET kbdusl DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdusr/CMakeLists.txt b/dll/keyboard/kbdusr/CMakeLists.txt deleted file mode 100644 index cd33a55f4c2..00000000000 --- a/dll/keyboard/kbdusr/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusr.dll kbdusr.spec) - -add_library(kbdusr SHARED kbdusr.c kbdusr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusr.def) - -set_module_type(kbdusr kbdlayout) - -add_dependencies(kbdusr psdk) - -add_cd_file(TARGET kbdusr DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdusx/CMakeLists.txt b/dll/keyboard/kbdusx/CMakeLists.txt deleted file mode 100644 index 8d7871b4bc5..00000000000 --- a/dll/keyboard/kbdusx/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdusx.dll kbdusx.spec) - -add_library(kbdusx SHARED kbdusx.c kbdusx.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdusx.def) - -set_module_type(kbdusx kbdlayout) - -add_dependencies(kbdusx psdk) - -add_cd_file(TARGET kbdusx DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbduzb/CMakeLists.txt b/dll/keyboard/kbduzb/CMakeLists.txt deleted file mode 100644 index 6b561a04445..00000000000 --- a/dll/keyboard/kbduzb/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbduzb.dll kbduzb.spec) - -add_library(kbduzb SHARED kbduzb.c kbduzb.rc ${CMAKE_CURRENT_BINARY_DIR}/kbduzb.def) - -set_module_type(kbduzb kbdlayout) - -add_dependencies(kbduzb psdk) - -add_cd_file(TARGET kbduzb DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdvntc/CMakeLists.txt b/dll/keyboard/kbdvntc/CMakeLists.txt deleted file mode 100644 index 9b2ce1d4150..00000000000 --- a/dll/keyboard/kbdvntc/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdvntc.dll kbdvntc.spec) - -add_library(kbdvntc SHARED kbdvntc.c kbdvntc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdvntc.def) - -set_module_type(kbdvntc kbdlayout) - -add_dependencies(kbdvntc psdk) - -add_cd_file(TARGET kbdvntc DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdycc/CMakeLists.txt b/dll/keyboard/kbdycc/CMakeLists.txt deleted file mode 100644 index 2e0d34f5317..00000000000 --- a/dll/keyboard/kbdycc/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdycc.dll kbdycc.spec) - -add_library(kbdycc SHARED kbdycc.c kbdycc.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycc.def) - -set_module_type(kbdycc kbdlayout) - -add_dependencies(kbdycc psdk) - -add_cd_file(TARGET kbdycc DESTINATION reactos/system32 FOR all) diff --git a/dll/keyboard/kbdycl/CMakeLists.txt b/dll/keyboard/kbdycl/CMakeLists.txt deleted file mode 100644 index cb737232c13..00000000000 --- a/dll/keyboard/kbdycl/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ - -include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - -spec2def(kbdycl.dll kbdycl.spec) - -add_library(kbdycl SHARED kbdycl.c kbdycl.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdycl.def) - -set_module_type(kbdycl kbdlayout) - -add_dependencies(kbdycl psdk) - -add_cd_file(TARGET kbdycl DESTINATION reactos/system32 FOR all) diff --git a/dll/nls/idndl/CMakeLists.txt b/dll/nls/idndl/CMakeLists.txt index 322671e1780..590ceec807d 100644 --- a/dll/nls/idndl/CMakeLists.txt +++ b/dll/nls/idndl/CMakeLists.txt @@ -15,7 +15,5 @@ if(NOT MSVC) endif() add_importlibs(idndl kernel32) - add_dependencies(idndl psdk) - add_cd_file(TARGET idndl DESTINATION reactos FOR all) diff --git a/dll/nls/normaliz/CMakeLists.txt b/dll/nls/normaliz/CMakeLists.txt index 1180cea06df..fcda54b7970 100644 --- a/dll/nls/normaliz/CMakeLists.txt +++ b/dll/nls/normaliz/CMakeLists.txt @@ -1,10 +1,6 @@ spec2def(normaliz.dll normaliz.spec) - add_library(normaliz SHARED dummy.c ${CMAKE_CURRENT_BINARY_DIR}/normaliz.def) - set_entrypoint(normaliz 0) - add_importlibs(normaliz kernel32) - add_dependencies(normaliz psdk) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index e2b14600ddd..982e260f57e 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -54,15 +54,7 @@ if(MSVC) add_target_link_flags(ntdll "/RELEASE") endif() -target_link_libraries(ntdll - rtl - ntdllsys - libcntpr - uuid - ${PSEH_LIB}) - +target_link_libraries(ntdll rtl ntdllsys libcntpr uuid ${PSEH_LIB}) add_pch(ntdll include/ntdll.h SOURCE) add_dependencies(ntdll ntstatus asm) - add_cd_file(TARGET ntdll DESTINATION reactos/system32 NO_CAB FOR all) - diff --git a/dll/opengl/mesa/CMakeLists.txt b/dll/opengl/mesa/CMakeLists.txt index f2ffd472948..004d505e21b 100644 --- a/dll/opengl/mesa/CMakeLists.txt +++ b/dll/opengl/mesa/CMakeLists.txt @@ -23,8 +23,7 @@ if((ARCH STREQUAL "i386") AND (NOT MSVC)) -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM - -DUSE_SSE_ASM - ) + -DUSE_SSE_ASM) add_subdirectory(x86) endif() diff --git a/dll/opengl/mesa/drivers/common/CMakeLists.txt b/dll/opengl/mesa/drivers/common/CMakeLists.txt index 2f8695c1888..2037330a389 100644 --- a/dll/opengl/mesa/drivers/common/CMakeLists.txt +++ b/dll/opengl/mesa/drivers/common/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND SOURCE driverfuncs.c - meta.c -) + meta.c) -add_library(mesa_drv_common STATIC ${SOURCE}) \ No newline at end of file +add_library(mesa_drv_common STATIC ${SOURCE}) diff --git a/dll/opengl/mesa/main/CMakeLists.txt b/dll/opengl/mesa/main/CMakeLists.txt index b5218e47ada..c42d9ccdeec 100644 --- a/dll/opengl/mesa/main/CMakeLists.txt +++ b/dll/opengl/mesa/main/CMakeLists.txt @@ -71,6 +71,7 @@ list(APPEND SOURCE add_library(mesa_main STATIC ${SOURCE}) add_pch(mesa_main precomp.h SOURCE) + if(NOT MSVC) allow_warnings(mesa_main) add_target_compile_flags(mesa_main "-Wno-type-limits") diff --git a/dll/opengl/mesa/swrast/CMakeLists.txt b/dll/opengl/mesa/swrast/CMakeLists.txt index bc78d599e76..18302ce94f6 100644 --- a/dll/opengl/mesa/swrast/CMakeLists.txt +++ b/dll/opengl/mesa/swrast/CMakeLists.txt @@ -29,10 +29,8 @@ list(APPEND SOURCE add_library(mesa_swrast STATIC ${SOURCE}) add_pch(mesa_swrast precomp.h SOURCE) -if(NOT MSVC) - allow_warnings(mesa_swrast) -endif() if(NOT MSVC) add_target_compile_flags(mesa_swrast "-Wno-unused-variable") + allow_warnings(mesa_swrast) endif() diff --git a/dll/opengl/mesa/swrast_setup/CMakeLists.txt b/dll/opengl/mesa/swrast_setup/CMakeLists.txt index 4eb1d436d82..b488022c6bc 100644 --- a/dll/opengl/mesa/swrast_setup/CMakeLists.txt +++ b/dll/opengl/mesa/swrast_setup/CMakeLists.txt @@ -1,7 +1,6 @@ list(APPEND SOURCE ss_context.c - ss_triangle.c -) + ss_triangle.c) -add_library(mesa_swrast_setup STATIC ${SOURCE}) \ No newline at end of file +add_library(mesa_swrast_setup STATIC ${SOURCE}) diff --git a/dll/opengl/mesa/x86/CMakeLists.txt b/dll/opengl/mesa/x86/CMakeLists.txt index aaec3098ab7..19d484fb7a1 100644 --- a/dll/opengl/mesa/x86/CMakeLists.txt +++ b/dll/opengl/mesa/x86/CMakeLists.txt @@ -4,8 +4,7 @@ list(APPEND SOURCE x86_xform.c 3dnow.c sse.c - rtasm/x86sse.c -) + rtasm/x86sse.c) list(APPEND ASM_SOURCE common_x86_asm.S @@ -24,8 +23,7 @@ list(APPEND ASM_SOURCE sse_xform3.S sse_xform4.S sse_normal.S - read_rgba_span_x86.S -) + read_rgba_span_x86.S) add_asm_files(mesa_x86_asm ${ASM_SOURCE}) add_library(mesa_x86 STATIC ${SOURCE} ${mesa_x86_asm}) diff --git a/dll/shellext/deskadp/CMakeLists.txt b/dll/shellext/deskadp/CMakeLists.txt index 99fa79c344f..9d8cda19d02 100644 --- a/dll/shellext/deskadp/CMakeLists.txt +++ b/dll/shellext/deskadp/CMakeLists.txt @@ -13,15 +13,6 @@ add_library(deskadp SHARED set_module_type(deskadp win32dll UNICODE) target_link_libraries(deskadp uuid) - -add_importlibs(deskadp - user32 - gdi32 - comctl32 - ole32 - msvcrt - kernel32 - ntdll) - +add_importlibs(deskadp user32 gdi32 comctl32 ole32 msvcrt kernel32 ntdll) add_pch(deskadp precomp.h SOURCE) add_cd_file(TARGET deskadp DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/deskadp/lang/tr-TR.rc b/dll/shellext/deskadp/lang/tr-TR.rc index 18cac87dbfe..9ffebb83099 100644 --- a/dll/shellext/deskadp/lang/tr-TR.rc +++ b/dll/shellext/deskadp/lang/tr-TR.rc @@ -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 diff --git a/dll/shellext/deskmon/CMakeLists.txt b/dll/shellext/deskmon/CMakeLists.txt index c6b216f5f5c..8691316c777 100644 --- a/dll/shellext/deskmon/CMakeLists.txt +++ b/dll/shellext/deskmon/CMakeLists.txt @@ -13,15 +13,6 @@ add_library(deskmon SHARED set_module_type(deskmon win32dll UNICODE) target_link_libraries(deskmon uuid) - -add_importlibs(deskmon - user32 - gdi32 - comctl32 - ole32 - msvcrt - kernel32 - ntdll) - +add_importlibs(deskmon user32 gdi32 comctl32 ole32 msvcrt kernel32 ntdll) add_pch(deskmon precomp.h SOURCE) add_cd_file(TARGET deskmon DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/deskmon/lang/tr-TR.rc b/dll/shellext/deskmon/lang/tr-TR.rc index 0ceebe57658..725392cfd04 100644 --- a/dll/shellext/deskmon/lang/tr-TR.rc +++ b/dll/shellext/deskmon/lang/tr-TR.rc @@ -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 diff --git a/dll/shellext/devcpux/CMakeLists.txt b/dll/shellext/devcpux/CMakeLists.txt index 263501c19e1..08624da93d3 100644 --- a/dll/shellext/devcpux/CMakeLists.txt +++ b/dll/shellext/devcpux/CMakeLists.txt @@ -2,13 +2,5 @@ spec2def(devcpux.dll devcpux.spec) add_library(devcpux SHARED processor.c processor.rc ${CMAKE_CURRENT_BINARY_DIR}/devcpux.def) set_module_type(devcpux win32dll UNICODE) - -add_importlibs(devcpux - user32 - powrprof - comctl32 - msvcrt - kernel32 - ntdll) - +add_importlibs(devcpux user32 powrprof comctl32 msvcrt kernel32 ntdll) add_cd_file(TARGET devcpux DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/fontext/CMakeLists.txt b/dll/shellext/fontext/CMakeLists.txt index 78d88d31ce2..a31e78d3e3f 100644 --- a/dll/shellext/fontext/CMakeLists.txt +++ b/dll/shellext/fontext/CMakeLists.txt @@ -13,18 +13,6 @@ add_library(fontext SHARED set_module_type(fontext win32dll UNICODE) target_link_libraries(fontext uuid) - -add_importlibs(fontext - user32 - gdi32 - ole32 - shlwapi - lz32 - advapi32 - setupapi - msvcrt - kernel32 - ntdll) - +add_importlibs(fontext user32 gdi32 ole32 shlwapi lz32 advapi32 setupapi msvcrt kernel32 ntdll) add_pch(fontext fontext.h SOURCE) add_cd_file(TARGET fontext DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/slayer/CMakeLists.txt b/dll/shellext/slayer/CMakeLists.txt index 825320ddeeb..62d898e229f 100644 --- a/dll/shellext/slayer/CMakeLists.txt +++ b/dll/shellext/slayer/CMakeLists.txt @@ -9,15 +9,5 @@ list(APPEND SOURCE add_library(slayer SHARED ${SOURCE}) set_module_type(slayer win32dll UNICODE) target_link_libraries(slayer uuid) - -add_importlibs(slayer - user32 - comctl32 - advapi32 - ole32 - shell32 - msvcrt - kernel32 - ntdll) - +add_importlibs(slayer user32 comctl32 advapi32 ole32 shell32 msvcrt kernel32 ntdll) add_cd_file(TARGET slayer DESTINATION reactos/system32 FOR all) diff --git a/dll/shellext/slayer/lang/tr-TR.rc b/dll/shellext/slayer/lang/tr-TR.rc index ef63fc31e95..5d4de0cbfa9 100644 --- a/dll/shellext/slayer/lang/tr-TR.rc +++ b/dll/shellext/slayer/lang/tr-TR.rc @@ -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 diff --git a/dll/win32/aclui/CMakeLists.txt b/dll/win32/aclui/CMakeLists.txt index 58f63709afc..de7a6b1c7b9 100644 --- a/dll/win32/aclui/CMakeLists.txt +++ b/dll/win32/aclui/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(aclui.dll aclui.spec) - add_definitions(-DSUPPORT_UXTHEME) list(APPEND SOURCE diff --git a/dll/win32/actxprxy/CMakeLists.txt b/dll/win32/actxprxy/CMakeLists.txt index 1f4a6d9a8af..a20d1db4a46 100644 --- a/dll/win32/actxprxy/CMakeLists.txt +++ b/dll/win32/actxprxy/CMakeLists.txt @@ -1,9 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_definitions(-DWINE_REGISTER_DLL -DPROXY_DELEGATION) - spec2def(actxprxy.dll actxprxy.spec) add_rpcproxy_files( diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index 71dc694f739..484f9234914 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -1,6 +1,5 @@ spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB) - add_definitions(-D_ADVAPI32_) remove_definitions(-D_WIN32_WINNT=0x502) @@ -60,8 +59,5 @@ set_module_type(advapi32 win32dll UNICODE ENTRYPOINT DllMain 12) target_link_libraries(advapi32 cryptlib wine ${PSEH_LIB}) add_delay_importlibs(advapi32 secur32) add_importlibs(advapi32 rpcrt4 kernel32 ntdll) - add_pch(advapi32 advapi32.h SOURCE) - add_cd_file(TARGET advapi32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/advpack/CMakeLists.txt b/dll/win32/advpack/CMakeLists.txt index c33a9dd7086..6f6f38ba219 100644 --- a/dll/win32/advpack/CMakeLists.txt +++ b/dll/win32/advpack/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(advpack.dll advpack.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/atl/CMakeLists.txt b/dll/win32/atl/CMakeLists.txt index 1a0200f5a44..22efd4f01cd 100644 --- a/dll/win32/atl/CMakeLists.txt +++ b/dll/win32/atl/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_ATL_VER=_ATL_VER_30) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(atl.dll atl.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -23,7 +22,6 @@ list(APPEND atl_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/atl_lib.tlb) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${atl_rc_deps}") - add_library(atl SHARED ${SOURCE} rsrc.rc) add_typelib(atl_lib.idl) add_dependencies(atl stdole2) diff --git a/dll/win32/atl100/CMakeLists.txt b/dll/win32/atl100/CMakeLists.txt index 67dfb1db52f..eedba4fa761 100644 --- a/dll/win32/atl100/CMakeLists.txt +++ b/dll/win32/atl100/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_ATL_VER=_ATL_VER_100) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(atl100.dll atl100.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/authz/CMakeLists.txt b/dll/win32/authz/CMakeLists.txt index 53bc1977118..5d57622d9d7 100644 --- a/dll/win32/authz/CMakeLists.txt +++ b/dll/win32/authz/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(authz.dll authz.spec) list(APPEND SOURCE @@ -15,8 +14,6 @@ add_library(authz SHARED ${CMAKE_CURRENT_BINARY_DIR}/authz.def) set_module_type(authz win32dll UNICODE) - add_importlibs(authz advapi32 msvcrt kernel32 ntdll) add_pch(authz precomp.h SOURCE) - add_cd_file(TARGET authz DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/avicap32/CMakeLists.txt b/dll/win32/avicap32/CMakeLists.txt index 85f843dd21d..7c574f5a94b 100644 --- a/dll/win32/avicap32/CMakeLists.txt +++ b/dll/win32/avicap32/CMakeLists.txt @@ -1,17 +1,12 @@ spec2def(avicap32.dll avicap32.spec ADD_IMPORTLIB) - add_library(avicap32 SHARED avicap32.c avicap32.rc ${CMAKE_CURRENT_BINARY_DIR}/avicap32.def) set_module_type(avicap32 win32dll UNICODE) - target_link_libraries(avicap32 wine) - add_importlibs(avicap32 advapi32 user32 version msvcrt kernel32 ntdll) - add_cd_file(TARGET avicap32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/beepmidi/CMakeLists.txt b/dll/win32/beepmidi/CMakeLists.txt index fac6040b173..18f8ba4f130 100644 --- a/dll/win32/beepmidi/CMakeLists.txt +++ b/dll/win32/beepmidi/CMakeLists.txt @@ -12,9 +12,5 @@ if(CMAKE_C_COMPILER_ID STREQUAL "Clang") endif() set_module_type(beepmidi win32dll UNICODE) - add_importlibs(beepmidi winmm msvcrt kernel32 ntdll) - - -add_dependencies(beepmidi psdk) add_cd_file(TARGET beepmidi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/browseui/CMakeLists.txt b/dll/win32/browseui/CMakeLists.txt index 0d92a03b543..8283f0f85b7 100644 --- a/dll/win32/browseui/CMakeLists.txt +++ b/dll/win32/browseui/CMakeLists.txt @@ -6,7 +6,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) include_directories(${REACTOS_SOURCE_DIR}/lib/atl) - spec2def(browseui.dll browseui.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -40,25 +39,8 @@ add_library(browseui SHARED ${CMAKE_CURRENT_BINARY_DIR}/browseui.def) set_module_type(browseui win32dll UNICODE) - -target_link_libraries(browseui - atlnew - uuid - wine) - -add_importlibs(browseui - shlwapi - shell32 - comctl32 - gdi32 - ole32 - oleaut32 - user32 - advapi32 - msvcrt - kernel32 - ntdll) - +target_link_libraries(browseui atlnew uuid wine) +add_importlibs(browseui shlwapi shell32 comctl32 gdi32 ole32 oleaut32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/cfgmgr32/CMakeLists.txt b/dll/win32/cfgmgr32/CMakeLists.txt index 16d1d92f06c..2e630932e67 100644 --- a/dll/win32/cfgmgr32/CMakeLists.txt +++ b/dll/win32/cfgmgr32/CMakeLists.txt @@ -9,6 +9,5 @@ list(APPEND SOURCE add_library(cfgmgr32 SHARED ${SOURCE}) set_module_type(cfgmgr32 win32dll) -add_importlibs(cfgmgr32 msvcrt setupapi kernel32 ntdll) -add_dependencies(cfgmgr32 psdk) +add_importlibs(cfgmgr32 setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET cfgmgr32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/comcat/CMakeLists.txt b/dll/win32/comcat/CMakeLists.txt index dcc2fde4689..ab1d9f5a9f9 100644 --- a/dll/win32/comcat/CMakeLists.txt +++ b/dll/win32/comcat/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(comcat.dll comcat.spec) list(APPEND SOURCE diff --git a/dll/win32/comctl32/lang/comctl_Tr.rc b/dll/win32/comctl32/lang/comctl_Tr.rc index 4b90ca605bf..567a49da635 100644 --- a/dll/win32/comctl32/lang/comctl_Tr.rc +++ b/dll/win32/comctl32/lang/comctl_Tr.rc @@ -1,7 +1,7 @@ /* * Top level resource file for Common Controls * - * Copyrights: 2006 Fatih Aşıcı; 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) + * Copyrights: 2006 Fatih Aşıcı; 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 diff --git a/dll/win32/comdlg32/lang/cdlg_Ro.rc b/dll/win32/comdlg32/lang/cdlg_Ro.rc index c32ecbe365b..cb1ded4fc68 100644 --- a/dll/win32/comdlg32/lang/cdlg_Ro.rc +++ b/dll/win32/comdlg32/lang/cdlg_Ro.rc @@ -4,7 +4,7 @@ * Copyright 1999 Bertho Stultiens * Copyright 1999 Klaas van Gend * Copyright 2008 Michael Stefaniuc - * 2012 Fulea Ștefan + * 2012 Ștefan Fulea * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +36,7 @@ Doriți să îl suprascrieți?" / : < > |" IDS_PATHNOTEXISTING "Calea nu există" IDS_FILENOTEXISTING "Fișierul nu există" - IDS_INVALID_FOLDERNAME "The selection contains a non-folder object" + IDS_INVALID_FOLDERNAME "Selecția nu conține un dosar" } STRINGTABLE @@ -67,7 +67,7 @@ Introduceți un număr între 1 și %d." PD32_OUT_OF_MEMORY "Memorie insuficientă." PD32_GENERIC_ERROR "S-a produs o eroare." PD32_DRIVER_UNKNOWN "Modulul pilot de imprimantă este necunoscut." - PD32_NO_DEVICES "Este necesară instalarea unei imprimante înainte de a putea efectua activități aferente imprimantei ca spre exemplu accesarea opțiunilor de pagină sau imprimarea unui document. Instalați o imprimantă apoi reîncercați." + PD32_NO_DEVICES "Este necesară instalarea unei imprimante înainte de a putea efectua activități aferente imprimantei (cum ar fi accesarea opțiunilor de pagină sau imprimarea unui document). Instalați o imprimantă apoi reîncercați." PD32_DEFAULT_PRINTER "Imprimantă implicită; " PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d documente sunt în coadă" @@ -139,7 +139,7 @@ STRINGTABLE IDS_SAVE "Păstrare" IDS_SAVE_AS "Păstrare în:" IDS_OPEN_FILE "Deschidere fișier" - IDS_SELECT_FOLDER "Select Folder" + IDS_SELECT_FOLDER "Selecează dosar" } /* @@ -244,10 +244,10 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Font" FONT 8, "MS Shell Dlg" { - LTEXT "F&ont:", stc1 ,6,3,90,9 + LTEXT "N&ume font:", stc1 ,6,3,90,9 COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE - LTEXT "&Stil font:", stc2 ,108,3,60,9 + LTEXT "Stil f&ont:", stc2 ,108,3,60,9 COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE LTEXT "Mă&rime:", stc3,179,3,32,9 @@ -259,13 +259,13 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "&Manual…", pshHelp,218,57,50,14,WS_GROUP | WS_TABSTOP GROUPBOX "Efecte", grp1,6,72,84,36,WS_GROUP CHECKBOX "&Tăiat", chx1, 10,82,78,10, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "S&ubliniat", chx2, 10,94,78,10, BS_AUTOCHECKBOX + CHECKBOX "Su&bliniat", chx2, 10,94,78,10, BS_AUTOCHECKBOX LTEXT "&Culoare:", stc4 ,6,114,80,9 COMBOBOX cmb4,6,124,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP GROUPBOX "Mostră", grp2,98,72,120,36,WS_GROUP CTEXT "AaBbYyZz", stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE - LTEXT "Scr&ipt:", stc7 ,98,114,40,9 + LTEXT "Sist&em de scriere:", stc7 ,98,114,40,9 COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP } @@ -283,13 +283,13 @@ FONT 8, "MS Shell Dlg" EDITTEXT 706, 295,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP RTEXT "&Verde:", 727/*1095*/,262,140,30,10 EDITTEXT 707, 295,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - RTEXT "&Albastru:", 728 /*1096*/,262,154,30,10 + RTEXT "Al&bastru:", 728 /*1096*/,262,154,30,10 EDITTEXT 708, 295,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP RTEXT "N&uanță:", 723 /*1091*/,194,126,40,10 EDITTEXT 703, 236,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - RTEXT "Sa&turație:", 724 /*1092*/,194,140,40,10 + RTEXT "S&aturație:", 724 /*1092*/,194,140,40,10 EDITTEXT 704, 236,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP - RTEXT "&Strălucire:", 725 /*1093*/,194,154,40,10 + RTEXT "St&rălucire:", 725 /*1093*/,194,154,40,10 EDITTEXT 705, 236,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP CONTROL "", 720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86 CONTROL "", 721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28 diff --git a/dll/win32/comdlg32/lang/cdlg_Tr.rc b/dll/win32/comdlg32/lang/cdlg_Tr.rc index 4ab43385465..e86f6e8e771 100644 --- a/dll/win32/comdlg32/lang/cdlg_Tr.rc +++ b/dll/win32/comdlg32/lang/cdlg_Tr.rc @@ -1,7 +1,7 @@ /* * Resources for Common Dialogs * - * Copyrights: 2006 Fatih Aşıcı; 2013 Erdem Ersoy (eersoy93) (erdemersoy@live.com) + * Copyrights: 2006 Fatih Aşıcı; 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 diff --git a/dll/win32/compstui/CMakeLists.txt b/dll/win32/compstui/CMakeLists.txt index f9091be2dfb..bac88d4722a 100644 --- a/dll/win32/compstui/CMakeLists.txt +++ b/dll/win32/compstui/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(compstui.dll compstui.spec) list(APPEND SOURCE @@ -10,11 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/compstui.def) add_library(compstui SHARED ${SOURCE}) - set_module_type(compstui win32dll) - target_link_libraries(compstui wine) - add_importlibs(compstui msvcrt kernel32 ntdll) add_cd_file(TARGET compstui DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/credui/CMakeLists.txt b/dll/win32/credui/CMakeLists.txt index 8030241a68d..3d9fe221e59 100644 --- a/dll/win32/credui/CMakeLists.txt +++ b/dll/win32/credui/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(credui.dll credui.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/credui/lang/credui_Tr.rc b/dll/win32/credui/lang/credui_Tr.rc index a9eb7d89879..2674d16ea2c 100644 --- a/dll/win32/credui/lang/credui_Tr.rc +++ b/dll/win32/credui/lang/credui_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish language resource file for Credentials UI * - * 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 diff --git a/dll/win32/crtdll/CMakeLists.txt b/dll/win32/crtdll/CMakeLists.txt index fc8b6483bb6..71d108f4e3e 100644 --- a/dll/win32/crtdll/CMakeLists.txt +++ b/dll/win32/crtdll/CMakeLists.txt @@ -18,9 +18,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/crtdll.def) add_library(crtdll SHARED ${SOURCE}) - set_module_type(crtdll win32dll ENTRYPOINT DllMain 12) - target_link_libraries(crtdll crt wine) if(MSVC) @@ -29,5 +27,4 @@ if(MSVC) endif() add_importlibs(crtdll kernel32 ntdll) - add_cd_file(TARGET crtdll DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/crypt32/lang/crypt32_Ro.rc b/dll/win32/crypt32/lang/crypt32_Ro.rc index ba9c6c14a1c..26680f924b0 100644 --- a/dll/win32/crypt32/lang/crypt32_Ro.rc +++ b/dll/win32/crypt32/lang/crypt32_Ro.rc @@ -2,6 +2,7 @@ * crypt32 dll Romanian resources * * Copyright (C) 2009 Paul Chitescu + * 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 @@ -177,7 +178,7 @@ STRINGTABLE STRINGTABLE { - IDS_KEY_ID "KeyID=" + IDS_KEY_ID "ID cheie=" IDS_CERT_ISSUER "Emitentul certificatului" IDS_CERT_SERIAL_NUMBER "Numărul de serie al certificatului=" IDS_ALT_NAME_OTHER_NAME "Nume alternativ=" diff --git a/dll/win32/crypt32/lang/crypt32_Tr.rc b/dll/win32/crypt32/lang/crypt32_Tr.rc index 8591f8a2568..a4ddb7b29a0 100644 --- a/dll/win32/crypt32/lang/crypt32_Tr.rc +++ b/dll/win32/crypt32/lang/crypt32_Tr.rc @@ -1,7 +1,7 @@ /* * crypt32 dll resources * - * 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 diff --git a/dll/win32/cryptdlg/CMakeLists.txt b/dll/win32/cryptdlg/CMakeLists.txt index 09f53cdf064..e389c39e3b8 100644 --- a/dll/win32/cryptdlg/CMakeLists.txt +++ b/dll/win32/cryptdlg/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptdlg.dll cryptdlg.spec) list(APPEND SOURCE diff --git a/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc b/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc index 341fe2d7f4e..af5b4e8ba8e 100644 --- a/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc +++ b/dll/win32/cryptdlg/lang/cryptdlg_Tr.rc @@ -1,7 +1,7 @@ /* * cryptdlg dll resources * - * 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 diff --git a/dll/win32/cryptdll/CMakeLists.txt b/dll/win32/cryptdll/CMakeLists.txt index 1810479e81a..05bea5e87d8 100644 --- a/dll/win32/cryptdll/CMakeLists.txt +++ b/dll/win32/cryptdll/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptdll.dll cryptdll.spec) list(APPEND SOURCE diff --git a/dll/win32/cryptnet/CMakeLists.txt b/dll/win32/cryptnet/CMakeLists.txt index ffbdf1a3098..7e8aa2d7c02 100644 --- a/dll/win32/cryptnet/CMakeLists.txt +++ b/dll/win32/cryptnet/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptnet.dll cryptnet.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/cryptui/CMakeLists.txt b/dll/win32/cryptui/CMakeLists.txt index 29262b8fad6..ed6c53810df 100644 --- a/dll/win32/cryptui/CMakeLists.txt +++ b/dll/win32/cryptui/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(cryptui.dll cryptui.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/cryptui/lang/cryptui_Ro.rc b/dll/win32/cryptui/lang/cryptui_Ro.rc index c085868922d..e3bdc74dd2f 100644 --- a/dll/win32/cryptui/lang/cryptui_Ro.rc +++ b/dll/win32/cryptui/lang/cryptui_Ro.rc @@ -187,7 +187,7 @@ BEGIN CONTROL "", IDC_CERTIFICATE_STATUS,"RichEdit20W", ES_READONLY|ES_MULTILINE,8,38,238,78 CONTROL "", -1, "Static", SS_BLACKFRAME, 16,116,222,1 CONTROL "", IDC_CERTIFICATE_NAMES,"RichEdit20W", ES_READONLY|ES_MULTILINE|WS_DISABLED,8,118,238,90 - PUSHBUTTON "&Instalare certificat…", IDC_ADDTOSTORE,53,216,95,14 + PUSHBUTTON "Instala&re certificat…", IDC_ADDTOSTORE,53,216,95,14 PUSHBUTTON "&Declarația emitentului", IDC_ISSUERSTATEMENT,152,216,95,14 END @@ -214,7 +214,7 @@ BEGIN CONTROL "",IDC_CERTPATH, "SysTreeView32", TVS_HASLINES|WS_BORDER, 13,22,231,130 PUSHBUTTON "&Afișează certificat", IDC_VIEWCERTIFICATE,155,156,90,14 - LTEXT "&Stare certificat:", IDC_CERTIFICATESTATUS,6,183,200,14 + LTEXT "Sta&re certificat:", IDC_CERTIFICATESTATUS,6,183,200,14 CONTROL "", IDC_CERTIFICATESTATUSTEXT,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,195,245,36 END @@ -292,7 +292,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "N&ume fișier:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - PUSHBUTTON "&Răsfoire…", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + PUSHBUTTON "&Căutare…", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 LTEXT "Notă: Următoarele formate de fișier pot conține mai multe certificate, liste de certificate revocate sau liste de certificate acreditate:", -1, 21,30,265,16 LTEXT "Standard sintaxă mesaje criptografice/Mesaje PKCS #7 (*.p7b)", @@ -314,7 +314,7 @@ BEGIN AUTORADIOBUTTON "&Plasează toate certificatele în următorul depozit:", IDC_IMPORT_SPECIFY_STORE, 31,42,220,12, BS_AUTORADIOBUTTON EDITTEXT IDC_IMPORT_STORE, 44,61,185,14, ES_READONLY - PUSHBUTTON "&Răsfoire…", IDC_IMPORT_BROWSE_STORE, 236,61,60,14 + PUSHBUTTON "&Căutare…", IDC_IMPORT_BROWSE_STORE, 236,61,60,14 END IDD_IMPORT_FINISH DIALOG 0,0,317,178 @@ -340,7 +340,7 @@ BEGIN COMBOBOX IDC_MGR_PURPOSE_SELECTION, 83,7,245,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_MGR_STORES, "SysTabControl32", WS_CLIPSIBLINGS|WS_TABSTOP, 7,25,321,140 CONTROL "", IDC_MGR_CERTS, "SysListView32", LVS_REPORT|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 15,46,305,111 - PUSHBUTTON "&Importare…", IDC_MGR_IMPORT, 7,172,65,14 + PUSHBUTTON "I&mportare…", IDC_MGR_IMPORT, 7,172,65,14 PUSHBUTTON "E&xportare…", IDC_MGR_EXPORT, 76,172,65,14, WS_DISABLED PUSHBUTTON "Șt&erge", IDC_MGR_REMOVE, 145,172,65,14, WS_DISABLED PUSHBUTTON "A&vansate…", IDC_MGR_ADVANCED, 263,172,65,14 @@ -382,7 +382,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dacă alegeți să exportați cheia privată, vi se va solicita pe o pagină următoare o parolă pentru a proteja această cheie privată.", -1, 21,1,195,25 LTEXT "Doriți să exportați cheia privată?", -1, 21,27,195,10 - AUTORADIOBUTTON "&Da, exportă cheia privată", + AUTORADIOBUTTON "D&a, exportă cheia privată", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "N&u, nu exporta cheia privată", IDC_EXPORT_PRIVATE_KEY_NO, 31,48,200,12, BS_AUTORADIOBUTTON @@ -393,9 +393,9 @@ IDD_EXPORT_PASSWORD DIALOG 0,0,317,143 CAPTION "Exportare certificate" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Parola:", -1, 21,1,195,10 + LTEXT "&Parolă:", -1, 21,1,195,10 EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - LTEXT "&Confirmați parola:", -1, 21,35,195,10 + LTEXT "&Confirmare parolă:", -1, 21,35,195,10 EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP END @@ -410,7 +410,7 @@ BEGIN IDC_EXPORT_FORMAT_BASE64, 31,30,280,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "Standard sintaxă mesaje criptografice/Mesaj &PKCS #7 (*.p7b)", IDC_EXPORT_FORMAT_CMS, 31,42,280,12, BS_AUTORADIOBUTTON - CHECKBOX "&Include toate certificatele din calea de certificare, dacă este posibil", + CHECKBOX "In&clude toate certificatele din calea de certificare, dacă este posibil", IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,280,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "Schimb de informații personale/P&KCS #12 (*.pfx)", IDC_EXPORT_FORMAT_PFX, 31,72,280,12, BS_AUTORADIOBUTTON|WS_DISABLED @@ -428,7 +428,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "N&ume fișier:", -1, 21,1,195,10 EDITTEXT IDC_EXPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - PUSHBUTTON "&Răsfoire…", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 + PUSHBUTTON "&Căutare…", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END IDD_EXPORT_FINISH DIALOG 0,0,317,178 diff --git a/dll/win32/devmgr/CMakeLists.txt b/dll/win32/devmgr/CMakeLists.txt index d2c78a1207e..179e0ce4343 100644 --- a/dll/win32/devmgr/CMakeLists.txt +++ b/dll/win32/devmgr/CMakeLists.txt @@ -18,16 +18,6 @@ add_library(devmgr SHARED set_module_type(devmgr win32dll UNICODE) target_link_libraries(devmgr uuid wine) - -add_importlibs(devmgr - setupapi - advapi32 - newdev - user32 - version - msvcrt - kernel32 - ntdll) - +add_importlibs(devmgr setupapi advapi32 newdev user32 version msvcrt kernel32 ntdll) add_pch(devmgr precomp.h SOURCE) add_cd_file(TARGET devmgr DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/dhcpcsvc/CMakeLists.txt b/dll/win32/dhcpcsvc/CMakeLists.txt index cf585a90cda..517582e5584 100644 --- a/dll/win32/dhcpcsvc/CMakeLists.txt +++ b/dll/win32/dhcpcsvc/CMakeLists.txt @@ -1,8 +1,6 @@ add_definitions(-Dtzset=_tzset) - include_directories(include) - spec2def(dhcpcsvc.dll dhcpcsvc.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/dnsapi/CMakeLists.txt b/dll/win32/dnsapi/CMakeLists.txt index 0755c23a5f6..7a80b3c1ea2 100644 --- a/dll/win32/dnsapi/CMakeLists.txt +++ b/dll/win32/dnsapi/CMakeLists.txt @@ -5,7 +5,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/3rdparty/adns/adns_win32) add_definitions(-DADNS_JGAA_WIN32) - spec2def(dnsapi.dll dnsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -27,6 +26,4 @@ set_module_type(dnsapi win32dll) target_link_libraries(dnsapi adns) add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi dnsapi/precomp.h SOURCE) -add_dependencies(dnsapi psdk) add_cd_file(TARGET dnsapi DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/dwmapi/CMakeLists.txt b/dll/win32/dwmapi/CMakeLists.txt index b9eb8806de9..da4c1cc50d2 100644 --- a/dll/win32/dwmapi/CMakeLists.txt +++ b/dll/win32/dwmapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dwmapi.dll dwmapi.spec) list(APPEND SOURCE diff --git a/dll/win32/fmifs/CMakeLists.txt b/dll/win32/fmifs/CMakeLists.txt index ffc3d847466..13a61eb37d2 100644 --- a/dll/win32/fmifs/CMakeLists.txt +++ b/dll/win32/fmifs/CMakeLists.txt @@ -23,4 +23,3 @@ add_importlibs(fmifs kernel32 ntdll) add_pch(fmifs precomp.h SOURCE) add_dependencies(fmifs psdk) add_cd_file(TARGET fmifs DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/framedyn/CMakeLists.txt b/dll/win32/framedyn/CMakeLists.txt index 9a2f8b8fd3b..5156254f425 100644 --- a/dll/win32/framedyn/CMakeLists.txt +++ b/dll/win32/framedyn/CMakeLists.txt @@ -1,6 +1,5 @@ set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) - spec2def(framedyn.dll framedyn.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -15,7 +14,6 @@ endif() add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) - add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) if(NOT MSVC) diff --git a/dll/win32/fusion/CMakeLists.txt b/dll/win32/fusion/CMakeLists.txt index 6704f9597f6..3a70195197c 100644 --- a/dll/win32/fusion/CMakeLists.txt +++ b/dll/win32/fusion/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(fusion.dll fusion.spec) list(APPEND SOURCE diff --git a/dll/win32/gdiplus/CMakeLists.txt b/dll/win32/gdiplus/CMakeLists.txt index d8f69adb96d..2217df50343 100644 --- a/dll/win32/gdiplus/CMakeLists.txt +++ b/dll/win32/gdiplus/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_USE_MATH_DEFINES) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(gdiplus.dll gdiplus.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/getuname/CMakeLists.txt b/dll/win32/getuname/CMakeLists.txt index f6c0cfc3fae..bb31454f875 100644 --- a/dll/win32/getuname/CMakeLists.txt +++ b/dll/win32/getuname/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(getuname.dll getuname.spec) add_library(getuname SHARED @@ -9,7 +7,6 @@ add_library(getuname SHARED getuname.rc ${CMAKE_CURRENT_BINARY_DIR}/getuname.def) - set_module_type(getuname win32dll UNICODE) add_importlibs(getuname user32 msvcrt kernel32 ntdll) add_cd_file(TARGET getuname DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/hhctrl.ocx/CMakeLists.txt b/dll/win32/hhctrl.ocx/CMakeLists.txt index 2e967c9721f..8d199af3043 100644 --- a/dll/win32/hhctrl.ocx/CMakeLists.txt +++ b/dll/win32/hhctrl.ocx/CMakeLists.txt @@ -30,13 +30,9 @@ list(APPEND hhctrl_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/hhctrl_tlb.tlb) set_source_files_properties(hhctrl.rc PROPERTIES OBJECT_DEPENDS "${hhctrl_rc_deps}") - -# hhctrl_tlb.tlb needs stdole2.tlb -add_dependencies(hhctrl stdole2) - set_module_type(hhctrl win32ocx) target_link_libraries(hhctrl uuid wine) add_importlibs(hhctrl advapi32 comctl32 shlwapi ole32 oleaut32 user32 gdi32 msvcrt kernel32 ntdll) -add_dependencies(hhctrl wineheaders) +add_dependencies(hhctrl stdole2 wineheaders) add_pch(hhctrl hhctrl.h SOURCE) add_cd_file(TARGET hhctrl DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/hhctrl.ocx/lang/Ro.rc b/dll/win32/hhctrl.ocx/lang/Ro.rc index 58063b7b62a..eae92f223ab 100644 --- a/dll/win32/hhctrl.ocx/lang/Ro.rc +++ b/dll/win32/hhctrl.ocx/lang/Ro.rc @@ -4,7 +4,7 @@ * Copyright 2005 James Hawkins * Copyright 2010 Claudia Cotună * Michael Stefaniuc - * Fulea Ștefan + * Ștefan Fulea * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,13 +27,13 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_CONTENTS "&Cuprins" - IDS_INDEX "&Index" + IDS_CONTENTS "C&uprins" + IDS_INDEX "In&dex" IDS_SEARCH "&Caută" IDS_FAVORITES "F&avorite" - IDS_HIDETABS "Hide &Tabs" - IDS_SHOWTABS "Show &Tabs" + IDS_HIDETABS "Ascunde ta&buri" + IDS_SHOWTABS "Afișează ta&buri" END STRINGTABLE @@ -55,12 +55,12 @@ MENU_POPUP MENU POPUP "" /* Options */ { MENUITEM "", IDTB_EXPAND - MENUITEM "S&ync", IDTB_SYNC - MENUITEM "&Back", IDTB_BACK - MENUITEM "&Forward", IDTB_FORWARD - MENUITEM "&Home", IDTB_HOME - MENUITEM "&Stop", IDTB_STOP - MENUITEM "&Refresh", IDTB_REFRESH - MENUITEM "&Print...", IDTB_PRINT + MENUITEM "Sinc&r", IDTB_SYNC + MENUITEM "Înap&oi", IDTB_BACK + MENUITEM "În&ainte", IDTB_FORWARD + MENUITEM "A&casă", IDTB_HOME + MENUITEM "Opr&ește", IDTB_STOP + MENUITEM "Împrospătea&ză", IDTB_REFRESH + MENUITEM "I&mprimă…", IDTB_PRINT } } diff --git a/dll/win32/hid/CMakeLists.txt b/dll/win32/hid/CMakeLists.txt index 42147d368e1..e045cfe4460 100644 --- a/dll/win32/hid/CMakeLists.txt +++ b/dll/win32/hid/CMakeLists.txt @@ -1,5 +1,4 @@ - list(APPEND SOURCE hid.c stubs.c @@ -13,7 +12,6 @@ add_library(hid SHARED ${CMAKE_CURRENT_BINARY_DIR}/hid.def) set_module_type(hid win32dll UNICODE) - add_importlibs(hid msvcrt kernel32 ntdll) add_pch(hid precomp.h SOURCE) add_cd_file(TARGET hid DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/hlink/CMakeLists.txt b/dll/win32/hlink/CMakeLists.txt index 8e6b85d7151..8bc7378dfef 100644 --- a/dll/win32/hlink/CMakeLists.txt +++ b/dll/win32/hlink/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(hlink.dll hlink.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/ieframe/CMakeLists.txt b/dll/win32/ieframe/CMakeLists.txt index 562c38dba64..09efbb8fabd 100644 --- a/dll/win32/ieframe/CMakeLists.txt +++ b/dll/win32/ieframe/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(ieframe.dll ieframe.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -39,10 +38,7 @@ list(APPEND ieframe_rc_deps ${CMAKE_CURRENT_BINARY_DIR}/ieframe_v1.tlb) set_source_files_properties(ieframe.rc PROPERTIES OBJECT_DEPENDS "${ieframe_rc_deps}") - -# ieframe_v1.tlb needs stdole2.tlb add_dependencies(ieframe stdole2) - set_module_type(ieframe win32dll) target_link_libraries(ieframe uuid wine) add_importlibs(ieframe urlmon shell32 comctl32 shlwapi oleaut32 ole32 user32 gdi32 advapi32 msvcrt kernel32 ntdll) diff --git a/dll/win32/imaadp32.acm/CMakeLists.txt b/dll/win32/imaadp32.acm/CMakeLists.txt index fd2d4004e5a..fddf9b12afd 100644 --- a/dll/win32/imaadp32.acm/CMakeLists.txt +++ b/dll/win32/imaadp32.acm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(imaadp32.acm imaadp32.acm.spec) list(APPEND SOURCE diff --git a/dll/win32/imagehlp/CMakeLists.txt b/dll/win32/imagehlp/CMakeLists.txt index 4195057c091..7a79c8bb2e0 100644 --- a/dll/win32/imagehlp/CMakeLists.txt +++ b/dll/win32/imagehlp/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D_IMAGEHLP_SOURCE_) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/inetmib1/CMakeLists.txt b/dll/win32/inetmib1/CMakeLists.txt index 8764effe22d..d5b0bb713e2 100644 --- a/dll/win32/inetmib1/CMakeLists.txt +++ b/dll/win32/inetmib1/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(inetmib1.dll inetmib1.spec) list(APPEND SOURCE diff --git a/dll/win32/initpki/CMakeLists.txt b/dll/win32/initpki/CMakeLists.txt index 8d103379b39..fe5d2724613 100644 --- a/dll/win32/initpki/CMakeLists.txt +++ b/dll/win32/initpki/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(initpki.dll initpki.spec) list(APPEND SOURCE diff --git a/dll/win32/iologmsg/CMakeLists.txt b/dll/win32/iologmsg/CMakeLists.txt index b3583606c94..02197c45d05 100644 --- a/dll/win32/iologmsg/CMakeLists.txt +++ b/dll/win32/iologmsg/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(${REACTOS_BINARY_DIR}/include/reactos) add_library(iologmsg SHARED iologmsg.rc) set_module_type(iologmsg win32dll ENTRYPOINT 0 UNICODE) diff --git a/dll/win32/iphlpapi/CMakeLists.txt b/dll/win32/iphlpapi/CMakeLists.txt index 3d15eb6aded..8fd8f48a139 100644 --- a/dll/win32/iphlpapi/CMakeLists.txt +++ b/dll/win32/iphlpapi/CMakeLists.txt @@ -1,5 +1,4 @@ - include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/dll/win32/dhcpcsvc/include @@ -29,4 +28,3 @@ target_link_libraries(iphlpapi wine tdilib) add_importlibs(iphlpapi icmp dhcpcsvc advapi32 ws2_32 msvcrt kernel32 ntdll) add_pch(iphlpapi iphlpapi_private.h SOURCE) add_cd_file(TARGET iphlpapi DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/itircl/CMakeLists.txt b/dll/win32/itircl/CMakeLists.txt index 944be95cf89..dc5a2fef1e1 100644 --- a/dll/win32/itircl/CMakeLists.txt +++ b/dll/win32/itircl/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(itircl.dll itircl.spec) list(APPEND SOURCE diff --git a/dll/win32/itss/CMakeLists.txt b/dll/win32/itss/CMakeLists.txt index 5d1e100856c..534a3fe510b 100644 --- a/dll/win32/itss/CMakeLists.txt +++ b/dll/win32/itss/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(itss.dll itss.spec) list(APPEND SOURCE diff --git a/dll/win32/jscript/CMakeLists.txt b/dll/win32/jscript/CMakeLists.txt index 6cb5c1d7bea..88074750c9f 100644 --- a/dll/win32/jscript/CMakeLists.txt +++ b/dll/win32/jscript/CMakeLists.txt @@ -48,7 +48,7 @@ add_library(jscript SHARED add_idl_headers(jscript_idlheader jscript_classes.idl) add_typelib(jsglobal.idl) -add_dependencies(jscript jscript_idlheader stdole2) # jsglobal.tlb needs stdole2.tlb +add_dependencies(jscript jscript_idlheader stdole2) set_module_type(jscript win32dll) target_link_libraries(jscript uuid wine) add_importlibs(jscript user32 ole32 oleaut32 advapi32 msvcrt kernel32 ntdll) diff --git a/dll/win32/jscript/lang/jscript_Ro.rc b/dll/win32/jscript/lang/jscript_Ro.rc index e791fe43a2c..55c027c524a 100644 --- a/dll/win32/jscript/lang/jscript_Ro.rc +++ b/dll/win32/jscript/lang/jscript_Ro.rc @@ -2,6 +2,7 @@ * Copyright 2009 Piotr Caban * Copyright 2010 Claudia Cotună * Michael Stefaniuc + * Ștefan Fulea * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,24 +27,24 @@ STRINGTABLE { IDS_TO_PRIMITIVE "Eroare la convertirea obiectului la un tip primitiv" IDS_INVALID_CALL_ARG "Apel de procedură sau argument nevalid" - IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript out of range" - IDS_OBJECT_REQUIRED "Object required" + IDS_SUBSCRIPT_OUT_OF_RANGE "Subscript în afara limitelor admise" + IDS_OBJECT_REQUIRED "Obiect necesar" IDS_CREATE_OBJ_ERROR "Serverul de automatizare nu poate crea obiectul" - IDS_NO_PROPERTY "Obiectul nu suportă această proprietate sau metodă" - IDS_UNSUPPORTED_ACTION "Object doesn't support this action" + IDS_NO_PROPERTY "Proprietatea sau metoda este neaplicabilă obiectului" + IDS_UNSUPPORTED_ACTION "Acțiunea este neaplicabilă obiectului" IDS_ARG_NOT_OPT "Argumentul nu este opțional" IDS_SYNTAX_ERROR "Eroare de sintaxă" IDS_SEMICOLON "Se așteaptă „;”" IDS_LBRACKET "Se așteaptă „(”" IDS_RBRACKET "Se așteaptă „)”" - IDS_INVALID_CHAR "Invalid character" + IDS_INVALID_CHAR "Caracter nevalid" IDS_UNTERMINATED_STR "Șir constant neterminat" - IDS_MISPLACED_RETURN "'return' statement outside of function" - IDS_INVALID_BREAK "Can't have 'break' outside of loop" - IDS_INVALID_CONTINUE "Can't have 'continue' outside of loop" - IDS_LABEL_REDEFINED "Label redefined" - IDS_LABEL_NOT_FOUND "Label not found" - IDS_DISABLED_CC "Conditional compilation is turned off" + IDS_MISPLACED_RETURN "Poziția 'return' este în afara funcției" + IDS_INVALID_BREAK "Nu se poate admite 'break' în afara buclelor" + IDS_INVALID_CONTINUE "Nu se poate admite 'continue' în afara buclelor" + IDS_LABEL_REDEFINED "Eticheta este redefinită" + IDS_LABEL_NOT_FOUND "Etichetă nu este găsită" + IDS_DISABLED_CC "Compilarea condițională este dezactivată" IDS_NOT_FUNC "Se așteaptă o funcție" IDS_NOT_DATE "„[obiect]” nu este un obiect de tip dată" IDS_NOT_NUM "Se așteaptă un număr" @@ -51,14 +52,14 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Atribuire ilegală" IDS_UNDEFINED "„|” nu este definit" IDS_NOT_BOOL "Se așteaptă un obiect boolean" - IDS_INVALID_DELETE "Cannot delete '|'" - IDS_NOT_VBARRAY "VBArray object expected" + IDS_INVALID_DELETE "'|' nu poate fi șters" + IDS_NOT_VBARRAY "Este aștepat obiect de tip VBArray" IDS_JSCRIPT_EXPECTED "Se așteaptă un obiect JScript" IDS_REGEXP_SYNTAX_ERROR "Eroare de sintaxă în expresia regulată" - IDS_URI_INVALID_CODING "URI to be decoded is incorrect" + IDS_URI_INVALID_CODING "URI ce urmează a fi decodificat nu este corect" IDS_URI_INVALID_CHAR "URI care trebuie codificat conține caractere nevalide" - IDS_FRACTION_DIGITS_OUT_OF_RANGE "Number of fraction digits is out of range" - IDS_PRECISION_OUT_OF_RANGE "Precision is out of range" + IDS_FRACTION_DIGITS_OUT_OF_RANGE "Numărul cifrelor fracționare este în afara limitelor admise" + IDS_PRECISION_OUT_OF_RANGE "Precizia este în afara limitelor admise" IDS_INVALID_LENGTH "Lungimea unei matrice trebuie să fie un număr întreg pozitiv" IDS_ARRAY_EXPECTED "Se așteaptă un obiect matrice" } diff --git a/dll/win32/jsproxy/CMakeLists.txt b/dll/win32/jsproxy/CMakeLists.txt index 4f7c63f3d2e..29879009653 100644 --- a/dll/win32/jsproxy/CMakeLists.txt +++ b/dll/win32/jsproxy/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(jsproxy.dll jsproxy.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/kernel32/CMakeLists.txt b/dll/win32/kernel32/CMakeLists.txt index d4720e30ae8..711182a6685 100644 --- a/dll/win32/kernel32/CMakeLists.txt +++ b/dll/win32/kernel32/CMakeLists.txt @@ -106,11 +106,6 @@ set_subsystem(kernel32 console) ################# END HACK ################# target_link_libraries(kernel32 wine chkstk ${PSEH_LIB}) - -if(RUNTIME_CHECKS) - target_link_libraries(kernel32 RunTmChk.lib) -endif() - add_importlibs(kernel32 ntdll) add_pch(kernel32 k32.h SOURCE) add_dependencies(kernel32 psdk errcodes asm) diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32_vista/CMakeLists.txt index 30d7710b715..67835dbcdd3 100644 --- a/dll/win32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32_vista/CMakeLists.txt @@ -1,9 +1,8 @@ -add_definitions(-D_KERNEL32_) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_KERNEL32_) spec2def(kernel32_vista.dll kernel32_vista.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/lpk/CMakeLists.txt b/dll/win32/lpk/CMakeLists.txt index 1374941f3c6..4bd68b34863 100644 --- a/dll/win32/lpk/CMakeLists.txt +++ b/dll/win32/lpk/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DLANGPACK) include_directories(include) - spec2def(lpk.dll lpk.spec) list(APPEND SOURCE @@ -16,8 +14,6 @@ add_library(lpk SHARED ${CMAKE_CURRENT_BINARY_DIR}/lpk.def) set_module_type(lpk win32dll UNICODE) - - add_importlibs(lpk user32 usp10 msvcrt kernel32 ntdll) add_pch(lpk ros_lpk.h SOURCE) add_cd_file(TARGET lpk DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/lsasrv/CMakeLists.txt b/dll/win32/lsasrv/CMakeLists.txt index 523841c7253..ec463c8af56 100644 --- a/dll/win32/lsasrv/CMakeLists.txt +++ b/dll/win32/lsasrv/CMakeLists.txt @@ -33,5 +33,4 @@ set_module_type(lsasrv win32dll UNICODE) target_link_libraries(lsasrv wine ${PSEH_LIB}) add_importlibs(lsasrv samsrv rpcrt4 msvcrt kernel32 advapi32 ntdll) add_pch(lsasrv lsasrv.h SOURCE) -add_dependencies(lsasrv psdk) add_cd_file(TARGET lsasrv DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/lsasrv/lang/tr-TR.rc b/dll/win32/lsasrv/lang/tr-TR.rc index a8272980dac..3ed347f611b 100644 --- a/dll/win32/lsasrv/lang/tr-TR.rc +++ b/dll/win32/lsasrv/lang/tr-TR.rc @@ -6,7 +6,7 @@ STRINGTABLE BEGIN IDS_NT_AUTHORITY "NT YETKİLİSİ" IDS_NULL_RID "BOŞ SID" - IDS_WORLD_RID "Herkes" + IDS_WORLD_RID "Tüm Kişiler" IDS_LOCAL_RID "YERLİ" IDS_CREATOR_OWNER_RID "OLUŞTURUCU İYE" IDS_CREATOR_GROUP_RID "OLUŞTURUCU TAKIM" diff --git a/dll/win32/lz32/CMakeLists.txt b/dll/win32/lz32/CMakeLists.txt index 8c19456b892..d75d8d96a67 100644 --- a/dll/win32/lz32/CMakeLists.txt +++ b/dll/win32/lz32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(lz32.dll lz32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,11 +8,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/lz32.def) add_library(lz32 SHARED ${SOURCE}) - set_module_type(lz32 win32dll ENTRYPOINT 0 ) target_link_libraries(lz32 wine) - add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 psdk) add_cd_file(TARGET lz32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/mciavi32/CMakeLists.txt b/dll/win32/mciavi32/CMakeLists.txt index 434f56c2677..0bafe1e9e09 100644 --- a/dll/win32/mciavi32/CMakeLists.txt +++ b/dll/win32/mciavi32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciavi32.dll mciavi32.spec) list(APPEND SOURCE diff --git a/dll/win32/mcicda/CMakeLists.txt b/dll/win32/mcicda/CMakeLists.txt index 23a1f5a0672..1bd908491c3 100644 --- a/dll/win32/mcicda/CMakeLists.txt +++ b/dll/win32/mcicda/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mcicda.dll mcicda.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mcicda.def) add_library(mcicda SHARED ${SOURCE}) - set_module_type(mcicda win32dll) target_link_libraries(mcicda wine) -add_importlibs(mcicda msvcrt winmm user32 kernel32 ntdll) -add_dependencies(mcicda psdk) +add_importlibs(mcicda winmm user32 msvcrt kernel32 ntdll) add_cd_file(TARGET mcicda DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mciqtz32/CMakeLists.txt b/dll/win32/mciqtz32/CMakeLists.txt index ad0628f4feb..536681e2712 100644 --- a/dll/win32/mciqtz32/CMakeLists.txt +++ b/dll/win32/mciqtz32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciqtz32.dll mciqtz32.spec) list(APPEND SOURCE diff --git a/dll/win32/mciseq/CMakeLists.txt b/dll/win32/mciseq/CMakeLists.txt index c9cf715b6d6..8b40837941a 100644 --- a/dll/win32/mciseq/CMakeLists.txt +++ b/dll/win32/mciseq/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciseq.dll mciseq.spec) list(APPEND SOURCE diff --git a/dll/win32/mciwave/CMakeLists.txt b/dll/win32/mciwave/CMakeLists.txt index bb7c3e13389..c11ee1db9a5 100644 --- a/dll/win32/mciwave/CMakeLists.txt +++ b/dll/win32/mciwave/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mciwave.dll mciwave.spec) list(APPEND SOURCE @@ -12,12 +11,9 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mciwave.def) add_library(mciwave SHARED ${SOURCE}) - set_module_type(mciwave win32dll) - target_link_libraries(mciwave wine) add_importlibs(mciwave user32 winmm msvcrt kernel32 ntdll) -add_dependencies(mciwave psdk) add_cd_file(TARGET mciwave DESTINATION reactos/system32 FOR all) if(NOT MSVC) diff --git a/dll/win32/mgmtapi/CMakeLists.txt b/dll/win32/mgmtapi/CMakeLists.txt index a7a5472893a..4579e33b53b 100644 --- a/dll/win32/mgmtapi/CMakeLists.txt +++ b/dll/win32/mgmtapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mgmtapi.dll mgmtapi.spec) list(APPEND SOURCE diff --git a/dll/win32/mmdrv/CMakeLists.txt b/dll/win32/mmdrv/CMakeLists.txt index 8a4a500a306..fa6f6ce17f3 100644 --- a/dll/win32/mmdrv/CMakeLists.txt +++ b/dll/win32/mmdrv/CMakeLists.txt @@ -1,6 +1,4 @@ - - spec2def(mmdrv.dll mmdrv.spec) list(APPEND SOURCE @@ -18,8 +16,6 @@ add_library(mmdrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/mmdrv.def) set_module_type(mmdrv win32dll UNICODE) - -add_importlibs(mmdrv msvcrt winmm user32 kernel32 ntdll) -add_dependencies(mmdrv psdk) +add_importlibs(mmdrv winmm user32 msvcrt kernel32 ntdll) add_pch(mmdrv mmdrv.h SOURCE) add_cd_file(TARGET mmdrv DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mpr/lang/mpr_Tr.rc b/dll/win32/mpr/lang/mpr_Tr.rc index 9bfc624e039..3da678700f9 100644 --- a/dll/win32/mpr/lang/mpr_Tr.rc +++ b/dll/win32/mpr/lang/mpr_Tr.rc @@ -1,7 +1,7 @@ /* * MPR dll resources for Turkish * - * Copyrights: 2006 Fatih Aşıcı; 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) + * Copyrights: 2006 Fatih Aşıcı, 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 diff --git a/dll/win32/mprapi/CMakeLists.txt b/dll/win32/mprapi/CMakeLists.txt index 95c08f67074..55ecce7f89b 100644 --- a/dll/win32/mprapi/CMakeLists.txt +++ b/dll/win32/mprapi/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mprapi.dll mprapi.spec) list(APPEND SOURCE @@ -10,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/mprapi.def) add_library(mprapi SHARED ${SOURCE}) - set_module_type(mprapi win32dll) target_link_libraries(mprapi wine) add_importlibs(mprapi msvcrt kernel32 ntdll) diff --git a/dll/win32/msacm32/lang/msacm_Ro.rc b/dll/win32/msacm32/lang/msacm_Ro.rc index cd5ec0d33ed..83270677175 100644 --- a/dll/win32/msacm32/lang/msacm_Ro.rc +++ b/dll/win32/msacm32/lang/msacm_Ro.rc @@ -33,7 +33,7 @@ BEGIN COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 135, 60, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Pă&strare ca…", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 + PUSHBUTTON "&Păstrare ca…", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 150, 14, 70, 14 PUSHBUTTON "&Elimină", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 150, 32, 70, 14 LTEXT "F&ormat:", -1, 5, 56, 44, 8, NOT WS_GROUP diff --git a/dll/win32/msacm32/lang/msacm_Tr.rc b/dll/win32/msacm32/lang/msacm_Tr.rc index 6b6547d5abe..ca43b3a8bd5 100644 --- a/dll/win32/msacm32/lang/msacm_Tr.rc +++ b/dll/win32/msacm32/lang/msacm_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resource file for MS ACM * - * Copyrights: 2006 Fatih Aşıcı; 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) + * Copyrights: 2006 Fatih Aşıcı, 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 diff --git a/dll/win32/msadp32.acm/CMakeLists.txt b/dll/win32/msadp32.acm/CMakeLists.txt index 702cefdc0e7..60132a73f7e 100644 --- a/dll/win32/msadp32.acm/CMakeLists.txt +++ b/dll/win32/msadp32.acm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msadp32.acm msadp32.acm.spec) list(APPEND SOURCE diff --git a/dll/win32/msafd/CMakeLists.txt b/dll/win32/msafd/CMakeLists.txt index 1be60b0851e..30e265a7f54 100644 --- a/dll/win32/msafd/CMakeLists.txt +++ b/dll/win32/msafd/CMakeLists.txt @@ -1,5 +1,4 @@ - include_directories( BEFORE include ${REACTOS_SOURCE_DIR}/include/reactos/drivers) @@ -20,7 +19,6 @@ add_library(msafd SHARED ${CMAKE_CURRENT_BINARY_DIR}/msafd.def) set_module_type(msafd win32dll UNICODE) - add_importlibs(msafd advapi32 msvcrt kernel32 ntdll) add_pch(msafd msafd.h SOURCE) add_cd_file(TARGET msafd DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mscms/CMakeLists.txt b/dll/win32/mscms/CMakeLists.txt index 017e857f363..1e7bfd2df9b 100644 --- a/dll/win32/mscms/CMakeLists.txt +++ b/dll/win32/mscms/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mscms.dll mscms.spec) list(APPEND SOURCE diff --git a/dll/win32/mscoree/CMakeLists.txt b/dll/win32/mscoree/CMakeLists.txt index e2ec45bffae..7c945218f40 100644 --- a/dll/win32/mscoree/CMakeLists.txt +++ b/dll/win32/mscoree/CMakeLists.txt @@ -1,10 +1,9 @@ -add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mscoree.dll mscoree.spec) list(APPEND SOURCE diff --git a/dll/win32/msgina/lang/ro-RO.rc b/dll/win32/msgina/lang/ro-RO.rc index 2bc853ed2c9..39ece06b299 100644 --- a/dll/win32/msgina/lang/ro-RO.rc +++ b/dll/win32/msgina/lang/ro-RO.rc @@ -3,7 +3,7 @@ * FILE: dll/win32/msgina/lang/ro-RO.rc * PURPOSE: Romanian Language File for ReactOS Logon GINA DLL * TRANSLATORS: - * Petre Dumitriu + * Petru Dumitriu (petrimetri at gmail dot com) * Ștefan Fulea (stefan dot fulea at mail dot md) */ @@ -119,7 +119,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 1 BEGIN ICON IDI_LOCKICON, -1, 7, 7, 20, 20 LTEXT "Sigur doriți să vă deautentificați?", IDC_STATIC, 35, 16, 146, 8 - PUSHBUTTON "&Da", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "D&a", IDYES, 41, 39, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "N&u", IDNO, 95, 39, 50, 14 END diff --git a/dll/win32/mshtml.tlb/CMakeLists.txt b/dll/win32/mshtml.tlb/CMakeLists.txt index 04ae9dedfd0..84363893122 100644 --- a/dll/win32/mshtml.tlb/CMakeLists.txt +++ b/dll/win32/mshtml.tlb/CMakeLists.txt @@ -1,10 +1,7 @@ add_typelib(mshtml_tlb.idl) - add_definitions(-D__WINESRC__) - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_library(mshtml.tlb SHARED rsrc.rc) list(APPEND mshtml_tlb_rc_deps @@ -12,7 +9,6 @@ list(APPEND mshtml_tlb_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/mshtml_tlb.rgs) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_tlb_rc_deps}") - set_module_type(mshtml.tlb module) set_target_properties(mshtml.tlb PROPERTIES SUFFIX "") add_dependencies(mshtml.tlb stdole2) diff --git a/dll/win32/mshtml/CMakeLists.txt b/dll/win32/mshtml/CMakeLists.txt index 4fea5a1aaf0..00d42539795 100644 --- a/dll/win32/mshtml/CMakeLists.txt +++ b/dll/win32/mshtml/CMakeLists.txt @@ -103,7 +103,6 @@ list(APPEND mshtml_rc_deps ${CMAKE_CURRENT_SOURCE_DIR}/mshtml_classes.rgs) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS "${mshtml_rc_deps}") - set_module_type(mshtml win32dll) target_link_libraries(mshtml uuid wine strmiids oldnames) diff --git a/dll/win32/mshtml/lang/Tr.rc b/dll/win32/mshtml/lang/Tr.rc index 88d2e38ae3e..b5e0a5d3551 100644 --- a/dll/win32/mshtml/lang/Tr.rc +++ b/dll/win32/mshtml/lang/Tr.rc @@ -1,5 +1,5 @@ /* - * 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 diff --git a/dll/win32/msi/CMakeLists.txt b/dll/win32/msi/CMakeLists.txt index a8316ca23ff..3e5247790f2 100644 --- a/dll/win32/msi/CMakeLists.txt +++ b/dll/win32/msi/CMakeLists.txt @@ -1,12 +1,10 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__ -DMSIRUNMODE=MSIRUNMODE_T) spec2def(msi.dll msi.spec ADD_IMPORTLIB) - generate_idl_iids(msiserver.idl) list(APPEND SOURCE @@ -67,20 +65,8 @@ set_module_type(msi win32dll) target_link_libraries(msi uuid ${PSEH_LIB} wine) add_dependencies(msi msi_idlheader) add_delay_importlibs(msi odbccp32 crypt32 wintrust) -add_importlibs(msi - advapi32 - cabinet - comctl32 - gdi32 - ole32 - oleaut32 - shell32 - shlwapi - urlmon - user32 - version - wininet -#fixme : should be in delayed imports +add_importlibs(msi advapi32 cabinet comctl32 gdi32 ole32 oleaut32 shell32 shlwapi urlmon user32 version wininet + #FIXME : should be in delayed imports imagehlp msvcrt kernel32_vista diff --git a/dll/win32/msimg32/CMakeLists.txt b/dll/win32/msimg32/CMakeLists.txt index c798a2e4b49..b0ee90484cf 100644 --- a/dll/win32/msimg32/CMakeLists.txt +++ b/dll/win32/msimg32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(msimg32.dll msimg32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msimg32.def) add_library(msimg32 SHARED ${SOURCE}) - set_module_type(msimg32 win32dll) target_link_libraries(msimg32 wine) add_importlibs(msimg32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET msimg32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/msnet32/CMakeLists.txt b/dll/win32/msnet32/CMakeLists.txt index 2ed1cda1ebd..f1a1abfa092 100644 --- a/dll/win32/msnet32/CMakeLists.txt +++ b/dll/win32/msnet32/CMakeLists.txt @@ -1,15 +1,9 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(msnet32.dll msnet32.spec) - add_library(msnet32 SHARED msnet_main.c ${CMAKE_CURRENT_BINARY_DIR}/msnet32.def) - set_module_type(msnet32 win32dll) - target_link_libraries(msnet32 wine) - add_importlibs(msnet32 msvcrt kernel32 ntdll) - add_cd_file(TARGET msnet32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/mspatcha/CMakeLists.txt b/dll/win32/mspatcha/CMakeLists.txt index 3b6c04055a9..e41ca6bd076 100644 --- a/dll/win32/mspatcha/CMakeLists.txt +++ b/dll/win32/mspatcha/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mspatcha.dll mspatcha.spec) list(APPEND SOURCE diff --git a/dll/win32/msports/CMakeLists.txt b/dll/win32/msports/CMakeLists.txt index 53a40962bce..b0fee514b8e 100644 --- a/dll/win32/msports/CMakeLists.txt +++ b/dll/win32/msports/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(msports.dll msports.spec) list(APPEND SOURCE @@ -21,4 +20,3 @@ target_link_libraries(msports wine) add_importlibs(msports setupapi comctl32 user32 advapi32 msvcrt kernel32 ntdll) add_pch(msports precomp.h SOURCE) add_cd_file(TARGET msports DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/msrle32/lang/msrle_Tr.rc b/dll/win32/msrle32/lang/msrle_Tr.rc index 215c739123a..cfdc1e727c4 100644 --- a/dll/win32/msrle32/lang/msrle_Tr.rc +++ b/dll/win32/msrle32/lang/msrle_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish resource file for MS-RLE * - * 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 diff --git a/dll/win32/mssign32/CMakeLists.txt b/dll/win32/mssign32/CMakeLists.txt index c1087de206d..fd7406457b6 100644 --- a/dll/win32/mssign32/CMakeLists.txt +++ b/dll/win32/mssign32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mssign32.dll mssign32.spec) list(APPEND SOURCE diff --git a/dll/win32/mssip32/CMakeLists.txt b/dll/win32/mssip32/CMakeLists.txt index 5860512f227..321ae4eff19 100644 --- a/dll/win32/mssip32/CMakeLists.txt +++ b/dll/win32/mssip32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(mssip32.dll mssip32.spec) list(APPEND SOURCE diff --git a/dll/win32/msvcrt20/CMakeLists.txt b/dll/win32/msvcrt20/CMakeLists.txt index dc114a5c466..707170e94e1 100644 --- a/dll/win32/msvcrt20/CMakeLists.txt +++ b/dll/win32/msvcrt20/CMakeLists.txt @@ -1,4 +1,5 @@ +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) spec2def(msvcrt20.dll msvcrt20.spec) add_definitions( @@ -11,8 +12,6 @@ add_definitions( -DCRTDLL -D__MINGW_IMPORT="") -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) - list(APPEND SOURCE msvcrt20.c stubs.c @@ -21,9 +20,7 @@ list(APPEND SOURCE add_library(msvcrt20 SHARED ${SOURCE}) set_module_type(msvcrt20 win32dll ENTRYPOINT DllMain 12) - add_dependencies(msvcrt20 psdk) - target_link_libraries(msvcrt20 crt wine ${PSEH_LIB}) if(MSVC) @@ -32,5 +29,4 @@ if(MSVC) endif() add_importlibs(msvcrt20 kernel32 ntdll) - add_cd_file(TARGET msvcrt20 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msvcrt40/CMakeLists.txt b/dll/win32/msvcrt40/CMakeLists.txt index 7b4e548ed7c..032794b4a73 100644 --- a/dll/win32/msvcrt40/CMakeLists.txt +++ b/dll/win32/msvcrt40/CMakeLists.txt @@ -1,4 +1,5 @@ +include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) spec2def(msvcrt40.dll msvcrt40.spec) add_definitions( @@ -11,8 +12,6 @@ add_definitions( -DCRTDLL -D__MINGW_IMPORT="") -include_directories(${REACTOS_SOURCE_DIR}/lib/sdk/crt/include) - list(APPEND SOURCE msvcrt40.c stubs.c @@ -20,11 +19,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/msvcrt40.def) add_library(msvcrt40 SHARED ${SOURCE}) - set_module_type(msvcrt40 win32dll ENTRYPOINT DllMain 12) - add_dependencies(msvcrt40 psdk) - target_link_libraries(msvcrt40 crt wine ${PSEH_LIB}) if(MSVC) @@ -33,5 +29,4 @@ if(MSVC) endif() add_importlibs(msvcrt40 kernel32 ntdll) - add_cd_file(TARGET msvcrt40 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msvfw32/lang/msvfw32_Tr.rc b/dll/win32/msvfw32/lang/msvfw32_Tr.rc index 6aaa96a3cd2..1cc75e13944 100644 --- a/dll/win32/msvfw32/lang/msvfw32_Tr.rc +++ b/dll/win32/msvfw32/lang/msvfw32_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish Resources * - * 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 diff --git a/dll/win32/msvidc32/lang/msvidc32_Tr.rc b/dll/win32/msvidc32/lang/msvidc32_Tr.rc index 162ef437ac6..f1973c41d1a 100644 --- a/dll/win32/msvidc32/lang/msvidc32_Tr.rc +++ b/dll/win32/msvidc32/lang/msvidc32_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish Resources * - * 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 diff --git a/dll/win32/mswsock/CMakeLists.txt b/dll/win32/mswsock/CMakeLists.txt index ac10be5db76..dbf8c341edc 100644 --- a/dll/win32/mswsock/CMakeLists.txt +++ b/dll/win32/mswsock/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DLE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(mswsock.dll mswsock.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +17,3 @@ set_module_type(mswsock win32dll UNICODE) add_importlibs(mswsock ws2_32 msvcrt kernel32) add_pch(mswsock precomp.h SOURCE) add_cd_file(TARGET mswsock DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/msxml/CMakeLists.txt b/dll/win32/msxml/CMakeLists.txt index a5cc03c0ba0..2b556711e39 100644 --- a/dll/win32/msxml/CMakeLists.txt +++ b/dll/win32/msxml/CMakeLists.txt @@ -7,9 +7,7 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml.dll msxml.spec) - add_typelib(msxml_tlb.idl) list(APPEND SOURCE @@ -21,8 +19,5 @@ set_module_type(msxml win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml_tlb.tlb) target_link_libraries(msxml wine) add_importlibs(msxml msxml3 msvcrt kernel32) - -# msxml_tlb.tlb needs stdole2.tlb add_dependencies(msxml stdole2) - add_cd_file(TARGET msxml DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml2/CMakeLists.txt b/dll/win32/msxml2/CMakeLists.txt index 5f882c4323d..7753fa4e61f 100644 --- a/dll/win32/msxml2/CMakeLists.txt +++ b/dll/win32/msxml2/CMakeLists.txt @@ -7,9 +7,7 @@ add_definitions( -D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml2.dll msxml2.spec) - add_typelib(msxml2_tlb.idl) list(APPEND SOURCE @@ -21,8 +19,5 @@ set_module_type(msxml2 win32dll) set_source_files_properties(msxml2.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml2_tlb.tlb) target_link_libraries(msxml2 wine) add_importlibs(msxml2 msxml3 msvcrt kernel32) - -# msxml2_tlb.tlb needs stdole2.tlb add_dependencies(msxml2 stdole2) - add_cd_file(TARGET msxml2 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml4/CMakeLists.txt b/dll/win32/msxml4/CMakeLists.txt index 704d094b26b..cf5c9f71139 100644 --- a/dll/win32/msxml4/CMakeLists.txt +++ b/dll/win32/msxml4/CMakeLists.txt @@ -8,9 +8,7 @@ add_definitions( -DCOM_NO_WINDOWS_H) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(msxml4.dll msxml4.spec) - add_typelib(msxml4_tlb.idl) list(APPEND SOURCE @@ -22,8 +20,5 @@ set_module_type(msxml4 win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml4_tlb.tlb) target_link_libraries(msxml4 wine) add_importlibs(msxml4 msxml3 msvcrt kernel32) - -# msxml4_tlb.tlb needs stdole2.tlb add_dependencies(msxml4 stdole2) - add_cd_file(TARGET msxml4 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msxml6/CMakeLists.txt b/dll/win32/msxml6/CMakeLists.txt index 8edc44c4fcf..ce39d635943 100644 --- a/dll/win32/msxml6/CMakeLists.txt +++ b/dll/win32/msxml6/CMakeLists.txt @@ -20,8 +20,5 @@ set_module_type(msxml6 win32dll) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/msxml6_tlb.tlb) target_link_libraries(msxml6 wine) add_importlibs(msxml6 msxml3 msvcrt kernel32) - -# msxml6_tlb.tlb needs stdole2.tlb add_dependencies(msxml6 stdole2) - add_cd_file(TARGET msxml6 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/nddeapi/CMakeLists.txt b/dll/win32/nddeapi/CMakeLists.txt index bdc2c194497..17b6c467345 100644 --- a/dll/win32/nddeapi/CMakeLists.txt +++ b/dll/win32/nddeapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(nddeapi.dll nddeapi.spec) list(APPEND SOURCE @@ -11,9 +10,6 @@ list(APPEND SOURCE add_library(nddeapi SHARED ${SOURCE}) set_module_type(nddeapi win32dll) - target_link_libraries(nddeapi wine) - add_importlibs(nddeapi msvcrt kernel32 ntdll) -add_dependencies(nddeapi psdk) add_cd_file(TARGET nddeapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 334f617656a..c5eb75cf69e 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -28,12 +28,8 @@ add_library(netapi32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) set_module_type(netapi32 win32dll) - target_link_libraries(netapi32 wine) - add_importlibs(netapi32 iphlpapi ws2_32 advapi32 msvcrt kernel32 ntdll) - add_delay_importlibs(netapi32 samlib secur32) add_pch(netapi32 netapi32.h SOURCE) add_cd_file(TARGET netapi32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/netcfgx/CMakeLists.txt b/dll/win32/netcfgx/CMakeLists.txt index 207238666cd..a2816b21810 100644 --- a/dll/win32/netcfgx/CMakeLists.txt +++ b/dll/win32/netcfgx/CMakeLists.txt @@ -1,3 +1,4 @@ + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) diff --git a/dll/win32/netshell/CMakeLists.txt b/dll/win32/netshell/CMakeLists.txt index 4a0f4c7de07..593dbd2a75e 100644 --- a/dll/win32/netshell/CMakeLists.txt +++ b/dll/win32/netshell/CMakeLists.txt @@ -10,7 +10,6 @@ remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D_NETSHELL_) - spec2def(netshell.dll netshell.spec) list(APPEND SOURCE @@ -31,21 +30,6 @@ add_library(netshell SHARED set_module_type(netshell win32dll) target_link_libraries(netshell uuid wine) - -add_importlibs(netshell - msvcrt - shlwapi - shell32 - version - iphlpapi - ole32 - user32 - advapi32 - setupapi - ws2_32 - comctl32 - kernel32 - ntdll) - +add_importlibs(netshell shlwapi shell32 version iphlpapi ole32 user32 advapi32 setupapi ws2_32 comctl32 msvcrt kernel32 ntdll) add_pch(netshell precomp.h SOURCE) add_cd_file(TARGET netshell DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/newdev/CMakeLists.txt b/dll/win32/newdev/CMakeLists.txt index 996995034a9..7e8c13e940f 100644 --- a/dll/win32/newdev/CMakeLists.txt +++ b/dll/win32/newdev/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(newdev.dll newdev.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +18,3 @@ target_link_libraries(newdev wine) add_importlibs(newdev gdi32 comctl32 setupapi advapi32 user32 shell32 msvcrt kernel32 ntdll) add_pch(newdev newdev_private.h SOURCE) add_cd_file(TARGET newdev DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/newdev/lang/ro-RO.rc b/dll/win32/newdev/lang/ro-RO.rc index ab06dba86e0..1426665f69b 100644 --- a/dll/win32/newdev/lang/ro-RO.rc +++ b/dll/win32/newdev/lang/ro-RO.rc @@ -3,7 +3,7 @@ * FILE: dll/win32/newdev/lang/ro-RO.rc * PURPOSE: Romanian Language File for new device installer * TRANSLATORS: - * Petre Dumitriu + * Petru Dumitriu (petrimetri at gmail dot com) * Ștefan Fulea (stefan dot fulea at mail dot md) */ @@ -19,8 +19,8 @@ BEGIN LTEXT "Apăsați „Înainte” pentru a continua.", IDC_STATIC, 120, 169, 195, 17 LTEXT "DISPOZITIV NECUNOSCUT", IDC_DEVICE, 134, 36, 164, 11 LTEXT "AVERTISMENT: INSTALAREA UNUI DISPOZITIV NECUNOSCUT POATE AVEA EFECTE GRAVE ASUPRA CALCULATORULUI DUMNEAVOASTRĂ!", IDC_STATIC, 120, 59, 195, 30 - CONTROL "Instalează modulele pilot &automat", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 178, 13 - CONTROL "Instalează &modulele pilot dintr-o locație specificată", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 164, 14 + CONTROL "Instalează modulele pilot a&utomat", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 178, 13 + CONTROL "Instalează modulele pilot din locație &specificată", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 164, 14 END IDD_NODRIVER DIALOGEX 0, 0, 317, 193 @@ -97,9 +97,9 @@ END STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" - IDS_CHSOURCE_TITLE "Choose search and install options" - IDS_SEARCHDRV_TITLE "Searching..." - IDS_INSTALLDRV_TITLE "Installing..." + IDS_INSTALLWIZARDTITLE "Asistent pentru un nou dispozitiv" + IDS_UPDATEWIZARDTITLE "Asistent pentru actualizare modul-pilot" + IDS_CHSOURCE_TITLE "Alegere opțiuni de căutare și instalare" + IDS_SEARCHDRV_TITLE "Căutare…" + IDS_INSTALLDRV_TITLE "Instalare…" END diff --git a/dll/win32/newdev/lang/tr-TR.rc b/dll/win32/newdev/lang/tr-TR.rc index 3c8f9335f1a..647da2482aa 100644 --- a/dll/win32/newdev/lang/tr-TR.rc +++ b/dll/win32/newdev/lang/tr-TR.rc @@ -90,9 +90,9 @@ END STRINGTABLE BEGIN - IDS_INSTALLWIZARDTITLE "New hardware wizard" - IDS_UPDATEWIZARDTITLE "Update driver wizard" - IDS_CHSOURCE_TITLE "Choose search and install options" - IDS_SEARCHDRV_TITLE "Searching..." - IDS_INSTALLDRV_TITLE "Installing..." + IDS_INSTALLWIZARDTITLE "Yeni Donanım Yardımcısı" + IDS_UPDATEWIZARDTITLE "Sürücü Şimdikileştirme Yardımcısı" + IDS_CHSOURCE_TITLE "Arama ve Kurma Seçeneklerini Seç" + IDS_SEARCHDRV_TITLE "Arıyor..." + IDS_INSTALLDRV_TITLE "Kuruyor..." END diff --git a/dll/win32/ntdsapi/CMakeLists.txt b/dll/win32/ntdsapi/CMakeLists.txt index 55b1878c363..5bb63ff62df 100644 --- a/dll/win32/ntdsapi/CMakeLists.txt +++ b/dll/win32/ntdsapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(ntdsapi.dll ntdsapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -11,10 +10,6 @@ list(APPEND SOURCE add_library(ntdsapi SHARED ${SOURCE}) set_module_type(ntdsapi win32dll) - target_link_libraries(ntdsapi wine) - add_importlibs(ntdsapi user32 msvcrt kernel32 ntdll) - -add_dependencies(ntdsapi psdk) add_cd_file(TARGET ntdsapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ntlanman/CMakeLists.txt b/dll/win32/ntlanman/CMakeLists.txt index 8416d1d976f..21773ad6224 100644 --- a/dll/win32/ntlanman/CMakeLists.txt +++ b/dll/win32/ntlanman/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(ntlanman.dll ntlanman.spec) list(APPEND SOURCE @@ -9,11 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntlanman.def) add_library(ntlanman SHARED ${SOURCE}) - set_module_type(ntlanman win32dll UNICODE) - target_link_libraries(ntlanman wine) - add_importlibs(ntlanman netapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET ntlanman DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ntmarta/CMakeLists.txt b/dll/win32/ntmarta/CMakeLists.txt index 1890871ab5d..62553858c26 100644 --- a/dll/win32/ntmarta/CMakeLists.txt +++ b/dll/win32/ntmarta/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D__WINESRC__) - spec2def(ntmarta.dll ntmarta.spec) list(APPEND SOURCE @@ -9,14 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ntmarta.def) add_library(ntmarta SHARED ${SOURCE}) - set_module_type(ntmarta win32dll UNICODE) - -add_importlibs(ntmarta - user32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(ntmarta user32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntmarta DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ntprint/CMakeLists.txt b/dll/win32/ntprint/CMakeLists.txt index 29196d54496..2f52596cab2 100644 --- a/dll/win32/ntprint/CMakeLists.txt +++ b/dll/win32/ntprint/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(ntprint.dll ntprint.spec) @@ -12,5 +13,4 @@ add_library(ntprint SHARED ${SOURCE}) set_module_type(ntprint win32dll) target_link_libraries(ntprint wine) add_importlibs(ntprint winspool msvcrt kernel32 ntdll) -add_dependencies(ntprint psdk) add_cd_file(TARGET ntprint DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/objsel/CMakeLists.txt b/dll/win32/objsel/CMakeLists.txt index e7fc09f8fdd..26fb063067d 100644 --- a/dll/win32/objsel/CMakeLists.txt +++ b/dll/win32/objsel/CMakeLists.txt @@ -1,11 +1,9 @@ -add_definitions(-D__WINESRC__) - remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(objsel.dll objsel.spec) list(APPEND SOURCE @@ -19,15 +17,7 @@ add_library(objsel SHARED ${CMAKE_CURRENT_BINARY_DIR}/objsel.def) set_module_type(objsel win32dll) - target_link_libraries(objsel uuid wine) - -add_importlibs(objsel - ole32 - advapi32 - msvcrt - kernel32 - ntdll) - +add_importlibs(objsel ole32 advapi32 msvcrt kernel32 ntdll) add_pch(objsel objsel_private.h SOURCE) add_cd_file(TARGET objsel DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/odbccp32/CMakeLists.txt b/dll/win32/odbccp32/CMakeLists.txt index 6905e458364..cd819ce8a02 100644 --- a/dll/win32/odbccp32/CMakeLists.txt +++ b/dll/win32/odbccp32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(odbccp32.dll odbccp32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -10,15 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/odbccp32.def) add_library(odbccp32 SHARED ${SOURCE}) - set_module_type(odbccp32 win32dll) target_link_libraries(odbccp32 uuid wine) - -add_importlibs(odbccp32 - msvcrt - advapi32 - kernel32 - ntdll) - - +add_importlibs(odbccp32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET odbccp32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ole32/CMakeLists.txt b/dll/win32/ole32/CMakeLists.txt index 807f8029815..3c023649da1 100644 --- a/dll/win32/ole32/CMakeLists.txt +++ b/dll/win32/ole32/CMakeLists.txt @@ -11,7 +11,6 @@ add_definitions( -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(ole32.dll ole32.spec ADD_IMPORTLIB) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) diff --git a/dll/win32/oleacc/lang/oleacc_Ro.rc b/dll/win32/oleacc/lang/oleacc_Ro.rc index 87ff65e92e6..a73b31a4be2 100644 --- a/dll/win32/oleacc/lang/oleacc_Ro.rc +++ b/dll/win32/oleacc/lang/oleacc_Ro.rc @@ -1,7 +1,7 @@ /* * Copyright 2008 Nikolay Sivov * Copyright 2009 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 @@ -30,8 +30,8 @@ STRINGTABLE ROLE_SYSTEM_SCROLLBAR "bară de defilare" ROLE_SYSTEM_GRIP "ghidaj" ROLE_SYSTEM_SOUND "sunet" - ROLE_SYSTEM_CURSOR "cursor" - ROLE_SYSTEM_CARET "circumflex" + ROLE_SYSTEM_CURSOR "indicator" + ROLE_SYSTEM_CARET "cursor" ROLE_SYSTEM_ALERT "atenționare" ROLE_SYSTEM_WINDOW "fereastră" ROLE_SYSTEM_CLIENT "client" @@ -91,35 +91,35 @@ STRINGTABLE ROLE_SYSTEM_OUTLINEBUTTON "buton contur" IDS_STATE_NORMAL "normal" - IDS_STATE_UNAVAILABLE "unavailable" - IDS_STATE_SELECTED "selected" - IDS_STATE_FOCUSED "focused" - IDS_STATE_PRESSED "pressed" - IDS_STATE_CHECKED "checked" - IDS_STATE_MIXED "mixed" - IDS_STATE_READONLY "read only" - IDS_STATE_HOTTRACKED "hot tracked" - IDS_STATE_DEFAULT "default" - IDS_STATE_EXPANDED "expanded" - IDS_STATE_COLLAPSED "collapsed" - IDS_STATE_BUSY "busy" - IDS_STATE_FLOATING "floating" - IDS_STATE_MARQUEED "marqueed" - IDS_STATE_ANIMATED "animated" - IDS_STATE_INVISIBLE "invisible" - IDS_STATE_OFFSCREEN "offscreen" - IDS_STATE_SIZEABLE "sizeable" - IDS_STATE_MOVEABLE "moveable" - IDS_STATE_SELFVOICING "self voicing" - IDS_STATE_FOCUSABLE "focusable" - IDS_STATE_SELECTABLE "selectable" - IDS_STATE_LINKED "linked" - IDS_STATE_TRAVERSED "traversed" - IDS_STATE_MULTISELECTABLE "multi selectable" - IDS_STATE_EXTSELECTABLE "extended selectable" - IDS_STATE_ALERT_LOW "alert low" - IDS_STATE_ALERT_MEDIUM "alert medium" - IDS_STATE_ALERT_HIGH "alert high" - IDS_STATE_PROTECTED "protected" - IDS_STATE_HASPOPUP "has popup" + IDS_STATE_UNAVAILABLE "indisponibil" + IDS_STATE_SELECTED "selectat" + IDS_STATE_FOCUSED "focalizat" + IDS_STATE_PRESSED "apăsat" + IDS_STATE_CHECKED "bifat" + IDS_STATE_MIXED "mixat" + IDS_STATE_READONLY "doar citire" + IDS_STATE_HOTTRACKED "urmărit" + IDS_STATE_DEFAULT "implicit" + IDS_STATE_EXPANDED "extins" + IDS_STATE_COLLAPSED "restrâns" + IDS_STATE_BUSY "ocupat" + IDS_STATE_FLOATING "flotant" + IDS_STATE_MARQUEED "sclipitor" + IDS_STATE_ANIMATED "animat" + IDS_STATE_INVISIBLE "invizibil" + IDS_STATE_OFFSCREEN "extra-ecran" + IDS_STATE_SIZEABLE "dimensionabil" + IDS_STATE_MOVEABLE "mobil" + IDS_STATE_SELFVOICING "auto-vociferant" + IDS_STATE_FOCUSABLE "focalizabil" + IDS_STATE_SELECTABLE "selectabil" + IDS_STATE_LINKED "legat" + IDS_STATE_TRAVERSED "traversat" + IDS_STATE_MULTISELECTABLE "multi-selectabil" + IDS_STATE_EXTSELECTABLE "selectabil extins" + IDS_STATE_ALERT_LOW "alertă preventivă" + IDS_STATE_ALERT_MEDIUM "alertă medie" + IDS_STATE_ALERT_HIGH "alertă maximă" + IDS_STATE_PROTECTED "protejat" + IDS_STATE_HASPOPUP "intempestiv" } diff --git a/dll/win32/oleacc/lang/oleacc_Tr.rc b/dll/win32/oleacc/lang/oleacc_Tr.rc index b2968f114a3..ca2765eccb5 100644 --- a/dll/win32/oleacc/lang/oleacc_Tr.rc +++ b/dll/win32/oleacc/lang/oleacc_Tr.rc @@ -88,36 +88,36 @@ STRINGTABLE ROLE_SYSTEM_IPADDRESS "IP adresi" ROLE_SYSTEM_OUTLINEBUTTON "anaçizgi düğmesi" - IDS_STATE_NORMAL "normal" - IDS_STATE_UNAVAILABLE "unavailable" - IDS_STATE_SELECTED "selected" - IDS_STATE_FOCUSED "focused" - IDS_STATE_PRESSED "pressed" - IDS_STATE_CHECKED "checked" - IDS_STATE_MIXED "mixed" - IDS_STATE_READONLY "read only" - IDS_STATE_HOTTRACKED "hot tracked" - IDS_STATE_DEFAULT "default" - IDS_STATE_EXPANDED "expanded" - IDS_STATE_COLLAPSED "collapsed" - IDS_STATE_BUSY "busy" - IDS_STATE_FLOATING "floating" - IDS_STATE_MARQUEED "marqueed" - IDS_STATE_ANIMATED "animated" - IDS_STATE_INVISIBLE "invisible" - IDS_STATE_OFFSCREEN "offscreen" - IDS_STATE_SIZEABLE "sizeable" - IDS_STATE_MOVEABLE "moveable" - IDS_STATE_SELFVOICING "self voicing" - IDS_STATE_FOCUSABLE "focusable" - IDS_STATE_SELECTABLE "selectable" - IDS_STATE_LINKED "linked" - IDS_STATE_TRAVERSED "traversed" - IDS_STATE_MULTISELECTABLE "multi selectable" - IDS_STATE_EXTSELECTABLE "extended selectable" - IDS_STATE_ALERT_LOW "alert low" - IDS_STATE_ALERT_MEDIUM "alert medium" - IDS_STATE_ALERT_HIGH "alert high" - IDS_STATE_PROTECTED "protected" - IDS_STATE_HASPOPUP "has popup" + IDS_STATE_NORMAL "düzgülü" + IDS_STATE_UNAVAILABLE "kullanılamaz" + IDS_STATE_SELECTED "seçili" + IDS_STATE_FOCUSED "odaklı" + IDS_STATE_PRESSED "basılı" + IDS_STATE_CHECKED "imli" + IDS_STATE_MIXED "karışık" + IDS_STATE_READONLY "yalnızca okunur" + IDS_STATE_HOTTRACKED "yakından izlenen" + IDS_STATE_DEFAULT "ön tanımlı" + IDS_STATE_EXPANDED "genişletilmiş" + IDS_STATE_COLLAPSED "daraltılmış" + IDS_STATE_BUSY "dolu" + IDS_STATE_FLOATING "değişen" + IDS_STATE_MARQUEED "asılı" + IDS_STATE_ANIMATED "devingen" + IDS_STATE_INVISIBLE "görünmez" + IDS_STATE_OFFSCREEN "görüntülük dışı" + IDS_STATE_SIZEABLE "boyutlandırılabilir" + IDS_STATE_MOVEABLE "taşınabilir" + IDS_STATE_SELFVOICING "kendinden sesli" + IDS_STATE_FOCUSABLE "odaklanılabilir" + IDS_STATE_SELECTABLE "seçilebilir" + IDS_STATE_LINKED "bağlanmış" + IDS_STATE_TRAVERSED "geçmiş" + IDS_STATE_MULTISELECTABLE "çoklu seçilebilir" + IDS_STATE_EXTSELECTABLE "genişletilmiş seçilebilir" + IDS_STATE_ALERT_LOW "uyarı düşük" + IDS_STATE_ALERT_MEDIUM "uyarı orta" + IDS_STATE_ALERT_HIGH "uyarı yüksek" + IDS_STATE_PROTECTED "korunan" + IDS_STATE_HASPOPUP "açılanı var" } diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt index 8bcbdc930c9..720015edb8d 100644 --- a/dll/win32/oleaut32/CMakeLists.txt +++ b/dll/win32/oleaut32/CMakeLists.txt @@ -12,9 +12,7 @@ add_definitions( -DPROXY_CLSID=CLSID_PSFactoryBuffer) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB) - add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) list(APPEND SOURCE diff --git a/dll/win32/olecli32/CMakeLists.txt b/dll/win32/olecli32/CMakeLists.txt index 2d456883e62..b30491a3783 100644 --- a/dll/win32/olecli32/CMakeLists.txt +++ b/dll/win32/olecli32/CMakeLists.txt @@ -11,6 +11,5 @@ list(APPEND SOURCE add_library(olecli32 SHARED ${SOURCE}) set_module_type(olecli32 win32dll) target_link_libraries(olecli32 wine) -add_importlibs(olecli32 msvcrt ole32 gdi32 kernel32 ntdll) -add_dependencies(olecli32 psdk) +add_importlibs(olecli32 ole32 gdi32 msvcrt kernel32 ntdll) add_cd_file(TARGET olecli32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/oledlg/lang/oledlg_Tr.rc b/dll/win32/oledlg/lang/oledlg_Tr.rc index 46ffb1d5a5b..ccdf370cafb 100644 --- a/dll/win32/oledlg/lang/oledlg_Tr.rc +++ b/dll/win32/oledlg/lang/oledlg_Tr.rc @@ -1,7 +1,7 @@ /* * Turkish Resources * - * 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 diff --git a/dll/win32/olesvr32/CMakeLists.txt b/dll/win32/olesvr32/CMakeLists.txt index cb27dd109d8..b96852dbab7 100644 --- a/dll/win32/olesvr32/CMakeLists.txt +++ b/dll/win32/olesvr32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(olesvr32.dll olesvr32.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/olesvr32.def) add_library(olesvr32 SHARED ${SOURCE}) - set_module_type(olesvr32 win32dll) - target_link_libraries(olesvr32 wine) - add_importlibs(olesvr32 msvcrt kernel32 ntdll) -add_dependencies(olesvr32 psdk) add_cd_file(TARGET olesvr32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/olethk32/CMakeLists.txt b/dll/win32/olethk32/CMakeLists.txt index 2056f4919c1..dd2ddddd630 100644 --- a/dll/win32/olethk32/CMakeLists.txt +++ b/dll/win32/olethk32/CMakeLists.txt @@ -13,5 +13,4 @@ add_library(olethk32 SHARED ${SOURCE}) set_module_type(olethk32 win32dll) target_link_libraries(olethk32 wine) add_importlibs(olethk32 msvcrt kernel32 ntdll) -add_dependencies(olethk32 psdk) add_cd_file(TARGET olethk32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/powrprof/CMakeLists.txt b/dll/win32/powrprof/CMakeLists.txt index cca66c17a6b..44146f91a35 100644 --- a/dll/win32/powrprof/CMakeLists.txt +++ b/dll/win32/powrprof/CMakeLists.txt @@ -1,16 +1,12 @@ spec2def(powrprof.dll powrprof.spec ADD_IMPORTLIB) - add_library(powrprof SHARED powrprof.c powrprof.rc ${CMAKE_CURRENT_BINARY_DIR}/powrprof.def) set_module_type(powrprof win32dll UNICODE) - target_link_libraries(powrprof wine) - add_importlibs(powrprof advapi32 user32 comctl32 msvcrt kernel32 ntdll) - add_cd_file(TARGET powrprof DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/psapi/CMakeLists.txt b/dll/win32/psapi/CMakeLists.txt index 43d12d45dec..a58d7324d5b 100644 --- a/dll/win32/psapi/CMakeLists.txt +++ b/dll/win32/psapi/CMakeLists.txt @@ -7,9 +7,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/psapi.def) add_library(psapi SHARED ${SOURCE}) - set_module_type(psapi win32dll) target_link_libraries(psapi ${PSEH_LIB}) add_importlibs(psapi msvcrt kernel32 ntdll) - add_cd_file(TARGET psapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/pstorec/CMakeLists.txt b/dll/win32/pstorec/CMakeLists.txt index b8b65da1918..e75e4e8f2e5 100644 --- a/dll/win32/pstorec/CMakeLists.txt +++ b/dll/win32/pstorec/CMakeLists.txt @@ -13,6 +13,5 @@ add_library(pstorec SHARED ${SOURCE} rsrc.rc) set_module_type(pstorec win32dll) target_link_libraries(pstorec uuid wine) add_importlibs(pstorec msvcrt kernel32 ntdll) -# pstorec_tlb.tlb needs stdole2.tlb add_dependencies(pstorec stdole2) add_cd_file(TARGET pstorec DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/qmgrprxy/CMakeLists.txt b/dll/win32/qmgrprxy/CMakeLists.txt index 0ef7911bd32..24959d6daf8 100644 --- a/dll/win32/qmgrprxy/CMakeLists.txt +++ b/dll/win32/qmgrprxy/CMakeLists.txt @@ -4,11 +4,8 @@ add_definitions( -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - generate_idl_iids(qmgrprxy.idl) - spec2def(qmgrprxy.dll qmgrprxy.spec) - add_rpcproxy_files(qmgrprxy.idl) list(APPEND SOURCE @@ -19,7 +16,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/qmgrprxy.def) add_library(qmgrprxy SHARED ${SOURCE}) - set_module_type(qmgrprxy win32dll) target_link_libraries(qmgrprxy ${PSEH_LIB} wine) add_importlibs(qmgrprxy rpcrt4 msvcrt kernel32 ntdll) diff --git a/dll/win32/rasadhlp/CMakeLists.txt b/dll/win32/rasadhlp/CMakeLists.txt index ef17487612f..100dcf54385 100644 --- a/dll/win32/rasadhlp/CMakeLists.txt +++ b/dll/win32/rasadhlp/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - spec2def(rasadhlp.dll rasadhlp.spec) list(APPEND SOURCE diff --git a/dll/win32/rasapi32/CMakeLists.txt b/dll/win32/rasapi32/CMakeLists.txt index 18c4baa8e58..547e754f3cd 100644 --- a/dll/win32/rasapi32/CMakeLists.txt +++ b/dll/win32/rasapi32/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(rasapi32.dll rasapi32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -13,5 +12,4 @@ add_library(rasapi32 SHARED ${SOURCE}) set_module_type(rasapi32 win32dll) target_link_libraries(rasapi32 wine) add_importlibs(rasapi32 msvcrt kernel32 ntdll) -add_dependencies(rasapi32 psdk) add_cd_file(TARGET rasapi32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/rasdlg/lang/ro-RO.rc b/dll/win32/rasdlg/lang/ro-RO.rc index 34ae1203f3e..abb28b661c5 100644 --- a/dll/win32/rasdlg/lang/ro-RO.rc +++ b/dll/win32/rasdlg/lang/ro-RO.rc @@ -201,7 +201,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON 563, 1098, 7, 6, 20, 20, WS_GROUP LTEXT "Încercarea de apelare automată a eșuat. Doriți dezactivarea apelării automate de la această locație?", 1099, 40, 6, 181, 34, NOT WS_GROUP - PUSHBUTTON "&Da", 1, 60, 42, 50, 14 + PUSHBUTTON "D&a", 1, 60, 42, 50, 14 DEFPUSHBUTTON "&Nu", 2, 115, 42, 50, 14 END @@ -1266,7 +1266,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Conectare inițială" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Da", 6, 68, 68, 50, 14 + DEFPUSHBUTTON "D&a", 6, 68, 68, 50, 14 PUSHBUTTON "N&u", 7, 125, 68, 50, 14 ICON 32516, 1575, 7, 7, 20, 20 LTEXT "", 1576, 40, 7, 190, 33 @@ -1634,7 +1634,7 @@ BEGIN ICON 32515, -1, 7, 7, 20, 20 LTEXT "Dezactivarea paravanului conexiunii la Internet poate expune calculatorul unui risc de acces neautorizat (din Inernet). Sigur doriți dezactivarrea lui?", -1, 44, 5, 212, 24 AUTOCHECKBOX "Nu dor&esc recurența acestui mesaj", 1662, 42, 40, 210, 10 - DEFPUSHBUTTON "&Da", 6, 74, 60, 50, 14 + DEFPUSHBUTTON "D&a", 6, 74, 60, 50, 14 PUSHBUTTON "N&u", 7, 128, 60, 50, 14 END diff --git a/dll/win32/rasdlg/lang/tr-TR.rc b/dll/win32/rasdlg/lang/tr-TR.rc index fa9178be6f8..13cfa52913d 100644 --- a/dll/win32/rasdlg/lang/tr-TR.rc +++ b/dll/win32/rasdlg/lang/tr-TR.rc @@ -37,309 +37,309 @@ END 104 DIALOGEX 6, 18, 269, 263 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Line Bundling Errors" +CAPTION "Geçek Donatılma Yanlışlıkları" FONT 8, "MS Shell Dlg" BEGIN ICON 32516, 1031, 7, 7, 20, 20 - LTEXT "One or more additional lines did not connect. ", 1033, 37, 8, 216, 20 + LTEXT "Bir ya da daha çok ek geçek bağlanmadı.", 1033, 37, 8, 216, 20 CONTROL "", 1032, "SYSLISTVIEW32", WS_BORDER | WS_TABSTOP | 0x00008401, 37, 83, 224, 136 - AUTOCHECKBOX "&Do not attempt failed lines in the future", 1030, 38, 226, 222, 10 - DEFPUSHBUTTON "&Accept", 1, 135, 242, 60, 14 - PUSHBUTTON "&Hang Up", 2, 201, 242, 60, 14 - LTEXT "If only a single line connected, the server may not be configured to accept multi-link calls. Check 'Do not attempt failed lines' to avoid unnecessary connection charges in such a case.", -1, 37, 36, 224, 44 + AUTOCHECKBOX "&İleride, Olmayan Geçekleri Deneme", 1030, 38, 226, 222, 10 + DEFPUSHBUTTON "&Onayla", 1, 135, 242, 60, 14 + PUSHBUTTON "&Ertele", 2, 201, 242, 60, 14 + LTEXT "Eğer yalnızca bir tek geçek bağlıysa sunucu çoklu bağlantılı aramaları kabul etmeye yapılandırılmamış olabilir. Böyle bir durumda gereksiz bağlantı görevlerinden kaçınmak için ""İleride, Olmayan Geçekleri Deneme""yi imleyiniz.", -1, 37, 36, 224, 44 END 105 DIALOGEX 0, 0, 261, 253 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Advanced Security Settings" +CAPTION "Gelişmiş Güvenlik Ayarları" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Logon security", 1547, 7, 33, 246, 191 - LTEXT "&Data encryption:", 1546, 7, 5, 247, 10 + GROUPBOX "Oturum Açma Güvenliği", 1547, 7, 33, 246, 191 + LTEXT "&Veri Çözme:", 1546, 7, 5, 247, 10 COMBOBOX 1495, 7, 17, 247, 76, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - AUTORADIOBUTTON "Use &Extensible Authentication Protocol (EAP)", 1544, 17, 47, 226, 8, WS_GROUP - LTEXT "EAP Type", -1, 18, 64, 35, 8, NOT WS_VISIBLE | NOT WS_GROUP + AUTORADIOBUTTON "&Genişletilebilir Kimlik Doğrulama İletşim Kâidesi'ni (EAP'yi) Kullan", 1544, 17, 47, 226, 8, WS_GROUP + LTEXT "EAP Türü", -1, 18, 64, 35, 8, NOT WS_VISIBLE | NOT WS_GROUP COMBOBOX 1034, 53, 62, 191, 42, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "P&roperties", 1035, 184, 77, 60, 14 - AUTORADIOBUTTON "Allow these &protocols", 1545, 17, 92, 224, 10 - AUTOCHECKBOX "&Unencrypted password (PAP)", 1491, 28, 105, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP - AUTOCHECKBOX "&Shiva Password Authentication Protocol (SPAP)", 1496, 28, 119, 214, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "&Challenge Handshake Authentication Protocol (CHAP)", 1494, 28, 133, 215, 10, BS_TOP | BS_MULTILINE + PUSHBUTTON "&Husûsiyetler", 1035, 184, 77, 60, 14 + AUTORADIOBUTTON "&Bu İletişim Kâidelerine İzin Ver", 1545, 17, 92, 224, 10 + AUTOCHECKBOX "&Çözülmemiş Şifre (PAP)", 1491, 28, 105, 215, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "&Shiva Şifre Kimlik Doğrulama İletşim Kâidesi (SPAP)", 1496, 28, 119, 214, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Challenge Handshake Kimlik Doğrulama İletşim Kâidesi (CHAP)", 1494, 28, 133, 215, 10, BS_TOP | BS_MULTILINE AUTOCHECKBOX "&MS CHAP (MS-CHAP)", 1493, 28, 148, 212, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Allow older MS-CHAP version for &Win 95 servers", 200, 46, 162, 198, 10, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "M&icrosoft CHAP Version 2 (MS-CHAP v2)", 1492, 28, 176, 200, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Windows 95 Sunucuları İçin Eski MS-CHAP Sürümüne İzin Ver", 200, 46, 162, 198, 10, BS_TOP | BS_MULTILINE + AUTOCHECKBOX "M&icrosoft CHAP Sürüm 2 (MS-CHAP Sürüm 2)", 1492, 28, 176, 200, 10, BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 28, 189, 208, 1 - AUTOCHECKBOX "&For MS-CHAP based protocols, automatically use my ReactOS logon name and password (and domain if any)", 1549, 28, 195, 213, 24, BS_TOP | BS_MULTILINE - DEFPUSHBUTTON "OK", 1, 127, 232, 60, 14 - PUSHBUTTON "Cancel", 2, 192, 232, 60, 14 + AUTOCHECKBOX "MS-CH&AP Tabanlı İletişim Kâideleri İçin ReactOS Oturum Açma Adımı ve Şifremi Kendiliğinden Kullan (Eğer Varsa Etki Alanını da)", 1549, 28, 195, 213, 24, BS_TOP | BS_MULTILINE + DEFPUSHBUTTON "Tamam", 1, 127, 232, 60, 14 + PUSHBUTTON "İptal", 2, 192, 232, 60, 14 END 106 DIALOGEX 6, 18, 255, 109 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Connection Complete" +CAPTION "Bağlama Bitirildi" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", 1, 97, 91, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 97, 91, 60, 14 ICON 563, 1046, 7, 7, 20, 20 - LTEXT "'Connection name' is now connected.", 1047, 40, 7, 212, 16 - LTEXT "To check the status of this connection or disconnect, right-click its icon in the Network Connections folder, or click its icon on the taskbar (if present).", -1, 40, 30, 212, 34 - AUTOCHECKBOX "&Do not display this message again", 1045, 40, 69, 212, 10, BS_TOP | BS_MULTILINE + LTEXT """Bağlantı Adı"" şimdi bağlı.", 1047, 40, 7, 212, 16 + LTEXT "Bu bağlantının durumunu denetlemek ya da bağlantıyı kesmek için, Ağ Bağlantıları dizinindeki simgesine sağ tıklayınız ya da görev çubuğundaki simgesine tıklayınız (eğer varsa).", -1, 40, 30, 212, 34 + AUTOCHECKBOX "&Bu İletiyi Bir Daha Gösterme", 1045, 40, 69, 212, 10, BS_TOP | BS_MULTILINE END 107 DIALOGEX 0, 0, 258, 167 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Phone number", 1053, 7, 5, 243, 92 - LTEXT "&Area code:", 1055, 18, 17, 54, 8 + GROUPBOX "Telefon Numarası", 1053, 7, 5, 243, 92 + LTEXT "&Alan Kodu:", 1055, 18, 17, 54, 8 COMBOBOX 1049, 17, 30, 55, 129, CBS_DROPDOWN | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Phone number:", 1057, 77, 17, 166, 8, NOT WS_GROUP + LTEXT "&Telefon Numarası:", 1057, 77, 17, 166, 8, NOT WS_GROUP EDITTEXT 1051, 77, 30, 163, 14, ES_AUTOHSCROLL - LTEXT "&Country/region code:", 1056, 18, 48, 221, 8, NOT WS_GROUP + LTEXT "&Ülke ya da Bölge Kodu:", 1056, 18, 48, 221, 8, NOT WS_GROUP COMBOBOX 1054, 17, 61, 224, 93, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - AUTOCHECKBOX "&Use dialing rules", 1048, 20, 81, 219, 10, BS_TOP | BS_MULTILINE - GROUPBOX "Co&mment", 1052, 7, 102, 243, 36 + AUTOCHECKBOX "&Çevirme Kâidelerini Kullan", 1048, 20, 81, 219, 10, BS_TOP | BS_MULTILINE + GROUPBOX "Aç&ıklama", 1052, 7, 102, 243, 36 EDITTEXT 1050, 17, 115, 224, 14, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 127, 147, 60, 14 - PUSHBUTTON "Cancel", 2, 191, 147, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 127, 147, 60, 14 + PUSHBUTTON "İptal", 2, 191, 147, 60, 14 END 108 DIALOGEX 6, 18, 222, 104 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Password" +CAPTION "Şifre Değiştir" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Your password on the remote network has expired. Enter passwords, then press OK to set a new one.", 1062, 7, 5, 210, 24 - LTEXT "&New password:", 1064, 8, 43, 108, 8 + LTEXT "Uzak ağdaki şifrenizin süresi doldu. Şifreleri giriniz, sonra yeni birini ayarlamak için Tamam'a tıklayınız.", 1062, 7, 5, 210, 24 + LTEXT "&Yeni Şifre:", 1064, 8, 43, 108, 8 EDITTEXT 1060, 118, 38, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm new password:", 1061, 8, 61, 102, 8 + LTEXT "Y&eni Şifreyi Doğrula:", 1061, 8, 61, 102, 8 EDITTEXT 1058, 118, 57, 98, 14, ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 90, 84, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 154, 84, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 90, 84, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 154, 84, 60, 14 END 109 DIALOGEX 6, 18, 223, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Change Password" +CAPTION "Şifre Değiştir" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Your password on the remote network has expired. Enter passwords, then press OK to set a new one.", 1062, 7, 5, 212, 29 - LTEXT "&Old password:", 1063, 7, 42, 108, 8 + LTEXT "Uzak ağdaki şifrenizin süresi doldu. Şifreleri giriniz, sonra yeni birini ayarlamak için Tamam'a tıklayınız.", 1062, 7, 5, 212, 29 + LTEXT "E&ski Şifre:", 1063, 7, 42, 108, 8 EDITTEXT 1059, 116, 38, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&New password:", 1064, 7, 60, 108, 8 + LTEXT "&Yeni Şifre:", 1064, 7, 60, 108, 8 EDITTEXT 1060, 116, 56, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "&Confirm new password:", 1061, 7, 78, 108, 8 + LTEXT "Y&eni Şifreyi Doğrula:", 1061, 7, 78, 108, 8 EDITTEXT 1058, 116, 74, 100, 14, ES_PASSWORD | ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 92, 101, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 156, 101, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 92, 101, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 156, 101, 60, 14 END 110 DIALOGEX 12, 16, 230, 105 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Callback" +CAPTION "Geri Arama" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "You have 'Set By Caller' callback privilege on the server. Press OK and the server will call you back at the number below. Press Cancel to skip callback.", 1066, 5, 5, 221, 39, SS_NOPREFIX - LTEXT "&Enter your modem's phone number:", 1067, 5, 46, 222, 8, NOT WS_GROUP + LTEXT "Sunucuda ""Arayana Göre Ayarla"" geri arama ayrıcalığınız var. Tamam'a tıklayınız ve sunucu aşağıdaki numaradan sizi geri arayacaktır. Geri aramayı atlamak için İptal'e tıklayınız.", 1066, 5, 5, 221, 39, SS_NOPREFIX + LTEXT "&Çevirgenizin telefon numarasını giriniz:", 1067, 5, 46, 222, 8, NOT WS_GROUP EDITTEXT 1065, 5, 57, 221, 14, ES_AUTOHSCROLL - DEFPUSHBUTTON "OK", 1, 100, 85, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 164, 85, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 100, 85, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 164, 85, 60, 14 END 111 DIALOGEX 6, 19, 265, 135 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Error Connecting to %1" +CAPTION "%1'e Bağlanma Yanlışlığı" FONT 8, "MS Shell Dlg" BEGIN ICON 32515, 1068, 7, 7, 20, 20, WS_GROUP LTEXT "", 1070, 34, 7, 226, 105 - DEFPUSHBUTTON "Do not dial=88", 1, 4, 117, 128, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 136, 117, 60, 14 - PUSHBUTTON "&More Info", 1069, 200, 117, 60, 14 + DEFPUSHBUTTON "Çevirme: 88", 1, 4, 117, 128, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 136, 117, 60, 14 + PUSHBUTTON "&Daha Çok Bilgi", 1069, 200, 117, 60, 14 END 112 DIALOGEX 6, 18, 263, 219 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Automatic Dialing And Hanging Up" +CAPTION "Kendiliğinden Çevirme ve Erteleme" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "ReactOS can automatically dial and hang up devices depending on how much information is being sent and received.", 1085, 9, 7, 253, 30 - GROUPBOX "Automatic dialing", -1, 6, 38, 249, 71 - LTEXT "Dial another line when this connection meets both of the following conditions:", 1083, 16, 51, 237, 16, NOT WS_GROUP - LTEXT "Activity at &least:", -1, 16, 73, 100, 8 + LTEXT "ReactOS, ne denli bilgi gönderiliyor ve alınıyor olduğuna bağlı olarak aygıtları kendiliğinden çevirebilir ve erteleyebilir.", 1085, 9, 7, 253, 30 + GROUPBOX "Kendiliğinden Çevirme", -1, 6, 38, 249, 71 + LTEXT "Bu bağlantı aşağıdaki koşulların ikisiyle karşılaştığında başka bir geçek çevir:", 1083, 16, 51, 237, 16, NOT WS_GROUP + LTEXT "&En Az Etknlik:", -1, 16, 73, 100, 8 COMBOBOX 1079, 117, 70, 60, 100, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "&Duration at least:", 1084, 16, 92, 99, 8, NOT WS_GROUP + LTEXT "E&n Az Süre:", 1084, 16, 92, 99, 8, NOT WS_GROUP COMBOBOX 1080, 117, 89, 90, 162, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - GROUPBOX "Automatic hangup", -1, 6, 113, 248, 81 - LTEXT "Hang up any device used for this connection when it meets both of the following conditions:", 1086, 16, 127, 230, 18, NOT WS_GROUP - LTEXT "Activity no &more than:", -1, 16, 150, 92, 8 + GROUPBOX "Kendiliğinden Erteleme", -1, 6, 113, 248, 81 + LTEXT "Aşağıdaki koşulların ikisiyle karşılaştığında bu bağlantı için kullanılan tüm aygıtları ertele:", 1086, 16, 127, 230, 18, NOT WS_GROUP + LTEXT "&Şundan Daha Çok Etkinlik Yok:", -1, 16, 150, 92, 8 COMBOBOX 1081, 115, 146, 60, 100, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "D&uration at least:", 1087, 16, 168, 92, 8, NOT WS_GROUP + LTEXT "En &Az Süre:", 1087, 16, 168, 92, 8, NOT WS_GROUP COMBOBOX 1082, 115, 166, 90, 151, CBS_DROPDOWNLIST | WS_VSCROLL | NOT WS_TABSTOP - DEFPUSHBUTTON "OK", 1, 131, 199, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 194, 199, 60, 14 + DEFPUSHBUTTON "Tamam", 1, 131, 199, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 194, 199, 60, 14 END 113 DIALOGEX 21, 46, 225, 65 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION -CAPTION "Connecting %1..." +CAPTION "%1'e Bağlanıyor..." FONT 8, "MS Shell Dlg" BEGIN ICON 563, 1417, 7, 7, 20, 20 LTEXT "", 1097, 36, 7, 185, 35, SS_NOPREFIX - PUSHBUTTON "Cancel", 2, 83, 47, 60, 14 + PUSHBUTTON "İptal", 2, 83, 47, 60, 14 END 114 DIALOGEX 6, 18, 225, 60 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Dial-Up Networking" +CAPTION "Çevirmeli Ağ" FONT 8, "MS Shell Dlg" BEGIN ICON 563, 1098, 7, 6, 20, 20, WS_GROUP - LTEXT "The autodial attempt failed. Do you want to disable autodial from this location?", 1099, 40, 6, 181, 34, NOT WS_GROUP - PUSHBUTTON "&Yes", 1, 60, 42, 50, 14 - DEFPUSHBUTTON "&No", 2, 115, 42, 50, 14 + LTEXT "Kendiliğinden çevirme girişimi başarısız. Bu konumdan kendiliğinden çevirmeyi edilginleştirmek ister misiniz?", 1099, 40, 6, 181, 34, NOT WS_GROUP + PUSHBUTTON "&Evet", 1, 60, 42, 50, 14 + DEFPUSHBUTTON "&Hayır", 2, 115, 42, 50, 14 END 115 DIALOGEX 0, 0, 263, 124 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Connect %1" +CAPTION "Bağlan: %1" FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 263, 50 - LTEXT "D&ial:", 1412, 9, 60, 68, 8 + LTEXT "Ç&evir:", 1412, 9, 60, 68, 8 COMBOBOX 1416, 88, 56, 165, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP - LTEXT "Dialing &from:", 1415, 9, 77, 71, 8 + LTEXT "&Şuradan Çevriliyor:", 1415, 9, 77, 71, 8 COMBOBOX 1414, 88, 75, 89, 112, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | NOT WS_TABSTOP - PUSHBUTTON "Dialing &Rules", 1108, 181, 75, 72, 14 + PUSHBUTTON "Çe&virme Kâideleri", 1108, 181, 75, 72, 14 CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 96, 245, 1 - DEFPUSHBUTTON "&Dial", 1590, 8, 103, 61, 14 - PUSHBUTTON "Cancel", 1591, 70, 103, 60, 14 - PUSHBUTTON "Pr&operties", 1107, 132, 103, 60, 14 - PUSHBUTTON "&Help", 1592, 194, 103, 60, 14 + DEFPUSHBUTTON "&Çevir", 1590, 8, 103, 61, 14 + PUSHBUTTON "İptal", 1591, 70, 103, 60, 14 + PUSHBUTTON "&Husûsiyetler", 1107, 132, 103, 60, 14 + PUSHBUTTON "&Yardım", 1592, 194, 103, 60, 14 END 116 DIALOGEX 0, 0, 265, 176 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Connect %1" +CAPTION "Bağlan: %1" FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "&User name:", 1413, 8, 60, 88, 8 + LTEXT "&Kullanıcı Adı:", 1413, 8, 60, 88, 8 EDITTEXT 1104, 103, 57, 154, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1112, 8, 79, 88, 8 + LTEXT "&Şifre:", 1112, 8, 79, 88, 8 EDITTEXT 1103, 103, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 8, 97, 248, 1 - AUTOCHECKBOX "&Save this user name and password for the following users:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Me o&nly", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Anyone who uses this computer", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Aşağıdaki Kullanıcılar İçin Bu Kulanıcı Adını ve Şifreyi Kaydet:", 1101, 14, 105, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ya&lnızca Ben", 1622, 26, 120, 226, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Bu Bilgisayarı Kullanan Tüm Kişiler", 1623, 26, 134, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 8, 149, 248, 1 - DEFPUSHBUTTON "&Dial", 1590, 8, 156, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 1591, 71, 156, 60, 14 - PUSHBUTTON "Pr&operties", 1107, 133, 156, 60, 14 - PUSHBUTTON "&Help", 1592, 195, 156, 60, 14 + DEFPUSHBUTTON "&Çevir", 1590, 8, 156, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 1591, 71, 156, 60, 14 + PUSHBUTTON "&Husûsiyetler", 1107, 133, 156, 60, 14 + PUSHBUTTON "&Yardım", 1592, 195, 156, 60, 14 END 117 DIALOGEX 0, 0, 263, 192 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Connect %1" +CAPTION "Bağlan: %1" FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "&User name:", 1413, 9, 61, 92, 8 + LTEXT "&Kullanıcı Adı:", 1413, 9, 61, 92, 8 EDITTEXT 1104, 102, 57, 154, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1112, 9, 80, 92, 8 + LTEXT "&Şifre:", 1112, 9, 80, 92, 8 EDITTEXT 1103, 102, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "Do&main:", 1110, 9, 99, 91, 8 + LTEXT "&Etki Alanı:", 1110, 9, 99, 91, 8 EDITTEXT 1102, 102, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 9, 116, 247, 1 - AUTOCHECKBOX "&Save this user name and password for the following users:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Me o&nly", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Anyone who uses this computer", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Aşağıdaki Kullanıcılar İçin Bu Kulanıcı Adını ve Şifreyi Kaydet:", 1101, 12, 123, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ya&lnızca Ben", 1622, 25, 137, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Bu Bilgisayarı Kullanan Tüm Kişiler", 1623, 25, 151, 230, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 9, 167, 247, 1 - DEFPUSHBUTTON "&Dial", 1590, 8, 173, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 1591, 71, 173, 60, 14 - PUSHBUTTON "Pr&operties", 1107, 133, 173, 60, 14 - PUSHBUTTON "&Help", 1592, 195, 173, 60, 14 + DEFPUSHBUTTON "&Çevir", 1590, 8, 173, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 1591, 71, 173, 60, 14 + PUSHBUTTON "&Husûsiyetler", 1107, 133, 173, 60, 14 + PUSHBUTTON "&Yardım", 1592, 195, 173, 60, 14 END 118 DIALOGEX 0, 0, 265, 220 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Connect %1" +CAPTION "Bağlan: %1" FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "&User name:", 1413, 10, 61, 92, 8 + LTEXT "&Kullanıcı Adı:", 1413, 10, 61, 92, 8 EDITTEXT 1104, 104, 57, 154, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1112, 10, 80, 92, 8 + LTEXT "&Şifre:", 1112, 10, 80, 92, 8 EDITTEXT 1103, 104, 76, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL - LTEXT "Do&main:", 1110, 10, 100, 92, 8 + LTEXT "&Etki Alanı:", 1110, 10, 100, 92, 8 EDITTEXT 1102, 104, 95, 154, 14, ES_UPPERCASE | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 11, 116, 247, 1 - AUTOCHECKBOX "&Save this user name and password for the following users:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Me o&nly", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Anyone who uses this computer", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Aşağıdaki Kullanıcılar İçin Bu Kulanıcı Adını ve Şifreyi Kaydet:", 1101, 16, 124, 239, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ya&lnızca Ben", 1622, 29, 139, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Bu Bilgisayarı Kullanan Tüm Kişiler", 1623, 29, 152, 225, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 167, 247, 1 - LTEXT "D&ial:", 1412, 10, 177, 90, 8 + LTEXT "Çe&vir:", 1412, 10, 177, 90, 8 COMBOBOX 1416, 102, 173, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 192, 247, 1 - DEFPUSHBUTTON "&Dial", 1590, 10, 199, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 1591, 72, 199, 60, 14 - PUSHBUTTON "Pr&operties", 1107, 134, 199, 60, 14 - PUSHBUTTON "&Help", 1592, 196, 199, 60, 14 + DEFPUSHBUTTON "&Çevir", 1590, 10, 199, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 1591, 72, 199, 60, 14 + PUSHBUTTON "&Husûsiyetler", 1107, 134, 199, 60, 14 + PUSHBUTTON "&Yardım", 1592, 196, 199, 60, 14 END 119 DIALOGEX 0, 0, 265, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION -CAPTION "Connect %1" +CAPTION "Bağlan: %1" FONT 8, "MS Shell Dlg" BEGIN CONTROL 1678, 1100, "STATIC", SS_BITMAP, 0, 0, 265, 50 - LTEXT "&User name:", 1413, 10, 62, 91, 8 + LTEXT "&Kullanıcı Adı:", 1413, 10, 62, 91, 8 EDITTEXT 1104, 104, 58, 154, 14, ES_AUTOHSCROLL - LTEXT "&Password:", 1112, 10, 81, 92, 8 + LTEXT "&Şifre:", 1112, 10, 81, 92, 8 EDITTEXT 1103, 104, 77, 154, 14, ES_PASSWORD | ES_AUTOHSCROLL CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN, 10, 97, 247, 1 - AUTOCHECKBOX "&Save this user name and password for the following users:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "Me o&nly", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP - AUTORADIOBUTTON "&Anyone who uses this computer", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE + AUTOCHECKBOX "&Aşağıdaki Kullanıcılar İçin Bu Kulanıcı Adını ve Şifreyi Kaydet:", 1101, 12, 103, 243, 13, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "Ya&lnızca Ben", 1622, 24, 117, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE | WS_GROUP + AUTORADIOBUTTON "&Bu Bilgisayarı Kullanan Tüm Kişiler", 1623, 24, 132, 229, 11, BS_LEFT | BS_TOP | BS_MULTILINE CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 147, 247, 1 - LTEXT "D&ial:", 1412, 13, 157, 88, 8 + LTEXT "Çe&vir:", 1412, 13, 157, 88, 8 COMBOBOX 1416, 103, 154, 154, 112, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | NOT WS_TABSTOP CONTROL "", -1, "STATIC", SS_LEFTNOWORDWRAP | SS_SUNKEN | WS_GROUP, 10, 173, 247, 1 - DEFPUSHBUTTON "&Dial", 1590, 10, 180, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 1591, 72, 180, 60, 14 - PUSHBUTTON "Pr&operties", 1107, 134, 180, 60, 14 - PUSHBUTTON "&Help", 1592, 197, 180, 60, 14 + DEFPUSHBUTTON "&Çevir", 1590, 10, 180, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 1591, 72, 180, 60, 14 + PUSHBUTTON "&Husûsiyetler", 1107, 134, 180, 60, 14 + PUSHBUTTON "&Yardım", 1592, 197, 180, 60, 14 END 121 DIALOGEX 6, 18, 230, 131 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ISDN Configuration" +CAPTION "ISDN Yapılandırılması" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Line type:", 1155, 9, 9, 65, 8 + LTEXT "&Geçek Türü:", 1155, 9, 9, 65, 8 COMBOBOX 1153, 76, 7, 148, 42, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Negotiate line type", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP + AUTOCHECKBOX "G&eçek Türüyle Anlaş", 1150, 23, 26, 199, 10, BS_TOP | BS_MULTILINE | WS_GROUP GROUPBOX " ", 1152, 8, 48, 214, 51, WS_GROUP - AUTOCHECKBOX "&Use old proprietary protocol", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE - LTEXT "&Channels to use:", 1154, 16, 65, 100, 8, NOT WS_GROUP + AUTOCHECKBOX "E&ski Uygun İletişim Kâidesini Kullan", 1149, 17, 48, 102, 10, BS_TOP | BS_MULTILINE + LTEXT "&Kullanılacak Kanallar:", 1154, 16, 65, 100, 8, NOT WS_GROUP EDITTEXT 1151, 119, 61, 94, 14, ES_AUTOHSCROLL - AUTOCHECKBOX "&Enable hardware compression", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE - PUSHBUTTON "OK", 1, 99, 109, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 163, 109, 60, 14 + AUTOCHECKBOX "&Donanım Sıkıştırmasını Etkinleştir", 1148, 16, 82, 198, 10, BS_TOP | BS_MULTILINE + PUSHBUTTON "Tamam", 1, 99, 109, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 163, 109, 60, 14 END 122 DIALOGEX 6, 18, 220, 68 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "ISDN Configure" +CAPTION "ISDN'yi Yapılandır" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Line type:", 1155, 9, 11, 55, 8 + LTEXT "&Geçek Türü:", 1155, 9, 11, 55, 8 COMBOBOX 1153, 67, 7, 148, 43, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - AUTOCHECKBOX "&Negotiate line type", 1150, 21, 28, 194, 10, BS_TOP | BS_MULTILINE | WS_GROUP - PUSHBUTTON "OK", 1, 90, 49, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 154, 49, 60, 14 + AUTOCHECKBOX "G&eçek Türüyle Anlaş", 1150, 21, 28, 194, 10, BS_TOP | BS_MULTILINE | WS_GROUP + PUSHBUTTON "Tamam", 1, 90, 49, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 154, 49, 60, 14 END 123 DIALOGEX 11, 20, 350, 275 @@ -347,11 +347,11 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION FONT 8, "MS Shell Dlg" BEGIN EDITTEXT 1161, 5, 5, 338, 236, ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL | WS_GROUP - LTEXT "I&P address:", 1163, 7, 253, 68, 8 + LTEXT "&IP Adresi:", 1163, 7, 253, 68, 8 CONTROL "", 1160, "RASIPADDRESS", WS_TABSTOP, 76, 250, 117, 14 DEFPUSHBUTTON "", 1162, 197, 252, 16, 13, NOT WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - PUSHBUTTON "&Done", 1, 219, 252, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 283, 252, 60, 14 + PUSHBUTTON "&Tamam", 1, 219, 252, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 283, 252, 60, 14 END 124 DIALOGEX 6, 17, 350, 266 @@ -360,8 +360,8 @@ FONT 8, "MS Shell Dlg" BEGIN EDITTEXT 1161, 5, 4, 340, 236, ES_MULTILINE | ES_AUTOVSCROLL | WS_VSCROLL | WS_GROUP DEFPUSHBUTTON "", 1162, 7, 247, 50, 14, NOT WS_VISIBLE | WS_GROUP | NOT WS_TABSTOP - PUSHBUTTON "&Done", 1, 222, 247, 60, 14, WS_GROUP - PUSHBUTTON "Cancel", 2, 286, 247, 60, 14 + PUSHBUTTON "&Tamam", 1, 222, 247, 60, 14, WS_GROUP + PUSHBUTTON "İptal", 2, 286, 247, 60, 14 END 125 DIALOGEX 12, 16, 261, 190 diff --git a/dll/win32/resutils/CMakeLists.txt b/dll/win32/resutils/CMakeLists.txt index 4592d25cbae..3433ad47c35 100644 --- a/dll/win32/resutils/CMakeLists.txt +++ b/dll/win32/resutils/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(resutils.dll resutils.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/resutils.def) add_library(resutils SHARED ${SOURCE}) - set_module_type(resutils win32dll) - target_link_libraries(resutils wine) - add_importlibs(resutils msvcrt kernel32 ntdll) - add_cd_file(TARGET resutils DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/rpcrt4/CMakeLists.txt b/dll/win32/rpcrt4/CMakeLists.txt index 85207ed0121..9f2e6dedc37 100644 --- a/dll/win32/rpcrt4/CMakeLists.txt +++ b/dll/win32/rpcrt4/CMakeLists.txt @@ -1,6 +1,6 @@ +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB) - add_rpc_files(client epm.idl) list(APPEND SOURCE @@ -35,8 +35,6 @@ add_definitions( -DCOM_NO_WINDOWS_H -DMSWMSG) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - if(MSVC) add_asm_files(rpcrt4_asm msvc.S) endif() @@ -50,7 +48,6 @@ add_library(rpcrt4 SHARED set_module_type(rpcrt4 win32dll) target_link_libraries(rpcrt4 wine uuid ${PSEH_LIB}) - add_delay_importlibs(rpcrt4 iphlpapi wininet secur32 user32) add_importlibs(rpcrt4 advapi32 ws2_32 shlwapi msvcrt kernel32 ntdll) add_pch(rpcrt4 precomp.h SOURCE) diff --git a/dll/win32/rsabase/CMakeLists.txt b/dll/win32/rsabase/CMakeLists.txt index 644eae6c3bd..2120062bd7c 100644 --- a/dll/win32/rsabase/CMakeLists.txt +++ b/dll/win32/rsabase/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(rsabase.dll rsabase.spec) list(APPEND SOURCE @@ -9,7 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/rsabase.def) add_library(rsabase SHARED ${SOURCE}) - set_module_type(rsabase win32dll ENTRYPOINT 0 ) target_link_libraries(rsabase wine) add_importlibs(rsabase rsaenh ntdll) diff --git a/dll/win32/samsrv/CMakeLists.txt b/dll/win32/samsrv/CMakeLists.txt index bb9d34fddff..fc93404567f 100644 --- a/dll/win32/samsrv/CMakeLists.txt +++ b/dll/win32/samsrv/CMakeLists.txt @@ -4,7 +4,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/sam.idl) - spec2def(samsrv.dll samsrv.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -29,9 +28,7 @@ add_library(samsrv SHARED ${CMAKE_CURRENT_BINARY_DIR}/samsrv.def) set_module_type(samsrv win32dll UNICODE) - target_link_libraries(samsrv wine ${PSEH_LIB}) -add_importlibs(samsrv msvcrt rpcrt4 advapi32 kernel32 ntdll) -add_dependencies(samsrv psdk) +add_importlibs(samsrv rpcrt4 advapi32 msvcrt kernel32 ntdll) add_pch(samsrv samsrv.h SOURCE) add_cd_file(TARGET samsrv DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/scrrun/CMakeLists.txt b/dll/win32/scrrun/CMakeLists.txt index 696a3bdba38..1de6bd1c89c 100644 --- a/dll/win32/scrrun/CMakeLists.txt +++ b/dll/win32/scrrun/CMakeLists.txt @@ -2,7 +2,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(scrrun.dll scrrun.spec) - add_idl_headers(scrrun_idlheader scrrun.idl) add_typelib(scrrun.idl) diff --git a/dll/win32/secur32/CMakeLists.txt b/dll/win32/secur32/CMakeLists.txt index 874adc16a6e..20d6774a547 100644 --- a/dll/win32/secur32/CMakeLists.txt +++ b/dll/win32/secur32/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D__SECUR32__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(secur32.dll secur32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -21,11 +20,7 @@ add_library(secur32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/secur32.def) set_module_type(secur32 win32dll UNICODE) - target_link_libraries(secur32 lsalib wine) - add_importlibs(secur32 advapi32 msvcrt kernel32 ntdll) add_pch(secur32 precomp.h SOURCE) - add_cd_file(TARGET secur32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/setupapi/CMakeLists.txt b/dll/win32/setupapi/CMakeLists.txt index e4c3f4b8ff4..0992ddfe032 100644 --- a/dll/win32/setupapi/CMakeLists.txt +++ b/dll/win32/setupapi/CMakeLists.txt @@ -41,17 +41,6 @@ add_library(setupapi SHARED set_module_type(setupapi win32dll UNICODE) target_link_libraries(setupapi uuid wine ${PSEH_LIB}) add_delay_importlibs(setupapi shell32 winspool wintrust) - -add_importlibs(setupapi - msvcrt - gdi32 - comctl32 - advapi32 - user32 - rpcrt4 - version - kernel32 - ntdll) - +add_importlibs(setupapi gdi32 comctl32 advapi32 user32 rpcrt4 version msvcrt kernel32 ntdll) add_pch(setupapi setupapi_private.h SOURCE) add_cd_file(TARGET setupapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/setupapi/devclass.c b/dll/win32/setupapi/devclass.c index 2bdd6e91d9e..60c92fe8fc1 100644 --- a/dll/win32/setupapi/devclass.c +++ b/dll/win32/setupapi/devclass.c @@ -1272,14 +1272,22 @@ SetupDiGetClassDevPropertySheetsW( if (DeviceInfoData) { struct DeviceInfo *devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; - devInfo->hmodDevicePropPageProvider = hModule; - devInfo->pDevicePropPageProvider = pPropPageProvider; + + if (devInfo->hmodDevicePropPageProvider == NULL) + { + devInfo->hmodDevicePropPageProvider = hModule; + devInfo->pDevicePropPageProvider = pPropPageProvider; + } } else { struct DeviceInfoSet *devInfoSet = (struct DeviceInfoSet *)DeviceInfoSet; - devInfoSet->hmodClassPropPageProvider = hModule; - devInfoSet->pClassPropPageProvider = pPropPageProvider; + + if (devInfoSet->hmodClassPropPageProvider == NULL) + { + devInfoSet->hmodClassPropPageProvider = hModule; + devInfoSet->pClassPropPageProvider = pPropPageProvider; + } } InitialNumberOfPages = PropertySheetHeader->nPages; diff --git a/dll/win32/sfc/CMakeLists.txt b/dll/win32/sfc/CMakeLists.txt index 639e15345d5..350c8d8a54a 100644 --- a/dll/win32/sfc/CMakeLists.txt +++ b/dll/win32/sfc/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sfc.def) add_library(sfc SHARED ${SOURCE}) - set_module_type(sfc win32dll) - add_importlibs(sfc sfc_os msvcrt kernel32 ntdll) - add_cd_file(TARGET sfc DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/sfc_os/CMakeLists.txt b/dll/win32/sfc_os/CMakeLists.txt index b9dae3f13b5..d9713f9dec5 100644 --- a/dll/win32/sfc_os/CMakeLists.txt +++ b/dll/win32/sfc_os/CMakeLists.txt @@ -7,8 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sfc_os.def) add_library(sfc_os SHARED ${SOURCE}) - set_module_type(sfc_os win32dll) add_importlibs(sfc_os msvcrt kernel32 ntdll) - add_cd_file(TARGET sfc_os DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index ea8a53d97bb..23e75c7b3b1 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -24,7 +24,6 @@ set_module_type(shdocvw win32dll) target_link_libraries(shdocvw uuid wine) add_delay_importlibs(shdocvw ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt kernel32 ntdll) -# shdocvw_v1.tlb needs stdole2.tlb add_dependencies(shdocvw stdole2) add_pch(shdocvw shdocvw.h SOURCE) add_cd_file(TARGET shdocvw DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt index 4ab943bb3f5..47f957535c9 100644 --- a/dll/win32/shell32/CMakeLists.txt +++ b/dll/win32/shell32/CMakeLists.txt @@ -1,6 +1,7 @@ PROJECT(SHELL) set_cpp(WITH_RUNTIME) +spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) @@ -14,8 +15,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/atl ${REACTOS_SOURCE_DIR}) -spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) - list(APPEND SOURCE #authors.cpp autocomplete.cpp @@ -84,31 +83,8 @@ add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) set_module_type(shell32 win32dll UNICODE HOTPATCHABLE) - -target_link_libraries(shell32 - atlnew - wine - uuid - recyclebin) - +target_link_libraries(shell32 atlnew wine uuid recyclebin) add_delay_importlibs(shell32 ole32 version fmifs) - -add_importlibs(shell32 - advapi32 - browseui - gdi32 - user32 - powrprof - comctl32 - comdlg32 - shdocvw - shlwapi - devmgr - winspool - winmm - msvcrt - kernel32 - ntdll) - +add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm msvcrt kernel32 ntdll) add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shell32/iconcache.cpp b/dll/win32/shell32/iconcache.cpp index aa3cbfba2e9..2d72dfbcfc3 100644 --- a/dll/win32/shell32/iconcache.cpp +++ b/dll/win32/shell32/iconcache.cpp @@ -308,7 +308,7 @@ fail: if (NULL != TargetIconInfo.hbmColor) DeleteObject(TargetIconInfo.hbmColor); if (NULL != TargetIconInfo.hbmMask) DeleteObject(TargetIconInfo.hbmMask); if (NULL != ShortcutIconInfo.hbmColor) DeleteObject(ShortcutIconInfo.hbmColor); - if (NULL != ShortcutIconInfo.hbmMask) DeleteObject(ShortcutIconInfo.hbmColor); + if (NULL != ShortcutIconInfo.hbmMask) DeleteObject(ShortcutIconInfo.hbmMask); if (NULL != ShortcutIcon) DestroyIcon(ShortcutIcon); return NULL; diff --git a/dll/win32/shell32/lang/ro-RO.rc b/dll/win32/shell32/lang/ro-RO.rc index 4ebf552799e..16f7d87ec00 100644 --- a/dll/win32/shell32/lang/ro-RO.rc +++ b/dll/win32/shell32/lang/ro-RO.rc @@ -1,10 +1,11 @@ /* Ștefan Fulea (stefan dot fulea at mail dot md) */ + LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL MENU_001 MENU BEGIN - MENUITEM "Pictograme m&ari", FCIDM_SHVIEW_BIGICON - MENUITEM "Pictograme m&ici", FCIDM_SHVIEW_SMALLICON + MENUITEM "D&ale", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pictograme", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detalii", FCIDM_SHVIEW_REPORTVIEW END @@ -16,8 +17,8 @@ BEGIN BEGIN POPUP "&Afișare" BEGIN - MENUITEM "Pictograme m&ari", FCIDM_SHVIEW_BIGICON - MENUITEM "Pictograme m&ici", FCIDM_SHVIEW_SMALLICON + MENUITEM "D&ale", FCIDM_SHVIEW_BIGICON + MENUITEM "&Pictograme", FCIDM_SHVIEW_SMALLICON MENUITEM "&Listă", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Detailii", FCIDM_SHVIEW_REPORTVIEW END @@ -25,9 +26,9 @@ BEGIN POPUP "&Ordonare" BEGIN MENUITEM "După &nume", 0x30 /* column 0 */ - MENUITEM "După &tip", 0x32 /* column 2 */ - MENUITEM "După &mărime", 0x31 /* ... */ - MENUITEM "După &dată", 0x33 + MENUITEM "După tip&uri", 0x32 /* column 2 */ + MENUITEM "După &mărimi", 0x31 /* ... */ + MENUITEM "După &date", 0x33 MENUITEM SEPARATOR MENUITEM "&Automată", FCIDM_SHVIEW_AUTOARRANGE END @@ -93,7 +94,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Mesaj" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Da", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "D&a", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Da pentru t&oate", IDC_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "N&u", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP @@ -157,22 +158,22 @@ BEGIN ICON "", 14000, 8, 8, 21, 20, WS_VISIBLE EDITTEXT 14001, 49, 10, 180, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 31, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Tip țintă:", 14004, 8, 38, 68, 10 + LTEXT "Tipul destinației:", 14004, 8, 38, 68, 10 EDITTEXT 14005, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Locație țintă:", 14006, 8, 55, 68, 10 + LTEXT "Locația destinației:", 14006, 8, 55, 68, 10 EDITTEXT 14007, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Ț&intă:", 14008, 8, 71, 68, 10 + LTEXT "D&estinația:", 14008, 8, 71, 68, 10 EDITTEXT 14009, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "P&ornire în:", 14010, 8, 98, 68, 10 + LTEXT "C&alea de lansare:", 14010, 8, 98, 68, 10 EDITTEXT 14011, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "&Taste rapide:", 14014, 8, 117, 68, 10 + LTEXT "Taste &rapide:", 14014, 8, 117, 68, 10 CONTROL "", 14015, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 LTEXT "E&xecuție:", 14016, 8, 136, 68, 10 COMBOBOX 14017, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP LTEXT "&Comentariu:", 14018, 8, 154, 68, 10 EDITTEXT 14019, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Găsire țintă…", 14020, 9, 172, 70, 14, ES_LEFT + PUSHBUTTON "&Deschide loc. destinației", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "&Pictogramă…", 14021, 84, 172, 70, 14, ES_LEFT PUSHBUTTON "A&vansate…", 14022, 159, 172, 70, 14, ES_LEFT END @@ -449,8 +450,8 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUPWIND CAPTION "Confirmare înlocuire fișier" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "&Da", IDYES, 20, 122, 60, 14 - PUSHBUTTON "Da pentru &toate", 12807, 85, 122, 60, 14 + DEFPUSHBUTTON "D&a", IDYES, 20, 122, 60, 14 + PUSHBUTTON "Da pentru t&oate", 12807, 85, 122, 60, 14 PUSHBUTTON "N&u", IDNO, 150, 122, 60, 14 PUSHBUTTON "A&nulează", IDCANCEL, 215, 122, 60, 14 ICON 146, -1, 11, 10, 21, 20, SS_REALSIZECONTROL @@ -642,21 +643,21 @@ BEGIN IDS_ADMINISTRATIVETOOLS "Instrumente administrative" /* context menus */ - IDS_VIEW_LARGE "Pictograme &mari" - IDS_VIEW_SMALL "Pictograme m&ici" + IDS_VIEW_LARGE "D&ale" + IDS_VIEW_SMALL "&Pictograme" IDS_VIEW_LIST "&Listă" IDS_VIEW_DETAILS "&Detalii" IDS_SELECT "Selectează" - IDS_OPEN "Deschide" + IDS_OPEN "&Deschide" IDS_CREATELINK "Creează sc&urtătură" - IDS_COPY "Copiază" - IDS_DELETE "Șterge" - IDS_PROPERTIES "Proprietăți" - IDS_CUT "Decupează" - IDS_RESTORE "Restabilește" - IDS_FORMATDRIVE "Formatare…" - IDS_RENAME "Redenumește" - IDS_INSERT "Inserează" + IDS_COPY "&Copiază" + IDS_DELETE "Șt&erge" + IDS_PROPERTIES "&Proprietăți" + IDS_CUT "&Decupează" + IDS_RESTORE "&Restabilește" + IDS_FORMATDRIVE "F&ormatare…" + IDS_RENAME "Rede&numește" + IDS_INSERT "Inserea&ză" IDS_CREATEFOLDER_DENIED "Nu s-a putut crea dosar nou: Eroare de permisiune." IDS_CREATEFOLDER_CAPTION "Eroare la crearea unui nou dosar" @@ -698,9 +699,9 @@ BEGIN IDS_MYMUSIC "Audio" IDS_MYVIDEO "Video" IDS_DESKTOPDIRECTORY "Birou" - IDS_NETHOOD "Rețele" - IDS_TEMPLATES "Șabloane" - IDS_APPDATA "Date aplicații" + IDS_NETHOOD "Retele" + IDS_TEMPLATES "Sabloane" + IDS_APPDATA "Date aplicatii" IDS_PRINTHOOD "Imprimante" IDS_LOCAL_APPDATA "Preferinte locale\\Date aplicatii" IDS_INTERNET_CACHE "Preferinte locale\\Fisiere de Internet temporare" diff --git a/dll/win32/shfolder/CMakeLists.txt b/dll/win32/shfolder/CMakeLists.txt index e973f7cae9f..c52580f322e 100644 --- a/dll/win32/shfolder/CMakeLists.txt +++ b/dll/win32/shfolder/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(shfolder.dll shfolder.spec) list(APPEND SOURCE @@ -9,9 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/shfolder.def) add_library(shfolder SHARED ${SOURCE}) - set_module_type(shfolder win32dll ENTRYPOINT 0 ) - target_link_libraries(shfolder wine) add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk) diff --git a/dll/win32/shimgvw/CMakeLists.txt b/dll/win32/shimgvw/CMakeLists.txt index 1da24dda9af..c923f33bc80 100644 --- a/dll/win32/shimgvw/CMakeLists.txt +++ b/dll/win32/shimgvw/CMakeLists.txt @@ -10,16 +10,5 @@ list(APPEND SOURCE add_library(shimgvw SHARED ${SOURCE}) set_module_type(shimgvw win32dll) target_link_libraries(shimgvw wine) - -add_importlibs(shimgvw - advapi32 - comctl32 - user32 - gdi32 - gdiplus - comdlg32 - msvcrt - kernel32 - ntdll) - +add_importlibs(shimgvw advapi32 comctl32 user32 gdi32 gdiplus comdlg32 msvcrt kernel32 ntdll) add_cd_file(TARGET shimgvw DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/shlwapi/lang/shlwapi_Ro.rc b/dll/win32/shlwapi/lang/shlwapi_Ro.rc index e8b7faf692a..f41395bb23a 100644 --- a/dll/win32/shlwapi/lang/shlwapi_Ro.rc +++ b/dll/win32/shlwapi/lang/shlwapi_Ro.rc @@ -1,7 +1,7 @@ /* * Copyright 2004 Jon Griffiths * Copyright 2008 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 @@ -40,6 +40,6 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Nu dor&esc recurența acestui mesaj", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON "Con&firmă", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "A&nulează", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Da", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "D&a", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "N&u", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } diff --git a/dll/win32/smdll/CMakeLists.txt b/dll/win32/smdll/CMakeLists.txt index 1b4648bf13d..e54445402b2 100644 --- a/dll/win32/smdll/CMakeLists.txt +++ b/dll/win32/smdll/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys) - spec2def(smdll.dll smdll.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -19,4 +18,3 @@ add_importlibs(smdll ntdll) add_pch(smdll precomp.h SOURCE) add_dependencies(smdll psdk) add_cd_file(TARGET smdll DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/sndblst/CMakeLists.txt b/dll/win32/sndblst/CMakeLists.txt index dd4c3ac3b76..e1b77cc0fed 100644 --- a/dll/win32/sndblst/CMakeLists.txt +++ b/dll/win32/sndblst/CMakeLists.txt @@ -1,8 +1,6 @@ - add_definitions(-DDEBUG_NT4) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) - spec2def(sndblst.dll sndblst.spec) list(APPEND SOURCE @@ -10,7 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/sndblst.def) add_library(sndblst SHARED ${SOURCE}) - set_module_type(sndblst win32dll UNICODE) target_link_libraries(sndblst mment4 mmebuddy) add_importlibs(sndblst user32 winmm advapi32 msvcrt kernel32 ntdll) diff --git a/dll/win32/softpub/CMakeLists.txt b/dll/win32/softpub/CMakeLists.txt index cef2c966101..2caf1ec30f2 100644 --- a/dll/win32/softpub/CMakeLists.txt +++ b/dll/win32/softpub/CMakeLists.txt @@ -1,16 +1,13 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(softpub.dll softpub.spec) -add_library(softpub SHARED softpub.rc +add_library(softpub SHARED + softpub.rc ${CMAKE_CURRENT_BINARY_DIR}/softpub.def) set_module_type(softpub win32dll ENTRYPOINT 0 ) - target_link_libraries(softpub wine) - add_importlibs(softpub wintrust) - add_cd_file(TARGET softpub DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/srclient/CMakeLists.txt b/dll/win32/srclient/CMakeLists.txt index 8e6d69dc2d5..c65d5d3b65e 100644 --- a/dll/win32/srclient/CMakeLists.txt +++ b/dll/win32/srclient/CMakeLists.txt @@ -8,8 +8,5 @@ list(APPEND SOURCE add_library(srclient SHARED ${SOURCE}) set_module_type(srclient win32dll) - add_importlibs(srclient msvcrt kernel32 ntdll) -add_dependencies(srclient psdk) - add_cd_file(TARGET srclient DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/stdole32.tlb/CMakeLists.txt b/dll/win32/stdole32.tlb/CMakeLists.txt index 897e12546f1..2e0babc9864 100644 --- a/dll/win32/stdole32.tlb/CMakeLists.txt +++ b/dll/win32/stdole32.tlb/CMakeLists.txt @@ -1,9 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - add_typelib(std_ole_v1.idl) - spec2def(stdole32.tlb stdole32.tlb.spec) list(APPEND SOURCE @@ -11,7 +9,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/stdole32.def) set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/std_ole_v1.tlb) - add_library(stdole32.tlb SHARED ${SOURCE}) set_module_type(stdole32.tlb module) set_target_properties(stdole32.tlb PROPERTIES SUFFIX "") diff --git a/dll/win32/syssetup/CMakeLists.txt b/dll/win32/syssetup/CMakeLists.txt index 6c0b48147cc..2698536a262 100644 --- a/dll/win32/syssetup/CMakeLists.txt +++ b/dll/win32/syssetup/CMakeLists.txt @@ -19,20 +19,5 @@ add_library(syssetup SHARED add_pch(syssetup precomp.h SOURCE) set_module_type(syssetup win32dll UNICODE) target_link_libraries(syssetup uuid wine ${PSEH_LIB}) - -add_importlibs(syssetup - msvcrt - advapi32 - gdi32 - user32 - samlib - userenv - comctl32 - setupapi - ole32 - shell32 - shlwapi - kernel32 - ntdll) - +add_importlibs(syssetup advapi32 gdi32 user32 samlib userenv comctl32 setupapi ole32 shell32 shlwapi msvcrt kernel32 ntdll) add_cd_file(TARGET syssetup DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/syssetup/lang/ro-RO.rc b/dll/win32/syssetup/lang/ro-RO.rc index b5884cec666..c102cd85deb 100644 --- a/dll/win32/syssetup/lang/ro-RO.rc +++ b/dll/win32/syssetup/lang/ro-RO.rc @@ -3,7 +3,7 @@ * FILE: dll/win32/syssetup/lang/ro-RO.rc * PURPOSE: Romanian Language File for system setup * TRANSLATORS: - * Petre Dumitriu + * Petru Dumitriu (petrimetri at gmail dot com) * Ștefan Fulea (stefan dot fulea at mail dot md) */ @@ -135,13 +135,13 @@ BEGIN IDS_ACKTITLE "Conștientizări" IDS_ACKSUBTITLE "Contribuții aduse și informații despre licență" IDS_OWNERTITLE "Personalizare sistem" - IDS_OWNERSUBTITLE "Asistentul va folosi câteva informații pentru a personaliza ReactOS." + IDS_OWNERSUBTITLE "Prelevare informații pentru a personaliza sistemul de operare" IDS_COMPUTERTITLE "Nume calculator și parolă de administrator" - IDS_COMPUTERSUBTITLE "Pentru calculator sunt necesare un nume și o parolă de administrator." + IDS_COMPUTERSUBTITLE "Furnizare nume pentru calculator și parolă pentru utilizatorul Administrator" IDS_LOCALETITLE "Particularizări regionale" - IDS_LOCALESUBTITLE "Particularizarea ReactOS pentru anumite regiuni sau limbi." + IDS_LOCALESUBTITLE "Particularizare sistem pentru anumite regiuni sau limbi" IDS_DATETIMETITLE "Dată și oră" - IDS_DATETIMESUBTITLE "Stabiliți data și ora corectă pentru calculator." + IDS_DATETIMESUBTITLE "Stabilire dată și oră corectă pentru calculator" IDS_PROCESSTITLE "Înregistrare componente" IDS_PROCESSSUBTITLE "Așteptați…" END diff --git a/dll/win32/t2embed/CMakeLists.txt b/dll/win32/t2embed/CMakeLists.txt index 32dc19987f4..ac925625b0e 100644 --- a/dll/win32/t2embed/CMakeLists.txt +++ b/dll/win32/t2embed/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(t2embed.dll t2embed.spec) list(APPEND SOURCE @@ -11,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/t2embed.def) add_library(t2embed SHARED ${SOURCE}) - set_module_type(t2embed win32dll UNICODE) - target_link_libraries(t2embed wine) - add_importlibs(t2embed gdi32 user32 advapi32 version msvcrt kernel32 ntdll) - add_cd_file(TARGET t2embed DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/traffic/CMakeLists.txt b/dll/win32/traffic/CMakeLists.txt index 64764005630..b0669c2de20 100644 --- a/dll/win32/traffic/CMakeLists.txt +++ b/dll/win32/traffic/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(traffic.dll traffic.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/traffic.def) add_library(traffic SHARED ${SOURCE}) - set_module_type(traffic win32dll) - target_link_libraries(traffic wine) - add_importlibs(traffic msvcrt kernel32 ntdll) -add_dependencies(traffic psdk) add_cd_file(TARGET traffic DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/uext2/CMakeLists.txt b/dll/win32/uext2/CMakeLists.txt index 8a18c50a1ca..eef6c63213a 100644 --- a/dll/win32/uext2/CMakeLists.txt +++ b/dll/win32/uext2/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/uext2.def) add_library(uext2 SHARED ${SOURCE}) - set_module_type(uext2 nativedll) target_link_libraries(uext2 ext2lib) add_importlibs(uext2 ntdll) diff --git a/dll/win32/ufat/CMakeLists.txt b/dll/win32/ufat/CMakeLists.txt index 9548798a627..432af9db096 100644 --- a/dll/win32/ufat/CMakeLists.txt +++ b/dll/win32/ufat/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ufat.def) add_library(ufat SHARED ${SOURCE}) - set_module_type(ufat nativedll) target_link_libraries(ufat vfatlib) add_importlibs(ufat ntdll) diff --git a/dll/win32/ufatx/CMakeLists.txt b/dll/win32/ufatx/CMakeLists.txt index 4b7fa840a8e..927efb516e5 100644 --- a/dll/win32/ufatx/CMakeLists.txt +++ b/dll/win32/ufatx/CMakeLists.txt @@ -6,11 +6,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/ufatx.def) add_library(ufatx SHARED ${SOURCE}) - target_link_libraries(ufatx vfatxlib) set_module_type(ufatx nativedll ENTRYPOINT 0 ) - add_importlibs(ufatx ntdll) - add_dependencies(ufatx psdk) add_cd_file(TARGET ufatx DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/unicows/CMakeLists.txt b/dll/win32/unicows/CMakeLists.txt index e57826ef82d..93c9f2c76cb 100644 --- a/dll/win32/unicows/CMakeLists.txt +++ b/dll/win32/unicows/CMakeLists.txt @@ -6,26 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/unicows.def) add_library(unicows SHARED ${SOURCE}) - set_module_type(unicows win32dll) - -add_importlibs(unicows - avicap32 - msvfw32 - oledlg - comdlg32 - shell32 - winmm - winspool - rasapi32 - secur32 - sensapi - version - user32 - mpr - gdi32 - advapi32 - msvcrt - kernel32 - ntdll) +add_importlibs(unicows avicap32 msvfw32 oledlg comdlg32 shell32 winmm winspool rasapi32 secur32 sensapi version user32 mpr gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET unicows DESTINATION reactos FOR all) diff --git a/dll/win32/untfs/CMakeLists.txt b/dll/win32/untfs/CMakeLists.txt index 818df413b80..c65863708e1 100644 --- a/dll/win32/untfs/CMakeLists.txt +++ b/dll/win32/untfs/CMakeLists.txt @@ -7,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/untfs.def) add_library(untfs SHARED ${SOURCE}) - set_module_type(untfs nativedll) target_link_libraries(untfs ntfslib) add_importlibs(untfs ntdll) diff --git a/dll/win32/updspapi/CMakeLists.txt b/dll/win32/updspapi/CMakeLists.txt index 18d1b1c8e52..ca4d87b96b8 100644 --- a/dll/win32/updspapi/CMakeLists.txt +++ b/dll/win32/updspapi/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(updspapi.dll updspapi.spec) list(APPEND SOURCE @@ -11,10 +10,6 @@ list(APPEND SOURCE add_library(updspapi SHARED ${SOURCE}) set_module_type(updspapi win32dll) - target_link_libraries(updspapi wine) - -add_importlibs(updspapi msvcrt setupapi kernel32 ntdll) -add_dependencies(updspapi psdk) - +add_importlibs(updspapi setupapi msvcrt kernel32 ntdll) add_cd_file(TARGET updspapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/url/CMakeLists.txt b/dll/win32/url/CMakeLists.txt index 0d1cc226918..7d18d43f9b2 100644 --- a/dll/win32/url/CMakeLists.txt +++ b/dll/win32/url/CMakeLists.txt @@ -1,7 +1,6 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) - spec2def(url.dll url.spec) list(APPEND SOURCE diff --git a/dll/win32/userenv/gpolicy.c b/dll/win32/userenv/gpolicy.c index fca2b051a21..55a5f098ac7 100644 --- a/dll/win32/userenv/gpolicy.c +++ b/dll/win32/userenv/gpolicy.c @@ -572,3 +572,31 @@ WaitForMachinePolicyForegroundProcessing(VOID) return Ret; } + +DWORD +WINAPI +GetAppliedGPOListA( + _In_ DWORD dwFlags, + _In_ LPCSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTA *ppGPOList +) +{ + DPRINT1("GetAppliedGPOListA is UNIMPLEMENTED!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +GetAppliedGPOListW( + _In_ DWORD dwFlags, + _In_ LPCWSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTW *ppGPOList +) +{ + DPRINT1("GetAppliedGPOListW is UNIMPLEMENTED!\n"); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dll/win32/userenv/userenv.spec b/dll/win32/userenv/userenv.spec index 8f8237614db..bcbed1e071c 100644 --- a/dll/win32/userenv/userenv.spec +++ b/dll/win32/userenv/userenv.spec @@ -16,8 +16,8 @@ 188 stub GenerateRsopPolicy #stdcall GenerateRsopPolicy(48) 189 stdcall GetAllUsersProfileDirectoryA(str ptr) 190 stdcall GetAllUsersProfileDirectoryW(wstr ptr) -191 stub GetAppliedGPOListA #stdcall GetAppliedGPOListA(long str ptr ptr ptr) -192 stub GetAppliedGPOListW #stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) +191 stdcall GetAppliedGPOListA(long str ptr ptr ptr) +192 stdcall GetAppliedGPOListW(long wstr ptr ptr ptr) 193 stdcall GetDefaultUserProfileDirectoryA(str ptr) 194 stdcall GetDefaultUserProfileDirectoryW(wstr ptr) 195 stub GetGPOListA #stdcall GetGPOListA(ptr str str str long ptr) diff --git a/dll/win32/vdmdbg/CMakeLists.txt b/dll/win32/vdmdbg/CMakeLists.txt index 3fe251b981e..cef101a4b36 100644 --- a/dll/win32/vdmdbg/CMakeLists.txt +++ b/dll/win32/vdmdbg/CMakeLists.txt @@ -6,7 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/vdmdbg.def) add_library(vdmdbg SHARED ${SOURCE}) - set_module_type(vdmdbg win32dll UNICODE) add_importlibs(vdmdbg msvcrt kernel32 ntdll) add_cd_file(TARGET vdmdbg DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wdmaud.drv/CMakeLists.txt b/dll/win32/wdmaud.drv/CMakeLists.txt index f23bc045c78..0da282b7f71 100644 --- a/dll/win32/wdmaud.drv/CMakeLists.txt +++ b/dll/win32/wdmaud.drv/CMakeLists.txt @@ -1,6 +1,4 @@ - - include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound ${REACTOS_SOURCE_DIR}/drivers/wdm/audio/legacy/wdmaud @@ -22,13 +20,8 @@ add_library(wdmaud.drv SHARED ${CMAKE_CURRENT_BINARY_DIR}/wdmaud.def) set_module_type(wdmaud.drv win32dll UNICODE) - set_target_properties(wdmaud.drv PROPERTIES SUFFIX "") - -target_link_libraries(wdmaud.drv - mmebuddy - libsamplerate - mmixer) +target_link_libraries(wdmaud.drv mmebuddy libsamplerate mmixer) if(CMAKE_C_COMPILER_ID STREQUAL "Clang") target_link_libraries(wdmaud.drv mingwex) diff --git a/dll/win32/windowscodecs/CMakeLists.txt b/dll/win32/windowscodecs/CMakeLists.txt index bb583b87d3b..9c9ef551127 100644 --- a/dll/win32/windowscodecs/CMakeLists.txt +++ b/dll/win32/windowscodecs/CMakeLists.txt @@ -20,7 +20,6 @@ if(MSVC) endif() spec2def(windowscodecs.dll windowscodecs.spec ADD_IMPORTLIB) - add_rpcproxy_files(windowscodecs_wincodec.idl) list(APPEND SOURCE diff --git a/dll/win32/winfax/CMakeLists.txt b/dll/win32/winfax/CMakeLists.txt index 6977a9d6abc..830d8e62fb0 100644 --- a/dll/win32/winfax/CMakeLists.txt +++ b/dll/win32/winfax/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/winfax.def) add_library(winfax SHARED ${SOURCE}) - set_module_type(winfax win32dll) - add_importlibs(winfax msvcrt kernel32 ntdll) -add_dependencies(winfax psdk) add_cd_file(TARGET winfax DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wing32/CMakeLists.txt b/dll/win32/wing32/CMakeLists.txt index b25a72d2f45..a4980b8eb2b 100644 --- a/dll/win32/wing32/CMakeLists.txt +++ b/dll/win32/wing32/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(wing32.dll wing32.spec) list(APPEND SOURCE @@ -7,9 +6,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wing32.def) add_library(wing32 SHARED ${SOURCE}) - set_module_type(wing32 win32dll UNICODE) - add_importlibs(wing32 user32 gdi32 msvcrt kernel32) -add_dependencies(wing32 psdk) add_cd_file(TARGET wing32 DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/winhttp/CMakeLists.txt b/dll/win32/winhttp/CMakeLists.txt index 2058bf171c8..4d7ef0dfa72 100644 --- a/dll/win32/winhttp/CMakeLists.txt +++ b/dll/win32/winhttp/CMakeLists.txt @@ -28,6 +28,6 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp uuid wine) add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32) add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy msvcrt kernel32 ntdll) -add_dependencies(winhttp stdole2) # wininet_tlb.tlb needs stdole2.tlb +add_dependencies(winhttp stdole2) add_pch(winhttp winhttp_private.h SOURCE) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wininet/lang/wininet_Ro.rc b/dll/win32/wininet/lang/wininet_Ro.rc index 64ab0449db7..075eedda0de 100644 --- a/dll/win32/wininet/lang/wininet_Ro.rc +++ b/dll/win32/wininet/lang/wininet_Ro.rc @@ -1,7 +1,7 @@ /* * Copyright 2003 Mike McCormack for CodeWeavers * Copyright 2008 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 @@ -24,11 +24,11 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL STRINGTABLE { - IDS_LANCONNECTION "LAN Connection" - IDS_CERT_CA_INVALID "The certificate is issued by an unknown or untrusted publisher." - IDS_CERT_DATE_INVALID "The date on the certificate is invalid." - IDS_CERT_CN_INVALID "The name on the certificate does not match the site." - IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + IDS_LANCONNECTION "Conexiune de rețea locală" + IDS_CERT_CA_INVALID "Certificatul este emis de o parte necunoscută sau nesigură." + IDS_CERT_DATE_INVALID "Data din certificat nu este validă." + IDS_CERT_CN_INVALID "Numele din certificat nu corespunde cu cel al sitului." + IDS_CERT_ERRORS "Există cel puțin o problemă nespecificată de securitate cu acest certificat." } IDD_PROXYDLG DIALOG 36, 24, 220, 146 @@ -73,12 +73,12 @@ FONT 8, "MS Shell Dlg" IDD_INVCERTDLG DIALOG 3, 24, 250, 86 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Security Warning" +CAPTION "Avertisment de securitate" FONT 8, "MS Shell Dlg" { - LTEXT "There is a problem with the certificate for this site.", -1, 40, 6, 200, 20 + LTEXT "Există o problemă cu certificatul acestui sit.", -1, 40, 6, 200, 20 LTEXT "", IDC_CERT_ERROR, 40, 26, 200, 20 - LTEXT "Do you want to continue anyway?", -1, 40, 46, 200, 20 - PUSHBUTTON "Yes", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "No", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Doriți totuși să continuați?", -1, 40, 46, 200, 20 + PUSHBUTTON "D&a", IDOK, 40, 66, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "N&u", IDCANCEL, 100, 66, 56, 14, WS_GROUP | WS_TABSTOP } diff --git a/dll/win32/wininet/lang/wininet_Tr.rc b/dll/win32/wininet/lang/wininet_Tr.rc index d9264b22514..49ac5b2c133 100644 --- a/dll/win32/wininet/lang/wininet_Tr.rc +++ b/dll/win32/wininet/lang/wininet_Tr.rc @@ -22,11 +22,11 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT STRINGTABLE { - IDS_LANCONNECTION "LAN Connection" - IDS_CERT_CA_INVALID "The certificate is issued by an unknown or untrusted publisher." - IDS_CERT_DATE_INVALID "The date on the certificate is invalid." - IDS_CERT_CN_INVALID "The name on the certificate does not match the site." - IDS_CERT_ERRORS "There is at least one unspecified security problem with this certificate." + IDS_LANCONNECTION "LAN Bağlantısı" + IDS_CERT_CA_INVALID "Onay belgesi, bilinmeyen ya da güvenilmeyen bir yayımcı eliyle yayımlandı." + IDS_CERT_DATE_INVALID "Onay belgesindeki zaman geçersiz." + IDS_CERT_CN_INVALID "Onay belgesindeki ad siteyle uyuşmuyor." + IDS_CERT_ERRORS "Bu onay belgesiyle en az bir belirtilmemiş güvenlik sorunu var." } IDD_PROXYDLG DIALOG 36, 24, 220, 146 diff --git a/dll/win32/winmm/CMakeLists.txt b/dll/win32/winmm/CMakeLists.txt index 0c59c51db63..5be73d9d6ca 100644 --- a/dll/win32/winmm/CMakeLists.txt +++ b/dll/win32/winmm/CMakeLists.txt @@ -1,7 +1,6 @@ add_definitions(-D_WINE) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -26,9 +25,10 @@ set_module_type(winmm win32dll HOTPATCHABLE) target_link_libraries(winmm wine ${PSEH_LIB}) add_importlibs(winmm advapi32 user32 msvcrt kernel32 ntdll) add_pch(winmm winemm.h SOURCE) -add_subdirectory(midimap) add_cd_file(TARGET winmm DESTINATION reactos/system32 FOR all) if((NOT MSVC) AND (NOT CMAKE_C_COMPILER_ID STREQUAL "Clang")) add_target_compile_flags(winmm "-Wno-unused-but-set-variable") endif() + +add_subdirectory(midimap) diff --git a/dll/win32/winmm/midimap/CMakeLists.txt b/dll/win32/winmm/midimap/CMakeLists.txt index 18ddfbc24ee..a025f148c11 100644 --- a/dll/win32/winmm/midimap/CMakeLists.txt +++ b/dll/win32/winmm/midimap/CMakeLists.txt @@ -7,10 +7,6 @@ add_library(midimap SHARED ${CMAKE_CURRENT_BINARY_DIR}/midimap.def) set_module_type(midimap win32dll UNICODE) - target_link_libraries(midimap uuid wine) - add_importlibs(midimap advapi32 user32 winmm msvcrt kernel32 ntdll) -add_dependencies(midimap psdk) add_cd_file(TARGET midimap DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/wlanapi/CMakeLists.txt b/dll/win32/wlanapi/CMakeLists.txt index 8c356b07b6e..233b3033d32 100644 --- a/dll/win32/wlanapi/CMakeLists.txt +++ b/dll/win32/wlanapi/CMakeLists.txt @@ -1,8 +1,6 @@ include_directories( ${REACTOS_SOURCE_DIR}/include/reactos/idl) - add_rpc_files(client ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl) - spec2def(wlanapi.dll wlanapi.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -12,15 +10,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wlansvc_c.c) add_library(wlanapi SHARED ${SOURCE}) - set_module_type(wlanapi win32dll) - -target_link_libraries(wlanapi - wine - ${PSEH_LIB}) - +target_link_libraries(wlanapi wine ${PSEH_LIB}) add_importlibs(wlanapi rpcrt4 msvcrt kernel32 ntdll) - - -add_dependencies(wlanapi psdk) add_cd_file(TARGET wlanapi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wldap32/lang/wldap32_Tr.rc b/dll/win32/wldap32/lang/wldap32_Tr.rc index 47ce7c3f094..8d8145284c9 100644 --- a/dll/win32/wldap32/lang/wldap32_Tr.rc +++ b/dll/win32/wldap32/lang/wldap32_Tr.rc @@ -31,7 +31,7 @@ STRINGTABLE 6 "Karşılaştırma Doğru" 7 "Kimlik Doğrulaması Yöntemi Desteklenmiyor" 8 "Güçlü Kimlik Doğrulaması Gerekli" - 9 "Başvuru (v2)" + 9 "Başvuru (Sürüm 2)" 10 "Başvuru" 11 "Yönetim Hududu Aşıldı" 12 "Olmayan Önemli Eklenti" diff --git a/dll/win32/wmi/CMakeLists.txt b/dll/win32/wmi/CMakeLists.txt index 7d37a29e7c3..0519d44940e 100644 --- a/dll/win32/wmi/CMakeLists.txt +++ b/dll/win32/wmi/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wmi.def) add_library(wmi SHARED ${SOURCE}) - set_module_type(wmi win32dll ENTRYPOINT 0 ) - add_importlibs(wmi advapi32) add_dependencies(wmi psdk) add_cd_file(TARGET wmi DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/ws2_32/CMakeLists.txt b/dll/win32/ws2_32/CMakeLists.txt index 0cded311199..a7ad9645cde 100644 --- a/dll/win32/ws2_32/CMakeLists.txt +++ b/dll/win32/ws2_32/CMakeLists.txt @@ -1,10 +1,8 @@ add_definitions(-DLE) add_definitions(-DWINSOCK_API_LINKAGE=DECLSPEC_EXPORT) - include_directories(BEFORE include) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(ws2_32.dll ws2_32.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -31,4 +29,3 @@ add_delay_importlibs(ws2_32 user32) add_importlibs(ws2_32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_pch(ws2_32 include/ws2_32.h SOURCE) add_cd_file(TARGET ws2_32 DESTINATION reactos/system32 FOR all) - diff --git a/dll/win32/ws2_32_new/CMakeLists.txt b/dll/win32/ws2_32_new/CMakeLists.txt index 250439a108b..7754c966825 100644 --- a/dll/win32/ws2_32_new/CMakeLists.txt +++ b/dll/win32/ws2_32_new/CMakeLists.txt @@ -1,12 +1,11 @@ add_definitions(-DLE) +spec2def(ws2_32_new.dll ws2_32.spec) include_directories( inc ${REACTOS_SOURCE_DIR}/include/reactos/winsock) -spec2def(ws2_32_new.dll ws2_32.spec) - list(APPEND SOURCE src/addrconv.c src/addrinfo.c diff --git a/dll/win32/ws2help/CMakeLists.txt b/dll/win32/ws2help/CMakeLists.txt index 277270a2349..d0412240ef4 100644 --- a/dll/win32/ws2help/CMakeLists.txt +++ b/dll/win32/ws2help/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/winsock) - spec2def(ws2help.dll ws2help.spec ADD_IMPORTLIB) list(APPEND SOURCE diff --git a/dll/win32/wshirda/CMakeLists.txt b/dll/win32/wshirda/CMakeLists.txt index ea110992e14..d7fc1562c94 100644 --- a/dll/win32/wshirda/CMakeLists.txt +++ b/dll/win32/wshirda/CMakeLists.txt @@ -1,5 +1,4 @@ - spec2def(wshirda.dll wshirda.spec) list(APPEND SOURCE @@ -8,7 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wshirda.def) add_library(wshirda SHARED ${SOURCE}) - set_module_type(wshirda win32dll UNICODE) add_importlibs(wshirda ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wshirda DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wshtcpip/CMakeLists.txt b/dll/win32/wshtcpip/CMakeLists.txt index e0c94acc1bd..41439e96954 100644 --- a/dll/win32/wshtcpip/CMakeLists.txt +++ b/dll/win32/wshtcpip/CMakeLists.txt @@ -1,7 +1,5 @@ - include_directories(${REACTOS_SOURCE_DIR}/lib/tdilib) - spec2def(wshtcpip.dll wshtcpip.spec) list(APPEND SOURCE @@ -10,10 +8,7 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wshtcpip.def) add_library(wshtcpip SHARED ${SOURCE}) - set_module_type(wshtcpip win32dll UNICODE) - target_link_libraries(wshtcpip tdilib) add_importlibs(wshtcpip ws2_32 msvcrt kernel32 ntdll) -add_dependencies(wshtcpip psdk) add_cd_file(TARGET wshtcpip DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/wsock32/CMakeLists.txt b/dll/win32/wsock32/CMakeLists.txt index 0f09ad6ffa7..2826ec78046 100644 --- a/dll/win32/wsock32/CMakeLists.txt +++ b/dll/win32/wsock32/CMakeLists.txt @@ -1,9 +1,6 @@ - spec2def(wsock32.dll wsock32.spec) add_library(wsock32 SHARED stubs.c wsock32.rc ${CMAKE_CURRENT_BINARY_DIR}/wsock32.def) - set_module_type(wsock32 win32dll UNICODE) - add_importlibs(wsock32 mswsock ws2_32 msvcrt kernel32 ntdll) add_cd_file(TARGET wsock32 DESTINATION reactos/system32 FOR all) diff --git a/drivers/base/bootvid/CMakeLists.txt b/drivers/base/bootvid/CMakeLists.txt index 6628ffd4ea5..8b1321b5524 100644 --- a/drivers/base/bootvid/CMakeLists.txt +++ b/drivers/base/bootvid/CMakeLists.txt @@ -20,9 +20,7 @@ add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) set_module_type(bootvid kerneldll ENTRYPOINT 0) - add_importlibs(bootvid ntoskrnl hal) add_pch(bootvid precomp.h SOURCE) add_dependencies(bootvid psdk) add_cd_file(TARGET bootvid DESTINATION reactos/system32 NO_CAB FOR all) - diff --git a/drivers/base/condrv/CMakeLists.txt b/drivers/base/condrv/CMakeLists.txt index b4137cecb0b..ab4de2a5469 100644 --- a/drivers/base/condrv/CMakeLists.txt +++ b/drivers/base/condrv/CMakeLists.txt @@ -13,10 +13,8 @@ add_library(condrv SHARED condrv.rc) # ${CMAKE_CURRENT_BINARY_DIR}/condrv.def) -add_pch(condrv condrv.h SOURCE) - set_module_type(condrv kernelmodedriver) target_link_libraries(condrv ${PSEH_LIB}) add_importlibs(condrv ntoskrnl hal) - +add_pch(condrv condrv.h SOURCE) add_cd_file(TARGET condrv DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/base/kdcom/CMakeLists.txt b/drivers/base/kdcom/CMakeLists.txt index 725e86b905e..8725ed55ab0 100644 --- a/drivers/base/kdcom/CMakeLists.txt +++ b/drivers/base/kdcom/CMakeLists.txt @@ -12,10 +12,8 @@ add_library(kdcom SHARED kdcom.rc ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) -set_entrypoint(kdcom 0) +set_module_type(kdcom module IMAGEBASE 0x00010000) set_subsystem(kdcom native) -set_image_base(kdcom 0x00010000) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk bugcodes) diff --git a/drivers/base/kdgdb/CMakeLists.txt b/drivers/base/kdgdb/CMakeLists.txt index bb9236c956d..2aaf82c1d37 100644 --- a/drivers/base/kdgdb/CMakeLists.txt +++ b/drivers/base/kdgdb/CMakeLists.txt @@ -2,9 +2,9 @@ spec2def(kdcom.dll kdgdb.spec ADD_IMPORTLIB) list(APPEND SOURCE - gdb_input.c - gdb_receive.c - gdb_send.c + gdb_input.c + gdb_receive.c + gdb_send.c kdcom.c kdpacket.c utils.c @@ -12,7 +12,7 @@ list(APPEND SOURCE # TODO: AMD64, ARM... if(ARCH STREQUAL "i386") - list(APPEND SOURCE i386_sup.c) + list(APPEND SOURCE i386_sup.c) endif() add_library(kdcom SHARED @@ -23,7 +23,6 @@ add_library(kdcom SHARED set_entrypoint(kdcom 0) set_subsystem(kdcom native) set_image_base(kdcom 0x00010000) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_pch(kdcom kdgdb.h SOURCE) diff --git a/drivers/base/kdrosdbg/CMakeLists.txt b/drivers/base/kdrosdbg/CMakeLists.txt index d4f8baffd5d..5c69e731783 100644 --- a/drivers/base/kdrosdbg/CMakeLists.txt +++ b/drivers/base/kdrosdbg/CMakeLists.txt @@ -7,11 +7,8 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) - set_module_type(kdcom kerneldll ENTRYPOINT 0) - add_importlibs(kdcom ntoskrnl hal) target_link_libraries(kdcom cportlib) add_dependencies(kdcom psdk) - add_cd_file(TARGET kdcom DESTINATION reactos/system32 NO_CAB FOR all) diff --git a/drivers/base/nmidebug/CMakeLists.txt b/drivers/base/nmidebug/CMakeLists.txt index 3293f041905..f54fe194f75 100644 --- a/drivers/base/nmidebug/CMakeLists.txt +++ b/drivers/base/nmidebug/CMakeLists.txt @@ -1,7 +1,5 @@ add_library(nmidebug SHARED nmidebug.c nmidebug.rc) - set_module_type(nmidebug kernelmodedriver) add_importlibs(nmidebug ntoskrnl hal) - add_cd_file(TARGET nmidebug DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/base/null/CMakeLists.txt b/drivers/base/null/CMakeLists.txt index b3f3b2d2f5f..830eb4018bb 100644 --- a/drivers/base/null/CMakeLists.txt +++ b/drivers/base/null/CMakeLists.txt @@ -1,9 +1,6 @@ add_library(null SHARED null.c null.rc) - target_link_libraries(null ${PSEH_LIB}) - set_module_type(null kernelmodedriver) add_importlibs(null ntoskrnl hal) - add_cd_file(TARGET null DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/battery/battc/CMakeLists.txt b/drivers/battery/battc/CMakeLists.txt index a0bea76b4d4..e112069c575 100644 --- a/drivers/battery/battc/CMakeLists.txt +++ b/drivers/battery/battc/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-D_BATTERYCLASS_) - spec2def(battc.sys battc.spec ADD_IMPORTLIB) add_library(battc SHARED @@ -10,6 +9,4 @@ add_library(battc SHARED set_module_type(battc kernelmodedriver) add_importlibs(battc ntoskrnl hal) - add_cd_file(TARGET battc DESTINATION reactos/system32/drivers FOR all) - diff --git a/drivers/bus/acpi/busmgr/bus.c b/drivers/bus/acpi/busmgr/bus.c index ebdb3a62c1b..f562fd03cac 100644 --- a/drivers/bus/acpi/busmgr/bus.c +++ b/drivers/bus/acpi/busmgr/bus.c @@ -96,7 +96,7 @@ acpi_bus_data_handler ( ACPI_HANDLE handle, void *context) { - DPRINT1("acpi_bus_data_handler not implemented"); + DPRINT1("acpi_bus_data_handler not implemented\n"); /* TBD */ @@ -489,7 +489,7 @@ acpi_bus_generate_event ( { ULONG_PTR TypeData = 0; - DPRINT("acpi_bus_generate_event"); + DPRINT("acpi_bus_generate_event\n"); if (!device) return_VALUE(AE_BAD_PARAMETER); @@ -519,7 +519,7 @@ acpi_bus_receive_event ( //DECLARE_WAITQUEUE(wait, current); - DPRINT("acpi_bus_receive_event"); + DPRINT("acpi_bus_receive_event\n"); if (!event) return AE_BAD_PARAMETER; @@ -1635,7 +1635,7 @@ acpi_bus_init (void) int result = 0; ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_init"); + DPRINT1("acpi_bus_init\n"); KeInitializeDpc(&event_dpc, acpi_bus_generate_event_dpc, NULL); @@ -1714,7 +1714,7 @@ acpi_bus_exit (void) { ACPI_STATUS status = AE_OK; - DPRINT("acpi_bus_exit"); + DPRINT1("acpi_bus_exit\n"); status = AcpiRemoveNotifyHandler(ACPI_ROOT_OBJECT, ACPI_SYSTEM_NOTIFY, acpi_bus_notify); @@ -1748,7 +1748,7 @@ acpi_init (void) { int result = 0; - DPRINT("acpi_init"); + DPRINT("acpi_init\n"); DPRINT("Subsystem revision %08x\n",ACPI_CA_VERSION); @@ -1806,7 +1806,7 @@ acpi_init (void) void acpi_exit (void) { - DPRINT("acpi_exit"); + DPRINT("acpi_exit\n"); #ifdef CONFIG_PM pm_active = 0; diff --git a/drivers/bus/acpi/busmgr/power.c b/drivers/bus/acpi/busmgr/power.c index 2a21454ddae..c6ae058f3f8 100644 --- a/drivers/bus/acpi/busmgr/power.c +++ b/drivers/bus/acpi/busmgr/power.c @@ -659,7 +659,7 @@ acpi_power_init (void) { int result = 0; - DPRINT("acpi_power_init"); + DPRINT("acpi_power_init\n"); INIT_LIST_HEAD(&acpi_power_resource_list); diff --git a/drivers/bus/acpi/busmgr/system.c b/drivers/bus/acpi/busmgr/system.c index 41977ec1af3..859f4d17914 100644 --- a/drivers/bus/acpi/busmgr/system.c +++ b/drivers/bus/acpi/busmgr/system.c @@ -94,7 +94,7 @@ acpi_system_add ( case ACPI_STATE_S4: if (/*AcpiGbl_FACS->S4bios_f &&*/ 0 != AcpiGbl_FADT.SmiCommand) { - DPRINT(" S4bios"); + DPRINT(" S4bios\n"); system->states[i] = 1; } /* no break */ diff --git a/drivers/bus/acpi/cmbatt/CMakeLists.txt b/drivers/bus/acpi/cmbatt/CMakeLists.txt index ff112bbff05..bf13da15940 100644 --- a/drivers/bus/acpi/cmbatt/CMakeLists.txt +++ b/drivers/bus/acpi/cmbatt/CMakeLists.txt @@ -13,8 +13,5 @@ add_library(cmbatt SHARED set_module_type(cmbatt kernelmodedriver) add_importlibs(cmbatt ntoskrnl hal battc wmilib) - add_pch(cmbatt cmbatt.h SOURCE) - - add_cd_file(TARGET cmbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/bus/acpi/compbatt/CMakeLists.txt b/drivers/bus/acpi/compbatt/CMakeLists.txt index f85e15bccba..b394648dee4 100644 --- a/drivers/bus/acpi/compbatt/CMakeLists.txt +++ b/drivers/bus/acpi/compbatt/CMakeLists.txt @@ -12,7 +12,5 @@ add_library(compbatt SHARED set_module_type(compbatt kernelmodedriver) add_importlibs(compbatt ntoskrnl hal battc) - add_pch(compbatt compbatt.h SOURCE) - add_cd_file(TARGET compbatt DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/bus/pcix/CMakeLists.txt b/drivers/bus/pcix/CMakeLists.txt index fa4e3bddcbe..d17325c2ad1 100644 --- a/drivers/bus/pcix/CMakeLists.txt +++ b/drivers/bus/pcix/CMakeLists.txt @@ -42,8 +42,6 @@ add_library(pcix SHARED set_module_type(pcix kernelmodedriver) add_importlibs(pcix ntoskrnl hal) - add_pch(pcix pci.h SOURCE) add_dependencies(pcix pciclass) - add_cd_file(TARGET pcix DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/crypto/ksecdd/CMakeLists.txt b/drivers/crypto/ksecdd/CMakeLists.txt index 389f6a3db42..ae1bd441310 100644 --- a/drivers/crypto/ksecdd/CMakeLists.txt +++ b/drivers/crypto/ksecdd/CMakeLists.txt @@ -6,13 +6,13 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/cryptlib) list(APPEND SOURCE - ksecdd.c - dispatch.c - crypt.c - random.c - stubs.c - ksecdd.rc - ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def) + ksecdd.c + dispatch.c + crypt.c + random.c + stubs.c + ksecdd.rc + ${CMAKE_CURRENT_BINARY_DIR}/ksecdd.def) add_library(ksecdd SHARED ${SOURCE}) target_link_libraries(ksecdd cryptlib pseh) diff --git a/drivers/filesystems/cdfs/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt index 9bec1b4356e..d8aaaaeb9c0 100644 --- a/drivers/filesystems/cdfs/CMakeLists.txt +++ b/drivers/filesystems/cdfs/CMakeLists.txt @@ -18,10 +18,7 @@ list(APPEND SOURCE cdfs.h) add_library(cdfs SHARED ${SOURCE} cdfs.rc) - set_module_type(cdfs kernelmodedriver) add_importlibs(cdfs ntoskrnl hal) - add_pch(cdfs cdfs.h SOURCE) - add_cd_file(TARGET cdfs DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/filesystems/ext2/inc/ext2fsd.h b/drivers/filesystems/ext2/inc/ext2fsd.h index dcf35d996ef..42baa7ff638 100644 --- a/drivers/filesystems/ext2/inc/ext2fsd.h +++ b/drivers/filesystems/ext2/inc/ext2fsd.h @@ -60,7 +60,7 @@ typedef unsigned char BYTE; extern Ext2Data Ext2GlobalData; // try-finally simulation -#define try_return(S) { S; goto try_exit; } +#define try_return(...) { __VA_ARGS__; goto try_exit; } #define try_return1(S) { S; goto try_exit1; } #define try_return2(S) { S; goto try_exit2; } @@ -119,10 +119,10 @@ extern Ext2Data Ext2GlobalData; #ifdef EXT2_POOL_WITH_TAG #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) + ExAllocatePoolWithTag( PoolType, NumberOfBytes, '2txE' ) #else #define Ext2AllocatePool(PoolType,NumberOfBytes) \ - ExAllocatePool( PoolType, NumberOfBytes ) + ExAllocatePool( PoolType, NumberOfBytes ) #endif @@ -227,7 +227,7 @@ extern Ext2Data Ext2GlobalData; } #else - #define DebugTrace( TYPE, X, Y ) + #define DebugTrace( TYPE, X, Y ) #define DebugTraceState( STR, X1, X2, X3 ) #define AssertFCB( PtrFCB ) #define AssertVCB( PtrVCB ) diff --git a/drivers/filesystems/fastfat/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt index 40f0988ac27..087f9e3f625 100644 --- a/drivers/filesystems/fastfat/CMakeLists.txt +++ b/drivers/filesystems/fastfat/CMakeLists.txt @@ -24,11 +24,8 @@ list(APPEND SOURCE vfat.h) add_library(fastfat SHARED ${SOURCE} vfatfs.rc) - set_module_type(fastfat kernelmodedriver) target_link_libraries(fastfat ${PSEH_LIB}) add_importlibs(fastfat ntoskrnl hal) - add_pch(fastfat vfat.h SOURCE) - add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/filesystems/fastfat_new/CMakeLists.txt b/drivers/filesystems/fastfat_new/CMakeLists.txt index e25e5c853cc..eac55f29757 100644 --- a/drivers/filesystems/fastfat_new/CMakeLists.txt +++ b/drivers/filesystems/fastfat_new/CMakeLists.txt @@ -25,13 +25,7 @@ list(APPEND SOURCE fastfat.rc) add_library(fastfat_new SHARED ${SOURCE}) - set_module_type(fastfat_new kernelmodedriver) - -target_link_libraries(fastfat_new - ${PSEH_LIB} - fullfat) - +target_link_libraries(fastfat_new ${PSEH_LIB} fullfat) add_importlibs(fastfat_new ntoskrnl hal) - add_pch(fastfat_new fastfat.h) diff --git a/drivers/filesystems/msfs/CMakeLists.txt b/drivers/filesystems/msfs/CMakeLists.txt index 78782129a5e..350a2c61fba 100644 --- a/drivers/filesystems/msfs/CMakeLists.txt +++ b/drivers/filesystems/msfs/CMakeLists.txt @@ -8,10 +8,7 @@ list(APPEND SOURCE msfs.h) add_library(msfs SHARED ${SOURCE} msfs.rc) - set_module_type(msfs kernelmodedriver) add_importlibs(msfs ntoskrnl hal) - add_pch(msfs msfs.h SOURCE) - add_cd_file(TARGET msfs DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/filesystems/npfs/create.c b/drivers/filesystems/npfs/create.c index 7fde99d3e29..4be56c67c79 100644 --- a/drivers/filesystems/npfs/create.c +++ b/drivers/filesystems/npfs/create.c @@ -384,7 +384,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, IoStatus.Information = 0; FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite(&NpVcb->Lock, TRUE); + NpAcquireExclusiveVcb(); if (RelatedFileObject) { @@ -462,7 +462,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, goto Quickie; } - Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + Fcb = NpFindPrefix(&FileName, 1, &Prefix); } if (Prefix.Length) @@ -499,7 +499,7 @@ NpFsdCreate(IN PDEVICE_OBJECT DeviceObject, &DeferredList); Quickie: - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); NpCompleteDeferredIrps(&DeferredList); FsRtlExitFileSystem(); @@ -852,7 +852,7 @@ NpFsdCreateNamedPipe(IN PDEVICE_OBJECT DeviceObject, goto Quickie; } - Fcb = NpFindPrefix(&FileName, TRUE, &Prefix); + Fcb = NpFindPrefix(&FileName, 1, &Prefix); } if (Prefix.Length) diff --git a/drivers/filesystems/npfs/datasup.c b/drivers/filesystems/npfs/datasup.c index a464936ea72..2bdbf99f278 100644 --- a/drivers/filesystems/npfs/datasup.c +++ b/drivers/filesystems/npfs/datasup.c @@ -85,7 +85,7 @@ NpCompleteStalledWrites(IN PNP_DATA_QUEUE DataQueue, { DataQueueEntry->Irp = NULL; - Irp->IoStatus.Status = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = DataQueueEntry->DataSize; InsertTailList(List, &Irp->Tail.Overlay.ListEntry); @@ -146,9 +146,10 @@ NpRemoveDataQueueEntry(IN PNP_DATA_QUEUE DataQueue, Irp = QueueEntry->Irp; NpFreeClientSecurityContext(QueueEntry->ClientSecurityContext); - if (Irp && IoSetCancelRoutine(Irp, NULL)) + if (Irp && !IoSetCancelRoutine(Irp, NULL)) { Irp->Tail.Overlay.DriverContext[3] = NULL; + Irp = NULL; } ExFreePool(QueueEntry); @@ -216,7 +217,7 @@ NpCancelDataQueueIrp(IN PDEVICE_OBJECT DeviceObject, InitializeListHead(&DeferredList); - DataQueue = (PNP_DATA_QUEUE)Irp->Tail.Overlay.DriverContext[2]; + DataQueue = Irp->Tail.Overlay.DriverContext[2]; ClientSecurityContext = NULL; if (DeviceObject) diff --git a/drivers/filesystems/npfs/fileinfo.c b/drivers/filesystems/npfs/fileinfo.c index d6f2a103082..5a152c0bc83 100644 --- a/drivers/filesystems/npfs/fileinfo.c +++ b/drivers/filesystems/npfs/fileinfo.c @@ -27,13 +27,13 @@ NpSetBasicInfo(IN PNP_CCB Ccb, NTSTATUS NTAPI NpSetPipeInfo(IN PNP_FCB Fcb, - IN PNP_CCB Ccb, + IN PNP_CCB Ccb, IN PFILE_PIPE_INFORMATION Buffer, - IN ULONG NamedPipeEnd, + IN ULONG NamedPipeEnd, IN PLIST_ENTRY List) { NTSTATUS Status; - PNP_DATA_QUEUE ReadQueue, WriteQueue; + PNP_DATA_QUEUE ReadQueue, WriteQueue; PAGED_CODE(); if (Buffer->ReadMode == FILE_PIPE_MESSAGE_MODE && Fcb->NamedPipeType == FILE_PIPE_BYTE_STREAM_TYPE) @@ -103,7 +103,7 @@ NpCommonSetInformation(IN PDEVICE_OBJECT DeviceObject, Buffer = Irp->AssociatedIrp.SystemBuffer; if (InfoClass == FileBasicInformation) return NpSetBasicInfo(Ccb, Buffer); - + if (InfoClass != FilePipeInformation) return STATUS_INVALID_PARAMETER; return NpSetPipeInfo(Fcb, Ccb, Buffer, NamedPipeEnd, List); diff --git a/drivers/filesystems/npfs/fsctrl.c b/drivers/filesystems/npfs/fsctrl.c index 74826f828d7..5e1803b858c 100644 --- a/drivers/filesystems/npfs/fsctrl.c +++ b/drivers/filesystems/npfs/fsctrl.c @@ -369,7 +369,7 @@ NpPeek(IN PDEVICE_OBJECT DeviceObject, return STATUS_INVALID_PARAMETER; } - PeekBuffer = (PFILE_PIPE_PEEK_BUFFER)Irp->AssociatedIrp.SystemBuffer; + PeekBuffer = Irp->AssociatedIrp.SystemBuffer; if (NamedPipeEnd != FILE_PIPE_CLIENT_END) { if (NamedPipeEnd != FILE_PIPE_SERVER_END) @@ -714,7 +714,7 @@ NpWaitForNamedPipe(IN PDEVICE_OBJECT DeviceObject, //Status = NpTranslateAlias(&SourceString); if (!NT_SUCCESS(Status)) goto Quickie; - Fcb = NpFindPrefix(&SourceString, TRUE, &Prefix); + Fcb = NpFindPrefix(&SourceString, 1, &Prefix); Fcb = (PNP_FCB)((ULONG_PTR)Fcb & ~1); NodeTypeCode = Fcb ? Fcb->NodeType : 0; diff --git a/drivers/filesystems/npfs/npfs.h b/drivers/filesystems/npfs/npfs.h index e13adbf60d2..5d36d0cf3bf 100644 --- a/drivers/filesystems/npfs/npfs.h +++ b/drivers/filesystems/npfs/npfs.h @@ -50,18 +50,18 @@ // NpFs - npfs.sys - Client security context // NpFw - npfs.sys - Write block // NpFW - npfs.sys - Write block -#define NPFS_CCB_TAG 'NpFc' -#define NPFS_ROOT_DCB_CCB_TAG 'NpFC' -#define NPFS_DCB_TAG 'NpFD' -#define NPFS_FCB_TAG 'NpFf' -#define NPFS_GLOBAL_TAG 'NpFg' -#define NPFS_CLIENT_INFO_TAG 'NpFi' -#define NPFS_NAME_BLOCK_TAG 'NpFn' -#define NPFS_QUERY_TEMPLATE_TAG 'NpFq' -#define NPFS_DATA_ENTRY_TAG 'NpFr' -#define NPFS_CLIENT_SEC_CTX_TAG 'NpFs' -#define NPFS_WAIT_BLOCK_TAG 'NpFt' -#define NPFS_WRITE_BLOCK_TAG 'NpFw' +#define NPFS_CCB_TAG 'cFpN' +#define NPFS_ROOT_DCB_CCB_TAG 'CFpN' +#define NPFS_DCB_TAG 'DFpN' +#define NPFS_FCB_TAG 'fFpN' +#define NPFS_GLOBAL_TAG 'gFpN' +#define NPFS_CLIENT_INFO_TAG 'iFpN' +#define NPFS_NAME_BLOCK_TAG 'nFpN' +#define NPFS_QUERY_TEMPLATE_TAG 'qFpN' +#define NPFS_DATA_ENTRY_TAG 'rFpN' +#define NPFS_CLIENT_SEC_CTX_TAG 'sFpN' +#define NPFS_WAIT_BLOCK_TAG 'tFpN' +#define NPFS_WRITE_BLOCK_TAG 'wFpN' // // NPFS bugchecking support diff --git a/drivers/filesystems/npfs/secursup.c b/drivers/filesystems/npfs/secursup.c index 3934b49ce77..f2a99b432cf 100644 --- a/drivers/filesystems/npfs/secursup.c +++ b/drivers/filesystems/npfs/secursup.c @@ -127,7 +127,6 @@ NpGetClientSecurityContext(IN ULONG NamedPipeEnd, IN PETHREAD Thread, IN PSECURITY_CLIENT_CONTEXT *Context) { - PSECURITY_CLIENT_CONTEXT NewContext; NTSTATUS Status; PAGED_CODE(); diff --git a/drivers/filesystems/npfs/strucsup.c b/drivers/filesystems/npfs/strucsup.c index 73d0360f79d..29a8c851969 100644 --- a/drivers/filesystems/npfs/strucsup.c +++ b/drivers/filesystems/npfs/strucsup.c @@ -218,7 +218,6 @@ NpCreateFcb(IN PNP_DCB Dcb, PNP_FCB Fcb; BOOLEAN RootPipe; PWCHAR NameBuffer; - ULONG BufferOffset; USHORT Length, MaximumLength; PAGED_CODE(); @@ -233,6 +232,7 @@ NpCreateFcb(IN PNP_DCB Dcb, RootPipe = FALSE; if (PipeName->Buffer[0] != OBJ_NAME_PATH_SEPARATOR) { + Length += sizeof(OBJ_NAME_PATH_SEPARATOR); MaximumLength += sizeof(OBJ_NAME_PATH_SEPARATOR); RootPipe = TRUE; if (MaximumLength < sizeof(WCHAR)) @@ -262,15 +262,21 @@ NpCreateFcb(IN PNP_DCB Dcb, InsertTailList(&Dcb->FcbList, &Fcb->DcbEntry); - BufferOffset = 0; if (RootPipe) { NameBuffer[0] = OBJ_NAME_PATH_SEPARATOR; - BufferOffset = 1; + RtlCopyMemory(NameBuffer + 1, + PipeName->Buffer, + PipeName->Length); + } + else + { + RtlCopyMemory(NameBuffer, + PipeName->Buffer, + PipeName->Length); } - RtlCopyMemory(NameBuffer + BufferOffset, PipeName->Buffer, Length); - NameBuffer[BufferOffset + (Length / sizeof(WCHAR))] = UNICODE_NULL; + NameBuffer[Length / sizeof(WCHAR)] = UNICODE_NULL; Fcb->FullName.Length = Length; Fcb->FullName.MaximumLength = MaximumLength; diff --git a/drivers/filesystems/npfs/volinfo.c b/drivers/filesystems/npfs/volinfo.c index ea0d67442b8..5a6f0a0b9d3 100644 --- a/drivers/filesystems/npfs/volinfo.c +++ b/drivers/filesystems/npfs/volinfo.c @@ -191,11 +191,11 @@ NpFsdQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, TRACE("Entered\n"); FsRtlEnterFileSystem(); - ExAcquireResourceSharedLite(&NpVcb->Lock, TRUE); + NpAcquireSharedVcb(); Status = NpCommonQueryVolumeInformation(DeviceObject, Irp); - ExReleaseResourceLite(&NpVcb->Lock); + NpReleaseVcb(); FsRtlExitFileSystem(); if (Status != STATUS_PENDING) diff --git a/drivers/filesystems/npfs/waitsup.c b/drivers/filesystems/npfs/waitsup.c index 42e15e861fc..31c9808dcab 100644 --- a/drivers/filesystems/npfs/waitsup.c +++ b/drivers/filesystems/npfs/waitsup.c @@ -99,6 +99,22 @@ NpInitializeWaitQueue(IN PNP_WAIT_QUEUE WaitQueue) KeInitializeSpinLock(&WaitQueue->WaitLock); } +static +BOOLEAN +NpEqualUnicodeString(IN PCUNICODE_STRING String1, + IN PCUNICODE_STRING String2) +{ + SIZE_T EqualLength; + + if (String1->Length != String2->Length) + return FALSE; + + EqualLength = RtlCompareMemory(String1->Buffer, + String2->Buffer, + String1->Length); + return EqualLength == String1->Length; +} + NTSTATUS NTAPI NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue, @@ -156,7 +172,8 @@ NpCancelWaiter(IN PNP_WAIT_QUEUE WaitQueue, PipeName.MaximumLength = PipeName.Length; } - if (RtlEqualUnicodeString(&WaitName, &PipeName, FALSE)) + /* Can't use RtlEqualUnicodeString with a spinlock held */ + if (NpEqualUnicodeString(&WaitName, &PipeName)) { /* Found a matching wait. Cancel it */ RemoveEntryList(&WaitIrp->Tail.Overlay.ListEntry); diff --git a/drivers/filesystems/npfs/writesup.c b/drivers/filesystems/npfs/writesup.c index fb2d3d02a53..3f03745bd7e 100644 --- a/drivers/filesystems/npfs/writesup.c +++ b/drivers/filesystems/npfs/writesup.c @@ -15,7 +15,7 @@ /* FUNCTIONS ******************************************************************/ -NTSTATUS +NTSTATUS NTAPI NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, IN ULONG Mode, @@ -57,9 +57,9 @@ NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, { DataSize = DataEntry->DataSize; - IoStack = IoGetCurrentIrpStackLocation( DataEntry->Irp); + IoStack = IoGetCurrentIrpStackLocation(DataEntry->Irp); - if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && + if (IoStack->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL && IoStack->Parameters.FileSystemControl.FsControlCode == FSCTL_PIPE_INTERNAL_READ_OVFLOW && (DataSize < OutBufferSize || MoreProcessing)) { @@ -76,7 +76,7 @@ NpWriteDataQueue(IN PNP_DATA_QUEUE WriteQueue, { DataEntry->Irp->Overlay.AllocationSize.QuadPart = 0; } - + BufferSize = *BytesNotWritten; if (BufferSize >= DataSize) BufferSize = DataSize; diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt index ed4875ff2d4..707f99d3023 100644 --- a/drivers/filesystems/ntfs/CMakeLists.txt +++ b/drivers/filesystems/ntfs/CMakeLists.txt @@ -18,10 +18,7 @@ list(APPEND SOURCE ntfs.h) add_library(ntfs SHARED ${SOURCE} ntfs.rc) - set_module_type(ntfs kernelmodedriver) add_importlibs(ntfs ntoskrnl hal) - add_pch(ntfs ntfs.h SOURCE) - add_cd_file(TARGET ntfs DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/filesystems/ntfs/create.c b/drivers/filesystems/ntfs/create.c index 858b48998f8..4ebb9d48b15 100644 --- a/drivers/filesystems/ntfs/create.c +++ b/drivers/filesystems/ntfs/create.c @@ -243,6 +243,28 @@ NtfsCreateFile(PDEVICE_OBJECT DeviceObject, NtfsCloseFile(DeviceExt, FileObject); return STATUS_NOT_A_DIRECTORY; } + + /* HUGLY HACK: remain RO so far... */ + if (RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) + { + DPRINT1("Denying write request on NTFS volume\n"); + NtfsCloseFile(DeviceExt, FileObject); + return STATUS_ACCESS_DENIED; + } + } + else + { + /* HUGLY HACK: remain RO so far... */ + if (RequestedDisposition == FILE_CREATE || + RequestedDisposition == FILE_OPEN_IF || + RequestedDisposition == FILE_OVERWRITE_IF || + RequestedDisposition == FILE_SUPERSEDE) + { + DPRINT1("Denying write request on NTFS volume\n"); + return STATUS_ACCESS_DENIED; + } } /* diff --git a/drivers/filesystems/ntfs/dirctl.c b/drivers/filesystems/ntfs/dirctl.c index 7024e0012f7..28c18779d0f 100644 --- a/drivers/filesystems/ntfs/dirctl.c +++ b/drivers/filesystems/ntfs/dirctl.c @@ -120,401 +120,210 @@ CdfsGetEntryName(PDEVICE_EXTENSION DeviceExt, return(STATUS_SUCCESS); } - - -static NTSTATUS -CdfsFindFile(PDEVICE_EXTENSION DeviceExt, - PFCB Fcb, - PFCB Parent, - PWSTR FileToFind, - PULONG pDirIndex, - PULONG pDirIndex2) -/* - * FUNCTION: Find a file - */ -{ - WCHAR name[256]; - WCHAR TempStr[2]; - PVOID Block; - NTSTATUS Status; - ULONG len; - ULONG DirIndex; - ULONG Offset; - ULONG Read; - BOOLEAN IsRoot; - PVOID Context = NULL; - ULONG DirSize; - PUCHAR Ptr; - PDIR_RECORD Record; - LARGE_INTEGER StreamOffset; - - DPRINT("FindFile(Parent %x, FileToFind '%S', DirIndex: %d)\n", - Parent, FileToFind, pDirIndex ? *pDirIndex : 0); - DPRINT("FindFile: old Pathname %x, old Objectname %x)\n", - Fcb->PathName, Fcb->ObjectName); - - IsRoot = FALSE; - DirIndex = 0; - if (wcslen (FileToFind) == 0) - { - CHECKPOINT; - TempStr[0] = (WCHAR) '.'; - TempStr[1] = 0; - FileToFind = (PWSTR)&TempStr; - } - - if (Parent) - { - if (Parent->Entry.ExtentLocationL == DeviceExt->CdInfo.RootStart) - { - IsRoot = TRUE; - } - } - else - { - IsRoot = TRUE; - } - - if (IsRoot == TRUE) - { - StreamOffset.QuadPart = (LONGLONG)DeviceExt->CdInfo.RootStart * (LONGLONG)BLOCKSIZE; - DirSize = DeviceExt->CdInfo.RootSize; - - - if (FileToFind[0] == 0 || (FileToFind[0] == '\\' && FileToFind[1] == 0) - || (FileToFind[0] == '.' && FileToFind[1] == 0)) - { - /* it's root : complete essentials fields then return ok */ - RtlZeroMemory(Fcb, sizeof(FCB)); - - Fcb->PathName[0]='\\'; - Fcb->ObjectName = &Fcb->PathName[1]; - Fcb->Entry.ExtentLocationL = DeviceExt->CdInfo.RootStart; - Fcb->Entry.DataLengthL = DeviceExt->CdInfo.RootSize; - Fcb->Entry.FileFlags = 0x02; //FILE_ATTRIBUTE_DIRECTORY; - - if (pDirIndex) - *pDirIndex = 0; - if (pDirIndex2) - *pDirIndex2 = 0; - DPRINT("CdfsFindFile: new Pathname %S, new Objectname %S)\n",Fcb->PathName, Fcb->ObjectName); - return (STATUS_SUCCESS); - } - } - else - { - StreamOffset.QuadPart = (LONGLONG)Parent->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE; - DirSize = Parent->Entry.DataLengthL; - } - - DPRINT("StreamOffset %I64u DirSize %lu\n", StreamOffset.QuadPart, DirSize); - - if (pDirIndex && (*pDirIndex)) - DirIndex = *pDirIndex; - - if(!CcMapData(DeviceExt->StreamFileObject, &StreamOffset, - BLOCKSIZE, TRUE, &Context, &Block)) - { - DPRINT("CcMapData() failed\n"); - return(STATUS_UNSUCCESSFUL); - } - - Ptr = (PUCHAR)Block; - while(TRUE) - { - Record = (PDIR_RECORD)Ptr; - if (Record->RecordLength == 0) - { - DPRINT1("Stopped!\n"); - break; - } - - DPRINT("RecordLength %u ExtAttrRecordLength %u NameLength %u\n", - Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); - - Status = CdfsGetEntryName(DeviceExt, &Context, &Block, &StreamOffset, - DirSize, (PVOID*)&Ptr, name, &DirIndex, pDirIndex2); - if (Status == STATUS_NO_MORE_ENTRIES) - { - break; - } - else if (Status == STATUS_UNSUCCESSFUL) - { - /* Note: the directory cache has already been unpinned */ - return(Status); - } - - DPRINT("Name '%S'\n", name); - - if (wstrcmpjoki(name, FileToFind)) /* || wstrcmpjoki (name2, FileToFind)) */ - { - if (Parent && Parent->PathName) - { - len = wcslen(Parent->PathName); - memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR)); - Fcb->ObjectName=&Fcb->PathName[len]; - if (len != 1 || Fcb->PathName[0] != '\\') - { - Fcb->ObjectName[0] = '\\'; - Fcb->ObjectName = &Fcb->ObjectName[1]; - } - } - else - { - Fcb->ObjectName=Fcb->PathName; - Fcb->ObjectName[0]='\\'; - Fcb->ObjectName=&Fcb->ObjectName[1]; - } - - DPRINT("PathName '%S' ObjectName '%S'\n", Fcb->PathName, Fcb->ObjectName); - - memcpy(&Fcb->Entry, Ptr, sizeof(DIR_RECORD)); - wcsncpy(Fcb->ObjectName, name, MAX_PATH); - if (pDirIndex) - *pDirIndex = DirIndex; - - DPRINT("FindFile: new Pathname %S, new Objectname %S, DirIndex %d\n", - Fcb->PathName, Fcb->ObjectName, DirIndex); - - CcUnpinData(Context); - - return(STATUS_SUCCESS); - } - - - Ptr = Ptr + Record->RecordLength; - DirIndex++; - - if (((ULONG)Ptr - (ULONG)Block) >= DirSize) - { - DPRINT("Stopped!\n"); - break; - } - } - - CcUnpinData(Context); - - if (pDirIndex) - *pDirIndex = DirIndex; - - return(STATUS_UNSUCCESSFUL); -} - - -static NTSTATUS -CdfsGetNameInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_NAMES_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetNameInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - -// Info->FileIndex=; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetFullDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetFullDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - -// Info->FileIndex=; - Info->EaSize = 0; - - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetBothDirectoryInformation(PFCB Fcb, - PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION Info, - ULONG BufferLength) -{ - ULONG Length; - - DPRINT("CdfsGetBothDirectoryInformation() called\n"); - - Length = wcslen(Fcb->ObjectName) * sizeof(WCHAR); - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + Length) > BufferLength) - return(STATUS_BUFFER_OVERFLOW); - - Info->FileNameLength = Length; - Info->NextEntryOffset = - ROUND_UP(sizeof(FILE_BOTH_DIRECTORY_INFORMATION) + Length, 4); - memcpy(Info->FileName, Fcb->ObjectName, Length); - - /* Convert file times */ - CdfsDateTimeToFileTime(Fcb, - &Info->CreationTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastAccessTime); - CdfsDateTimeToFileTime(Fcb, - &Info->LastWriteTime); - CdfsDateTimeToFileTime(Fcb, - &Info->ChangeTime); - - /* Convert file flags */ - CdfsFileFlagsToAttributes(Fcb, - &Info->FileAttributes); - - Info->EndOfFile.QuadPart = Fcb->Entry.DataLengthL; - - /* Make AllocSize a rounded up multiple of the sector size */ - Info->AllocationSize.QuadPart = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE); - -// Info->FileIndex=; - Info->EaSize = 0; - - if (DeviceExt->CdInfo.JolietLevel == 0) - { - /* Standard ISO-9660 format */ - Info->ShortNameLength = Length; - memcpy(Info->ShortName, Fcb->ObjectName, Length); - } - else - { - /* Joliet extension */ - - /* FIXME: Copy or create a short file name */ - - Info->ShortName[0] = 0; - Info->ShortNameLength = 0; - } - - return(STATUS_SUCCESS); -} #endif +static NTSTATUS +NtfsGetNameInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_NAMES_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetNameInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength * sizeof (WCHAR); + if ((sizeof(FILE_NAMES_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_NAMES_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + return(STATUS_SUCCESS); +} + + +static NTSTATUS +NtfsGetDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_DIRECTORY_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength * sizeof (WCHAR); + if ((sizeof(FILE_DIRECTORY_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; + +// Info->FileIndex=; + + return STATUS_SUCCESS; +} + + +static NTSTATUS +NtfsGetFullDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_FULL_DIRECTORY_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetFullDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength * sizeof (WCHAR); + if ((sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_FULL_DIRECTORY_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; + +// Info->FileIndex=; + Info->EaSize = 0; + + return STATUS_SUCCESS; +} + + +static NTSTATUS +NtfsGetBothDirectoryInformation(PDEVICE_EXTENSION DeviceExt, + PFILE_RECORD_HEADER FileRecord, + PNTFS_ATTR_CONTEXT DataContext, + PFILE_BOTH_DIR_INFORMATION Info, + ULONG BufferLength) +{ + ULONG Length; + PFILENAME_ATTRIBUTE FileName; + + DPRINT("NtfsGetBothDirectoryInformation() called\n"); + + FileName = GetFileNameFromRecord(FileRecord); + ASSERT(FileName != NULL); + + Length = FileName->NameLength * sizeof (WCHAR); + if ((sizeof(FILE_BOTH_DIR_INFORMATION) + Length) > BufferLength) + return(STATUS_BUFFER_OVERFLOW); + + Info->FileNameLength = Length; + Info->NextEntryOffset = + ROUND_UP(sizeof(FILE_BOTH_DIR_INFORMATION) + Length, sizeof(ULONG)); + RtlCopyMemory(Info->FileName, FileName->Name, Length); + + /* Convert file times */ + NtfsDateTimeToFileTime(FileName->CreationTime, &Info->CreationTime); + NtfsDateTimeToFileTime(FileName->LastAccessTime, &Info->LastAccessTime); + NtfsDateTimeToFileTime(FileName->LastWriteTime, &Info->LastWriteTime); + NtfsDateTimeToFileTime(FileName->ChangeTime, &Info->ChangeTime); + + /* Convert file flags */ + NtfsFileFlagsToAttributes(FileName->FileAttributes, &Info->FileAttributes); + + Info->EndOfFile.QuadPart = FileName->DataSize; + Info->AllocationSize.QuadPart = FileName->AllocatedSize; + +// Info->FileIndex=; + Info->EaSize = 0; + + Info->ShortName[0] = 0; + Info->ShortNameLength = 0; + + return STATUS_SUCCESS; +} + + NTSTATUS NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) { PIRP Irp; - //PDEVICE_OBJECT DeviceObject; - //PDEVICE_EXTENSION DeviceExtension; - //LONG BufferLength = 0; + PDEVICE_OBJECT DeviceObject; + PDEVICE_EXTENSION DeviceExtension; + LONG BufferLength = 0; PUNICODE_STRING SearchPattern = NULL; - //FILE_INFORMATION_CLASS FileInformationClass; + FILE_INFORMATION_CLASS FileInformationClass; ULONG FileIndex = 0; PUCHAR Buffer = NULL; PFILE_NAMES_INFORMATION Buffer0 = NULL; - //PNTFS_FCB Fcb; + PNTFS_FCB Fcb; PNTFS_CCB Ccb; -// FCB TempFcb; BOOLEAN First = FALSE; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; - //NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status = STATUS_SUCCESS; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_CONTEXT DataContext; + ULONGLONG MFTRecord; + UNICODE_STRING Pattern; DPRINT1("NtfsQueryDirectory() called\n"); ASSERT(IrpContext); Irp = IrpContext->Irp; -// DeviceObject = IrpContext->DeviceObject; + DeviceObject = IrpContext->DeviceObject; -// DeviceExtension = DeviceObject->DeviceExtension; + DeviceExtension = DeviceObject->DeviceExtension; Stack = IoGetCurrentIrpStackLocation(Irp); FileObject = Stack->FileObject; Ccb = (PNTFS_CCB)FileObject->FsContext2; -// Fcb = (PNTFS_FCB)FileObject->FsContext; + Fcb = (PNTFS_FCB)FileObject->FsContext; /* Obtain the callers parameters */ - //BufferLength = Stack->Parameters.QueryDirectory.Length; + BufferLength = Stack->Parameters.QueryDirectory.Length; SearchPattern = Stack->Parameters.QueryDirectory.FileName; - //FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; + FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; - if (SearchPattern != NULL) { if (!Ccb->DirectorySearchPattern) @@ -546,7 +355,10 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) Ccb->DirectorySearchPattern[1] = 0; } - DPRINT("Search pattern '%S'\n", Ccb->DirectorySearchPattern); + RtlInitUnicodeString(&Pattern, Ccb->DirectorySearchPattern); + + DPRINT1("Search pattern '%S'\n", Ccb->DirectorySearchPattern); + DPRINT1("In: '%S'\n", Fcb->PathName); /* Determine directory index */ if (Stack->Flags & SL_INDEX_SPECIFIED) @@ -570,93 +382,96 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern); -#if 0 - TempFcb.ObjectName = TempFcb.PathName; - while (Status == STATUS_SUCCESS && BufferLength > 0) + while (Status == STATUS_SUCCESS && BufferLength > 0) { - Status = CdfsFindFile(DeviceExtension, - &TempFcb, - Fcb, - Ccb->DirectorySearchPattern, - &Ccb->Entry, - NULL); - DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); + Status = NtfsFindFileAt(DeviceExtension, + &Pattern, + &Ccb->Entry, + &FileRecord, + &DataContext, + &MFTRecord, + Fcb->MFTIndex); + //DPRINT("Found %S, Status=%x, entry %x\n", TempFcb.ObjectName, Status, Ccb->Entry); - if (NT_SUCCESS(Status)) - { - switch (FileInformationClass) - { - case FileNameInformation: - Status = CdfsGetNameInformation(&TempFcb, - DeviceExtension, - (PFILE_NAMES_INFORMATION)Buffer, - BufferLength); - break; + if (NT_SUCCESS(Status)) + { + switch (FileInformationClass) + { + case FileNameInformation: + Status = NtfsGetNameInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_NAMES_INFORMATION)Buffer, + BufferLength); + break; - case FileDirectoryInformation: - Status = CdfsGetDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; + case FileDirectoryInformation: + Status = NtfsGetDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_DIRECTORY_INFORMATION)Buffer, + BufferLength); + break; - case FileFullDirectoryInformation: - Status = CdfsGetFullDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; + case FileFullDirectoryInformation: + Status = NtfsGetFullDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_FULL_DIRECTORY_INFORMATION)Buffer, + BufferLength); + break; - case FileBothDirectoryInformation: - Status = NtfsGetBothDirectoryInformation(&TempFcb, - DeviceExtension, - (PFILE_BOTH_DIRECTORY_INFORMATION)Buffer, - BufferLength); - break; + case FileBothDirectoryInformation: + Status = NtfsGetBothDirectoryInformation(DeviceExtension, + FileRecord, + DataContext, + (PFILE_BOTH_DIR_INFORMATION)Buffer, + BufferLength); + break; - default: - Status = STATUS_INVALID_INFO_CLASS; - } + default: + Status = STATUS_INVALID_INFO_CLASS; + } - if (Status == STATUS_BUFFER_OVERFLOW) - { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } - break; - } - } - else - { - if (Buffer0) - { - Buffer0->NextEntryOffset = 0; - } + if (Status == STATUS_BUFFER_OVERFLOW) + { + if (Buffer0) + { + Buffer0->NextEntryOffset = 0; + } + break; + } + } + else + { + if (Buffer0) + { + Buffer0->NextEntryOffset = 0; + } - if (First) - { - Status = STATUS_NO_SUCH_FILE; - } - else - { - Status = STATUS_NO_MORE_FILES; - } - break; - } + if (First) + { + Status = STATUS_NO_SUCH_FILE; + } + else + { + Status = STATUS_NO_MORE_FILES; + } + break; + } - Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; - Buffer0->FileIndex = FileIndex++; - Ccb->Entry++; + Buffer0 = (PFILE_NAMES_INFORMATION)Buffer; + Buffer0->FileIndex = FileIndex++; + Ccb->Entry++; - if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) - { - break; - } - BufferLength -= Buffer0->NextEntryOffset; - Buffer += Buffer0->NextEntryOffset; + if (Stack->Flags & SL_RETURN_SINGLE_ENTRY) + { + break; + } + BufferLength -= Buffer0->NextEntryOffset; + Buffer += Buffer0->NextEntryOffset; + ExFreePoolWithTag(FileRecord, TAG_NTFS); } -#endif if (Buffer0) { @@ -665,11 +480,10 @@ NtfsQueryDirectory(PNTFS_IRP_CONTEXT IrpContext) if (FileIndex > 0) { - //Status = STATUS_SUCCESS; + Status = STATUS_SUCCESS; } -// return Status; - return STATUS_NO_MORE_FILES; + return Status; } diff --git a/drivers/filesystems/ntfs/fsctl.c b/drivers/filesystems/ntfs/fsctl.c index 8d149bfe99e..b57e12a8d32 100644 --- a/drivers/filesystems/ntfs/fsctl.c +++ b/drivers/filesystems/ntfs/fsctl.c @@ -34,8 +34,6 @@ #define NDEBUG #include -UNICODE_STRING EmptyName = RTL_CONSTANT_STRING(L""); - /* FUNCTIONS ****************************************************************/ /* @@ -274,7 +272,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, return Status; } - Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, &EmptyName, &DeviceExt->MFTContext); + Status = FindAttribute(DeviceExt, DeviceExt->MasterFileTable, AttributeData, L"", 0, &DeviceExt->MFTContext); if (!NT_SUCCESS(Status)) { DPRINT1("Can't find data attribute for Master File Table.\n"); @@ -312,7 +310,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, NtfsDumpFileAttributes(VolumeRecord); /* Get volume name */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, &EmptyName, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeName, L"", 0, &AttrCtxt); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { @@ -348,7 +346,7 @@ NtfsGetVolumeData(PDEVICE_OBJECT DeviceObject, DeviceExt->VolumeFcb = VolumeFcb; /* Get volume information */ - Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, &EmptyName, &AttrCtxt); + Status = FindAttribute(DeviceExt, VolumeRecord, AttributeVolumeInformation, L"", 0, &AttrCtxt); if (NT_SUCCESS(Status) && AttrCtxt->Record.Resident.ValueLength != 0) { diff --git a/drivers/filesystems/ntfs/mft.c b/drivers/filesystems/ntfs/mft.c index c6add131a11..864547ff3ae 100644 --- a/drivers/filesystems/ntfs/mft.c +++ b/drivers/filesystems/ntfs/mft.c @@ -31,8 +31,6 @@ #define NDEBUG #include -UNICODE_STRING IndexOfFileNames = RTL_CONSTANT_STRING(L"$I30"); - /* FUNCTIONS ****************************************************************/ PNTFS_ATTR_CONTEXT @@ -84,10 +82,10 @@ FindAttributeHelper(PDEVICE_EXTENSION Vcb, PNTFS_ATTR_RECORD AttrRecord, PNTFS_ATTR_RECORD AttrRecordEnd, ULONG Type, - const WCHAR *Name, + PCWSTR Name, ULONG NameLength) { - DPRINT("FindAttributeHelper(%p, %p, %p, 0x%x, %s, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); + DPRINT1("FindAttributeHelper(%p, %p, %p, 0x%x, %S, %u)\n", Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); while (AttrRecord < AttrRecordEnd) { @@ -143,7 +141,6 @@ FindAttributeHelper(PDEVICE_EXTENSION Vcb, if (AttrRecord->Type == Type) { - DPRINT("%d, %d\n", AttrRecord->NameLength, NameLength); if (AttrRecord->NameLength == NameLength) { PWCHAR AttrName; @@ -176,18 +173,19 @@ NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, ULONG Type, - PUNICODE_STRING Name, + PCWSTR Name, + ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx) { PNTFS_ATTR_RECORD AttrRecord; PNTFS_ATTR_RECORD AttrRecordEnd; - DPRINT("NtfsFindAttribute(%p, %p, %u, %s)\n", Vcb, MftRecord, Type, Name); + DPRINT1("FindAttribute(%p, %p, %u, %S, %u, %p)\n", Vcb, MftRecord, Type, Name, NameLength, AttrCtx); AttrRecord = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + MftRecord->AttributeOffset); AttrRecordEnd = (PNTFS_ATTR_RECORD)((PCHAR)MftRecord + Vcb->NtfsInfo.BytesPerFileRecord); - *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name->Buffer, Name->Length); + *AttrCtx = FindAttributeHelper(Vcb, AttrRecord, AttrRecordEnd, Type, Name, NameLength); if (*AttrCtx == NULL) { return STATUS_OBJECT_NAME_NOT_FOUND; @@ -399,6 +397,8 @@ ReadFileRecord(PDEVICE_EXTENSION Vcb, { ULONGLONG BytesRead; + DPRINT1("ReadFileRecord(%p, %I64x, %p)\n", Vcb, index, file); + BytesRead = ReadAttribute(Vcb, Vcb->MFTContext, index * Vcb->NtfsInfo.BytesPerFileRecord, (PCHAR)file, Vcb->NtfsInfo.BytesPerFileRecord); if (BytesRead != Vcb->NtfsInfo.BytesPerFileRecord) { @@ -462,7 +462,8 @@ ReadLCN(PDEVICE_EXTENSION Vcb, BOOLEAN CompareFileName(PUNICODE_STRING FileName, - PINDEX_ENTRY_ATTRIBUTE IndexEntry) + PINDEX_ENTRY_ATTRIBUTE IndexEntry, + BOOLEAN DirSearch) { UNICODE_STRING EntryName; @@ -470,12 +471,24 @@ CompareFileName(PUNICODE_STRING FileName, EntryName.Length = EntryName.MaximumLength = IndexEntry->FileName.NameLength; - return (RtlCompareUnicodeString(FileName, &EntryName, !!(IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + if (DirSearch) + { + return FsRtlIsNameInExpression(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX), NULL); + } + else + { + return (RtlCompareUnicodeString(FileName, &EntryName, (IndexEntry->FileName.NameType != NTFS_FILE_NAME_POSIX)) == TRUE); + } } NTSTATUS -NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING FileName, ULONGLONG *OutMFTIndex) +NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, + ULONGLONG MFTIndex, + PUNICODE_STRING FileName, + PULONG FirstEntry, + BOOLEAN DirSearch, + ULONGLONG *OutMFTIndex) { PFILE_RECORD_HEADER MftRecord; //ULONG Magic; @@ -483,6 +496,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil PNTFS_ATTR_CONTEXT IndexBitmapCtx; PNTFS_ATTR_CONTEXT IndexAllocationCtx; PINDEX_ROOT_ATTRIBUTE IndexRoot; + PINDEX_BUFFER IndexBuffer; ULONGLONG BitmapDataSize; ULONGLONG IndexAllocationSize; PCHAR BitmapData; @@ -491,6 +505,9 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil ULONG RecordOffset; ULONG IndexBlockSize; NTSTATUS Status; + ULONG CurrentEntry = 0; + + DPRINT1("NtfsFindMftRecord(%p, %I64d, %wZ, %p, %u, %p)\n", Vcb, MFTIndex, FileName, FirstEntry, DirSearch, OutMFTIndex); MftRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, @@ -504,7 +521,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil { //Magic = MftRecord->Magic; - Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, &IndexOfFileNames, &IndexRootCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexRoot, L"$I30", 4, &IndexRootCtx); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(MftRecord, TAG_NTFS); @@ -530,14 +547,19 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry)) + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && + CurrentEntry >= *FirstEntry && + CompareFileName(FileName, IndexEntry, DirSearch)) { - *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + *OutMFTIndex = (IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK); + *FirstEntry = CurrentEntry; ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); return STATUS_SUCCESS; } - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); + + ++CurrentEntry; + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } if (IndexRoot->Header.Flags & INDEX_ROOT_LARGE) @@ -546,10 +568,10 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil IndexBlockSize = IndexRoot->SizeOfEntry; - Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, &IndexOfFileNames, &IndexBitmapCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeBitmap, L"$I30", 4, &IndexBitmapCtx); if (!NT_SUCCESS(Status)) { - DPRINT("Corrupted filesystem!\n"); + DPRINT1("Corrupted filesystem!\n"); ExFreePoolWithTag(MftRecord, TAG_NTFS); return Status; } @@ -569,7 +591,7 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil ReadAttribute(Vcb, IndexBitmapCtx, 0, BitmapData, (ULONG)BitmapDataSize); ReleaseAttributeContext(IndexBitmapCtx); - Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, &IndexOfFileNames, &IndexAllocationCtx); + Status = FindAttribute(Vcb, MftRecord, AttributeIndexAllocation, L"$I30", 4, &IndexAllocationCtx); if (!NT_SUCCESS(Status)) { DPRINT("Corrupted filesystem!\n"); @@ -601,28 +623,36 @@ NtfsFindMftRecord(PDEVICE_EXTENSION Vcb, ULONGLONG MFTIndex, PUNICODE_STRING Fil ReadAttribute(Vcb, IndexAllocationCtx, RecordOffset, IndexRecord, IndexBlockSize); - if (!FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs)) + if (!NT_SUCCESS(FixupUpdateSequenceArray(Vcb, &((PFILE_RECORD_HEADER)IndexRecord)->Ntfs))) { break; } - /* FIXME */ - IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + 0x18 + *(USHORT *)(IndexRecord + 0x18)); - IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(IndexRecord + IndexBlockSize); + IndexBuffer = (PINDEX_BUFFER)IndexRecord; + ASSERT(IndexBuffer->Ntfs.Type == 'XDNI'); + ASSERT(IndexBuffer->Header.AllocatedSize + 0x18 == IndexBlockSize); + IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.FirstEntryOffset); + IndexEntryEnd = (PINDEX_ENTRY_ATTRIBUTE)(&IndexBuffer->Header + IndexBuffer->Header.TotalSizeOfEntries); + //ASSERT(IndexEntryEnd <= (PINDEX_ENTRY_ATTRIBUTE)((ULONG_PTR)IndexBuffer + IndexBlockSize)); FIXME: Why doesn't it work? while (IndexEntry < IndexEntryEnd && !(IndexEntry->Flags & NTFS_INDEX_ENTRY_END)) { - if (CompareFileName(FileName, IndexEntry)) + if ((IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK) > 0x10 && + CurrentEntry >= *FirstEntry && + CompareFileName(FileName, IndexEntry, DirSearch)) { DPRINT("File found\n"); - *OutMFTIndex = IndexEntry->Data.Directory.IndexedFile; + *OutMFTIndex = (IndexEntry->Data.Directory.IndexedFile & NTFS_MFT_MASK); + *FirstEntry = CurrentEntry; ExFreePoolWithTag(BitmapData, TAG_NTFS); ExFreePoolWithTag(IndexRecord, TAG_NTFS); ExFreePoolWithTag(MftRecord, TAG_NTFS); ReleaseAttributeContext(IndexAllocationCtx); return STATUS_SUCCESS; } + + ++CurrentEntry; IndexEntry = (PINDEX_ENTRY_ATTRIBUTE)((PCHAR)IndexEntry + IndexEntry->Length); } @@ -654,6 +684,7 @@ NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, { UNICODE_STRING Current, Remaining; NTSTATUS Status; + ULONG FirstEntry = 0; DPRINT1("NtfsLookupFileAt(%p, %wZ, %p, %p, %I64x)\n", Vcb, PathName, FileRecord, DataContext, CurrentMFTIndex); @@ -661,38 +692,48 @@ NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, while (Current.Length != 0) { - DPRINT1("Lookup: %wZ\n", &Current); + DPRINT1("Current: %wZ\n", &Current); - Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &CurrentMFTIndex); + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, &Current, &FirstEntry, FALSE, &CurrentMFTIndex); if (!NT_SUCCESS(Status)) { return Status; } - FsRtlDissectName(*PathName, &Current, &Remaining); + if (Remaining.Length == 0) + return STATUS_OBJECT_PATH_NOT_FOUND; + + FsRtlDissectName(Current, &Current, &Remaining); } *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); if (*FileRecord == NULL) { - DPRINT("NtfsLookupFile: Can't allocate MFT record\n"); + DPRINT("NtfsLookupFileAt: Can't allocate MFT record\n"); return STATUS_INSUFFICIENT_RESOURCES; } Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); if (!NT_SUCCESS(Status)) { - DPRINT("NtfsLookupFile: Can't read MFT record\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); + DPRINT("NtfsLookupFileAt: Can't read MFT record\n"); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); return Status; } - Status = FindAttribute(Vcb, *FileRecord, AttributeData, PathName, DataContext); - if (!NT_SUCCESS(Status)) + if (!((*FileRecord)->Flags & FRH_DIRECTORY)) { - DPRINT("NtfsLookupFile: Can't find data attribute\n"); - ExFreePoolWithTag(FileRecord, TAG_NTFS); - return Status; + Status = FindAttribute(Vcb, *FileRecord, AttributeData, L"", 0, DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsLookupFileAt: Can't find data attribute\n"); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); + return Status; + } + } + else + { + *DataContext = NULL; } *MFTIndex = CurrentMFTIndex; @@ -709,4 +750,59 @@ NtfsLookupFile(PDEVICE_EXTENSION Vcb, { return NtfsLookupFileAt(Vcb, PathName, FileRecord, DataContext, MFTIndex, NTFS_FILE_ROOT); } + +NTSTATUS +NtfsFindFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING SearchPattern, + PULONG FirstEntry, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, + ULONGLONG CurrentMFTIndex) +{ + NTSTATUS Status; + + DPRINT1("NtfsFindFileAt(%p, %wZ, %p, %p, %p, %p, %I64x)\n", Vcb, SearchPattern, FirstEntry, FileRecord, DataContext, MFTIndex, CurrentMFTIndex); + + Status = NtfsFindMftRecord(Vcb, CurrentMFTIndex, SearchPattern, FirstEntry, TRUE, &CurrentMFTIndex); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + *FileRecord = ExAllocatePoolWithTag(NonPagedPool, Vcb->NtfsInfo.BytesPerFileRecord, TAG_NTFS); + if (*FileRecord == NULL) + { + DPRINT("NtfsFindFileAt: Can't allocate MFT record\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(Vcb, CurrentMFTIndex, *FileRecord); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsFindFileAt: Can't read MFT record\n"); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); + return Status; + } + + if (!((*FileRecord)->Flags & FRH_DIRECTORY)) + { + Status = FindAttribute(Vcb, *FileRecord, AttributeData, L"", 0, DataContext); + if (!NT_SUCCESS(Status)) + { + DPRINT("NtfsFindFileAt: Can't find data attribute\n"); + ExFreePoolWithTag(*FileRecord, TAG_NTFS); + return Status; + } + } + else + { + *DataContext = NULL; + } + + *MFTIndex = CurrentMFTIndex; + + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/drivers/filesystems/ntfs/misc.c b/drivers/filesystems/ntfs/misc.c index 11ce46bc416..d1a4ffcf9df 100644 --- a/drivers/filesystems/ntfs/misc.c +++ b/drivers/filesystems/ntfs/misc.c @@ -97,4 +97,31 @@ NtfsAllocateIrpContext(PDEVICE_OBJECT DeviceObject, return IrpContext; } +/* See: + -> http://msdn.microsoft.com/en-us/library/ms724228 + -> http://bos.asmhackers.net/docs/filesystems/ntfs/standard.html#layout + */ +VOID +NtfsDateTimeToFileTime(ULONGLONG NtfsTime, + PLARGE_INTEGER SystemTime) +{ + + SystemTime->QuadPart = NtfsTime + 116444736000000000; +} + +VOID +NtfsFileFlagsToAttributes(ULONG NtfsAttributes, + PULONG FileAttributes) +{ + *FileAttributes = NtfsAttributes; + if ((NtfsAttributes & NTFS_FILE_TYPE_DIRECTORY) == NTFS_FILE_TYPE_DIRECTORY) + { + *FileAttributes = NtfsAttributes & ~NTFS_FILE_TYPE_DIRECTORY; + *FileAttributes |= FILE_ATTRIBUTE_DIRECTORY; + } + + if (NtfsAttributes == 0) + *FileAttributes = FILE_ATTRIBUTE_NORMAL; +} + /* EOF */ diff --git a/drivers/filesystems/ntfs/ntfs.h b/drivers/filesystems/ntfs/ntfs.h index 6fadaebcb09..eb75a8ca324 100644 --- a/drivers/filesystems/ntfs/ntfs.h +++ b/drivers/filesystems/ntfs/ntfs.h @@ -169,6 +169,8 @@ typedef enum #define NTFS_FILE_UPCASE 10 #define NTFS_FILE_EXTEND 11 +#define NTFS_MFT_MASK 0x0000FFFFFFFFFFFFULL + #define COLLATION_BINARY 0x00 #define COLLATION_FILE_NAME 0x01 #define COLLATION_UNICODE_STRING 0x02 @@ -329,6 +331,13 @@ typedef struct INDEX_HEADER_ATTRIBUTE Header; } INDEX_ROOT_ATTRIBUTE, *PINDEX_ROOT_ATTRIBUTE; +typedef struct +{ + NTFS_RECORD_HEADER Ntfs; + ULONGLONG VCN; + INDEX_HEADER_ATTRIBUTE Header; +} INDEX_BUFFER, *PINDEX_BUFFER; + typedef struct { union @@ -613,7 +622,8 @@ NTSTATUS FindAttribute(PDEVICE_EXTENSION Vcb, PFILE_RECORD_HEADER MftRecord, ULONG Type, - PUNICODE_STRING Name, + PCWSTR Name, + ULONG NameLength, PNTFS_ATTR_CONTEXT * AttrCtx); VOID @@ -654,6 +664,15 @@ NtfsLookupFileAt(PDEVICE_EXTENSION Vcb, PULONGLONG MFTIndex, ULONGLONG CurrentMFTIndex); +NTSTATUS +NtfsFindFileAt(PDEVICE_EXTENSION Vcb, + PUNICODE_STRING SearchPattern, + PULONG FirstEntry, + PFILE_RECORD_HEADER *FileRecord, + PNTFS_ATTR_CONTEXT *DataContext, + PULONGLONG MFTIndex, + ULONGLONG CurrentMFTIndex); + /* misc.c */ BOOLEAN @@ -671,16 +690,16 @@ VOID CdfsSwapString(PWCHAR Out, PUCHAR In, ULONG Count); - -VOID -CdfsDateTimeToFileTime(PFCB Fcb, - TIME *FileTime); - -VOID -CdfsFileFlagsToAttributes(PFCB Fcb, - PULONG FileAttributes); #endif +VOID +NtfsDateTimeToFileTime(ULONGLONG NtfsTime, + PLARGE_INTEGER SystemTime); + +VOID +NtfsFileFlagsToAttributes(ULONG NtfsAttributes, + PULONG FileAttributes); + /* rw.c */ diff --git a/drivers/filesystems/ntfs/volinfo.c b/drivers/filesystems/ntfs/volinfo.c index 3c9e717daca..9b7d23e233f 100644 --- a/drivers/filesystems/ntfs/volinfo.c +++ b/drivers/filesystems/ntfs/volinfo.c @@ -32,6 +32,14 @@ /* FUNCTIONS ****************************************************************/ +static +ULONGLONG +NtfsGetFreeClusters(PDEVICE_EXTENSION DeviceExt) +{ + UNIMPLEMENTED; + return 0; +} + static NTSTATUS NtfsGetFsVolumeInformation(PDEVICE_OBJECT DeviceObject, @@ -130,8 +138,8 @@ NtfsGetFsSizeInformation(PDEVICE_OBJECT DeviceObject, DeviceExt = DeviceObject->DeviceExtension; - FsSizeInfo->AvailableAllocationUnits.QuadPart = 0; - FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.SectorCount; /* ?? */ + FsSizeInfo->AvailableAllocationUnits.QuadPart = NtfsGetFreeClusters(DeviceExt); + FsSizeInfo->TotalAllocationUnits.QuadPart = DeviceExt->NtfsInfo.SectorCount / DeviceExt->NtfsInfo.SectorsPerCluster; FsSizeInfo->SectorsPerAllocationUnit = DeviceExt->NtfsInfo.SectorsPerCluster; FsSizeInfo->BytesPerSector = DeviceExt->NtfsInfo.BytesPerSector; @@ -145,7 +153,8 @@ NtfsGetFsSizeInformation(PDEVICE_OBJECT DeviceObject, static NTSTATUS -NtfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, +NtfsGetFsDeviceInformation(PDEVICE_OBJECT DeviceObject, + PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, PULONG BufferLength) { DPRINT("NtfsGetFsDeviceInformation()\n"); @@ -157,7 +166,7 @@ NtfsGetFsDeviceInformation(PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, return STATUS_BUFFER_OVERFLOW; FsDeviceInfo->DeviceType = FILE_DEVICE_DISK; - FsDeviceInfo->Characteristics = 0; /* FIXME: fix this !! */ + FsDeviceInfo->Characteristics = DeviceObject->Characteristics; DPRINT("NtfsGetFsDeviceInformation() finished.\n"); @@ -215,7 +224,8 @@ NtfsQueryVolumeInformation(PNTFS_IRP_CONTEXT IrpContext) break; case FileFsDeviceInformation: - Status = NtfsGetFsDeviceInformation(SystemBuffer, + Status = NtfsGetFsDeviceInformation(DeviceObject, + SystemBuffer, &BufferLength); break; diff --git a/drivers/filters/mountmgr/CMakeLists.txt b/drivers/filters/mountmgr/CMakeLists.txt index ab904927128..218d908f7a7 100644 --- a/drivers/filters/mountmgr/CMakeLists.txt +++ b/drivers/filters/mountmgr/CMakeLists.txt @@ -15,4 +15,3 @@ set_module_type(mountmgr kernelmodedriver) add_importlibs(mountmgr ntoskrnl hal) add_pch(mountmgr mntmgr.h SOURCE) add_cd_file(TARGET mountmgr DESTINATION reactos/system32/drivers NO_CAB FOR all) - diff --git a/drivers/filters/mountmgr/symlink.c b/drivers/filters/mountmgr/symlink.c index 80c5b00873e..3fc954dfdbe 100644 --- a/drivers/filters/mountmgr/symlink.c +++ b/drivers/filters/mountmgr/symlink.c @@ -923,27 +923,35 @@ DeleteSymbolicLinkNameFromMemory(IN PDEVICE_EXTENSION DeviceExtension, BOOLEAN IsDriveLetter(PUNICODE_STRING SymbolicName) { - WCHAR Letter; - BOOLEAN Result = FALSE; + WCHAR Letter, Colon; /* We must have a precise length */ - if (SymbolicName->Length != sizeof(DosDevices.Buffer) + 2 * sizeof(WCHAR)) + if (SymbolicName->Length != DosDevices.Length + 2 * sizeof(WCHAR)) { return FALSE; } - /* Check if len is correct */ - Letter = SymbolicName->Buffer[sizeof(DosDevices.Buffer) / sizeof(WCHAR)]; - if (((Letter >= L'A' && Letter <= L'Z') || Letter == (WCHAR)-1) && - SymbolicName->Buffer[(sizeof(DosDevices.Buffer) + sizeof(WCHAR)) / sizeof (WCHAR)] == L':') + /* Must start with the DosDevices prefix */ + if (!RtlPrefixUnicodeString(&DosDevices, SymbolicName, TRUE)) { - /* In case it's not a normal drive letter, check differently */ - SymbolicName->Length = sizeof(DosDevices.Buffer); - Result = RtlEqualUnicodeString(SymbolicName, &DosDevices, TRUE); - SymbolicName->Length = sizeof(DosDevices.Buffer) + 2 * sizeof(WCHAR); + return FALSE; } - return Result; + /* Check if letter is correct */ + Letter = SymbolicName->Buffer[DosDevices.Length / sizeof(WCHAR)]; + if ((Letter < L'A' || Letter > L'Z') && Letter != (WCHAR)-1) + { + return FALSE; + } + + /* And finally it must end with a colon */ + Colon = SymbolicName->Buffer[DosDevices.Length / sizeof(WCHAR) + 1]; + if (Colon != L':') + { + return FALSE; + } + + return TRUE; } /* diff --git a/drivers/hid/hidclass/CMakeLists.txt b/drivers/hid/hidclass/CMakeLists.txt index d23d5992af0..a9e53004aba 100644 --- a/drivers/hid/hidclass/CMakeLists.txt +++ b/drivers/hid/hidclass/CMakeLists.txt @@ -14,7 +14,6 @@ add_library(hidclass SHARED ${CMAKE_CURRENT_BINARY_DIR}/hidclass.def) set_module_type(hidclass kernelmodedriver ENTRYPOINT 0) - add_importlibs(hidclass ntoskrnl hidparse hal) add_pch(hidclass precomp.h SOURCE) add_cd_file(TARGET hidclass DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/hid/hidparse/CMakeLists.txt b/drivers/hid/hidparse/CMakeLists.txt index 3b5f9294804..1c23d7dd7ce 100644 --- a/drivers/hid/hidparse/CMakeLists.txt +++ b/drivers/hid/hidparse/CMakeLists.txt @@ -8,10 +8,7 @@ include_directories( add_library(hidparse SHARED hidparse.c hidparse.rc ${CMAKE_CURRENT_BINARY_DIR}/hidparse.def) - set_module_type(hidparse kernelmodedriver) add_importlibs(hidparse ntoskrnl) - target_link_libraries(hidparse hidparser) - add_cd_file(TARGET hidparse DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/hid/hidusb/CMakeLists.txt b/drivers/hid/hidusb/CMakeLists.txt index 349abc855c9..9ec04ea5f91 100644 --- a/drivers/hid/hidusb/CMakeLists.txt +++ b/drivers/hid/hidusb/CMakeLists.txt @@ -4,8 +4,6 @@ list(APPEND SOURCE hidusb.rc) add_library(hidusb SHARED ${SOURCE}) - set_module_type(hidusb kernelmodedriver) add_importlibs(hidusb hidclass ntoskrnl usbd hal) - add_cd_file(TARGET hidusb DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/hid/kbdhid/CMakeLists.txt b/drivers/hid/kbdhid/CMakeLists.txt index f8667efae35..7a5f48e1340 100644 --- a/drivers/hid/kbdhid/CMakeLists.txt +++ b/drivers/hid/kbdhid/CMakeLists.txt @@ -1,11 +1,7 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - add_library(kbdhid SHARED kbdhid.c kbdhid.rc) - set_module_type(kbdhid kernelmodedriver) add_importlibs(kbdhid ntoskrnl hal hidparse) - add_cd_file(TARGET kbdhid DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/hid/mouhid/CMakeLists.txt b/drivers/hid/mouhid/CMakeLists.txt index e0ba3960dd4..6a7e7349fb3 100644 --- a/drivers/hid/mouhid/CMakeLists.txt +++ b/drivers/hid/mouhid/CMakeLists.txt @@ -1,11 +1,7 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) - add_library(mouhid SHARED mouhid.c mouhid.rc) - set_module_type(mouhid kernelmodedriver) add_importlibs(mouhid ntoskrnl hal hidparse) - add_cd_file(TARGET mouhid DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/ksfilter/ks/CMakeLists.txt b/drivers/ksfilter/ks/CMakeLists.txt index e0a6629e111..7a79f9f678a 100644 --- a/drivers/ksfilter/ks/CMakeLists.txt +++ b/drivers/ksfilter/ks/CMakeLists.txt @@ -47,4 +47,3 @@ add_pch(ks precomp.h SOURCE) add_importlibs(ks ntoskrnl hal) add_dependencies(ks psdk) add_cd_file(TARGET ks DESTINATION reactos/system32/drivers FOR all) - diff --git a/drivers/ksfilter/swenum/CMakeLists.txt b/drivers/ksfilter/swenum/CMakeLists.txt index d9311417631..cf8b33a0964 100644 --- a/drivers/ksfilter/swenum/CMakeLists.txt +++ b/drivers/ksfilter/swenum/CMakeLists.txt @@ -1,10 +1,5 @@ -list(APPEND SOURCE - swenum.c) - -add_library(swenum SHARED ${SOURCE}) - +add_library(swenum SHARED swenum.c) set_module_type(swenum kernelmodedriver) add_importlibs(swenum ks ntoskrnl hal) - add_cd_file(TARGET swenum DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/network/afd/CMakeLists.txt b/drivers/network/afd/CMakeLists.txt index 4776226f573..ae1a2db1dc7 100644 --- a/drivers/network/afd/CMakeLists.txt +++ b/drivers/network/afd/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND SOURCE add_library(afd SHARED ${SOURCE} afd.rc) target_link_libraries(afd ${PSEH_LIB}) - set_module_type(afd kernelmodedriver) add_importlibs(afd ntoskrnl hal) add_pch(afd include/afd.h SOURCE) diff --git a/drivers/network/ndis/CMakeLists.txt b/drivers/network/ndis/CMakeLists.txt index 3a81a64f245..f338362d125 100644 --- a/drivers/network/ndis/CMakeLists.txt +++ b/drivers/network/ndis/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories(BEFORE include) +spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) add_definitions( -DNDIS_WRAPPER @@ -10,8 +11,6 @@ add_definitions( -DNDIS_LEGACY_PROTOCOL -DNDIS_MINIPORT_DRIVER) -spec2def(ndis.sys ndis.spec ADD_IMPORTLIB) - list(APPEND SOURCE ndis/30stubs.c ndis/40stubs.c @@ -41,8 +40,5 @@ add_library(ndis SHARED set_module_type(ndis kernelmodedriver) add_importlibs(ndis ntoskrnl hal) - add_pch(ndis include/ndissys.h SOURCE) - add_cd_file(TARGET ndis DESTINATION reactos/system32/drivers FOR all) - diff --git a/drivers/network/ndisuio/CMakeLists.txt b/drivers/network/ndisuio/CMakeLists.txt index 5fd566b3e29..1f9e8946be1 100644 --- a/drivers/network/ndisuio/CMakeLists.txt +++ b/drivers/network/ndisuio/CMakeLists.txt @@ -1,3 +1,4 @@ + add_definitions( -DNDIS50 -D_NTDRIVER_) diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt index 5a8230a8e9c..c29acaf9214 100644 --- a/drivers/network/tcpip/CMakeLists.txt +++ b/drivers/network/tcpip/CMakeLists.txt @@ -32,15 +32,8 @@ add_library(tcpip SHARED tcpip.rc ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def) -target_link_libraries(tcpip - ip - lwip - ${PSEH_LIB} - chew) - +target_link_libraries(tcpip ip lwip ${PSEH_LIB} chew) set_module_type(tcpip kernelmodedriver) add_importlibs(tcpip ndis ntoskrnl hal) - add_pch(tcpip include/precomp.h SOURCE) - add_cd_file(TARGET tcpip DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/parallel/parallel/CMakeLists.txt b/drivers/parallel/parallel/CMakeLists.txt index 95444961590..e263fa16718 100644 --- a/drivers/parallel/parallel/CMakeLists.txt +++ b/drivers/parallel/parallel/CMakeLists.txt @@ -1,5 +1,4 @@ add_library(parallel SHARED parallel.c parallel.rc) - set_module_type(parallel kernelmodedriver) add_importlibs(parallel ntoskrnl hal) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index 2f335653ccb..8ab07f20d63 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -7,13 +7,7 @@ list(APPEND SOURCE precomp.h) add_library(cdrom SHARED ${SOURCE} cdrom.rc) - set_module_type(cdrom kernelmodedriver) -add_importlibs(cdrom - class2 - scsiport - ntoskrnl - hal) - +add_importlibs(cdrom class2 scsiport ntoskrnl hal) add_pch(cdrom precomp.h SOURCE) add_cd_file(TARGET cdrom DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/class/cdrom/cdrom.c b/drivers/storage/class/cdrom/cdrom.c index f573eeda932..e90825a04ab 100644 --- a/drivers/storage/class/cdrom/cdrom.c +++ b/drivers/storage/class/cdrom/cdrom.c @@ -3931,10 +3931,7 @@ CdRomSwitchModeCompletion( IoCompleteRequest(realIrp, IO_DISK_INCREMENT); ExFreePool(srb->SenseInfoBuffer); - ExFreePool(srb->DataBuffer); ExFreePool(srb); - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); IoStartNextPacket(DeviceObject, FALSE); diff --git a/drivers/storage/class/cdrom_new/CMakeLists.txt b/drivers/storage/class/cdrom_new/CMakeLists.txt index 1c425b6c01d..d4d0853280d 100644 --- a/drivers/storage/class/cdrom_new/CMakeLists.txt +++ b/drivers/storage/class/cdrom_new/CMakeLists.txt @@ -10,15 +10,12 @@ list(APPEND SOURCE cdrom.h) add_library(cdrom_new SHARED ${SOURCE}) - target_link_libraries(cdrom_new libcntpr wdmguid) -if(ARCH STREQUAL "i386") +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") - endif() + #add_target_compile_flags(cdrom_new "-Wno-format -Wno-unused-variable -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-format -Wno-unused-variable -Wno-pointer-sign") endif() set_module_type(cdrom_new kernelmodedriver) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index d17def7f987..fa298def3b4 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -1,6 +1,5 @@ include_directories(..) - spec2def(class2.sys class2.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,10 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/class2.def) add_library(class2 SHARED ${SOURCE}) - set_module_type(class2 kernelmodedriver) - add_importlibs(class2 scsiport ntoskrnl hal) - - add_cd_file(TARGET class2 DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index dcddd4f2aaa..e288906eaeb 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -1,13 +1,6 @@ include_directories(..) - add_library(disk SHARED disk.c disk.rc) - set_module_type(disk kernelmodedriver) -add_importlibs(disk - class2 - scsiport - ntoskrnl - hal) - +add_importlibs(disk class2 scsiport ntoskrnl hal) add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/class/disk_new/CMakeLists.txt b/drivers/storage/class/disk_new/CMakeLists.txt index 61e15dc78c5..c210c5c754e 100644 --- a/drivers/storage/class/disk_new/CMakeLists.txt +++ b/drivers/storage/class/disk_new/CMakeLists.txt @@ -1,3 +1,4 @@ + include_directories(..) list(APPEND SOURCE @@ -11,14 +12,12 @@ list(APPEND SOURCE disk.h) add_library(disk_new SHARED ${SOURCE} disk.rc) - target_link_libraries(disk_new libcntpr wdmguid) -if(ARCH STREQUAL "i386") + +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - #add_target_compile_flags(disk_new "-Wno-error -Wno-format -Wno-pointer-sign") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-format -Wno-pointer-sign") - endif() + #add_target_compile_flags(disk_new "-Wno-error -Wno-format -Wno-pointer-sign") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error -Wno-format -Wno-pointer-sign") endif() set_module_type(disk_new kernelmodedriver) diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt index f6cee2bfe72..aac700cbbff 100644 --- a/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/drivers/storage/class/ramdisk/CMakeLists.txt @@ -1,11 +1,6 @@ include_directories(..) - add_library(ramdisk SHARED ramdisk.c ramdisk.rc) - set_module_type(ramdisk kernelmodedriver) -add_importlibs(ramdisk - ntoskrnl - hal) - +add_importlibs(ramdisk ntoskrnl hal) add_cd_file(TARGET ramdisk DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt index 69cfd3725aa..47846cf03b2 100644 --- a/drivers/storage/classpnp/CMakeLists.txt +++ b/drivers/storage/classpnp/CMakeLists.txt @@ -1,5 +1,6 @@ include_directories(../inc) +spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) add_definitions( -DCLASS_GLOBAL_BREAK_ON_LOST_IRPS=0 @@ -9,8 +10,6 @@ add_definitions( -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512) -spec2def(classpnp.sys classpnp.spec ADD_IMPORTLIB) - list(APPEND SOURCE autorun.c class.c @@ -34,16 +33,13 @@ add_library(classpnp SHARED class.rc ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) -if(ARCH STREQUAL "i386") +if((ARCH STREQUAL "i386") AND (NOT MSVC)) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - if(NOT MSVC) - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=switch") - endif() + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=switch") endif() add_pch(classpnp classp.h SOURCE) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) - add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt index 73c2c8a0eef..0e1902a09f4 100644 --- a/drivers/storage/ide/atapi/CMakeLists.txt +++ b/drivers/storage/ide/atapi/CMakeLists.txt @@ -1,9 +1,6 @@ add_library(atapi SHARED atapi.c atapi.rc) - target_link_libraries(atapi libcntpr) - set_module_type(atapi kernelmodedriver) add_importlibs(atapi scsiport) - add_cd_file(TARGET atapi DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt index 89efccdf7c4..ebbe776f268 100644 --- a/drivers/storage/ide/pciide/CMakeLists.txt +++ b/drivers/storage/ide/pciide/CMakeLists.txt @@ -1,7 +1,5 @@ add_library(pciide SHARED pciide.c pciide.rc) - set_module_type(pciide kernelmodedriver) add_importlibs(pciide pciidex ntoskrnl) - add_cd_file(TARGET pciide DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt index d26e48e8891..c31405b78a0 100644 --- a/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/drivers/storage/ide/pciidex/CMakeLists.txt @@ -18,4 +18,3 @@ add_pch(pciidex pciidex.h SOURCE) set_module_type(pciidex kernelmodedriver) add_importlibs(pciidex ntoskrnl) add_cd_file(TARGET pciidex DESTINATION reactos/system32/drivers NO_CAB FOR all) - diff --git a/drivers/storage/ide/uniata/CMakeLists.txt b/drivers/storage/ide/uniata/CMakeLists.txt index 922d18e7a11..49111be670b 100644 --- a/drivers/storage/ide/uniata/CMakeLists.txt +++ b/drivers/storage/ide/uniata/CMakeLists.txt @@ -20,7 +20,6 @@ list(APPEND SOURCE add_library(uniata SHARED ${SOURCE} idedma.rc) - if(NOT MSVC) add_target_compile_flags(uniata "-Wno-narrowing") if(NOT CMAKE_C_COMPILER_ID STREQUAL "Clang") diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt index 6ab1a4945c0..339e84faeac 100644 --- a/drivers/storage/scsiport/CMakeLists.txt +++ b/drivers/storage/scsiport/CMakeLists.txt @@ -14,5 +14,4 @@ add_library(scsiport SHARED add_pch(scsiport precomp.h SOURCE) set_module_type(scsiport kernelmodedriver) add_importlibs(scsiport ntoskrnl hal) - add_cd_file(TARGET scsiport DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbccgp/CMakeLists.txt b/drivers/usb/usbccgp/CMakeLists.txt index 15eab5b124a..92a8ae0a7cf 100644 --- a/drivers/usb/usbccgp/CMakeLists.txt +++ b/drivers/usb/usbccgp/CMakeLists.txt @@ -1,9 +1,8 @@ + remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) - add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE @@ -21,7 +20,6 @@ add_library(usbccgp SHARED usbccgp.rc) target_link_libraries(usbccgp ${PSEH_LIB}) - set_module_type(usbccgp kernelmodedriver) add_importlibs(usbccgp ntoskrnl hal usbd) add_pch(usbccgp usbccgp.h SOURCE) diff --git a/drivers/usb/usbd/CMakeLists.txt b/drivers/usb/usbd/CMakeLists.txt index 993f1d053c2..aaccade8a3b 100644 --- a/drivers/usb/usbd/CMakeLists.txt +++ b/drivers/usb/usbd/CMakeLists.txt @@ -8,6 +8,4 @@ add_library(usbd SHARED set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) - - add_cd_file(TARGET usbd DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/drivers/usb/usbehci/CMakeLists.txt b/drivers/usb/usbehci/CMakeLists.txt index 8f1e50d498f..aed4b1588f1 100644 --- a/drivers/usb/usbehci/CMakeLists.txt +++ b/drivers/usb/usbehci/CMakeLists.txt @@ -18,12 +18,7 @@ add_library(usbehci SHARED guid.cpp usbehci.rc) -target_link_libraries(usbehci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbehci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbehci kernelmodedriver) add_importlibs(usbehci ntoskrnl hal usbd) add_pch(usbehci usbehci.h SOURCE) diff --git a/drivers/usb/usbhub/CMakeLists.txt b/drivers/usb/usbhub/CMakeLists.txt index 5aa3ec798d3..2a8224d08cf 100644 --- a/drivers/usb/usbhub/CMakeLists.txt +++ b/drivers/usb/usbhub/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE @@ -17,7 +16,6 @@ add_library(usbhub SHARED usbhub.rc) target_link_libraries(usbhub ${PSEH_LIB}) - set_module_type(usbhub kernelmodedriver) add_importlibs(usbhub ntoskrnl hal usbd) add_pch(usbhub usbhub.h SOURCE) diff --git a/drivers/usb/usbohci/CMakeLists.txt b/drivers/usb/usbohci/CMakeLists.txt index 53b05f4f29c..83aa2e38e6b 100644 --- a/drivers/usb/usbohci/CMakeLists.txt +++ b/drivers/usb/usbohci/CMakeLists.txt @@ -18,12 +18,7 @@ add_library(usbohci SHARED guid.cpp usbohci.rc) -target_link_libraries(usbohci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbohci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbohci kernelmodedriver) add_importlibs(usbohci ntoskrnl hal usbd) add_pch(usbohci usbohci.h SOURCE) diff --git a/drivers/usb/usbstor/CMakeLists.txt b/drivers/usb/usbstor/CMakeLists.txt index 47881948b57..3bb2eed0f25 100644 --- a/drivers/usb/usbstor/CMakeLists.txt +++ b/drivers/usb/usbstor/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DDEBUG_MODE) - include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) list(APPEND SOURCE diff --git a/drivers/usb/usbuhci/CMakeLists.txt b/drivers/usb/usbuhci/CMakeLists.txt index 3ca8ffaa9d3..9decd89fc70 100644 --- a/drivers/usb/usbuhci/CMakeLists.txt +++ b/drivers/usb/usbuhci/CMakeLists.txt @@ -4,8 +4,7 @@ set_cpp() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -include_directories( - ${REACTOS_SOURCE_DIR}/lib/drivers/libusb) +include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/libusb) list(APPEND SOURCE usbuhci.cpp @@ -19,12 +18,7 @@ add_library(usbuhci SHARED guid.cpp usbuhci.rc) -target_link_libraries(usbuhci - uuid - libusb - libcntpr - ${PSEH_LIB}) - +target_link_libraries(usbuhci uuid libusb libcntpr ${PSEH_LIB}) set_module_type(usbuhci kernelmodedriver) add_importlibs(usbuhci ntoskrnl hal usbd) add_pch(usbuhci usbuhci.h SOURCE) diff --git a/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt b/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt index ec4b43a546d..a1a46b0ec3e 100644 --- a/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt @@ -7,10 +7,7 @@ include_directories( ${REACTOS_SOURCE_DIR}/lib/3rdparty/libsamplerate) add_executable(audio_test audio_test.c) - set_module_type(audio_test win32cui) - target_link_libraries(audio_test libsamplerate) - add_importlibs(audio_test setupapi ksuser msvcrt kernel32) add_dependencies(audio_test bugcodes) diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index a9a333830ae..e5f07047763 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -55,10 +55,7 @@ add_library(portcls SHARED portcls.rc ${CMAKE_CURRENT_BINARY_DIR}/portcls.def) -target_link_libraries(portcls - libcntpr - ${PSEH_LIB}) - +target_link_libraries(portcls libcntpr ${PSEH_LIB}) set_module_type(portcls kernelmodedriver ENTRYPOINT 0 ) add_pch(portcls private.hpp SOURCE) add_importlibs(portcls ntoskrnl ks drmk hal) diff --git a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt index c0c67fd4e85..550716b77e8 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/CMakeLists.txt @@ -21,9 +21,7 @@ add_library(cmipci SHARED cmipci.rc) target_link_libraries(cmipci stdunk libcntpr uuid) - set_module_type(cmipci wdmdriver UNICODE) - add_importlibs(cmipci portcls hal ntoskrnl) if(NOT MSVC) @@ -35,6 +33,7 @@ endif() add_pch(cmipci precomp.h SOURCE) add_cd_file(TARGET cmipci DESTINATION reactos/system32/drivers FOR all) + if(ARCH STREQUAL "i386") add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CM8738-x32.inf" DESTINATION reactos/inf FOR all) else() diff --git a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt index a60725aa05a..aeff43e3db7 100644 --- a/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt +++ b/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/CMakeLists.txt @@ -1,29 +1,13 @@ set_cpp() - include_directories(..) -add_executable(cmicontrol - main.cpp - window.rc) +add_executable(cmicontrol main.cpp window.rc) if(NOT MSVC) set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS "-Wno-write-strings") endif() -add_importlibs(cmicontrol - user32 - gdi32 - ole32 - advapi32 - comctl32 - shell32 - dsound - setupapi - winmm - msvcrt - kernel32) - +add_importlibs(cmicontrol user32 gdi32 ole32 advapi32 comctl32 shell32 dsound setupapi winmm msvcrt kernel32) set_module_type(cmicontrol win32gui) - add_cd_file(TARGET cmicontrol DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt index 3e575393812..a393407c729 100644 --- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DBUILDING_DRMK) - spec2def(drmk.sys drmk.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -9,9 +8,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/drmk.def) add_library(drmk SHARED ${SOURCE}) - set_module_type(drmk kernelmodedriver ENTRYPOINT 0) - add_importlibs(drmk ntoskrnl) - add_cd_file(TARGET drmk DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt index 16d22f65428..feba177426f 100644 --- a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt +++ b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt @@ -9,11 +9,7 @@ list(APPEND SOURCE add_library(kmixer SHARED ${SOURCE}) set_module_type(kmixer kernelmodedriver) - -target_link_libraries(kmixer - libcntpr - libsamplerate) - +target_link_libraries(kmixer libcntpr libsamplerate) add_pch(kmixer kmixer.h SOURCE) add_importlibs(kmixer ntoskrnl ks hal) add_cd_file(TARGET kmixer DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt index b4ccdd062d1..0716b07449d 100644 --- a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt +++ b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt @@ -15,11 +15,7 @@ list(APPEND SOURCE add_library(wdmaud SHARED ${SOURCE} wdmaud.rc) set_module_type(wdmaud kernelmodedriver) - -target_link_libraries(wdmaud - mmixer - libcntpr) - +target_link_libraries(wdmaud mmixer libcntpr) add_pch(wdmaud wdmaud.h SOURCE) add_importlibs(wdmaud ntoskrnl ks hal) add_cd_file(TARGET wdmaud DESTINATION reactos/system32/drivers FOR all) diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index 35f19842bab..8d6212634d4 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) add_library(wmilib SHARED ${SOURCE}) - set_module_type(wmilib kernelmodedriver ENTRYPOINT 0) - add_importlibs(wmilib ntoskrnl) - add_cd_file(TARGET wmilib DESTINATION reactos/system32/drivers NO_CAB FOR all) diff --git a/include/asm/genincdata.c b/include/asm/genincdata.c index 0824b620869..dd89eaf028c 100644 --- a/include/asm/genincdata.c +++ b/include/asm/genincdata.c @@ -74,7 +74,7 @@ __attribute__ ((section(".asmdef"))) ASMGENDATA Table[] = { -#if defined (_M_IX86) || defined (M_AMD64) +#if defined (_M_IX86) || defined (_M_AMD64) /* PORTABLE CONSTANTS ********************************************************/ #include "ksx.template.h" #endif diff --git a/include/crt/msc/intrin.h b/include/crt/msc/intrin.h index 66f79fdbbba..07f92ea0db0 100644 --- a/include/crt/msc/intrin.h +++ b/include/crt/msc/intrin.h @@ -651,7 +651,6 @@ void __forceinline __invlpg_fixed(void * Address) #elif defined(_M_AMD64) void __invlpg(void * Address); #pragma intrinsic(__invlpg) -#elif defined(_M_AMD64) unsigned __int64 __readcr0(void); #pragma intrinsic(__readcr0) unsigned __int64 __readcr2(void); diff --git a/include/psdk/userenv.h b/include/psdk/userenv.h index 85b95d70d34..4b96301a123 100644 --- a/include/psdk/userenv.h +++ b/include/psdk/userenv.h @@ -43,6 +43,48 @@ typedef struct _PROFILEINFOW HANDLE hProfile; } PROFILEINFOW, *LPPROFILEINFOW; +#if (WINVER >= 0x0502) +typedef enum _GPO_LINK { + GPLinkUnknown = 0, + GPLinkMachine, + GPLinkSite, + GPLinkDomain, + GPLinkOrganizationalUnit +} GPO_LINK, *PGPO_LINK; + +typedef struct _GROUP_POLICY_OBJECTA { + DWORD dwOptions; + DWORD dwVersion; + LPSTR lpDSPath; + LPSTR lpFileSysPath; + LPSTR lpDisplayName; + CHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTA *pNext; + struct _GROUP_POLICY_OBJECTA *pPrev; + LPSTR lpExtensions; + LPARAM lParam2; + LPSTR lpLink; +} GROUP_POLICY_OBJECTA, *PGROUP_POLICY_OBJECTA; + +typedef struct _GROUP_POLICY_OBJECTW { + DWORD dwOptions; + DWORD dwVersion; + LPWSTR lpDSPath; + LPWSTR lpFileSysPath; + LPWSTR lpDisplayName; + WCHAR szGPOName[50]; + GPO_LINK GPOLink; + LPARAM lParam; + struct _GROUP_POLICY_OBJECTW *pNext; + struct _GROUP_POLICY_OBJECTW *pPrev; + LPWSTR lpExtensions; + LPARAM lParam2; + LPWSTR lpLink; +} GROUP_POLICY_OBJECTW, *PGROUP_POLICY_OBJECTW; +#endif + /* begin private */ BOOL WINAPI InitializeProfiles (VOID); BOOL WINAPI CreateUserProfileA (PSID, LPCSTR); @@ -85,6 +127,27 @@ BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); #endif +#if (WINVER >= 0x0502) +DWORD +WINAPI +GetAppliedGPOListA( + _In_ DWORD dwFlags, + _In_ LPCSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTA *ppGPOList +); +DWORD +WINAPI +GetAppliedGPOListW( + _In_ DWORD dwFlags, + _In_ LPCWSTR pMachineName, + _In_ PSID pSidUser, + _In_ GUID *pGuidExtension, + _Out_ PGROUP_POLICY_OBJECTW *ppGPOList +); +#endif + HANDLE WINAPI EnterCriticalPolicySection (BOOL); BOOL WINAPI LeaveCriticalPolicySection (HANDLE); BOOL WINAPI RefreshPolicy (BOOL); @@ -115,6 +178,11 @@ typedef LPPROFILEINFOW LPPROFILEINFO; #if (WINVER >= 0x0500) #define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserW #endif +#if (WINVER >= 0x0502) +typedef GROUP_POLICY_OBJECTW GROUP_POLICY_OBJECT; +typedef PGROUP_POLICY_OBJECTW PGROUP_POLICY_OBJECT; +#define GetAppliedGPOList GetAppliedGPOListW +#endif #else typedef PROFILEINFOA PROFILEINFO; typedef LPPROFILEINFOA LPPROFILEINFO; @@ -136,6 +204,11 @@ typedef LPPROFILEINFOA LPPROFILEINFO; #if (WINVER >= 0x0500) #define ExpandEnvironmentStringsForUser ExpandEnvironmentStringsForUserA #endif +#if (WINVER >= 0x0502) +typedef GROUP_POLICY_OBJECTA GROUP_POLICY_OBJECT; +typedef PGROUP_POLICY_OBJECTA PGROUP_POLICY_OBJECT; +#define GetAppliedGPOList GetAppliedGPOListA +#endif #endif #ifdef __cplusplus diff --git a/include/psdk/winnt.h b/include/psdk/winnt.h index d5d705d562f..55be73a43c4 100644 --- a/include/psdk/winnt.h +++ b/include/psdk/winnt.h @@ -1709,6 +1709,10 @@ extern "C++" { \ #define THREAD_BASE_PRIORITY_MAX 2 #define THREAD_BASE_PRIORITY_MIN (-2) #define THREAD_BASE_PRIORITY_IDLE (-15) + +#define PROCESS_SET_LIMITED_INFORMATION 0x2000 +#define THREAD_RESUME 0x1000 + /* * To prevent gcc compiler warnings, bracket these defines when initialising * a SID_IDENTIFIER_AUTHORITY, eg. diff --git a/include/psdk/winternl.h b/include/psdk/winternl.h index 274bff0420c..085dd1b209b 100644 --- a/include/psdk/winternl.h +++ b/include/psdk/winternl.h @@ -2310,7 +2310,12 @@ BOOLEAN WINAPI RtlTimeToSecondsSince1970(const LARGE_INTEGER *,LPDWORD); BOOLEAN WINAPI RtlTimeToSecondsSince1980(const LARGE_INTEGER *,LPDWORD); BOOL WINAPI RtlTryEnterCriticalSection(RTL_CRITICAL_SECTION *); +#ifdef __REACTOS__ ULONGLONG __fastcall RtlUlonglongByteSwap(ULONGLONG); +#define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) +#else +ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG); +#endif DWORD WINAPI RtlUnicodeStringToAnsiSize(const UNICODE_STRING*); NTSTATUS WINAPI RtlUnicodeStringToAnsiString(PANSI_STRING,PCUNICODE_STRING,BOOLEAN); NTSTATUS WINAPI RtlUnicodeStringToInteger(const UNICODE_STRING *,ULONG,ULONG *); diff --git a/include/reactos/idl/wlansvc.idl b/include/reactos/idl/wlansvc.idl index 07f84fa9ad6..d8c434bccb0 100644 --- a/include/reactos/idl/wlansvc.idl +++ b/include/reactos/idl/wlansvc.idl @@ -7,7 +7,7 @@ typedef [context_handle] PVOID WLANSVC_RPC_HANDLE; typedef WLANSVC_RPC_HANDLE* LPWLANSVC_RPC_HANDLE; -typedef [handle] LPWSTR WLANSVC_HANDLE; +typedef [handle, string] LPWSTR WLANSVC_HANDLE; /* FIXME */ typedef struct struct_C { @@ -49,8 +49,8 @@ interface wlansvc_interface DWORD _RpcOpenHandle( [in] WLANSVC_HANDLE szMachineName, [in] DWORD dwClientVersion, - [in, out] DWORD* pdwNegotiatedVersion, - [in, out] LPWLANSVC_RPC_HANDLE phClientHandle); + [out] DWORD* pdwNegotiatedVersion, + [out] LPWLANSVC_RPC_HANDLE phClientHandle); /* Function: 0x01 */ DWORD _RpcCloseHandle( diff --git a/include/reactos/libs/fast486/fast486.h b/include/reactos/libs/fast486/fast486.h index efd4235582e..2606a35ad0b 100644 --- a/include/reactos/libs/fast486/fast486.h +++ b/include/reactos/libs/fast486/fast486.h @@ -207,13 +207,6 @@ VOID UCHAR DataSize ); -typedef -VOID -(NTAPI *FAST486_IDLE_PROC) -( - PFAST486_STATE State -); - typedef VOID (NTAPI *FAST486_BOP_PROC) @@ -261,14 +254,14 @@ typedef struct _FAST486_SEG_REG ULONG Base; } FAST486_SEG_REG, *PFAST486_SEG_REG; -typedef struct +typedef struct _FAST486_LDT_REG { USHORT Selector; ULONG Base; ULONG Limit; -} FAST486_LDT_REG; +} FAST486_LDT_REG, *PFAST486_LDT_REG; -typedef struct +typedef struct _FAST486_TASK_REG { USHORT Selector; ULONG Base; @@ -276,7 +269,7 @@ typedef struct BOOLEAN Busy; } FAST486_TASK_REG, *PFAST486_TASK_REG; -#pragma pack(push, 1) +#include typedef struct { @@ -350,7 +343,7 @@ typedef struct /* Verify the structure size */ C_ASSERT(sizeof(FAST486_IDT_ENTRY) == sizeof(ULONGLONG)); -#pragma pack(pop) +#include typedef struct _FAST486_TABLE_REG { @@ -474,7 +467,6 @@ struct _FAST486_STATE FAST486_MEM_WRITE_PROC MemWriteCallback; FAST486_IO_READ_PROC IoReadCallback; FAST486_IO_WRITE_PROC IoWriteCallback; - FAST486_IDLE_PROC IdleCallback; FAST486_BOP_PROC BopCallback; FAST486_INT_ACK_PROC IntAckCallback; FAST486_REG GeneralRegs[FAST486_NUM_GEN_REGS]; @@ -490,6 +482,7 @@ struct _FAST486_STATE ULONG ExceptionCount; ULONG PrefixFlags; FAST486_SEG_REGS SegmentOverride; + BOOLEAN Halted; FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; PULONG Tlb; @@ -510,7 +503,6 @@ Fast486Initialize(PFAST486_STATE State, FAST486_MEM_WRITE_PROC MemWriteCallback, FAST486_IO_READ_PROC IoReadCallback, FAST486_IO_WRITE_PROC IoWriteCallback, - FAST486_IDLE_PROC IdleCallback, FAST486_BOP_PROC BopCallback, FAST486_INT_ACK_PROC IntAckCallback, PULONG Tlb); diff --git a/include/reactos/libs/libxml/SAX2.h b/include/reactos/libs/libxml/SAX2.h index daafd17eff8..a55212eb554 100644 --- a/include/reactos/libs/libxml/SAX2.h +++ b/include/reactos/libs/libxml/SAX2.h @@ -98,7 +98,9 @@ XMLPUBFUN void XMLCALL xmlSAX2StartDocument (void *ctx); XMLPUBFUN void XMLCALL xmlSAX2EndDocument (void *ctx); -#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) +#if defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || \ + defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) || \ + defined(LIBXML_LEGACY_ENABLED) XMLPUBFUN void XMLCALL xmlSAX2StartElement (void *ctx, const xmlChar *fullname, @@ -106,7 +108,7 @@ XMLPUBFUN void XMLCALL XMLPUBFUN void XMLCALL xmlSAX2EndElement (void *ctx, const xmlChar *name); -#endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED */ +#endif /* LIBXML_SAX1_ENABLED or LIBXML_HTML_ENABLED or LIBXML_LEGACY_ENABLED */ XMLPUBFUN void XMLCALL xmlSAX2StartElementNs (void *ctx, const xmlChar *localname, diff --git a/include/reactos/libs/libxml/entities.h b/include/reactos/libs/libxml/entities.h index 1e9118975d7..47b4573eba6 100644 --- a/include/reactos/libs/libxml/entities.h +++ b/include/reactos/libs/libxml/entities.h @@ -57,7 +57,7 @@ struct _xmlEntity { const xmlChar *URI; /* the full URI as computed */ int owner; /* does the entity own the childrens */ int checked; /* was the entity content checked */ - /* this is also used to count entites + /* this is also used to count entities * references done from that entity * and if it contains '<' */ }; @@ -103,7 +103,7 @@ XMLPUBFUN xmlEntityPtr XMLCALL XMLPUBFUN xmlEntityPtr XMLCALL xmlGetPredefinedEntity (const xmlChar *name); XMLPUBFUN xmlEntityPtr XMLCALL - xmlGetDocEntity (xmlDocPtr doc, + xmlGetDocEntity (const xmlDoc *doc, const xmlChar *name); XMLPUBFUN xmlEntityPtr XMLCALL xmlGetDtdEntity (xmlDocPtr doc, @@ -120,7 +120,7 @@ XMLPUBFUN xmlChar * XMLCALL xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar *input); XMLPUBFUN xmlChar * XMLCALL - xmlEncodeSpecialChars (xmlDocPtr doc, + xmlEncodeSpecialChars (const xmlDoc *doc, const xmlChar *input); XMLPUBFUN xmlEntitiesTablePtr XMLCALL xmlCreateEntitiesTable (void); diff --git a/include/reactos/libs/libxml/globals.h b/include/reactos/libs/libxml/globals.h index 9d688e0d3fa..a9305aa97e8 100644 --- a/include/reactos/libs/libxml/globals.h +++ b/include/reactos/libs/libxml/globals.h @@ -39,7 +39,9 @@ XMLPUBFUN void XMLCALL xmlCleanupGlobals(void); * Returns the new xmlParserInputBufferPtr in case of success or NULL if no * method was found. */ -typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, xmlCharEncoding enc); +typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const char *URI, + xmlCharEncoding enc); + /** * xmlOutputBufferCreateFilenameFunc: @@ -52,7 +54,9 @@ typedef xmlParserInputBufferPtr (*xmlParserInputBufferCreateFilenameFunc) (const * Returns the new xmlOutputBufferPtr in case of success or NULL if no * method was found. */ -typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, xmlCharEncodingHandlerPtr encoder, int compression); +typedef xmlOutputBufferPtr (*xmlOutputBufferCreateFilenameFunc) (const char *URI, + xmlCharEncodingHandlerPtr encoder, + int compression); XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL xmlParserInputBufferCreateFilenameDefault (xmlParserInputBufferCreateFilenameFunc func); @@ -185,7 +189,8 @@ XMLPUBFUN xmlDeregisterNodeFunc XMLCALL xmlThrDefDeregisterNodeDefault(xmlDeregi XMLPUBFUN xmlOutputBufferCreateFilenameFunc XMLCALL xmlThrDefOutputBufferCreateFilenameDefault(xmlOutputBufferCreateFilenameFunc func); XMLPUBFUN xmlParserInputBufferCreateFilenameFunc XMLCALL - xmlThrDefParserInputBufferCreateFilenameDefault(xmlParserInputBufferCreateFilenameFunc func); + xmlThrDefParserInputBufferCreateFilenameDefault( + xmlParserInputBufferCreateFilenameFunc func); /** DOC_DISABLE */ /* @@ -297,7 +302,8 @@ XMLPUBFUN xmlBufferAllocationScheme * XMLCALL __xmlBufferAllocScheme(void); #else XMLPUBVAR xmlBufferAllocationScheme xmlBufferAllocScheme; #endif -XMLPUBFUN xmlBufferAllocationScheme XMLCALL xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v); +XMLPUBFUN xmlBufferAllocationScheme XMLCALL + xmlThrDefBufferAllocScheme(xmlBufferAllocationScheme v); XMLPUBFUN int * XMLCALL __xmlDefaultBufferSize(void); #ifdef LIBXML_THREAD_ENABLED @@ -479,7 +485,8 @@ XMLPUBFUN xmlDeregisterNodeFunc * XMLCALL __xmlDeregisterNodeDefaultValue(void); XMLPUBVAR xmlDeregisterNodeFunc xmlDeregisterNodeDefaultValue; #endif -XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL __xmlParserInputBufferCreateFilenameValue(void); +XMLPUBFUN xmlParserInputBufferCreateFilenameFunc * XMLCALL \ + __xmlParserInputBufferCreateFilenameValue(void); #ifdef LIBXML_THREAD_ENABLED #define xmlParserInputBufferCreateFilenameValue \ (*(__xmlParserInputBufferCreateFilenameValue())) diff --git a/include/reactos/libs/libxml/relaxng.h b/include/reactos/libs/libxml/relaxng.h index bdb0a7d3769..f269c9ec0db 100644 --- a/include/reactos/libs/libxml/relaxng.h +++ b/include/reactos/libs/libxml/relaxng.h @@ -32,7 +32,9 @@ typedef xmlRelaxNG *xmlRelaxNGPtr; * * Signature of an error callback from a Relax-NG validation */ -typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); +typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, + const char *msg, + ...) LIBXML_ATTR_FORMAT(2,3); /** * xmlRelaxNGValidityWarningFunc: @@ -42,7 +44,9 @@ typedef void (XMLCDECL *xmlRelaxNGValidityErrorFunc) (void *ctx, const char *msg * * Signature of a warning callback from a Relax-NG validation */ -typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, const char *msg, ...) LIBXML_ATTR_FORMAT(2,3); +typedef void (XMLCDECL *xmlRelaxNGValidityWarningFunc) (void *ctx, + const char *msg, + ...) LIBXML_ATTR_FORMAT(2,3); /** * A schemas validation context diff --git a/include/reactos/libs/libxml/tree.h b/include/reactos/libs/libxml/tree.h index 7e06686af3c..2f90717c1b4 100644 --- a/include/reactos/libs/libxml/tree.h +++ b/include/reactos/libs/libxml/tree.h @@ -116,8 +116,8 @@ typedef xmlBuf *xmlBufPtr; * A few public routines for xmlBuf. As those are expected to be used * mostly internally the bulk of the routines are internal in buf.h */ -XMLPUBFUN xmlChar* XMLCALL xmlBufContent (const xmlBufPtr buf); -XMLPUBFUN xmlChar* XMLCALL xmlBufEnd (const xmlBufPtr buf); +XMLPUBFUN xmlChar* XMLCALL xmlBufContent (const xmlBuf* buf); +XMLPUBFUN xmlChar* XMLCALL xmlBufEnd (xmlBufPtr buf); XMLPUBFUN size_t XMLCALL xmlBufUse (const xmlBufPtr buf); XMLPUBFUN size_t XMLCALL xmlBufShrink (xmlBufPtr buf, size_t len); @@ -654,7 +654,11 @@ struct _xmlDOMWrapCtxt { /* * Some helper functions */ -#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || defined(LIBXML_DOCB_ENABLED) +#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \ + defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_DEBUG_ENABLED) || \ + defined (LIBXML_HTML_ENABLED) || defined(LIBXML_SAX1_ENABLED) || \ + defined(LIBXML_HTML_ENABLED) || defined(LIBXML_WRITER_ENABLED) || \ + defined(LIBXML_DOCB_ENABLED) || defined(LIBXML_LEGACY_ENABLED) XMLPUBFUN int XMLCALL xmlValidateNCName (const xmlChar *value, int space); @@ -731,14 +735,14 @@ XMLPUBFUN int XMLCALL XMLPUBFUN void XMLCALL xmlBufferEmpty (xmlBufferPtr buf); XMLPUBFUN const xmlChar* XMLCALL - xmlBufferContent (const xmlBufferPtr buf); + xmlBufferContent (const xmlBuffer *buf); XMLPUBFUN xmlChar* XMLCALL xmlBufferDetach (xmlBufferPtr buf); XMLPUBFUN void XMLCALL xmlBufferSetAllocationScheme(xmlBufferPtr buf, xmlBufferAllocationScheme scheme); XMLPUBFUN int XMLCALL - xmlBufferLength (const xmlBufferPtr buf); + xmlBufferLength (const xmlBuffer *buf); /* * Creating/freeing new structures. @@ -754,7 +758,7 @@ XMLPUBFUN xmlDtdPtr XMLCALL const xmlChar *ExternalID, const xmlChar *SystemID); XMLPUBFUN xmlDtdPtr XMLCALL - xmlGetIntSubset (xmlDocPtr doc); + xmlGetIntSubset (const xmlDoc *doc); XMLPUBFUN void XMLCALL xmlFreeDtd (xmlDtdPtr cur); #ifdef LIBXML_LEGACY_ENABLED @@ -842,7 +846,7 @@ XMLPUBFUN xmlNodePtr XMLCALL const xmlChar *content); #endif XMLPUBFUN xmlNodePtr XMLCALL - xmlNewDocText (xmlDocPtr doc, + xmlNewDocText (const xmlDoc *doc, const xmlChar *content); XMLPUBFUN xmlNodePtr XMLCALL xmlNewText (const xmlChar *content); @@ -873,20 +877,20 @@ XMLPUBFUN xmlNodePtr XMLCALL xmlNewCharRef (xmlDocPtr doc, const xmlChar *name); XMLPUBFUN xmlNodePtr XMLCALL - xmlNewReference (xmlDocPtr doc, + xmlNewReference (const xmlDoc *doc, const xmlChar *name); XMLPUBFUN xmlNodePtr XMLCALL - xmlCopyNode (const xmlNodePtr node, + xmlCopyNode (xmlNodePtr node, int recursive); XMLPUBFUN xmlNodePtr XMLCALL - xmlDocCopyNode (const xmlNodePtr node, + xmlDocCopyNode (xmlNodePtr node, xmlDocPtr doc, int recursive); XMLPUBFUN xmlNodePtr XMLCALL xmlDocCopyNodeList (xmlDocPtr doc, - const xmlNodePtr node); + xmlNodePtr node); XMLPUBFUN xmlNodePtr XMLCALL - xmlCopyNodeList (const xmlNodePtr node); + xmlCopyNodeList (xmlNodePtr node); #ifdef LIBXML_TREE_ENABLED XMLPUBFUN xmlNodePtr XMLCALL xmlNewTextChild (xmlNodePtr parent, @@ -906,19 +910,19 @@ XMLPUBFUN xmlNodePtr XMLCALL * Navigating. */ XMLPUBFUN long XMLCALL - xmlGetLineNo (xmlNodePtr node); + xmlGetLineNo (const xmlNode *node); #if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED) XMLPUBFUN xmlChar * XMLCALL - xmlGetNodePath (xmlNodePtr node); + xmlGetNodePath (const xmlNode *node); #endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_DEBUG_ENABLED) */ XMLPUBFUN xmlNodePtr XMLCALL - xmlDocGetRootElement (xmlDocPtr doc); + xmlDocGetRootElement (const xmlDoc *doc); XMLPUBFUN xmlNodePtr XMLCALL - xmlGetLastChild (xmlNodePtr parent); + xmlGetLastChild (const xmlNode *parent); XMLPUBFUN int XMLCALL - xmlNodeIsText (xmlNodePtr node); + xmlNodeIsText (const xmlNode *node); XMLPUBFUN int XMLCALL - xmlIsBlankNode (xmlNodePtr node); + xmlIsBlankNode (const xmlNode *node); /* * Changing the structure. @@ -945,7 +949,7 @@ XMLPUBFUN xmlNodePtr XMLCALL xmlNodePtr cur); #endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_WRITER_ENABLED) */ #if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_HTML_ENABLED) || \ - defined(LIBXML_SCHEMAS_ENABLED) + defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) XMLPUBFUN xmlNodePtr XMLCALL xmlAddPrevSibling (xmlNodePtr cur, xmlNodePtr elem); @@ -986,10 +990,11 @@ XMLPUBFUN xmlNsPtr XMLCALL xmlSearchNsByHref (xmlDocPtr doc, xmlNodePtr node, const xmlChar *href); -#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) +#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) || \ + defined(LIBXML_SCHEMAS_ENABLED) XMLPUBFUN xmlNsPtr * XMLCALL - xmlGetNsList (xmlDocPtr doc, - xmlNodePtr node); + xmlGetNsList (const xmlDoc *doc, + const xmlNode *node); #endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XPATH_ENABLED) */ XMLPUBFUN void XMLCALL @@ -1003,7 +1008,8 @@ XMLPUBFUN xmlNsPtr XMLCALL /* * Changing the content. */ -#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) +#if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \ + defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) XMLPUBFUN xmlAttrPtr XMLCALL xmlSetProp (xmlNodePtr node, const xmlChar *name, @@ -1013,39 +1019,40 @@ XMLPUBFUN xmlAttrPtr XMLCALL xmlNsPtr ns, const xmlChar *name, const xmlChar *value); -#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) */ +#endif /* defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) || \ + defined(LIBXML_SCHEMAS_ENABLED) || defined(LIBXML_HTML_ENABLED) */ XMLPUBFUN xmlChar * XMLCALL - xmlGetNoNsProp (xmlNodePtr node, + xmlGetNoNsProp (const xmlNode *node, const xmlChar *name); XMLPUBFUN xmlChar * XMLCALL - xmlGetProp (xmlNodePtr node, + xmlGetProp (const xmlNode *node, const xmlChar *name); XMLPUBFUN xmlAttrPtr XMLCALL - xmlHasProp (xmlNodePtr node, + xmlHasProp (const xmlNode *node, const xmlChar *name); XMLPUBFUN xmlAttrPtr XMLCALL - xmlHasNsProp (xmlNodePtr node, + xmlHasNsProp (const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace); XMLPUBFUN xmlChar * XMLCALL - xmlGetNsProp (xmlNodePtr node, + xmlGetNsProp (const xmlNode *node, const xmlChar *name, const xmlChar *nameSpace); XMLPUBFUN xmlNodePtr XMLCALL - xmlStringGetNodeList (xmlDocPtr doc, + xmlStringGetNodeList (const xmlDoc *doc, const xmlChar *value); XMLPUBFUN xmlNodePtr XMLCALL - xmlStringLenGetNodeList (xmlDocPtr doc, + xmlStringLenGetNodeList (const xmlDoc *doc, const xmlChar *value, int len); XMLPUBFUN xmlChar * XMLCALL xmlNodeListGetString (xmlDocPtr doc, - xmlNodePtr list, + const xmlNode *list, int inLine); #ifdef LIBXML_TREE_ENABLED XMLPUBFUN xmlChar * XMLCALL - xmlNodeListGetRawString (xmlDocPtr doc, - xmlNodePtr list, + xmlNodeListGetRawString (const xmlDoc *doc, + const xmlNode *list, int inLine); #endif /* LIBXML_TREE_ENABLED */ XMLPUBFUN void XMLCALL @@ -1065,19 +1072,19 @@ XMLPUBFUN void XMLCALL const xmlChar *content, int len); XMLPUBFUN xmlChar * XMLCALL - xmlNodeGetContent (xmlNodePtr cur); + xmlNodeGetContent (const xmlNode *cur); XMLPUBFUN int XMLCALL xmlNodeBufGetContent (xmlBufferPtr buffer, - xmlNodePtr cur); + const xmlNode *cur); XMLPUBFUN int XMLCALL xmlBufGetNodeContent (xmlBufPtr buf, - xmlNodePtr cur); + const xmlNode *cur); XMLPUBFUN xmlChar * XMLCALL - xmlNodeGetLang (xmlNodePtr cur); + xmlNodeGetLang (const xmlNode *cur); XMLPUBFUN int XMLCALL - xmlNodeGetSpacePreserve (xmlNodePtr cur); + xmlNodeGetSpacePreserve (const xmlNode *cur); #ifdef LIBXML_TREE_ENABLED XMLPUBFUN void XMLCALL xmlNodeSetLang (xmlNodePtr cur, @@ -1087,8 +1094,8 @@ XMLPUBFUN void XMLCALL int val); #endif /* LIBXML_TREE_ENABLED */ XMLPUBFUN xmlChar * XMLCALL - xmlNodeGetBase (xmlDocPtr doc, - xmlNodePtr cur); + xmlNodeGetBase (const xmlDoc *doc, + const xmlNode *cur); #if defined(LIBXML_TREE_ENABLED) || defined(LIBXML_XINCLUDE_ENABLED) XMLPUBFUN void XMLCALL xmlNodeSetBase (xmlNodePtr cur, @@ -1234,7 +1241,7 @@ XMLPUBFUN int XMLCALL * Compression. */ XMLPUBFUN int XMLCALL - xmlGetDocCompressMode (xmlDocPtr doc); + xmlGetDocCompressMode (const xmlDoc *doc); XMLPUBFUN void XMLCALL xmlSetDocCompressMode (xmlDocPtr doc, int mode); diff --git a/include/reactos/libs/libxml/xmlIO.h b/include/reactos/libs/libxml/xmlIO.h index 6c241a8dde9..3e41744deb0 100644 --- a/include/reactos/libs/libxml/xmlIO.h +++ b/include/reactos/libs/libxml/xmlIO.h @@ -209,7 +209,7 @@ XMLPUBFUN int XMLCALL xmlParserInputBufferPtr __xmlParserInputBufferCreateFilename(const char *URI, - xmlCharEncoding enc); + xmlCharEncoding enc); #ifdef LIBXML_OUTPUT_ENABLED /* diff --git a/include/reactos/libs/libxml/xmlerror.h b/include/reactos/libs/libxml/xmlerror.h index 537a396c6d8..43e68ca5935 100644 --- a/include/reactos/libs/libxml/xmlerror.h +++ b/include/reactos/libs/libxml/xmlerror.h @@ -86,7 +86,7 @@ struct _xmlError { char *str2; /* extra string information */ char *str3; /* extra string information */ int int1; /* extra number information */ - int int2; /* column number of the error or 0 if N/A (todo: rename this field when we would break ABI) */ + int int2; /* error column # or 0 if N/A (todo: rename field when we would brk ABI) */ void *ctxt; /* the parser context if available */ void *node; /* the node in the tree */ }; diff --git a/include/reactos/libs/libxml/xmlversion.h b/include/reactos/libs/libxml/xmlversion.h index 26517419949..92f1352371a 100644 --- a/include/reactos/libs/libxml/xmlversion.h +++ b/include/reactos/libs/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.9.1" +#define LIBXML_DOTTED_VERSION "2.9.2" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 20901 +#define LIBXML_VERSION 20902 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "20901" +#define LIBXML_VERSION_STRING "20902" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void XMLCALL xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(20901); +#define LIBXML_TEST_VERSION xmlCheckVersion(20902); #ifndef VMS #if 0 diff --git a/lib/3rdparty/bzip2/CMakeLists.txt b/lib/3rdparty/bzip2/CMakeLists.txt index 17126984bfa..e65eba0084b 100644 --- a/lib/3rdparty/bzip2/CMakeLists.txt +++ b/lib/3rdparty/bzip2/CMakeLists.txt @@ -1,6 +1,5 @@ add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) - spec2def(unbzip2.sys unbzip2.spec) list(APPEND SOURCE diff --git a/lib/3rdparty/libxml2/COPYING b/lib/3rdparty/libxml2/COPYING index 417e95531fd..d61318502ca 100644 --- a/lib/3rdparty/libxml2/COPYING +++ b/lib/3rdparty/libxml2/COPYING @@ -2,7 +2,7 @@ Except where otherwise noted in the source code (e.g. the files hash.c, list.c and the trio files, which are covered by a similar licence but with different Copyright notices) all the files are: - Copyright (C) 1998-2003 Daniel Veillard. All Rights Reserved. + Copyright (C) 1998-2012 Daniel Veillard. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -17,11 +17,7 @@ all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON- -NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of Daniel Veillard shall not -be used in advertising or otherwise to promote the sale, use or other deal- -ings in this Software without prior written authorization from him. - +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/lib/3rdparty/libxml2/ChangeLog b/lib/3rdparty/libxml2/ChangeLog index 36045e60c85..08725dd3d2e 100644 --- a/lib/3rdparty/libxml2/ChangeLog +++ b/lib/3rdparty/libxml2/ChangeLog @@ -8139,7 +8139,7 @@ Wed Dec 10 11:16:29 CET 2003 Daniel Veillard Tue Dec 9 23:50:23 CET 2003 Daniel Veillard - * entities.c: fixed an XML entites content serialization + * entities.c: fixed an XML entities content serialization potentially triggered by XInclude, see #126817 Tue Dec 9 16:12:50 CET 2003 Daniel Veillard diff --git a/lib/3rdparty/libxml2/HTMLparser.c b/lib/3rdparty/libxml2/HTMLparser.c index dd0c1ead910..d329d3b5407 100644 --- a/lib/3rdparty/libxml2/HTMLparser.c +++ b/lib/3rdparty/libxml2/HTMLparser.c @@ -1177,7 +1177,7 @@ static const char *const htmlScriptAttributes[] = { "onfocus", "onblur", "onsubmit", - "onrest", + "onreset", "onchange", "onselect" }; @@ -3671,13 +3671,13 @@ htmlParseStartTag(htmlParserCtxtPtr ctxt) { int i; int discardtag = 0; - if (ctxt->instate == XML_PARSER_EOF) - return(-1); if ((ctxt == NULL) || (ctxt->input == NULL)) { htmlParseErr(ctxt, XML_ERR_INTERNAL_ERROR, "htmlParseStartTag: context error\n", NULL, NULL); return -1; } + if (ctxt->instate == XML_PARSER_EOF) + return(-1); if (CUR != '<') return -1; NEXT; @@ -4366,7 +4366,7 @@ static void htmlParseElementInternal(htmlParserCtxtPtr ctxt) { const xmlChar *name; const htmlElemDesc * info; - htmlParserNodeInfo node_info; + htmlParserNodeInfo node_info = { 0, }; int failed; if ((ctxt == NULL) || (ctxt->input == NULL)) { @@ -5991,7 +5991,7 @@ done: ctxt->sax->endDocument(ctxt->userData); } } - if ((ctxt->myDoc != NULL) && + if ((!(ctxt->options & HTML_PARSE_NODEFDTD)) && (ctxt->myDoc != NULL) && ((terminate) || (ctxt->instate == XML_PARSER_EOF) || (ctxt->instate == XML_PARSER_EPILOG))) { xmlDtdPtr dtd; @@ -6288,12 +6288,16 @@ htmlCreateFileParserCtxt(const char *filename, const char *encoding) /* set encoding */ if (encoding) { - content = xmlMallocAtomic (xmlStrlen(content_line) + strlen(encoding) + 1); - if (content) { - strcpy ((char *)content, (char *)content_line); - strcat ((char *)content, (char *)encoding); - htmlCheckEncoding (ctxt, content); - xmlFree (content); + size_t l = strlen(encoding); + + if (l < 1000) { + content = xmlMallocAtomic (xmlStrlen(content_line) + l + 1); + if (content) { + strcpy ((char *)content, (char *)content_line); + strcat ((char *)content, (char *)encoding); + htmlCheckEncoding (ctxt, content); + xmlFree (content); + } } } @@ -6808,6 +6812,7 @@ htmlReadFd(int fd, const char *URL, const char *encoding, int options) if (fd < 0) return (NULL); + xmlInitParser(); xmlInitParser(); input = xmlParserInputBufferCreateFd(fd, XML_CHAR_ENCODING_NONE); @@ -6898,6 +6903,7 @@ htmlCtxtReadDoc(htmlParserCtxtPtr ctxt, const xmlChar * cur, return (NULL); if (ctxt == NULL) return (NULL); + xmlInitParser(); htmlCtxtReset(ctxt); @@ -6931,6 +6937,7 @@ htmlCtxtReadFile(htmlParserCtxtPtr ctxt, const char *filename, return (NULL); if (ctxt == NULL) return (NULL); + xmlInitParser(); htmlCtxtReset(ctxt); @@ -6967,6 +6974,7 @@ htmlCtxtReadMemory(htmlParserCtxtPtr ctxt, const char *buffer, int size, return (NULL); if (buffer == NULL) return (NULL); + xmlInitParser(); htmlCtxtReset(ctxt); @@ -7009,6 +7017,7 @@ htmlCtxtReadFd(htmlParserCtxtPtr ctxt, int fd, return (NULL); if (ctxt == NULL) return (NULL); + xmlInitParser(); htmlCtxtReset(ctxt); @@ -7053,6 +7062,7 @@ htmlCtxtReadIO(htmlParserCtxtPtr ctxt, xmlInputReadCallback ioread, return (NULL); if (ctxt == NULL) return (NULL); + xmlInitParser(); htmlCtxtReset(ctxt); diff --git a/lib/3rdparty/libxml2/HTMLtree.c b/lib/3rdparty/libxml2/HTMLtree.c index 4d8e3542603..5c57fc572bc 100644 --- a/lib/3rdparty/libxml2/HTMLtree.c +++ b/lib/3rdparty/libxml2/HTMLtree.c @@ -716,22 +716,49 @@ htmlAttrDumpOutput(xmlOutputBufferPtr buf, xmlDocPtr doc, xmlAttrPtr cur, (!xmlStrcasecmp(cur->name, BAD_CAST "src")) || ((!xmlStrcasecmp(cur->name, BAD_CAST "name")) && (!xmlStrcasecmp(cur->parent->name, BAD_CAST "a"))))) { - xmlChar *escaped; xmlChar *tmp = value; + /* xmlURIEscapeStr() escapes '"' so it can be safely used. */ + xmlBufCCat(buf->buffer, "\""); while (IS_BLANK_CH(*tmp)) tmp++; - /* - * the < and > have already been escaped at the entity level - * And doing so here breaks server side includes - */ - escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+<>"); - if (escaped != NULL) { - xmlBufWriteQuotedString(buf->buffer, escaped); - xmlFree(escaped); - } else { - xmlBufWriteQuotedString(buf->buffer, value); + /* URI Escape everything, except server side includes. */ + for ( ; ; ) { + xmlChar *escaped; + xmlChar endChar; + xmlChar *end = NULL; + xmlChar *start = (xmlChar *)xmlStrstr(tmp, BAD_CAST ""); + if (end != NULL) { + *start = '\0'; + } + } + + /* Escape the whole string, or until start (set to '\0'). */ + escaped = xmlURIEscapeStr(tmp, BAD_CAST"@/:=?;#%&,+"); + if (escaped != NULL) { + xmlBufCat(buf->buffer, escaped); + xmlFree(escaped); + } else { + xmlBufCat(buf->buffer, tmp); + } + + if (end == NULL) { /* Everything has been written. */ + break; + } + + /* Do not escape anything within server side includes. */ + *start = '<'; /* Restore the first character of "") */ + endChar = *end; + *end = '\0'; + xmlBufCat(buf->buffer, start); + *end = endChar; + tmp = end; } + + xmlBufCCat(buf->buffer, "\""); } else { xmlBufWriteQuotedString(buf->buffer, value); } diff --git a/lib/3rdparty/libxml2/NEWS b/lib/3rdparty/libxml2/NEWS index cdfdda6f8d4..8027d55c0fd 100644 --- a/lib/3rdparty/libxml2/NEWS +++ b/lib/3rdparty/libxml2/NEWS @@ -4,17 +4,647 @@ Note that this is automatically generated from the news webpage at: http://xmlsoft.org/news.html -Items not finished and worked on, get in touch with the list if you want -to help those - More testing on RelaxNG - - Finishing up XML - Schemas - The change log at ChangeLog.html describes the recents commits -to the SVN at -http://svn.gnome.org/viewvc/libxml2/trunk/ +to the GIT at +http://git.gnome.org/browse/libxml2/ code base.Here is the list of public releases: +2.9.2: Oct 16 2014: + - Security: + Fix for CVE-2014-3660 billion laugh variant (Daniel Veillard), + CVE-2014-0191 Do not fetch external parameter entities (Daniel Veillard) + + - Bug Fixes: + fix memory leak xml header encoding field with XML_PARSE_IGNORE_ENC (Bart De Schuymer), + xmlmemory: handle realloc properly (Yegor Yefremov), + Python generator bug raised by the const change (Daniel Veillard), + Windows Critical sections not released correctly (Daniel Veillard), + Parser error on repeated recursive entity expansion containing < (Daniel Veillard), + xpointer : fixing Null Pointers (Gaurav Gupta), + Remove Unnecessary Null check in xpointer.c (Gaurav Gupta), + parser bug on misformed namespace attributes (Dennis Filder), + Pointer dereferenced before null check (Daniel Veillard), + Leak of struct addrinfo in xmlNanoFTPConnect() (Gaurav Gupta), + Possible overflow in HTMLParser.c (Daniel Veillard), + python/tests/sync.py assumes Python dictionaries are ordered (John Beck), + Fix Enum check and missing break (Gaurav Gupta), + xmlIO: Handle error returns from dup() (Philip Withnall), + Fix a problem properly saving URIs (Daniel Veillard), + wrong error column in structured error when parsing attribute values (Juergen Keil), + wrong error column in structured error when skipping whitespace in xml decl (Juergen Keil), + no error column in structured error handler for xml schema validation errors (Juergen Keil), + Couple of Missing Null checks (Gaurav Gupta), + Add couple of missing Null checks (Daniel Veillard), + xmlschemastypes: Fix potential array overflow (Philip Withnall), + runtest: Fix a memory leak on parse failure (Philip Withnall), + xmlIO: Fix an FD leak on gzdopen() failure (Philip Withnall), + xmlcatalog: Fix a memory leak on quit (Philip Withnall), + HTMLparser: Correctly initialise a stack allocated structure (Philip Withnall), + Check for tmon in _xmlSchemaDateAdd() is incorrect (David Kilzer), + Avoid Possible Null Pointer in trio.c (Gaurav Gupta), + Fix processing in SAX2 in case of an allocation failure (Daniel Veillard), + XML Shell command "cd" does not handle "/" at end of path (Daniel Veillard), + Fix various Missing Null checks (Gaurav Gupta), + Fix a potential NULL dereference (Daniel Veillard), + Add a couple of misisng check in xmlRelaxNGCleanupTree (Gaurav Gupta), + Add a missing argument check (Gaurav Gupta), + Adding a check in case of allocation error (Gaurav Gupta), + xmlSaveUri() incorrectly recomposes URIs with rootless paths (Dennis Filder), + Adding some missing NULL checks (Gaurav), + Fixes for xmlInitParserCtxt (Daniel Veillard), + Fix regressions introduced by CVE-2014-0191 patch (Daniel Veillard), + erroneously ignores a validation error if no error callback set (Daniel Veillard), + xmllint was not parsing the --c14n11 flag (Sérgio Batista), + Avoid Possible null pointer dereference in memory debug mode (Gaurav), + Avoid Double Null Check (Gaurav), + Restore context size and position after XPATH_OP_ARG (Nick Wellnhofer), + Fix xmlParseInNodeContext() if node is not element (Daniel Veillard), + Avoid a possible NULL pointer dereference (Gaurav), + Fix xmlTextWriterWriteElement when a null content is given (Daniel Veillard), + Fix an typo 'onrest' in htmlScriptAttributes (Daniel Veillard), + fixing a ptotential uninitialized access (Daniel Veillard), + Fix an fd leak in an error case (Daniel Veillard), + Missing initialization for the catalog module (Daniel Veillard), + Handling of XPath function arguments in error case (Nick Wellnhofer), + Fix a couple of missing NULL checks (Gaurav), + Avoid a possibility of dangling encoding handler (Gaurav), + Fix HTML push parser to accept HTML_PARSE_NODEFDTD (Arnold Hendriks), + Fix a bug loading some compressed files (Mike Alexander), + Fix XPath node comparison bug (Gaurav), + Type mismatch in xmlschemas.c (Gaurav), + Type mismatch in xmlschemastypes.c (Gaurav), + Avoid a deadcode in catalog.c (Daniel Veillard), + run close socket on Solaris, same as we do on other platforms (Denis Pauk), + Fix pointer dereferenced before null check (Gaurav), + Fix a potential NULL dereference in tree code (Daniel Veillard), + Fix potential NULL pointer dereferences in regexp code (Gaurav), + xmllint --pretty crashed without following numeric argument (Tim Galeckas), + Fix XPath expressions of the form '@ns:*' (Nick Wellnhofer), + Fix XPath '//' optimization with predicates (Nick Wellnhofer), + Clear up a potential NULL dereference (Daniel Veillard), + Fix a possible NULL dereference (Gaurav), + Avoid crash if allocation fails (Daniel Veillard), + Remove occasional leading space in XPath number formatting (Daniel Veillard), + Fix handling of mmap errors (Daniel Veillard), + Catch malloc error and exit accordingly (Daniel Veillard), + missing else in xlink.c (Ami Fischman), + Fix a parsing bug on non-ascii element and CR/LF usage (Daniel Veillard), + Fix a regression in xmlGetDocCompressMode() (Daniel Veillard), + properly quote the namespace uris written out during c14n (Aleksey Sanin), + Remove premature XInclude check on URI being relative (Alexey Neyman), + Fix missing break on last() function for attributes (dcb), + Do not URI escape in server side includes (Romain Bondue), + Fix an error in xmlCleanupParser (Alexander Pastukhov) + + - Documentation: + typo in error messages "colon are forbidden from..." (Daniel Veillard), + Fix a link to James SAX documentation old page (Daniel Veillard), + Fix typos in relaxng.c (Jan Pokorný), + Fix a doc typo (Daniel Veillard), + Fix typos in {tree,xpath}.c (errror) (Jan Pokorný), + Add limitations about encoding conversion (Daniel Veillard), + Fix typos in xmlschemas{,types}.c (Jan Pokorný), + Fix incorrect spelling entites->entities (Jan Pokorný), + Forgot to document 2.9.1 release, regenerate docs (Daniel Veillard) + + - Portability: + AC_CONFIG_FILES and executable bit (Roumen Petrov), + remove HAVE_CONFIG_H dependency in testlimits.c (Roumen Petrov), + fix some tabs mixing incompatible with python3 (Roumen Petrov), + Visual Studio 14 CTP defines snprintf() (Francis Dupont), + OS400: do not try to copy unexisting doc files (Patrick Monnerat), + OS400: use either configure.ac or configure.in. (Patrick Monnerat), + os400: make-src.sh: create physical file with target CCSID (Patrick Monnerat), + OS400: Add some more C macros equivalent procedures. (Patrick Monnerat), + OS400: use C macros to implement equivalent RPG support procedures. (Patrick Monnerat), + OS400: implement XPath macros as procedures for ILE/RPG support. (Patrick Monnerat), + OS400: include in distribution tarball. (Patrick Monnerat), + OS400: Add README: compilation directives and OS/400 specific stuff. (Patrick Monnerat), + OS400: Add compilation scripts. (Patrick Monnerat), + OS400: ILE RPG language header files. (Patrick Monnerat), + OS400: implement some macros as functions for ILE/RPG language support (that as no macros). (Patrick Monnerat), + OS400: UTF8<-->EBCDIC wrappers for system and external library calls (Patrick Monnerat), + OS400: Easy character transcoding support (Patrick Monnerat), + OS400: iconv functions compatibility wrappers and table builder. (Patrick Monnerat), + OS400: create architecture directory. Implement dlfcn emulation. (Patrick Monnerat), + Fix building when configuring without xpath and xptr (Daniel Veillard), + configure: Add --with-python-install-dir (Jonas Eriksson), + Fix compilation with minimum and xinclude. (Nicolas Le Cam), + Compile out use of xmlValidateNCName() when not available. (Nicolas Le Cam), + Fix compilation with minimum and schematron. (Nicolas Le Cam), + Legacy needs xmlSAX2StartElement() and xmlSAX2EndElement(). (Nicolas Le Cam), + Don't use xmlValidateName() when not available. (Nicolas Le Cam), + Fix a portability issue on Windows (Longstreth Jon), + Various portability patches for OpenVMS (Jacob (Jouk) Jansen), + Use specific macros for portability to OS/400 (Patrick Monnerat), + Add macros needed for OS/400 portability (Patrick Monnerat), + Portability patch for fopen on OS/400 (Patrick Monnerat), + Portability fixes for OS/400 (Patrick Monnerat), + Improve va_list portability (Patrick Monnerat), + Portability fix (Patrick Monnerat), + Portability fix (Patrick Monnerat), + Generic portability fix (Patrick Monnerat), + Shortening lines in headers (Patrick Monnerat), + build: Use pkg-config to find liblzma in preference to AC_CHECK_LIB (Philip Withnall), + build: Add @LZMA_LIBS@ to libxml’s pkg-config files (Philip Withnall), + fix some tabs mixing incompatible with python3 (Daniel Veillard), + add additional defines checks for support "./configure --with-minimum" (Denis Pauk), + Another round of fixes for older versions of Python (Arfrever Frehtes Taifersar Arahesis), + python: fix drv_libxml2.py for python3 compatibility (Alexandre Rostovtsev), + python: Fix compiler warnings when building python3 bindings (Armin K), + Fix for compilation with python 2.6.8 (Petr Sumbera) + + - Improvements: + win32/libxml2.def.src after rebuild in doc (Roumen Petrov), + elfgcchack.h: more legacy needs xmlSAX2StartElement() and xmlSAX2EndElement() (Roumen Petrov), + elfgcchack.h: add xmlXPathNodeEval and xmlXPathSetContextNode (Roumen Petrov), + Provide cmake module (Samuel Martin), + Fix a couple of issues raised by make dist (Daniel Veillard), + Fix and add const qualifiers (Kurt Roeckx), + Preparing for upcoming release of 2.9.2 (Daniel Veillard), + Fix zlib and lzma libraries check via command line (Dmitriy), + wrong error column in structured error when parsing end tag (Juergen Keil), + doc/news.html: small update to avoid line join while generating NEWS. (Patrick Monnerat), + Add methods for python3 iterator (Ron Angeles), + Support element node traversal in document fragments. (Kyle VanderBeek), + xmlNodeSetName: Allow setting the name to a substring of the currently set name (Tristan Van Berkom), + Added macros for argument casts (Eric Zurcher), + adding init calls to xml and html Read parsing entry points (Daniel Veillard), + Get rid of 'REPLACEMENT CHARACTER' Unicode chars in xmlschemas.c (Jan Pokorný), + Implement choice for name classes on attributes (Shaun McCance), + Two small namespace tweaks (Daniel Veillard), + xmllint --memory should fail on empty files (Daniel Veillard), + Cast encoding name to char pointer to match arg type (Nikolay Sivov) + + - Cleanups: + Removal of old configure.in (Daniel Veillard), + Unreachable code in tree.c (Gaurav Gupta), + Remove a couple of dead conditions (Gaurav Gupta), + Avoid some dead code and cleanup in relaxng.c (Gaurav), + Drop not needed checks (Denis Pauk), + Fix a wrong test (Daniel Veillard) + + + +2.9.1: Apr 19 2013: + - Features: + Support for Python3 (Daniel Veillard), + Add xmlXPathSetContextNode and xmlXPathNodeEval (Alex Bligh) + + - Documentation: + Add documentation for xmllint --xpath (Daniel Veillard), + Fix the URL of the SAX documentation from James (Daniel Veillard), + Fix spelling of "length". (Michael Wood) + + - Portability: + Fix python bindings with versions older than 2.7 (Daniel Veillard), + rebuild docs:Makefile.am (Roumen Petrov), + elfgcchack.h after rebuild in doc (Roumen Petrov), + elfgcchack for buf module (Roumen Petrov), + Fix a uneeded and wrong extra link parameter (Daniel Veillard), + Few cleanup patches for Windows (Denis Pauk), + Fix rpmbuild --nocheck (Mark Salter), + Fix for win32/configure.js and WITH_THREAD_ALLOC (Daniel Richard), + Fix Broken multi-arch support in xml2-config (Daniel Veillard), + Fix a portability issue for GCC < 3.4.0 (Daniel Veillard), + Windows build fixes (Daniel Richard), + Fix a thread portability problem (Friedrich Haubensak), + Downgrade autoconf requirement to 2.63 (Daniel Veillard) + + - Bug Fixes: + Fix a linking error for python bindings (Daniel Veillard), + Fix a couple of return without value (Jüri Aedla), + Improve the hashing functions (Daniel Franke), + Improve handling of xmlStopParser() (Daniel Veillard), + Remove risk of lockup in dictionary initialization (Daniel Veillard), + Activate detection of encoding in external subset (Daniel Veillard), + Fix an output buffer flushing conversion bug (Mikhail Titov), + Fix an old bug in xmlSchemaValidateOneElement (Csaba László), + Fix configure cannot remove messages (Gilles Espinasse), + fix schema validation in combination with xsi:nil (Daniel Veillard), + xmlCtxtReadFile doesn't work with literal IPv6 URLs (Steve Wolf), + Fix a few problems with setEntityLoader (Alexey Neyman), + Detect excessive entities expansion upon replacement (Daniel Veillard), + Fix the flushing out of raw buffers on encoding conversions (Daniel, +Veillard), + Fix some buffer conversion issues (Daniel Veillard), + When calling xmlNodeDump make sure we grow the buffer quickly (Daniel, +Veillard), + Fix an error in the progressive DTD parsing code (Dan Winship), + xmllint should not load DTD by default when using the reader (Daniel, +Veillard), + Try IBM-037 when looking for EBCDIC handlers (Petr Sumbera), + Fix potential out of bound access (Daniel Veillard), + Fix large parse of file from memory (Daniel Veillard), + Fix a bug in the nsclean option of the parser (Daniel Veillard), + Fix a regression in 2.9.0 breaking validation while streaming (Daniel, +Veillard), + Remove potential calls to exit() (Daniel Veillard) + + - Improvements: + Regenerated API, and testapi, rebuild documentation (Daniel Veillard), + Fix tree iterators broken by 2to3 script (Daniel Veillard), + update all tests for Python3 and Python2 (Daniel Veillard), + A few more fixes for python 3 affecting libxml2.py (Daniel Veillard), + Fix compilation on Python3 (Daniel Veillard), + Converting apibuild.py to python3 (Daniel Veillard), + First pass at starting porting to python3 (Daniel Veillard), + updated configure.in for python3 (Daniel Veillard), + Add support for xpathRegisterVariable in Python (Shaun McCance), + Added a regression tests from bug 694228 data (Daniel Veillard), + Cache presence of '<' in entities content (Daniel Veillard), + Avoid extra processing on entities (Daniel Veillard), + Python binding for xmlRegisterInputCallback (Alexey Neyman), + Python bindings: DOM casts everything to xmlNode (Alexey Neyman), + Define LIBXML_THREAD_ALLOC_ENABLED via xmlversion.h (Tim Starling), + Adding streaming validation to runtest checks (Daniel Veillard), + Add a --pushsmall option to xmllint (Daniel Veillard) + + - Cleanups: + Switched comment in file to UTF-8 encoding (Daniel Veillard), + Extend gitignore (Daniel Veillard), + Silent the new python test on input (Alexey Neyman), + Cleanup of a duplicate test (Daniel Veillard), + Cleanup on duplicate test expressions (Daniel Veillard), + Fix compiler warning after 153cf15905cf4ec080612ada6703757d10caba1e (Patrick, +Gansterer), + Spec cleanups and a fix for multiarch support (Daniel Veillard), + Silence a clang warning (Daniel Veillard), + Cleanup the Copyright to be pure MIT Licence wording (Daniel Veillard), + rand_seed should be static in dict.c (Wouter Van Rooy), + Fix typos in parser comments (Jan Pokorný) + + + +2.9.0: Sep 11 2012: + - Features: + A few new API entry points, + More resilient push parser mode, + A lot of portability improvement, + Faster XPath evaluation + + - Documentation: + xml2-config.1 markup error (Christian Weisgerber), + libxml(3) manpage typo fix (John Bradshaw), + More cleanups to the documentation part of libxml2 (Daniel Richard G) + + - Portability: + Bug 676544 - fails to build with --without-sax1 (Akira TAGOH), + fix builds not having stdint.h (Rob Richards), + GetProcAddressA is available only on WinCE (Daniel Veillard), + More updates and cleanups on autotools and Makefiles (Daniel Richard G), + More changes for Win32 compilation (Eric Zurcher), + Basic changes for Win32 builds of release 2.9.0: compile buf.c (Eric Zurcher), + Bundles all generated files for python into the distribution (Daniel Richard G), + Fix compiler warnings of wincecompat.c (Patrick Gansterer), + Fix non __GNUC__ build (Patrick Gansterer), + Fix windows unicode build (Patrick Gansterer), + clean redefinition of {v}snprintf in C-source (Roumen Petrov), + use xmlBuf... if DEBUG_INPUT is defined (Roumen Petrov), + fix runtests to use pthreads support for various Unix platforms (Daniel Richard G), + Various "make distcheck" and portability fixups 2nd part (Daniel Richard G), + Various "make distcheck" and portability fixups (Daniel Richard G), + Fix compilation on older Visual Studio (Daniel Veillard) + + - Bug Fixes: + Change the XPath code to percolate allocation errors (Daniel Veillard), + Fix reuse of xmlInitParser (Daniel Veillard), + Fix potential crash on entities errors (Daniel Veillard), + initialize var (Rob Richards), + Fix the XPath arity check to also check the XPath stack limits (Daniel Veillard), + Fix problem with specific and generic error handlers (Pietro Cerutti), + Avoid a potential infinite recursion (Daniel Veillard), + Fix an XSD error when generating internal automata (Daniel Veillard), + Patch for xinclude of text using multibyte characters (Vitaly Ostanin), + Fix a segfault on XSD validation on pattern error (Daniel Veillard), + Fix missing xmlsave.h module which was ignored in recent builds (Daniel Veillard), + Add a missing element check (Daniel Veillard), + Adding various checks on node type though the API (Daniel Veillard), + Namespace nodes can't be unlinked with xmlUnlinkNode (Daniel Veillard), + Fix make dist to include new private header files (Daniel Veillard), + More fixups on the push parser behaviour (Daniel Veillard), + Strengthen behaviour of the push parser in problematic situations (Daniel Veillard), + Enforce XML_PARSER_EOF state handling through the parser (Daniel Veillard), + Fixup limits parser (Daniel Veillard), + Do not fetch external parsed entities (Daniel Veillard), + Fix an error in previous commit (Aron Xu), + Fix entities local buffers size problems (Daniel Veillard), + Fix parser local buffers size problems (Daniel Veillard), + Fix a failure to report xmlreader parsing failures (Daniel Veillard) + + - Improvements: + Keep libxml2.syms when running "make distclean" (Daniel Veillard), + Allow to set the quoting character of an xmlWriter (Csaba Raduly), + Keep non-significant blanks node in HTML parser (Daniel Veillard), + Add a forbidden variable error number and message to XPath (Daniel Veillard), + Support long path names on WNT (Michael Stahl), + Improve HTML escaping of attribute on output (Daniel Veillard), + Handle ICU_LIBS as LIBADD, not LDFLAGS to prevent linking errors (Arfrever Frehtes Taifersar Arahesis), + Switching XPath node sorting to Timsort (Vojtech Fried), + Optimizing '//' in XPath expressions (Nick Wellnhofer), + Expose xmlBufShrink in the public tree API (Daniel Veillard), + Visible HTML elements close the head tag (Conrad Irwin), + Fix file and line report for XSD SAX and reader streaming validation (Daniel Veillard), + Fix const qualifyer to definition of xmlBufferDetach (Daniel Veillard), + minimize use of HAVE_CONFIG_H (Roumen Petrov), + fixup regression in Various "make distcheck" and portability fixups (Roumen Petrov), + Add support for big line numbers in error reporting (Daniel Veillard), + Avoid using xmlBuffer for serialization (Daniel Veillard), + Improve compatibility between xmlBuf and xmlBuffer (Daniel Veillard), + Provide new accessors for xmlOutputBuffer (Daniel Veillard), + Improvements for old buffer compatibility (Daniel Veillard), + Expand the limit test program (Daniel Veillard), + Improve error reporting on parser errors (Daniel Veillard), + Implement some default limits in the XPath module (Daniel Veillard), + Introduce some default parser limits (Daniel Veillard), + Cleanups and new limit APIs for dictionaries (Daniel Veillard), + Fixup for buf.c (Daniel Veillard), + Cleanup URI module memory allocation code (Daniel Veillard), + Extend testlimits (Daniel Veillard), + More avoid quadratic behaviour (Daniel Veillard), + Impose a reasonable limit on PI size (Daniel Veillard), + first version of testlimits new test (Daniel Veillard), + Avoid quadratic behaviour in some push parsing cases (Daniel Veillard), + Impose a reasonable limit on comment size (Daniel Veillard), + Impose a reasonable limit on attribute size (Daniel Veillard), + Harden the buffer code and make it more compatible (Daniel Veillard), + More cleanups for input/buffers code (Daniel Veillard), + Cleanup function xmlBufResetInput(), to set input from Buffer (Daniel Veillard) + Swicth the test program for characters to new input buffers (Daniel Veillard), + Convert the HTML tree module to the new buffers (Daniel Veillard), + Convert of the HTML parser to new input buffers (Daniel Veillard), + Convert the writer to new output buffer and save APIs (Daniel Veillard), + Convert XMLReader to the new input buffers (Daniel Veillard), + New saving functions using xmlBuf and conversion (Daniel Veillard), + Provide new xmlBuf based saving functions (Daniel Veillard), + Convert XInclude to the new input buffers (Daniel Veillard), + Convert catalog code to the new input buffers (Daniel Veillard), + Convert C14N to the new Input buffer (Daniel Veillard), + Convert xmlIO.c to the new input and output buffers (Daniel Veillard), + Convert XML parser to the new input buffers (Daniel Veillard), + Incompatible change to the Input and Output buffers (Daniel Veillard), + Adding new encoding function to deal with the new structures (Daniel Veillard), + Convert XPath to xmlBuf (Daniel Veillard), + Adding a new buf module for buffers (Daniel Veillard), + Memory error within SAX2 reuse common framework (Daniel Veillard), + Fix xmllint --xpath node initialization (Daniel Veillard) + + - Cleanups: + Various cleanups to avoid compiler warnings (Daniel Veillard), + Big space and tab cleanup (Daniel Veillard), + Followup to LibXML2 docs/examples cleanup patch (Daniel Veillard), + Second round of cleanups for LibXML2 docs/examples (Daniel Richard), + Remove all .cvsignore as they are not used anymore (Daniel Veillard), + Fix a Timsort function helper comment (Daniel Veillard), + Small cleanup for valgrind target (Daniel Veillard), + Patch for portability of latin characters in C files (Daniel Veillard), + Cleanup some of the parser code (Daniel Veillard), + Fix a variable name in comment (Daniel Veillard), + Regenerated testapi.c (Daniel Veillard), + Regenerating docs and API files (Daniel Veillard), + Small cleanup of unused variables in test (Daniel Veillard), + Expand .gitignore with more files (Daniel Veillard) + + + +2.8.0: May 23 2012: + - Features: + add lzma compression support (Anders F Bjorklund) + + - Documentation: + xmlcatalog: Add uri and delegateURI to possible add types in man page. (Ville Skyttä), + Update README.tests (Daniel Veillard), + URI handling code is not OOM resilient (Daniel Veillard), + Fix an error in comment (Daniel Veillard), + Fixed bug #617016 (Daniel Mustieles), + Fixed two typos in the README document (Daniel Neel), + add generated html files (Anders F Bjorklund), + Clarify the need to use xmlFreeNode after xmlUnlinkNode (Daniel Veillard), + Improve documentation a bit (Daniel Veillard), + Updated URL for lxml python bindings (Daniel Veillard) + + - Portability: + Restore code for Windows compilation (Daniel Veillard), + Remove git error message during configure (Christian Dywan), + xmllint: Build fix for endTimer if !defined(HAVE_GETTIMEOFDAY) (Patrick R. Gansterer), + remove a bashism in confgure.in (John Hein), + undef ERROR if already defined (Patrick R. Gansterer), + Fix library problems with mingw-w64 (Michael Cronenworth), + fix windows build. ifdef addition from bug 666491 makes no sense (Rob Richards), + prefer native threads on win32 (Sam Thursfield), + Allow to compile with Visual Studio 2010 (Thomas Lemm), + Fix mingw's snprintf configure check (Andoni Morales), + fixed a 64bit big endian issue (Marcus Meissner), + Fix portability failure if netdb.h lacks NO_ADDRESS (Daniel Veillard), + Fix windows build from lzma addition (Rob Richards), + autogen: Only check for libtoolize (Colin Walters), + Fix the Windows build files (Patrick von Reth), + 634846 Remove a linking option breaking Windows VC10 (Daniel Veillard), + 599241 fix an initialization problem on Win64 (Andrew W. Nosenko), + fix win build (Rob Richards) + + - Bug fixes: + Part for rand_r checking missing (Daniel Veillard), + Cleanup on randomization (Daniel Veillard), + Fix undefined reference in python module (Pacho Ramos), + Fix a race in xmlNewInputStream (Daniel Veillard), + Fix weird streaming RelaxNG errors (Noam), + Fix various bugs in new code raised by the API checking (Daniel Veillard), + Fix various problems with "make dist" (Daniel Veillard), + Fix a memory leak in the xzlib code (Daniel Veillard), + HTML parser error with