Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHLWAPI] Implement SHIsLowMemoryMachine (#2783)
by Katayama Hirofumi MZ 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3a550a6a95cce96d281b… commit d3a550a6a95cce96d281b61973ee27eb22a5aa8c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 14 09:47:21 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu May 14 09:47:21 2020 +0900 [SHLWAPI] Implement SHIsLowMemoryMachine (#2783) Implement shlwapi!SHIsLowMemoryMachine function. --- dll/win32/shlwapi/ordinal.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dll/win32/shlwapi/ordinal.c b/dll/win32/shlwapi/ordinal.c index db932c7932e..84234865b28 100644 --- a/dll/win32/shlwapi/ordinal.c +++ b/dll/win32/shlwapi/ordinal.c @@ -4324,16 +4324,28 @@ HRESULT WINAPI SHGetInverseCMAP(LPDWORD dest, DWORD dwSize) * Determine if the current computer has low memory. * * PARAMS - * x [I] FIXME + * dwType [I] Zero. * * RETURNS * TRUE if the users machine has 16 Megabytes of memory or less, * FALSE otherwise. */ -BOOL WINAPI SHIsLowMemoryMachine (DWORD x) +BOOL WINAPI SHIsLowMemoryMachine(DWORD dwType) { - FIXME("(0x%08x) stub\n", x); +#ifdef __REACTOS__ + MEMORYSTATUS status; + static int is_low = -1; + TRACE("(0x%08x)\n", dwType); + if (dwType == 0 && is_low == -1) + { + GlobalMemoryStatus(&status); + is_low = (status.dwTotalPhys <= 0x1000000); + } + return is_low; +#else + FIXME("(0x%08x) stub\n", dwType); return FALSE; +#endif } /*************************************************************************

1 0

[reactos] 01/01: [SHELL32] Half-implement SHWinHelp
by Katayama Hirofumi MZ 14 May '20

14 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b70232d416121f4e4cdda… commit b70232d416121f4e4cdda74d402297f85a1608ed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu May 14 09:38:38 2020 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu May 14 09:38:38 2020 +0900 [SHELL32] Half-implement SHWinHelp --- dll/win32/shell32/wine/shellord.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dll/win32/shell32/wine/shellord.c b/dll/win32/shell32/wine/shellord.c index f634c33665d..8cbdb2a4da4 100644 --- a/dll/win32/shell32/wine/shellord.c +++ b/dll/win32/shell32/wine/shellord.c @@ -1369,9 +1369,18 @@ HRESULT WINAPI SHCreateShellFolderViewEx( * SHWinHelp [SHELL32.127] * */ -HRESULT WINAPI SHWinHelp (DWORD v, DWORD w, DWORD x, DWORD z) -{ FIXME("0x%08x 0x%08x 0x%08x 0x%08x stub\n",v,w,x,z); - return 0; +HRESULT WINAPI SHWinHelp(HWND hwnd, LPCWSTR pszHelp, UINT uCommand, ULONG_PTR dwData) +{ + TRACE("(%p, %s, 0x%08x, %p)\n", hwnd, debugstr_w(pszHelp), uCommand, dwData); + if (!WinHelpW(hwnd, pszHelp, uCommand, dwData)) + { +#if 0 + ShellMessageBoxW(shell32_hInstance, hwnd, MAKEINTRESOURCEW(9115), + MAKEINTRESOURCEW(9116), MB_ICONSTOP); +#endif + return FALSE; + } + return TRUE; } /************************************************************************* * SHRunControlPanel [SHELL32.161]

1 0

[reactos] 01/01: [NTOSKRNL] Restore section layout for NTOSKRNL to fix BSOD regression CORE-14683
by Joachim Henze 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d28677795e98cdd4fdf0f… commit d28677795e98cdd4fdf0f4aff2773197a6b39718 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed May 13 17:08:25 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed May 13 17:09:15 2020 +0200 [NTOSKRNL] Restore section layout for NTOSKRNL to fix BSOD regression CORE-14683 This version (after .rsrc) works different than the proper version I used for 0.4.12 (after .reloc). Inserting after .rsrc is actually not correct, but Thomas believes it can be used as a temporary trick to avoid random memory corruption upon relocations of the kernel, caused by ROSBE-154. I follow his advice, although when judging from practical tests only: as long as we limit this script to NTOSKRNL like I do for releases there have no negative consequences been observed in real life yet even with the proper version of 0.4.12. Up to now those problems have only been observed when used for drivers MODULE TYPE sdk/cmake/gcc.cmake as well, like it was tried for a moment in master 0.4.13-dev-609-g c4d8e2a6e9660c1f0d0d24877219baca443bbce0 Using for drivers immediately did lead to BSODs like CORE-16183 and therefore was mitigated in master by total disabling of the scripts for both, kernel and drivers in 0.4.13-dev-621-g 36e9a6f8ddc70018b55b0cad0b13128b1cbb60c2 To allow installing DVDWritenow without BSOD, we need the script at least for ntoskrnl! I committed this patch (after .rsrc) already into 0.4.13RC and 0.4.14RC. --- ntoskrnl/CMakeLists.txt | 3 +-- sdk/cmake/init-section.lds | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 96fcab407d9..be575b9892f 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -38,8 +38,7 @@ else() else() set_image_base(ntoskrnl 0x80800000) endif() - #Disabled due to LD bug: ROSBE-154 - #add_linker_script(ntoskrnl ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) + add_linker_script(ntoskrnl ${REACTOS_SOURCE_DIR}/sdk/cmake/init-section.lds) endif() target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid ioevent) diff --git a/sdk/cmake/init-section.lds b/sdk/cmake/init-section.lds index 2b815150105..ca46bd1451e 100644 --- a/sdk/cmake/init-section.lds +++ b/sdk/cmake/init-section.lds @@ -8,4 +8,5 @@ SECTIONS __init_end__ = . ; } } -INSERT AFTER .reloc; +/*INSERT AFTER .reloc;*//*This is what we actually want to do, but do not dare due to LD bug ROSBE-154*/ +INSERT AFTER .rsrc; /*This is what we do instead to at least fix CORE-14683*/

1 0

[reactos] 01/01: [MPLAY32] Don't hardcode C: drive (#2778)
by Katayama Hirofumi MZ 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1519f65a7d1ce87d612a… commit b1519f65a7d1ce87d612af4862f3e7ba8cd95b8c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 13 22:36:44 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 22:36:44 2020 +0900 [MPLAY32] Don't hardcode C: drive (#2778) CORE-13235 --- base/applications/mplay32/mplay32.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/applications/mplay32/mplay32.c b/base/applications/mplay32/mplay32.c index 06694d517ae..f3df906dcf9 100644 --- a/base/applications/mplay32/mplay32.c +++ b/base/applications/mplay32/mplay32.c @@ -1149,22 +1149,15 @@ OpenFileDialog(HWND hwnd, DWORD dwFilterIndex, LPTSTR lpType) { OPENFILENAME OpenFileName; TCHAR szFile[MAX_PATH + 1] = _T(""); - TCHAR szCurrentDir[MAX_PATH]; ZeroMemory(&OpenFileName, sizeof(OpenFileName)); - if (!GetCurrentDirectory(ARRAYSIZE(szCurrentDir), szCurrentDir)) - { - StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\")); - } - OpenFileName.lStructSize = sizeof(OpenFileName); OpenFileName.hwndOwner = hwnd; OpenFileName.hInstance = hInstance; OpenFileName.lpstrFilter = szFilter; OpenFileName.lpstrFile = szFile; OpenFileName.nMaxFile = ARRAYSIZE(szFile); - OpenFileName.lpstrInitialDir = szCurrentDir; OpenFileName.Flags = OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_SHAREAWARE; OpenFileName.lpstrDefExt = _T("\0"); OpenFileName.nFilterIndex = dwFilterIndex;

1 0

[reactos] 01/01: [ROSAPPS][MAN] Don't hardcode C: drive (#2780)
by Katayama Hirofumi MZ 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5a4e534aeed0c9c37e45… commit d5a4e534aeed0c9c37e45a7e6cc0feba9721ea58 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 13 22:21:17 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 22:21:17 2020 +0900 [ROSAPPS][MAN] Don't hardcode C: drive (#2780) CORE-13235 --- modules/rosapps/applications/sysutils/man/man.c | 38 +++++++++++++++++-------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/modules/rosapps/applications/sysutils/man/man.c b/modules/rosapps/applications/sysutils/man/man.c index e382972b08d..825b7954396 100644 --- a/modules/rosapps/applications/sysutils/man/man.c +++ b/modules/rosapps/applications/sysutils/man/man.c @@ -15,6 +15,7 @@ */ +#include <stdlib.h> #include <stdio.h> #include <string.h> #include <windows.h> @@ -37,7 +38,7 @@ int AnalyzeFile(); /*====[Globals]====*/ FILE* manfile; char OpenFlag=0; -char manpath[MAXLINE]="c:\\man\\"; +char manpath[MAX_PATH]; /*=================*/ void @@ -49,21 +50,34 @@ SetCl(WORD cl) int OpenF(char* name) { - int retval=0; - char *manpath_local=(char*)malloc(sizeof(char)*MAXLINE); + int ret = 0; + char *cp; - strcpy(manpath_local, manpath); //save mandir value + /* C:\man\\... */ + cp = getenv("SystemDrive"); + if (cp && *cp) + { + strcpy(manpath, cp); + strcat(manpath, "\\man\\"); + } + else + { + strcpy(manpath, "C:\\man\\"); + } + strcat(manpath, name); - if((manfile=fopen((strcat(manpath_local,name)),"r"))!=NULL) - { - OpenFlag=1; - AnalyzeFile(); - } + manfile = fopen(manpath, "r"); + if (manfile != NULL) + { + OpenFlag = 1; + AnalyzeFile(); + } else - retval=-1; + { + ret = -1; + } - free(manpath_local); - return retval; + return ret; } int

1 0

[reactos] 01/01: [RAPPS] Corrections for Chinese Simplified dialog UI translation (#2781)
by He Yang 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f56ccafe0ed7298234b5… commit 2f56ccafe0ed7298234b5fc599478b6f7a22f826 Author: He Yang <1160386205(a)qq.com> AuthorDate: Wed May 13 20:26:29 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 15:26:29 2020 +0300 [RAPPS] Corrections for Chinese Simplified dialog UI translation (#2781) --- base/applications/rapps/lang/zh-CN.rc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/rapps/lang/zh-CN.rc b/base/applications/rapps/lang/zh-CN.rc index 42c4ee23a3e..dfec62d3609 100644 --- a/base/applications/rapps/lang/zh-CN.rc +++ b/base/applications/rapps/lang/zh-CN.rc @@ -63,7 +63,7 @@ BEGIN AUTOCHECKBOX "保存窗口位置(&S)", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 AUTOCHECKBOX "启动时更新可获得的程序列表(&U)", IDC_UPDATE_AVLIST, 15, 29, 222, 12 AUTOCHECKBOX "将程序的安装和卸载记录到日志(&L)", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "正在下载", -1, 4, 65, 240, 51 + GROUPBOX "下载设置", -1, 4, 65, 240, 51 LTEXT "下载文件夹: ", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "选择(&C)", IDC_CHOOSE, 187, 85, 50, 14 @@ -72,9 +72,9 @@ BEGIN CONTROL "使用系统代理设置", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 210, 10 CONTROL "直连 (无代理）", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 210, 10 CONTROL "代理服务器", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 74, 10 - EDITTEXT IDC_PROXY_SERVER, 90, 160, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "为...不使用代理", -1, 27, 175, 64, 10 - EDITTEXT IDC_NO_PROXY_FOR, 90, 175, 147, 12, ES_AUTOHSCROLL | WS_DISABLED + EDITTEXT IDC_PROXY_SERVER, 97, 160, 140, 12, ES_AUTOHSCROLL | WS_DISABLED + LTEXT "不使用代理的地址", -1, 27, 175, 64, 10 + EDITTEXT IDC_NO_PROXY_FOR, 97, 175, 140, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "默认", IDC_DEFAULT_SETTINGS, 8, 195, 60, 14 DEFPUSHBUTTON "确定", IDOK, 116, 195, 60, 14 PUSHBUTTON "取消", IDCANCEL, 181, 195, 60, 14 @@ -180,7 +180,7 @@ BEGIN IDS_CAT_SCIENCE "科学" IDS_CAT_TOOLS "工具" IDS_CAT_VIDEO "视频" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "主题" END STRINGTABLE @@ -215,7 +215,7 @@ BEGIN IDS_INSTALL_SELECTED "安装已选中的" IDS_SELECTEDFORINST "选中以安装" IDS_MISMATCH_CERT_INFO "所使用的证书未知:\n主题: %s\n发行方: %s\n您是否仍然想继续？" - IDS_UNABLE_PATH "Incorrect path format." + IDS_UNABLE_PATH "不正确的URL格式。" END STRINGTABLE

1 0

[reactos] 01/01: [NOTEPAD] Update Ukrainian translation (#2775)
by Yaroslav Kibysh 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a76c7ea9fc03f896d4fb2… commit a76c7ea9fc03f896d4fb2c968121a94924daff58 Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Wed May 13 15:12:22 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 15:12:22 2020 +0300 [NOTEPAD] Update Ukrainian translation (#2775) --- base/applications/notepad/lang/uk-UA.rc | 56 ++++++++++++++++----------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a1ebedb050f..c249c64a998 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -32,7 +32,7 @@ BEGIN MENUITEM SEPARATOR MENUITEM "В&ихід", CMD_EXIT END - POPUP "Пр&авка" + POPUP "&Редагування" BEGIN MENUITEM "С&касувати\tCtrl+Z", CMD_UNDO MENUITEM SEPARATOR @@ -62,7 +62,7 @@ BEGIN BEGIN MENUITEM "Змі&ст", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "&Про Блокнот", CMD_HELP_ABOUT_NOTEPAD END END @@ -70,37 +70,37 @@ END DIALOG_PAGESETUP DIALOGEX 0, 0, 365, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP FONT 8, "MS Shell Dlg" -CAPTION "Page Setup" +CAPTION "Налаштування сторінки" BEGIN - GROUPBOX "Preview", 0, 240, 6, 120, 153, BS_GROUPBOX + GROUPBOX "Перегляд", 0, 240, 6, 120, 153, BS_GROUPBOX CONTROL "", rct1, "Static", SS_WHITERECT, 260, 42, 80, 80 CONTROL "", rct2, "Static", SS_GRAYRECT, 340, 46, 4, 80 CONTROL "", rct3, "Static", SS_GRAYRECT, 264, 122, 80, 4 - GROUPBOX "Paper", grp2, 8, 6, 224, 56, BS_GROUPBOX - LTEXT "&Size:", stc2, 16, 22, 36, 8 + GROUPBOX "Папір", grp2, 8, 6, 224, 56, BS_GROUPBOX + LTEXT "&Розмір:", stc2, 16, 22, 36, 8 COMBOBOX cmb2, 64, 20, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - LTEXT "&Tray:", stc3, 16, 42, 36, 8 + LTEXT "&Подача:", stc3, 16, 42, 36, 8 COMBOBOX cmb3, 64, 40, 160, 160, CBS_SIMPLE | CBS_DROPDOWN | CBS_SORT | WS_GROUP | WS_TABSTOP | WS_VSCROLL - GROUPBOX "Orientation", grp1, 8, 66, 64, 56, BS_GROUPBOX - AUTORADIOBUTTON "&Portrait", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON - AUTORADIOBUTTON "&Landscape", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON - GROUPBOX "Borders", grp4, 80, 66, 152, 56, BS_GROUPBOX - LTEXT "L&eft:", stc15, 88, 82, 30, 8 + GROUPBOX "Орієнтація", grp1, 8, 66, 64, 56, BS_GROUPBOX + AUTORADIOBUTTON "&Книжкова", rad1, 16, 80, 52, 12, BS_AUTORADIOBUTTON + AUTORADIOBUTTON "П&ортретна", rad2, 16, 100, 52, 12, BS_AUTORADIOBUTTON + GROUPBOX "Поля", grp4, 80, 66, 152, 56, BS_GROUPBOX + LTEXT "&Ліве:", stc15, 88, 82, 30, 8 EDITTEXT edt4, 119, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Right:", stc16, 159, 82, 30, 8 + LTEXT "Пр&аве:", stc16, 159, 82, 30, 8 EDITTEXT edt6, 190, 80, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "T&op:", stc17, 88, 102, 30, 8 + LTEXT "&Верхнє:", stc17, 88, 102, 30, 8 EDITTEXT edt5, 119, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Bottom:", stc18, 159, 102, 30, 8 + LTEXT "&Нижнє:", stc18, 159, 102, 30, 8 EDITTEXT edt7, 190, 100, 36, 12, WS_TABSTOP | WS_GROUP | WS_BORDER - LTEXT "&Header:", 0x140, 8, 132, 40, 15 + LTEXT "Вер&хній колонтитул:", 0x140, 8, 132, 40, 15 EDITTEXT 0x141, 58, 130, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "&Footer:", 0x142, 8, 149, 40, 15 + LTEXT "Н&ижній колонтитул:", 0x142, 8, 149, 40, 15 EDITTEXT 0x143, 58, 147, 173, 12, WS_BORDER | WS_TABSTOP | ES_AUTOHSCROLL - PUSHBUTTON "Help", IDHELP, 8, 170, 50, 14 + PUSHBUTTON "Допомога", IDHELP, 8, 170, 50, 14 DEFPUSHBUTTON "OK", IDOK, 198, 170, 50, 14, BS_PUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 254, 170, 50, 14 - PUSHBUTTON "P&rinter...", psh3, 310, 170, 50, 14 + PUSHBUTTON "Скасувати", IDCANCEL, 254, 170, 50, 14 + PUSHBUTTON "Прин&тер...", psh3, 310, 170, 50, 14 END /* Dialog 'Encoding' */ @@ -143,17 +143,17 @@ BEGIN STRING_ALL_FILES "Усі файли (*.*)" STRING_TEXT_FILES_TXT "Текстові файли (*.txt)" STRING_TOOLARGE "Файл '%s' завеликий для блокнота.\n \ -Будь ласка використайте інший редактор." +Будь ласка, використайте інший редактор." STRING_NOTEXT "Ви не ввели ніякого тексту. \ -\nБудь ласка введіть що-небудь і спробуйте ще раз" +\nБудь ласка, введіть що-небудь і спробуйте ще раз" STRING_DOESNOTEXIST "Файл '%s'\nне існує\n\n \ -Хочете створити новий файл ?" +Хочете створити новий файл?" STRING_NOTSAVED "Файл '%s'\nбув змінений\n\n \ -Хочете зберегти зміни ?" - STRING_NOTFOUND "'%s' can not be found." +Хочете зберегти зміни?" + STRING_NOTFOUND "'%s' не знайдено." STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\ \nЗакрийте один або декілька додатків і повторіть спробу." - STRING_CANNOTFIND "Не можу знайти '%s'" + STRING_CANNOTFIND "Неможливо знайти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Юнікод" STRING_UNICODE_BE "Юнікод (big endian)" @@ -162,8 +162,8 @@ BEGIN STRING_LF "Unix (LF)" STRING_CR "Mac (CR)" STRING_LINE_COLUMN "Рядок %d, стовпчик %d" - STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." + STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." - STRING_TEXT_DOCUMENT "Text Document" + STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" END

1 0

[reactos] 01/01: [SYSSETUP] Update Ukrainian translation (#2776)
by Yaroslav Kibysh 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f319bafc8ebed4a0da2f… commit 5f319bafc8ebed4a0da2f43d6ec4e508f25f860b Author: Yaroslav Kibysh <yanet.prod(a)gmail.com> AuthorDate: Wed May 13 15:11:48 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 15:11:48 2020 +0300 [SYSSETUP] Update Ukrainian translation (#2776) --- dll/win32/syssetup/lang/uk-UA.rc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dll/win32/syssetup/lang/uk-UA.rc b/dll/win32/syssetup/lang/uk-UA.rc index 0708330b63b..65f07117587 100644 --- a/dll/win32/syssetup/lang/uk-UA.rc +++ b/dll/win32/syssetup/lang/uk-UA.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/syssetup/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for syssetup - * TRANSLATORS: Artem Reznikov, Igor Paliychuk + * TRANSLATORS: Artem Reznikov, Igor Paliychuk, Yaroslav Kibysh */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -14,7 +14,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ласкаво просимо до майстра встановлення ReactOS.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб установити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Цей майстер встановлює ReactOS на Ваш комп'ютер. Йому потрібно зібрати деякі відомості про Вас і Ваш комп'ютер щоб встановити ReactOS належним чином.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Натисніть ""Далі"", щоб продовжити встановлення.", IDC_STATIC, 115, 169, 195, 17 END @@ -31,20 +31,20 @@ BEGIN END IDD_PRODUCT DIALOGEX 0, 0, 317, 143 -CAPTION "ReactOS Setup" +CAPTION "Встановлення ReactOS" STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUPWINDOW | WS_CAPTION | WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_PRODUCT_ICON, 5, 5, 20, 20 - LTEXT "Please choose a product option:", IDC_STATIC, 35, 7, 230, 12 - LTEXT "Product &Options:", IDC_STATIC, 5, 32, 85, 10 + LTEXT "Будь ласка, виберіть тип продукту:", IDC_STATIC, 35, 7, 230, 12 + LTEXT "Тип &продукту:", IDC_STATIC, 5, 32, 85, 10 COMBOBOX IDC_PRODUCT_OPTIONS, 95, 30, 170, 300, CBS_HASSTRINGS | CBS_AUTOHSCROLL | CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Product Information", IDC_STATIC, 5, 50, 305, 85 + GROUPBOX "Інформація про продукт", IDC_STATIC, 5, 50, 305, 85 LTEXT "ProductSuite:", IDC_STATIC, 20, 62, 70, 10 EDITTEXT IDC_PRODUCT_SUITE, 95, 60, 175, 14, ES_READONLY | ES_AUTOHSCROLL LTEXT "ProductType:", IDC_STATIC, 20, 82, 70, 10 EDITTEXT IDC_PRODUCT_TYPE, 95, 80, 110, 14, ES_READONLY | ES_AUTOHSCROLL - LTEXT "Description:", IDC_STATIC, 20, 102, 70, 10 + LTEXT "Опис:", IDC_STATIC, 20, 102, 70, 10 EDITTEXT IDC_PRODUCT_DESCRIPTION, 95, 99, 205, 30, ES_READONLY | ES_AUTOVSCROLL | ES_MULTILINE | WS_VSCROLL END @@ -54,7 +54,7 @@ CAPTION "Встановлення ReactOS" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_ICON2, IDC_STATIC, 21, 7, 20, 20 - LTEXT "Введіть своє повне ім'я і назву вашої компанії або організації.", IDC_STATIC, 54, 7, 242, 21 + LTEXT "Введіть своє повне ім'я та назву вашої організації.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Ім'я:", IDC_STATIC, 54, 37, 44, 8 EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Організація:", IDC_STATIC, 54, 57, 44, 8 @@ -135,7 +135,7 @@ BEGIN LTEXT "Завершення встановлення ReactOS", IDC_FINISHTITLE, 115, 8, 195, 24 LTEXT "Ви успішно завершили встановлення ReactOS.\n\nПісля натиснення кнопки ""Завершити"" комп'ютер буде перезавантажений.", IDC_STATIC, 115, 40, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 - LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Потім для перезавантаження Вашого комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 + LTEXT "Якщо в дисковод вставлений компакт-диск, вийміть його. Для перезавантаження комп'ютера натистніть ""Завершити"".", IDC_STATIC, 115, 163, 195, 25 END IDD_GPL DIALOGEX 0, 0, 333, 230 @@ -253,10 +253,10 @@ END STRINGTABLE BEGIN - IDS_PRODUCTTITLE "Product Options" - IDS_PRODUCTSUBTITLE "You can choose a product option that affects the behaviour of the system." - IDS_PRODUCTSERVERNAME "ReactOS Server" - IDS_PRODUCTWORKSTATIONNAME "ReactOS Workstation (Default)" - IDS_PRODUCTSERVERINFO "The system will be recognized as a server. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are independent from ""My Documents""." - IDS_PRODUCTWORKSTATIONINFO "The system will be recognized as a workstation. Private folders ""My Pictures"", ""My Videos"" and ""My Music"" are in ""My Documents""." + IDS_PRODUCTTITLE "Тип продукту" + IDS_PRODUCTSUBTITLE "Ви можете вибрати тип продукту. Це вплине на поведінку системи." + IDS_PRODUCTSERVERNAME "Сервер ReactOS" + IDS_PRODUCTWORKSTATIONNAME "Робоча станція ReactOS (за замовчуванням)" + IDS_PRODUCTSERVERINFO "Система буде розпізнаватися як сервер. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" не будуть залежати від папки ""Мої документи""." + IDS_PRODUCTWORKSTATIONINFO "Система буде розпізнаватися як робоча станція. Особисті папки ""Мої зображення"", ""Мої відео"" та ""Моя музика"" будуть в папці ""Мої документи""." END

1 0

[reactos] 01/01: [FTP] Don't hardcode C: drive (#2767)
by Katayama Hirofumi MZ 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=278f563e04eb6a44fb3e6… commit 278f563e04eb6a44fb3e66641d4cc14999bdcd6b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed May 13 13:42:18 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed May 13 13:42:18 2020 +0900 [FTP] Don't hardcode C: drive (#2767) CORE-13235 --- base/applications/network/ftp/main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/base/applications/network/ftp/main.c b/base/applications/network/ftp/main.c index 44b10fb6970..f2b1c9a0bb3 100644 --- a/base/applications/network/ftp/main.c +++ b/base/applications/network/ftp/main.c @@ -227,7 +227,16 @@ int main(int argc, const char *argv[]) (void) strcpy(home, pw->pw_dir); } #endif - strcpy(home, "C:/"); + cp = getenv("SystemDrive"); + if (cp != NULL && *cp != 0) + { + strcpy(home, cp); + strcat(home, "/"); + } + else + { + strcpy(home, "C:/"); + } if (argc > 0) { if (setjmp(toplevel)) exit(0);

1 0

[reactos] 01/01: [NtGDI] Add missing type for EPS Print Escape
by James Tabor 13 May '20

13 May '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cba5acbc48b48971e0e93… commit cba5acbc48b48971e0e93787221ac3f5da31eab7 Author: James Tabor <james.tabor(a)reactos.org> AuthorDate: Tue May 12 20:34:22 2020 -0500 Commit: James Tabor <james.tabor(a)reactos.org> CommitDate: Tue May 12 20:34:22 2020 -0500 [NtGDI] Add missing type for EPS Print Escape Part of GDI escape printing. --- win32ss/gdi/ntgdi/dcutil.c | 5 +++++ win32ss/include/ntgdityp.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dcutil.c b/win32ss/gdi/ntgdi/dcutil.c index 0ac907f0197..056fd7f2140 100644 --- a/win32ss/gdi/ntgdi/dcutil.c +++ b/win32ss/gdi/ntgdi/dcutil.c @@ -585,6 +585,11 @@ NtGdiGetAndSetDCDword( switch (u) { + case GdiGetSetEPSPrintingEscape: + SafeResult = pdc->fs & DC_EPSPRINTINGESCAPE; + pdc->fs &= ~DC_EPSPRINTINGESCAPE; + break; + case GdiGetSetCopyCount: SafeResult = pdc->ulCopyCount; pdc->ulCopyCount = dwIn; diff --git a/win32ss/include/ntgdityp.h b/win32ss/include/ntgdityp.h index 748e4041034..3144df2745d 100644 --- a/win32ss/include/ntgdityp.h +++ b/win32ss/include/ntgdityp.h @@ -59,7 +59,8 @@ typedef enum _GETDCDWORD typedef enum _GETSETDCDWORD { - GdiGetSetCopyCount = 2, + GdiGetSetEPSPrintingEscape = 1, + GdiGetSetCopyCount, GdiGetSetTextAlign, GdiGetSetRelAbs, GdiGetSetTextCharExtra,

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