Ros-diffs

ros-diffs@reactos.org

81390 discussions

02/08: [WELCOME] Reduce Welcome's SUBSYSTEM requirements to WinNT 4 for x86 builds only, so that we can still show something in old NT OSes.
by Hermès Bélusca-Maïto 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0dae6094e70bf2bee7d4… commit a0dae6094e70bf2bee7d49e061bf8162909408dc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun May 20 21:59:40 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:00:14 2018 +0200 [WELCOME] Reduce Welcome's SUBSYSTEM requirements to WinNT 4 for x86 builds only, so that we can still show something in old NT OSes. --- base/setup/welcome/CMakeLists.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/base/setup/welcome/CMakeLists.txt b/base/setup/welcome/CMakeLists.txt index e8b3f247fb..3ac8d946f4 100644 --- a/base/setup/welcome/CMakeLists.txt +++ b/base/setup/welcome/CMakeLists.txt @@ -4,4 +4,27 @@ add_rc_deps(welcome.rc ${welcome_rc_deps}) add_executable(welcome welcome.c welcome.rc) set_module_type(welcome win32gui UNICODE) add_importlibs(welcome gdi32 user32 shell32 msvcrt kernel32 ntdll) + +# Reduce the required subsystem to WinNT 4.0 for i386 builds only. +if(ARCH STREQUAL "i386") + if(MSVC) + # NOTE: We cannot use the following command: + # add_target_link_flags(welcome "/SUBSYSTEM:WINDOWS,4.00") + # because it would act at the level of the LINK.EXE linker flags, + # which only accepts a subsystem version >= 5.10 (Windows XP+) on + # latest MSVC versions. + # So to work around this problem, we use a post-build command by + # employing EDITBIN.EXE that does not check the subsystem version. + # + add_custom_command( + TARGET welcome POST_BUILD + COMMAND editbin.exe /NOLOGO /SUBSYSTEM:WINDOWS,4.00 $<TARGET_FILE:welcome> + VERBATIM) + else() + # The binutils linker does not set a lower limit on the subsystem. + # Otherwise we would use: objcopy --subsystem windows:4.00 $<TARGET_FILE:welcome> + add_target_link_flags(welcome "-Wl,--subsystem,windows:4.00") + endif() +endif() + add_cd_file(TARGET welcome DESTINATION reactos NO_CAB FOR bootcd)

1 0

01/08: [WELCOME] Automatically expands the path to the ReactOS installer executable found on the installation media, depending on the ambient CPU architecture.
by Hermès Bélusca-Maïto 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55f9fee412ea7a0820242… commit 55f9fee412ea7a0820242ffb6e62f5414fa94aa3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jul 13 18:41:32 2017 +0000 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 21:00:10 2018 +0200 [WELCOME] Automatically expands the path to the ReactOS installer executable found on the installation media, depending on the ambient CPU architecture. svn path=/branches/setup_improvements/; revision=75330 --- base/setup/welcome/welcome.c | 118 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 3 deletions(-) diff --git a/base/setup/welcome/welcome.c b/base/setup/welcome/welcome.c index 01a63b1612..b4050d9941 100644 --- a/base/setup/welcome/welcome.c +++ b/base/setup/welcome/welcome.c @@ -210,6 +210,104 @@ VOID TranslateEscapes(IN OUT LPTSTR lpString) } } +/* + * Expands the path for the ReactOS Installer "reactos.exe". + * See also base/system/userinit/userinit.c!StartInstaller() + */ +VOID ExpandInstallerPath(IN OUT LPTSTR lpInstallerPath, IN SIZE_T PathSize) +{ + SYSTEM_INFO SystemInfo; + PTSTR ptr; + DWORD dwAttribs; + +#if 0 + if (_tcsicmp(lpInstallerPath, TEXT("reactos.exe")) != 0) + return; +#endif + + /* + * First, try to find the installer using the default drive, under + * the directory whose name corresponds to the currently-running + * CPU architecture. + */ + GetSystemInfo(&SystemInfo); + + *lpInstallerPath = 0; + GetModuleFileName(NULL, lpInstallerPath, PathSize); + ptr = _tcschr(lpInstallerPath, _T('\\')); + if (ptr) + *++ptr = 0; + else + *lpInstallerPath = 0; + + /* Append the corresponding CPU architecture */ + switch (SystemInfo.wProcessorArchitecture) + { + case PROCESSOR_ARCHITECTURE_INTEL: + StringCchCat(lpInstallerPath, PathSize, TEXT("I386")); + break; + + case PROCESSOR_ARCHITECTURE_MIPS: + StringCchCat(lpInstallerPath, PathSize, TEXT("MIPS")); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA: + StringCchCat(lpInstallerPath, PathSize, TEXT("ALPHA")); + break; + + case PROCESSOR_ARCHITECTURE_PPC: + StringCchCat(lpInstallerPath, PathSize, TEXT("PPC")); + break; + + case PROCESSOR_ARCHITECTURE_SHX: + StringCchCat(lpInstallerPath, PathSize, TEXT("SHX")); + break; + + case PROCESSOR_ARCHITECTURE_ARM: + StringCchCat(lpInstallerPath, PathSize, TEXT("ARM")); + break; + + case PROCESSOR_ARCHITECTURE_IA64: + StringCchCat(lpInstallerPath, PathSize, TEXT("IA64")); + break; + + case PROCESSOR_ARCHITECTURE_ALPHA64: + StringCchCat(lpInstallerPath, PathSize, TEXT("ALPHA64")); + break; + + case PROCESSOR_ARCHITECTURE_AMD64: + StringCchCat(lpInstallerPath, PathSize, TEXT("AMD64")); + break; + + // case PROCESSOR_ARCHITECTURE_MSIL: /* .NET CPU-independent code */ + case PROCESSOR_ARCHITECTURE_UNKNOWN: + default: + SystemInfo.wProcessorArchitecture = PROCESSOR_ARCHITECTURE_UNKNOWN; + break; + } + + if (SystemInfo.wProcessorArchitecture != PROCESSOR_ARCHITECTURE_UNKNOWN) + StringCchCat(lpInstallerPath, PathSize, TEXT("\\")); + StringCchCat(lpInstallerPath, PathSize, TEXT("reactos.exe")); + + dwAttribs = GetFileAttributes(lpInstallerPath); + if ((dwAttribs != INVALID_FILE_ATTRIBUTES) && + !(dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { + /* We have found the installer */ + return; + } + + /* + * We failed. Try to find the installer from either the current + * ReactOS installation directory, or from our current directory. + */ + *lpInstallerPath = 0; + if (GetWindowsDirectory(lpInstallerPath, PathSize - 12)) + StringCchCat(lpInstallerPath, PathSize, TEXT("\\")); + StringCchCat(lpInstallerPath, PathSize, TEXT("reactos.exe")); +} + VOID InitializeTopicList(VOID) { dwNumberTopics = 0; @@ -275,6 +373,10 @@ PTOPIC AddNewTopicEx( { pTopic->bIsCommand = TRUE; StringCchCopy(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand), szCommand); + + /* Check for special applications: ReactOS Installer */ + if (_tcsicmp(pTopic->szCommand, TEXT("reactos.exe")) == 0) + ExpandInstallerPath(pTopic->szCommand, ARRAYSIZE(pTopic->szCommand)); } else { @@ -382,6 +484,7 @@ static BOOL LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) { DWORD dwRet; + DWORD dwAttribs; DWORD dwSize; TCHAR szBuffer[LOCALE_NAME_MAX_LENGTH]; TCHAR szIniPath[MAX_PATH]; @@ -402,7 +505,9 @@ LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) TEXT("%s\\%s.ini"), lpResPath, szBuffer); /* Verify that the file exists, otherwise fall back to english (US) */ - if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) + dwAttribs = GetFileAttributes(szIniPath); + if ((dwAttribs == INVALID_FILE_ATTRIBUTES) || + (dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) { StringCchCopy(szBuffer, ARRAYSIZE(szBuffer), TEXT("en-US")); @@ -411,8 +516,12 @@ LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) } /* Verify that the file exists, otherwise fall back to internal (localized) resource */ - if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) + dwAttribs = GetFileAttributes(szIniPath); + if ((dwAttribs == INVALID_FILE_ATTRIBUTES) || + (dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) + { return FALSE; // For localized resources, see the general function. + } /* Try to load the default localized strings */ GetPrivateProfileString(TEXT("Defaults"), TEXT("AppTitle"), TEXT("ReactOS - Welcome") /* default */, @@ -496,6 +605,7 @@ LoadLocalizedResourcesFromINI(LCID Locale, LPTSTR lpResPath) static VOID LoadConfiguration(VOID) { + DWORD dwAttribs; BOOL bLoadDefaultResources; TCHAR szAppPath[MAX_PATH]; TCHAR szIniPath[MAX_PATH]; @@ -530,7 +640,9 @@ LoadConfiguration(VOID) StringCchPrintf(szIniPath, ARRAYSIZE(szIniPath), TEXT("%s\\welcome.ini"), szAppPath); /* Verify that the file exists, otherwise use the default configuration */ - if (GetFileAttributes(szIniPath) == INVALID_FILE_ATTRIBUTES) + dwAttribs = GetFileAttributes(szIniPath); + if ((dwAttribs == INVALID_FILE_ATTRIBUTES) || + (dwAttribs & FILE_ATTRIBUTE_DIRECTORY)) { /* Use the default internal (localized) resources */ LoadLocalizedResourcesInternal();

1 0

01/01: [NETCFGX] NetPropPageProvider: Add Base and Step parameter options.
by Eric Kohl 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11c9e773fb164c437b590… commit 11c9e773fb164c437b5908c31762536c3e791916 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Oct 8 18:55:39 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Oct 8 18:55:39 2018 +0200 [NETCFGX] NetPropPageProvider: Add Base and Step parameter options. --- dll/win32/netcfgx/propertypage.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dll/win32/netcfgx/propertypage.c b/dll/win32/netcfgx/propertypage.c index 37a731e2ce..1c37083c9f 100644 --- a/dll/win32/netcfgx/propertypage.c +++ b/dll/win32/netcfgx/propertypage.c @@ -40,6 +40,9 @@ typedef struct _PARAMETER BOOL bUpperCase; INT iTextLimit; + + INT iBase; + INT iStep; } PARAMETER, *PPARAMETER; typedef struct _PARAMETER_ARRAY @@ -490,7 +493,17 @@ BuildParameterArray( ParamArray->Array[dwIndex].Type == WORD_TYPE || ParamArray->Array[dwIndex].Type == DWORD_TYPE) { - /* FIXME: Read Base, Min, Max and Step values */ + /* FIXME: Read Min and Max values */ + + GetIntValue(hParamKey, + L"Base", + 10, + &ParamArray->Array[dwIndex].iBase); + + GetIntValue(hParamKey, + L"Step", + 1, + &ParamArray->Array[dwIndex].iStep); } else if (ParamArray->Array[dwIndex].Type == EDIT_TYPE) { @@ -682,6 +695,11 @@ DisplayParameter( EnableWindow(hwndControl, Parameter->bPresent); ShowWindow(hwndControl, SW_SHOW); + if (Parameter->Type == WORD_TYPE || Parameter->Type == DWORD_TYPE) + SendMessage(hwndControl, UDM_SETBASE, Parameter->iBase, 0); + else + SendMessage(hwndControl, UDM_SETBASE, 10, 0); + hwndControl = GetDlgItem(hwnd, IDC_PROPERTY_VALUE_EDIT); EnableWindow(hwndControl, Parameter->bPresent); ShowWindow(hwndControl, SW_SHOW); @@ -881,6 +899,11 @@ OnNotify( TRACE("PSN_APPLY!\n"); WriteParameterArray(hwnd, pParamArray); } + else if (((LPNMHDR)lParam)->code == (UINT)UDN_DELTAPOS) + { + LPNMUPDOWN pUpDown = (LPNMUPDOWN)lParam; + pUpDown->iDelta *= pParamArray->pCurrentParam->iStep; + } }

1 0

01/01: [SYSTEMINFO] Improve uptime source
by Stanislav Motylkov 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=743bbc32b74c23ed5920e… commit 743bbc32b74c23ed5920e8c17a514f20eb6ce320 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 8 16:06:48 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 16:36:17 2018 +0200 [SYSTEMINFO] Improve uptime source --- .../applications/sysutils/systeminfo/systeminfo.c | 46 +++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c index e0adc2d5a7..407553e887 100644 --- a/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c +++ b/modules/rosapps/applications/sysutils/systeminfo/systeminfo.c @@ -179,6 +179,50 @@ FormatDateTime(time_t Time, LPWSTR lpBuf) GetTimeFormatW(LOCALE_SYSTEM_DEFAULT, 0, &SysTime, NULL, lpBuf + i, BUFFER_SIZE - i); } +ULONGLONG GetSecondsQPC(VOID) +{ + LARGE_INTEGER Counter, Frequency; + + QueryPerformanceCounter(&Counter); + QueryPerformanceFrequency(&Frequency); + + return Counter.QuadPart / Frequency.QuadPart; +} + +ULONGLONG GetSeconds(VOID) +{ + ULONGLONG (WINAPI * pGetTickCount64)(VOID); + ULONGLONG Ticks64; + HMODULE hModule = GetModuleHandleW(L"kernel32.dll"); + + pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); + if (pGetTickCount64) + { + return pGetTickCount64() / 1000; + } + + hModule = LoadLibraryW(L"kernel32_vista.dll"); + + if (!hModule) + { + return GetSecondsQPC(); + } + + pGetTickCount64 = (PVOID)GetProcAddress(hModule, "GetTickCount64"); + + if (pGetTickCount64) + { + Ticks64 = pGetTickCount64() / 1000; + } + else + { + Ticks64 = GetSecondsQPC(); + } + + FreeLibrary(hModule); + return Ticks64; +} + /* Show usage */ static VOID @@ -317,7 +361,7 @@ AllSysInfo(VOID) RegCloseKey(hKey); //getting System Up Time - cSeconds = GetTickCount() / 1000; + cSeconds = GetSeconds(); if (!LoadStringW(GetModuleHandle(NULL), IDS_UP_TIME_FORMAT, Tmp, BUFFER_SIZE)) Tmp[0] = L'\0'; swprintf(Buf, Tmp, cSeconds / (60*60*24), (cSeconds / (60*60)) % 24, (cSeconds / 60) % 60, cSeconds % 60);

1 0

04/04: [ROSTESTS] Add a test program. (#890)
by Baruch Rutman 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=acb1f24085e4c58f82594… commit acb1f24085e4c58f8259403c60a8b91d76b435ee Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Sep 28 18:13:08 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 16:17:55 2018 +0200 [ROSTESTS] Add a test program. (#890) Add a test program that shows how the *PSMTextOut() functions draw the strings by a side by side comparison between LpkPSMTextOut() and UserLpkPSMTextOut(). --- modules/rostests/win32/user32/CMakeLists.txt | 1 + .../rostests/win32/user32/psmtest/CMakeLists.txt | 5 + modules/rostests/win32/user32/psmtest/psmtest.c | 284 +++++++++++++++++++++ 3 files changed, 290 insertions(+) diff --git a/modules/rostests/win32/user32/CMakeLists.txt b/modules/rostests/win32/user32/CMakeLists.txt index 097f5261f5..44e44fb78a 100644 --- a/modules/rostests/win32/user32/CMakeLists.txt +++ b/modules/rostests/win32/user32/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(biditext) add_subdirectory(messagebox) add_subdirectory(paintdesktop) +add_subdirectory(psmtest) add_subdirectory(sysicon) add_subdirectory(winstation) diff --git a/modules/rostests/win32/user32/psmtest/CMakeLists.txt b/modules/rostests/win32/user32/psmtest/CMakeLists.txt new file mode 100644 index 0000000000..0045d35fc4 --- /dev/null +++ b/modules/rostests/win32/user32/psmtest/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_executable(psmtest psmtest.c) +set_module_type(psmtest win32gui UNICODE) +add_importlibs(psmtest lpk gdi32 user32 shell32 comctl32 msvcrt kernel32 ntdll) +add_rostests_file(TARGET psmtest SUBDIR suppl) diff --git a/modules/rostests/win32/user32/psmtest/psmtest.c b/modules/rostests/win32/user32/psmtest/psmtest.c new file mode 100644 index 0000000000..1299bcc21f --- /dev/null +++ b/modules/rostests/win32/user32/psmtest/psmtest.c @@ -0,0 +1,284 @@ +/* + * PROJECT: ReactOS Tests + * FILE: rostests/win32/user32/psmtest/psmtest.c + * PURPOSE: Side by side comparison of the undocumented + * LpkPSMTextOut and UserLpkPSMTextOut functions + * + * PROGRAMMER: Program skeleton: https://github.com/TransmissionZero/MinGW-Win32-Application + * Test code by Baruch Rutman + */ + +#include <windows.h> +#include <commctrl.h> +#include <strsafe.h> + +#define IDI_APPICON 101 +#define IDR_ACCELERATOR 103 +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + +/* Prototypes */ +INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags); +INT WINAPI UserLpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags); + +/* Main window class and title */ +static LPCWSTR MainWndClass = L"PSM Test"; + +#define LPK 1 +#define USERLPK 2 +static void DrawTest(HDC hdc, int ypos, LPCWSTR str, DWORD dwFlags, int testtype) +{ + WCHAR Result[100]; + INT ret = 0; + + if (testtype == LPK) + { + ret = LpkPSMTextOut(hdc, 0, ypos, str, (!str) ? 10 : wcslen(str), dwFlags); + StringCchPrintfW(Result, 100, L"Return Value = %d", ret); + TextOutW(hdc, 200, ypos, Result, wcslen(Result)); + } + else if (testtype == USERLPK) + { + ret = UserLpkPSMTextOut(hdc, 400, ypos, str, wcslen(str), dwFlags); + StringCchPrintfW(Result, 100, L"Return Value = %d", ret); + TextOutW(hdc, 600, ypos, Result, wcslen(Result)); + } + +} + +/* Our application entry point */ +int WINAPI +wWinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPTSTR lpszCmdLine, + int nCmdShow) +{ + INITCOMMONCONTROLSEX icc; + HWND hWnd; + HACCEL hAccelerators; + MSG msg; + WNDCLASSEXW wc; + + /* Class for our main window */ + wc.cbSize = sizeof(wc); + wc.style = 0; + wc.lpfnWndProc = &MainWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = (HICON)LoadImage(hInstance, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | + LR_DEFAULTCOLOR | LR_SHARED); + wc.hCursor = (HCURSOR)LoadImageW(NULL, IDC_ARROW, IMAGE_CURSOR, 0, 0, LR_SHARED); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszClassName = MainWndClass; + wc.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 16, 16, LR_DEFAULTCOLOR); + + /* Initialise common controls */ + icc.dwSize = sizeof(icc); + icc.dwICC = ICC_WIN95_CLASSES; + InitCommonControlsEx(&icc); + + /* Register our main window class, or error */ + if (!RegisterClassExW(&wc)) + { + MessageBoxW(NULL, L"Error registering main window class.", L"Error", MB_ICONERROR | MB_OK); + return 0; + } + + hWnd = CreateWindowExW(0, MainWndClass, MainWndClass, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 640, 480, + NULL, NULL, hInstance, NULL); + + /* Create our main window, or error */ + if (!hWnd) + { + MessageBoxW(NULL, L"Error creating main window.", L"Error", MB_ICONERROR | MB_OK); + return 0; + } + + /* Load accelerators */ + hAccelerators = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDR_ACCELERATOR)); + + /* Show main window and force a paint */ + ShowWindow(hWnd, nCmdShow | SW_MAXIMIZE); + UpdateWindow(hWnd); + + /* Main message loop */ + while (GetMessageW(&msg, NULL, 0, 0) > 0) + { + if (!TranslateAcceleratorW(hWnd, hAccelerators, &msg)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + return (int)msg.wParam; +} + +/* Window procedure for our main window */ +LRESULT CALLBACK MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + + case WM_GETMINMAXINFO: + { + /* Prevent our window from being sized too small */ + MINMAXINFO *minMax = (MINMAXINFO*)lParam; + minMax->ptMinTrackSize.x = 220; + minMax->ptMinTrackSize.y = 110; + + return 0; + } + + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hdc = BeginPaint(hWnd, &ps); + + enum { + ALEF = 0x5D0, + BET, + GIMEL, + DALET, + HEY, + VAV, + ZAYIN, + HET, + TET, + YUD, + KAF_SOFIT, + KAF, + LAMED, + MEM_SOFIT, + MEM, + NUN_SOFIT, + NUN, + SAMEKH, + AYIN, + PEY_SOFIT, + PEY, + TSADI_SOFIT, + TSADI, + QOF, + RESH, + SHIN, + TAV + }; + + LOGFONTW font; + HFONT hfont; + WCHAR Test[] = L"&Test Text"; + WCHAR Test2[] = L"&Test\nText"; + WCHAR Test3[] = L"&Test\tText"; + WCHAR Test4[] = L"&Test T&ex&t"; + WCHAR Test5[] = { TET, QOF, SAMEKH, TET, L' ', L'&', BET, DALET, YUD, QOF, HEY, 0 }; + WCHAR Test6[] = L"Test&&Text"; + WCHAR Test7[] = { BET, DALET, YUD, QOF, HEY, L'&', 'T','e','s','t', 0}; + WCHAR Test8[] = L"TestText&"; + WCHAR Test9[] = L"TestText&&"; + WCHAR Test10[] = L"TestText"; + + ZeroMemory(&font, sizeof(LOGFONTW)); + StringCchCopyW(font.lfFaceName, 32, L"Microsoft Sans Serif"); + hfont = CreateFontIndirectW(&font); + SelectObject(hdc, hfont); + SetBkMode(hdc, TRANSPARENT); + + DrawTest(hdc, 0, Test, 0, LPK); + DrawTest(hdc, 20, Test, DT_NOPREFIX, LPK); + DrawTest(hdc, 40, Test, DT_PREFIXONLY, LPK); + DrawTest(hdc, 60, Test2, DT_SINGLELINE, LPK); + DrawTest(hdc, 80, Test2, 0, LPK); + DrawTest(hdc, 100, Test2, DT_CALCRECT, LPK); + DrawTest(hdc, 120, Test3, 0, LPK); + DrawTest(hdc, 140, Test3, DT_EXPANDTABS, LPK); + DrawTest(hdc, 160, NULL, 0, LPK); + DrawTest(hdc, 180, Test4, 0, LPK); + DrawTest(hdc, 200, Test4, DT_NOPREFIX, LPK); + DrawTest(hdc, 220, Test4, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 240, Test5, 0, LPK); + DrawTest(hdc, 260, Test5, DT_NOPREFIX, LPK); + DrawTest(hdc, 280, Test5, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 300, Test5, DT_PREFIXONLY, LPK); + DrawTest(hdc, 320, Test6, 0, LPK); + DrawTest(hdc, 340, Test6, DT_NOPREFIX, LPK); + DrawTest(hdc, 360, Test6, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 380, Test6, DT_PREFIXONLY, LPK); + DrawTest(hdc, 400, Test7, 0, LPK); + DrawTest(hdc, 420, Test7, DT_NOPREFIX, LPK); + DrawTest(hdc, 440, Test7, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 460, Test7, DT_PREFIXONLY, LPK); + DrawTest(hdc, 480, Test7, DT_RTLREADING, LPK); + SetTextAlign(hdc, GetTextAlign(hdc) | TA_RTLREADING); + DrawTest(hdc, 500, Test7, 0, LPK); + SetTextAlign(hdc, GetTextAlign(hdc) & ~TA_RTLREADING); + DrawTest(hdc, 520, Test8, 0, LPK); + DrawTest(hdc, 540, Test8, DT_NOPREFIX, LPK); + DrawTest(hdc, 560, Test8, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 580, Test8, DT_PREFIXONLY, LPK); + DrawTest(hdc, 600, Test9, 0, LPK); + DrawTest(hdc, 620, Test9, DT_NOPREFIX, LPK); + DrawTest(hdc, 640, Test9, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 660, Test9, DT_PREFIXONLY, LPK); + DrawTest(hdc, 680, Test10, 0, LPK); + DrawTest(hdc, 700, Test10, DT_NOPREFIX, LPK); + DrawTest(hdc, 720, Test10, DT_HIDEPREFIX, LPK); + DrawTest(hdc, 740, Test10, DT_PREFIXONLY, LPK); + + TextOutW(hdc, 100, 760, L"LpkPSMTextOut", 13); + + DrawTest(hdc, 0, Test, 0, USERLPK); + DrawTest(hdc, 20, Test, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 40, Test, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 60, Test2, DT_SINGLELINE, USERLPK); + DrawTest(hdc, 80, Test2, 0, USERLPK); + DrawTest(hdc, 100, Test2, DT_CALCRECT, USERLPK); + DrawTest(hdc, 120, Test3, 0, USERLPK); + DrawTest(hdc, 140, Test3, DT_EXPANDTABS, USERLPK); + /* DrawTest(hdc, 160, NULL, 0, USERLPK); */ /* Crash on windows */ + DrawTest(hdc, 180, Test4, 0, USERLPK); + DrawTest(hdc, 200, Test4, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 220, Test4, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 240, Test5, 0, USERLPK); + DrawTest(hdc, 260, Test5, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 280, Test5, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 300, Test5, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 320, Test6, 0, USERLPK); + DrawTest(hdc, 340, Test6, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 360, Test6, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 380, Test6, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 400, Test7, 0, USERLPK); + DrawTest(hdc, 420, Test7, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 440, Test7, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 460, Test7, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 480, Test7, DT_RTLREADING, USERLPK); + SetTextAlign(hdc, GetTextAlign(hdc) | TA_RTLREADING); + DrawTest(hdc, 500, Test7, 0, USERLPK); + SetTextAlign(hdc, GetTextAlign(hdc) & ~TA_RTLREADING); + DrawTest(hdc, 520, Test8, 0, USERLPK); + DrawTest(hdc, 540, Test8, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 560, Test8, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 580, Test8, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 600, Test9, 0, USERLPK); + DrawTest(hdc, 620, Test9, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 640, Test9, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 660, Test9, DT_PREFIXONLY, USERLPK); + DrawTest(hdc, 680, Test10, 0, USERLPK); + DrawTest(hdc, 700, Test10, DT_NOPREFIX, USERLPK); + DrawTest(hdc, 720, Test10, DT_HIDEPREFIX, USERLPK); + DrawTest(hdc, 740, Test10, DT_PREFIXONLY, USERLPK); + + TextOutW(hdc, 500, 760, L"UserLpkPSMTextOut", 17); + + EndPaint(hWnd, &ps); + break; + } + + case WM_DESTROY: + { + PostQuitMessage(0); + return 0; + } + } + return DefWindowProcW(hWnd, msg, wParam, lParam); +}

1 0

03/04: [LPK] Small fix and a related comment. (#890)
by Baruch Rutman 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=87c529a537d1c92610fc2… commit 87c529a537d1c92610fc2a3e41a25079d86db180 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Sep 28 18:10:10 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 16:17:42 2018 +0200 [LPK] Small fix and a related comment. (#890) [LPK][USER32] Fix reading layout checks. - Both functions don't care about DT_RTLREADING flag. - Added a different method to check reading order. [USER32] Remove gcc-build breaker semicolon. --- dll/win32/lpk/lpk.c | 12 +++++++++--- win32ss/user/user32/windows/font.c | 6 +++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index b99e8a3c65..2bbb744c88 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -65,6 +65,7 @@ static void PSM_PrepareToDraw(LPCWSTR str, INT count, LPWSTR new_str, LPINT new_ static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, int offset) { SCRIPT_STRING_ANALYSIS ssa; + DWORD dwSSAFlags = SSA_GLYPHS; int prefix_x; int prefix_end; int pos; @@ -78,8 +79,11 @@ static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, in if (ScriptIsComplex(str, count, SIC_COMPLEX) == S_OK) { + if (GetLayout(hdc) & LAYOUT_RTL || GetTextAlign(hdc) & TA_RTLREADING) + dwSSAFlags |= SSA_RTL; + hr = ScriptStringAnalyse(hdc, str, count, (3 * count / 2 + 16), - -1, SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &ssa); + -1, dwSSAFlags, -1, NULL, NULL, NULL, NULL, NULL, &ssa); } if (hr == S_OK) @@ -328,6 +332,8 @@ LpkGetCharacterPlacement( * without any of these flags the behavior is the string being drawn without the amperstands and * with the underscore. * user32 has an equivalent function - UserLpkPSMTextOut + * + * Note: lpString does not need to be null terminated */ INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags) { @@ -341,7 +347,7 @@ INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, D if (dwFlags & DT_NOPREFIX) { - LpkExtTextOut(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, lpString, cString - 1, NULL, 0); + LpkExtTextOut(hdc, x, y, 0, NULL, lpString, cString, NULL, 0); GetTextExtentPointW(hdc, lpString, cString, &size); return size.cx; } @@ -354,7 +360,7 @@ INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, D PSM_PrepareToDraw(lpString, cString, display_str, &len); if (!(dwFlags & DT_PREFIXONLY)) - LpkExtTextOut(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, display_str, len, NULL, 0); + LpkExtTextOut(hdc, x, y, 0, NULL, display_str, len, NULL, 0); if (!(dwFlags & DT_HIDEPREFIX)) { diff --git a/win32ss/user/user32/windows/font.c b/win32ss/user/user32/windows/font.c index 3d16eddb9a..01b234d2aa 100644 --- a/win32ss/user/user32/windows/font.c +++ b/win32ss/user/user32/windows/font.c @@ -414,7 +414,7 @@ INT WINAPI UserLpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cStrin { SIZE size; TEXTMETRICW tm; - int len, i = 0, j = 0;; + int len, i = 0, j = 0; int prefix_count = 0, prefix_offset = -1; LPWSTR display_str = NULL; int prefix_x, prefix_end; @@ -426,7 +426,7 @@ INT WINAPI UserLpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cStrin if (dwFlags & DT_NOPREFIX) /* Windows ignores this */ { - ExtTextOutW(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, lpString, cString, NULL); + TextOutW(hdc, x, y, lpString, cString); GetTextExtentPointW(hdc, lpString, cString, &size); return size.cx; } @@ -455,7 +455,7 @@ INT WINAPI UserLpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cStrin len = wcslen(display_str); if (!(dwFlags & DT_PREFIXONLY)) - ExtTextOutW(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, display_str, len, NULL); + TextOutW(hdc, x, y, display_str, len); if (!(dwFlags & DT_HIDEPREFIX)) {

1 0

02/04: [USER32] Implement UserLpkPSMTextOut(). (#890)
by Baruch Rutman 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17d4df8102562e22bd8f8… commit 17d4df8102562e22bd8f88af689cf1cb4f986850 Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Sep 28 18:02:38 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 16:16:52 2018 +0200 [USER32] Implement UserLpkPSMTextOut(). (#890) This function is a condensed version of LpkPSMTextOut() (from lpk.dll), but not bug-for-bug equivalent. The main difference is that the underscore is drawn without taking into account any kind of script processing. --- win32ss/user/user32/misc/stubs.c | 8 --- win32ss/user/user32/user32.spec | 2 +- win32ss/user/user32/windows/font.c | 112 +++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 9 deletions(-) diff --git a/win32ss/user/user32/misc/stubs.c b/win32ss/user/user32/misc/stubs.c index b73397d44b..a04ca5eddb 100644 --- a/win32ss/user/user32/misc/stubs.c +++ b/win32ss/user/user32/misc/stubs.c @@ -546,14 +546,6 @@ RecordShutdownReason(DWORD dw0) return FALSE; } -BOOL -WINAPI -UserLpkPSMTextOut(DWORD dw1, DWORD dw2, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) -{ - UNIMPLEMENTED; - return FALSE; -} - BOOL WINAPI UserLpkTabbedTextOut( diff --git a/win32ss/user/user32/user32.spec b/win32ss/user/user32/user32.spec index 2f3ec10bac..dc54a3e22e 100644 --- a/win32ss/user/user32/user32.spec +++ b/win32ss/user/user32/user32.spec @@ -719,7 +719,7 @@ 710 stdcall User32InitializeImmEntryTable(ptr) 711 stdcall UserClientDllInitialize(long long ptr) DllMain 712 stdcall UserHandleGrantAccess(ptr ptr long) NtUserUserHandleGrantAccess -713 stdcall UserLpkPSMTextOut(long long long long long long) +713 stdcall UserLpkPSMTextOut(long long long wstr long long) 714 stdcall UserLpkTabbedTextOut(long long long long long long long long long long long long) 715 stdcall UserRealizePalette(long) 716 stdcall UserRegisterWowHandlers(ptr ptr) diff --git a/win32ss/user/user32/windows/font.c b/win32ss/user/user32/windows/font.c index 6031ae970d..3d16eddb9a 100644 --- a/win32ss/user/user32/windows/font.c +++ b/win32ss/user/user32/windows/font.c @@ -383,3 +383,115 @@ INT WINAPI DrawTextA( HDC hdc, LPCSTR str, INT count, LPRECT rect, UINT flags ) } return DrawTextExA( hdc, (LPSTR)str, count, rect, flags, &dtp ); } + +/*************************************************************************** + * UserLpkPSMTextOut + * + * Stripped down version of DrawText, can only draw single line text and + * Prefix underscore (only on the last found amperstand) + * only flags to be found to be of use in testing: + * + * DT_NOPREFIX - Draw the string as is it without any changes + * DT_HIDEPREFIX - Draw the string without underscore + * DT_PREFIXONLY - Draw only the underscore + * + * without any of these flags the behavior is the string being drawn without the amperstands and + * with the underscore. + * + * lpk has an equivalent function - LpkPSMTextOut + * Notes by testing: + * This function in windows doesn't check if lpString is NULL, which results a crash, + * returns seemingly random values without any logic, and ignores the DT_NOPREFIX value. + * All of these issues don't exist in the LPK version. + * + * Note: lpString does not need to be null terminated + */ +#define PREFIX 38 +#define ALPHA_PREFIX 30 /* Win16: Alphabet prefix */ +#define KANA_PREFIX 31 /* Win16: Katakana prefix */ + +INT WINAPI UserLpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags) +{ + SIZE size; + TEXTMETRICW tm; + int len, i = 0, j = 0;; + int prefix_count = 0, prefix_offset = -1; + LPWSTR display_str = NULL; + int prefix_x, prefix_end; + HPEN hpen; + HPEN oldPen; + + if (!lpString || cString <= 0) + return 0; + + if (dwFlags & DT_NOPREFIX) /* Windows ignores this */ + { + ExtTextOutW(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, lpString, cString, NULL); + GetTextExtentPointW(hdc, lpString, cString, &size); + return size.cx; + } + + display_str = HeapAlloc(GetProcessHeap(), 0, (cString + 1) * sizeof(WCHAR)); + + if (!display_str) + return 0; + + while (i < cString) + { + if (lpString[i] == PREFIX || (iswspace(lpString[i]) && lpString[i] != L' ')) + { + if (i < cString - 1 && lpString[i + 1] == PREFIX) + display_str[j++] = lpString[i++]; + else + i++; + } + else + { + display_str[j++] = lpString[i++]; + } + } + + display_str[j] = L'\0'; + len = wcslen(display_str); + + if (!(dwFlags & DT_PREFIXONLY)) + ExtTextOutW(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, display_str, len, NULL); + + if (!(dwFlags & DT_HIDEPREFIX)) + { + + for (i = 0; i < cString - 1; i++) + { + if (lpString[i] == PREFIX && lpString[i + 1] != PREFIX) + { + prefix_offset = i - prefix_count; + prefix_count++; + } + else if (lpString[i] == PREFIX && lpString[i + 1] == PREFIX) + { + i++; + } + } + + GetTextMetricsW(hdc, &tm); + + if (prefix_offset != -1) + { + GetTextExtentPointW(hdc, display_str, prefix_offset, &size); + prefix_x = x + size.cx; + GetTextExtentPointW(hdc, display_str, prefix_offset + 1, &size); + prefix_end = x + size.cx - 1; + hpen = CreatePen(PS_SOLID, 1, GetTextColor(hdc)); + oldPen = SelectObject(hdc, hpen); + MoveToEx(hdc, prefix_x, y + tm.tmAscent + 1, NULL); + LineTo(hdc, prefix_end, y + tm.tmAscent + 1); + SelectObject(hdc, oldPen); + DeleteObject(hpen); + } + } + + GetTextExtentPointW(hdc, display_str, len + 1, &size); + HeapFree(GetProcessHeap(), 0, display_str); + + return size.cx; +}

1 0

01/04: [LPK] Implement LpkPSMTextOut(). (#890)
by Baruch Rutman 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a494d0583fe3805f1b33e… commit a494d0583fe3805f1b33ed0d65e6a6f7ed8f8e0b Author: Baruch Rutman <peterooch(a)gmail.com> AuthorDate: Fri Sep 28 01:00:31 2018 +0300 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 16:16:40 2018 +0200 [LPK] Implement LpkPSMTextOut(). (#890) - The function is almost fully implemented, but some return values change wildly. The results are mostly compatible to the Windows results. - Remove #ifdef (this is primary ReactOS code). --- dll/win32/lpk/lpk.c | 152 +++++++++++++++++++++++++++++++++++++++++++++--- dll/win32/lpk/lpk.spec | 2 +- dll/win32/lpk/ros_lpk.h | 3 +- dll/win32/lpk/stub.c | 9 --- 4 files changed, 147 insertions(+), 19 deletions(-) diff --git a/dll/win32/lpk/lpk.c b/dll/win32/lpk/lpk.c index b567d744ca..b99e8a3c65 100644 --- a/dll/win32/lpk/lpk.c +++ b/dll/win32/lpk/lpk.c @@ -14,6 +14,97 @@ LPK_LPEDITCONTROL_LIST LpkEditControl = {EditCreate, EditIchToXY, EditMou EditVerifyText, EditNextWord, EditSetMenu, EditProcessMenu, EditCreateCaret, EditAdjustCaret}; +#define PREFIX 38 +#define ALPHA_PREFIX 30 /* Win16: Alphabet prefix */ +#define KANA_PREFIX 31 /* Win16: Katakana prefix */ + +static int PSM_FindLastPrefix(LPCWSTR str, int count) +{ + int i, prefix_count = 0, index = -1; + + for (i = 0; i < count - 1; i++) + { + if (str[i] == PREFIX && str[i + 1] != PREFIX) + { + index = i - prefix_count; + prefix_count++; + } + else if (str[i] == PREFIX && str[i + 1] == PREFIX) + { + i++; + } + } + return index; +} + +static void PSM_PrepareToDraw(LPCWSTR str, INT count, LPWSTR new_str, LPINT new_count) +{ + int len, i = 0, j = 0; + + while (i < count) + { + if (str[i] == PREFIX || (iswspace(str[i]) && str[i] != L' ')) + { + if(i < count - 1 && str[i + 1] == PREFIX) + new_str[j++] = str[i++]; + else + i++; + } + else + { + new_str[j++] = str[i++]; + } + } + + new_str[j] = L'\0'; + len = wcslen(new_str); + *new_count = len; +} + +/* Can be used with also LpkDrawTextEx if it will be implemented */ +static void LPK_DrawUnderscore(HDC hdc, int x, int y, LPCWSTR str, int count, int offset) +{ + SCRIPT_STRING_ANALYSIS ssa; + int prefix_x; + int prefix_end; + int pos; + SIZE size; + HPEN hpen; + HPEN oldPen; + HRESULT hr = S_FALSE; + + if (offset == -1) + return; + + if (ScriptIsComplex(str, count, SIC_COMPLEX) == S_OK) + { + hr = ScriptStringAnalyse(hdc, str, count, (3 * count / 2 + 16), + -1, SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &ssa); + } + + if (hr == S_OK) + { + ScriptStringCPtoX(ssa, offset, FALSE, &pos); + prefix_x = x + pos; + ScriptStringCPtoX(ssa, offset, TRUE, &pos); + prefix_end = x + pos; + ScriptStringFree(&ssa); + } + else + { + GetTextExtentPointW(hdc, str, offset, &size); + prefix_x = x + size.cx; + GetTextExtentPointW(hdc, str, offset + 1, &size); + prefix_end = x + size.cx - 1; + } + hpen = CreatePen(PS_SOLID, 1, GetTextColor(hdc)); + oldPen = SelectObject(hdc, hpen); + MoveToEx(hdc, prefix_x, y, NULL); + LineTo(hdc, prefix_end, y); + SelectObject(hdc, oldPen); + DeleteObject(hpen); +} + BOOL WINAPI DllMain( @@ -196,14 +287,7 @@ LpkGetCharacterPlacement( { int pos = 0; - hr = ScriptStringAnalyse(hdc, lpString, nSet, -#ifdef __REACTOS__ - /* ReactOS r57677 and r57679 */ - (3 * nSet / 2 + 16), -#else - (1.5 * nSet + 16), -#endif - -1, SSA_GLYPHS, -1, + hr = ScriptStringAnalyse(hdc, lpString, nSet, (3 * nSet / 2 + 16), -1, SSA_GLYPHS, -1, NULL, NULL, NULL, NULL, NULL, &ssa); if (hr == S_OK) { @@ -232,3 +316,55 @@ LpkGetCharacterPlacement( return ret; } + +/* Stripped down version of DrawText, can only draw single line text and Prefix underscore + * (only on the last found amperstand) + * only flags to be found to be of use in testing: + * + * DT_NOPREFIX - Draw the string as is without removal of the amperstands and without underscore + * DT_HIDEPREFIX - Draw the string without underscore + * DT_PREFIXONLY - Draw only the underscore + * + * without any of these flags the behavior is the string being drawn without the amperstands and + * with the underscore. + * user32 has an equivalent function - UserLpkPSMTextOut + */ +INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags) +{ + SIZE size; + TEXTMETRICW tm; + int prefix_offset, len; + LPWSTR display_str = NULL; + + if (!lpString || cString <= 0) + return 0; + + if (dwFlags & DT_NOPREFIX) + { + LpkExtTextOut(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, lpString, cString - 1, NULL, 0); + GetTextExtentPointW(hdc, lpString, cString, &size); + return size.cx; + } + + display_str = HeapAlloc(GetProcessHeap(), 0, (cString + 1) * sizeof(WCHAR)); + + if (!display_str) + return 0; + + PSM_PrepareToDraw(lpString, cString, display_str, &len); + + if (!(dwFlags & DT_PREFIXONLY)) + LpkExtTextOut(hdc, x, y, (dwFlags & DT_RTLREADING) ? ETO_RTLREADING : 0, NULL, display_str, len, NULL, 0); + + if (!(dwFlags & DT_HIDEPREFIX)) + { + prefix_offset = PSM_FindLastPrefix(lpString, cString); + GetTextMetricsW(hdc, &tm); + LPK_DrawUnderscore(hdc, x, y + tm.tmAscent + 1, display_str, len, prefix_offset); + } + + GetTextExtentPointW(hdc, display_str, len + 1, &size); + HeapFree(GetProcessHeap(), 0, display_str); + + return size.cx; +} diff --git a/dll/win32/lpk/lpk.spec b/dll/win32/lpk/lpk.spec index 910d3dc65d..1ef05e1a74 100644 --- a/dll/win32/lpk/lpk.spec +++ b/dll/win32/lpk/lpk.spec @@ -6,6 +6,6 @@ @ stdcall LpkExtTextOut(long long long long ptr wstr long ptr long) @ stdcall LpkGetCharacterPlacement(long wstr long long ptr long long) @ stdcall LpkGetTextExtentExPoint(long long long long long long long long long) -@ stdcall LpkPSMTextOut(long long long long long long) +@ stdcall LpkPSMTextOut(long long long wstr long long) @ stdcall LpkUseGDIWidthCache(long long long long long) @ stdcall ftsWordBreak(long long long long long) diff --git a/dll/win32/lpk/ros_lpk.h b/dll/win32/lpk/ros_lpk.h index 0fb1fe341d..ecb3ef91fc 100644 --- a/dll/win32/lpk/ros_lpk.h +++ b/dll/win32/lpk/ros_lpk.h @@ -66,7 +66,6 @@ DWORD WINAPI LpkTabbedTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD BOOL WINAPI LpkDllInitialize (HANDLE hDll, DWORD dwReason, LPVOID lpReserved); DWORD WINAPI LpkDrawTextEx(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9, DWORD x10); DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6,DWORD x7,DWORD x8,DWORD x9); -DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6); DWORD WINAPI LpkUseGDIWidthCache(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); DWORD WINAPI ftsWordBreak(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5); @@ -77,6 +76,8 @@ BOOL WINAPI LpkExtTextOut(HDC hdc, int x, int y, UINT fuOptions, const RECT *lpr DWORD WINAPI LpkGetCharacterPlacement(HDC hdc, LPCWSTR lpString, INT uCount, INT nMaxExtent, GCP_RESULTSW *lpResults, DWORD dwFlags, DWORD dwUnused); + +INT WINAPI LpkPSMTextOut(HDC hdc, int x, int y, LPCWSTR lpString, int cString, DWORD dwFlags); /* bidi.c */ #define WINE_GCPW_FORCE_LTR 0 diff --git a/dll/win32/lpk/stub.c b/dll/win32/lpk/stub.c index 51d8eda0e4..b601a35868 100644 --- a/dll/win32/lpk/stub.c +++ b/dll/win32/lpk/stub.c @@ -48,15 +48,6 @@ DWORD WINAPI LpkGetTextExtentExPoint(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x return 0; } -/* - * @unimplemented - */ -DWORD WINAPI LpkPSMTextOut(DWORD x1,DWORD x2,DWORD x3,DWORD x4,DWORD x5,DWORD x6) -{ - UNIMPLEMENTED - return 0; -} - /* * @unimplemented */

1 0

01/01: [APPWIZ] Update russian translation (#917)
by Stanislav Motylkov 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3179a0771c30e0d7bcc7… commit b3179a0771c30e0d7bcc7839899811558e0105c4 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Oct 8 15:53:11 2018 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:53:11 2018 +0200 [APPWIZ] Update russian translation (#917) --- dll/cpl/appwiz/lang/ru-RU.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/appwiz/lang/ru-RU.rc b/dll/cpl/appwiz/lang/ru-RU.rc index 4c7e2fd1b7..f440f30ace 100644 --- a/dll/cpl/appwiz/lang/ru-RU.rc +++ b/dll/cpl/appwiz/lang/ru-RU.rc @@ -78,8 +78,8 @@ BEGIN IDS_DOWNLOADING "Загрузка..." IDS_INSTALLING "Установка..." IDS_INVALID_SHA "Ошибка контрольной суммы загруженного файла. Прерывание установки поврежденного файла." - IDS_NEW_INTERNET_SHORTCUT "New Internet Shortcut" - IDS_DWL_FAILED "Failed to download the Gecko package. Make sure you have an internet connection in order to download it. The setup will proceed without installing Gecko." - IDS_CANTMAKEINETSHORTCUT "Failed to create internet shortcut." - IDS_CANTMAKESHORTCUT "Failed to create shortcut." + IDS_NEW_INTERNET_SHORTCUT "Новый ярлык интернета" + IDS_DWL_FAILED "Не удалось скачать пакет установки Gecko, проверьте ваше подключение к сети интернет. Установка будет продолжена без включения пакета Gecko." + IDS_CANTMAKEINETSHORTCUT "Не удалось создать ярлык интернета." + IDS_CANTMAKESHORTCUT "Не удалось создать ярлык." END

1 0

01/01: [FONT][WIN32SS] Use GOT_PENALTY macro to specify the penalty (#910)
by Katayama Hirofumi MZ 08 Oct '18

08 Oct '18

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=951335cd15be0c92d5494… commit 951335cd15be0c92d5494e4ca8e1dfce2aa2a634 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Oct 8 21:38:38 2018 +0900 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Oct 8 14:38:38 2018 +0200 [FONT][WIN32SS] Use GOT_PENALTY macro to specify the penalty (#910) Define and use GOT_PENALTY macro to specify the font penalty info. CORE-5519 --- win32ss/gdi/ntgdi/freetype.c | 67 ++++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 5377d6eb18..7bacfb66ec 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -4346,6 +4346,8 @@ ftGdiGetFontData( return Result; } +#define GOT_PENALTY(name, value) Penalty += (value) + // NOTE: See Table 1. of https://msdn.microsoft.com/en-us/library/ms969909.aspx static UINT GetFontPenalty(const LOGFONTW * LogFont, @@ -4387,18 +4389,19 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* CharSet Penalty 65000 */ /* Requested charset does not match the candidate's. */ - Penalty += 65000; + GOT_PENALTY("CharSet", 65000); } else { if (UserCharSet != TM->tmCharSet) { - /* UNDOCUMENTED */ - Penalty += 100; + /* UNDOCUMENTED: Not user language */ + GOT_PENALTY("UNDOCUMENTED:NotUserLanguage", 100); + if (ANSI_CHARSET != TM->tmCharSet) { - /* UNDOCUMENTED */ - Penalty += 100; + /* UNDOCUMENTED: Not ANSI charset */ + GOT_PENALTY("UNDOCUMENTED:NotAnsiCharSet", 100); } } } @@ -4416,7 +4419,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* OutputPrecision Penalty 19000 */ /* Requested OUT_STROKE_PRECIS, but the device can't do it or the candidate is not a vector font. */ - Penalty += 19000; + GOT_PENALTY("OutputPrecision", 19000); } break; default: @@ -4425,7 +4428,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* OutputPrecision Penalty 19000 */ /* Or OUT_STROKE_PRECIS not requested, and the candidate is a vector font that requires GDI support. */ - Penalty += 19000; + GOT_PENALTY("OutputPrecision", 19000); } break; } @@ -4440,7 +4443,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* FixedPitch Penalty 15000 */ /* Requested a fixed pitch font, but the candidate is a variable pitch font. */ - Penalty += 15000; + GOT_PENALTY("FixedPitch", 15000); } } if (Byte == VARIABLE_PITCH) @@ -4450,7 +4453,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* PitchVariable Penalty 350 */ /* Requested a variable pitch font, but the candidate is not a variable pitch font. */ - Penalty += 350; + GOT_PENALTY("PitchVariable", 350); } } @@ -4461,7 +4464,7 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* DefaultPitchFixed Penalty 1 */ /* Requested DEFAULT_PITCH, but the candidate is fixed pitch. */ - Penalty += 1; + GOT_PENALTY("DefaultPitchFixed", 1); } } @@ -4487,7 +4490,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* FaceName Penalty 10000 */ /* Requested a face name, but the candidate's face name does not match. */ - Penalty += 10000; + GOT_PENALTY("FaceName", 10000); } } @@ -4498,13 +4501,13 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* Family Penalty 9000 */ /* Requested a family, but the candidate's family is different. */ - Penalty += 9000; + GOT_PENALTY("Family", 9000); } if ((TM->tmPitchAndFamily & 0xF0) == FF_DONTCARE) { /* FamilyUnknown Penalty 8000 */ /* Requested a family, but the candidate has no family. */ - Penalty += 8000; + GOT_PENALTY("FamilyUnknown", 8000); } } @@ -4519,11 +4522,11 @@ GetFontPenalty(const LOGFONTW * LogFont, /* HeightBigger Penalty 600 */ /* The candidate is a nonvector font and is bigger than the requested height. */ - Penalty += 600; + GOT_PENALTY("HeightBigger", 600); /* HeightBiggerDifference Penalty 150 */ /* The candidate is a raster font and is larger than the requested height. Penalty * height difference */ - Penalty += 150 * labs(TM->tmHeight - labs(LogFont->lfHeight)); + GOT_PENALTY("HeightBiggerDifference", 150 * labs(TM->tmHeight - labs(LogFont->lfHeight))); fNeedScaling = TRUE; } @@ -4532,7 +4535,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* HeightSmaller Penalty 150 */ /* The candidate is a raster font and is smaller than the requested height. Penalty * height difference */ - Penalty += 150 * labs(TM->tmHeight - labs(LogFont->lfHeight)); + GOT_PENALTY("HeightSmaller", 150 * labs(TM->tmHeight - labs(LogFont->lfHeight))); fNeedScaling = TRUE; } @@ -4548,7 +4551,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* FamilyUnlikely Penalty 50 */ /* Requested a roman/modern/swiss family, but the candidate is decorative/script. */ - Penalty += 50; + GOT_PENALTY("FamilyUnlikely", 50); break; default: break; @@ -4561,7 +4564,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* FamilyUnlikely Penalty 50 */ /* Or requested decorative/script, and the candidate is roman/modern/swiss. */ - Penalty += 50; + GOT_PENALTY("FamilyUnlikely", 50); break; default: break; @@ -4577,7 +4580,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* Width Penalty 50 */ /* Requested a nonzero width, but the candidate's width doesn't match. Penalty * width difference */ - Penalty += 50 * labs(LogFont->lfWidth - TM->tmAveCharWidth); + GOT_PENALTY("Width", 50 * labs(LogFont->lfWidth - TM->tmAveCharWidth)); if (!(TM->tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR))) fNeedScaling = TRUE; @@ -4588,7 +4591,7 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* SizeSynth Penalty 50 */ /* The candidate is a raster font that needs scaling by GDI. */ - Penalty += 50; + GOT_PENALTY("SizeSynth", 50); } if (!!LogFont->lfItalic != !!TM->tmItalic) @@ -4599,14 +4602,14 @@ GetFontPenalty(const LOGFONTW * LogFont, /* Requested font and candidate font do not agree on italic status, and the desired result cannot be simulated. */ /* Adjusted to 40 to satisfy (Oblique Penalty > Book Penalty). */ - Penalty += 40; + GOT_PENALTY("Italic", 40); } else if (LogFont->lfItalic && !ItalicFromStyle(style_name)) { /* ItalicSim Penalty 1 */ /* Requested italic font but the candidate is not italic, although italics can be simulated. */ - Penalty += 1; + GOT_PENALTY("ItalicSim", 1); } } @@ -4617,7 +4620,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* NotTrueType Penalty 4 */ /* Requested OUT_TT_PRECIS, but the candidate is not a TrueType font. */ - Penalty += 4; + GOT_PENALTY("NotTrueType", 4); } } @@ -4629,7 +4632,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* Weight Penalty 3 */ /* The candidate's weight does not match the requested weight. Penalty * (weight difference/10) */ - Penalty += 3 * (labs(Long - TM->tmWeight) / 10); + GOT_PENALTY("Weight", 3 * (labs(Long - TM->tmWeight) / 10)); } if (!LogFont->lfUnderline && TM->tmUnderlined) @@ -4637,7 +4640,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* Underline Penalty 3 */ /* Requested font has no underline, but the candidate is underlined. */ - Penalty += 3; + GOT_PENALTY("Underline", 3); } if (!LogFont->lfStrikeOut && TM->tmStruckOut) @@ -4645,7 +4648,7 @@ GetFontPenalty(const LOGFONTW * LogFont, /* StrikeOut Penalty 3 */ /* Requested font has no strike-out, but the candidate is struck out. */ - Penalty += 3; + GOT_PENALTY("StrikeOut", 3); } /* Is the candidate a non-vector font? */ @@ -4656,14 +4659,14 @@ GetFontPenalty(const LOGFONTW * LogFont, /* VectorHeightSmaller Penalty 2 */ /* Candidate is a vector font that is smaller than the requested height. Penalty * height difference */ - Penalty += 2 * labs(TM->tmHeight - LogFont->lfHeight); + GOT_PENALTY("VectorHeightSmaller", 2 * labs(TM->tmHeight - LogFont->lfHeight)); } if (LogFont->lfHeight != 0 && TM->tmHeight > LogFont->lfHeight) { /* VectorHeightBigger Penalty 1 */ /* Candidate is a vector font that is bigger than the requested height. Penalty * height difference */ - Penalty += 1 * labs(TM->tmHeight - LogFont->lfHeight); + GOT_PENALTY("VectorHeightBigger", 1 * labs(TM->tmHeight - LogFont->lfHeight)); } } @@ -4671,7 +4674,7 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* DeviceFavor Penalty 2 */ /* Extra penalty for all nondevice fonts. */ - Penalty += 2; + GOT_PENALTY("DeviceFavor", 2); } if (TM->tmAveCharWidth >= 5 && TM->tmHeight >= 5) @@ -4680,13 +4683,13 @@ GetFontPenalty(const LOGFONTW * LogFont, { /* Aspect Penalty 30 */ /* The aspect rate is >= 3. It seems like a bad font. */ - Penalty += ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30; + GOT_PENALTY("Aspect", ((TM->tmAveCharWidth / TM->tmHeight) - 2) * 30); } else if (TM->tmHeight / TM->tmAveCharWidth >= 3) { /* Aspect Penalty 30 */ /* The aspect rate is >= 3. It seems like a bad font. */ - Penalty += ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30; + GOT_PENALTY("Aspect", ((TM->tmHeight / TM->tmAveCharWidth) - 2) * 30); } } @@ -4703,6 +4706,8 @@ GetFontPenalty(const LOGFONTW * LogFont, return Penalty; /* success */ } +#undef GOT_PENALTY + static __inline VOID FindBestFontFromList(FONTOBJ **FontObj, ULONG *MatchPenalty, const LOGFONTW *LogFont,

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