Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [NTUSER][USER32] Simplify user32.IsHungAppWindow (#4150)
by Katayama Hirofumi MZ 08 Dec '21

08 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee3659d5d50b08755dd97… commit ee3659d5d50b08755dd97e785214ad36e33036b8 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Dec 9 00:39:57 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Dec 9 00:39:57 2021 +0900 [NTUSER][USER32] Simplify user32.IsHungAppWindow (#4150) Check FNID_GHOST and MsqIsHung. CORE-17894 --- win32ss/user/ntuser/window.c | 2 +- win32ss/user/user32/windows/window.c | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 7d2a97f3584..8e42d693d45 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3991,7 +3991,7 @@ NtUserQueryWindow(HWND hWnd, DWORD Index) break; case QUERY_WINDOW_ISHUNG: - Result = (DWORD_PTR)MsqIsHung(pWnd->head.pti, MSQ_HUNG); + Result = (pWnd->fnid == FNID_GHOST) || MsqIsHung(pWnd->head.pti, MSQ_HUNG); break; case QUERY_WINDOW_REAL_ID: diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c index 078e496a0ea..8aa237ba397 100644 --- a/win32ss/user/user32/windows/window.c +++ b/win32ss/user/user32/windows/window.c @@ -1875,22 +1875,7 @@ InternalGetWindowText(HWND hWnd, LPWSTR lpString, int nMaxCount) BOOL WINAPI IsHungAppWindow(HWND hwnd) { - PWND Window; - UNICODE_STRING ClassName; - WCHAR szClass[16]; - static const UNICODE_STRING GhostClass = RTL_CONSTANT_STRING(L"Ghost"); - - /* Ghost is a hung window */ - RtlInitEmptyUnicodeString(&ClassName, szClass, sizeof(szClass)); - Window = ValidateHwnd(hwnd); - if (Window && Window->fnid == FNID_GHOST && - NtUserGetClassName(hwnd, FALSE, &ClassName) && - RtlEqualUnicodeString(&ClassName, &GhostClass, TRUE)) - { - return TRUE; - } - - return (NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG) != 0); + return !!NtUserQueryWindow(hwnd, QUERY_WINDOW_ISHUNG); } /*

1 0

[reactos] 01/01: [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices)
by Stanislav Motylkov 08 Dec '21

08 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=07c534c8639cf916cbf94… commit 07c534c8639cf916cbf943135eea5a4bc1005bcf Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Dec 8 17:52:07 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Wed Dec 8 17:52:07 2021 +0300 [BOOTDATA][USBSTOR] Add device definitions for SFF-8070i (ARMD-style devices) Confirmed working with our usbstor driver by Vort. CORE-17895 --- boot/bootdata/hivesys.inf | 3 +++ boot/bootdata/txtsetup.sif | 1 + drivers/usb/usbstor/usbstor.inf | 1 + 3 files changed, 5 insertions(+) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index 4f2024799b2..39b0175b8b7 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -50,6 +50,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubCl HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","Service",0x00000000,"usbstor" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_02&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","Service",0x00000000,"usbstor" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_08&SubClass_05&Prot_50","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" + HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","Service",0x00000000,"usbccgp" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#COMPOSITE","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 8929c94a698..f4930254853 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -168,6 +168,7 @@ PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor +USB\Class_08&SubClass_05&Prot_50 = usbstor HID_DEVICE_SYSTEM_KEYBOARD = kbdhid,{4D36E96B-E325-11CE-BFC1-08002BE10318} USB\COMPOSITE = usbccgp GenDisk = disk,{4D36E967-E325-11CE-BFC1-08002BE10318} diff --git a/drivers/usb/usbstor/usbstor.inf b/drivers/usb/usbstor/usbstor.inf index a42f5371ef4..d6bc94ac7b6 100644 --- a/drivers/usb/usbstor/usbstor.inf +++ b/drivers/usb/usbstor/usbstor.inf @@ -21,6 +21,7 @@ DefaultDestDir = 12 %GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_06&Prot_50 ; SCSI devices ; usbstor.sys supports usb-cdroms but cdrom.sys from ReactOS does not like it %GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_02&Prot_50 ; SFF-8020i (ATAPI) +%GenericBulkOnlyTransport.DeviceDesc% = USBBulkOnly_Inst,USB\Class_08&SubClass_05&Prot_50 ; SFF-8070i (ATAPI Removable/Rewritable) ;-------------------------- USB STORAGE DRIVER --------------------------

1 0

[reactos] 01/01: [NTUSER] Implement HSHELL_RUDEAPPACTIVATE notification (#4147)
by Katayama Hirofumi MZ 08 Dec '21

08 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=79c926c893c563ba5f701… commit 79c926c893c563ba5f701eecf4c73640a2192834 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 8 18:26:22 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Dec 8 18:26:22 2021 +0900 [NTUSER] Implement HSHELL_RUDEAPPACTIVATE notification (#4147) - Add IntIsWindowFullscreen function to judge whether the window is fullscreen. - Add IntCheckFullscreen function to notify HSHELL_RUDEAPPACTIVATE if fullscreen. - Add IntCheckFullscreen call in UpdateShellHook function. - Add IntCheckFullscreen call in co_WinPosSetWindowPos function. CORE-16130 --- win32ss/user/ntuser/focus.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ win32ss/user/ntuser/focus.h | 1 + win32ss/user/ntuser/winpos.c | 4 ++++ 3 files changed, 54 insertions(+) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 3c5ee19ed87..a9ea0965177 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -15,6 +15,7 @@ PTHREADINFO gptiForeground = NULL; PPROCESSINFO gppiLockSFW = NULL; ULONG guSFWLockCount = 0; // Rule #8, No menus are active. So should be zero. PTHREADINFO ptiLastInput = NULL; +HWND ghwndOldFullscreen = NULL; /* Check locking of a process or one or more menus are active. @@ -48,9 +49,57 @@ IntGetThreadFocusWindow(VOID) return ThreadQueue->spwndFocus ? UserHMGetHandle(ThreadQueue->spwndFocus) : 0; } +BOOL FASTCALL IntIsWindowFullscreen(PWND Window) +{ + RECTL rclAnd, rclMonitor, rclWindow; + PMONITOR pMonitor; + + if (!Window || !(Window->style & WS_VISIBLE) || (Window->style & WS_CHILD) || + (Window->ExStyle & WS_EX_TOOLWINDOW) || !IntGetWindowRect(Window, &rclWindow)) + { + return FALSE; + } + + pMonitor = UserGetPrimaryMonitor(); + if (!pMonitor) + { + RECTL_vSetRect(&rclMonitor, 0, 0, + UserGetSystemMetrics(SM_CXSCREEN), UserGetSystemMetrics(SM_CYSCREEN)); + } + else + { + rclMonitor = *(LPRECTL)&pMonitor->rcMonitor; + } + + RECTL_bIntersectRect(&rclAnd, &rclMonitor, &rclWindow); + return RtlEqualMemory(&rclAnd, &rclMonitor, sizeof(RECTL)); +} + +BOOL FASTCALL IntCheckFullscreen(PWND Window) +{ + HWND hWnd; + + if (ghwndOldFullscreen && !IntIsWindowFullscreen(ValidateHwndNoErr(ghwndOldFullscreen))) + ghwndOldFullscreen = NULL; + + if (!IntIsWindowFullscreen(Window)) + return FALSE; + + hWnd = UserHMGetHandle(Window); + if (ghwndOldFullscreen != hWnd) + { + co_IntShellHookNotify(HSHELL_RUDEAPPACTIVATED, (WPARAM)hWnd, TRUE); + ghwndOldFullscreen = hWnd; + } + return TRUE; +} + VOID FASTCALL UpdateShellHook(PWND Window) { + if (IntCheckFullscreen(Window)) + return; + if ( Window->spwndParent == UserGetDesktopWindow() && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) diff --git a/win32ss/user/ntuser/focus.h b/win32ss/user/ntuser/focus.h index 821d7b4db57..37ada347dc0 100644 --- a/win32ss/user/ntuser/focus.h +++ b/win32ss/user/ntuser/focus.h @@ -29,3 +29,4 @@ VOID FASTCALL IntActivateWindow(PWND,PTHREADINFO,HANDLE,DWORD); BOOL FASTCALL IntDeactivateWindow(PTHREADINFO,HANDLE); BOOL FASTCALL co_IntSetForegroundMessageQueue(PWND,PTHREADINFO,BOOL,DWORD ); VOID FASTCALL UpdateShellHook(PWND); +BOOL FASTCALL IntCheckFullscreen(PWND Window); diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 550a074c6c1..da70805ed9c 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1926,6 +1926,10 @@ co_WinPosSetWindowPos( Window->head.pti->cVisWindows++; IntNotifyWinEvent(EVENT_OBJECT_SHOW, Window, OBJID_WINDOW, CHILDID_SELF, WEF_SETBYWNDPTI); } + else + { + IntCheckFullscreen(Window); + } if (Window->hrgnUpdate != NULL && Window->hrgnUpdate != HRGN_WINDOW) {

1 0

[reactos] 01/01: [USETUP][TRANSLATION] Improve Japanese
by Katayama Hirofumi MZ 08 Dec '21

08 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=821223b3d5fc08f303afa… commit 821223b3d5fc08f303afada2ee7ec62c28a5ec18 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Dec 8 15:16:16 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Dec 8 15:21:17 2021 +0900 [USETUP][TRANSLATION] Improve Japanese --- base/setup/usetup/lang/ja-JP.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h index a0817056070..461281ffa2a 100644 --- a/base/setup/usetup/lang/ja-JP.h +++ b/base/setup/usetup/lang/ja-JP.h @@ -1531,14 +1531,14 @@ static MUI_ENTRY jaJPBootLoaderInstallPageEntries[] = { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ReactOS " KERNEL_VERSION_STR " \276\257\304\261\257\314\337 ", TEXT_STYLE_UNDERLINE, TEXT_ID_STATIC }, { 0, 0, - "Installing the bootloader onto the media, please wait...", + "\322\303\336\250\261 \306 \314\336\260\304\333\260\300\336\260\246 \262\335\275\304\260\331 \274\303\262\317\275\241 \265\317\301\270\300\336\273\262...", TEXT_TYPE_STATUS | TEXT_PADDING_BIG, TEXT_ID_STATIC }, @@ -2221,14 +2221,14 @@ MUI_STRING jaJPStrings[] = {STRING_PLEASEWAIT, " \265\317\301 \270\300\336\273\262..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, + " ENTER = \262\335\275\304\260\331 P = \314\337\327\262\317\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, // " ENTER = �ݽİ� C = �߰è�� F3 = ��"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " ENTER = \262\335\275\304\260\331 L = \333\335\330 \312\337\260\303\250\274\256\335 \273\270\276\262 F3 = \301\255\263\274"}, {STRING_INSTALLDELETEPARTITION, " ENTER = \262\335\275\304\260\331 D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = \312\337\260\303\250\274\256\335 \273\270\274\336\256 F3 = \301\255\263\274"}, {STRING_PARTITIONSIZE, "\261\300\327\274\262 \312\337\260\303\250\274\256\335\311 \273\262\275\336:"}, {STRING_CHOOSENEWPARTITION, @@ -2263,7 +2263,7 @@ MUI_STRING jaJPStrings[] = {STRING_MOVING, " \314\247\262\331 \311 \262\304\336\263: %S \266\327: %S"}, {STRING_RENAMING, - " \305\317\264 \311 \315\335\272\263: %S to: %S"}, + " \305\317\264 \311 \315\335\272\263: %S \266\327: %S"}, {STRING_COPYING, " \272\313\337\260 \301\255\263\311 \314\247\262\331: %S"}, {STRING_SETUPCOPYINGFILES,

1 0

[reactos] 01/01: [RAPPS] Fix Ctrl+F hotkey not working regression
by Stanislav Motylkov 07 Dec '21

07 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6edd653b02ab6479f0ac… commit f6edd653b02ab6479f0ac69d14b2d45bac21c058 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Dec 7 20:36:49 2021 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Dec 7 20:36:49 2021 +0300 [RAPPS] Fix Ctrl+F hotkey not working regression Addendum to 4c7bd34a. CORE-17881 --- base/applications/rapps/appview.cpp | 5 +++++ base/applications/rapps/gui.cpp | 4 ++++ base/applications/rapps/include/appview.h | 1 + 3 files changed, 10 insertions(+) diff --git a/base/applications/rapps/appview.cpp b/base/applications/rapps/appview.cpp index a9fe2922254..d548504c1cb 100644 --- a/base/applications/rapps/appview.cpp +++ b/base/applications/rapps/appview.cpp @@ -1713,6 +1713,11 @@ void CApplicationView::SetRedraw(BOOL bRedraw) m_ListView->SetRedraw(bRedraw); } +void CApplicationView::SetFocusOnSearchBar() +{ + m_SearchBar->SetFocus(); +} + VOID CApplicationView::OnSize(HWND hwnd, WPARAM wParam, LPARAM lParam) { if (wParam == SIZE_MINIMIZED) diff --git a/base/applications/rapps/gui.cpp b/base/applications/rapps/gui.cpp index 80cd779bed1..8b26bc2a2f1 100644 --- a/base/applications/rapps/gui.cpp +++ b/base/applications/rapps/gui.cpp @@ -545,6 +545,10 @@ VOID CMainWindow::OnCommand(WPARAM wParam, LPARAM lParam) PostMessageW(WM_CLOSE, 0, 0); break; + case ID_SEARCH: + m_ApplicationView->SetFocusOnSearchBar(); + break; + case ID_INSTALL: if (IsAvailableEnum(SelectedEnumType)) { diff --git a/base/applications/rapps/include/appview.h b/base/applications/rapps/include/appview.h index 9042a361d33..7a6374ccafa 100644 --- a/base/applications/rapps/include/appview.h +++ b/base/applications/rapps/include/appview.h @@ -367,6 +367,7 @@ public: HWND Create(HWND hwndParent); void SetRedraw(BOOL bRedraw); + void SetFocusOnSearchBar(); BOOL SetDisplayAppType(APPLICATION_VIEW_TYPE AppType); BOOL AddInstalledApplication(CInstalledApplicationInfo *InstAppInfo, LPVOID param);

1 0

[reactos] 01/01: [NTGDI] Follow-up of #4137
by Katayama Hirofumi MZ 06 Dec '21

06 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4a17d4b0c19bc0f564ecc… commit 4a17d4b0c19bc0f564ecc3925052b9472c8675a1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Dec 7 08:08:46 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Dec 7 08:08:46 2021 +0900 [NTGDI] Follow-up of #4137 Revert AddPenLinesBounds. Delete FIXME comments. CORE-2527, CORE-8366 --- win32ss/gdi/ntgdi/fillshap.c | 4 ---- win32ss/gdi/ntgdi/line.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/win32ss/gdi/ntgdi/fillshap.c b/win32ss/gdi/ntgdi/fillshap.c index f0d08d8505b..c01ae97d7b6 100644 --- a/win32ss/gdi/ntgdi/fillshap.c +++ b/win32ss/gdi/ntgdi/fillshap.c @@ -137,8 +137,6 @@ IntGdiPolygon(PDC dc, PATH_UnlockPath(pPath); PATH_Delete(dc->dclevel.hPath); dc->dclevel.hPath = NULL; - - /* FIXME: Boundary */ } else { @@ -695,8 +693,6 @@ IntRectangle(PDC dc, PATH_UnlockPath(pPath); PATH_Delete(dc->dclevel.hPath); dc->dclevel.hPath = NULL; - - /* FIXME: Boundary */ } else { diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c index c61f62db7a0..9e3ff20c824 100644 --- a/win32ss/gdi/ntgdi/line.c +++ b/win32ss/gdi/ntgdi/line.c @@ -31,7 +31,7 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) bounds.left = bounds.top = INT_MAX; bounds.right = bounds.bottom = INT_MIN; - if (IntIsEffectiveWidePen(pbrLine)) + if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || pbrLine->lWidth > 1) { /* Windows uses some heuristics to estimate the distance from the point that will be painted */ lWidth = pbrLine->lWidth + 2; @@ -230,8 +230,6 @@ IntGdiLineTo(DC *dc, PATH_UnlockPath(pPath); PATH_Delete(dc->dclevel.hPath); dc->dclevel.hPath = NULL; - - /* FIXME: Boundary */ } else { @@ -398,8 +396,6 @@ IntGdiPolyline(DC *dc, PATH_UnlockPath(pPath); PATH_Delete(dc->dclevel.hPath); dc->dclevel.hPath = NULL; - - /* FIXME: Boundary */ } else {

1 0

[reactos] 01/01: [W32TIME] Improve w32time setup
by Eric Kohl 06 Dec '21

06 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d8d88eaf94e4d369c518… commit 3d8d88eaf94e4d369c5184841e55954b946f8950 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Dec 6 23:24:51 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Dec 6 23:24:51 2021 +0100 [W32TIME] Improve w32time setup - Remove w32time from hivesys.inf - Implement DllRegisterServer - Add DllUnregisterServer stub - Register w32time at the end of setup phase 2 --- base/services/w32time/CMakeLists.txt | 4 +- base/services/w32time/lang/de-DE.rc | 7 + base/services/w32time/lang/en-US.rc | 7 + base/services/w32time/register.c | 286 +++++++++++++++++++++++++++++++++++ base/services/w32time/resource.h | 4 + base/services/w32time/w32time.h | 1 + base/services/w32time/w32time.rc | 20 +++ base/services/w32time/w32time.spec | 2 + boot/bootdata/hivesys.inf | 26 ---- media/inf/syssetup.inf | 1 + 10 files changed, 331 insertions(+), 27 deletions(-) diff --git a/base/services/w32time/CMakeLists.txt b/base/services/w32time/CMakeLists.txt index 080d1fd3e18..f1d25b455d2 100644 --- a/base/services/w32time/CMakeLists.txt +++ b/base/services/w32time/CMakeLists.txt @@ -4,9 +4,11 @@ spec2def(w32time.dll w32time.spec ADD_IMPORTLIB) add_library(w32time MODULE w32time.c ntpclient.c + register.c + w32time.rc ${CMAKE_CURRENT_BINARY_DIR}/w32time.def) set_module_type(w32time win32dll UNICODE) -add_importlibs(w32time ws2_32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(w32time ws2_32 advapi32 msvcrt user32 kernel32 ntdll) add_cd_file(TARGET w32time DESTINATION reactos/system32 FOR all) diff --git a/base/services/w32time/lang/de-DE.rc b/base/services/w32time/lang/de-DE.rc new file mode 100644 index 00000000000..b4b7f2f2663 --- /dev/null +++ b/base/services/w32time/lang/de-DE.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Zeitgeberdienst" + IDS_DESCRIPTION "Verwaltet die Datum- und Uhrzeitsynchronisation auf allen Clients und Servern im Netzwerk." +END diff --git a/base/services/w32time/lang/en-US.rc b/base/services/w32time/lang/en-US.rc new file mode 100644 index 00000000000..3aef0f2a641 --- /dev/null +++ b/base/services/w32time/lang/en-US.rc @@ -0,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_DISPLAYNAME "Time Service" + IDS_DESCRIPTION "Maintains date and time synchronization on all clients and servers on the network." +END diff --git a/base/services/w32time/register.c b/base/services/w32time/register.c new file mode 100644 index 00000000000..205a288bb04 --- /dev/null +++ b/base/services/w32time/register.c @@ -0,0 +1,286 @@ +/* + * PROJECT: ReactOS W32Time Service + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Service Registration + * COPYRIGHT: Copyright 2021 Eric Kohl <ekohl(a)reactos.org> + */ + +#include "w32time.h" +#include <debug.h> +#include <strsafe.h> + +#include "resource.h" + +static +PWSTR +ReadString( + _In_ UINT uID) +{ + HINSTANCE hInstance; + int nLength; + PWSTR pszString, pszPtr; + + hInstance = GetModuleHandleW(L"w32time"); + if (hInstance == NULL) + return NULL; + + nLength = LoadStringW(hInstance, uID, (LPWSTR)&pszPtr, 0); + if (nLength == 0) + return NULL; + + pszString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (nLength + 1) * sizeof(WCHAR)); + if (pszString == NULL) + return NULL; + + wcsncpy(pszString, pszPtr, nLength); + + return pszString; +} + + +static +HRESULT +RegisterService(VOID) +{ + SC_HANDLE hServiceManager = NULL; + SC_HANDLE hService = NULL; + HKEY hKey = NULL; + PWSTR pszValue; + PWSTR pszDisplayName = NULL, pszDescription = NULL; + DWORD dwDisposition, dwError; + SERVICE_DESCRIPTIONW ServiceDescription; + HRESULT hresult = S_OK; + + DPRINT("RegisterService()\n"); + + hServiceManager = OpenSCManagerW(NULL, NULL, SC_MANAGER_CREATE_SERVICE); + if (hServiceManager == NULL) + { + DPRINT1("OpenSCManager() failed!\n"); + hresult = E_FAIL; + goto done; + } + + pszDisplayName = ReadString(IDS_DISPLAYNAME); + if (pszDisplayName == NULL) + { + DPRINT1("ReadString(IDS_DISPLAYNAME) failed!\n"); + hresult = E_FAIL; + goto done; + } + + pszDescription = ReadString(IDS_DESCRIPTION); + if (pszDescription == NULL) + { + DPRINT1("ReadString(IDS_DESCRIPTION) failed!\n"); + hresult = E_FAIL; + goto done; + } + + hService = CreateServiceW(hServiceManager, + L"W32Time", + pszDisplayName, + GENERIC_WRITE, + SERVICE_WIN32_SHARE_PROCESS, + SERVICE_AUTO_START, + SERVICE_ERROR_NORMAL, + L"%SystemRoot%\\system32\\svchost.exe -k netsvcs", + L"Time", NULL, NULL, L"LocalSystem", NULL); + if (hService == NULL) + { + DPRINT1("CreateService() failed!\n"); + hresult = E_FAIL; + goto done; + } + + ServiceDescription.lpDescription = pszDescription; + if (ChangeServiceConfig2W(hService, + SERVICE_CONFIG_DESCRIPTION, + &ServiceDescription) == FALSE) + { + DPRINT1("ChangeServiceConfig2() failed!\n"); + hresult = E_FAIL; + goto done; + } + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\W32Time\\Parameters", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyEx() failed!\n"); + hresult = E_FAIL; + goto done; + } + + pszValue = L"%SystemRoot%\\system32\\w32time.dll"; + dwError = RegSetValueExW(hKey, + L"ServiceDll", + 0, + REG_EXPAND_SZ, + (LPBYTE)pszValue, + (wcslen(pszValue) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx() failed!\n"); + hresult = E_FAIL; + goto done; + } + + pszValue = L"SvchostEntry_W32Time"; + dwError = RegSetValueExW(hKey, + L"ServiceMain", + 0, + REG_SZ, + (LPBYTE)pszValue, + (wcslen(pszValue) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx() failed!\n"); + hresult = E_FAIL; + goto done; + } + +done: + if (hKey) + RegCloseKey(hKey); + + if (hService) + CloseServiceHandle(hService); + + if (hServiceManager) + CloseServiceHandle(hServiceManager); + + if (pszDescription) + HeapFree(GetProcessHeap(), 0, pszDescription); + + if (pszDisplayName) + HeapFree(GetProcessHeap(), 0, pszDisplayName); + + return hresult; +} + + +static +HRESULT +SetParametersValues(VOID) +{ + HKEY hKey = NULL; + PWSTR pszValue; + DWORD dwDisposition, dwError; + HRESULT hresult = S_OK; + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\W32Time\\Parameters", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyEx() failed!\n"); + goto done; + } + + pszValue = L"NTP"; + dwError = RegSetValueExW(hKey, + L"Type", + 0, + REG_SZ, + (LPBYTE)pszValue, + (wcslen(pszValue) + 1) * sizeof(WCHAR)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx() failed!\n"); + goto done; + } + +done: + if (hKey) + RegCloseKey(hKey); + + return hresult; +} + + +static +HRESULT +SetNtpClientValues(VOID) +{ + HKEY hKey = NULL; + DWORD dwValue; + DWORD dwDisposition, dwError; + HRESULT hresult = S_OK; + + dwError = RegCreateKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\W32Time\\TimeProviders\\NtpClient", + 0, + NULL, + REG_OPTION_NON_VOLATILE, + KEY_WRITE, + NULL, + &hKey, + &dwDisposition); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegCreateKeyEx() failed!\n"); + goto done; + } + + dwValue = 0x00093a80; + dwError = RegSetValueExW(hKey, + L"SpecialPollInterval", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(dwValue)); + if (dwError != ERROR_SUCCESS) + { + DPRINT1("RegSetValueEx() failed!\n"); + goto done; + } + +done: + if (hKey) + RegCloseKey(hKey); + + return hresult; +} + + +HRESULT +WINAPI +DllRegisterServer(VOID) +{ + HRESULT hresult; + + hresult = RegisterService(); + if (FAILED(hresult)) + return hresult; + + hresult = SetParametersValues(); + if (FAILED(hresult)) + return hresult; + + hresult = SetNtpClientValues(); + + return hresult; +} + + +HRESULT +WINAPI +DllUnregisterServer(VOID) +{ + DPRINT1("DllUnregisterServer()\n"); + return S_OK; +} diff --git a/base/services/w32time/resource.h b/base/services/w32time/resource.h new file mode 100644 index 00000000000..d3049b4a38b --- /dev/null +++ b/base/services/w32time/resource.h @@ -0,0 +1,4 @@ +#pragma once + +#define IDS_DISPLAYNAME 200 +#define IDS_DESCRIPTION 201 diff --git a/base/services/w32time/w32time.h b/base/services/w32time/w32time.h index 87be3d09d68..0bd729e6d6f 100644 --- a/base/services/w32time/w32time.h +++ b/base/services/w32time/w32time.h @@ -12,6 +12,7 @@ #include <winnls.h> #include <winreg.h> #include <winsvc.h> +#include <winuser.h> #define MAX_VALUE_NAME 16383 #define NTPPORT 123 diff --git a/base/services/w32time/w32time.rc b/base/services/w32time/w32time.rc new file mode 100644 index 00000000000..4b0b320485d --- /dev/null +++ b/base/services/w32time/w32time.rc @@ -0,0 +1,20 @@ +#include <windef.h> +#include <winuser.h> + +#include "resource.h" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Time Service" +#define REACTOS_STR_INTERNAL_NAME "w32time" +#define REACTOS_STR_ORIGINAL_FILENAME "w32time.dll" +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif diff --git a/base/services/w32time/w32time.spec b/base/services/w32time/w32time.spec index 32d25bff181..6e0850009aa 100644 --- a/base/services/w32time/w32time.spec +++ b/base/services/w32time/w32time.spec @@ -1,3 +1,5 @@ +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 6 stdcall SvchostEntry_W32Time(long ptr) W32TmServiceMain 18 stdcall W32TimeSyncNow(wstr long long) 21 stdcall W32TmServiceMain(long ptr) diff --git a/boot/bootdata/hivesys.inf b/boot/bootdata/hivesys.inf index fa6c21b9261..4f2024799b2 100644 --- a/boot/bootdata/hivesys.inf +++ b/boot/bootdata/hivesys.inf @@ -2072,20 +2072,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","ObjectName",0x00000000,"LocalS HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Start",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\WlanSvc","Type",0x00010001,0x00000110 -; W32TIME service -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","DisplayName",0x00000000,%W32TIME_SERVICE% -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","Description",0x00000000,%W32TIME_SERVICE_DESCRIPTION% -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","Group",0x00000000,"Time" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","ObjectName",0x00000000,"LocalSystem" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","Start",0x00010001,0x00000002 -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time","Type",0x00010001,0x00000020 -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\w32time.dll" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time\Parameters","ServiceMain",0x00000000,"SvchostEntry_W32Time" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time\Parameters","Type",0x00010000,"NTP" -HKLM,"SYSTEM\CurrentControlSet\Services\W32Time\TimeProviders\NtpClient","SpecialPollInterval",0x00010001,0x00093a80 - ; Simple TCP services HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Description",0x00000000,%TCPSVCS_SERVICE_DECRIPTION% HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","DisplayName",0x00000000,%TCPSVCS_SERVICE% @@ -2317,9 +2303,6 @@ WINMGMT_SERVICE_DESCRIPTION="Provides interface to system management information WLANSVC_SERVICE="WLAN Service" WLANSVC_SERVICE_DESCRIPTION="WLAN Service" -W32TIME_SERVICE="Time Service" -W32TIME_SERVICE_DESCRIPTION="ReactOS Time Service" - WORKSTATION_SERVICE="Workstation" WORKSTATION_SERVICE_DESCRIPTION="Responsible for creating and maintaining network connections to servers." @@ -2474,9 +2457,6 @@ WINMGMT_SERVICE_DESCRIPTION="Dostarcza interfejs w celu uzyskiwania dostępu do WLANSVC_SERVICE="Usługa WLAN" WLANSVC_SERVICE_DESCRIPTION="Usługa WLAN" -W32TIME_SERVICE="Usługa Czas" -W32TIME_SERVICE_DESCRIPTION="Usługa Czas systemu ReactOS" - WORKSTATION_SERVICE="Stacja robocza" WORKSTATION_SERVICE_DESCRIPTION="Tworzy i zachowuje połączenia sieciowe klientów z serwerami." @@ -2936,9 +2916,6 @@ WINMGMT_SERVICE_DESCRIPTION="Proporciona una interfaz para la gestión de la inf WLANSVC_SERVICE="Servicio de WLAN" WLANSVC_SERVICE_DESCRIPTION="Servicio de redes inalámbricas WLAN." -W32TIME_SERVICE="Servicio de hora" -W32TIME_SERVICE_DESCRIPTION="Servicio de hora para ReactOS" - WORKSTATION_SERVICE="Estación de trabajo" WORKSTATION_SERVICE_DESCRIPTION="Es el responsable de crear y mantener las conexiones de redes LAN a los servidores." @@ -3092,9 +3069,6 @@ WINMGMT_SERVICE_DESCRIPTION="Sistem yönetim bilgisine arayüz sağlar." WLANSVC_SERVICE="WLAN Hizmeti" WLANSVC_SERVICE_DESCRIPTION="WLAN Hizmeti" -W32TIME_SERVICE="Zaman Hizmeti" -W32TIME_SERVICE_DESCRIPTION="ReactOS Zaman Hizmeti" - WORKSTATION_SERVICE="İş İstasyonu" WORKSTATION_SERVICE_DESCRIPTION="Sunuculara ağ bağlantılarını oluşturmaktan ve yönetmekten sorumludur." diff --git a/media/inf/syssetup.inf b/media/inf/syssetup.inf index 2a5375352bb..0196d9bca52 100644 --- a/media/inf/syssetup.inf +++ b/media/inf/syssetup.inf @@ -113,6 +113,7 @@ AddReg=Classes 11,,stobject.dll,1 11,,urlmon.dll,3 11,,vbscript.dll,1 +11,,w32time.dll,1 11,,windowscodecs.dll,1 11,,winhttp.dll,1 11,,wininet.dll,2

1 0

[reactos] 01/01: [NTGDI] Support the wide pen (#4137)
by Katayama Hirofumi MZ 06 Dec '21

06 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6358c4ac9f1b3fe0997cb… commit 6358c4ac9f1b3fe0997cb39b4603d9afcc12a079 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Dec 6 20:44:06 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Dec 6 20:44:06 2021 +0900 [NTGDI] Support the wide pen (#4137) - Extend PATH_WidenPath function as PATH_WidenPathEx with the path argument. - Use PATH_WidenPathEx and PATH_FillPathEx functions to implement wide pen drawing in PATH_StrokePath function. - Add the code to IntGdiLineTo, IntRectangle, IntGdiPolygon, and IntGdiPolyline in order to stroke the path when the effective wide pen. FIXME: Boundary rectangle. CORE-2527, CORE-8366 --- win32ss/gdi/ntgdi/fillshap.c | 185 ++++++++++++++++++++++++++++++------------- win32ss/gdi/ntgdi/line.c | 106 +++++++++++++++++++++---- win32ss/gdi/ntgdi/path.c | 51 ++++++++---- win32ss/gdi/ntgdi/path.h | 5 +- win32ss/gdi/ntgdi/pen.h | 6 ++ 5 files changed, 263 insertions(+), 90 deletions(-) diff --git a/win32ss/gdi/ntgdi/fillshap.c b/win32ss/gdi/ntgdi/fillshap.c index c18ff0093cc..f0d08d8505b 100644 --- a/win32ss/gdi/ntgdi/fillshap.c +++ b/win32ss/gdi/ntgdi/fillshap.c @@ -23,9 +23,10 @@ IntGdiPolygon(PDC dc, PBRUSH pbrLine, pbrFill; BOOL ret = FALSE; // Default to failure RECTL DestRect; - int CurrentPoint; + INT i, CurrentPoint; PDC_ATTR pdcattr; POINTL BrushOrigin; + PPATH pPath; // int Left; // int Top; @@ -105,38 +106,72 @@ IntGdiPolygon(PDC dc, // Draw the Polygon Edges with the current pen ( if not a NULL pen ) if (!(pbrLine->flAttrs & BR_IS_NULL)) { - int i; - - for (i = 0; i < Count-1; i++) + if (IntIsEffectiveWidePen(pbrLine)) { - + /* Clear the path */ + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* Begin a path */ + pPath = PATH_CreatePath(Count + 1); + dc->dclevel.flPath |= DCPATH_ACTIVE; + dc->dclevel.hPath = pPath->BaseObject.hHmgr; + pPath->pos = Points[0]; + IntLPtoDP(dc, &pPath->pos, 1); + + PATH_MoveTo(dc, pPath); + for (i = 1; i < Count; ++i) + { + PATH_LineTo(dc, Points[i].x, Points[i].y); + } + PATH_LineTo(dc, Points[0].x, Points[0].y); + + /* Close the path */ + pPath->state = PATH_Closed; + dc->dclevel.flPath &= ~DCPATH_ACTIVE; + + /* Actually stroke a path */ + ret = PATH_StrokePath(dc, pPath); + + /* Clear the path */ + PATH_UnlockPath(pPath); + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* FIXME: Boundary */ + } + else + { + for (i = 0; i < Count-1; i++) + { // DPRINT1("Polygon Making line from (%d,%d) to (%d,%d)\n", // Points[0].x, Points[0].y, // Points[1].x, Points[1].y ); - ret = IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - Points[i].x, /* From */ - Points[i].y, - Points[i+1].x, /* To */ - Points[i+1].y, - &DestRect, - ROP2_TO_MIX(pdcattr->jROP2)); /* MIX */ - if (!ret) break; - } - /* Close the polygon */ - if (ret) - { - ret = IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - Points[Count-1].x, /* From */ - Points[Count-1].y, - Points[0].x, /* To */ - Points[0].y, - &DestRect, - ROP2_TO_MIX(pdcattr->jROP2)); /* MIX */ + ret = IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + Points[i].x, /* From */ + Points[i].y, + Points[i+1].x, /* To */ + Points[i+1].y, + &DestRect, + ROP2_TO_MIX(pdcattr->jROP2)); /* MIX */ + if (!ret) break; + } + /* Close the polygon */ + if (ret) + { + ret = IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + Points[Count-1].x, /* From */ + Points[Count-1].y, + Points[0].x, /* To */ + Points[0].y, + &DestRect, + ROP2_TO_MIX(pdcattr->jROP2)); /* MIX */ + } } } } @@ -542,6 +577,7 @@ IntRectangle(PDC dc, MIX Mix; PDC_ATTR pdcattr; POINTL BrushOrigin; + PPATH pPath; ASSERT ( dc ); // Caller's responsibility to set this up @@ -628,34 +664,71 @@ IntRectangle(PDC dc, if (!(pbrLine->flAttrs & BR_IS_NULL)) { - Mix = ROP2_TO_MIX(pdcattr->jROP2); - ret = ret && IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - DestRect.left, DestRect.top, DestRect.right, DestRect.top, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, - &DestRect, // Bounding rectangle - Mix); - - ret = ret && IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, - &DestRect, // Bounding rectangle - Mix); + if (IntIsEffectiveWidePen(pbrLine)) + { + /* Clear the path */ + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* Begin a path */ + pPath = PATH_CreatePath(5); + dc->dclevel.flPath |= DCPATH_ACTIVE; + dc->dclevel.hPath = pPath->BaseObject.hHmgr; + pPath->pos.x = LeftRect; + pPath->pos.y = TopRect; + IntLPtoDP(dc, &pPath->pos, 1); + + PATH_MoveTo(dc, pPath); + PATH_LineTo(dc, RightRect, TopRect); + PATH_LineTo(dc, RightRect, BottomRect); + PATH_LineTo(dc, LeftRect, BottomRect); + PATH_LineTo(dc, LeftRect, TopRect); + + /* Close the path */ + pPath->state = PATH_Closed; + dc->dclevel.flPath &= ~DCPATH_ACTIVE; + + /* Actually stroke a path */ + ret = PATH_StrokePath(dc, pPath); + + /* Clear the path */ + PATH_UnlockPath(pPath); + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* FIXME: Boundary */ + } + else + { + Mix = ROP2_TO_MIX(pdcattr->jROP2); + ret = ret && IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + DestRect.left, DestRect.top, DestRect.right, DestRect.top, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + DestRect.right, DestRect.top, DestRect.right, DestRect.bottom, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + DestRect.right, DestRect.bottom, DestRect.left, DestRect.bottom, + &DestRect, // Bounding rectangle + Mix); + + ret = ret && IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + DestRect.left, DestRect.bottom, DestRect.left, DestRect.top, + &DestRect, // Bounding rectangle + Mix); + } } cleanup: diff --git a/win32ss/gdi/ntgdi/line.c b/win32ss/gdi/ntgdi/line.c index aeebebc58a1..c61f62db7a0 100644 --- a/win32ss/gdi/ntgdi/line.c +++ b/win32ss/gdi/ntgdi/line.c @@ -31,7 +31,7 @@ AddPenLinesBounds(PDC dc, int count, POINT *points) bounds.left = bounds.top = INT_MAX; bounds.right = bounds.bottom = INT_MIN; - if (((pbrLine->ulPenStyle & PS_TYPE_MASK) & PS_GEOMETRIC) || (pbrLine->lWidth > 1)) + if (IntIsEffectiveWidePen(pbrLine)) { /* Windows uses some heuristics to estimate the distance from the point that will be painted */ lWidth = pbrLine->lWidth + 2; @@ -152,9 +152,13 @@ IntGdiLineTo(DC *dc, PBRUSH pbrLine; RECTL Bounds; POINT Points[2]; - PDC_ATTR pdcattr = dc->pdcattr; + PDC_ATTR pdcattr; + PPATH pPath; + ASSERT_DC_PREPARED(dc); + pdcattr = dc->pdcattr; + if (PATH_IsPathOpen(dc->dclevel)) { Ret = PATH_LineTo(dc, XEnd, YEnd); @@ -199,15 +203,47 @@ IntGdiLineTo(DC *dc, if (!(pbrLine->flAttrs & BR_IS_NULL)) { - Ret = IntEngLineTo(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - Points[0].x, Points[0].y, - Points[1].x, Points[1].y, - &Bounds, - ROP2_TO_MIX(pdcattr->jROP2)); - } + if (IntIsEffectiveWidePen(pbrLine)) + { + /* Clear the path */ + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* Begin a path */ + pPath = PATH_CreatePath(2); + dc->dclevel.flPath |= DCPATH_ACTIVE; + dc->dclevel.hPath = pPath->BaseObject.hHmgr; + IntGetCurrentPositionEx(dc, &pPath->pos); + IntLPtoDP(dc, &pPath->pos, 1); + + PATH_MoveTo(dc, pPath); + PATH_LineTo(dc, XEnd, YEnd); + + /* Close the path */ + pPath->state = PATH_Closed; + dc->dclevel.flPath &= ~DCPATH_ACTIVE; + + /* Actually stroke a path */ + Ret = PATH_StrokePath(dc, pPath); + /* Clear the path */ + PATH_UnlockPath(pPath); + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* FIXME: Boundary */ + } + else + { + Ret = IntEngLineTo(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + Points[0].x, Points[0].y, + Points[1].x, Points[1].y, + &Bounds, + ROP2_TO_MIX(pdcattr->jROP2)); + } + } } if (Ret) @@ -298,6 +334,7 @@ IntGdiPolyline(DC *dc, BOOL Ret = TRUE; LONG i; PDC_ATTR pdcattr = dc->pdcattr; + PPATH pPath; if (!dc->dclevel.pSurface) { @@ -331,13 +368,48 @@ IntGdiPolyline(DC *dc, AddPenLinesBounds(dc, Count, Points); } - Ret = IntEngPolyline(&psurf->SurfObj, - (CLIPOBJ *)&dc->co, - &dc->eboLine.BrushObject, - Points, - Count, - ROP2_TO_MIX(pdcattr->jROP2)); - + if (IntIsEffectiveWidePen(pbrLine)) + { + /* Clear the path */ + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* Begin a path */ + pPath = PATH_CreatePath(Count); + dc->dclevel.flPath |= DCPATH_ACTIVE; + dc->dclevel.hPath = pPath->BaseObject.hHmgr; + pPath->pos = pt[0]; + IntLPtoDP(dc, &pPath->pos, 1); + + PATH_MoveTo(dc, pPath); + for (i = 1; i < Count; ++i) + { + PATH_LineTo(dc, pt[i].x, pt[i].y); + } + + /* Close the path */ + pPath->state = PATH_Closed; + dc->dclevel.flPath &= ~DCPATH_ACTIVE; + + /* Actually stroke a path */ + Ret = PATH_StrokePath(dc, pPath); + + /* Clear the path */ + PATH_UnlockPath(pPath); + PATH_Delete(dc->dclevel.hPath); + dc->dclevel.hPath = NULL; + + /* FIXME: Boundary */ + } + else + { + Ret = IntEngPolyline(&psurf->SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboLine.BrushObject, + Points, + Count, + ROP2_TO_MIX(pdcattr->jROP2)); + } EngFreeMem(Points); } else diff --git a/win32ss/gdi/ntgdi/path.c b/win32ss/gdi/ntgdi/path.c index 4343d553e0e..37b82ad5a7d 100644 --- a/win32ss/gdi/ntgdi/path.c +++ b/win32ss/gdi/ntgdi/path.c @@ -1600,17 +1600,35 @@ PATH_StrokePath( PPATH pPath) { BOOL ret = FALSE; - INT i = 0; - INT nLinePts, nAlloc; + INT nLinePts, nAlloc, jOldFillMode, i = 0; POINT *pLinePts = NULL; POINT ptViewportOrg, ptWindowOrg; SIZE szViewportExt, szWindowExt; DWORD mapMode, graphicsMode; XFORM xform; PDC_ATTR pdcattr = dc->pdcattr; + PBRUSH pbrLine; + PPATH pNewPath; TRACE("Enter %s\n", __FUNCTION__); + pbrLine = dc->dclevel.pbrLine; + if (IntIsEffectiveWidePen(pbrLine)) + { + pNewPath = PATH_WidenPathEx(dc, pPath); + if (pNewPath) + { + /* Fill the path with the WINDING fill mode */ + jOldFillMode = pdcattr->jFillMode; + pdcattr->jFillMode = WINDING; + PATH_FillPathEx(dc, pNewPath, pbrLine); + pdcattr->jFillMode = jOldFillMode; + + PATH_Delete(pNewPath->BaseObject.hHmgr); + return TRUE; + } + } + /* Save the mapping mode info */ mapMode = pdcattr->iMapMode; @@ -2100,12 +2118,7 @@ PPATH FASTCALL PATH_WidenPath(DC *dc) { - INT size; - UINT penWidth, penStyle; - DWORD obj_type; PPATH pPath, pNewPath; - LPEXTLOGPEN elp; - PDC_ATTR pdcattr = dc->pdcattr; pPath = PATH_LockPath(dc->dclevel.hPath); if (!pPath) @@ -2114,10 +2127,24 @@ PATH_WidenPath(DC *dc) return NULL; } + pNewPath = PATH_WidenPathEx(dc, pPath); + PATH_UnlockPath(pPath); + return pNewPath; +} + +PPATH +FASTCALL +PATH_WidenPathEx(DC *dc, PPATH pPath) +{ + INT size; + UINT penWidth, penStyle; + DWORD obj_type; + LPEXTLOGPEN elp; + PDC_ATTR pdcattr = dc->pdcattr; + if (pPath->state != PATH_Closed) { TRACE("PWP 1\n"); - PATH_UnlockPath(pPath); EngSetLastError(ERROR_CAN_NOT_COMPLETE); return NULL; } @@ -2126,7 +2153,6 @@ PATH_WidenPath(DC *dc) if (!size) { TRACE("PWP 2\n"); - PATH_UnlockPath(pPath); EngSetLastError(ERROR_CAN_NOT_COMPLETE); return NULL; } @@ -2135,7 +2161,6 @@ PATH_WidenPath(DC *dc) if (elp == NULL) { TRACE("PWP 3\n"); - PATH_UnlockPath(pPath); EngSetLastError(ERROR_OUTOFMEMORY); return NULL; } @@ -2156,7 +2181,6 @@ PATH_WidenPath(DC *dc) TRACE("PWP 4\n"); EngSetLastError(ERROR_CAN_NOT_COMPLETE); ExFreePoolWithTag(elp, TAG_PATH); - PATH_UnlockPath(pPath); return NULL; } @@ -2168,14 +2192,11 @@ PATH_WidenPath(DC *dc) (PS_TYPE_MASK & penStyle) == PS_COSMETIC) { TRACE("PWP 5\n"); - PATH_UnlockPath(pPath); EngSetLastError(ERROR_CAN_NOT_COMPLETE); return FALSE; } - pNewPath = IntGdiWidenPath(pPath, penWidth, penStyle, dc->dclevel.laPath.eMiterLimit); - PATH_UnlockPath(pPath); - return pNewPath; + return IntGdiWidenPath(pPath, penWidth, penStyle, dc->dclevel.laPath.eMiterLimit); } static inline INT int_from_fixed(FIXED f) diff --git a/win32ss/gdi/ntgdi/path.h b/win32ss/gdi/ntgdi/path.h index 038e58195dc..c5028caa8e4 100644 --- a/win32ss/gdi/ntgdi/path.h +++ b/win32ss/gdi/ntgdi/path.h @@ -69,14 +69,14 @@ typedef struct _EPATHOBJ #define PATH_AllocPathWithHandle() ((PPATH) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_PATH, sizeof(PATH))) #define PATH_LockPath(hPath) ((PPATH)GDIOBJ_ShareLockObj((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH)) #define PATH_UnlockPath(pPath) GDIOBJ_vDereferenceObject((POBJ)pPath) - - #define PATH_IsPathOpen(dclevel) ( ((dclevel).hPath) && ((dclevel).flPath & DCPATH_ACTIVE) ) BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT direction, INT lines); BOOL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2); +PPATH FASTCALL PATH_CreatePath(int count); VOID FASTCALL PATH_EmptyPath (PPATH pPath); BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y); +BOOL FASTCALL PATH_MoveTo(PDC dc, PPATH pPath); BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints); BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints); @@ -93,6 +93,7 @@ BOOL FASTCALL PATH_AddFlatBezier (PPATH pPath, POINT *pt, BOOL closed); BOOL FASTCALL PATH_FillPath( PDC dc, PPATH pPath ); BOOL FASTCALL PATH_FillPathEx(PDC dc, PPATH pPath, PBRUSH pbrFill); PPATH FASTCALL PATH_FlattenPath (PPATH pPath); +PPATH FASTCALL PATH_WidenPathEx(DC *dc, PPATH pPath); BOOL FASTCALL PATH_ReserveEntries (PPATH pPath, INT numEntries); BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath); diff --git a/win32ss/gdi/ntgdi/pen.h b/win32ss/gdi/ntgdi/pen.h index ea995c532a0..7a0793fc4c7 100644 --- a/win32ss/gdi/ntgdi/pen.h +++ b/win32ss/gdi/ntgdi/pen.h @@ -29,3 +29,9 @@ PEN_GetObject( _Out_ PLOGPEN Buffer); VOID FASTCALL AddPenLinesBounds(PDC,int,POINT *); + +#define IntIsEffectiveWidePen(pbrLine) ( \ + (pbrLine)->lWidth > 1 && \ + ((pbrLine->flAttrs & BR_IS_OLDSTYLEPEN) || \ + ((pbrLine)->ulPenStyle & PS_TYPE_MASK) == PS_GEOMETRIC) \ +)

1 0

[reactos] 01/01: [COMCTL32] Redraw children when the combo box is dropped down.
by Robert Naumann 04 Dec '21

04 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff89651ed018be182ed95… commit ff89651ed018be182ed9568d8644f56e046ee7dd Author: Robert Naumann <gonzomdx(a)gmail.com> AuthorDate: Sat Dec 4 20:23:34 2021 +0100 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Sat Dec 4 21:57:59 2021 +0100 [COMCTL32] Redraw children when the combo box is dropped down. Wine commit c82d6ee by Gabriel Ivancescu Fixes CORE-17883 --- dll/win32/comctl32/combo.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dll/win32/comctl32/combo.c b/dll/win32/comctl32/combo.c index 25502f8a74a..9b694dcbf7b 100644 --- a/dll/win32/comctl32/combo.c +++ b/dll/win32/comctl32/combo.c @@ -1046,8 +1046,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) if( !(lphc->wState & CBF_NOREDRAW) ) - RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | - RDW_ERASE | RDW_UPDATENOW | RDW_NOCHILDREN ); + RedrawWindow( lphc->self, NULL, 0, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW ); EnableWindow( lphc->hWndLBox, TRUE ); if (GetCapture() != lphc->self)

1 0

[reactos] 01/01: [TRANSLATION][WORDPAD] Fix line breaks of Croatian
by Katayama Hirofumi MZ 04 Dec '21

04 Dec '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89dd9ecacb2baa758d607… commit 89dd9ecacb2baa758d607ce4384fbb6c4b197f1a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 4 20:25:08 2021 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Dec 4 20:25:08 2021 +0900 [TRANSLATION][WORDPAD] Fix line breaks of Croatian Fix newline codes of #4098. https://github.com/reactos/reactos/commit/52c75521a6093e5358de44c7333cdb27b… --- base/applications/wordpad/lang/hr-HR.rc | 516 ++++++++++++++++---------------- 1 file changed, 258 insertions(+), 258 deletions(-) diff --git a/base/applications/wordpad/lang/hr-HR.rc b/base/applications/wordpad/lang/hr-HR.rc index 86bdfeba1e7..3f1ad832a79 100644 --- a/base/applications/wordpad/lang/hr-HR.rc +++ b/base/applications/wordpad/lang/hr-HR.rc @@ -1,258 +1,258 @@ -/* This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT - -IDM_MAINMENU MENU -BEGIN - POPUP "&Datoteka" - BEGIN - MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW - MENUITEM "&Otvori...\tCtrl+O", ID_FILE_OPEN - MENUITEM "&Spremi\tCtrl+S", ID_FILE_SAVE - MENUITEM "Spremi &kao...", ID_FILE_SAVEAS - MENUITEM SEPARATOR - MENUITEM "&Ispiši...\tCtrl+P", ID_PRINT - MENUITEM "Ispiši &pregled", ID_PREVIEW - MENUITEM "Postavljanje stranic&e", ID_PRINTSETUP - MENUITEM SEPARATOR - MENUITEM "Iz&ađi", ID_FILE_EXIT - END - POPUP "&Uredi" - BEGIN - MENUITEM "&Poništi\tCtrl+Z", ID_EDIT_UNDO - MENUITEM "&Vrati\tCtrl+Y", ID_EDIT_REDO - MENUITEM SEPARATOR - MENUITEM "&Izreži\tCtrl+X", ID_EDIT_CUT - MENUITEM "&Kopiraj\tCtrl+C", ID_EDIT_COPY - MENUITEM "&Zalijepi\tCtrl+V", ID_EDIT_PASTE - MENUITEM "Iz&briši\tDel", ID_EDIT_CLEAR - MENUITEM "&Označi sve\tCtrl+A", ID_EDIT_SELECTALL - MENUITEM SEPARATOR - MENUITEM "P&ronađi...\tCtrl+F", ID_FIND - MENUITEM "Pronađi &slijedeće\tF3", ID_FIND_NEXT - MENUITEM "Z&amijeni...\tCtrl+H", ID_REPLACE - MENUITEM SEPARATOR - MENUITEM "Pročitaj-samo &način", ID_EDIT_READONLY - MENUITEM "&Modificirano", ID_EDIT_MODIFIED - MENUITEM SEPARATOR - POPUP "&Dodatno" - BEGIN - MENUITEM "&Informacije označenoga", ID_EDIT_SELECTIONINFO - MENUITEM "&Format znaka", ID_EDIT_CHARFORMAT - MENUITEM "&Definicija znakovnog formata", ID_EDIT_DEFCHARFORMAT - MENUITEM "&Paragraf formata", ID_EDIT_PARAFORMAT - MENUITEM "Dobij &tekst", ID_EDIT_GETTEXT - END - END - POPUP "&Pogled" - BEGIN - MENUITEM "&Alatna traka", ID_TOGGLE_TOOLBAR - MENUITEM "Traka &formatiranja", ID_TOGGLE_FORMATBAR - MENUITEM "&Ravnalo", ID_TOGGLE_RULER - MENUITEM "&Statusna traka", ID_TOGGLE_STATUSBAR - MENUITEM SEPARATOR - MENUITEM "&Opcije...", ID_VIEWPROPERTIES - END - POPUP "&Ubaci" - BEGIN - MENUITEM "&Datum i vrijeme...", ID_DATETIME - END - POPUP "&Format" - BEGIN - MENUITEM "&Font...", ID_FONTSETTINGS - MENUITEM "&Grafičke oznake", ID_BULLET - MENUITEM "&Paragraf...", ID_PARAFORMAT - MENUITEM "&Kartice...", ID_TABSTOPS - POPUP "&Pozadina" - BEGIN - MENUITEM "&Sustav\tCtrl+1", ID_BACK_1 - MENUITEM "&Bijelo žuta\tCtrl+2", ID_BACK_2 - END - END - POPUP "P&omoć" - BEGIN - MENUITEM "&O Wine WordPad-u", ID_ABOUT - END -END - -IDM_POPUP MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Izreži", ID_EDIT_CUT - MENUITEM "&Kopiraj", ID_EDIT_COPY - MENUITEM "&Zalijepi", ID_EDIT_PASTE - MENUITEM SEPARATOR - MENUITEM "&Grafičke oznake", ID_BULLET - MENUITEM "&Paragraf...", ID_PARAFORMAT - END -END - -IDM_COLOR_POPUP MENU -BEGIN - POPUP "" - BEGIN - MENUITEM "Crna", ID_COLOR_BLACK - MENUITEM "Boja kestena", ID_COLOR_MAROON - MENUITEM "Zelena", ID_COLOR_GREEN - MENUITEM "Boja masline", ID_COLOR_OLIVE - MENUITEM "Mornarska boja", ID_COLOR_NAVY - MENUITEM "Ljubičasta", ID_COLOR_PURPLE - MENUITEM "Teal", ID_COLOR_TEAL - MENUITEM "Siva", ID_COLOR_GRAY - MENUITEM "Srebrna", ID_COLOR_SILVER - MENUITEM "Crvena", ID_COLOR_RED - MENUITEM "Lime", ID_COLOR_LIME - MENUITEM "Žuta", ID_COLOR_YELLOW - MENUITEM "Plava", ID_COLOR_BLUE - MENUITEM "Fuchsia", ID_COLOR_FUCHSIA - MENUITEM "Aqua", ID_COLOR_AQUA - MENUITEM "Bijela", ID_COLOR_WHITE - MENUITEM "Automatski", ID_COLOR_AUTOMATIC - END -END - -STRINGTABLE -BEGIN - STRING_ALL_FILES, "Svi dokumenti (*.*)" - STRING_TEXT_FILES_TXT, "Tekstni dokumenti (*.txt)" - STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekstni dokumenti (*.txt)" - STRING_RICHTEXT_FILES_RTF, "Obogaćeni tekstni formati (*.rtf)" - STRING_NEWFILE_RICHTEXT, "Obogaćeni tekstni dokument" - STRING_NEWFILE_TXT, "Tekstni dokument" - STRING_NEWFILE_TXT_UNICODE, "Unicode tekstni dokument" - STRING_PRINTER_FILES_PRN, "Datoteke ispisa (*.prn)" -END - -STRINGTABLE -BEGIN - STRING_ALIGN_LEFT, "Lijevo" - STRING_ALIGN_RIGHT, "Desno" - STRING_ALIGN_CENTER, "Sredina" -END - -STRINGTABLE -BEGIN - STRING_VIEWPROPS_TITLE, "Opcije" - STRING_VIEWPROPS_TEXT, "Tekst" - STRING_VIEWPROPS_RICHTEXT, "Obogaćeni teskt" -END - -STRINGTABLE -BEGIN - STRING_PREVIEW_PRINT, "Ispis" - STRING_PREVIEW_NEXTPAGE, "Sljedeća stranica" - STRING_PREVIEW_PREVPAGE, "Prethodna stranica" - STRING_PREVIEW_TWOPAGES, "Dvije stranice" - STRING_PREVIEW_ONEPAGE, "Jedna stranica" - STRING_PREVIEW_ZOOMIN, "Zumiraj" - STRING_PREVIEW_ZOOMOUT, "Odzumiraj" - STRING_PREVIEW_CLOSE, "Zatvori" - STRING_PREVIEW_PAGE, "Stranica" - STRING_PREVIEW_PAGES, "Stranice" - STRING_UNITS_CM, "cm" - STRING_UNITS_IN, "in" - STRING_UNITS_INCH, "inch (inči)" - STRING_UNITS_PT, "pt" -END - -STRINGTABLE -BEGIN - STRING_DEFAULT_FILENAME, "Dokument" - STRING_PROMPT_SAVE_CHANGES, "Spremi promjene u '%s'?" - STRING_SEARCH_FINISHED, "Završeno pretraživanje dokumenta." - STRING_LOAD_RICHED_FAILED, "Neuspješno učitavanje RichEdit knjižnice." - STRING_SAVE_LOSEFORMATTING, "Odabrali ste spremanje u formatu običnog teksta, što će uzrokovati gubitak cjelokupnog oblikovanja. Jeste li sigurni da to želite učiniti?" - STRING_INVALID_NUMBER, "Nevažeći format brojeva." - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE dokumenti za pohranu nisu podržani." - STRING_WRITE_FAILED, "Neuspješno spremanje dokumenta." - STRING_WRITE_ACCESS_DENIED, "Nemate dopuštenje za spremanje datoteke." - STRING_OPEN_FAILED, "Neuspješno otvaranje datoteke." - STRING_OPEN_ACCESS_DENIED, "Nemate dopuštenje za otvaranje datoteke." - STRING_PRINTING_NOT_IMPLEMENTED, "Ispis nije implementiran, razvijen." - STRING_MAX_TAB_STOPS, "Ne može se dodati više od 32 tabulatora." -END - -IDD_DATETIME DIALOGEX 30, 20, 130, 80 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Date and time" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Podražni formati",-1,3,2,100,15 - LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY - DEFPUSHBUTTON "U redu",IDOK,87,12,40,12 - PUSHBUTTON "Odustani",IDCANCEL,87,26,40,12 -END - -IDD_NEWFILE DIALOGEX 30, 20, 140, 80 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Novo" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Novi tip dokumenta",-1,3,2,100,15 - LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT - DEFPUSHBUTTON "U redu",IDOK,97,12,40,12 - PUSHBUTTON "Odustani",IDCANCEL,97,26,40,12 -END - -IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Format paragrafa" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Uvlačenje", -1, 10, 10, 140, 68 - LTEXT "Lijevo", -1, 15, 22, 60, 13 - EDITTEXT IDC_PARA_LEFT, 75, 20, 65, 13 - LTEXT "Desno", -1, 15, 40, 60, 13 - EDITTEXT IDC_PARA_RIGHT, 75, 38, 65, 13 - LTEXT "Prva linija", -1, 15, 58, 60, 13 - EDITTEXT IDC_PARA_FIRST, 75, 56, 65, 13 - LTEXT "Poravnanje", -1, 15, 87, 60, 13 - COMBOBOX IDC_PARA_ALIGN, 75, 85, 65, 60, CBS_DROPDOWNLIST - DEFPUSHBUTTON "U redu", IDOK, 160, 15, 50, 15 - PUSHBUTTON "Odustani", IDCANCEL, 160, 33, 50, 15 -END - -IDD_TABSTOPS DIALOGEX 30, 20, 200, 110 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Tabulatori" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Tabulatori", -1, 10, 10, 120, 90 - COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE - DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 - PUSHBUTTON "&Ukloni", ID_TAB_DEL, 72, 80, 45, 15 - PUSHBUTTON "U redu", IDOK, 135, 15, 58, 15 - PUSHBUTTON "Odustani", IDCANCEL, 135, 33, 58, 15 - PUSHBUTTON "Ukloni &sve", ID_TAB_EMPTY, 135, 51, 58, 15 -END - -IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110 -STYLE DS_SHELLFONT | DS_SYSMODAL -CAPTION "" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Omatanje linija", -1, 5, 10, 145, 85 - RADIOBUTTON "&Nema prelamanja linija", IDC_PAGEFMT_WN, 10, 25, 138, 15 - RADIOBUTTON "Prelomi tekst uz &okvir prozora", IDC_PAGEFMT_WW, 10, 45, 138, 15 - RADIOBUTTON "Prelamanje teksta uz &marginu", IDC_PAGEFMT_WM, 10, 65, 138, 15 - GROUPBOX "Alatne trake", -1, 155, 10, 115, 85 - CHECKBOX "&Alatna traka", IDC_PAGEFMT_TB, 165, 20, 80, 15 - CHECKBOX "&Formatna traka", IDC_PAGEFMT_FB, 165, 38, 80, 15 - CHECKBOX "&Ravnalo", IDC_PAGEFMT_RU, 165, 56, 80, 15 - CHECKBOX "&Statusna traka", IDC_PAGEFMT_SB, 165, 74, 80, 15 - LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 -END +/* This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_CROATIAN, SUBLANG_DEFAULT + +IDM_MAINMENU MENU +BEGIN + POPUP "&Datoteka" + BEGIN + MENUITEM "&Novo...\tCtrl+N", ID_FILE_NEW + MENUITEM "&Otvori...\tCtrl+O", ID_FILE_OPEN + MENUITEM "&Spremi\tCtrl+S", ID_FILE_SAVE + MENUITEM "Spremi &kao...", ID_FILE_SAVEAS + MENUITEM SEPARATOR + MENUITEM "&Ispiši...\tCtrl+P", ID_PRINT + MENUITEM "Ispiši &pregled", ID_PREVIEW + MENUITEM "Postavljanje stranic&e", ID_PRINTSETUP + MENUITEM SEPARATOR + MENUITEM "Iz&ađi", ID_FILE_EXIT + END + POPUP "&Uredi" + BEGIN + MENUITEM "&Poništi\tCtrl+Z", ID_EDIT_UNDO + MENUITEM "&Vrati\tCtrl+Y", ID_EDIT_REDO + MENUITEM SEPARATOR + MENUITEM "&Izreži\tCtrl+X", ID_EDIT_CUT + MENUITEM "&Kopiraj\tCtrl+C", ID_EDIT_COPY + MENUITEM "&Zalijepi\tCtrl+V", ID_EDIT_PASTE + MENUITEM "Iz&briši\tDel", ID_EDIT_CLEAR + MENUITEM "&Označi sve\tCtrl+A", ID_EDIT_SELECTALL + MENUITEM SEPARATOR + MENUITEM "P&ronađi...\tCtrl+F", ID_FIND + MENUITEM "Pronađi &slijedeće\tF3", ID_FIND_NEXT + MENUITEM "Z&amijeni...\tCtrl+H", ID_REPLACE + MENUITEM SEPARATOR + MENUITEM "Pročitaj-samo &način", ID_EDIT_READONLY + MENUITEM "&Modificirano", ID_EDIT_MODIFIED + MENUITEM SEPARATOR + POPUP "&Dodatno" + BEGIN + MENUITEM "&Informacije označenoga", ID_EDIT_SELECTIONINFO + MENUITEM "&Format znaka", ID_EDIT_CHARFORMAT + MENUITEM "&Definicija znakovnog formata", ID_EDIT_DEFCHARFORMAT + MENUITEM "&Paragraf formata", ID_EDIT_PARAFORMAT + MENUITEM "Dobij &tekst", ID_EDIT_GETTEXT + END + END + POPUP "&Pogled" + BEGIN + MENUITEM "&Alatna traka", ID_TOGGLE_TOOLBAR + MENUITEM "Traka &formatiranja", ID_TOGGLE_FORMATBAR + MENUITEM "&Ravnalo", ID_TOGGLE_RULER + MENUITEM "&Statusna traka", ID_TOGGLE_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Opcije...", ID_VIEWPROPERTIES + END + POPUP "&Ubaci" + BEGIN + MENUITEM "&Datum i vrijeme...", ID_DATETIME + END + POPUP "&Format" + BEGIN + MENUITEM "&Font...", ID_FONTSETTINGS + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + MENUITEM "&Kartice...", ID_TABSTOPS + POPUP "&Pozadina" + BEGIN + MENUITEM "&Sustav\tCtrl+1", ID_BACK_1 + MENUITEM "&Bijelo žuta\tCtrl+2", ID_BACK_2 + END + END + POPUP "P&omoć" + BEGIN + MENUITEM "&O Wine WordPad-u", ID_ABOUT + END +END + +IDM_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Izreži", ID_EDIT_CUT + MENUITEM "&Kopiraj", ID_EDIT_COPY + MENUITEM "&Zalijepi", ID_EDIT_PASTE + MENUITEM SEPARATOR + MENUITEM "&Grafičke oznake", ID_BULLET + MENUITEM "&Paragraf...", ID_PARAFORMAT + END +END + +IDM_COLOR_POPUP MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "Crna", ID_COLOR_BLACK + MENUITEM "Boja kestena", ID_COLOR_MAROON + MENUITEM "Zelena", ID_COLOR_GREEN + MENUITEM "Boja masline", ID_COLOR_OLIVE + MENUITEM "Mornarska boja", ID_COLOR_NAVY + MENUITEM "Ljubičasta", ID_COLOR_PURPLE + MENUITEM "Teal", ID_COLOR_TEAL + MENUITEM "Siva", ID_COLOR_GRAY + MENUITEM "Srebrna", ID_COLOR_SILVER + MENUITEM "Crvena", ID_COLOR_RED + MENUITEM "Lime", ID_COLOR_LIME + MENUITEM "Žuta", ID_COLOR_YELLOW + MENUITEM "Plava", ID_COLOR_BLUE + MENUITEM "Fuchsia", ID_COLOR_FUCHSIA + MENUITEM "Aqua", ID_COLOR_AQUA + MENUITEM "Bijela", ID_COLOR_WHITE + MENUITEM "Automatski", ID_COLOR_AUTOMATIC + END +END + +STRINGTABLE +BEGIN + STRING_ALL_FILES, "Svi dokumenti (*.*)" + STRING_TEXT_FILES_TXT, "Tekstni dokumenti (*.txt)" + STRING_TEXT_FILES_UNICODE_TXT, "Unicode tekstni dokumenti (*.txt)" + STRING_RICHTEXT_FILES_RTF, "Obogaćeni tekstni formati (*.rtf)" + STRING_NEWFILE_RICHTEXT, "Obogaćeni tekstni dokument" + STRING_NEWFILE_TXT, "Tekstni dokument" + STRING_NEWFILE_TXT_UNICODE, "Unicode tekstni dokument" + STRING_PRINTER_FILES_PRN, "Datoteke ispisa (*.prn)" +END + +STRINGTABLE +BEGIN + STRING_ALIGN_LEFT, "Lijevo" + STRING_ALIGN_RIGHT, "Desno" + STRING_ALIGN_CENTER, "Sredina" +END + +STRINGTABLE +BEGIN + STRING_VIEWPROPS_TITLE, "Opcije" + STRING_VIEWPROPS_TEXT, "Tekst" + STRING_VIEWPROPS_RICHTEXT, "Obogaćeni teskt" +END + +STRINGTABLE +BEGIN + STRING_PREVIEW_PRINT, "Ispis" + STRING_PREVIEW_NEXTPAGE, "Sljedeća stranica" + STRING_PREVIEW_PREVPAGE, "Prethodna stranica" + STRING_PREVIEW_TWOPAGES, "Dvije stranice" + STRING_PREVIEW_ONEPAGE, "Jedna stranica" + STRING_PREVIEW_ZOOMIN, "Zumiraj" + STRING_PREVIEW_ZOOMOUT, "Odzumiraj" + STRING_PREVIEW_CLOSE, "Zatvori" + STRING_PREVIEW_PAGE, "Stranica" + STRING_PREVIEW_PAGES, "Stranice" + STRING_UNITS_CM, "cm" + STRING_UNITS_IN, "in" + STRING_UNITS_INCH, "inch (inči)" + STRING_UNITS_PT, "pt" +END + +STRINGTABLE +BEGIN + STRING_DEFAULT_FILENAME, "Dokument" + STRING_PROMPT_SAVE_CHANGES, "Spremi promjene u '%s'?" + STRING_SEARCH_FINISHED, "Završeno pretraživanje dokumenta." + STRING_LOAD_RICHED_FAILED, "Neuspješno učitavanje RichEdit knjižnice." + STRING_SAVE_LOSEFORMATTING, "Odabrali ste spremanje u formatu običnog teksta, što će uzrokovati gubitak cjelokupnog oblikovanja. Jeste li sigurni da to želite učiniti?" + STRING_INVALID_NUMBER, "Nevažeći format brojeva." + STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE dokumenti za pohranu nisu podržani." + STRING_WRITE_FAILED, "Neuspješno spremanje dokumenta." + STRING_WRITE_ACCESS_DENIED, "Nemate dopuštenje za spremanje datoteke." + STRING_OPEN_FAILED, "Neuspješno otvaranje datoteke." + STRING_OPEN_ACCESS_DENIED, "Nemate dopuštenje za otvaranje datoteke." + STRING_PRINTING_NOT_IMPLEMENTED, "Ispis nije implementiran, razvijen." + STRING_MAX_TAB_STOPS, "Ne može se dodati više od 32 tabulatora." +END + +IDD_DATETIME DIALOGEX 30, 20, 130, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Date and time" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Podražni formati",-1,3,2,100,15 + LISTBOX IDC_DATETIME,3,12,80,65,LBS_NOINTEGRALHEIGHT | LBS_NOTIFY + DEFPUSHBUTTON "U redu",IDOK,87,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,87,26,40,12 +END + +IDD_NEWFILE DIALOGEX 30, 20, 140, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Novo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Novi tip dokumenta",-1,3,2,100,15 + LISTBOX IDC_NEWFILE,3,12,90,65,LBS_NOINTEGRALHEIGHT + DEFPUSHBUTTON "U redu",IDOK,97,12,40,12 + PUSHBUTTON "Odustani",IDCANCEL,97,26,40,12 +END + +IDD_PARAFORMAT DIALOGEX 30, 20, 220, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Format paragrafa" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Uvlačenje", -1, 10, 10, 140, 68 + LTEXT "Lijevo", -1, 15, 22, 60, 13 + EDITTEXT IDC_PARA_LEFT, 75, 20, 65, 13 + LTEXT "Desno", -1, 15, 40, 60, 13 + EDITTEXT IDC_PARA_RIGHT, 75, 38, 65, 13 + LTEXT "Prva linija", -1, 15, 58, 60, 13 + EDITTEXT IDC_PARA_FIRST, 75, 56, 65, 13 + LTEXT "Poravnanje", -1, 15, 87, 60, 13 + COMBOBOX IDC_PARA_ALIGN, 75, 85, 65, 60, CBS_DROPDOWNLIST + DEFPUSHBUTTON "U redu", IDOK, 160, 15, 50, 15 + PUSHBUTTON "Odustani", IDCANCEL, 160, 33, 50, 15 +END + +IDD_TABSTOPS DIALOGEX 30, 20, 200, 110 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Tabulatori" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Tabulatori", -1, 10, 10, 120, 90 + COMBOBOX IDC_TABSTOPS, 20, 20, 100, 60, CBS_SIMPLE + DEFPUSHBUTTON "&Dodaj", ID_TAB_ADD, 20, 80, 45, 15 + PUSHBUTTON "&Ukloni", ID_TAB_DEL, 72, 80, 45, 15 + PUSHBUTTON "U redu", IDOK, 135, 15, 58, 15 + PUSHBUTTON "Odustani", IDCANCEL, 135, 33, 58, 15 + PUSHBUTTON "Ukloni &sve", ID_TAB_EMPTY, 135, 51, 58, 15 +END + +IDD_FORMATOPTS DIALOGEX 0, 0, 280, 110 +STYLE DS_SHELLFONT | DS_SYSMODAL +CAPTION "" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Omatanje linija", -1, 5, 10, 145, 85 + RADIOBUTTON "&Nema prelamanja linija", IDC_PAGEFMT_WN, 10, 25, 138, 15 + RADIOBUTTON "Prelomi tekst uz &okvir prozora", IDC_PAGEFMT_WW, 10, 45, 138, 15 + RADIOBUTTON "Prelamanje teksta uz &marginu", IDC_PAGEFMT_WM, 10, 65, 138, 15 + GROUPBOX "Alatne trake", -1, 155, 10, 115, 85 + CHECKBOX "&Alatna traka", IDC_PAGEFMT_TB, 165, 20, 80, 15 + CHECKBOX "&Formatna traka", IDC_PAGEFMT_FB, 165, 38, 80, 15 + CHECKBOX "&Ravnalo", IDC_PAGEFMT_RU, 165, 56, 80, 15 + CHECKBOX "&Statusna traka", IDC_PAGEFMT_SB, 165, 74, 80, 15 + LTEXT "", IDC_PAGEFMT_ID, 0,0,0,0 +END

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