Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TRANSLATION][UTILMAN] Translations for UTILMAN and some other stuff (#1880)
by Shy Zedaka 27 Aug '19

27 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=162e43d927c87af631e93… commit 162e43d927c87af631e933a2b3c62419a69bd62e Author: Shy Zedaka <shaytzedaka(a)outlook.com> AuthorDate: Tue Aug 27 14:04:34 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 27 13:04:34 2019 +0200 [TRANSLATION][UTILMAN] Translations for UTILMAN and some other stuff (#1880) --- base/applications/utilman/lang/en-US.rc | 4 +-- base/applications/utilman/lang/fr-FR.rc | 4 +-- base/applications/utilman/lang/he-IL.rc | 55 +++++++++++++++++++++++++++++++++ base/applications/utilman/lang/it-IT.rc | 4 +-- base/applications/utilman/lang/ro-RO.rc | 4 +-- base/applications/utilman/utilman.rc | 3 ++ media/inf/shortcuts.inf | 6 ++-- 7 files changed, 70 insertions(+), 10 deletions(-) diff --git a/base/applications/utilman/lang/en-US.rc b/base/applications/utilman/lang/en-US.rc index 01f77285d09..84c022811ba 100644 --- a/base/applications/utilman/lang/en-US.rc +++ b/base/applications/utilman/lang/en-US.rc @@ -31,8 +31,8 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/fr-FR.rc b/base/applications/utilman/lang/fr-FR.rc index f5c79a3f98d..ef32c1d90d9 100644 --- a/base/applications/utilman/lang/fr-FR.rc +++ b/base/applications/utilman/lang/fr-FR.rc @@ -31,8 +31,8 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibility Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibility Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 PUSHBUTTON "Close", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/he-IL.rc b/base/applications/utilman/lang/he-IL.rc new file mode 100644 index 00000000000..169f9ae00c0 --- /dev/null +++ b/base/applications/utilman/lang/he-IL.rc @@ -0,0 +1,55 @@ +/* + * PROJECT: ReactOS Utility Manager (Accessibility) + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Hebrew (Israel) translation resource + * COPYRIGHT: Copyright 2019 Shy Zedaka (shaytzedaka123(a)gmail.com) + */ + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_MAIN_DIALOG DIALOGEX 0, 0, 284, 183 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_CONTEXTHELP +CAPTION "מנהל כלי הנגישות" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LISTBOX, 4, 4, 273, 56, LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_BORDER + CONTROL "", IDC_GROUPBOX, "Button", BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 3, 62, 275, 92 + CONTROL "הפעל", IDC_START, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 14, 76, 45, 16 + CONTROL "עצור", IDC_STOP, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 69, 76, 45, 16 + CONTROL "הפעל אוטומטית כאשר אני מתחבר", IDC_START_LOG_IN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 101, 206, 14 + CONTROL "הפעל אוטומטית כאשר אני נועל את שולחן העבודה", IDC_START_DESKTOP, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 118, 212, 14 + CONTROL "הפעל אוטומטית כאשר אני מפעיל את מנהל כלי הנגישות", IDC_START_UTILMAN, "Button", BS_CHECKBOX | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 12, 134, 212, 13 + CONTROL "&אישור", IDC_OK, "Button", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 160, 161, 50, 14 + CONTROL "&ביטול", IDC_CANCEL, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 221, 161, 50, 14 + CONTROL "&עזרה", IDC_HELP_TOPICS, "Button", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_TABSTOP, 98, 161, 50, 14 +END + +IDD_ABOUT_DIALOG DIALOGEX 22, 16, 210, 65 +CAPTION "אודות מנהל כלי הנגישות" +FONT 8, "MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 + LTEXT "מנהל כלי הנגישות\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + PUSHBUTTON "סגור", IDOK, 75, 47, 44, 15 +END + +STRINGTABLE +BEGIN + IDS_OSK "לוח מקשים על התצוגה" + IDS_MAGNIFIER "זכוכית מגדלת" +END + +STRINGTABLE +BEGIN + IDS_NOTRUNNING "התוכנית %s אינה פועלת" + IDS_RUNNING "התוכנית %s פועלת" + IDS_GROUPBOX_OPTIONS_TITLE "אפשרויות עבור %s" +END + +STRINGTABLE +BEGIN + IDM_ABOUT "אודות מנהל כלי הנגישות..." +END diff --git a/base/applications/utilman/lang/it-IT.rc b/base/applications/utilman/lang/it-IT.rc index b8ba8000e24..9b4295c1153 100644 --- a/base/applications/utilman/lang/it-IT.rc +++ b/base/applications/utilman/lang/it-IT.rc @@ -31,8 +31,8 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Accessibilità Utility Manager\nCopyright (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Copyright (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Accessibilità Utility Manager\nCopyright 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Copyright 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 PUSHBUTTON "Chiudi", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/lang/ro-RO.rc b/base/applications/utilman/lang/ro-RO.rc index 20dfac27335..e6b3ba5de93 100644 --- a/base/applications/utilman/lang/ro-RO.rc +++ b/base/applications/utilman/lang/ro-RO.rc @@ -31,8 +31,8 @@ FONT 8, "MS Shell Dlg", 0, 0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN ICON IDI_ICON_UTILMAN, IDC_STATIC, 10, 10, 7, 30 - LTEXT "Manager utilitare\nDrept de autor (C) 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 - LTEXT "Drept de autor (C) 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 + LTEXT "Manager utilitare\nDrept de autor 2019 George Bișoc (fraizeraust99 at gmail dot com)", IDC_STATIC, 48, 7, 150, 36 + LTEXT "Drept de autor 2019 Hermes Belusca-Maito", IDC_STATIC, 48, 33, 150, 36 PUSHBUTTON "Închide", IDOK, 75, 47, 44, 15 END diff --git a/base/applications/utilman/utilman.rc b/base/applications/utilman/utilman.rc index ab561caeef4..01271de6d0b 100644 --- a/base/applications/utilman/utilman.rc +++ b/base/applications/utilman/utilman.rc @@ -31,6 +31,9 @@ IDI_ICON_UTILMAN ICON "res/utilman.ico" #ifdef LANGUAGE_FR_FR #include "lang/fr-FR.rc" #endif +#ifdef LANGUAGE_HE_IL + #include "lang/he-IL.rc" +#endif #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif diff --git a/media/inf/shortcuts.inf b/media/inf/shortcuts.inf index d3c0eb8aa3f..bc9cc450a8e 100644 --- a/media/inf/shortcuts.inf +++ b/media/inf/shortcuts.inf @@ -630,8 +630,8 @@ DXDIAG_TITLE=ReactX Diagnostic DXDIAG_DESC=Launch ReactX-Diagnostic program MAGNIFY_TITLE=זכוכית מגדלת MAGNIFY_DESC=זכוכית מגדלת -OSK_TITLE=על לוח מקשים על המסך -OSK_DESC=הפעלה על לוח מקשים על המסך +OSK_TITLE=לוח מקשים על התצוגה +OSK_DESC=הפעל את לוח מקשים על התצוגה MPLAY_TITLE=נגן מולטימדיה MPLAY_DESC=נגן המולטימדיה SNDVOL_TITLE=בקרת עוצמה @@ -644,6 +644,8 @@ WINMINE_TITLE=שולה המוקשים WINMINE_DESC=שולה המוקשים SPIDER_TITLE=סוליטייר עכביש SPIDER_DESC=סוליטייר עכביש +UTILMAN_TITLE=מנהל כלי הנגישות +UTILMAN_DESC=הפעל את מנהל כלי הנגישות ; Hungarian [Strings.040E]

1 0

[reactos] 01/01: [CMLIB] Clean volatile registry entries in the same manner as Windows (#1883)
by maharmstone 27 Aug '19

27 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6a9aafe58f8938de7884… commit e6a9aafe58f8938de7884fd06fb867144fe568ed Author: maharmstone <mark(a)harmstone.com> AuthorDate: Tue Aug 27 01:39:27 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Aug 27 02:39:27 2019 +0200 [CMLIB] Clean volatile registry entries in the same manner as Windows (#1883) This fixes the crashes in HvpGetCellMapped on Windows Server 2003 when booting from Freeloader, as mentioned in maharmstone/btrfs#16. When the bootloader loads the system hive, it cleans the data pertaining to any volatile keys. The Windows bootloader does this by setting SubKeyCounts[Volatile] to 0. After boot, the kernel marks any cell where this is 0 but SubKeyLists[Volatile] isn't HCELL_NIL as dirty, meaning that the sanitized version will then get flushed to the disk. Because Freeloader sets SubKeyLists[Volatile] to HCELL_NIL straightaway, Windows thinks the cell is clean, and can unload it without flushing. If it then reads it from the disk, it will crash in HvpGetCellMapped due to the stale volatile pointers. If you break on nt!CmpInitializeSystemHive on Windows and "gu" to the let the function run, you'll see that DirtyVector of the HHIVE has only the first 8 bits set. If you run it using the official bootloader, it'll have a lot more than that. --- sdk/lib/cmlib/cminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/lib/cmlib/cminit.c b/sdk/lib/cmlib/cminit.c index b1b060d8c41..699376e75d9 100644 --- a/sdk/lib/cmlib/cminit.c +++ b/sdk/lib/cmlib/cminit.c @@ -120,8 +120,8 @@ CmpPrepareKey( ASSERT(KeyCell->Signature == CM_KEY_NODE_SIGNATURE); - KeyCell->SubKeyLists[Volatile] = HCELL_NIL; KeyCell->SubKeyCounts[Volatile] = 0; + // KeyCell->SubKeyLists[Volatile] = HCELL_NIL; // FIXME! Done only on Windows < XP. /* Enumerate and add subkeys */ if (KeyCell->SubKeyCounts[Stable] > 0)

1 0

[reactos] 01/01: [WIN32SS][USER][EXPLORER] Add/Update portuguese translation (#1882)
by Jose Carlos Jesus 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5dca45e5170b3759998d… commit d5dca45e5170b3759998d4dd782e4e1ea2e02347 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon Aug 26 20:01:41 2019 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 26 21:01:41 2019 +0200 [WIN32SS][USER][EXPLORER] Add/Update portuguese translation (#1882) --- base/shell/explorer/lang/pt-PT.rc | 4 +- win32ss/user/user32/lang/pt-BR.rc | 2 +- win32ss/user/user32/lang/{pt-BR.rc => pt-PT.rc} | 10 ++--- win32ss/user/user32/user32.rc | 3 ++ win32ss/user/winsrv/consrv/consrv.rc | 3 ++ win32ss/user/winsrv/consrv/lang/pt-BR.rc | 2 +- .../user/winsrv/consrv/lang/{pt-BR.rc => pt-PT.rc} | 0 win32ss/user/winsrv/consrv_new/consrv.rc | 3 ++ win32ss/user/winsrv/consrv_new/lang/pt-BR.rc | 2 +- .../lang/pt-BR.rc => consrv_new/lang/pt-PT.rc} | 2 +- win32ss/user/winsrv/usersrv/lang/pt-BR.rc | 2 +- win32ss/user/winsrv/usersrv/lang/pt-PT.rc | 43 ++++++++++++++++++++++ win32ss/user/winsrv/usersrv/usersrv.rc | 3 ++ 13 files changed, 67 insertions(+), 12 deletions(-) diff --git a/base/shell/explorer/lang/pt-PT.rc b/base/shell/explorer/lang/pt-PT.rc index adb7ec5fef0..14cb98880a3 100644 --- a/base/shell/explorer/lang/pt-PT.rc +++ b/base/shell/explorer/lang/pt-PT.rc @@ -57,7 +57,7 @@ BEGIN MENUITEM "&Executar...", IDM_RUN, MFT_STRING, MFS_ENABLED MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED MENUITEM "&Sincronizar", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED - MENUITEM "&Log Off %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "&Terminar sessão de %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED MENUITEM "De&sconectar...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED MENUITEM "Desbloquear Co&mputador", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED MENUITEM "Desl&igar...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED @@ -198,6 +198,6 @@ END STRINGTABLE BEGIN - IDS_TASKBAR_STARTMENU_PROP_CAPTION "Propriedades do Barra de Tarefas e Menu Iniciar" + IDS_TASKBAR_STARTMENU_PROP_CAPTION "da Barra de Tarefas e Menu Iniciar" IDS_RESTORE_ALL "&Mostrar janelas abertas" END diff --git a/win32ss/user/user32/lang/pt-BR.rc b/win32ss/user/user32/lang/pt-BR.rc index e28731e47a9..484d133ffa8 100644 --- a/win32ss/user/user32/lang/pt-BR.rc +++ b/win32ss/user/user32/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN /* Dialogs */ diff --git a/win32ss/user/user32/lang/pt-BR.rc b/win32ss/user/user32/lang/pt-PT.rc similarity index 88% copy from win32ss/user/user32/lang/pt-BR.rc copy to win32ss/user/user32/lang/pt-PT.rc index e28731e47a9..eaa4df2a0c7 100644 --- a/win32ss/user/user32/lang/pt-BR.rc +++ b/win32ss/user/user32/lang/pt-PT.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL SELWINDOW DIALOGEX 20, 20, 220, 140 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Selecionar Janela" +CAPTION "Seleccionar Janela" BEGIN LISTBOX 100, 5, 5, 210, 110, LBS_NOTIFY | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_HSCROLL PUSHBUTTON "&OK", 1, 60, 120, 40, 15, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP @@ -27,7 +27,7 @@ BEGIN MENUITEM "C&olar", WM_PASTE MENUITEM "&Apagar", WM_CLEAR MENUITEM SEPARATOR - MENUITEM "&Selecionar Tudo", EM_SETSEL + MENUITEM "&Seleccionar Tudo", EM_SETSEL END END @@ -60,9 +60,9 @@ END STRINGTABLE BEGIN IDS_ERROR "Erro" - IDS_NOT_RESPONDING " (Not Responding)" - IDS_ASK_TERMINATE "This application is hung up. May I terminate this app?" - IDS_HUNG_UP_TITLE "Hung up!" + IDS_NOT_RESPONDING " (Não Responde)" + IDS_ASK_TERMINATE "Esta aplicação não responde. Deseja terminar esta aplicação?" + IDS_HUNG_UP_TITLE "Desligada!" IDS_OK "OK" IDS_CANCEL "Cancelar" IDS_ABORT "&Abortar" diff --git a/win32ss/user/user32/user32.rc b/win32ss/user/user32/user32.rc index fbe656b96f7..f1f4463e08a 100644 --- a/win32ss/user/user32/user32.rc +++ b/win32ss/user/user32/user32.rc @@ -158,6 +158,9 @@ OBM_OLD_CLOSE BITMAP "resources/obm_old_close.bmp" #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/win32ss/user/winsrv/consrv/consrv.rc b/win32ss/user/winsrv/consrv/consrv.rc index f249bfbf01b..3e00ddf94f3 100644 --- a/win32ss/user/winsrv/consrv/consrv.rc +++ b/win32ss/user/winsrv/consrv/consrv.rc @@ -48,6 +48,9 @@ #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/win32ss/user/winsrv/consrv/lang/pt-BR.rc b/win32ss/user/winsrv/consrv/lang/pt-BR.rc index c4162380a05..a88a3acbe4f 100644 --- a/win32ss/user/winsrv/consrv/lang/pt-BR.rc +++ b/win32ss/user/winsrv/consrv/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE BEGIN diff --git a/win32ss/user/winsrv/consrv/lang/pt-BR.rc b/win32ss/user/winsrv/consrv/lang/pt-PT.rc similarity index 100% copy from win32ss/user/winsrv/consrv/lang/pt-BR.rc copy to win32ss/user/winsrv/consrv/lang/pt-PT.rc diff --git a/win32ss/user/winsrv/consrv_new/consrv.rc b/win32ss/user/winsrv/consrv_new/consrv.rc index f249bfbf01b..3e00ddf94f3 100644 --- a/win32ss/user/winsrv/consrv_new/consrv.rc +++ b/win32ss/user/winsrv/consrv_new/consrv.rc @@ -48,6 +48,9 @@ #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc b/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc index c4162380a05..a88a3acbe4f 100644 --- a/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc +++ b/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN STRINGTABLE BEGIN diff --git a/win32ss/user/winsrv/consrv/lang/pt-BR.rc b/win32ss/user/winsrv/consrv_new/lang/pt-PT.rc similarity index 61% copy from win32ss/user/winsrv/consrv/lang/pt-BR.rc copy to win32ss/user/winsrv/consrv_new/lang/pt-PT.rc index c4162380a05..0ef39a28e88 100644 --- a/win32ss/user/winsrv/consrv/lang/pt-BR.rc +++ b/win32ss/user/winsrv/consrv_new/lang/pt-PT.rc @@ -2,5 +2,5 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL STRINGTABLE BEGIN - IDS_CONSOLE_TITLE "ReactOS Console" + IDS_CONSOLE_TITLE "ReactOS Consola" END diff --git a/win32ss/user/winsrv/usersrv/lang/pt-BR.rc b/win32ss/user/winsrv/usersrv/lang/pt-BR.rc index 320cc195d73..33baa2debd5 100644 --- a/win32ss/user/winsrv/usersrv/lang/pt-BR.rc +++ b/win32ss/user/winsrv/usersrv/lang/pt-BR.rc @@ -1,6 +1,6 @@ /* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN IDD_END_NOW DIALOGEX 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU diff --git a/win32ss/user/winsrv/usersrv/lang/pt-PT.rc b/win32ss/user/winsrv/usersrv/lang/pt-PT.rc new file mode 100644 index 00000000000..4dd3e46889d --- /dev/null +++ b/win32ss/user/winsrv/usersrv/lang/pt-PT.rc @@ -0,0 +1,43 @@ +/* Translation and UTF-8 Conversion by mkbu95 <mkbu95(a)gmail.com> (May, 2012) */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_END_NOW DIALOGEX 0, 0, 200, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar Programa - " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "A finalizar Programa... Por favor aguarde", IDC_STATIC, 7, 7, 186, 11 + CONTROL "Progress", IDC_PROGRESS, "msctls_progress32", WS_BORDER, 7, 20, 186, 13 + LTEXT "Se finalizar o programa imediatamente, irá perder todas as alterações não guardadas. Para finalizar o programa agora, pressione Finalizar Agora.", IDC_STATIC, 7, 40, 186, 26 + DEFPUSHBUTTON "&Finalizar Agora", IDC_END_NOW, 150, 71, 43, 17 +END + +IDD_NOT_RESPONDING DIALOGEX 0, 0, 192, 122 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Finalizar Programa - " +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Cancelar", IDCANCEL, 142, 98, 43, 17 + PUSHBUTTON "&Finalizar Agora", IDC_END_NOW, 78, 98, 43, 17 + LTEXT "O programa não está a responder.", IDC_STATIC, 7, 7, 178, 8 + LTEXT "Para retornar ao ReactOS e verificar o estado do programa, pressione Cancelar.", IDC_STATIC, 7, 26, 178, 16 + LTEXT "Se finalizar o programa imediatamente, irá perder todas as alterações não guardadas. Para finalizar o programa agora, pressione Finalizar Agora.", IDC_STATIC, 7, 53, 178, 26 +END + + +STRINGTABLE +BEGIN + IDS_SEVERITY_SUCCESS "Sucesso" + IDS_SEVERITY_INFORMATIONAL "Informação do sistema" + IDS_SEVERITY_WARNING "Aviso do sistema" + IDS_SEVERITY_ERROR "Erro do sistema" +END + +STRINGTABLE +BEGIN + IDS_SYSTEM_PROCESS "Processo do sistema" + IDS_UNKNOWN_SOFTWARE_EXCEPT "Excepção de software desconhecida" + IDS_OK_TERMINATE_PROGRAM "Clique em OK para terminar o programa." + IDS_CANCEL_DEBUG_PROGRAM "Clique em CANCELAR para debug do programa." +END diff --git a/win32ss/user/winsrv/usersrv/usersrv.rc b/win32ss/user/winsrv/usersrv/usersrv.rc index cafd5928370..56c456eee5d 100644 --- a/win32ss/user/winsrv/usersrv/usersrv.rc +++ b/win32ss/user/winsrv/usersrv/usersrv.rc @@ -51,6 +51,9 @@ #ifdef LANGUAGE_PT_BR #include "lang/pt-BR.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif

1 0

[reactos] 01/01: [CALC] Enable support for HTMLHELP (#1877)
by Carlo Bramini 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=055c5a9bb7c54b05233aa… commit 055c5a9bb7c54b05233aa4f5612d975a38b41208 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Mon Aug 26 16:14:01 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Aug 26 16:14:01 2019 +0200 [CALC] Enable support for HTMLHELP (#1877) Nowadays ReactOS includes support for htmlhelp.h and a working implementation of HHCTRL.OCX. Although current imported HHCTRL.OCX suffers of this issue: https://bugs.winehq.org/show_bug.cgi?id=47379 See also CORE-15019 + Revert 'intptr_t' to 'size_t'. --- base/applications/calc/CMakeLists.txt | 2 -- base/applications/calc/htmlhelp.c | 2 +- base/applications/calc/winmain.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index d273f10250e..07104ff7095 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -1,6 +1,4 @@ -add_definitions(-DDISABLE_HTMLHELP_SUPPORT=1) - list(APPEND SOURCE convert.c fun_ieee.c diff --git a/base/applications/calc/htmlhelp.c b/base/applications/calc/htmlhelp.c index a306ae441b0..38f3ea3080a 100644 --- a/base/applications/calc/htmlhelp.c +++ b/base/applications/calc/htmlhelp.c @@ -49,7 +49,7 @@ dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData) void HtmlHelp_Start(HINSTANCE hInstance) { - hHtmlHelp = LoadLibrary(_T("HTMLHELP")); + hHtmlHelp = LoadLibrary(_T("HHCTRL.OCX")); if (hHtmlHelp == NULL) return; diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 222dff44faf..6bf11a3c246 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -894,7 +894,7 @@ static void delete_stat_item(int n) static char *ReadConversion(const char *formula) { - intptr_t len = strlen(formula); + size_t len = strlen(formula); char *str = (char *)malloc(len+3); if (str == NULL)

1 0

[reactos] 01/01: [MEDIA][FONTS] Add Verdana fonts (#1881)
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca967db5ca65d289e3dc2… commit ca967db5ca65d289e3dc2ed05e5e1b49673ed3e5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 22:19:06 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Aug 26 22:19:06 2019 +0900 [MEDIA][FONTS] Add Verdana fonts (#1881) - Add "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic" fonts by duplicating "Bitstream Vera Sans" fonts and renaming them. - Delete some "Verdana" font substitutes. - Add LICENSE file. I made these font files by using FontForge. Their family name is "Verdana". Their display names are "Verdana", "Verdana Bold", "Verdana Bold Italic" and "Verdana Italic". Their font filenames are verdana.ttf, verdanab.ttf, verdanaz.ttf and verdanai.ttf. The Underline Positions are hacked by adding an integer value for workaround of FontForge's bug. CORE-16264 --- media/fonts/CMakeLists.txt | 6 +- media/fonts/doc/Verdana/COPYRIGHT.TXT | 124 ++++++++++++++++++++++++++++++++++ media/fonts/doc/Verdana/README.txt | 3 + media/fonts/verdana.ttf | Bin 0 -> 38412 bytes media/fonts/verdanab.ttf | Bin 0 -> 36204 bytes media/fonts/verdanai.ttf | Bin 0 -> 34016 bytes media/fonts/verdanaz.ttf | Bin 0 -> 37124 bytes 7 files changed, 132 insertions(+), 1 deletion(-) diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt index 51a7d9e2282..e7a5aa6de0a 100644 --- a/media/fonts/CMakeLists.txt +++ b/media/fonts/CMakeLists.txt @@ -165,7 +165,11 @@ list(APPEND FONT_FILES trebucbd.ttf trebucbi.ttf trebucit.ttf - UniVGA16.ttf) + UniVGA16.ttf + verdanab.ttf + verdanaz.ttf + verdanai.ttf + verdana.ttf) foreach(item ${FONT_FILES}) add_cd_file(FILE "${CMAKE_CURRENT_SOURCE_DIR}/${item}" DESTINATION reactos/Fonts FOR all) diff --git a/media/fonts/doc/Verdana/COPYRIGHT.TXT b/media/fonts/doc/Verdana/COPYRIGHT.TXT new file mode 100644 index 00000000000..e651be1c4fe --- /dev/null +++ b/media/fonts/doc/Verdana/COPYRIGHT.TXT @@ -0,0 +1,124 @@ +Bitstream Vera Fonts Copyright + +The fonts have a generous copyright, allowing derivative works (as +long as "Bitstream" or "Vera" are not in the names), and full +redistribution (so long as they are not *sold* by themselves). They +can be be bundled, redistributed and sold with any software. + +The fonts are distributed under the following copyright: + +Copyright +========= + +Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream +Vera is a trademark of Bitstream, Inc. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the fonts accompanying this license ("Fonts") and associated +documentation files (the "Font Software"), to reproduce and distribute +the Font Software, including without limitation the rights to use, +copy, merge, publish, distribute, and/or sell copies of the Font +Software, and to permit persons to whom the Font Software is furnished +to do so, subject to the following conditions: + +The above copyright and trademark notices and this permission notice +shall be included in all copies of one or more of the Font Software +typefaces. + +The Font Software may be modified, altered, or added to, and in +particular the designs of glyphs or characters in the Fonts may be +modified and additional glyphs or characters may be added to the +Fonts, only if the fonts are renamed to names not containing either +the words "Bitstream" or the word "Vera". + +This License becomes null and void to the extent applicable to Fonts +or Font Software that has been modified and is distributed under the +"Bitstream Vera" names. + +The Font Software may be sold as part of a larger software package but +no copy of one or more of the Font Software typefaces may be sold by +itself. + +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL +BITSTREAM OR THE GNOME FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, +OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT +SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE. + +Except as contained in this notice, the names of Gnome, the Gnome +Foundation, and Bitstream Inc., shall not be used in advertising or +otherwise to promote the sale, use or other dealings in this Font +Software without prior written authorization from the Gnome Foundation +or Bitstream Inc., respectively. For further information, contact: +fonts at gnome dot org. + +Copyright FAQ +============= + + 1. I don't understand the resale restriction... What gives? + + Bitstream is giving away these fonts, but wishes to ensure its + competitors can't just drop the fonts as is into a font sale system + and sell them as is. It seems fair that if Bitstream can't make money + from the Bitstream Vera fonts, their competitors should not be able to + do so either. You can sell the fonts as part of any software package, + however. + + 2. I want to package these fonts separately for distribution and + sale as part of a larger software package or system. Can I do so? + + Yes. A RPM or Debian package is a "larger software package" to begin + with, and you aren't selling them independently by themselves. + See 1. above. + + 3. Are derivative works allowed? + Yes! + + 4. Can I change or add to the font(s)? + Yes, but you must change the name(s) of the font(s). + + 5. Under what terms are derivative works allowed? + + You must change the name(s) of the fonts. This is to ensure the + quality of the fonts, both to protect Bitstream and Gnome. We want to + ensure that if an application has opened a font specifically of these + names, it gets what it expects (though of course, using fontconfig, + substitutions could still could have occurred during font + opening). You must include the Bitstream copyright. Additional + copyrights can be added, as per copyright law. Happy Font Hacking! + + 6. If I have improvements for Bitstream Vera, is it possible they might get + adopted in future versions? + + Yes. The contract between the Gnome Foundation and Bitstream has + provisions for working with Bitstream to ensure quality additions to + the Bitstream Vera font family. Please contact us if you have such + additions. Note, that in general, we will want such additions for the + entire family, not just a single font, and that you'll have to keep + both Gnome and Jim Lyles, Vera's designer, happy! To make sense to add + glyphs to the font, they must be stylistically in keeping with Vera's + design. Vera cannot become a "ransom note" font. Jim Lyles will be + providing a document describing the design elements used in Vera, as a + guide and aid for people interested in contributing to Vera. + + 7. I want to sell a software package that uses these fonts: Can I do so? + + Sure. Bundle the fonts with your software and sell your software + with the fonts. That is the intent of the copyright. + + 8. If applications have built the names "Bitstream Vera" into them, + can I override this somehow to use fonts of my choosing? + + This depends on exact details of the software. Most open source + systems and software (e.g., Gnome, KDE, etc.) are now converting to + use fontconfig (see www.fontconfig.org) to handle font configuration, + selection and substitution; it has provisions for overriding font + names and subsituting alternatives. An example is provided by the + supplied local.conf file, which chooses the family Bitstream Vera for + "sans", "serif" and "monospace". Other software (e.g., the XFree86 + core server) has other mechanisms for font substitution. + diff --git a/media/fonts/doc/Verdana/README.txt b/media/fonts/doc/Verdana/README.txt new file mode 100644 index 00000000000..365bc5eb550 --- /dev/null +++ b/media/fonts/doc/Verdana/README.txt @@ -0,0 +1,3 @@ +ReactOS Verdana fonts are based on "Bitstream Vera Sans" fonts. + +See also COPYRIGHT.TXT. diff --git a/media/fonts/verdana.ttf b/media/fonts/verdana.ttf new file mode 100644 index 00000000000..1a55bafcf3c Binary files /dev/null and b/media/fonts/verdana.ttf differ diff --git a/media/fonts/verdanab.ttf b/media/fonts/verdanab.ttf new file mode 100644 index 00000000000..7b56d8f2783 Binary files /dev/null and b/media/fonts/verdanab.ttf differ diff --git a/media/fonts/verdanai.ttf b/media/fonts/verdanai.ttf new file mode 100644 index 00000000000..2b7628696e8 Binary files /dev/null and b/media/fonts/verdanai.ttf differ diff --git a/media/fonts/verdanaz.ttf b/media/fonts/verdanaz.ttf new file mode 100644 index 00000000000..f1a96c4f128 Binary files /dev/null and b/media/fonts/verdanaz.ttf differ

1 0

[reactos] 01/01: [ROSAPPS][SHLEXTDBG] Delete DbgPrint hack for gcc (fix build)
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e85e396438f9cde018dbd… commit e85e396438f9cde018dbd7e4467571c0f1d53663 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 21:35:05 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 21:36:59 2019 +0900 [ROSAPPS][SHLEXTDBG] Delete DbgPrint hack for gcc (fix build) --- modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp index 3e1a29feea2..cbb7f9bc477 100644 --- a/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp +++ b/modules/rosapps/applications/devutils/shlextdbg/shlextdbg.cpp @@ -12,8 +12,6 @@ #include <atlstr.h> #include <atlsimpcoll.h> #include <conio.h> - // hack for gcc: -#define DbgPrint(...) printf(__VA_ARGS__) #include <shellutils.h> enum WaitType

1 0

[reactos] 01/01: [MEDIA][FONTS] Make MS Sans Serif ells sans serif CORE-16166
by Katayama Hirofumi MZ 26 Aug '19

26 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0f06035c9b7df474ef622… commit 0f06035c9b7df474ef622fcd85036253afcb223b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 10:07:56 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 10:07:56 2019 +0900 [MEDIA][FONTS] Make MS Sans Serif ells sans serif CORE-16166 --- media/fonts/ssee1255.fon | Bin 69168 -> 69168 bytes media/fonts/ssee1256.fon | Bin 71632 -> 71632 bytes media/fonts/ssee874.fon | Bin 71792 -> 71792 bytes media/fonts/sserife.fon | Bin 64560 -> 64560 bytes media/fonts/sserifeg.fon | Bin 65456 -> 65456 bytes media/fonts/sserifer.fon | Bin 68848 -> 68848 bytes media/fonts/sserifet.fon | Bin 64304 -> 64304 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1255.fon b/media/fonts/ssee1255.fon index 59de17288bb..87c4b6319fd 100644 Binary files a/media/fonts/ssee1255.fon and b/media/fonts/ssee1255.fon differ diff --git a/media/fonts/ssee1256.fon b/media/fonts/ssee1256.fon index 7e27d99027c..8e3804388e8 100644 Binary files a/media/fonts/ssee1256.fon and b/media/fonts/ssee1256.fon differ diff --git a/media/fonts/ssee874.fon b/media/fonts/ssee874.fon index aefe77a6978..4f6db4f0a9e 100644 Binary files a/media/fonts/ssee874.fon and b/media/fonts/ssee874.fon differ diff --git a/media/fonts/sserife.fon b/media/fonts/sserife.fon index 5bcce146c91..264757092cb 100644 Binary files a/media/fonts/sserife.fon and b/media/fonts/sserife.fon differ diff --git a/media/fonts/sserifeg.fon b/media/fonts/sserifeg.fon index fad4c7a2172..fd7d539e784 100644 Binary files a/media/fonts/sserifeg.fon and b/media/fonts/sserifeg.fon differ diff --git a/media/fonts/sserifer.fon b/media/fonts/sserifer.fon index 163668f5f62..600d9fe251d 100644 Binary files a/media/fonts/sserifer.fon and b/media/fonts/sserifer.fon differ diff --git a/media/fonts/sserifet.fon b/media/fonts/sserifet.fon index 25c4c94db85..6aa8dc2ddc9 100644 Binary files a/media/fonts/sserifet.fon and b/media/fonts/sserifet.fon differ

1 0

[reactos] 01/01: [MEDIA][FONTS] Adjust internal leading of Baltic MS Sans Serif
by Katayama Hirofumi MZ 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=24e5d36d5d29ecc9b8f21… commit 24e5d36d5d29ecc9b8f211d8113ebdf21b3ea0ec Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Aug 26 03:36:48 2019 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Aug 26 03:36:48 2019 +0900 [MEDIA][FONTS] Adjust internal leading of Baltic MS Sans Serif --- media/fonts/ssee1257.fon | Bin 65424 -> 65424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/media/fonts/ssee1257.fon b/media/fonts/ssee1257.fon index ee1bbcda616..42a43a7a612 100644 Binary files a/media/fonts/ssee1257.fon and b/media/fonts/ssee1257.fon differ

1 0

[reactos] 01/01: [NETAPI32] Implement DsEnumerateDomainTrustsW
by Eric Kohl 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=324afc252cef7c2b9a316… commit 324afc252cef7c2b9a316b37dbbf34a01c7d2b46 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Aug 25 18:23:38 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Aug 25 18:23:38 2019 +0200 [NETAPI32] Implement DsEnumerateDomainTrustsW --- dll/win32/netapi32/netlogon.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dll/win32/netapi32/netlogon.c b/dll/win32/netapi32/netlogon.c index 293b482aee5..8a03e887b19 100644 --- a/dll/win32/netapi32/netlogon.c +++ b/dll/win32/netapi32/netlogon.c @@ -657,9 +657,30 @@ DsEnumerateDomainTrustsW( _Out_ PDS_DOMAIN_TRUSTSW *Domains, _Out_ PULONG DomainCount) { - FIXME("DsEnumerateDomainTrustsW(%s, %x, %p, %p)\n", + NETLOGON_TRUSTED_DOMAIN_ARRAY DomainsArray = {0, NULL}; + NET_API_STATUS status; + + TRACE("DsEnumerateDomainTrustsW(%s, %x, %p, %p)\n", debugstr_w(ServerName), Flags, Domains, DomainCount); - return ERROR_CALL_NOT_IMPLEMENTED; + + RpcTryExcept + { + status = DsrEnumerateDomainTrusts(ServerName, + Flags, + &DomainsArray); + if (status == NERR_Success) + { + *Domains = DomainsArray.Domains; + *DomainCount = DomainsArray.DomainCount; + } + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return status; }

1 0

[reactos] 01/01: Fix build
by Ioannis Adamopoulos 25 Aug '19

25 Aug '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eb28dd0a9251f4db040a… commit 7eb28dd0a9251f4db040ac81903aad4e45f808eb Author: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Aug 25 14:53:52 2019 +0300 Commit: Ioannis Adamopoulos <gadamopoulos(a)reactos.org> CommitDate: Sun Aug 25 14:56:12 2019 +0300 Fix build --- modules/rostests/apitests/shell32/IShellFolderViewCB.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp b/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp index a1fd664fe63..392321166c8 100644 --- a/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp +++ b/modules/rostests/apitests/shell32/IShellFolderViewCB.cpp @@ -8,13 +8,6 @@ #include "shelltest.h" #include <atlsimpcoll.h> #include <stdio.h> - -#if 1 -#define DbgPrint(...) trace(__VA_ARGS__) -#else -EXTERN_C -void DbgPrint(PCSTR, ...); -#endif #include <shellutils.h> //#include <msgtrace.h>

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs