Ros-diffs June 2019

ros-diffs@reactos.org

28 participants
288 discussions

[reactos] 01/01: Add an Alpha note for new users in the README (#1270)
by Ender Ossel 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bfab2d457da33934998d… commit 8bfab2d457da33934998d2821d582278b94e597a Author: Ender Ossel <EnderNator10(a)users.noreply.github.com> AuthorDate: Thu Jun 6 18:01:48 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 18:01:48 2019 +0200 Add an Alpha note for new users in the README (#1270) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 759059bb38b..ddfeb5e3675 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,8 @@ The ReactOS project, although currently focused on Windows Server 2003 compatibi The code of ReactOS is licensed under [GNU GPL 2.0](https://github.com/reactos/reactos/blob/master/COPYING). +***ReactOS is currently an Alpha quality operating system. This means that ReactOS is under heavy development, things may not work well and it can corrupt the data present on your hard disk. It is recommended to test ReactOS on a virtual machine or on a computer with no sensitive and credential data!*** + ## Building [![appveyor.badge]][appveyor.link] [![travis.badge]][travis.link] [![rosbewin.badge]][rosbewin.link] [![rosbeunix.badge]][rosbeunix.link] [![coverity.badge]][coverity.link]

1 0

[reactos] 01/01: [ROSTESTS] Add missing '\n' to a few skip()
by Serge Gautherie 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=73938ee96f06d493c6c94… commit 73938ee96f06d493c6c94053d8df42e0454b0aa5 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Tue Jun 4 01:14:31 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 17:33:59 2019 +0200 [ROSTESTS] Add missing '\n' to a few skip() --- modules/rostests/apitests/kernel32/MultiByteToWideChar.c | 2 +- modules/rostests/apitests/kernel32/TunnelCache.c | 2 +- modules/rostests/apitests/ntdll/NtContinue.c | 2 +- modules/rostests/apitests/shell32/CUserNotification.cpp | 2 +- modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c | 2 +- modules/rostests/kmtests/ntos_ke/KeEvent.c | 2 +- modules/rostests/kmtests/ntos_ob/ObReference.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c index 830e348a45d..e5213d3fc18 100644 --- a/modules/rostests/apitests/kernel32/MultiByteToWideChar.c +++ b/modules/rostests/apitests/kernel32/MultiByteToWideChar.c @@ -254,7 +254,7 @@ START_TEST(MultiByteToWideChar) trace("This test is designed for Windows 10+ and ReactOS.\n" "It is expected to report some failures on older Windows versions.\n"); #if 0 - skip(""); + skip("\n"); return; #endif } diff --git a/modules/rostests/apitests/kernel32/TunnelCache.c b/modules/rostests/apitests/kernel32/TunnelCache.c index 23632a7157b..9e67e74404d 100644 --- a/modules/rostests/apitests/kernel32/TunnelCache.c +++ b/modules/rostests/apitests/kernel32/TunnelCache.c @@ -17,7 +17,7 @@ Test_VeryLongTests(void) CHAR OldDir[MAX_PATH]; FILETIME FileTime, File1Time; - win_skip("Too long, see: ROSTESTS-177"); + win_skip("Too long, see: ROSTESTS-177\n"); return; /* Create a blank test directory */ diff --git a/modules/rostests/apitests/ntdll/NtContinue.c b/modules/rostests/apitests/ntdll/NtContinue.c index e2b254beda1..0a57bab7cd8 100644 --- a/modules/rostests/apitests/ntdll/NtContinue.c +++ b/modules/rostests/apitests/ntdll/NtContinue.c @@ -123,7 +123,7 @@ void check(CONTEXT * pContext) START_TEST(NtContinue) { #ifdef __RUNTIME_CHECKS__ - skip("This test breaks MSVC runtime checks!"); + skip("This test breaks MSVC runtime checks!\n"); return; #endif /* __RUNTIME_CHECKS__ */ initrand(); diff --git a/modules/rostests/apitests/shell32/CUserNotification.cpp b/modules/rostests/apitests/shell32/CUserNotification.cpp index 1cb3dff45ed..f9207d83f30 100644 --- a/modules/rostests/apitests/shell32/CUserNotification.cpp +++ b/modules/rostests/apitests/shell32/CUserNotification.cpp @@ -196,7 +196,7 @@ START_TEST(CUserNotification) ok(hThread != NULL, "CreateThread failed with error 0x%lu\n", GetLastError()); if (!hThread) { - skip("Could not create the CUserNotification test thread!"); + skip("Could not create the CUserNotification test thread!\n"); return; } diff --git a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c index 60830532354..0393dbfbbb5 100644 --- a/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c +++ b/modules/rostests/apitests/win32nt/ntgdi/NtGdiEnumFontOpen.c @@ -22,7 +22,7 @@ START_TEST(NtGdiEnumFontOpen) ok(idEnum != 0, "idEnum was 0.\n"); if (idEnum == 0) { - skip("idEnum == 0"); + skip("idEnum == 0\n"); return; } diff --git a/modules/rostests/kmtests/ntos_ke/KeEvent.c b/modules/rostests/kmtests/ntos_ke/KeEvent.c index 2cf19026c88..65e3a0830c2 100644 --- a/modules/rostests/kmtests/ntos_ke/KeEvent.c +++ b/modules/rostests/kmtests/ntos_ke/KeEvent.c @@ -214,7 +214,7 @@ TestEventConcurrent( Priority = KeQueryPriorityThread(Threads[i].Thread); ok_eq_long(Priority, max(min(8L + PriorityIncrement + i, 15L), 8L)); /* replace the thread with the current thread - which will never signal */ - if (!skip((Status & 0x3F) < ThreadCount, "Index out of bounds")) + if (!skip((Status & 0x3F) < ThreadCount, "Index out of bounds\n")) ThreadObjects[Status & 0x3F] = Thread; Status = KeWaitForMultipleObjects(ThreadCount, ThreadObjects, WaitAny, Executive, KernelMode, FALSE, &ShortTimeout, WaitBlock); ok_eq_hex(Status, STATUS_TIMEOUT); diff --git a/modules/rostests/kmtests/ntos_ob/ObReference.c b/modules/rostests/kmtests/ntos_ob/ObReference.c index 2989b8cdeb3..a0305cd9732 100644 --- a/modules/rostests/kmtests/ntos_ob/ObReference.c +++ b/modules/rostests/kmtests/ntos_ob/ObReference.c @@ -212,7 +212,7 @@ START_TEST(ObReference) ok_eq_hex(Status, STATUS_SUCCESS); ok(DirectoryHandle != NULL, "DirectoryHandle = NULL\n"); - if (!skip(Status == STATUS_SUCCESS && DirectoryHandle, "Cannot proceed without an object")) + if (!skip(Status == STATUS_SUCCESS && DirectoryHandle, "Cannot proceed without an object\n")) { TestReference(DirectoryHandle, pName, pNameUpper, FALSE, Tests[i].AdditionalReferences, (Tests[i].Flags & OBJ_PERMANENT) != 0); /* try again for good measure */

1 0

[reactos] 03/03: [BROWSEUI] Fix CSHEnumClassesOfCategories::Initialize() parameters validation. (#1559) CORE-11711
by Hermès Bélusca-Maïto 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fdfef818ef5dcb4d0132d… commit fdfef818ef5dcb4d0132da8fe4e91eb00415db24 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jun 6 16:33:44 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 17:07:38 2019 +0200 [BROWSEUI] Fix CSHEnumClassesOfCategories::Initialize() parameters validation. (#1559) CORE-11711 --- .../shellbars/CSHEnumClassesOfCategories.cpp | 30 ++++++++++++++-------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp b/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp index c2915a725fc..7f448a2f1ce 100644 --- a/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp +++ b/dll/win32/browseui/shellbars/CSHEnumClassesOfCategories.cpp @@ -254,17 +254,16 @@ HRESULT CSHEnumClassesOfCategories::Initialize(ULONG cImplemented, CATID *pImple if (!fDsa) return E_FAIL; - if (cRequired > 0 || cImplemented == (ULONG)-1) - { - FIXME("Implement required categories class enumeration\n"); - return E_NOTIMPL; - } - - // Don't do anything if we have nothing - if (cRequired == 0 && cImplemented == (ULONG)-1) - return E_FAIL; + // Parameter validation: + // - We must have at least one category to manage. + // - The array pointers must not be NULL if there is a non-zero + // element count specified for them. + if (cImplemented == 0 && cRequired == 0) + return E_INVALIDARG; + if ((cImplemented && !pImplemented) || (cRequired && !pRequired)) + return E_INVALIDARG; - // For each implemented category, create a cache and add it to our local DSA + // For each implemented category, create a cache and add it to our local DSA. for (i = 0; i < cImplemented; i++) { CComCatCachedCategory cachedCat; @@ -273,6 +272,17 @@ HRESULT CSHEnumClassesOfCategories::Initialize(ULONG cImplemented, CATID *pImple return hr; cachedCat.WriteCacheToDSA(fDsa); } + + // TODO: Implement caching of the required categories. + if (cRequired > 0) + { + FIXME("Implement required categories class enumeration\n"); + + // Only fail in case we didn't look at the implemented categories. + if (cImplemented == 0) + return E_NOTIMPL; + } + return S_OK; }

1 0

[reactos] 02/03: [BROWSEUI_APITEST] Add a test for SHEnumClassesOfCategories. (#1559) CORE-11711
by Serge Gautherie 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6d1efe73165b4cc5b50f… commit d6d1efe73165b4cc5b50f61163fa8660038a20b9 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu May 9 07:03:49 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 17:07:08 2019 +0200 [BROWSEUI_APITEST] Add a test for SHEnumClassesOfCategories. (#1559) CORE-11711 --- modules/rostests/apitests/browseui/CMakeLists.txt | 1 + .../browseui/SHEnumClassesOfCategories.cpp | 247 +++++++++++++++++++++ modules/rostests/apitests/browseui/testlist.c | 4 +- 3 files changed, 250 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/browseui/CMakeLists.txt b/modules/rostests/apitests/browseui/CMakeLists.txt index e60f6599616..053ca9776c5 100644 --- a/modules/rostests/apitests/browseui/CMakeLists.txt +++ b/modules/rostests/apitests/browseui/CMakeLists.txt @@ -12,6 +12,7 @@ include_directories( list(APPEND SOURCE ACListISF.cpp IACLCustomMRU.cpp + SHEnumClassesOfCategories.cpp SHExplorerParseCmdLine.c testlist.c) diff --git a/modules/rostests/apitests/browseui/SHEnumClassesOfCategories.cpp b/modules/rostests/apitests/browseui/SHEnumClassesOfCategories.cpp new file mode 100644 index 00000000000..e7e83d20449 --- /dev/null +++ b/modules/rostests/apitests/browseui/SHEnumClassesOfCategories.cpp @@ -0,0 +1,247 @@ +/* + * PROJECT: ReactOS API Tests + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Test for SHEnumClassesOfCategories + * COPYRIGHT: Copyright 2019 Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> + */ + +/* +TODO, if they make sense: +* Test more than 1 Implemented/Required. + And maybe not "matching" ones. +* Check pEnumGUID after S_OK cases. +*/ + +#include <apitest.h> + +#include <shlobj.h> +#include <atlbase.h> + +typedef HRESULT (WINAPI *SHENUMCLASSESOFCATEGORIES)(ULONG cImplemented, CATID *pImplemented, ULONG cRequired, CATID *pRequired, IEnumGUID **out); + +static SHENUMCLASSESOFCATEGORIES pSHEnumClassesOfCategories; + +START_TEST(SHEnumClassesOfCategories) +{ + HRESULT hr; + HMODULE hbrowseui; + CATID CategoryImplemented, CategoryRequired; + CComPtr<IEnumGUID> pEnumGUID; + + // Set up. + + hbrowseui = LoadLibraryA("browseui.dll"); + ok(hbrowseui != NULL, "LoadLibraryA() failed\n"); + if (!hbrowseui) + { + skip("No dll\n"); + return; + } + + pSHEnumClassesOfCategories = (SHENUMCLASSESOFCATEGORIES)GetProcAddress(hbrowseui, MAKEINTRESOURCEA(136)); + ok(pSHEnumClassesOfCategories != NULL, "GetProcAddress() failed\n"); + if (!pSHEnumClassesOfCategories) + { + skip("No function, as on NT 6.1+\n"); + return; + } + + // Test (mostly) invalid arguments. + + // Implemented, '(ULONG)-1, NULL'. + // Keep this odd case, as ReactOS used to "implement" it. + + // hr = pSHEnumClassesOfCategories((ULONG)-1, NULL, 0, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories((ULONG)-1, NULL, 0, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + CategoryRequired = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories((ULONG)-1, NULL, 1, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories((ULONG)-1, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + // Implemented, '0, NULL'. + + // hr = pSHEnumClassesOfCategories(0, NULL, 0, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(0, NULL, 0, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + // CategoryRequired = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + // The following case duplicates a later one. + // hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + // ok_long(hr, S_OK); + // ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + // pEnumGUID = NULL; + + // Implemented, '0, &CategoryImplemented'. + + CategoryImplemented = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 0, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + CategoryRequired = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 1, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_DeskBand, "CategoryImplemented was modified\n"); + ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryRequired = CATID_InfoBand; + // hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 1, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(0, &CategoryImplemented, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_DeskBand, "CategoryImplemented was modified\n"); + ok(CategoryRequired == CATID_InfoBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + // Implemented, '1, NULL'. + + // hr = pSHEnumClassesOfCategories(1, NULL, 0, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(1, NULL, 0, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + CategoryRequired = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(1, NULL, 1, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(1, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + // Required, '0, &CategoryRequired'. + + CategoryRequired = CATID_DeskBand; + + CategoryImplemented = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_DeskBand, "CategoryImplemented was modified\n"); + ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryImplemented = CATID_InfoBand; + // hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, &CategoryRequired, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_InfoBand, "CategoryImplemented was modified\n"); + ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + // Required, '1, NULL'. + + // hr = pSHEnumClassesOfCategories(0, NULL, 1, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(0, NULL, 1, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + CategoryImplemented = CATID_DeskBand; + // hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 1, NULL, NULL); + // ok_long(hr, E_INVALIDARG); + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 1, NULL, &pEnumGUID); + ok_long(hr, E_INVALIDARG); + + // Out, 'NULL'. + // Previous similar checks are commented out, for usual use. + + CategoryImplemented = CATID_DeskBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, NULL); + ok_long(hr, E_INVALIDARG); + + CategoryRequired = CATID_DeskBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 1, &CategoryRequired, NULL); + ok_long(hr, E_INVALIDARG); + + // Test success. + // CATID_* from sdk/include/psdk/shlguid.h. + // See also modules/rostests/winetests/shlwapi/clsid.c. + + // Each CATID, as Implemented. + + CategoryImplemented = CATID_BrowsableShellExt; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_BrowsableShellExt, "CategoryImplemented was modified\n"); + pEnumGUID = NULL; + + CategoryImplemented = CATID_BrowseInPlace; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_BrowseInPlace, "CategoryImplemented was modified\n"); + pEnumGUID = NULL; + + CategoryImplemented = CATID_DeskBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_DeskBand, "CategoryImplemented was modified\n"); + pEnumGUID = NULL; + + CategoryImplemented = CATID_InfoBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_InfoBand, "CategoryImplemented was modified\n"); + pEnumGUID = NULL; + + CategoryImplemented = CATID_CommBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 0, NULL, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_CommBand, "CategoryImplemented was modified\n"); + pEnumGUID = NULL; + + // Each CATID, as Required. + + CategoryRequired = CATID_BrowsableShellExt; + hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryRequired == CATID_BrowsableShellExt, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryRequired = CATID_BrowseInPlace; + hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryRequired == CATID_BrowseInPlace, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryRequired = CATID_DeskBand; + hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryRequired = CATID_InfoBand; + hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryRequired == CATID_InfoBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + CategoryRequired = CATID_CommBand; + hr = pSHEnumClassesOfCategories(0, NULL, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryRequired == CATID_CommBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + // Same CATID, as Implemented and Required. + + CategoryImplemented = CATID_DeskBand; + CategoryRequired = CATID_DeskBand; + hr = pSHEnumClassesOfCategories(1, &CategoryImplemented, 1, &CategoryRequired, &pEnumGUID); + ok_long(hr, S_OK); + ok(CategoryImplemented == CATID_DeskBand, "CategoryImplemented was modified\n"); + ok(CategoryRequired == CATID_DeskBand, "CategoryRequired was modified\n"); + pEnumGUID = NULL; + + // Clean up. + + ok(FreeLibrary(hbrowseui) != 0, "FreeLibrary() failed\n"); +} diff --git a/modules/rostests/apitests/browseui/testlist.c b/modules/rostests/apitests/browseui/testlist.c index 60a522860c9..9c5d8dfd204 100644 --- a/modules/rostests/apitests/browseui/testlist.c +++ b/modules/rostests/apitests/browseui/testlist.c @@ -5,14 +5,14 @@ extern void func_ACListISF(void); extern void func_IACLCustomMRU(void); +extern void func_SHEnumClassesOfCategories(void); extern void func_SHExplorerParseCmdLine(void); const struct test winetest_testlist[] = { { "ACListISF", func_ACListISF }, { "IACLCustomMRU", func_IACLCustomMRU }, + { "SHEnumClassesOfCategories", func_SHEnumClassesOfCategories }, { "SHExplorerParseCmdLine", func_SHExplorerParseCmdLine }, - { 0, 0 } }; -

1 0

[reactos] 01/03: [BROWSEUI] browseui.spec: Fix SHEnumClassesOfCategories() parameters. (#1559)
by Serge Gautherie 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1f8250f700f5cd59c7bfe… commit 1f8250f700f5cd59c7bfee15ccf0bd827f81682e Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Thu May 9 07:03:49 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 17:06:52 2019 +0200 [BROWSEUI] browseui.spec: Fix SHEnumClassesOfCategories() parameters. (#1559) --- dll/win32/browseui/browseui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/browseui/browseui.spec b/dll/win32/browseui/browseui.spec index 9bc26e378e5..64a561e89ff 100644 --- a/dll/win32/browseui/browseui.spec +++ b/dll/win32/browseui/browseui.spec @@ -26,6 +26,6 @@ 133 stdcall -noname Channel_QuickLaunch() 134 stdcall -noname SHGetNavigateTarget(long long long long) 135 stdcall -noname GetInfoTip(ptr long wstr long) -136 stdcall -noname SHEnumClassesOfCategories(long long long long long) +136 stdcall -noname SHEnumClassesOfCategories(long ptr long ptr ptr) 137 stdcall -noname SHWriteClassesOfCategories(long long long long long long long) 138 stdcall -noname SHIsExplorerBrowser()

1 0

[reactos] 01/01: [WIN32SS][FREETYPE] Avoid performance regression CORE-16020
by Joachim Henze 06 Jun '19

06 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f482af0a876d269cca64… commit 8f482af0a876d269cca64288f114eb1fe1180ef0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Thu Jun 6 02:24:20 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Thu Jun 6 02:24:20 2019 +0200 [WIN32SS][FREETYPE] Avoid performance regression CORE-16020 by reverting essential parts of "Font rotation at arbitrary angles" which was once committed in several steps: Initial commit (PR#1207) 0.4.12-dev-243-g f757a135192c02a3c41d8da47eb9dba21d34ebd1 broke font rendering for GTK apps CORE-15623 Second commit (PR#1238) 0.4.12-dev-558-g 64987cf2731f9762d0316274bf7877a9bd3d88ba restored font rendering in GTK apps but introduced slowdown CORE-16020 Katayama agreed to the temporal revert and will try to come up later with a performance optimized version. We revert in 0.4.12-RC and 0.4.13-dev. The revert will cause failure-increases in gdi32:TextTransform https://reactos.org/testman/compare.php?ids=67898,67901 --- win32ss/gdi/ntgdi/freetype.c | 475 ++++++++++++++++--------------------------- win32ss/gdi/ntgdi/xformobj.c | 11 +- 2 files changed, 179 insertions(+), 307 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3b653270714..6a2fae1ed71 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -740,16 +740,33 @@ FtMatrixFromMx(FT_Matrix *pmat, PMATRIX pmx) pmat->yy = FLOATOBJ_GetLong(&ef); } -FORCEINLINE VOID FASTCALL +VOID FtSetCoordinateTransform( FT_Face face, PMATRIX pmx) { - FT_Matrix mat; - FtMatrixFromMx(&mat, pmx); + FT_Matrix ftmatrix; + FLOATOBJ efTemp; + + /* Create a freetype matrix, by converting to 16.16 fixpoint format */ + efTemp = pmx->efM11; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM12; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.xy = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM21; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yx = FLOATOBJ_GetLong(&efTemp); + + efTemp = pmx->efM22; + FLOATOBJ_MulLong(&efTemp, 0x00010000); + ftmatrix.yy = FLOATOBJ_GetLong(&efTemp); /* Set the transformation matrix */ - FT_Set_Transform(face, &mat, 0); + FT_Set_Transform(face, &ftmatrix, 0); } static BOOL @@ -2855,8 +2872,6 @@ ftGdiGlyphCacheGet( FT_Face Face, INT GlyphIndex, INT Height, - INT Width, - INT Escapement, FT_Render_Mode RenderMode, PMATRIX pmx) { @@ -2873,8 +2888,6 @@ ftGdiGlyphCacheGet( if ((FontEntry->Face == Face) && (FontEntry->GlyphIndex == GlyphIndex) && (FontEntry->Height == Height) && - (FontEntry->Width == Width) && - (FontEntry->Escapement == Escapement) && (FontEntry->RenderMode == RenderMode) && (SameScaleMatrix(&FontEntry->mxWorldToDevice, pmx))) break; @@ -2937,8 +2950,6 @@ ftGdiGlyphCacheSet( FT_Face Face, INT GlyphIndex, INT Height, - INT Width, - INT Escapement, PMATRIX pmx, FT_GlyphSlot GlyphSlot, FT_Render_Mode RenderMode) @@ -2992,8 +3003,6 @@ ftGdiGlyphCacheSet( NewEntry->Face = Face; NewEntry->BitmapGlyph = BitmapGlyph; NewEntry->Height = Height; - NewEntry->Width = Width; - NewEntry->Escapement = Escapement; NewEntry->RenderMode = RenderMode; NewEntry->mxWorldToDevice = *pmx; @@ -3980,7 +3989,6 @@ TextIntGetTextExtentPoint(PDC dc, realglyph = NULL; else realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - plf->lfWidth, plf->lfEscapement, RenderMode, pmxWorldToDevice); if (EmuBold || EmuItalic || !realglyph) @@ -4006,8 +4014,6 @@ TextIntGetTextExtentPoint(PDC dc, realglyph = ftGdiGlyphCacheSet(face, glyph_index, plf->lfHeight, - plf->lfWidth, - plf->lfEscapement, pmxWorldToDevice, glyph, RenderMode); @@ -5581,14 +5587,6 @@ ScaleLong(LONG lValue, PFLOATOBJ pef) return lValue; } -FORCEINLINE LONG FASTCALL -IntNormalizeAngle(LONG nTenthAngle) -{ - const LONG nFullAngle = 360 * 10; - nTenthAngle %= nFullAngle; - return (nTenthAngle + nFullAngle) % nFullAngle; -} - BOOL APIENTRY IntExtTextOutW( @@ -5615,14 +5613,15 @@ IntExtTextOutW( FT_Face face; FT_GlyphSlot glyph; FT_BitmapGlyph realglyph; - LONGLONG TextLeft64, TextTop64, TextWidth64, DeltaX64, DeltaY64, XStart64, YStart64; - ULONG previous; + LONGLONG TextLeft, RealXStart; + ULONG TextTop, previous; FT_Bool use_kerning; RECTL DestRect, MaskRect; POINTL SourcePoint, BrushOrigin; HBITMAP HSourceGlyph; SURFOBJ *SourceGlyphSurf; SIZEL bitSize; + INT yoff; FONTOBJ *FontObj; PFONTGDI FontGDI; PTEXTOBJ TextObj = NULL; @@ -5633,15 +5632,13 @@ IntExtTextOutW( BOOL DoBreak = FALSE; USHORT DxShift; PMATRIX pmxWorldToDevice; - LONG lfEscapement, lfWidth; + LONG fixAscender, fixDescender; FLOATOBJ Scale; LOGFONTW *plf; BOOL EmuBold, EmuItalic; int thickness; BOOL bResult; - FT_Matrix mat = identityMat, matWidth, matEscape, matWorld; - FT_Vector vecs[9]; - BOOL bNeedCache; + ULONGLONG TextWidth; /* Check if String is valid */ if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) @@ -5681,16 +5678,19 @@ IntExtTextOutW( IntLPtoDP(dc, (POINT *)lprc, 2); } - if (pdcattr->flTextAlign & TA_UPDATECP) - { - IntGetCurrentPositionEx(dc, &Start); - } - else + if (pdcattr->lTextAlign & TA_UPDATECP) { + Start.x = pdcattr->ptlCurrent.x; + Start.y = pdcattr->ptlCurrent.y; + } else { Start.x = XStart; Start.y = YStart; } + IntLPtoDP(dc, &Start, 1); + RealXStart = ((LONGLONG)Start.x + dc->ptlDCOrig.x) << 6; + YStart = Start.y + dc->ptlDCOrig.y; + SourcePoint.x = 0; SourcePoint.y = 0; MaskRect.left = 0; @@ -5765,15 +5765,6 @@ IntExtTextOutW( plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont; EmuBold = (plf->lfWeight >= FW_BOLD && FontGDI->OriginalWeight <= FW_NORMAL); EmuItalic = (plf->lfItalic && !FontGDI->OriginalItalic); - if (FT_IS_SCALABLE(face)) - { - lfEscapement = IntNormalizeAngle(plf->lfEscapement); - lfWidth = labs(plf->lfWidth); - } - else - { - lfEscapement = lfWidth = 0; - } if (Render) RenderMode = IntGetFontRenderMode(plf); @@ -5787,22 +5778,53 @@ IntExtTextOutW( goto Cleanup; } - FT_Set_Transform(face, NULL, NULL); + /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ + if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) + { + pmxWorldToDevice = DC_pmxWorldToDevice(dc); + FtSetCoordinateTransform(face, pmxWorldToDevice); - // Calculate the text width. - TextWidth64 = 0; + fixAscender = ScaleLong(FontGDI->tmAscent, &pmxWorldToDevice->efM22) << 6; + fixDescender = ScaleLong(FontGDI->tmDescent, &pmxWorldToDevice->efM22) << 6; + } + else + { + pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; + FtSetCoordinateTransform(face, pmxWorldToDevice); + + fixAscender = FontGDI->tmAscent << 6; + fixDescender = FontGDI->tmDescent << 6; + } + + /* + * Process the vertical alignment and determine the yoff. + */ +#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) + if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BASELINE) + yoff = 0; + else if ((pdcattr->lTextAlign & VALIGN_MASK) == TA_BOTTOM) + yoff = -(fixDescender >> 6); + else /* TA_TOP */ + yoff = fixAscender >> 6; +#undef VALIGN_MASK + + /* + * Calculate width of the text. + */ + TextWidth = 0; DxShift = fuOptions & ETO_PDY ? 1 : 0; use_kerning = FT_HAS_KERNING(face); previous = 0; if ((fuOptions & ETO_OPAQUE) || - (pdcattr->flTextAlign & (TA_CENTER | TA_RIGHT)) || - memcmp(&mat, &identityMat, sizeof(mat)) != 0 || - plf->lfUnderline || plf->lfStrikeOut) + (pdcattr->lTextAlign & (TA_CENTER | TA_RIGHT))) { + TextLeft = RealXStart; + TextTop = YStart; for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); + // FIXME: Use FT_LOAD_BITMAP_METRICS_ONLY or cache. error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); if (error) { @@ -5831,68 +5853,51 @@ IntExtTextOutW( { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextWidth64 += delta.x; + TextLeft += delta.x; } if (Dx == NULL) { - TextWidth64 += realglyph->root.advance.x >> 10; + TextLeft += realglyph->root.advance.x >> 10; } else { - // FIXME this should probably be a matrix transform with DeltaY64 as well. + // FIXME this should probably be a matrix transform with TextTop as well. Scale = pdcattr->mxWorldToDevice.efM11; if (FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i << DxShift] << 6); - TextWidth64 += FLOATOBJ_GetLong(&Scale); + TextLeft += FLOATOBJ_GetLong(&Scale); + } + + if (DxShift) + { + TextTop -= Dx[2 * i + 1] << 6; } previous = glyph_index; FT_Done_Glyph((FT_Glyph)realglyph); } - } - /* NOTE: Don't trust face->size->metrics.ascender and descender values. */ - if (lfWidth) - { - lfWidth = IntWidthMatrix(face, &matWidth, lfWidth); - FT_Matrix_Multiply(&matWidth, &mat); + TextWidth = TextLeft - RealXStart; } - if (lfEscapement) - { - IntEscapeMatrix(&matEscape, lfEscapement); - FT_Matrix_Multiply(&matEscape, &mat); - } - - DC_vUpdateWorldToDevice(dc); - if (dc->pdcattr->iGraphicsMode == GM_ADVANCED) + /* + * Process the horizontal alignment and modify XStart accordingly. + */ + if ((pdcattr->lTextAlign & TA_CENTER) == TA_CENTER) { - pmxWorldToDevice = DC_pmxWorldToDevice(dc); + RealXStart -= TextWidth / 2; } - else + else if ((pdcattr->lTextAlign & TA_RIGHT) == TA_RIGHT) { - pmxWorldToDevice = (PMATRIX)&gmxWorldToDeviceDefault; + RealXStart -= TextWidth; + if (((RealXStart + TextWidth + 32) >> 6) <= Start.x + dc->ptlDCOrig.x) + RealXStart += 1 << 6; } - FtMatrixFromMx(&matWorld, pmxWorldToDevice); - matWorld.xy = -matWorld.xy; - matWorld.yx = -matWorld.yx; - FT_Matrix_Multiply(&matWorld, &mat); - - vecs[0].x = TextWidth64 << 10; - vecs[0].y = 0; - FT_Vector_Transform(&vecs[0], &mat); - DeltaX64 = vecs[0].x >> 10; - DeltaY64 = -vecs[0].y >> 10; - - XStart64 = (Start.x << 6); - YStart64 = (Start.y << 6); - - FT_Set_Transform(face, &mat, NULL); psurf = dc->dclevel.pSurface; SurfObj = &psurf->SurfObj ; @@ -5900,11 +5905,14 @@ IntExtTextOutW( if ((fuOptions & ETO_OPAQUE) && (dc->pdcattr->ulDirty_ & DIRTY_BACKGROUND)) DC_vUpdateBackgroundBrush(dc) ; - if (dc->pdcattr->ulDirty_ & DIRTY_TEXT) + if(dc->pdcattr->ulDirty_ & DIRTY_TEXT) DC_vUpdateTextBrush(dc) ; - thickness = 1; - if (face->units_per_EM) + if (!face->units_per_EM) + { + thickness = 1; + } + else { thickness = face->underline_thickness * face->size->metrics.y_ppem / face->units_per_EM; @@ -5912,111 +5920,15 @@ IntExtTextOutW( thickness = 1; } - /* Process the vertical alignment */ -#define VALIGN_MASK (TA_TOP | TA_BASELINE | TA_BOTTOM) - RtlZeroMemory(vecs, sizeof(vecs)); - if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BASELINE) - { - vecs[1].y = -FontGDI->tmAscent << 16; // upper left - vecs[4].y = 0; // baseline - vecs[0].y = FontGDI->tmDescent << 16; // lower left - } - else if ((pdcattr->flTextAlign & VALIGN_MASK) == TA_BOTTOM) - { - vecs[1].y = -FontGDI->tmHeight << 16; // upper left - vecs[4].y = -FontGDI->tmDescent << 16; // baseline - vecs[0].y = 0; // lower left - } - else /* TA_TOP */ - { - vecs[1].y = 0; // upper left - vecs[4].y = FontGDI->tmAscent << 16; // baseline - vecs[0].y = FontGDI->tmHeight << 16; // lower left - } - vecs[2] = vecs[1]; - vecs[2].x += (TextWidth64 << 10); // upper right - vecs[3] = vecs[0]; - vecs[3].x += (TextWidth64 << 10); // lower right -#undef VALIGN_MASK - - // underline - if (plf->lfUnderline) - { - int position = 0; - if (face->units_per_EM) - { - position = face->underline_position * - face->size->metrics.y_ppem / face->units_per_EM; - } - vecs[5].y = vecs[6].y = vecs[4].y - (position << 16); - vecs[6].x += (TextWidth64 << 10); - } - - // strike through - if (plf->lfStrikeOut) - { - vecs[7].y = vecs[8].y = vecs[4].y - ((FontGDI->tmAscent / 3) << 16); - vecs[8].x += (TextWidth64 << 10); - } - - if (lfEscapement) - { - // invert y axis - IntEscapeMatrix(&matEscape, -lfEscapement); - } - - // convert vecs - for (i = 0; i < 9; ++i) - { - if (lfWidth) - { - FT_Vector_Transform(&vecs[i], &matWidth); - } - if (lfEscapement) - { - FT_Vector_Transform(&vecs[i], &matEscape); - } - vecs[i].x += (XStart64 << 10); - vecs[i].y += (YStart64 << 10); - vecs[i].x >>= 16; - vecs[i].y >>= 16; - IntLPtoDP(dc, &vecs[i], 1); - if ((pdcattr->flTextAlign & TA_CENTER) == TA_CENTER) - { - vecs[i].x -= (DeltaX64 >> 6) / 2; - vecs[i].y -= (DeltaY64 >> 6) / 2; - } - else if ((pdcattr->flTextAlign & TA_RIGHT) == TA_RIGHT) - { - vecs[i].x -= (DeltaX64 >> 6); - vecs[i].y -= (DeltaY64 >> 6); - } - vecs[i].x += dc->ptlDCOrig.x; - vecs[i].y += dc->ptlDCOrig.y; - } - if (fuOptions & ETO_OPAQUE) { /* Draw background */ RECTL Rect; - RtlZeroMemory(&Rect, sizeof(Rect)); - if ((mat.xy == 0 && mat.yx == 0) || (mat.xx == 0 && mat.yy == 0)) - { - Rect.left = Rect.top = MAXLONG; - Rect.right = Rect.bottom = MINLONG; - for (i = 0; i < 4; ++i) - { - Rect.left = min(Rect.left, vecs[i].x); - Rect.top = min(Rect.top, vecs[i].y); - Rect.right = max(Rect.right, vecs[i].x); - Rect.bottom = max(Rect.bottom, vecs[i].y); - } - } - else - { - // FIXME: Use vecs[0] ... vecs[3] and EngFillPath - } + Rect.left = (RealXStart + 32) >> 6; + Rect.top = TextTop + yoff - ((fixAscender + 32) >> 6); + Rect.right = (RealXStart + TextWidth + 32) >> 6; + Rect.bottom = Rect.top + ((fixAscender + fixDescender) >> 6); if (dc->fs & (DC_ACCUM_APP | DC_ACCUM_WMGR)) { @@ -6052,22 +5964,24 @@ IntExtTextOutW( EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0); EXLATEOBJ_vInitialize(&exloDst2RGB, psurf->ppal, &gpalRGB, 0, 0, 0); - // The main rendering loop. + /* Assume success */ bResult = TRUE; - TextLeft64 = vecs[4].x << 6; - TextTop64 = vecs[4].y << 6; + + /* + * The main rendering loop. + */ + TextLeft = RealXStart; + TextTop = YStart; previous = 0; - bNeedCache = (!EmuBold && !EmuItalic); for (i = 0; i < Count; ++i) { glyph_index = get_glyph_index_flagged(face, String[i], ETO_GLYPH_INDEX, fuOptions); - realglyph = NULL; - if (bNeedCache) - { + + if (EmuBold || EmuItalic) + realglyph = NULL; + else realglyph = ftGdiGlyphCacheGet(face, glyph_index, plf->lfHeight, - lfWidth, lfEscapement, RenderMode, pmxWorldToDevice); - } if (!realglyph) { error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); @@ -6077,17 +5991,9 @@ IntExtTextOutW( bResult = FALSE; break; } + glyph = face->glyph; - if (bNeedCache) - { - realglyph = ftGdiGlyphCacheSet(face, - glyph_index, - plf->lfHeight, lfWidth, lfEscapement, - pmxWorldToDevice, - glyph, - RenderMode); - } - else + if (EmuBold || EmuItalic) { if (EmuBold) FT_GlyphSlot_Embolden(glyph); @@ -6095,6 +6001,15 @@ IntExtTextOutW( FT_GlyphSlot_Oblique(glyph); realglyph = ftGdiGlyphSet(face, glyph, RenderMode); } + else + { + realglyph = ftGdiGlyphCacheSet(face, + glyph_index, + plf->lfHeight, + pmxWorldToDevice, + glyph, + RenderMode); + } if (!realglyph) { DPRINT1("Failed to render glyph! [index: %d]\n", glyph_index); @@ -6108,16 +6023,15 @@ IntExtTextOutW( { FT_Vector delta; FT_Get_Kerning(face, previous, glyph_index, 0, &delta); - TextLeft64 += delta.x; - TextTop64 -= delta.y; + TextLeft += delta.x; } - DPRINT("TextLeft64: %I64d\n", TextLeft64); - DPRINT("TextTop64: %I64d\n", TextTop64); + DPRINT("TextLeft: %I64d\n", TextLeft); + DPRINT("TextTop: %lu\n", TextTop); DPRINT("Advance: %d\n", realglyph->root.advance.x); - DestRect.left = ((TextLeft64 + 32) >> 6) + realglyph->left; + DestRect.left = ((TextLeft + 32) >> 6) + realglyph->left; DestRect.right = DestRect.left + realglyph->bitmap.width; - DestRect.top = ((TextTop64 + 32) >> 6) - realglyph->top; + DestRect.top = TextTop + yoff - realglyph->top; DestRect.bottom = DestRect.top + realglyph->bitmap.rows; bitSize.cx = realglyph->bitmap.width; @@ -6214,115 +6128,82 @@ IntExtTextOutW( break; } + if (plf->lfUnderline) + { + int i, position; + if (!face->units_per_EM) + { + position = 0; + } + else + { + position = face->underline_position * + face->size->metrics.y_ppem / face->units_per_EM; + } + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + EngLineTo(SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + (TextLeft >> 6), + TextTop + yoff - position + i, + ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), + TextTop + yoff - position + i, + NULL, + ROP2_TO_MIX(R2_COPYPEN)); + } + } + if (plf->lfStrikeOut) + { + int i; + for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) + { + EngLineTo(SurfObj, + (CLIPOBJ *)&dc->co, + &dc->eboText.BrushObject, + (TextLeft >> 6), + TextTop + yoff - (fixAscender >> 6) / 3 + i, + ((TextLeft + (realglyph->root.advance.x >> 10)) >> 6), + TextTop + yoff - (fixAscender >> 6) / 3 + i, + NULL, + ROP2_TO_MIX(R2_COPYPEN)); + } + } + if (NULL == Dx) { - TextLeft64 += realglyph->root.advance.x >> 10; - TextTop64 -= realglyph->root.advance.y >> 10; - DPRINT("New TextLeft64: %I64d\n", TextLeft64); - DPRINT("New TextTop64: %I64d\n", TextTop64); + TextLeft += realglyph->root.advance.x >> 10; + DPRINT("New TextLeft: %I64d\n", TextLeft); } else { - // FIXME this should probably be a matrix transform with TextTop64 as well. + // FIXME this should probably be a matrix transform with TextTop as well. Scale = pdcattr->mxWorldToDevice.efM11; if (FLOATOBJ_Equal0(&Scale)) FLOATOBJ_Set1(&Scale); /* do the shift before multiplying to preserve precision */ FLOATOBJ_MulLong(&Scale, Dx[i<<DxShift] << 6); - TextLeft64 += FLOATOBJ_GetLong(&Scale); - DPRINT("New TextLeft64 2: %I64d\n", TextLeft64); + TextLeft += FLOATOBJ_GetLong(&Scale); + DPRINT("New TextLeft2: %I64d\n", TextLeft); } if (DxShift) { - TextTop64 -= Dx[2 * i + 1] << 6; + TextTop -= Dx[2 * i + 1] << 6; } previous = glyph_index; /* No cache, so clean up */ - if (!bNeedCache) + if (EmuBold || EmuItalic) { FT_Done_Glyph((FT_Glyph)realglyph); } } - if (plf->lfUnderline || plf->lfStrikeOut) - { - INT x0 = min(vecs[0].x, vecs[2].x); - INT y0 = min(vecs[0].y, vecs[2].y); - INT x1 = max(vecs[0].x, vecs[2].x); - INT y1 = max(vecs[0].y, vecs[2].y); - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawStart(dc->ppdev, x0, y0, x1, y1); - } - - if (plf->lfUnderline) - { - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - LONG dx = (LONG)(DeltaX64 >> 6), dy = (LONG)(DeltaY64 >> 6); - if (labs(dx) > labs(dy)) - { - // move vertical - EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - vecs[5].x, vecs[5].y + i, - vecs[6].x, vecs[6].y + i, - NULL, ROP2_TO_MIX(R2_COPYPEN)); - } - else - { - // move horizontal - EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - vecs[5].x + i, vecs[5].y, - vecs[6].x + i, vecs[6].y, - NULL, ROP2_TO_MIX(R2_COPYPEN)); - } - } - } - - if (plf->lfStrikeOut) - { - for (i = -thickness / 2; i < -thickness / 2 + thickness; ++i) - { - LONG dx = (LONG)(DeltaX64 >> 6), dy = (LONG)(DeltaY64 >> 6); - if (labs(dx) > labs(dy)) - { - // move vertical - EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - vecs[7].x, vecs[7].y + i, - vecs[8].x, vecs[8].y + i, - NULL, ROP2_TO_MIX(R2_COPYPEN)); - } - else - { - // move horizontal - EngLineTo(SurfObj, (CLIPOBJ *)&dc->co, - &dc->eboText.BrushObject, - vecs[7].x + i, vecs[7].y, - vecs[8].x + i, vecs[8].y, - NULL, ROP2_TO_MIX(R2_COPYPEN)); - } - } - } - - if (plf->lfUnderline || plf->lfStrikeOut) - { - if (dc->dctype == DCTYPE_DIRECT) - MouseSafetyOnDrawEnd(dc->ppdev); - } - - if (pdcattr->flTextAlign & TA_UPDATECP) - { - pdcattr->ptlCurrent.x = vecs[2].x - dc->ptlDCOrig.x; - pdcattr->ptlCurrent.y = vecs[2].y - dc->ptlDCOrig.y; - IntDPtoLP(dc, &pdcattr->ptlCurrent, 1); - pdcattr->ulDirty_ &= ~DIRTY_PTLCURRENT; - pdcattr->ulDirty_ |= (DIRTY_PTFXCURRENT | DIRTY_STYLESTATE); + if (pdcattr->lTextAlign & TA_UPDATECP) { + pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; } IntUnLockFreeType(); diff --git a/win32ss/gdi/ntgdi/xformobj.c b/win32ss/gdi/ntgdi/xformobj.c index 02216a58591..fccf5517b38 100644 --- a/win32ss/gdi/ntgdi/xformobj.c +++ b/win32ss/gdi/ntgdi/xformobj.c @@ -151,21 +151,12 @@ XFORMOBJ_iSetXform( IN const XFORML *pxform) { PMATRIX pmx = XFORMOBJ_pmx(pxo); - FLOATOBJ ef1, ef2, efTemp; /* Check parameters */ if (!pxo || !pxform) return DDI_ERROR; /* Check if the xform is valid */ - /* M11 * M22 - M12 * M21 != 0 */ - FLOATOBJ_SetFloat(&ef1, pxform->eM11); - FLOATOBJ_SetFloat(&efTemp, pxform->eM22); - FLOATOBJ_Mul(&ef1, &efTemp); - FLOATOBJ_SetFloat(&ef2, pxform->eM12); - FLOATOBJ_SetFloat(&efTemp, pxform->eM21); - FLOATOBJ_Mul(&ef2, &efTemp); - if (FLOATOBJ_Equal(&ef1, &ef2)) - return DDI_ERROR; + if ((pxform->eM11 == 0) || (pxform->eM22 == 0)) return DDI_ERROR; /* Copy members */ FLOATOBJ_SetFloat(&pmx->efM11, pxform->eM11);

1 0

[reactos] 01/01: [BOOTLIB] Check DBG with #if, not #ifdef (#1621)
by Serge Gautherie 05 Jun '19

05 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7eead935693b854b6337d… commit 7eead935693b854b6337dfcb1af4a58ec0d4a075 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 6 01:53:53 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 01:53:53 2019 +0200 [BOOTLIB] Check DBG with #if, not #ifdef (#1621) --- boot/environ/lib/misc/debug.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/environ/lib/misc/debug.c b/boot/environ/lib/misc/debug.c index b38a29f1926..799d90be8dd 100644 --- a/boot/environ/lib/misc/debug.c +++ b/boot/environ/lib/misc/debug.c @@ -86,7 +86,7 @@ BlStatusPrint ( /* Check if the boot debugger is enabled */ if (BlBdDebuggerEnabled() -#if (defined(DBG)) +#if DBG || TRUE #endif ) @@ -94,7 +94,7 @@ BlStatusPrint ( /* Print the string out into a buffer */ if (vswprintf(BlScratchBuffer, Format, va) > 0) { -#if defined(DBG) +#if DBG EfiPrintf(BlScratchBuffer); EfiPrintf(L"\r\n"); #endif

1 0

[reactos] 01/01: [LWIP] Fix src/core/init.c a bit (#1620)
by Serge Gautherie 05 Jun '19

05 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a98d96eac606d3fc258e… commit 3a98d96eac606d3fc258ef298b80a71f00d96188 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 6 01:51:46 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 01:51:46 2019 +0200 [LWIP] Fix src/core/init.c a bit (#1620) Cherry-pick http://git.savannah.nongnu.org/cgit/lwip.git/commit/src/core/init.c?id=c0b5… --- sdk/lib/drivers/lwip/src/core/init.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk/lib/drivers/lwip/src/core/init.c b/sdk/lib/drivers/lwip/src/core/init.c index a7b15a776ab..691bdcaaf60 100644 --- a/sdk/lib/drivers/lwip/src/core/init.c +++ b/sdk/lib/drivers/lwip/src/core/init.c @@ -70,9 +70,6 @@ #if (!LWIP_UDP && LWIP_UDPLITE) #error "If you want to use UDP Lite, you have to define LWIP_UDP=1 in your lwipopts.h" #endif -#if (!LWIP_UDP && LWIP_SNMP) - #error "If you want to use SNMP, you have to define LWIP_UDP=1 in your lwipopts.h" -#endif #if (!LWIP_UDP && LWIP_DHCP) #error "If you want to use DHCP, you have to define LWIP_UDP=1 in your lwipopts.h" #endif @@ -124,7 +121,7 @@ #if (LWIP_TCP && ((TCP_MAXRTX > 12) || (TCP_SYNMAXRTX > 12))) #error "If you want to use TCP, TCP_MAXRTX and TCP_SYNMAXRTX must less or equal to 12 (due to tcp_backoff table), so, you have to reduce them in your lwipopts.h" #endif -#if (LWIP_TCP && TCP_LISTEN_BACKLOG && (TCP_DEFAULT_LISTEN_BACKLOG < 0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff)) +#if (LWIP_TCP && TCP_LISTEN_BACKLOG && ((TCP_DEFAULT_LISTEN_BACKLOG < 0) || (TCP_DEFAULT_LISTEN_BACKLOG > 0xff))) #error "If you want to use TCP backlog, TCP_DEFAULT_LISTEN_BACKLOG must fit into an u8_t" #endif #if (LWIP_NETIF_API && (NO_SYS==1)) @@ -166,7 +163,7 @@ #if (DNS_LOCAL_HOSTLIST && !DNS_LOCAL_HOSTLIST_IS_DYNAMIC && !(defined(DNS_LOCAL_HOSTLIST_INIT))) #error "you have to define define DNS_LOCAL_HOSTLIST_INIT {{'host1', 0x123}, {'host2', 0x234}} to initialize DNS_LOCAL_HOSTLIST" #endif -#if PPP_SUPPORT && !PPPOS_SUPPORT & !PPPOE_SUPPORT +#if PPP_SUPPORT && !PPPOS_SUPPORT && !PPPOE_SUPPORT #error "PPP_SUPPORT needs either PPPOS_SUPPORT or PPPOE_SUPPORT turned on" #endif #if !LWIP_ETHERNET && (LWIP_ARP || PPPOE_SUPPORT)

1 0

[reactos] 01/01: [MBEDTLS] Use '#ifndef __REACTOS__', instead of '#if DBG & 0' (#1619)
by Serge Gautherie 05 Jun '19

05 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=394eb8922778335e3b960… commit 394eb8922778335e3b960a7ae0f07b00b905b9de Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 6 01:50:55 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 01:50:55 2019 +0200 [MBEDTLS] Use '#ifndef __REACTOS__', instead of '#if DBG & 0' (#1619) - Don't use '|' on a '#if' - Remove a personal comment. --- sdk/include/reactos/libs/mbedtls/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/libs/mbedtls/config.h b/sdk/include/reactos/libs/mbedtls/config.h index 4e78b52b6df..b30a1a4e863 100644 --- a/sdk/include/reactos/libs/mbedtls/config.h +++ b/sdk/include/reactos/libs/mbedtls/config.h @@ -1897,8 +1897,8 @@ * * This module provides debugging functions. */ -#if DBG & 0 - #define MBEDTLS_DEBUG_C /* swyter: we don't even need this level of verboseness, useful only when developing */ +#ifndef __REACTOS__ +#define MBEDTLS_DEBUG_C #endif /**

1 0

[reactos] 01/01: [DXSDK] Improve dxerr?.h a bit (#1617)
by Serge Gautherie 05 Jun '19

05 Jun '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f0b265e8de775007ac7f… commit 2f0b265e8de775007ac7fa4979db8f0121230527 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Thu Jun 6 01:50:24 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Jun 6 01:50:24 2019 +0200 [DXSDK] Improve dxerr?.h a bit (#1617) *Use '||', instead of '|', on a '#if'. *Synchronize some white spaces and blank lines. --- sdk/include/dxsdk/dxerr8.h | 6 +----- sdk/include/dxsdk/dxerr9.h | 9 +++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sdk/include/dxsdk/dxerr8.h b/sdk/include/dxsdk/dxerr8.h index aeaea5a62f7..79947f9424f 100644 --- a/sdk/include/dxsdk/dxerr8.h +++ b/sdk/include/dxsdk/dxerr8.h @@ -1,5 +1,4 @@ - #ifndef _DXERR8_H_ #define _DXERR8_H_ @@ -15,7 +14,6 @@ const WCHAR* WINAPI DXGetErrorString8W(HRESULT hr); const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr); HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox ); - #ifdef UNICODE #define DXGetErrorString8 DXGetErrorString8W #define DXGetErrorDescription8 DXGetErrorDescription8W @@ -26,7 +24,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC #define DXTrace DXTraceA #endif -#if defined(DEBUG) | defined(_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) #define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) @@ -36,10 +34,8 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC #define DXTRACE_ERR_NOMSGBOX(str,hr) (hr) #endif - #ifdef __cplusplus } #endif #endif - diff --git a/sdk/include/dxsdk/dxerr9.h b/sdk/include/dxsdk/dxerr9.h index 440bc3fcf63..6b42b8b2f8d 100644 --- a/sdk/include/dxsdk/dxerr9.h +++ b/sdk/include/dxsdk/dxerr9.h @@ -1,11 +1,11 @@ - #ifndef _DXERR9_H_ + +#ifndef _DXERR9_H_ #define _DXERR9_H_ #ifdef __cplusplus extern "C" { #endif - const char* WINAPI DXGetErrorString9A(HRESULT hr); const char* WINAPI DXGetErrorDescription9A(HRESULT hr); HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox ); @@ -24,8 +24,7 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC #define DXTrace DXTraceA #endif - -#if defined(DEBUG) | defined(_DEBUG) +#if defined(DEBUG) || defined(_DEBUG) #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) #define DXTRACE_ERR_MSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) @@ -35,10 +34,8 @@ HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WC #define DXTRACE_ERR_MSGBOX(str,hr) (hr) #endif - #ifdef __cplusplus } #endif #endif -

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2019