Ros-diffs December 2021

ros-diffs@reactos.org

33 participants
155 discussions

[reactos] 01/01: [NTGDI] Follow-up of #4137

by Katayama Hirofumi MZ

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 {

3 years

[reactos] 01/01: [W32TIME] Improve w32time setup

by Eric Kohl

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

3 years

[reactos] 01/01: [NTGDI] Support the wide pen (#4137)

by Katayama Hirofumi MZ

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) \ +)

3 years

[reactos] 01/01: [COMCTL32] Redraw children when the combo box is dropped down.

by Robert Naumann

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)

3 years

[reactos] 01/01: [TRANSLATION][WORDPAD] Fix line breaks of Croatian

by Katayama Hirofumi MZ

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

3 years

[reactos] 01/01: [NTUSER] Fix where linking newly created window is done (#4127)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f606fecb0d8c5d5aab11e… commit f606fecb0d8c5d5aab11e9ac5214e3b48429ed5f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Dec 4 11:52:38 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Dec 4 11:52:38 2021 +0900 [NTUSER] Fix where linking newly created window is done (#4127) Co-authored-by: I_Kill_Bugs <> CORE-12052 --- win32ss/user/ntuser/window.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index d7877395159..7d2a97f3584 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2190,14 +2190,9 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, Window->rcClient = Window->rcWindow; - /* Link the window */ - if (NULL != ParentWindow) + if (Window->spwndNext || Window->spwndPrev) { - /* Link the window into the siblings list */ - if ((Cs->style & (WS_CHILD|WS_MAXIMIZE)) == WS_CHILD) - IntLinkHwnd(Window, HWND_BOTTOM); - else - IntLinkHwnd(Window, hwndInsertAfter); + ERR("Window 0x%p has been linked too early!\n", Window); } if (!(Window->state2 & WNDS2_WIN31COMPAT)) @@ -2210,10 +2205,10 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, { if ( !IntIsTopLevelWindow(Window) ) { - if (pti != Window->spwndParent->head.pti) + if (pti != ParentWindow->head.pti) { //ERR("CreateWindow Parent in.\n"); - UserAttachThreadInput(pti, Window->spwndParent->head.pti, TRUE); + UserAttachThreadInput(pti, ParentWindow->head.pti, TRUE); } } } @@ -2226,6 +2221,16 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, goto cleanup; } + /* Link the window */ + if (ParentWindow != NULL) + { + /* Link the window into the siblings list */ + if ((Cs->style & (WS_CHILD | WS_MAXIMIZE)) == WS_CHILD) + IntLinkHwnd(Window, HWND_BOTTOM); + else + IntLinkHwnd(Window, hwndInsertAfter); + } + /* Send the WM_NCCALCSIZE message */ { // RECT rc;

3 years

[reactos] 01/01: [APITESTS][NTVDM][SPOOLSV] Add the missing ENABLE_EXPORTS property as these EXE targets have function exports.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=957e566a236b75ba2547a… commit 957e566a236b75ba2547af6305a5edf59c5eca7a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Dec 4 01:08:20 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Dec 4 01:17:32 2021 +0100 [APITESTS][NTVDM][SPOOLSV] Add the missing ENABLE_EXPORTS property as these EXE targets have function exports. This became a requirement, following a previous CMake update. Otherwise the built EXEs would not export their intended functions. Addendum to commit d8e92b5a (see PR #1335) CORE-15406 [LOADCONFIG] The GCC rant had nothing to do with GCC, but everything with CMake... [SPOOLSV] Add the missing exported stubs. --- modules/rostests/apitests/loadconfig/CMakeLists.txt | 12 ++++++------ modules/rostests/apitests/ntdll/CMakeLists.txt | 5 +++++ modules/rostests/apitests/shell32/CMakeLists.txt | 5 +++++ sdk/cmake/CMakeMacros.cmake | 6 ++++-- subsystems/mvdm/ntvdm/CMakeLists.txt | 5 +++++ win32ss/printing/base/spoolsv/CMakeLists.txt | 13 +++++++++++-- 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/modules/rostests/apitests/loadconfig/CMakeLists.txt b/modules/rostests/apitests/loadconfig/CMakeLists.txt index d4327e5622d..ac40bc53bb4 100644 --- a/modules/rostests/apitests/loadconfig/CMakeLists.txt +++ b/modules/rostests/apitests/loadconfig/CMakeLists.txt @@ -7,16 +7,16 @@ list(APPEND SOURCE loadconfig.h) add_executable(loadconfig_apitest ${SOURCE} testlist.c ${CMAKE_CURRENT_BINARY_DIR}/loadconfig_apitest.def) -target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) -set_module_type(loadconfig_apitest win32cui) -add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) -#add_pch(loadconfig_apitest loadconfig.h SOURCE) -add_rostests_file(TARGET loadconfig_apitest) -# Tell GCC again that we are really interested in exporting symols (who would have figured that we want to use the .def we specified before?) set_target_properties(loadconfig_apitest PROPERTIES ENABLE_EXPORTS TRUE DEFINE_SYMBOL "") +target_link_libraries(loadconfig_apitest wine ${PSEH_LIB}) +set_module_type(loadconfig_apitest win32cui) +add_importlibs(loadconfig_apitest msvcrt kernel32 ntdll) +#add_pch(loadconfig_apitest loadconfig.h SOURCE) +add_rostests_file(TARGET loadconfig_apitest) + fixup_load_config(loadconfig_apitest) diff --git a/modules/rostests/apitests/ntdll/CMakeLists.txt b/modules/rostests/apitests/ntdll/CMakeLists.txt index 1e69ecf4900..a50b1898a76 100644 --- a/modules/rostests/apitests/ntdll/CMakeLists.txt +++ b/modules/rostests/apitests/ntdll/CMakeLists.txt @@ -110,6 +110,11 @@ add_executable(ntdll_apitest testdata.rc ${CMAKE_CURRENT_BINARY_DIR}/ntdll_apitest.def) +set_target_properties(ntdll_apitest + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + target_link_libraries(ntdll_apitest wine uuid ${PSEH_LIB}) set_module_type(ntdll_apitest win32cui) add_importlibs(ntdll_apitest msvcrt advapi32 kernel32 ntdll) diff --git a/modules/rostests/apitests/shell32/CMakeLists.txt b/modules/rostests/apitests/shell32/CMakeLists.txt index 7a175032619..9ebf9404a2d 100644 --- a/modules/rostests/apitests/shell32/CMakeLists.txt +++ b/modules/rostests/apitests/shell32/CMakeLists.txt @@ -41,6 +41,11 @@ add_executable(shell32_apitest resource.rc ${CMAKE_CURRENT_BINARY_DIR}/shell32_apitest.def) +set_target_properties(shell32_apitest + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + target_link_libraries(shell32_apitest wine uuid ${PSEH_LIB} cpprt atl_classes) set_module_type(shell32_apitest win32cui) add_importlibs(shell32_apitest user32 gdi32 shell32 ole32 oleaut32 advapi32 shlwapi msvcrt kernel32 ntdll) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 7e4cb21cbe0..b72b40b3cd9 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -669,8 +669,10 @@ function(set_module_type MODULE TYPE) if(TYPE STREQUAL kernel) # Kernels are executables with exports - set_property(TARGET ${MODULE} PROPERTY ENABLE_EXPORTS TRUE) - set_target_properties(${MODULE} PROPERTIES DEFINE_SYMBOL "") + set_target_properties(${MODULE} + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") endif() if(${TYPE} STREQUAL win32ocx) diff --git a/subsystems/mvdm/ntvdm/CMakeLists.txt b/subsystems/mvdm/ntvdm/CMakeLists.txt index ff102d88576..aa01e0727d3 100644 --- a/subsystems/mvdm/ntvdm/CMakeLists.txt +++ b/subsystems/mvdm/ntvdm/CMakeLists.txt @@ -73,6 +73,11 @@ add_executable(ntvdm ntvdm.rc ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) +set_target_properties(ntvdm + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + add_pch(ntvdm ntvdm.h SOURCE) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486 ${PSEH_LIB}) diff --git a/win32ss/printing/base/spoolsv/CMakeLists.txt b/win32ss/printing/base/spoolsv/CMakeLists.txt index 1506f4d5dc3..6602eba9fab 100644 --- a/win32ss/printing/base/spoolsv/CMakeLists.txt +++ b/win32ss/printing/base/spoolsv/CMakeLists.txt @@ -22,9 +22,18 @@ list(APPEND SOURCE rpcstubs.c spoolfile.c xcv.c - ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c) + ${CMAKE_CURRENT_BINARY_DIR}/winspool_s.c + ${CMAKE_CURRENT_BINARY_DIR}/spoolsv_stubs.c) -add_executable(spoolsv ${SOURCE} spoolsv.rc) +add_executable(spoolsv + ${SOURCE} + spoolsv.rc + ${CMAKE_CURRENT_BINARY_DIR}/spoolsv.def) + +set_target_properties(spoolsv + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") if(USE_CLANG_CL) target_compile_options(spoolsv PRIVATE "-Wno-cast-calling-convention")

3 years

[reactos] 03/03: [NTVDM] Log explicitly calls to Long FileName support functions in DOS INT 21h. Use MAXDWORD instead of hardcoded values.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=addf1e87fe643c412dc22… commit addf1e87fe643c412dc22f4fcb461410398e2f6b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 3 23:15:03 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:24 2021 +0100 [NTVDM] Log explicitly calls to Long FileName support functions in DOS INT 21h. Use MAXDWORD instead of hardcoded values. --- subsystems/mvdm/ntvdm/dos/dos32krnl/device.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c index 71fbdcef1aa..881f67e47d3 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c @@ -378,7 +378,7 @@ PDOS_DEVICE_NODE DosCreateDeviceEx(WORD Attributes, PCHAR DeviceName, WORD Priva /* Fill the header with data */ DriverHeader = SEG_OFF_TO_PTR(Segment, 0); - DriverHeader->Link = 0xFFFFFFFF; + DriverHeader->Link = MAXDWORD; DriverHeader->DeviceAttributes = Attributes; DriverHeader->StrategyRoutine = sizeof(DOS_DRIVER); DriverHeader->InterruptRoutine = sizeof(DOS_DRIVER) + sizeof(StrategyRoutine); diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c index 641ab62ed93..6c94ade7e6d 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c @@ -1998,6 +1998,17 @@ VOID WINAPI DosInt21h(LPWORD Stack) break; } + /* Long FileName Support */ + case 0x71: + { + DPRINT1("INT 21h LFN Support, AH = %02Xh, AL = %02Xh NOT IMPLEMENTED!\n", + getAH(), getAL()); + + setAL(0); // Some functions expect AL to be 0 when it's not supported. + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + break; + } + /* Unsupported */ default: // Default: { @@ -2302,7 +2313,7 @@ BOOLEAN DosKRNLInitialize(VOID) SysVars->BootDrive = RtlUpcaseUnicodeChar(SharedUserData->NtSystemRoot[0]) - 'A' + 1; /* Initialize the NUL device driver */ - SysVars->NullDevice.Link = 0xFFFFFFFF; + SysVars->NullDevice.Link = MAXDWORD; SysVars->NullDevice.DeviceAttributes = DOS_DEVATTR_NUL | DOS_DEVATTR_CHARACTER; // Offset from within the DOS data segment SysVars->NullDevice.StrategyRoutine = DOS_DATA_OFFSET(NullDriverRoutine); @@ -2380,7 +2391,7 @@ BOOLEAN DosKRNLInitialize(VOID) /* Initialize the SFT */ Sft = (PDOS_SFT)FAR_POINTER(SysVars->FirstSft); - Sft->Link = 0xFFFFFFFF; + Sft->Link = MAXDWORD; Sft->NumDescriptors = DOS_SFT_SIZE; for (i = 0; i < Sft->NumDescriptors; i++)

3 years

[reactos] 02/03: [NTVDM] Improve DOS file search implementation. Addendum to commit 86ba2faa (r67619).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81d5e650de7fb78efcaf6… commit 81d5e650de7fb78efcaf6b5e27e79a2618285709 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Dec 3 22:20:21 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:23 2021 +0100 [NTVDM] Improve DOS file search implementation. Addendum to commit 86ba2faa (r67619). We get file matches when their attributes match and we can obtain a valid 8.3 file name. This last condition is of upmost importance. We cannot reliably use GetShortPathName() on the filename returned by FindFirstFile()/FindNextFile() because the result is uncertain (one either needs to build a full path before calling the function just to get the final short path form, or change the current working directory to the one where the search is being made, etc.) The Find*file() functions return anyway the short file. name (in the cAlternateFileName member) if the file does have such 8.3 filename and its real name (in cFileName) is longer. Otherwise, cFileName could already be *THE* short filename because it has the correct format for it. Check this latter case with RtlIsNameLegalDOS8Dot3() and use it if so. Otherwise this means the file has a long filename that cannot be converted to short filename format (because e.g. it is in a volume where short filenames are unavailable), and we skip such files: they wouldn't be accessible from DOS anyways. - Doxygen-document demFileFindFirst(), demFileFindNext() and associated flags and structures. Update their annotations. This fixes TurboC 2.x installation. --- subsystems/mvdm/ntvdm/dos/dem.c | 220 ++++++++++++++++++++++++------ subsystems/mvdm/ntvdm/dos/dem.h | 36 +++-- subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h | 15 +- 3 files changed, 213 insertions(+), 58 deletions(-) diff --git a/subsystems/mvdm/ntvdm/dos/dem.c b/subsystems/mvdm/ntvdm/dos/dem.c index dcb78174d06..728963b972f 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.c +++ b/subsystems/mvdm/ntvdm/dos/dem.c @@ -1406,95 +1406,225 @@ demFileDelete(IN LPCSTR FileName) return GetLastError(); } +/** + * @brief Helper for demFileFindFirst() and demFileFindNext(). + * Returns TRUE if a file matches the DOS attributes and has a 8.3 file name. + **/ +static BOOLEAN +dempIsFileMatch( + _Inout_ PWIN32_FIND_DATAA FindData, + _In_ WORD AttribMask, + _Out_ PCSTR* ShortName) +{ + /* Convert in place the attributes to DOS format */ + FindData->dwFileAttributes = NT_TO_DOS_FA(FindData->dwFileAttributes); + + /* Check the attributes */ + if ((FindData->dwFileAttributes & (FA_HIDDEN | FA_SYSTEM | FA_DIRECTORY)) + & ~AttribMask) + { + return FALSE; + } + + /* Check whether the file has a 8.3 file name */ + if (*FindData->cAlternateFileName) + { + /* Use the available one */ + *ShortName = FindData->cAlternateFileName; + return TRUE; + } + else + { + /* + * Verify whether the original long name is actually a valid + * 8.3 file name. Note that we cannot use GetShortPathName() + * since the latter works on full paths, that we do not always have. + */ + BOOLEAN IsNameLegal, SpacesInName; + WCHAR FileNameBufferU[_countof(FindData->cFileName) + 1]; + UNICODE_STRING FileNameU; + ANSI_STRING FileNameA; + + RtlInitAnsiString(&FileNameA, FindData->cFileName); + RtlInitEmptyUnicodeString(&FileNameU, FileNameBufferU, sizeof(FileNameBufferU)); + RtlAnsiStringToUnicodeString(&FileNameU, &FileNameA, FALSE); + + IsNameLegal = RtlIsNameLegalDOS8Dot3(&FileNameU, + NULL, // (lpOemName ? &AnsiName : NULL), + &SpacesInName); + + if (!IsNameLegal || SpacesInName) + { + /* This is an error situation */ + DPRINT1("'%.*s' is %s 8.3 filename %s spaces\n", + _countof(FindData->cFileName), FindData->cFileName, + (IsNameLegal ? "a valid" : "an invalid"), (SpacesInName ? "with" : "without")); + } + + if (IsNameLegal && !SpacesInName) + { + /* We can use the original name */ + *ShortName = FindData->cFileName; + return TRUE; + } + } + + DPRINT1("No short 8.3 filename available for '%.*s'\n", + _countof(FindData->cFileName), FindData->cFileName); + + return FALSE; +} + +/** + * @name demFileFindFirst + * Implementation of the DOS INT 21h, AH=4Eh "Find First File" function. + * + * Starts enumerating files that match the given file search specification + * and whose attributes are _at most_ those specified by the mask. This means + * in particular that "normal files", i.e. files with no attributes set, are + * always enumerated along those matching the requested attributes. + * + * @param[out] pFindFileData + * Pointer to the DTA (Disk Transfer Area) filled with FindFirst data block. + * + * @param[in] FileName + * File search specification (may include path and wildcards). + * + * @param[in] AttribMask + * Mask of file attributes. Includes files with a given attribute bit set + * if the corresponding bit is set to 1 in the mask. Excludes files with a + * given attribute bit set if the corresponding bit is set to 0 in the mask. + * Supported file attributes: + * FA_NORMAL 0x0000 + * FA_READONLY 0x0001 (ignored) + * FA_HIDDEN 0x0002 + * FA_SYSTEM 0x0004 + * FA_VOLID 0x0008 (not currently supported) + * FA_LABEL + * FA_DIRECTORY 0x0010 + * FA_ARCHIVE 0x0020 (ignored) + * FA_DEVICE 0x0040 (ignored) + * + * @return + * ERROR_SUCCESS on success (found match), or a last error (match not found). + * + * @see demFileFindNext() + **/ DWORD WINAPI -demFileFindFirst(OUT PVOID lpFindFileData, - IN LPCSTR FileName, - IN WORD AttribMask) +demFileFindFirst( + _Out_ PVOID pFindFileData, + _In_ PCSTR FileName, + _In_ WORD AttribMask) { - BOOLEAN Success = TRUE; - WIN32_FIND_DATAA FindData; + PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)pFindFileData; HANDLE SearchHandle; - PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; + WIN32_FIND_DATAA FindData; + PCSTR ShortName = NULL; + + /* Reset the private block fields */ + RtlZeroMemory(FindFileBlock, RTL_SIZEOF_THROUGH_FIELD(DOS_FIND_FILE_BLOCK, SearchHandle)); + + // TODO: Handle FA_VOLID for volume label. + if (AttribMask & FA_VOLID) + { + DPRINT1("demFileFindFirst: Volume label attribute is UNIMPLEMENTED!\n"); + AttribMask &= ~FA_VOLID; // Remove it for the time being... + } + + /* Filter out the ignored attributes */ + AttribMask &= ~(FA_DEVICE | FA_ARCHIVE | FA_READONLY); /* Start a search */ SearchHandle = FindFirstFileA(FileName, &FindData); - if (SearchHandle == INVALID_HANDLE_VALUE) return GetLastError(); + if (SearchHandle == INVALID_HANDLE_VALUE) + return GetLastError(); - do + /* Check the attributes and retry as long as we haven't found a matching file */ + while (!dempIsFileMatch(&FindData, AttribMask, &ShortName)) { - /* Check the attributes and retry as long as we haven't found a matching file */ - if (!((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~AttribMask)) + /* Continue searching. If we fail at some point, + * stop the search and return an error. */ + if (!FindNextFileA(SearchHandle, &FindData)) { - break; + FindClose(SearchHandle); + return GetLastError(); } } - while ((Success = FindNextFileA(SearchHandle, &FindData))); - - /* If we failed at some point, close the search and return an error */ - if (!Success) - { - FindClose(SearchHandle); - return GetLastError(); - } /* Fill the block */ FindFileBlock->DriveLetter = DosData->Sda.CurrentDrive + 'A'; + strncpy(FindFileBlock->Pattern, FileName, _countof(FindFileBlock->Pattern)); FindFileBlock->AttribMask = AttribMask; FindFileBlock->SearchHandle = SearchHandle; FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); FileTimeToDosDateTime(&FindData.ftLastWriteTime, &FindFileBlock->FileDate, &FindFileBlock->FileTime); - FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + FindFileBlock->FileSize = FindData.nFileSizeHigh ? MAXDWORD : FindData.nFileSizeLow; - /* Build a short path name */ - if (*FindData.cAlternateFileName) - strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); - else - GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); + + /* Copy the NULL-terminated short file name */ + RtlStringCchCopyA(FindFileBlock->FileName, + _countof(FindFileBlock->FileName), + ShortName); return ERROR_SUCCESS; } +/** + * @name demFileFindNext + * Implementation of the DOS INT 21h, AH=4Fh "Find Next File" function. + * + * Continues enumerating files, with the same file search specification + * and attributes as those given to the first demFileFindFirst() call. + * + * @param[in,out] pFindFileData + * Pointer to the DTA (Disk Transfer Area) filled with FindFirst data block. + * + * @return + * ERROR_SUCCESS on success (found match), or a last error (match not found). + * + * @see demFileFindFirst() + **/ DWORD WINAPI -demFileFindNext(OUT PVOID lpFindFileData) +demFileFindNext( + _Inout_ PVOID pFindFileData) { + PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)pFindFileData; + HANDLE SearchHandle = FindFileBlock->SearchHandle; WIN32_FIND_DATAA FindData; - PDOS_FIND_FILE_BLOCK FindFileBlock = (PDOS_FIND_FILE_BLOCK)lpFindFileData; + PCSTR ShortName = NULL; do { - /* Continue searching as long as we haven't found a matching file */ - - /* If we failed at some point, close the search and return an error */ - if (!FindNextFileA(FindFileBlock->SearchHandle, &FindData)) + /* Continue searching. If we fail at some point, + * stop the search and return an error. */ + if (!FindNextFileA(SearchHandle, &FindData)) { - FindClose(FindFileBlock->SearchHandle); + FindClose(SearchHandle); + + /* Reset the private block fields */ + RtlZeroMemory(FindFileBlock, RTL_SIZEOF_THROUGH_FIELD(DOS_FIND_FILE_BLOCK, SearchHandle)); return GetLastError(); } } - while ((FindData.dwFileAttributes & (FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_DIRECTORY)) - & ~FindFileBlock->AttribMask); + /* Check the attributes and retry as long as we haven't found a matching file */ + while (!dempIsFileMatch(&FindData, FindFileBlock->AttribMask, &ShortName)); /* Update the block */ FindFileBlock->Attributes = LOBYTE(FindData.dwFileAttributes); FileTimeToDosDateTime(&FindData.ftLastWriteTime, &FindFileBlock->FileDate, &FindFileBlock->FileTime); - FindFileBlock->FileSize = FindData.nFileSizeHigh ? 0xFFFFFFFF + FindFileBlock->FileSize = FindData.nFileSizeHigh ? MAXDWORD : FindData.nFileSizeLow; - /* Build a short path name */ - if (*FindData.cAlternateFileName) - strncpy(FindFileBlock->FileName, FindData.cAlternateFileName, sizeof(FindFileBlock->FileName)); - else - GetShortPathNameA(FindData.cFileName, FindFileBlock->FileName, sizeof(FindFileBlock->FileName)); + + /* Copy the NULL-terminated short file name */ + RtlStringCchCopyA(FindFileBlock->FileName, + _countof(FindFileBlock->FileName), + ShortName); return ERROR_SUCCESS; } diff --git a/subsystems/mvdm/ntvdm/dos/dem.h b/subsystems/mvdm/ntvdm/dos/dem.h index 8760e0468fb..789d2317d4a 100644 --- a/subsystems/mvdm/ntvdm/dos/dem.h +++ b/subsystems/mvdm/ntvdm/dos/dem.h @@ -15,6 +15,7 @@ /* INCLUDES *******************************************************************/ +#include <crt/dos.h> // For _A_NORMAL etc. #include "dos32krnl/dos.h" /* DEFINES ********************************************************************/ @@ -62,21 +63,36 @@ demFileDelete IN LPCSTR FileName ); +/** + * @brief File attributes for demFileFindFirst(). + **/ +#define FA_NORMAL _A_NORMAL // 0x0000 +#define FA_READONLY _A_RDONLY // 0x0001 // FILE_ATTRIBUTE_READONLY +#define FA_HIDDEN _A_HIDDEN // 0x0002 // FILE_ATTRIBUTE_HIDDEN +#define FA_SYSTEM _A_SYSTEM // 0x0004 // FILE_ATTRIBUTE_SYSTEM +#define FA_VOLID _A_VOLID // 0x0008 +#define FA_LABEL FA_VOLID +#define FA_DIRECTORY _A_SUBDIR // 0x0010 // FILE_ATTRIBUTE_DIRECTORY +#define FA_ARCHIVE _A_ARCH // 0x0020 // FILE_ATTRIBUTE_ARCHIVE +#define FA_DEVICE 0x0040 // FILE_ATTRIBUTE_DEVICE + +#define FA_VALID (FA_ARCHIVE | FA_DIRECTORY | FA_SYSTEM | FA_HIDDEN | FA_READONLY | FA_NORMAL) + +/** @brief Convert Win32/NT file attributes to DOS format. */ +#define NT_TO_DOS_FA(Attrs) \ + ( ((Attrs) == FILE_ATTRIBUTE_NORMAL) ? FA_NORMAL : (LOBYTE(Attrs) & FA_VALID) ) + DWORD WINAPI -demFileFindFirst -( - OUT PVOID lpFindFileData, - IN LPCSTR FileName, - IN WORD AttribMask -); +demFileFindFirst( + _Out_ PVOID pFindFileData, + _In_ PCSTR FileName, + _In_ WORD AttribMask); DWORD WINAPI -demFileFindNext -( - OUT PVOID lpFindFileData -); +demFileFindNext( + _Inout_ PVOID pFindFileData); UCHAR WINAPI diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h index 18e50077d4a..6eb7067c388 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h @@ -119,20 +119,29 @@ typedef struct _DOS_INPUT_BUFFER CHAR Buffer[ANYSIZE_ARRAY]; } DOS_INPUT_BUFFER, *PDOS_INPUT_BUFFER; +/** + * @struct DOS_FIND_FILE_BLOCK + * Data block returned in the DTA (Disk Transfer Area) by the + * INT 21h, AH=4Eh "Find First File" and the INT 21h, AH=4Fh "Find Next File" + * functions. + * + * @see demFileFindFirst(), demFileFindNext() + **/ typedef struct _DOS_FIND_FILE_BLOCK { + /* The 21 first bytes (0x00 to 0x14 included) are reserved */ CHAR DriveLetter; CHAR Pattern[11]; UCHAR AttribMask; - DWORD Unused; - HANDLE SearchHandle; + DWORD Unused; // FIXME: We must NOT store a Win32 handle here! + HANDLE SearchHandle; // Instead we should use an ID and helpers to map it to Win32. /* The following part of the structure is documented */ UCHAR Attributes; WORD FileTime; WORD FileDate; DWORD FileSize; - CHAR FileName[13]; + _Null_terminated_ CHAR FileName[13]; } DOS_FIND_FILE_BLOCK, *PDOS_FIND_FILE_BLOCK; // http://www.ctyme.com/intr/rb-3023.htm

3 years

[reactos] 01/03: [NTVDM] Trivial english typos fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fcbdab00373827cb6fac0… commit fcbdab00373827cb6fac08d799e3e8ffce3ab0be Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Dec 2 20:26:56 2021 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Dec 3 23:26:22 2021 +0100 [NTVDM] Trivial english typos fixes. --- subsystems/mvdm/ntvdm/bios/vidbios.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c | 2 +- subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subsystems/mvdm/ntvdm/bios/vidbios.c b/subsystems/mvdm/ntvdm/bios/vidbios.c index f580f3fb834..7a6611cc262 100644 --- a/subsystems/mvdm/ntvdm/bios/vidbios.c +++ b/subsystems/mvdm/ntvdm/bios/vidbios.c @@ -2357,7 +2357,7 @@ static VOID VidBiosSetCursorShape(WORD CursorStartEnd) * https://sites.google.com/site/pcdosretro/biosdata * * A proof that it is OK is that in the following code samples it is - * explicitely mentioned that setting bit 0 disables cursor emulation: + * explicitly mentioned that setting bit 0 disables cursor emulation: * - Code snippets in PC Magazine vol.5 num.15 of 16/09/1986, p.291-292; * - CardFile DOS utility (Jeff Prosise, PC Magazine vol.6 num.17 of 13/10/1987, p.403-416): * https://ia600700.us.archive.org/1/items/srccode-00000020/cardfile.asm.txt diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c index f07c87658af..86e17c86750 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c @@ -435,7 +435,7 @@ static VOID WINAPI XmsBopProcedure(LPWORD Stack) break; } - // NOTE: We implicitely suppose that we always have HMA. + // NOTE: We implicitly suppose that we always have HMA. // If not, we should fail there with the XMS_STATUS_HMA_DOES_NOT_EXIST // error code. diff --git a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c index a66cf1656d7..2db4059ac55 100644 --- a/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c +++ b/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c @@ -673,7 +673,7 @@ DWORD DosLoadExecutableInternal(IN DOS_EXEC_TYPE LoadType, /* * Keep critical flags, clear test flags (OF, SF, ZF, AF, PF, CF) - * and explicitely set the interrupt flag. + * and explicitly set the interrupt flag. */ setEFLAGS((getEFLAGS() & ~0x08D5) | 0x0200);

3 years

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 December 2021