Ros-diffs October 2020

ros-diffs@reactos.org

22 participants
156 discussions

[reactos] 01/03: [PSEH2_TEST] Fix compilation with MSVC

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1fa9fdb625d0be01d0245… commit 1fa9fdb625d0be01d02456a8482d17122f147684 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Mon Mar 9 22:17:22 2020 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 24 13:26:33 2020 +0200 [PSEH2_TEST] Fix compilation with MSVC --- modules/rostests/tests/CMakeLists.txt | 4 +--- modules/rostests/tests/pseh2/psehtest.c | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/modules/rostests/tests/CMakeLists.txt b/modules/rostests/tests/CMakeLists.txt index 78164342591..0fc1ed4c2bd 100644 --- a/modules/rostests/tests/CMakeLists.txt +++ b/modules/rostests/tests/CMakeLists.txt @@ -1,6 +1,4 @@ add_subdirectory(mmixer_test) -if(NOT MSVC) - add_subdirectory(pseh2) -endif() +add_subdirectory(pseh2) add_subdirectory(dllexport) add_subdirectory(spec2def) diff --git a/modules/rostests/tests/pseh2/psehtest.c b/modules/rostests/tests/pseh2/psehtest.c index dbd0e1e56c4..242b3ecff8e 100644 --- a/modules/rostests/tests/pseh2/psehtest.c +++ b/modules/rostests/tests/pseh2/psehtest.c @@ -2417,7 +2417,7 @@ DEFINE_TEST(test_unvolatile) _SEH2_TRY { val = return_one(); - *((char*)0xc0000000) = 0; + *((char*)(intptr_t)0xc0000000) = 0; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -2435,7 +2435,7 @@ DEFINE_TEST(test_unvolatile_2) _SEH2_TRY { val = 1; - *((char*)0xc0000000) = 0; + *((char*)(intptr_t)0xc0000000) = 0; val = 2; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2467,7 +2467,7 @@ DEFINE_TEST(test_unvolatile_3) _SEH2_TRY { val2 = 1; - *((char*)0xc0000000) = 0; + *((char*)(intptr_t)0xc0000000) = 0; val2 = 2; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2477,7 +2477,7 @@ DEFINE_TEST(test_unvolatile_3) _SEH2_END; val1 = 2; - *((int*)0xc0000000) = 1; + *((int*)(intptr_t)0xc0000000) = 1; val1 = 3; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -2511,7 +2511,7 @@ DEFINE_TEST(test_unvolatile_4) _SEH2_TRY { - *(char*)0x80000000 = 1; + *(char*)(intptr_t)0x80000000 = 1; } _SEH2_EXCEPT(result == 0xdeadbeef) { @@ -2539,7 +2539,7 @@ DEFINE_TEST(test_finally_goto) _SEH2_FINALLY { val |= 4; - *((char*)0xdeadc0de) = 0; + *((char*)(intptr_t)0xdeadc0de) = 0; val |= 8; } _SEH2_END; @@ -2547,7 +2547,7 @@ DEFINE_TEST(test_finally_goto) val |= 16; next: val |= 32; - *((char*)0xdeadc0de) = 0; + *((char*)(intptr_t)0xdeadc0de) = 0; val |= 64; } _SEH2_EXCEPT(1) @@ -2569,19 +2569,19 @@ DEFINE_TEST(test_nested_exception) _SEH2_TRY { val |= 2; - *((char*)0xdeadc0de) = 0; + *((char*)(intptr_t)0xdeadc0de) = 0; val |= 4; } _SEH2_EXCEPT(1) { val |= 8; - *((char*)0xdeadc0de) = 0; + *((char*)(intptr_t)0xdeadc0de) = 0; val |= 16; } _SEH2_END; val |= 32; - *((char*)0xdeadc0de) = 0; + *((char*)(intptr_t)0xdeadc0de) = 0; val |= 64; } _SEH2_EXCEPT(1) @@ -2644,14 +2644,14 @@ int call_test(int (* func)(void)) static int ret; static struct volatile_context before, after; static LPTOP_LEVEL_EXCEPTION_FILTER prev_unhandled_exception; -#ifndef _PSEH3_H_ +#if !defined(_PSEH3_H_) && !defined(_MSC_VER) static _SEH2Registration_t * prev_frame; _SEH2Registration_t passthrough_frame; #endif prev_unhandled_exception = SetUnhandledExceptionFilter(&unhandled_exception); -#if defined(_X86_) && !defined(_PSEH3_H_) +#if defined(_X86_) && !defined(_PSEH3_H_) && !defined(_MSC_VER) prev_frame = (_SEH2Registration_t *)__readfsdword(0); passthrough_frame.SER_Prev = prev_frame; passthrough_frame.SER_Handler = passthrough_handler; @@ -2687,7 +2687,7 @@ int call_test(int (* func)(void)) ret = func(); #endif -#if defined(_X86_) && !defined(_PSEH3_H_) +#if defined(_X86_) && !defined(_PSEH3_H_) && !defined(_MSC_VER) if((_SEH2Registration_t *)__readfsdword(0) != &passthrough_frame || passthrough_frame.SER_Prev != prev_frame) { trace("exception registration list corrupted\n");

3 years, 11 months

[reactos] 01/01: [SHELL32] PL-pl Dialogs fix v2

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16d8190f513976044f845… commit 16d8190f513976044f845cda75dff87acce4b277 Author: Piotr Hetnarowicz <40692062+pithwz(a)users.noreply.github.com> AuthorDate: Thu May 14 17:47:44 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 24 10:20:59 2020 +0200 [SHELL32] PL-pl Dialogs fix v2 shell32.dll PL-pl -FIXED: invisible icon,text & description --- dll/win32/shell32/lang/pl-PL.rc | 142 ++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/dll/win32/shell32/lang/pl-PL.rc b/dll/win32/shell32/lang/pl-PL.rc index 46403617508..0f900b4163f 100644 --- a/dll/win32/shell32/lang/pl-PL.rc +++ b/dll/win32/shell32/lang/pl-PL.rc @@ -186,23 +186,23 @@ BEGIN ICON "", IDC_SHORTCUT_ICON, 8, 8, 21, 20, WS_VISIBLE EDITTEXT IDC_SHORTCUT_TEXT, 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 "Typ docelowy:", IDC_SHORTCUT_TYPE, 8, 38, 68, 10 - EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 37, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Lokalizacja docelowa:", IDC_SHORTCUT_LOCATION, 8, 55, 71, 10 - EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 53, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Element docelowy:", IDC_SHORTCUT_TARGET, 8, 71, 68, 10 + LTEXT "Typ docelowy:", IDC_SHORTCUT_TYPE, 7, 38, 68, 10 + EDITTEXT IDC_SHORTCUT_TYPE_EDIT, 79, 38, 150, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "Lokalizacja docelowa:", IDC_SHORTCUT_LOCATION, 7, 55, 71, 10 + EDITTEXT IDC_SHORTCUT_LOCATION_EDIT, 79, 55, 150, 14, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + LTEXT "&Element docelowy:", IDC_SHORTCUT_TARGET, 7, 71, 68, 10 EDITTEXT IDC_SHORTCUT_TARGET_TEXT, 79, 69, 150, 14, ES_AUTOHSCROLL LTEXT "", -1, 8, 88, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "&Rozpocznij w:", IDC_SHORTCUT_START_IN, 8, 98, 68, 10 + LTEXT "&Rozpocznij w:", IDC_SHORTCUT_START_IN, 7, 98, 68, 10 EDITTEXT IDC_SHORTCUT_START_IN_EDIT, 79, 96, 150, 14, ES_AUTOHSCROLL - LTEXT "Klawisz &skrótu:", IDC_SHORTCUT_KEY, 8, 117, 68, 10 + LTEXT "Klawisz &skrótu:", IDC_SHORTCUT_KEY, 7, 117, 68, 10 CONTROL "", IDC_SHORTCUT_KEY_HOTKEY, "msctls_hotkey32", WS_VISIBLE | WS_CHILD | WS_BORDER | WS_TABSTOP, 79, 115, 150, 14 - LTEXT "U&ruchom:", IDC_SHORTCUT_RUN, 8, 136, 68, 10 + LTEXT "U&ruchom:", IDC_SHORTCUT_RUN, 7, 136, 68, 10 COMBOBOX IDC_SHORTCUT_RUN_COMBO, 79, 134, 150, 14, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP - LTEXT "K&omentarz:", IDC_SHORTCUT_COMMENT, 8, 154, 68, 10 + LTEXT "K&omentarz:", IDC_SHORTCUT_COMMENT, 7, 154, 68, 10 EDITTEXT IDC_SHORTCUT_COMMENT_EDIT, 79, 152, 150, 14, ES_AUTOHSCROLL - PUSHBUTTON "&Znajdź element docelowy...", IDC_SHORTCUT_FIND, 5, 172, 96, 14, ES_LEFT - PUSHBUTTON "Zmień &ikonę...", IDC_SHORTCUT_CHANGE_ICON, 106, 172, 55, 14, ES_LEFT + PUSHBUTTON "&Znajdź element docelowy...", IDC_SHORTCUT_FIND, 7, 172, 96, 14, ES_LEFT + PUSHBUTTON "Zmień &ikonę...", IDC_SHORTCUT_CHANGE_ICON, 107, 172, 55, 14, ES_LEFT PUSHBUTTON "Z&aawansowane...", IDC_SHORTCUT_ADVANCED, 166, 172, 63, 14, ES_LEFT END @@ -227,25 +227,25 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT - LTEXT "Typ:", 14004, 8, 40, 55, 10 - CONTROL "Katalog", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 58, 40, 170, 10 + LTEXT "Typ:", 14004, 8, 40, 42, 10 + CONTROL "Katalog", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL, 73, 40, 155, 12 LTEXT "", -1, 8, 31, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Lokalizacja:", 14008, 8, 56, 55, 10 - EDITTEXT 14009, 73, 56, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP + EDITTEXT 14009, 73, 56, 155, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Rozmiar:", 14010, 8, 72, 55, 10 - EDITTEXT 14011, 73, 72, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT 14011, 73, 72, 155, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Rozmiar na dysku:", 140101, 8, 88, 60, 10 - EDITTEXT 14012, 73, 88, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT 14012, 73, 88, 155, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Zawiera:", 14026, 8, 104, 55, 10 - EDITTEXT 14027, 73, 104, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT 14027, 73, 104, 155, 12, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 120, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Utworzony:", 14014, 8, 128, 55, 10 + LTEXT "Utworzony:", 14014, 8, 128, 55, 12 EDITTEXT 14015, 73, 128, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atrybuty:", 14020, 8, 152, 46, 10 AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 151, 70, 10 - AUTOCHECKBOX "&Ukryty", 14022, 130, 151, 70, 10 - AUTOCHECKBOX "&Archiwalny", 14023, 181, 151, 70, 10 + AUTOCHECKBOX "&Ukryty", 14022, 130, 151, 50, 10 + AUTOCHECKBOX "&Archiwalny", 14023, 181, 151, 50, 10 PUSHBUTTON "Zaawa&nsowane...", 14028, 158, 170, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -279,10 +279,10 @@ BEGIN EDITTEXT 14019, 73, 163, 155, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Atrybuty:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 188, 67, 10 - AUTOCHECKBOX "&Ukryty", 14022, 130, 188, 50, 10 + AUTOCHECKBOX "&Tylko do odczytu", 14021, 58, 188, 70, 10 + AUTOCHECKBOX "&Ukryty", 14022, 130, 188, 36, 10 AUTOCHECKBOX "&Archiwalny", 14023, 181, 188, 49, 10 - PUSHBUTTON "Zaawa&nsowane...", 14028, 168, 205, 67, 15, WS_TABSTOP + PUSHBUTTON "Zaawa&nsowane...", 14028, 168, 205, 67, 14, WS_TABSTOP END IDD_FILE_VERSION DIALOGEX 0, 0, 235, 215 @@ -342,17 +342,17 @@ CAPTION "Narzędzia" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Sprawdzanie błędów", -1, 5, 5, 230, 60 - ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 25, 21, 20 - LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu błędów.", -1, 40, 25, 160, 17 - PUSHBUTTON "&Sprawdź...", 14000, 130, 45, 100, 15, WS_TABSTOP + ICON IDI_SHELL_TOOLS_CHKDSK, IDC_STATIC, 13, 22, 21, 20 + LTEXT "Ta opcja sprawdzi wolumin w poszukiwaniu błędów.", -1, 40, 22, 190, 17 + PUSHBUTTON "&Sprawdź...", 14000, 130, 43, 100, 14, WS_TABSTOP GROUPBOX "Defragmentacja", -1, 5, 69, 230, 60 - ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 89, 21, 20 - LTEXT "Ta opcja dokona defragmentacji plików woluminu.", -1, 40, 89, 160, 17 - PUSHBUTTON "&Defragmentuj...", 14001, 130, 109, 100, 15, WS_TABSTOP + ICON IDI_SHELL_TOOLS_DEFRAG, IDC_STATIC, 13, 86, 21, 20 + LTEXT "Ta opcja dokona defragmentacji plików woluminu.", -1, 40, 86, 190, 17 + PUSHBUTTON "&Defragmentuj...", 14001, 130, 107, 100, 14, WS_TABSTOP GROUPBOX "&Kopia zapasowa", -1, 5, 133, 230, 60 - ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 153, 21, 20 - LTEXT "Ta opcja wykona kopię zapasową plików tego woluminu.", -1, 40, 153, 160, 17 - PUSHBUTTON "Wykonaj kopię zapasową...", 14002, 130, 173, 100, 15, WS_TABSTOP + ICON IDI_SHELL_TOOLS_BACKUP, IDC_STATIC, 13, 150, 21, 20 + LTEXT "Ta opcja wykona kopię zapasową plików tego woluminu.", -1, 40, 150, 190, 17 + PUSHBUTTON "Wykonaj kopię zapasową...", 14002, 130, 171, 100, 14, WS_TABSTOP END IDD_DRIVE_HARDWARE DIALOGEX 0, 0, 240, 230 @@ -403,50 +403,50 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_SHELL_OPEN_WITH, -1, 7, 7, 21, 20 LTEXT "Wybierz program, którego chcesz użyć do otwarcia tego pliku:", -1, 36, 7, 215, 10 - LTEXT "Plik: ", 14001, 36, 19, 212, 16 + LTEXT "Plik: ", 14001, 36, 23, 212, 14 GROUPBOX "&Programy", -1, 7, 36, 249, 192 - CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,54, 230, 130 - AUTOCHECKBOX "&Zawsze używaj wybranego programu do otwierania tego typu plików", 14003, 16, 192, 234, 10 - PUSHBUTTON "&Przeglądaj...", 14004, 188, 208, 60, 14 + CONTROL "Programy", 14002, WC_TREEVIEW, WS_BORDER | WS_TABSTOP | TVS_SHOWSELALWAYS, 16 ,49, 230, 130 + AUTOCHECKBOX "&Zawsze używaj wybranego programu do otwierania tego typu plików", 14003, 16, 186, 234, 10 + PUSHBUTTON "&Przeglądaj...", 14004, 188, 206, 60, 14 DEFPUSHBUTTON "OK", IDOK, 150, 236, 50, 14 PUSHBUTTON "Anuluj", IDCANCEL, 206, 236, 50, 14 END -IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 256 +IDD_FOLDER_OPTIONS_GENERAL DIALOGEX 0, 0, 264, 231 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Ogólne" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Zadania", -1, 7, 10, 249, 45 - CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 25, 21, 20 - AUTORADIOBUTTON "Pokaż popularne zadania w &katalogach", IDC_FOLDER_OPTIONS_COMMONTASKS, 40, 25, 180, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Użyj klasycznych katalogów systemu &ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 40, 37, 180, 10 - GROUPBOX "Przeglądanie katalogów", -1, 7, 60, 249, 45, WS_TABSTOP - CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 70, 21, 20 - AUTORADIOBUTTON "Otwórz każdy katalog w tym &samym oknie", IDC_FOLDER_OPTIONS_SAMEWINDOW, 40, 75, 180, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Otwórz każdy katalog w &osobnym oknie", IDC_FOLDER_OPTIONS_OWNWINDOW, 40, 87, 180, 10 - GROUPBOX "Działanie przycisków myszki", -1, 7, 110, 249, 60 - CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 120, 21, 20 - AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 40, 120, 214, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Dwukrotne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 40, 156, 210, 10 - AUTORADIOBUTTON "Podkreśl tytuły ikon zgodnych z używ&aną przeglądarką", IDC_FOLDER_OPTIONS_ULBROWSER, 50, 132, 189, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po ich wskazaniu", IDC_FOLDER_OPTIONS_ULPOINT, 50, 144, 200, 10 - PUSHBUTTON "Przywróć &domyślne", IDC_FOLDER_OPTIONS_RESTORE, 167, 179, 90, 14, WS_TABSTOP -END - -IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 + GROUPBOX "Zadania", -1, 7, 7, 249, 37 + CONTROL "", IDC_FOLDER_OPTIONS_TASKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 18, 21, 20 + AUTORADIOBUTTON "Pokaż popularne zadania w &katalogach", IDC_FOLDER_OPTIONS_COMMONTASKS, 41, 18, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Użyj klasycznych katalogów systemu &ReactOS", IDC_FOLDER_OPTIONS_CLASSICFOLDERS, 41, 29, 180, 10 + GROUPBOX "Przeglądanie katalogów", -1, 7, 51, 249, 38, WS_TABSTOP + CONTROL "", IDC_FOLDER_OPTIONS_FOLDERICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 63, 21, 20 + AUTORADIOBUTTON "Otwórz każdy katalog w tym &samym oknie", IDC_FOLDER_OPTIONS_SAMEWINDOW, 41, 63, 180, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Otwórz każdy katalog w &osobnym oknie", IDC_FOLDER_OPTIONS_OWNWINDOW, 41, 74, 180, 10 + GROUPBOX "Działanie przycisków myszki", -1, 7, 96, 249, 60 + CONTROL "", IDC_FOLDER_OPTIONS_CLICKICON, "Static", SS_ICON | WS_CHILD | WS_VISIBLE, 14, 108, 21, 20 + AUTORADIOBUTTON "&Pojedyncze kliknięcie by otworzyć cel (najechanie by wskazać)", IDC_FOLDER_OPTIONS_SINGLECLICK, 41, 108, 214, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Dwukrotne kliknięcie by otworzyć (pojedyncze by wskazać)", IDC_FOLDER_OPTIONS_DOUBLECLICK, 41, 141, 210, 10 + AUTORADIOBUTTON "Podkreśl tytuły ikon zgodnych z używ&aną przeglądarką", IDC_FOLDER_OPTIONS_ULBROWSER, 54, 119, 189, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Podkreślaj &tytuły ikon tylko po ich wskazaniu", IDC_FOLDER_OPTIONS_ULPOINT, 54, 130, 151, 10 + PUSHBUTTON "Przywróć &domyślne", IDC_FOLDER_OPTIONS_RESTORE, 167, 164, 90, 14, WS_TABSTOP +END + +IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 274, 231 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Widok" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Widoki folderów", -1, 7, 10, 249, 60 + GROUPBOX "Widoki folderu", -1, 10, 5, 256, 55 ICON IDI_SHELL_PROGRAMS_FOLDER2, IDC_STATIC, 20, 20, 21, 20 - LTEXT "Widok, którego używasz dla tego folderu (taki jak Szczegóły lub Kafelki), możesz zastosować do wszystkich folderów.", -1, 20, 20, 210, 20 - PUSHBUTTON "Zastosuj do w&szystkich folderów", IDC_VIEW_APPLY_TO_ALL, 19, 50, 120, 14, WS_TABSTOP - PUSHBUTTON "&Resetuj wszystkie foldery", IDC_VIEW_RESET_ALL, 149, 50, 100, 14, WS_TABSTOP - LTEXT "Ustawienia zaawansowane:", -1, 7, 80, 100, 10 - CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 7, 90, 249, 120 - PUSHBUTTON "Przywróć &domyślne", IDC_VIEW_RESTORE_DEFAULTS, 160, 220, 90, 14, WS_TABSTOP + LTEXT "Widok, którego używasz dla tego folderu (taki jak Szczegóły lub Kafelki), możesz zastosować do wszystkich folderów.", -1, 56, 14, 202, 20 + PUSHBUTTON "Zastosuj do w&szystkich folderów", IDC_VIEW_APPLY_TO_ALL, 56, 35, 111, 14, WS_TABSTOP + PUSHBUTTON "&Resetuj wszystkie foldery", IDC_VIEW_RESET_ALL, 171, 35, 88, 14, WS_TABSTOP + LTEXT "Ustawienia zaawansowane:", -1, 10, 70, 100, 10 + CONTROL "", IDC_VIEW_TREEVIEW, "SysTreeView32", WS_BORDER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | TVS_DISABLEDRAGDROP | TVS_LINESATROOT, 1, 80, 256, 120 + PUSHBUTTON "Przywróć &domyślne", IDC_VIEW_RESTORE_DEFAULTS, 196, 210, 70, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256 @@ -456,15 +456,15 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN LTEXT "Zarejestrowane &typy plików:", -1, 7, 8, 110, 8 CONTROL "", IDC_FILETYPES_LISTVIEW, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 18, 251, 115 - PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 132, 140, 55, 14, WS_TABSTOP - PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 192, 140, 65, 14, WS_TABSTOP + PUSHBUTTON "&Nowy", IDC_FILETYPES_NEW, 154, 140, 50, 14, WS_TABSTOP + PUSHBUTTON "&Usuń", IDC_FILETYPES_DELETE, 208, 140, 50, 14, WS_TABSTOP GROUPBOX "Szczegóły dla rozszerzenia '%s'", IDC_FILETYPES_DETAILS_GROUPBOX, 7, 165, 251, 80 - LTEXT "Otwierane za pomocą:", -1, 14, 175, 40, 16 - CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 87, 175, 10, 10 - LTEXT "Nazwa Aplikacji", IDC_FILETYPES_APPNAME, 102, 175, 80, 14 - PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 190, 175, 60, 14, WS_TABSTOP - LTEXT "", IDC_FILETYPES_DESCRIPTION, 14, 196, 160, 40 - PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 192, 210, 60, 14, WS_TABSTOP + LTEXT "Otwierane za pomocą:", -1, 14, 178, 75, 16 + CONTROL "", IDC_FILETYPES_ICON, "STATIC", SS_BITMAP | SS_REALSIZEIMAGE, 89, 178, 10, 10 + LTEXT "Nazwa Aplikacji", IDC_FILETYPES_APPNAME, 107, 178, 80, 14 + PUSHBUTTON "Z&mień", IDC_FILETYPES_CHANGE, 191, 175, 60, 14, WS_TABSTOP + LTEXT "", IDC_FILETYPES_DESCRIPTION, 14, 196, 230, 24 + PUSHBUTTON "Zaawa&nsowane", IDC_FILETYPES_ADVANCED, 191, 227, 60, 14, WS_TABSTOP END IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 282, 143 @@ -951,7 +951,7 @@ BEGIN IDS_SHLEXEC_NOASSOC "Żaden program nie jest skonfigurowany, by otwierać pliki tego typu." IDS_FILE_DETAILS "Szczegóły dla rozszerzenia '%s'" - IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' są typu '%s'. Aby zmienić ustawienia, które dotyczą wszystkich plików '%s', kliknij przycisk Zaawansowane." + IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' są typu '%s'. Aby zmienić ustawienia odnoszące się do wszystkich plików '%s', kliknij przycisk Zaawansowane." IDS_FILE_TYPES "Typy plików" IDS_COLUMN_EXTENSION "Rozszerzenia"

3 years, 11 months

[reactos] 01/01: [MLANG] Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be08d69bc3663bc5531a5… commit be08d69bc3663bc5531a5e5a64a372b9f60e7b74 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Wed Jun 24 20:41:44 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Oct 24 10:17:05 2020 +0200 [MLANG] Fix scripts values in fnIMLangFontLink2_GetScriptFontInfo() MSVC: '...\mlang.c(3568): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)' Import https://source.winehq.org/git/wine.git/commit/2dc0758b5d0fe4ef49b7d0635299e… --- dll/win32/mlang/mlang.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/mlang/mlang.c b/dll/win32/mlang/mlang.c index 372a7f4334b..e96b2f767a7 100644 --- a/dll/win32/mlang/mlang.c +++ b/dll/win32/mlang/mlang.c @@ -3565,7 +3565,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { if (j >= *puiFonts) break; - pScriptFont[j].scripts = 1 << mlang_data[i].sid; + pScriptFont[j].scripts = (SCRIPT_IDS)1 << mlang_data[i].sid; if (dwFlags == SCRIPTCONTF_FIXED_FONT) { MultiByteToWideChar(CP_ACP, 0, mlang_data[i].fixed_font, -1,

3 years, 11 months

[reactos] 01/01: [DOC] Make "3rd Party Files.txt" a main source about 3rd party projects

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=119f102f6337e736bc2b2… commit 119f102f6337e736bc2b25acba08e44e58454e5f Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Sat Oct 24 06:34:55 2020 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Oct 24 06:34:55 2020 +0300 [DOC] Make "3rd Party Files.txt" a main source about 3rd party projects - Add path and license information to "3rd Party Files.txt" - Merge README.FSD with it - Rename README.WINE to WINESYNC.txt --- media/doc/3rd Party Files.txt | 258 ++++++++++++++++++++++++-------- media/doc/README.FSD | 35 ----- media/doc/{README.WINE => WINESYNC.txt} | 0 3 files changed, 192 insertions(+), 101 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index 5b2ff47e5b0..346d8dbd84d 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -1,104 +1,230 @@ -Files synced with various file system upstreams can be found in /media/doc/README.FSD -Files synced with Wine can be found in /media/doc/README.WINE +This file contains 3rd party projects which are used by the ReactOS +Files synced with Wine can be found in /media/doc/WINESYNC.txt -Other things synced with other projects: +Projects are sorted alphabetically by a path. +SPDX identifier of a license was used where possible. +Please update this file when you port/sync an external project. -Title: Liberation Fonts -Used Version: 2.00.1 -Website: https://fedorahosted.org/liberation-fonts/ -Title: DejaVu Fonts -Used Version: 2.37 -Website: http://dejavu.sourceforge.net +Title: DXTN OpenGL Compression Libs +Path: dll/3rdparty/dxtn +Used Version: 1.1 +License: MIT (https://spdx.org/licenses/MIT.html) +URL: http://www.geocities.com/dborca/opengl/tc.html -Title: Ubuntu Fonts -Used Version: 0.83 -Website: http://font.ubuntu.com +Title: libjpeg +Path: dll/3rdparty/libjpeg +Used Version: 9d +License: custom, BSD-like +URL: http://www.ijg.org/ -Title: Open Sans Fonts -Used Version: 1.10 -Website: http://www.google.com/fonts/specimen/Open+Sans +Title: libpng +Path: dll/3rdparty/libpng +Used Version: 1.6.37 +License: PNG Reference Library version 2 +URL: http://libpng.sourceforge.net/ -Title: DXTN OpenGL Compression Libs -Used Version: 1.1 -Website: http://www.geocities.com/dborca/opengl/tc.html +Title: libtiff +Path: dll/3rdparty/libtiff +Used Version: 4.1.0 +License: libtiff (https://spdx.org/licenses/libtiff.html) +URL: http://www.simplesystems.org/libtiff/ -Title: FreeType -Used Version: 2.9.0 -Website: http://www.freetype.org +Title: Libxslt +Path: dll/3rdparty/libxslt +Used Version: 1.1.34 +License: MIT (https://spdx.org/licenses/MIT.html) +URL: http://xmlsoft.org + +Title: mbed TLS +Path: dll/3rdparty/mbedtls +Used Version: 2.7.16 +License: Apache-2.0 (https://spdx.org/licenses/Apache-2.0.html) +URL: https://tls.mbed.org/ Title: Mesa3D +Path: dll/opengl/mesa Used Version: 2.6 -Website: http://www.mesa3d.org +License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) +URL: http://www.mesa3d.org Title: Mesa3D glu libary +Path: dll/opengl/glu32 Used Version: 9.0.1 -Website: https://gitlab.freedesktop.org/mesa/glu | ftp://ftp.freedesktop.org/pub/mesa/glu/ - -Title: GNU adns -Used Version: 1.0 REV 5 -Website: http://www.gnu.org/software/adns/ | http://adns.jgaa.com +License: SGI-B-2.0 (https://spdx.org/licenses/SGI-B-2.0.html) +URL: https://gitlab.freedesktop.org/mesa/glu, ftp://ftp.freedesktop.org/pub/mesa/glu/ -Title: LibXML -Used Version: 2.9.10 -Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ +Title: ACPICA +Path: drivers/bus/acpi/acpica +Used Version: 20200925 +License: GPL-2.0 (https://spdx.org/licenses/GPL-2.0.html) +URL: https://acpica.org/ + +Title: WinBtrfs +Path: dll/shellext/shellbtrfs +Path: drivers/filesystems/btrfs +Path: sdk/lib/fslib/btrfslib +Used Version: 1.7.2 +License: LGPL-3.0-or-later (https://spdx.org/licenses/LGPL-3.0-or-later.html) +URL: https://github.com/maharmstone/btrfs + +Title: Microsoft CDFS File System Driver +Path: drivers/filesystems/cdfs +Used Version: git commit f73e552 +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/filesys + +Title: Ext2Fsd +Path: drivers/filesystems/ext2 +Path: sdk/lib/fslib/ext2lib +Used Version: 0.69 +License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) +URL: http://www.ext2fsd.com + +Title: FFS/UFS file system driver for Windows +Path: drivers/filesystems/ffs +Used Version: 0.5.2 +License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) +URL: http://www.acc.umu.se/~bosse/ + +Title: NFSv4.1 Client for Windows +Path: base/services/nfsd +Path: dll/3rdparty/libtirpc +Path: dll/np/nfs +Path: drivers/filesystems/nfs +Used Version: ??? (Imported on 2017.06.18.) +License: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later.html) +URL: http://www.citi.umich.edu/projects/nfsv4/windows/readme.html + +Title: ReiserFS file system driver for Windows +Path: drivers/filesystems/reiserfs +Used Version: 0.26 +License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) +URL: http://www.acc.umu.se/~bosse/ + +Title: Microsoft fastfat File System Driver +Path: drivers/filesystems/fastfat_new +Used Version: git commit 16022c5 +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/filesys + +Title: Microsoft CDROM Storage Class Driver +Path: drivers/storage/class/cdrom_new +Used Version: git commit 96eb96d +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage + +Title: Microsoft ClassPnP Storage Class Driver Library +Path: drivers/storage/class/classpnp +Used Version: git commit 88541f7 +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage + +Title: Microsoft Disk Class Driver +Path: drivers/storage/class/disk_new +Used Version: git commit 3428c5f +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage + +Title: Microsoft Super Floppy (sfloppy) Storage Class Driver +Path: drivers/storage/floppy_new +Used Version: git commit 8fb512a +License: MS-PL (https://spdx.org/licenses/MS-PL.html) +URL: https://github.com/microsoft/Windows-driver-samples/tree/master/storage -Title: Libxslt -Used Version: 1.1.34 -Website: http://xmlsoft.org +Title: DejaVu Fonts +Path: media/fonts +Used Version: 2.37 +License: media/fonts/doc/DejaVu/LICENSE.txt +URL: http://dejavu.sourceforge.net -Title: ZLib -Used Version: 1.2.11 -Website: http://www.zlib.net +Title: Open Sans Fonts +Path: media/fonts +Used Version: 1.10 +License: Apache-2.0 (https://spdx.org/licenses/Apache-2.0.html) +URL: http://www.google.com/fonts/specimen/Open+Sans Title: GNU FreeFont +Path: media/fonts Used Version: 2012-05-03 -Website: http://savannah.gnu.org/projects/freefont/ +License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) +URL: http://savannah.gnu.org/projects/freefont/ + +Title: GNU adns +Path: sdk/lib/adns +Used Version: 1.0 REV 5 +License: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later.html) +URL: http://www.gnu.org/software/adns/, http://adns.jgaa.com Title: CardLib +Path: sdk/lib/cardlib Used Version: 2005-07-14 -Website: http://www.catch22.net/tuts/cardlib +License: +URL: http://www.catch22.net/tuts/cardlib -Title: libsamplerate -Used Version: 0.1.9 -Website: http://www.mega-nerd.com/SRC/download.html +Title: lwIP - A Lightweight TCP/IP stack +Path: sdk/lib/drivers/lwip +Used Version: 1.4.1 +License: Modified BSD License (sdk/lib/drivers/lwip/COPYING) +URL: https://savannah.nongnu.org/projects/lwip/ -Title: libmpg123 (used by winemp3.acm) +Title: FreeType +Path: sdk/lib/freetype +Used Version: 2.9.0 +License: FTL (https://spdx.org/licenses/FTL.html) +URL: http://www.freetype.org + +Title: dosfstools +Path: sdk/lib/fslib/vfatlib/check +Used Version: 4.1 +License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) +URL: https://github.com/dosfstools/dosfstools + +Title: libmpg123 (used by winemp3.acm) +Path: sdk/lib/libmpg123 Used Version: 1.26.1 -Website: http://www.mpg123.de/ +License: LGPL-2.1 (https://spdx.org/licenses/LGPL-2.1.html) +URL: http://www.mpg123.de/ -Title: STLport -Used Version: 5.2.1 -Website: http://stlport.sourceforge.net/ +Title: libsamplerate +Path: sdk/lib/libsamplerate +Used Version: 0.1.9 +License: BSD-2-Clause (https://spdx.org/licenses/BSD-2-Clause.html) +URL: http://www.mega-nerd.com/SRC/download.html Title: win-iconv +Path: sdk/lib/libwin-iconv Used Version: git commit 8765259 -Website: https://github.com/win-iconv/win-iconv +License: +URL: https://github.com/win-iconv/win-iconv -Title: libjpeg -Used Version: 9d -Website: http://www.ijg.org/ - -Title: libtiff -Used Version: 4.1.0 -Website: http://www.simplesystems.org/libtiff/ - -Title: mbed TLS -Used Version: 2.7.16 -Website: https://tls.mbed.org/ +Title: LibXML +Path: sdk/lib/libxml2 +Used Version: 2.9.10 +License: MIT (https://spdx.org/licenses/MIT.htmlf) +URL: http://xmlsoft.org, ftp://xmlsoft.org/libxml2/ -Title: libpng -Used Version: 1.6.37 -Website: http://libpng.sourceforge.net/ +Title: STLport +Path: sdk/lib/stlport +Used Version: 5.2.1 +License: BSD-2-Clause (https://spdx.org/licenses/BSD-2-Clause.html) +URL: http://stlport.sourceforge.net/ -Title: ACPICA -Used Version: 20200925 -Website: https://acpica.org/ +Title: ZLib +Path: sdk/lib/zlib +Used Version: 1.2.11 +License: Zlib (https://spdx.org/licenses/Zlib.html) +URL: http://www.zlib.net Title: Schily Tools, mkisofs +Path: sdk/tools/mkisofs/schilytools Used Version: schily-2017-09-07 -Website: https://sourceforge.net/projects/schilytools/ +License: CDDL-1.0 (https://spdx.org/licenses/CDDL-1.0.html) +URL: https://sourceforge.net/projects/schilytools/ Title: chmc and lzxcomp +Path: sdk/tools/hhpcomp/chmc +Path: sdk/tools/hhpcomp/lzx_compress Used Version: ??? (Imported on 2015.08.11.) -Website: https://sourceforge.net/projects/chmc/ +License: GPL-3.0-or-later (https://spdx.org/licenses/GPL-3.0-or-later.html) +URL: https://sourceforge.net/projects/chmc/ diff --git a/media/doc/README.FSD b/media/doc/README.FSD deleted file mode 100644 index 83137d81a5c..00000000000 --- a/media/doc/README.FSD +++ /dev/null @@ -1,35 +0,0 @@ -# ReactOS FSD porting/syncing reference file -# Update this file when you port/sync a FSD from an external source. - -The following FSD are shared with: https://github.com/maharmstone/btrfs. - -dll/shellext/shellbtrfs # Synced to 1.7.2 -drivers/filesystems/btrfs # Synced to 1.7.2 -sdk/lib/fslib/btrfslib # Synced to 1.7.2 - -The following FSD are shared with: http://www.ext2fsd.com/ - -drivers/filesystems/ext2 # Synced to 0.69 - -The following FSD are shared with: http://www.acc.umu.se/~bosse/ - -drivers/filesystems/ffs # Synced to 0.5.2 -drivers/filesystems/reiserfs # Synced to 0.26 - -The following FSD are shared with: https://github.com/Microsoft/Windows-driver-samples - -drivers/filesystems/cdfs # Synced to f73e552 -drivers/filesystems/fastfat_new # Synced to 16022c5 -drivers/storage/class/disk_new # Forked. (Imported on 2012.01.26 (r55211, from Windows XP DDK), merged to trunk on 2012.02.12 (r55555).) -drivers/storage/floppy_new # Synced to 8fb512a - -The following FSD are shared with: ??? ('nfs41 project'. See CORE-8204.) - -base/services/nfsd # ??? (Imported on 2017.06.19.) -dll/3rdparty/libtirpc # ??? (Imported on 2017.06.18.) -dll/np/nfs # ??? (Imported on 2017.06.18.) -drivers/filesystems/nfs # ??? (Imported on 2017.06.18.) - -The following FS libs are shared with: https://github.com/dosfstools/dosfstools - -sdk/lib/fslib/vfatlib/check # Synced to 4.1 diff --git a/media/doc/README.WINE b/media/doc/WINESYNC.txt similarity index 100% rename from media/doc/README.WINE rename to media/doc/WINESYNC.txt

3 years, 11 months

[reactos] 01/01: [CMAKE] MSVC RUNTIME_CHECKS is a 'Debug'-only feature

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a2a6038e562e1936d737b… commit a2a6038e562e1936d737bac6cb623cbd74b0f1e2 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Jun 2 21:27:07 2020 +0200 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Sat Oct 24 04:28:16 2020 +0300 [CMAKE] MSVC RUNTIME_CHECKS is a 'Debug'-only feature "cl : Command line error D8016 : '/Ox' and '/RTC1' command-line options are incompatible" Addendum to 92dfec219d8c53a84c68ca069abbc170fc8bdb49. --- CMakeLists.txt | 2 ++ sdk/cmake/config-amd64.cmake | 4 +++- sdk/cmake/config-arm.cmake | 4 +++- sdk/cmake/config.cmake | 5 +++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f56a025651..e8cced5d1fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,8 @@ if(NOT CMAKE_VERSION MATCHES "ReactOS") message(WARNING "Building with \"${CMAKE_COMMAND}\", which is not the custom CMake included in RosBE, might cause build issues...") endif() +include(CMakeDependentOption) + project(REACTOS) # Versioning diff --git a/sdk/cmake/config-amd64.cmake b/sdk/cmake/config-amd64.cmake index 058d4518acb..46a9293d2eb 100644 --- a/sdk/cmake/config-amd64.cmake +++ b/sdk/cmake/config-amd64.cmake @@ -44,5 +44,7 @@ set(USERMODE TRUE CACHE BOOL if(MSVC) set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") - option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) + # RTC are incompatible with compiler optimizations. + cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON + "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) endif() diff --git a/sdk/cmake/config-arm.cmake b/sdk/cmake/config-arm.cmake index b9f2e2028f9..3290d76a166 100644 --- a/sdk/cmake/config-arm.cmake +++ b/sdk/cmake/config-arm.cmake @@ -45,5 +45,7 @@ set(NEWSPRINTF FALSE CACHE BOOL "Whether to compile the new sprintf.") if(MSVC) - option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) + # RTC are incompatible with compiler optimizations. + cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON + "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) endif() diff --git a/sdk/cmake/config.cmake b/sdk/cmake/config.cmake index d9897426bd8..01c1ac760db 100644 --- a/sdk/cmake/config.cmake +++ b/sdk/cmake/config.cmake @@ -83,8 +83,9 @@ set(_PREFAST_ FALSE CACHE BOOL "Whether to enable PREFAST while compiling.") set(_VS_ANALYZE_ FALSE CACHE BOOL "Whether to enable static analysis while compiling.") - - option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON) + # RTC are incompatible with compiler optimizations. + cmake_dependent_option(RUNTIME_CHECKS "Whether to enable runtime checks on MSVC" ON + "CMAKE_BUILD_TYPE STREQUAL \"Debug\"" OFF) endif() if(GCC)

3 years, 11 months

[reactos] 01/01: [CMAKE] Make unattended bootcd configurable via cmake

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de401183624beaafe72b5… commit de401183624beaafe72b5d54e44b87ad0c7f33c7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Fri Oct 23 09:24:18 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Fri Oct 23 10:31:57 2020 +0200 [CMAKE] Make unattended bootcd configurable via cmake Instead of messing around with a file in the source tree and risk commiting it use cmake -DUNATTENDED_BOOTCD=yes to enable it, and use the UNATTENDED_BOOTCD_* cache variables to configure --- boot/bootdata/CMakeLists.txt | 2 +- boot/bootdata/bootcd/CMakeLists.txt | 42 ++++++++++++++++++++++ .../bootcd/{unattend.inf => unattend.inf.in} | 30 ++++++++-------- 3 files changed, 58 insertions(+), 16 deletions(-) diff --git a/boot/bootdata/CMakeLists.txt b/boot/bootdata/CMakeLists.txt index f1e6153f8a7..90a54bdc60b 100644 --- a/boot/bootdata/CMakeLists.txt +++ b/boot/bootdata/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(packages) +add_subdirectory(bootcd) # Common hives @@ -61,7 +62,6 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hybridcd.ini DESTINATION root NAME_ # Unattend add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/unattend.inf DESTINATION reactos NO_CAB FOR regtest) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd/unattend.inf DESTINATION reactos NO_CAB FOR livecd) # LiveCD shortcuts diff --git a/boot/bootdata/bootcd/CMakeLists.txt b/boot/bootdata/bootcd/CMakeLists.txt new file mode 100644 index 00000000000..8c164f7b687 --- /dev/null +++ b/boot/bootdata/bootcd/CMakeLists.txt @@ -0,0 +1,42 @@ +set(UNATTENDED_BOOTCD "no" CACHE STRING "Whether to build a self-installing bootcd (yes/no)") + +function(add_unattended_bootcd_option _var _default _doc) + if (UNATTENDED_BOOTCD STREQUAL "yes") + set(${_var} "${_default}" CACHE STRING ${_doc}) + endif() +endfunction() + +add_unattended_bootcd_option(UNATTENDED_BOOTCD_DestinationDiskNumber "0" + "The Disk Number ReactOS will be installed on during bootcd unattended setup") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_DestinationPartitionNumber "1" + "The Partition Number ReactOS will be installed on during bootcd unattended setup") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_InstallationDirectory "ReactOS" + "The directory ReactOS will be installed in during bootcd unattended setup") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_MBRInstallType "2" + "MBR installation type during bootcd unattended setup: 0: skip, 1: On floppy, 2: On HDD") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_FullName "MyName" + "The user name used for unattended bootcd installation") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_OrgName "" + "The organisation name used for unattended bootcd installation (None if empty)") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_ComputerName "MYCOMPUTERNAME" + "The computer name used for unattended bootcd installation") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_AdminPassword "" + "The administrator password used for unattended bootcd installation (None if empty)") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_FormatPartition "1" + "Whether to format the partition during bootcd unattended setup. 0: Don't format, 1: Format)") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_AutoPartition "1" + "Whether to automatically create the partition during bootcd unattended setup. 0: Don't create partition, 1: Create partition") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_FsType "0" + "The filesystem used during bootcd unattended setup. 0: FAT, 1: BTRFS") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_DisableGeckoInst "no" + "Whether to disable the Gecko module installation. (yes/no)") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_LocaleID "409" + "The locale used during bootcd unattended setup. See hivesys.inf for values") +add_unattended_bootcd_option(UNATTENDED_BOOTCD_ProductOption "0" + "The product installed during bootcd unattended setup. 0: Server, 1: WorkStation") + +if (UNATTENDED_BOOTCD STREQUAL "yes") + configure_file(unattend.inf.in unattend.inf @ONLY) + add_cd_file(FILE ${CMAKE_CURRENT_BINARY_DIR}/unattend.inf DESTINATION reactos NO_CAB FOR bootcd) +endif() + diff --git a/boot/bootdata/bootcd/unattend.inf b/boot/bootdata/bootcd/unattend.inf.in similarity index 67% rename from boot/bootdata/bootcd/unattend.inf rename to boot/bootdata/bootcd/unattend.inf.in index ce5593788e2..651d6fa022e 100644 --- a/boot/bootdata/bootcd/unattend.inf +++ b/boot/bootdata/bootcd/unattend.inf.in @@ -4,22 +4,22 @@ Signature = "$ReactOS$" ; Set UnattendSetupEnabled to yes in order to get unattended setup working ; yes - unattend setup enabled ; no - unattend setup disabled -UnattendSetupEnabled = no +UnattendSetupEnabled = @UNATTENDED_BOOTCD@ ; Install to \Device\Harddisk0\Partition1\ReactOS -DestinationDiskNumber = 0 -DestinationPartitionNumber = 1 -InstallationDirectory=ReactOS +DestinationDiskNumber = @UNATTENDED_BOOTCD_DestinationDiskNumber@ +DestinationPartitionNumber = @UNATTENDED_BOOTCD_DestinationPartitionNumber@ +InstallationDirectory=@UNATTENDED_BOOTCD_InstallationDirectory@ ; MBRInstallType=0 skips MBR installation ; MBRInstallType=1 install MBR on floppy ; MBRInstallType=2 install MBR on hdd -MBRInstallType=2 +MBRInstallType=@UNATTENDED_BOOTCD_MBRInstallType@ -FullName="MyName" -;OrgName="MyOrg" -ComputerName="MYCOMPUTERNAME" -;AdminPassword="MyPassword" +FullName="@UNATTENDED_BOOTCD_FullName@" +OrgName="@UNATTENDED_BOOTCD_OrgName@" +ComputerName="@UNATTENDED_BOOTCD_ComputerName@" +AdminPassword="@UNATTENDED_BOOTCD_AdminPassword@" ; TimeZone is set GMT as default TimeZoneIndex=85 @@ -30,33 +30,33 @@ TimeZoneIndex=85 ; enable this setting to format the selected partition ; 1 - format enabled ; 0 - format disabled -FormatPartition=1 +FormatPartition=@UNATTENDED_BOOTCD_FormatPartition@ ; enable this setting to automatically create a partition ; during installation ; 1 - enabled ; 0 - disabled -AutoPartition = 1 +AutoPartition = @UNATTENDED_BOOTCD_AutoPartition@ ; choose default file system type ; 0 - FAT ; 1 - BtrFS -FsType = 0 +FsType = @UNATTENDED_BOOTCD_FsType@ ; enable this setting to disable Gecko install ; yes - disabled ; no - enabled -DisableGeckoInst = no +DisableGeckoInst = @UNATTENDED_BOOTCD_DisableGeckoInst@ ; set this option to automatically ; specify language in 2nd mode setup ; see hivesys.inf for available languages -LocaleID = 409 +LocaleID = @UNATTENDED_BOOTCD_LocaleID@ ; set product option ; 0: ReactOS Server ; 1: ReactOS Workstation -ProductOption = 0 +ProductOption = @UNATTENDED_BOOTCD_ProductOption@ ; enable this section to automatically launch programs ; after 3rd boot

3 years, 11 months

[reactos] 05/05: [CMAKE] Use an INTERFACE library to perform the msvcrt <-> msvcrtex binding

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=23e04ae1eec666118a235… commit 23e04ae1eec666118a2359a17fc442e0332c258b Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 16:29:40 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 18:07:27 2020 +0200 [CMAKE] Use an INTERFACE library to perform the msvcrt <-> msvcrtex binding --- dll/win32/msvcrt/CMakeLists.txt | 14 +++++++++++--- sdk/cmake/CMakeMacros.cmake | 6 ------ sdk/lib/crt/msvcrtex.cmake | 3 +++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dll/win32/msvcrt/CMakeLists.txt b/dll/win32/msvcrt/CMakeLists.txt index 2b558d18191..2e0c6625971 100644 --- a/dll/win32/msvcrt/CMakeLists.txt +++ b/dll/win32/msvcrt/CMakeLists.txt @@ -1,6 +1,14 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/crt/include) -spec2def(msvcrt.dll msvcrt.spec ADD_IMPORTLIB) +spec2def(msvcrt.dll msvcrt.spec) + +# The msvcrt <-> msvcrtex trick +generate_import_lib(libmsvcrt_real msvcrt.dll msvcrt.spec) +add_library(libmsvcrt INTERFACE) +target_compile_definitions(libmsvcrt INTERFACE _DLL __USE_CRTIMP) +# if the linked module is one of win32gui;win32cui;win32dll;win32ocx;cpl link it with msvcrtex, which itself is linked to libmsvcrt_real +# Otherwise, just link to libmsvcrt_real +target_link_libraries(libmsvcrt INTERFACE "$<IF:$<IN_LIST:$<TARGET_PROPERTY:REACTOS_MODULE_TYPE>,win32gui;win32cui;win32dll;win32ocx;cpl>,msvcrtex,libmsvcrt_real>") add_definitions( -DUSE_MSVCRT_PREFIX @@ -26,8 +34,8 @@ target_link_libraries(msvcrt crt wine ${PSEH_LIB}) if(MSVC) # export of deleting destructor "name" - add_target_link_flags(msvcrt "/ignore:4102") - add_target_property(libmsvcrt STATIC_LIBRARY_FLAGS "/ignore:4102") + target_link_options(msvcrt PRIVATE "/ignore:4102") + set_property(TARGET libmsvcrt_real APPEND PROPERTY STATIC_LIBRARY_OPTIONS "/ignore:4102") endif() add_importlibs(msvcrt kernel32 ntdll) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index f4d7cb1f1b1..6458e75fdaf 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -531,13 +531,7 @@ endif() function(add_importlibs _module) add_dependency_node(${_module}) foreach(LIB ${ARGN}) - if("${LIB}" MATCHES "msvcrt") - target_compile_definitions(${_module} PRIVATE _DLL __USE_CRTIMP) - # set_module_type might not have been called at this point, so use a generator expression - target_link_libraries(${_module} "$<$<IN_LIST:$<TARGET_PROPERTY:${_module},REACTOS_MODULE_TYPE>,win32gui;win32cui;win32dll;win32ocx;cpl>:msvcrtex>") - endif() target_link_libraries(${_module} lib${LIB}) - add_dependencies(${_module} lib${LIB}) add_dependency_edge(${_module} ${LIB}) endforeach() endfunction() diff --git a/sdk/lib/crt/msvcrtex.cmake b/sdk/lib/crt/msvcrtex.cmake index 9d4182ffb4d..593622e277d 100644 --- a/sdk/lib/crt/msvcrtex.cmake +++ b/sdk/lib/crt/msvcrtex.cmake @@ -96,6 +96,9 @@ add_asm_files(msvcrtex_asm ${MSVCRTEX_ASM_SOURCE}) add_library(msvcrtex ${MSVCRTEX_SOURCE} ${msvcrtex_asm}) target_compile_definitions(msvcrtex PRIVATE _DLL _MSVCRTEX_) +# Link msvcrtex to the "real" msvcrt.dll library. See msvcrt.dll CMakeLists.txt to see what really happens here +target_link_libraries(msvcrtex libmsvcrt_real libkernel32) + if(GCC OR CLANG) target_compile_options(msvcrtex PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-main>) if(LTCG)

3 years, 11 months

[reactos] 04/05: [APISETS] Declare them as modules instead of win32dll

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bada20a361d385a779901… commit bada20a361d385a779901c3fe0c40fe55dcde1d7 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 15:15:46 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 18:07:27 2020 +0200 [APISETS] Declare them as modules instead of win32dll --- dll/apisets/CMakeLists.txt | 2 +- dll/apisets/CMakeLists.txt.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/apisets/CMakeLists.txt b/dll/apisets/CMakeLists.txt index 27b82d2a281..a08f9f12d36 100644 --- a/dll/apisets/CMakeLists.txt +++ b/dll/apisets/CMakeLists.txt @@ -22,7 +22,7 @@ function (add_apiset apiset_name baseaddress) ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}.def) add_dependencies(${apiset_name} xdk) - set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) + set_module_type(${apiset_name} module UNICODE IMAGEBASE ${baseaddress}) if(NOT MSVC) target_compile_options(${apiset_name} PRIVATE -fno-builtin) diff --git a/dll/apisets/CMakeLists.txt.in b/dll/apisets/CMakeLists.txt.in index 69aaa9fa38d..12ca868f641 100644 --- a/dll/apisets/CMakeLists.txt.in +++ b/dll/apisets/CMakeLists.txt.in @@ -22,7 +22,7 @@ function (add_apiset apiset_name baseaddress) ${CMAKE_CURRENT_BINARY_DIR}/${apiset_name}.def) add_dependencies(${apiset_name} xdk) - set_module_type(${apiset_name} win32dll ENTRYPOINT 0 UNICODE IMAGEBASE ${baseaddress}) + set_module_type(${apiset_name} module UNICODE IMAGEBASE ${baseaddress}) if(NOT MSVC) target_compile_options(${apiset_name} PRIVATE -fno-builtin)

3 years, 11 months

[reactos] 03/05: [CMAKE] Only link msvcrtex to win32cui, win32gui, win32dll, win32ocx and cpl modules

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c25e816bfff056baad76… commit 5c25e816bfff056baad76346cbd49835fc914ddd Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 15:12:49 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 18:07:27 2020 +0200 [CMAKE] Only link msvcrtex to win32cui, win32gui, win32dll, win32ocx and cpl modules --- sdk/cmake/CMakeMacros.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 26337a0713e..f4d7cb1f1b1 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -533,7 +533,8 @@ function(add_importlibs _module) foreach(LIB ${ARGN}) if("${LIB}" MATCHES "msvcrt") target_compile_definitions(${_module} PRIVATE _DLL __USE_CRTIMP) - target_link_libraries(${_module} msvcrtex) + # set_module_type might not have been called at this point, so use a generator expression + target_link_libraries(${_module} "$<$<IN_LIST:$<TARGET_PROPERTY:${_module},REACTOS_MODULE_TYPE>,win32gui;win32cui;win32dll;win32ocx;cpl>:msvcrtex>") endif() target_link_libraries(${_module} lib${LIB}) add_dependencies(${_module} lib${LIB})

3 years, 11 months

[reactos] 02/05: [CMAKE] Introduce the REACTOS_MODULE_TYPE target property

by Jérôme Gardou

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=840fe4d6acf3e2899b6bb… commit 840fe4d6acf3e2899b6bb59a243985af91579325 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Thu Oct 22 15:12:02 2020 +0200 Commit: Jérôme Gardou <zefklop(a)users.noreply.github.com> CommitDate: Thu Oct 22 18:07:27 2020 +0200 [CMAKE] Introduce the REACTOS_MODULE_TYPE target property And set it in set_module_type function --- CMakeLists.txt | 7 +++++++ sdk/cmake/CMakeMacros.cmake | 3 +++ 2 files changed, 10 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0ffe31e9d6..3f56a025651 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,6 +115,13 @@ else() set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) # Add our own target properties + # General module definitions + define_property(TARGET PROPERTY REACTOS_MODULE_TYPE + BRIEF_DOCS "The type of this module" + FULL_DOCS [[ +The type of this module. +One of "nativecui", "nativedll", "kernelmodedriver", "wdmdriver", "kerneldll", "win32cui", "win32gui", "win32dll", "win32ocx", "cpl" or "module"]]) + # C++ define_property(TARGET PROPERTY WITH_CXX_EXCEPTIONS BRIEF_DOCS "Enable C++ exceptions on this target" diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index e3ed4a00545..26337a0713e 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -567,6 +567,9 @@ function(set_module_type MODULE TYPE) message(FATAL_ERROR "Unknown type ${TYPE} for module ${MODULE}") endif() + # Set our target property + set_target_properties(${MODULE} PROPERTIES REACTOS_MODULE_TYPE ${TYPE}) + if(DEFINED __subsystem) set_subsystem(${MODULE} ${__subsystem}) endif()

3 years, 11 months

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2020