Ros-diffs April 2020

ros-diffs@reactos.org

45 participants
395 discussions

[reactos] 01/01: [ZIPFLDR] Update Polish translation (#2351)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e81aebeec5426ab5e4dc… commit 5e81aebeec5426ab5e4dca85737b18cfba21935c Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Sat Feb 15 08:01:33 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 10:39:50 2020 +0300 [ZIPFLDR] Update Polish translation (#2351) --- dll/shellext/zipfldr/lang/pl-PL.rc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dll/shellext/zipfldr/lang/pl-PL.rc b/dll/shellext/zipfldr/lang/pl-PL.rc index 3ac36f3980d..f89e018bdd5 100644 --- a/dll/shellext/zipfldr/lang/pl-PL.rc +++ b/dll/shellext/zipfldr/lang/pl-PL.rc @@ -2,6 +2,8 @@ * PROJECT: ReactOS Zip Shell Extension * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) * PURPOSE: Polish resource translation + * TRANSLATORS: 2018-2019 Adam Słaboń (asaillen456esx(a)gmail.com) + * 2020 Piotr Hetnarowicz (piotrhwz(a)gmail.com) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -15,7 +17,7 @@ BEGIN EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL PUSHBUTTON "Przeglądaj...",IDC_BROWSE,174,42,54,14 PUSHBUTTON "Hasło",IDC_PASSWORD,174,66,54,14 - LTEXT "Click 'Next' to extract",IDC_STATUSTEXT,6,114,100,8 + LTEXT "Kliknij przycisk Dalej, aby wypakować.",IDC_STATUSTEXT,6,114,124,8 CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END @@ -67,12 +69,12 @@ BEGIN IDS_COL_DATE_MOD "Data modyfikacji" IDS_YES "Tak" IDS_NO "Nie" - IDS_ERRORTITLE "Compressed (zipped) Folders Error" - IDS_CANTSTARTTHREAD "Cannot start thread to compress files." - IDS_NOFILES "The specified directory '%s' is empty, so Compressed (zipped) Folders cannot add it to the archive." - IDS_CANTCREATEZIP "Failed to create a compressed folder '%s' (Error Code: %d)." - IDS_CANTREADFILE "Cannot read file '%s'." - IDS_EXTRACTING "Extracting..." + IDS_ERRORTITLE "Błąd folderów skompresowanych (zip)." + IDS_CANTSTARTTHREAD "Nie można uruchomić wątku do kompresji plików." + IDS_NOFILES "Określony katalog '%s' jest pusty, dlatego foldery skompresowane (zip) nie mogą dodać go do archiwum." + IDS_CANTCREATEZIP "Nie można utworzyć folderu skompresowanego '%s' (kod błędu: %d)." + IDS_CANTREADFILE "Błąd podczas czytania pliku '%s'." + IDS_EXTRACTING "Trwa wyodrębnianie..." IDS_WIZ_TITLE "Kreator wyodrębniania" IDS_WIZ_DEST_TITLE "Wybierz miejsce docelowe"

4 years, 6 months

[reactos] 01/01: [APPWIZ] Update Polish translation (#2337)

by Piotr Hetnarowicz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5c86e1012b37a60c1a4e6… commit 5c86e1012b37a60c1a4e651ccdac5ed96c41ed96 Author: Piotr Hetnarowicz <piotrhwz(a)gmail.com> AuthorDate: Wed Feb 12 18:24:36 2020 +0100 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 09:51:40 2020 +0300 [APPWIZ] Update Polish translation (#2337) --- dll/cpl/appwiz/lang/pl-PL.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/cpl/appwiz/lang/pl-PL.rc b/dll/cpl/appwiz/lang/pl-PL.rc index caf66710be7..49baa3ab42e 100644 --- a/dll/cpl/appwiz/lang/pl-PL.rc +++ b/dll/cpl/appwiz/lang/pl-PL.rc @@ -6,6 +6,7 @@ * UTF-8 conversion by Caemyr (May, 2011) * Updated by Saibamen - Adam Stachowicz (saibamenppl(a)gmail.com) (April, 2014) * Updated by Zcooger - M. St. Ciuńczyk (October, 2018) + * Updated by pithwz - Piotr Hetnarowicz <piotrhwz(a)gmail.com> (February, 2020) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -34,7 +35,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Utwórz skrót" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Ten program konfiguracyjny pomoże ci stworzyć skróty do lokalnych lub\nsieciowych programów, plików, katalogów, komputerów, bądź addresów\nInternetowych.", -1, 120, 15, 200, 30 + LTEXT "Ten program pomoże ci stworzyć skróty do lokalnych lub sieciowych programów, plików, katalogów, komputerów, bądź adresów Internetowych.", -1, 120, 15, 200, 30 LTEXT "Wpisz ścieżkę dostępu do obiektu:", -1, 120, 50, 120, 10 EDITTEXT IDC_SHORTCUT_LOCATION, 120, 65, 150, 15, ES_LEFT PUSHBUTTON "Przeglądaj...", IDC_SHORTCUT_BROWSE, 272, 65, 55, 15, ES_LEFT

4 years, 6 months

[reactos] 01/01: [WALLPAPER] Rename Soft Blue to Mizu (#1945)

by Foxlet

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6a8c894642c0c7003d238… commit 6a8c894642c0c7003d238b8aab97376f762cd9a6 Author: Foxlet <foxlet(a)furcode.co> AuthorDate: Wed Apr 15 19:37:17 2020 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 02:37:17 2020 +0300 [WALLPAPER] Rename Soft Blue to Mizu (#1945) Cleanup of filenames to match the Mizu theme. --- modules/wallpapers/CMakeLists.txt | 7 ++++--- modules/wallpapers/ReactOS_Mizu.png | Bin 0 -> 39382 bytes .../{ReactOS_Soft_Blue.png => ReactOS_Mizu_16x9_A.png} | Bin ...actOS_Soft_Blue_16x9.png => ReactOS_Mizu_16x9_B.png} | Bin .../{ReactOS_Soft_Blue_4x3.png => ReactOS_Mizu_4x3.png} | Bin modules/wallpapers/ReadMe.txt | 7 ++++--- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/wallpapers/CMakeLists.txt b/modules/wallpapers/CMakeLists.txt index ab4c64f93a5..76495cd454b 100644 --- a/modules/wallpapers/CMakeLists.txt +++ b/modules/wallpapers/CMakeLists.txt @@ -7,8 +7,9 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesBlue_2.jpg DESTINATI add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_1.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_CirclesGold_2.jpg DESTINATION reactos/Web/Wallpaper FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Hexagons.jpg DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue.png DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue_4x3.png DESTINATION reactos/Web/Wallpaper FOR all) -add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Soft_Blue_16x9.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_4x3.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_16x9_A.png DESTINATION reactos/Web/Wallpaper FOR all) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/ReactOS_Mizu_16x9_B.png DESTINATION reactos/Web/Wallpaper FOR all) add_subdirectory(Angelus) add_subdirectory(Silhouette) diff --git a/modules/wallpapers/ReactOS_Mizu.png b/modules/wallpapers/ReactOS_Mizu.png new file mode 100644 index 00000000000..43dc6d19c6b Binary files /dev/null and b/modules/wallpapers/ReactOS_Mizu.png differ diff --git a/modules/wallpapers/ReactOS_Soft_Blue.png b/modules/wallpapers/ReactOS_Mizu_16x9_A.png similarity index 100% rename from modules/wallpapers/ReactOS_Soft_Blue.png rename to modules/wallpapers/ReactOS_Mizu_16x9_A.png diff --git a/modules/wallpapers/ReactOS_Soft_Blue_16x9.png b/modules/wallpapers/ReactOS_Mizu_16x9_B.png similarity index 100% rename from modules/wallpapers/ReactOS_Soft_Blue_16x9.png rename to modules/wallpapers/ReactOS_Mizu_16x9_B.png diff --git a/modules/wallpapers/ReactOS_Soft_Blue_4x3.png b/modules/wallpapers/ReactOS_Mizu_4x3.png similarity index 100% rename from modules/wallpapers/ReactOS_Soft_Blue_4x3.png rename to modules/wallpapers/ReactOS_Mizu_4x3.png diff --git a/modules/wallpapers/ReadMe.txt b/modules/wallpapers/ReadMe.txt index 51dd3ced2f9..cd82eb93444 100644 --- a/modules/wallpapers/ReadMe.txt +++ b/modules/wallpapers/ReadMe.txt @@ -15,9 +15,10 @@ ReactOS_CirclesBlue_2.jpg | See above ReactOS_CirclesGold_1.jpg | See above | See above ReactOS_CirclesGold_2.jpg | See above | See above ReactOS_Hexagons.jpg | See above | http://www.reactos.org/forum/viewtopic.php?p=109866#p109866 -ReactOS_Soft_Blue.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 -ReactOS_Soft_Blue_4x3.png | See above | See above -ReactOS_Soft_Blue_16x9.png | See above | See above +ReactOS_Mizu.png | Forum user "Foxlet" (foxlet(a)furcode.co) | https://jira.reactos.org/browse/CORE-15783 +ReactOS_Mizu_4x3.png | See above | See above +ReactOS_Mizu_16x9_A.png | See above | See above +ReactOS_Mizu_16x9_B.png | See above | See above Silhouette collection | Jake Collins (polar(a)ever3st.com) | https://ever3st.com/Graphics/Loot/ To include the module in your build folder, run the configure script with the flags -DENABLE_WALLPAPERS=1

4 years, 6 months

[reactos] 01/01: [SFC][SFC_OS] Add stubs to exported functions (#2431)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7865ff97cc18b58be6fde… commit 7865ff97cc18b58be6fde86b17b0c945d54e4ba1 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Apr 16 02:06:22 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 02:06:22 2020 +0300 [SFC][SFC_OS] Add stubs to exported functions (#2431) - Also remove extra whitespace between function names and their arguments in sfc. - Required by userenv.dll, win32k.sys, and others from Windows Server 2003 and also by some MS installers like Windows Media Encoder 7.1 installer. Now they should not fail due to that functions. CORE-16458 --- dll/win32/sfc/sfc.spec | 34 +++++++++++++++++----------------- dll/win32/sfc_os/sfc_os.spec | 12 ++++++------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dll/win32/sfc/sfc.spec b/dll/win32/sfc/sfc.spec index 12b1da8e21c..c94c35d0521 100644 --- a/dll/win32/sfc/sfc.spec +++ b/dll/win32/sfc/sfc.spec @@ -1,17 +1,17 @@ -@ stub sfc_1 -@ stub sfc_2 -@ stub sfc_3 -@ stub sfc_4 -@ stub sfc_5 -@ stub sfc_6 -@ stub sfc_7 -@ stdcall sfc_8 () -@ stdcall sfc_9 () -@ stdcall SRSetRestorePoint (ptr ptr) SRSetRestorePointA -@ stdcall SRSetRestorePointA (ptr ptr) -@ stdcall SRSetRestorePointW (ptr ptr) -@ stdcall SfcGetNextProtectedFile (ptr ptr) sfc_os.SfcGetNextProtectedFile -@ stdcall SfcIsFileProtected (ptr wstr) sfc_os.SfcIsFileProtected -@ stdcall SfcWLEventLogoff (ptr) sfc_os.SfcWLEventLogoff -@ stdcall SfcWLEventLogon (ptr) sfc_os.SfcWLEventLogon -@ stdcall SfpVerifyFile (str str long) \ No newline at end of file +@ stdcall -stub sfc_1() +@ stdcall -stub sfc_2() +@ stdcall -stub sfc_3() +@ stdcall -stub sfc_4() +@ stdcall -stub sfc_5() +@ stdcall -stub sfc_6() +@ stdcall -stub sfc_7() +@ stdcall sfc_8() +@ stdcall sfc_9() +@ stdcall SRSetRestorePoint(ptr ptr) SRSetRestorePointA +@ stdcall SRSetRestorePointA(ptr ptr) +@ stdcall SRSetRestorePointW(ptr ptr) +@ stdcall SfcGetNextProtectedFile(ptr ptr) sfc_os.SfcGetNextProtectedFile +@ stdcall SfcIsFileProtected(ptr wstr) sfc_os.SfcIsFileProtected +@ stdcall SfcWLEventLogoff(ptr) sfc_os.SfcWLEventLogoff +@ stdcall SfcWLEventLogon(ptr) sfc_os.SfcWLEventLogon +@ stdcall SfpVerifyFile(str str long) diff --git a/dll/win32/sfc_os/sfc_os.spec b/dll/win32/sfc_os/sfc_os.spec index 561928bc428..c229cf6ed18 100644 --- a/dll/win32/sfc_os/sfc_os.spec +++ b/dll/win32/sfc_os/sfc_os.spec @@ -1,10 +1,10 @@ -@ stub sfc_os_1 -@ stub sfc_os_2 -@ stub sfc_os_3 -@ stub sfc_os_4 +@ stdcall -stub sfc_os_1() +@ stdcall -stub sfc_os_2() +@ stdcall -stub sfc_os_3() +@ stdcall -stub sfc_os_4() @ stdcall SfcFileException(long ptr long) -@ stub sfc_os_6 -@ stub sfc_os_7 +@ stdcall -stub sfc_os_6() +@ stdcall -stub sfc_os_7() @ stdcall SfcGetNextProtectedFile(ptr ptr) @ stdcall SfcIsFileProtected(ptr wstr) @ stdcall SfcIsKeyProtected(long wstr long)

4 years, 6 months

[reactos] 01/01: [WINSTA] Add some missing stubs (#2307)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d8b224d71c162ec95e4e… commit 2d8b224d71c162ec95e4e5215322d480cefd3618 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Thu Apr 16 01:50:22 2020 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 01:50:22 2020 +0300 [WINSTA] Add some missing stubs (#2307) Add stubs for WinStationCanLogonProceed() and _WinStationOpenSessionDirectory() functions to make winlogon from Windows Server 2003 happy. CORE-15392 CORE-16458 --- dll/win32/winsta/logon.c | 15 +++++++++++++++ dll/win32/winsta/winsta.spec | 2 ++ 2 files changed, 17 insertions(+) diff --git a/dll/win32/winsta/logon.c b/dll/win32/winsta/logon.c index 1ea47b78328..3462aafac2f 100644 --- a/dll/win32/winsta/logon.c +++ b/dll/win32/winsta/logon.c @@ -111,3 +111,18 @@ WINSTAAPI _WinStationNotifyLogon(PVOID A, { UNIMPLEMENTED; } + +VOID +WINSTAAPI WinStationCanLogonProceed(PVOID A, + PVOID B, + PVOID C) +{ + UNIMPLEMENTED; +} + +VOID +WINSTAAPI _WinStationOpenSessionDirectory(PVOID A, + PVOID B) +{ + UNIMPLEMENTED; +} diff --git a/dll/win32/winsta/winsta.spec b/dll/win32/winsta/winsta.spec index df10cfee4b9..4779f868bd4 100644 --- a/dll/win32/winsta/winsta.spec +++ b/dll/win32/winsta/winsta.spec @@ -21,6 +21,7 @@ @ stdcall WinStationActivateLicense(ptr ptr ptr ptr) @ stdcall WinStationAutoReconnect(ptr) @ stdcall WinStationBroadcastSystemMessage(ptr ptr ptr ptr ptr ptr ptr ptr ptr ptr) +@ stdcall WinStationCanLogonProceed(ptr ptr ptr) @ stdcall WinStationCheckAccess(ptr ptr ptr) @ stdcall WinStationCheckLoopBack(ptr ptr ptr ptr) @ stdcall WinStationCloseServer(ptr ptr ptr ptr) @@ -111,6 +112,7 @@ @ stdcall _WinStationNotifyLogoff() @ stdcall _WinStationNotifyLogon(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall _WinStationNotifyNewSession(ptr ptr) +@ stdcall _WinStationOpenSessionDirectory(ptr ptr) @ stdcall _WinStationReInitializeSecurity(ptr) @ stdcall _WinStationReadRegistry(ptr) @ stdcall _WinStationSessionInitialized()

4 years, 6 months

[reactos] 01/01: [KSECDD] Improve GetSecurityUserInfo stub (#2438)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb10698316c9d4d4b9c49… commit cb10698316c9d4d4b9c499b6c9a9791d6eb023d5 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Wed Apr 15 17:32:47 2020 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Apr 16 01:32:47 2020 +0300 [KSECDD] Improve GetSecurityUserInfo stub (#2438) - Fix UNIMPLEMENTED_DBGBREAK seen using FileMon - Add SAL2 Annotations and remove unneeded comments - Return NULL pointer CORE-15186 --- drivers/crypto/ksecdd/ksecdd.spec | 2 +- drivers/crypto/ksecdd/stubs.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/ksecdd/ksecdd.spec b/drivers/crypto/ksecdd/ksecdd.spec index 796edb8d2b7..2f1fc69edd8 100644 --- a/drivers/crypto/ksecdd/ksecdd.spec +++ b/drivers/crypto/ksecdd/ksecdd.spec @@ -12,7 +12,7 @@ @ stdcall FreeCredentialsHandle(ptr) @ stdcall GenerateDirEfs() @ stdcall GenerateSessionKey() -@ stdcall GetSecurityUserInfo() +@ stdcall GetSecurityUserInfo(ptr long ptr) @ stdcall ImpersonateSecurityContext(ptr) @ stdcall ImportSecurityContextW(ptr ptr ptr ptr) @ stdcall InitSecurityInterfaceW() diff --git a/drivers/crypto/ksecdd/stubs.c b/drivers/crypto/ksecdd/stubs.c index 176b4acb9f9..426861c97ae 100644 --- a/drivers/crypto/ksecdd/stubs.c +++ b/drivers/crypto/ksecdd/stubs.c @@ -13,6 +13,7 @@ #define NDEBUG #include <debug.h> +typedef PVOID PSECURITY_PACKAGE_OPTIONS, PSecurityUserData; /* FUNCTIONS ******************************************************************/ @@ -160,11 +161,16 @@ GenerateSessionKey(VOID) UNIMPLEMENTED_DBGBREAK(); } -VOID +SECURITY_STATUS SEC_ENTRY -GetSecurityUserInfo(VOID) +GetSecurityUserInfo( + _In_opt_ PLUID LogonId, + _In_ ULONG Flags, + _Outptr_ PSecurityUserData *UserInformation) { - UNIMPLEMENTED_DBGBREAK(); + UNIMPLEMENTED; + *UserInformation = NULL; + return STATUS_UNSUCCESSFUL; } SECURITY_STATUS

4 years, 6 months

[reactos] 01/01: [CHARMAP] Updates to behaviour and UI (#2543)

by Charles Ambrye

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d90e1061e1f8d09ba70a8… commit d90e1061e1f8d09ba70a87170cd6d29813703579 Author: Charles Ambrye <giawa(a)hotmail.com> AuthorDate: Wed Apr 15 14:31:16 2020 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 15 23:31:16 2020 +0200 [CHARMAP] Updates to behaviour and UI (#2543) Purpose ~=~=~=~ This pull request updates charmap to look a bit better (removes gap at bottom of the window), removes the blank space character (0x0020) from the charmap, and also modifies the behaviour of when a larger glyph is rendered (allowing the user to select a new glyph by holding down the mouse button). This better mimics the charmap.exe that is bundled by Microsoft. Proposed changes ~=~=~=~=~=~=~=~= - Remove gap where the advanced button is normally rendered when compiled with REMOVE_ADVANCED (which is the default behaviour). - Skip over the blank space character. - Change behaviour of rendering large glyphs to allow mouse move, and to hide on double click. - Optimize search for glyph under the mouse by using the cellSize instead of PtInRect. * [CHARMAP] Resize the window slightly when compiled with REMOVE_ADVANCED to avoid deadspace at the bottom of the window * [CHARMAP] Skip over the non-printable characters by starting with character ' ' + 1 * [CHARMAP] Instead of iterating over every cell, simply compute the cell x and y using the CellSize Modify behaviour of charmap to allow large character render on mouse move, only hiding the larger character on double click. --- base/applications/charmap/charmap.c | 12 +++++ base/applications/charmap/map.c | 92 +++++++++++++++++-------------------- 2 files changed, 54 insertions(+), 50 deletions(-) diff --git a/base/applications/charmap/charmap.c b/base/applications/charmap/charmap.c index 218f8512c5e..1ed517b390f 100644 --- a/base/applications/charmap/charmap.c +++ b/base/applications/charmap/charmap.c @@ -276,6 +276,8 @@ ChangeView(HWND hWnd) RECT rcCharmap; #ifndef REMOVE_ADVANCED RECT rcAdvanced; +#else + RECT rcCopy; #endif RECT rcPanelExt; RECT rcPanelInt; @@ -284,10 +286,16 @@ ChangeView(HWND hWnd) UINT xPos, yPos; UINT Width, Height; UINT DeskTopWidth, DeskTopHeight; +#ifdef REMOVE_ADVANCED + HWND hCopy; +#endif GetClientRect(hCharmapDlg, &rcCharmap); #ifndef REMOVE_ADVANCED GetClientRect(hAdvancedDlg, &rcAdvanced); +#else + hCopy = GetDlgItem(hCharmapDlg, IDC_COPY); + GetClientRect(hCopy, &rcCopy); #endif GetWindowRect(hWnd, &rcPanelExt); GetClientRect(hWnd, &rcPanelInt); @@ -312,6 +320,10 @@ ChangeView(HWND hWnd) #ifndef REMOVE_ADVANCED if (Settings.IsAdvancedView) Height += rcAdvanced.bottom; +#else + /* The lack of advanced button leaves an empty gap at the bottom of the window. + Shrink the window height a bit here to accomodate for that lost control. */ + Height = rcCharmap.bottom + rcCopy.bottom + 10; #endif if ((xPos + Width) > DeskTopWidth) xPos += DeskTopWidth - (xPos + Width); diff --git a/base/applications/charmap/map.c b/base/applications/charmap/map.c index a8a9c8a2823..7b2d7838ef8 100644 --- a/base/applications/charmap/map.c +++ b/base/applications/charmap/map.c @@ -256,7 +256,7 @@ SetFont(PMAP infoPtr, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) { j = 0; - for (i = 0; i < MAX_GLYPHS; i++) + for (i = ' ' + 1; i < MAX_GLYPHS; i++) { if (out[i] != 0xffff) { @@ -312,64 +312,38 @@ OnClick(PMAP infoPtr, WORD ptx, WORD pty) { - POINT pt; INT x, y; - pt.x = ptx; - pt.y = pty; + x = ptx / max(1, infoPtr->CellSize.cx); + y = pty / max(1, infoPtr->CellSize.cy); - for (x = 0; x < XCELLS; x++) - for (y = 0; y < YCELLS; y++) + /* if the cell is not already active */ + if (!infoPtr->Cells[y][x].bActive) { - if (PtInRect(&infoPtr->Cells[y][x].CellInt, - pt)) + /* set previous active cell to inactive */ + if (infoPtr->pActiveCell) { - /* if the cell is not already active */ - if (!infoPtr->Cells[y][x].bActive) - { - /* set previous active cell to inactive */ - if (infoPtr->pActiveCell) - { - /* invalidate normal cells, required when - * moving a small active cell via keyboard */ - if (!infoPtr->pActiveCell->bLarge) - { - InvalidateRect(infoPtr->hMapWnd, - &infoPtr->pActiveCell->CellInt, - TRUE); - } - - infoPtr->pActiveCell->bActive = FALSE; - infoPtr->pActiveCell->bLarge = FALSE; - } - - /* set new cell to active */ - infoPtr->pActiveCell = &infoPtr->Cells[y][x]; - infoPtr->pActiveCell->bActive = TRUE; - infoPtr->pActiveCell->bLarge = TRUE; - if (infoPtr->hLrgWnd) - MoveLargeCell(infoPtr); - else - CreateLargeCell(infoPtr); - } - else + /* invalidate normal cells, required when + * moving a small active cell via keyboard */ + if (!infoPtr->pActiveCell->bLarge) { - /* flick between large and small */ - if (infoPtr->pActiveCell->bLarge) - { - DestroyWindow(infoPtr->hLrgWnd); - infoPtr->hLrgWnd = NULL; - } - else - { - CreateLargeCell(infoPtr); - } - - infoPtr->pActiveCell->bLarge = (infoPtr->pActiveCell->bLarge) ? FALSE : TRUE; + InvalidateRect(infoPtr->hMapWnd, + &infoPtr->pActiveCell->CellInt, + TRUE); } - break; + infoPtr->pActiveCell->bActive = FALSE; + infoPtr->pActiveCell->bLarge = FALSE; } + + /* set new cell to active */ + infoPtr->pActiveCell = &infoPtr->Cells[y][x]; + infoPtr->pActiveCell->bActive = TRUE; + infoPtr->pActiveCell->bLarge = TRUE; + if (infoPtr->hLrgWnd) + MoveLargeCell(infoPtr); + else + CreateLargeCell(infoPtr); } } @@ -577,12 +551,30 @@ MapWndProc(HWND hwnd, break; } + case WM_MOUSEMOVE: + { + if (wParam & MK_LBUTTON) + { + OnClick(infoPtr, + LOWORD(lParam), + HIWORD(lParam)); + } + break; + } + case WM_LBUTTONDBLCLK: { NotifyParentOfSelection(infoPtr, FM_SETCHAR, infoPtr->pActiveCell->ch); + if (infoPtr->pActiveCell->bLarge) + { + DestroyWindow(infoPtr->hLrgWnd); + infoPtr->hLrgWnd = NULL; + } + + infoPtr->pActiveCell->bLarge = FALSE; break; }

4 years, 6 months

[reactos] 01/01: [SHELL32][BROWSEUI] Update Russian translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea298746dbfeac7229523… commit ea298746dbfeac7229523c716ab033e5fa3180d8 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Apr 16 00:10:12 2020 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Apr 16 00:10:12 2020 +0300 [SHELL32][BROWSEUI] Update Russian translation Addendum to 033f0d9. CORE-16866 --- dll/win32/browseui/lang/ru-RU.rc | 4 ++-- dll/win32/shell32/lang/ru-RU.rc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/browseui/lang/ru-RU.rc b/dll/win32/browseui/lang/ru-RU.rc index 76ee2d043bf..9baefa021d3 100644 --- a/dll/win32/browseui/lang/ru-RU.rc +++ b/dll/win32/browseui/lang/ru-RU.rc @@ -3,7 +3,7 @@ * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) * PURPOSE: Russian resource file * COPYRIGHT: Copyright 2014-2015 Petr Akhlamov (petr-akhlamov(a)yandex.ru) - * Copyright 2017 Stanislav Motylkov (binarymaster(a)mail.ru) + * Copyright 2017-2020 Stanislav Motylkov (binarymaster(a)mail.ru) * Copyright 2019 Abdulganiev Rafael (abdulganiev.rafael[at]gmail.com) */ @@ -339,7 +339,7 @@ BEGIN IDS_SEARCHINVALID "'%1' не является допустимой папкой." IDS_SEARCH_FOLDER "Ищем в ""%s""" IDS_SEARCH_FILES_FOUND "Найдено файлов: %u" - IDS_SEARCH_OPEN_FOLDER "Открыть &расположение файла" + IDS_SEARCH_OPEN_FOLDER "Открыть &расположение объекта" IDS_COL_NAME "Имя" IDS_COL_LOCATION "В папке" IDS_COL_RELEVANCE "Релевантность" diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 7f3031f4ecb..40c1a320fbc 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -775,7 +775,7 @@ BEGIN IDS_PASTE "Вставить" IDS_EJECT "Извлечь" IDS_DISCONNECT "Отсоединить" - IDS_OPENFILELOCATION "Открыть &расположение файла" + IDS_OPENFILELOCATION "Открыть &расположение объекта" IDS_DESKLINK "Рабочий стол (создать ярлык)" IDS_SENDTO_MENU "Отправит&ь"

4 years, 6 months

[reactos] 01/01: [CSRSRV] Addendum to e3a70662: Fix build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1815aae8776019c53a7e2… commit 1815aae8776019c53a7e23b6aec50605cb244688 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 15 15:53:47 2020 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 15 15:59:08 2020 +0200 [CSRSRV] Addendum to e3a70662: Fix build. Since indeeed the memcpy/move type of functions usually don't operate on pointers to 'volatile' data, don't make ClientCaptureBuffer volatile. Instead when retrieving the values of its 'Size' and 'PointerCount' members (see the SEH block), use the so-called technique of "volatile glasses" [1], where the pointer will be explicitly casted to "volatile TYPE*" where needed. [1]: https://docs.microsoft.com/archive/blogs/itgoestoeleven/why-your-user-mode-… --- subsystems/win32/csrsrv/api.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c index 9120794b16e..62bb06b3eba 100644 --- a/subsystems/win32/csrsrv/api.c +++ b/subsystems/win32/csrsrv/api.c @@ -1120,8 +1120,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, IN PCSR_API_MESSAGE ApiMessage) { PCSR_PROCESS CsrProcess = CsrThread->Process; - volatile CSR_CAPTURE_BUFFER* ClientCaptureBuffer; - PCSR_CAPTURE_BUFFER ServerCaptureBuffer = NULL; + PCSR_CAPTURE_BUFFER ClientCaptureBuffer, ServerCaptureBuffer = NULL; ULONG_PTR EndOfClientBuffer; SIZE_T SizeOfBufferThroughOffsetsArray; SIZE_T BufferDistance; @@ -1151,7 +1150,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, } /* Capture the buffer length */ - Length = ClientCaptureBuffer->Size; + Length = ((volatile CSR_CAPTURE_BUFFER*)ClientCaptureBuffer)->Size; /* * Now check if the remaining of the buffer is inside our mapped section. @@ -1171,7 +1170,7 @@ CsrCaptureArguments(IN PCSR_THREAD CsrThread, } /* Capture the pointer count */ - PointerCount = ClientCaptureBuffer->PointerCount; + PointerCount = ((volatile CSR_CAPTURE_BUFFER*)ClientCaptureBuffer)->PointerCount; /* * Check whether the total buffer size and the pointer count are consistent

4 years, 6 months

[reactos] 01/01: [SHELL32] CORE-12294 File & folder properties dialog fr-FR & de-DE resource

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2032c3afba57767c7c0af… commit 2032c3afba57767c7c0afc5cc61fd30da6e12123 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Apr 15 14:45:48 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Apr 15 14:45:48 2020 +0200 [SHELL32] CORE-12294 File & folder properties dialog fr-FR & de-DE resource Avoids text truncation for french Improves checkboxes alignment for german --- dll/win32/shell32/lang/de-DE.rc | 10 +++++----- dll/win32/shell32/lang/fr-FR.rc | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/shell32/lang/de-DE.rc b/dll/win32/shell32/lang/de-DE.rc index cbc8f00b686..17a487f6182 100644 --- a/dll/win32/shell32/lang/de-DE.rc +++ b/dll/win32/shell32/lang/de-DE.rc @@ -238,8 +238,8 @@ BEGIN LTEXT "", -1, 8, 144, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attribute:", 14020, 8, 152, 46, 10 AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 151, 65, 10 - AUTOCHECKBOX "&Versteckt", 14022, 126, 151, 50, 10 - AUTOCHECKBOX "&Archiv", 14023, 181, 151, 50, 10 + AUTOCHECKBOX "&Versteckt", 14022, 136, 151, 50, 10 + AUTOCHECKBOX "&Archiv", 14023, 191, 151, 50, 10 PUSHBUTTON "Er&weitert...", 14028, 158, 150, 70, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -273,9 +273,9 @@ BEGIN EDITTEXT 14019, 58, 163, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 179, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Attribute:", 14020, 8, 189, 45, 10 - AUTOCHECKBOX "&Schreibgeschützt", 14021, 45, 188, 67, 10 - AUTOCHECKBOX "&Versteckt", 14022, 126, 188, 50, 10 - AUTOCHECKBOX "&Archiv", 14023, 181, 188, 49, 10 + AUTOCHECKBOX "&Schreibgeschützt", 14021, 58, 188, 65, 10 + AUTOCHECKBOX "&Versteckt", 14022, 136, 188, 50, 10 + AUTOCHECKBOX "&Archiv", 14023, 191, 188, 50, 10 PUSHBUTTON "Er&weitert...", 14028, 180, 185, 50, 15, WS_TABSTOP END diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 6051bda7e76..9eb571fcabe 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -228,7 +228,7 @@ BEGIN EDITTEXT 14009, 58, 56, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Taille :", 14010, 8, 72, 55, 10 EDITTEXT 14011, 58, 72, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - LTEXT "Taille sur le disque :", 140101, 8, 88, 55, 10 + LTEXT "Taille sur le disque :", 140101, 8, 83, 55, 20 EDITTEXT 14012, 58, 88, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL LTEXT "Contient :", 14026, 8, 104, 55, 10 EDITTEXT 14027, 58, 104, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -251,7 +251,7 @@ BEGIN ICON "", 14000, 16, 7, 32, 32, WS_VISIBLE EDITTEXT 14001, 58, 9, 170, 14, ES_LEFT | WS_TABSTOP LTEXT "", -1, 8, 29, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 + LTEXT "Type de fichier :", 14004, 8, 35, 55, 10 CONTROL "Fichier", 14005, "edit", ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP, 58, 35, 170, 10 LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 ICON "", 14025, 58, 52, 11, 10, NOT WS_VISIBLE @@ -262,7 +262,7 @@ BEGIN EDITTEXT 14009, 58, 75, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | ES_AUTOHSCROLL | NOT WS_TABSTOP LTEXT "Taille :", 14010, 8, 91, 45, 10 EDITTEXT 14011, 58, 91, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP - LTEXT "Taille sur le disque :", 140112, 8, 107, 55, 10 + LTEXT "Taille sur le disque :", 140112, 8, 102, 55, 20 EDITTEXT 14012, 58, 107, 170, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 123, 221, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE LTEXT "Créé :", 14014, 8, 131, 45, 10

4 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
...
40
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 April 2020