Ros-diffs November 2023

ros-diffs@reactos.org

20 participants
274 discussions

[reactos] 01/01: [USER32_APITEST] Add test for bad 'Icon Groups' but good 'Icons' such as F1'97 (#6020)

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c00d41d91c181746563e6… commit c00d41d91c181746563e689d3390228f703053f5 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Sun Nov 26 09:26:05 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 26 15:26:05 2023 +0000 [USER32_APITEST] Add test for bad 'Icon Groups' but good 'Icons' such as F1'97 (#6020) Add test for bad 'Icon Groups' but good 'Icons' such as created by old versions of Watcom C/C++ That icon shows fine in Windows Explorer WinXP/Win2K3, but does not show in WinVista/Win7 anymore. A very special corner case. We will commit the proposed fix shortly after committing the new test. --- modules/rostests/apitests/user32/PrivateExtractIcons.c | 12 ++++++++++-- modules/rostests/apitests/user32/cpimg2e.exe | Bin 0 -> 38400 bytes modules/rostests/apitests/user32/resource.h | 1 + modules/rostests/apitests/user32/user32_apitest.rc | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/rostests/apitests/user32/PrivateExtractIcons.c b/modules/rostests/apitests/user32/PrivateExtractIcons.c index 85edab85a16..aff24a195ed 100644 --- a/modules/rostests/apitests/user32/PrivateExtractIcons.c +++ b/modules/rostests/apitests/user32/PrivateExtractIcons.c @@ -27,8 +27,9 @@ BOOL ResourceToFile(INT i, PCWSTR FileName) if (FileExists(FileName)) { - skip("'%S' already exists. Exiting now\n", FileName); - return FALSE; + /* We should only be using %temp% paths, so deleting here should be OK */ + printf("Deleting '%S' that already exists.\n", FileName); + DeleteFileW(FileName); } hRes = FindResourceW(NULL, MAKEINTRESOURCEW(i), MAKEINTRESOURCEW(RT_RCDATA)); @@ -90,6 +91,12 @@ static struct /* Icon group file containing one PNG icon and one normal icon */ {L"%temp%\\ROS.ico", 1, 1, TRUE}, + + /* Executable file with bad 'Icon Group' but good 'Icons'. + * Windows explorer shows the program's icon correctly in WinXP/Win2K3 + * but Windows 7 shows only a default icon. This is analogous + * to EXE's generated by older Watcom C/C++ versions. */ + {L"%temp%\\cpimg2e.exe", 1, 1, TRUE}, }; static struct @@ -100,6 +107,7 @@ static struct { {L"%temp%\\ROS.ico", IDR_ICONS_PNG}, {L"%temp%\\sysicon.ico", IDR_ICONS_NORMAL}, + {L"%temp%\\cpimg2e.exe", IDR_EXE_NORMAL} }; START_TEST(PrivateExtractIcons) diff --git a/modules/rostests/apitests/user32/cpimg2e.exe b/modules/rostests/apitests/user32/cpimg2e.exe new file mode 100644 index 00000000000..db9d844a615 Binary files /dev/null and b/modules/rostests/apitests/user32/cpimg2e.exe differ diff --git a/modules/rostests/apitests/user32/resource.h b/modules/rostests/apitests/user32/resource.h index ac91b1b51be..33972fde705 100644 --- a/modules/rostests/apitests/user32/resource.h +++ b/modules/rostests/apitests/user32/resource.h @@ -3,3 +3,4 @@ #define IDR_ICONS_PNG 2000 #define IDR_ICONS_NORMAL 2001 +#define IDR_EXE_NORMAL 2002 diff --git a/modules/rostests/apitests/user32/user32_apitest.rc b/modules/rostests/apitests/user32/user32_apitest.rc index 370c3aaa721..155390fc217 100644 --- a/modules/rostests/apitests/user32/user32_apitest.rc +++ b/modules/rostests/apitests/user32/user32_apitest.rc @@ -10,6 +10,7 @@ TESTCURSOR CURSOR "test.cur" IDR_ICONS_PNG RCDATA "ROS.ico" IDR_ICONS_NORMAL RCDATA "sysicon.ico" +IDR_EXE_NORMAL RCDATA "cpimg2e.exe" TESTDIALOG DIALOG 0,0, 200,200 CLASS "TestDialogClass"

9 months, 3 weeks

[reactos] 01/01: [PING] Update Romanian (ro-RO) translation (#6010)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e3d97d7ddecb704a948e0… commit e3d97d7ddecb704a948e02b7796b2406fcc1f091 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 26 16:11:45 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 26 14:11:45 2023 +0000 [PING] Update Romanian (ro-RO) translation (#6010) Co-authored-by: Joachim Henze <joachim.henze(a)reactos.org> Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- base/applications/network/ping/lang/ro-RO.rc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/base/applications/network/ping/lang/ro-RO.rc b/base/applications/network/ping/lang/ro-RO.rc index be34da3759e..bbbefda7744 100644 --- a/base/applications/network/ping/lang/ro-RO.rc +++ b/base/applications/network/ping/lang/ro-RO.rc @@ -1,7 +1,9 @@ /* - * FILE: base/applications/network/ping/lang/ro-RO.rc - * PURPOSE: Romanian translations for ReactOS Ping Command - * TRANSLATORS: Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Ping Command + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -22,7 +24,7 @@ Opțiuni:\n\ -f Indicator de prevenție a fragmentării pachetelor (valabil\n\ doar pentru IPv4).\n\ -i TDV Timp de valabilitate.\n\ - -v TDS Tip de serviciu (valabil doar pentru IPv4. Această opțiune\n\ + -v TDS Tip de serviciu (valabil doar pentru IPv4. Această setare\n\ nu este de actualitate și nu va avea efect asupra câmpului\n\ tipului de serviciu din antetul unui pachet IP).\n\ -w expirare Limita temporală pentru răspuns, în milisecunde.\n\

9 months, 3 weeks

[reactos] 01/01: [WINLOGON] Update Romanian (ro-RO) translation (#6011)

by Andrei Miloiu

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=624b36ad59474e2d213fa… commit 624b36ad59474e2d213fad0da7eb8088bb35cf64 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 26 16:10:12 2023 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 26 14:10:12 2023 +0000 [WINLOGON] Update Romanian (ro-RO) translation (#6011) Co-authored-by: Stanislav Motylkov <x86corez(a)gmail.com> --- base/system/winlogon/lang/ro-RO.rc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/base/system/winlogon/lang/ro-RO.rc b/base/system/winlogon/lang/ro-RO.rc index 12a42b69b7b..c3cb421880a 100644 --- a/base/system/winlogon/lang/ro-RO.rc +++ b/base/system/winlogon/lang/ro-RO.rc @@ -1,10 +1,11 @@ /* - * PROJECT: ReactOS Winlogon - * FILE: base/system/winlogon/lang/ro-RO.rc - * PURPOSE: Romanian Language File for Winlogon - * TRANSLATORS: - * Petru Dimitriu (petrimetri at gmail dot com) - * Ștefan Fulea (stefan dot fulea at mail dot com) + * PROJECT: ReactOS Winlogon + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011 Petru Dimitriu <petrimetri(a)gmail.com> + * Copyright 2011-2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2021 George Bișoc <george.bisoc(a)reactos.org> + * Copyright 2023 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL @@ -45,19 +46,19 @@ END STRINGTABLE BEGIN IDS_PREPARENETWORKCONNECTIONS "Conexiuni în rețea în curs de pregătire…" - IDS_APPLYINGCOMPUTERSETTINGS "Configurații generale în curs de instituire…" + IDS_APPLYINGCOMPUTERSETTINGS "Setări generale în curs de aplicare…" IDS_RUNNINGSTARTUPSCRIPTS "Operații de pornire în curs de execuție…" IDS_RUNNINGSHUTDOWNSCRIPTS "Operații de oprire în curs de execuție…" - IDS_APPLYINGYOURPERSONALSETTINGS "Configurații personale în curs de instituire…" + IDS_APPLYINGYOURPERSONALSETTINGS "Setări personale în curs de aplicare…" IDS_RUNNINGLOGOFFSCRIPTS "Operații de deautentificare în curs de efectuare…" IDS_RUNNINGLOGONSCRIPTS "Operații de autentificare în curs de efectuare…" - IDS_LOADINGYOURPERSONALSETTINGS "Configurații personale în curs de reconstituire…" + IDS_LOADINGYOURPERSONALSETTINGS "Setări personale în curs de încărcare…" IDS_CLOSINGNETWORKCONNECTIONS "Conexiuni în rețea în curs de închidere…" IDS_REACTOSISRESTARTING "Se repornește..." IDS_REACTOSISSHUTTINGDOWN "Se închide..." IDS_PREPARETOSTANDBY "Stare de veghe în curs de pregătire…" IDS_PREPARETOHIBERNATE "Stare de hibernare în curs de pregătire…" - IDS_SAVEYOURSETTINGS "Configurații personale în curs de păstrare…" + IDS_SAVEYOURSETTINGS "Setări personale în curs de salvare…" IDS_REACTOSISSTARTINGUP "Sistem de operare în curs de pornire…" IDS_TIMEOUTSHORTFORMAT "%02d:%02d:%02d" IDS_TIMEOUTLONGFORMAT "%d zile"

9 months, 3 weeks

[reactos] 01/01: [SDK:LIB] Import PathCch* functions from Wine (#5842) CORE-12686

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0e1d360098b5fe2f03e5… commit d0e1d360098b5fe2f03e5088d326f84ee344eca2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Oct 27 15:46:13 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Nov 26 13:43:15 2023 +0100 [SDK:LIB] Import PathCch* functions from Wine (#5842) CORE-12686 Isolate PathCch* functions from Wine implementation in kernelbase (which are mixed with a ton of unrelated stuff). These functions are compiled into a pathcch.lib library, similarly to the one in the official MS PSDK. Excepting that here, their actual implementation is in the library. This contrasts with the one in the MS PSDK, which is an import library to an apiset DLL. The pathcch.h header is an original one, that contains SAL annotations and descriptive parameter names, based on the MinGW and MS PSDK headers. Wine's header was not used as it is poor and incomplete. Co-authored-by: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> --- sdk/lib/CMakeLists.txt | 1 + sdk/lib/pathcch/CMakeLists.txt | 3 + sdk/lib/pathcch/pathcch.c | 1098 ++++++++++++++++++++++++++++++++++++++++ sdk/lib/pathcch/pathcch.h | 360 +++++++++++++ 4 files changed, 1462 insertions(+) diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index ade5b4af3fb..61b051f6193 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -34,6 +34,7 @@ endif() add_subdirectory(ioevent) add_subdirectory(lsalib) add_subdirectory(nt) +add_subdirectory(pathcch) add_subdirectory(pseh) if(KDBG) diff --git a/sdk/lib/pathcch/CMakeLists.txt b/sdk/lib/pathcch/CMakeLists.txt new file mode 100644 index 00000000000..579dd177919 --- /dev/null +++ b/sdk/lib/pathcch/CMakeLists.txt @@ -0,0 +1,3 @@ + +add_library(pathcch pathcch.c) +add_dependencies(pathcch xdk) diff --git a/sdk/lib/pathcch/pathcch.c b/sdk/lib/pathcch/pathcch.c new file mode 100644 index 00000000000..9c690df3e68 --- /dev/null +++ b/sdk/lib/pathcch/pathcch.c @@ -0,0 +1,1098 @@ +/* + * Copyright 2018 Nikolay Sivov + * Copyright 2018 Zhiyi Zhang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +/* Wine code is still stuck in the past... */ +#ifdef __REACTOS__ +#define wcsnicmp _wcsnicmp +#endif + +#include <windef.h> +#include <winbase.h> + +/* The PathCch functions use size_t, but Wine's implementation uses SIZE_T, + * so temporarily change the define'd SIZE_T type to the compatible one... */ +#ifdef __REACTOS__ +#undef SIZE_T +#define SIZE_T size_t +#endif + +/* This is the static implementation of the PathCch functions */ +#define STATIC_PATHCCH +#ifdef __GNUC__ // GCC doesn't support #pragma deprecated() +#undef DEPRECATE_SUPPORTED +#endif +#include <pathcch.h> + +#include <strsafe.h> + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(path); + +#ifdef __REACTOS__ +#if (_WIN32_WINNT < _WIN32_WINNT_VISTA) || (DLL_EXPORT_VERSION < _WIN32_WINNT_VISTA) +/* wcsnlen is an NT6+ function. To cover all cases, use a private implementation */ +static inline size_t hacked_wcsnlen(const wchar_t* str, size_t size) +{ + StringCchLengthW(str, size, &size); + return size; +} +#define wcsnlen hacked_wcsnlen +#endif +#endif /* __REACTOS__ */ + +static BOOL is_drive_spec( const WCHAR *str ) +{ + return isalpha( str[0] ) && str[1] == ':'; +} + +#if 0 +static BOOL is_escaped_drive_spec( const WCHAR *str ) +{ + return isalpha( str[0] ) && (str[1] == ':' || str[1] == '|'); +} +#endif + +static BOOL is_prefixed_unc(const WCHAR *string) +{ + return !wcsnicmp(string, L"\\\\?\\UNC\\", 8 ); +} + +static BOOL is_prefixed_disk(const WCHAR *string) +{ + return !wcsncmp(string, L"\\\\?\\", 4) && is_drive_spec( string + 4 ); +} + +static BOOL is_prefixed_volume(const WCHAR *string) +{ + const WCHAR *guid; + INT i = 0; + + if (wcsnicmp( string, L"\\\\?\\Volume", 10 )) return FALSE; + + guid = string + 10; + + while (i <= 37) + { + switch (i) + { + case 0: + if (guid[i] != '{') return FALSE; + break; + case 9: + case 14: + case 19: + case 24: + if (guid[i] != '-') return FALSE; + break; + case 37: + if (guid[i] != '}') return FALSE; + break; + default: + if (!isxdigit(guid[i])) return FALSE; + break; + } + i++; + } + + return TRUE; +} + +/* Get the next character beyond end of the segment. + Return TRUE if the last segment ends with a backslash */ +static BOOL get_next_segment(const WCHAR *next, const WCHAR **next_segment) +{ + while (*next && *next != '\\') next++; + if (*next == '\\') + { + *next_segment = next + 1; + return TRUE; + } + else + { + *next_segment = next; + return FALSE; + } +} + +/* Find the last character of the root in a path, if there is one, without any segments */ +static const WCHAR *get_root_end(const WCHAR *path) +{ + /* Find path root */ + if (is_prefixed_volume(path)) + return path[48] == '\\' ? path + 48 : path + 47; + else if (is_prefixed_unc(path)) + return path + 7; + else if (is_prefixed_disk(path)) + return path[6] == '\\' ? path + 6 : path + 5; + /* \\ */ + else if (path[0] == '\\' && path[1] == '\\') + return path + 1; + /* \ */ + else if (path[0] == '\\') + return path; + /* X:\ */ + else if (is_drive_spec( path )) + return path[2] == '\\' ? path + 2 : path + 1; + else + return NULL; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathAllocCanonicalize( + _In_ PCWSTR path_in, + _In_ /* PATHCCH_OPTIONS */ ULONG flags, + _Outptr_ PWSTR* path_out) +#else +HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out) +#endif +{ + WCHAR *buffer, *dst; + const WCHAR *src; + const WCHAR *root_end; + SIZE_T buffer_size, length; + + TRACE("%s %#lx %p\n", debugstr_w(path_in), flags, path_out); + + if (!path_in || !path_out + || ((flags & PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS) && (flags & PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS)) + || (flags & (PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS | PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS) + && !(flags & PATHCCH_ALLOW_LONG_PATHS)) + || ((flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH) && (flags & PATHCCH_ALLOW_LONG_PATHS))) + { + if (path_out) *path_out = NULL; + return E_INVALIDARG; + } + + length = lstrlenW(path_in); + if ((length + 1 > MAX_PATH && !(flags & (PATHCCH_ALLOW_LONG_PATHS | PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH))) + || (length + 1 > PATHCCH_MAX_CCH)) + { + *path_out = NULL; + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + } + + /* PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH implies PATHCCH_DO_NOT_NORMALIZE_SEGMENTS */ + if (flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH) flags |= PATHCCH_DO_NOT_NORMALIZE_SEGMENTS; + + /* path length + possible \\?\ addition + possible \ addition + NUL */ + buffer_size = (length + 6) * sizeof(WCHAR); + buffer = LocalAlloc(LMEM_ZEROINIT, buffer_size); + if (!buffer) + { + *path_out = NULL; + return E_OUTOFMEMORY; + } + + src = path_in; + dst = buffer; + + root_end = get_root_end(path_in); + if (root_end) root_end = buffer + (root_end - path_in); + + /* Copy path root */ + if (root_end) + { + memcpy(dst, src, (root_end - buffer + 1) * sizeof(WCHAR)); + src += root_end - buffer + 1; + if(PathCchStripPrefix(dst, length + 6) == S_OK) + { + /* Fill in \ in X:\ if the \ is missing */ + if (is_drive_spec( dst ) && dst[2]!= '\\') + { + dst[2] = '\\'; + dst[3] = 0; + } + dst = buffer + lstrlenW(buffer); + root_end = dst; + } + else + dst += root_end - buffer + 1; + } + + while (*src) + { + if (src[0] == '.') + { + if (src[1] == '.') + { + /* Keep one . after * */ + if (dst > buffer && dst[-1] == '*') + { + *dst++ = *src++; + continue; + } + + /* Keep the .. if not surrounded by \ */ + if ((src[2] != '\\' && src[2]) || (dst > buffer && dst[-1] != '\\')) + { + *dst++ = *src++; + *dst++ = *src++; + continue; + } + + /* Remove the \ before .. if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) + { + *--dst = '\0'; + /* Remove characters until a \ is encountered */ + while (dst > buffer) + { + if (dst[-1] == '\\') + { + *--dst = 0; + break; + } + else + *--dst = 0; + } + } + /* Remove the extra \ after .. if the \ before .. wasn't deleted */ + else if (src[2] == '\\') + src++; + + src += 2; + } + else + { + /* Keep the . if not surrounded by \ */ + if ((src[1] != '\\' && src[1]) || (dst > buffer && dst[-1] != '\\')) + { + *dst++ = *src++; + continue; + } + + /* Remove the \ before . if the \ is not part of root */ + if (dst > buffer && dst[-1] == '\\' && (!root_end || dst - 1 > root_end)) dst--; + /* Remove the extra \ after . if the \ before . wasn't deleted */ + else if (src[1] == '\\') + src++; + + src++; + } + + /* If X:\ is not complete, then complete it */ + if (is_drive_spec( buffer ) && buffer[2] != '\\') + { + root_end = buffer + 2; + dst = buffer + 3; + buffer[2] = '\\'; + /* If next character is \, use the \ to fill in */ + if (src[0] == '\\') src++; + } + } + /* Copy over */ + else + *dst++ = *src++; + } + /* End the path */ + *dst = 0; + + /* Strip multiple trailing . */ + if (!(flags & PATHCCH_DO_NOT_NORMALIZE_SEGMENTS)) + { + while (dst > buffer && dst[-1] == '.') + { + /* Keep a . after * */ + if (dst - 1 > buffer && dst[-2] == '*') + break; + /* If . follow a : at the second character, remove the . and add a \ */ + else if (dst - 1 > buffer && dst[-2] == ':' && dst - 2 == buffer + 1) + *--dst = '\\'; + else + *--dst = 0; + } + } + + /* If result path is empty, fill in \ */ + if (!*buffer) + { + buffer[0] = '\\'; + buffer[1] = 0; + } + + /* Extend the path if needed */ + length = lstrlenW(buffer); + if (((length + 1 > MAX_PATH && is_drive_spec( buffer )) + || (is_drive_spec( buffer ) && flags & PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH)) + && !(flags & PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS)) + { + memmove(buffer + 4, buffer, (length + 1) * sizeof(WCHAR)); + buffer[0] = '\\'; + buffer[1] = '\\'; + buffer[2] = '?'; + buffer[3] = '\\'; + } + + /* Add a trailing backslash to the path if needed */ + if (flags & PATHCCH_ENSURE_TRAILING_SLASH) + PathCchAddBackslash(buffer, buffer_size); + + *path_out = buffer; + return S_OK; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathAllocCombine( + _In_opt_ PCWSTR path1, + _In_opt_ PCWSTR path2, + _In_ /* PATHCCH_OPTIONS */ ULONG flags, + _Outptr_ PWSTR* out) +#else +HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out) +#endif +{ + SIZE_T combined_length, length2; + WCHAR *combined_path; + BOOL add_backslash = FALSE; + HRESULT hr; + + TRACE("%s %s %#lx %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); + + if ((!path1 && !path2) || !out) + { + if (out) *out = NULL; + return E_INVALIDARG; + } + + if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); + + /* If path2 is fully qualified, use path2 only */ + if (is_drive_spec( path2 ) || (path2[0] == '\\' && path2[1] == '\\')) + { + path1 = path2; + path2 = NULL; + add_backslash = (is_drive_spec(path1) && !path1[2]) + || (is_prefixed_disk(path1) && !path1[6]); + } + + length2 = path2 ? lstrlenW(path2) : 0; + /* path1 length + path2 length + possible backslash + NULL */ + combined_length = lstrlenW(path1) + length2 + 2; + + combined_path = HeapAlloc(GetProcessHeap(), 0, combined_length * sizeof(WCHAR)); + if (!combined_path) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + lstrcpyW(combined_path, path1); + PathCchStripPrefix(combined_path, combined_length); + if (add_backslash) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + + if (path2 && path2[0]) + { + if (path2[0] == '\\' && path2[1] != '\\') + { + PathCchStripToRoot(combined_path, combined_length); + path2++; + } + + PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + lstrcatW(combined_path, path2); + } + + hr = PathAllocCanonicalize(combined_path, flags, out); + HeapFree(GetProcessHeap(), 0, combined_path); + return hr; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchAddBackslash( + _Inout_updates_(size) PWSTR path, + _In_ size_t size) +#else +HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) +#endif +{ + return PathCchAddBackslashEx(path, size, NULL, NULL); +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchAddBackslashEx( + _Inout_updates_(size) PWSTR path, + _In_ size_t size, + _Outptr_opt_result_buffer_(*remaining) PWSTR* endptr, + _Out_opt_ size_t* remaining) +#else +HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, SIZE_T *remaining) +#endif +{ + BOOL needs_termination; + SIZE_T length; + + TRACE("%s, %Iu, %p, %p\n", debugstr_w(path), size, endptr, remaining); + + length = lstrlenW(path); + needs_termination = size && length && path[length - 1] != '\\'; + + if (length >= (needs_termination ? size - 1 : size)) + { + if (endptr) *endptr = NULL; + if (remaining) *remaining = 0; + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + + if (!needs_termination) + { + if (endptr) *endptr = path + length; + if (remaining) *remaining = size - length; + return S_FALSE; + } + + path[length++] = '\\'; + path[length] = 0; + + if (endptr) *endptr = path + length; + if (remaining) *remaining = size - length; + + return S_OK; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchAddExtension( + _Inout_updates_(size) PWSTR path, + _In_ size_t size, + _In_ PCWSTR extension) +#else +HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +#endif +{ + const WCHAR *existing_extension, *next; + SIZE_T path_length, extension_length, dot_length; + BOOL has_dot; + HRESULT hr; + + TRACE("%s %Iu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + if (!path || !size || size > PATHCCH_MAX_CCH || !extension) return E_INVALIDARG; + + next = extension; + while (*next) + { + if ((*next == '.' && next > extension) || *next == ' ' || *next == '\\') return E_INVALIDARG; + next++; + } + + has_dot = extension[0] == '.'; + + hr = PathCchFindExtension(path, size, &existing_extension); + if (FAILED(hr)) return hr; + if (*existing_extension) return S_FALSE; + + path_length = wcsnlen(path, size); + dot_length = has_dot ? 0 : 1; + extension_length = lstrlenW(extension); + + if (path_length + dot_length + extension_length + 1 > size) return STRSAFE_E_INSUFFICIENT_BUFFER; + + /* If extension is empty or only dot, return S_OK with path unchanged */ + if (!extension[0] || (extension[0] == '.' && !extension[1])) return S_OK; + + if (!has_dot) + { + path[path_length] = '.'; + path_length++; + } + + lstrcpyW(path + path_length, extension); + return S_OK; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchAppend( + _Inout_updates_(size) PWSTR path1, + _In_ size_t size, + _In_opt_ PCWSTR path2) +#else +HRESULT WINAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2) +#endif +{ + TRACE("%s %Iu %s\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2)); + + return PathCchAppendEx(path1, size, path2, PATHCCH_NONE); +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchAppendEx( + _Inout_updates_(size) PWSTR path1, + _In_ size_t size, + _In_opt_ PCWSTR path2, + _In_ /* PATHCCH_OPTIONS */ ULONG flags) +#else +HRESULT WINAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags) +#endif +{ + HRESULT hr; + WCHAR *result; + + TRACE("%s %Iu %s %#lx\n", wine_dbgstr_w(path1), size, wine_dbgstr_w(path2), flags); + + if (!path1 || !size) return E_INVALIDARG; + + /* Create a temporary buffer for result because we need to keep path1 unchanged if error occurs. + * And PathCchCombineEx writes empty result if there is error so we can't just use path1 as output + * buffer for PathCchCombineEx */ + result = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!result) return E_OUTOFMEMORY; + + /* Avoid the single backslash behavior with PathCchCombineEx when appending */ + if (path2 && path2[0] == '\\' && path2[1] != '\\') path2++; + + hr = PathCchCombineEx(result, size, path1, path2, flags); + if (SUCCEEDED(hr)) memcpy(path1, result, size * sizeof(WCHAR)); + + HeapFree(GetProcessHeap(), 0, result); + return hr; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchCanonicalize( + _Out_writes_(size) PWSTR out, + _In_ size_t size, + _In_ PCWSTR in) +#else +HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in) +#endif +{ + TRACE("%p %Iu %s\n", out, size, wine_dbgstr_w(in)); + + /* Not X:\ and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */ + if (lstrlenW(in) > MAX_PATH - 4 && !(is_drive_spec( in ) && in[2] == '\\')) + return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + + return PathCchCanonicalizeEx(out, size, in, PATHCCH_NONE); +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchCanonicalizeEx( + _Out_writes_(size) PWSTR out, + _In_ size_t size, + _In_ PCWSTR in, + _In_ /* PATHCCH_OPTIONS */ ULONG flags) +#else +HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags) +#endif +{ + WCHAR *buffer; + SIZE_T length; + HRESULT hr; + + TRACE("%p %Iu %s %#lx\n", out, size, wine_dbgstr_w(in), flags); + + if (!size) return E_INVALIDARG; + + hr = PathAllocCanonicalize(in, flags, &buffer); + if (FAILED(hr)) return hr; + + length = lstrlenW(buffer); + if (size < length + 1) + { + /* No root and path > MAX_PATH - 4, return HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE) */ + if (length > MAX_PATH - 4 && !(in[0] == '\\' || (is_drive_spec( in ) && in[2] == '\\'))) + hr = HRESULT_FROM_WIN32(ERROR_FILENAME_EXCED_RANGE); + else + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + } + + if (SUCCEEDED(hr)) + { + memcpy(out, buffer, (length + 1) * sizeof(WCHAR)); + + /* Fill a backslash at the end of X: */ + if (is_drive_spec( out ) && !out[2] && size > 3) + { + out[2] = '\\'; + out[3] = 0; + } + } + + LocalFree(buffer); + return hr; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchCombine( + _Out_writes_(size) PWSTR out, + _In_ size_t size, + _In_opt_ PCWSTR path1, + _In_opt_ PCWSTR path2) +#else +HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2) +#endif +{ + TRACE("%p %s %s\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2)); + + return PathCchCombineEx(out, size, path1, path2, PATHCCH_NONE); +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchCombineEx( + _Out_writes_(size) PWSTR out, + _In_ size_t size, + _In_opt_ PCWSTR path1, + _In_opt_ PCWSTR path2, + _In_ /* PATHCCH_OPTIONS */ ULONG flags) +#else +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags) +#endif +{ + HRESULT hr; + WCHAR *buffer; + SIZE_T length; + + TRACE("%p %s %s %#lx\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags); + + if (!out || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathAllocCombine(path1, path2, flags, &buffer); + if (FAILED(hr)) + { + out[0] = 0; + return hr; + } + + length = lstrlenW(buffer); + if (length + 1 > size) + { + out[0] = 0; + LocalFree(buffer); + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + { + memcpy(out, buffer, (length + 1) * sizeof(WCHAR)); + LocalFree(buffer); + return S_OK; + } +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchFindExtension( + _In_reads_(size) PCWSTR path, + _In_ size_t size, + _Outptr_ PCWSTR* extension) +#else +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) +#endif +{ + const WCHAR *lastpoint = NULL; + SIZE_T counter = 0; + + TRACE("%s %Iu %p\n", wine_dbgstr_w(path), size, extension); + + if (!path || !size || size > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + while (*path) + { + if (*path == '\\' || *path == ' ') + lastpoint = NULL; + else if (*path == '.') + lastpoint = path; + + path++; + counter++; + if (counter == size || counter == PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + } + + *extension = lastpoint ? lastpoint : path; + return S_OK; +} + +#ifdef __REACTOS__ +BOOL +APIENTRY +PathCchIsRoot( + _In_opt_ PCWSTR path) +#else +BOOL WINAPI PathCchIsRoot(const WCHAR *path) +#endif +{ + const WCHAR *root_end; + const WCHAR *next; + BOOL is_unc; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) return FALSE; + + root_end = get_root_end(path); + if (!root_end) return FALSE; + + if ((is_unc = is_prefixed_unc(path)) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?')) + { + next = root_end + 1; + /* No extra segments */ + if ((is_unc && !*next) || (!is_unc && !*next)) return TRUE; + + /* Has first segment with an ending backslash but no remaining characters */ + if (get_next_segment(next, &next) && !*next) return FALSE; + /* Has first segment with no ending backslash */ + else if (!*next) + return TRUE; + /* Has first segment with an ending backslash and has remaining characters*/ + else + { + next++; + /* Second segment must have no backslash and no remaining characters */ + return !get_next_segment(next, &next) && !*next; + } + } + else if (*root_end == '\\' && !root_end[1]) + return TRUE; + else + return FALSE; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchRemoveBackslash( + _Inout_updates_(path_size) PWSTR path, + _In_ size_t path_size) +#else +HRESULT WINAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size) +#endif +{ + WCHAR *path_end; + SIZE_T free_size; + + TRACE("%s %Iu\n", debugstr_w(path), path_size); + + return PathCchRemoveBackslashEx(path, path_size, &path_end, &free_size); +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchRemoveBackslashEx( + _Inout_updates_(path_size) PWSTR path, + _In_ size_t path_size, + _Outptr_opt_result_buffer_(*free_size) PWSTR* path_end, + _Out_opt_ size_t* free_size) +#else +HRESULT WINAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size) +#endif +{ + const WCHAR *root_end; + SIZE_T path_length; + + TRACE("%s %Iu %p %p\n", debugstr_w(path), path_size, path_end, free_size); + + if (!path_size || !path_end || !free_size) + { + if (path_end) *path_end = NULL; + if (free_size) *free_size = 0; + return E_INVALIDARG; + } + + path_length = wcsnlen(path, path_size); + if (path_length == path_size && !path[path_length]) return E_INVALIDARG; + + root_end = get_root_end(path); + if (path_length > 0 && path[path_length - 1] == '\\') + { + *path_end = path + path_length - 1; + *free_size = path_size - path_length + 1; + /* If the last character is beyond end of root */ + if (!root_end || path + path_length - 1 > root_end) + { + path[path_length - 1] = 0; + return S_OK; + } + else + return S_FALSE; + } + else + { + *path_end = path + path_length; + *free_size = path_size - path_length; + return S_FALSE; + } +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchRemoveExtension( + _Inout_updates_(size) PWSTR path, + _In_ size_t size) +#else +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) +#endif +{ + const WCHAR *extension; + WCHAR *next; + HRESULT hr; + + TRACE("%s %Iu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathCchFindExtension(path, size, &extension); + if (FAILED(hr)) return hr; + + next = path + (extension - path); + while (next - path < size && *next) *next++ = 0; + + return next == extension ? S_FALSE : S_OK; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchRemoveFileSpec( + _Inout_updates_(size) PWSTR path, + _In_ size_t size) +#else +HRESULT WINAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size) +#endif +{ + const WCHAR *root_end = NULL; + SIZE_T length; + WCHAR *last; + + TRACE("%s %Iu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + if (PathCchIsRoot(path)) return S_FALSE; + + PathCchSkipRoot(path, &root_end); + + /* The backslash at the end of UNC and \\* are not considered part of root in this case */ + if (root_end && root_end > path && root_end[-1] == '\\' + && (is_prefixed_unc(path) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?'))) + root_end--; + + length = lstrlenW(path); + last = path + length - 1; + while (last >= path && (!root_end || last >= root_end)) + { + if (last - path >= size) return E_INVALIDARG; + + if (*last == '\\') + { + *last-- = 0; + break; + } + + *last-- = 0; + } + + return last != path + length - 1 ? S_OK : S_FALSE; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchRenameExtension( + _Inout_updates_(size) PWSTR path, + _In_ size_t size, + _In_ PCWSTR extension) +#else +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +#endif +{ + HRESULT hr; + + TRACE("%s %Iu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + hr = PathCchRemoveExtension(path, size); + if (FAILED(hr)) return hr; + + hr = PathCchAddExtension(path, size, extension); + return FAILED(hr) ? hr : S_OK; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchSkipRoot( + _In_ PCWSTR path, + _Outptr_ PCWSTR* root_end) +#else +HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end) +#endif +{ + TRACE("%s %p\n", debugstr_w(path), root_end); + + if (!path || !path[0] || !root_end + || (!wcsnicmp(path, L"\\\\?", 3) && !is_prefixed_volume(path) && !is_prefixed_unc(path) + && !is_prefixed_disk(path))) + return E_INVALIDARG; + + *root_end = get_root_end(path); + if (*root_end) + { + (*root_end)++; + if (is_prefixed_unc(path)) + { + get_next_segment(*root_end, root_end); + get_next_segment(*root_end, root_end); + } + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + { + /* Skip share server */ + get_next_segment(*root_end, root_end); + /* If mount point is empty, don't skip over mount point */ + if (**root_end != '\\') get_next_segment(*root_end, root_end); + } + } + + return *root_end ? S_OK : E_INVALIDARG; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchStripPrefix( + _Inout_updates_(size) PWSTR path, + _In_ size_t size) +#else +HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) +#endif +{ + TRACE("%s %Iu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + if (is_prefixed_unc(path)) + { + /* \\?\UNC\a -> \\a */ + if (size < lstrlenW(path + 8) + 3) return E_INVALIDARG; + lstrcpyW(path + 2, path + 8); + return S_OK; + } + else if (is_prefixed_disk(path)) + { + /* \\?\C:\ -> C:\ */ + if (size < lstrlenW(path + 4) + 1) return E_INVALIDARG; + lstrcpyW(path, path + 4); + return S_OK; + } + else + return S_FALSE; +} + +#ifdef __REACTOS__ +HRESULT +APIENTRY +PathCchStripToRoot( + _Inout_updates_(size) PWSTR path, + _In_ size_t size) +#else +HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size) +#endif +{ + const WCHAR *root_end; + WCHAR *segment_end; + BOOL is_unc; + + TRACE("%s %Iu\n", wine_dbgstr_w(path), size); + + if (!path || !*path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + /* \\\\?\\UNC\\* and \\\\* have to have at least two extra segments to be striped, + * e.g. \\\\?\\UNC\\a\\b\\c -> \\\\?\\UNC\\a\\b + * \\\\a\\b\\c -> \\\\a\\b */ + if ((is_unc = is_prefixed_unc(path)) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?')) + { + root_end = is_unc ? path + 8 : path + 3; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path) - 1; + *segment_end = 0; + return S_OK; + } + else if (PathCchSkipRoot(path, &root_end) == S_OK) + { + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path); + if (!*segment_end) return S_FALSE; + + *segment_end = 0; + return S_OK; + } + else + return E_INVALIDARG; +} + +#ifdef __REACTOS__ +BOOL +APIENTRY +PathIsUNCEx( + _In_ PCWSTR path, + _Outptr_opt_ PCWSTR* server) +#else +BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) +#endif +{ + const WCHAR *result = NULL; + + TRACE("%s %p\n", wine_dbgstr_w(path), server); + + if (is_prefixed_unc(path)) + result = path + 8; + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + result = path + 2; + + if (server) *server = result; + return !!result; +} diff --git a/sdk/lib/pathcch/pathcch.h b/sdk/lib/pathcch/pathcch.h new file mode 100644 index 00000000000..ddda4f1a90a --- /dev/null +++ b/sdk/lib/pathcch/pathcch.h @@ -0,0 +1,360 @@ +/* + * PROJECT: ReactOS PSDK + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: "Secure" shell path manipulation functions + * COPYRIGHT: MinGW-64 and Microsoft Corporation. + */ + +/** + * This file is part of the mingw-w64 runtime package. + * No warranty is given; refer to the file DISCLAIMER within this package. + */ + +#pragma once + + +#ifndef WINBASEAPI +#ifndef _KERNEL32_ +#define WINBASEAPI DECLSPEC_IMPORT +#else +#define WINBASEAPI +#endif +#endif + + +#ifndef WINPATHCCHAPI +#ifndef STATIC_PATHCCH +#define WINPATHCCHAPI WINBASEAPI +#else +#define WINPATHCCHAPI +#endif +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +// typedef enum PATHCCH_OPTIONS +#define PATHCCH_NONE 0x00 +#define PATHCCH_ALLOW_LONG_PATHS 0x01 +#define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS 0x02 +#define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04 +#define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 +#define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_ENSURE_TRAILING_SLASH 0x20 +// DEFINE_ENUM_FLAG_OPERATORS(PATHCCH_OPTIONS) + +#define VOLUME_PREFIX L"\\\\?\\Volume" +#define VOLUME_PREFIX_LEN (ARRAYSIZE(VOLUME_PREFIX) - 1) + +#define PATHCCH_MAX_CCH 0x8000 + +WINPATHCCHAPI +HRESULT +APIENTRY +PathAllocCanonicalize( + _In_ PCWSTR pszPathIn, + _In_ /* PATHCCH_OPTIONS */ ULONG dwFlags, + _Outptr_ PWSTR* ppszPathOut); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathAllocCombine( + _In_opt_ PCWSTR pszPathIn, + _In_opt_ PCWSTR pszMore, + _In_ /* PATHCCH_OPTIONS */ ULONG dwFlags, + _Outptr_ PWSTR* ppszPathOut); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchAddBackslash( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchAddBackslashEx( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _Outptr_opt_result_buffer_(*pcchRemaining) PWSTR* ppszEnd, + _Out_opt_ size_t* pcchRemaining); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchAddExtension( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _In_ PCWSTR pszExt); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchAppend( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _In_opt_ PCWSTR pszMore); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchAppendEx( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _In_opt_ PCWSTR pszMore, + _In_ /* PATHCCH_OPTIONS */ ULONG dwFlags); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchCanonicalize( + _Out_writes_(cchPathOut) PWSTR pszPathOut, + _In_ size_t cchPathOut, + _In_ PCWSTR pszPathIn); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchCanonicalizeEx( + _Out_writes_(cchPathOut) PWSTR pszPathOut, + _In_ size_t cchPathOut, + _In_ PCWSTR pszPathIn, + _In_ /* PATHCCH_OPTIONS */ ULONG dwFlags); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchCombine( + _Out_writes_(cchPathOut) PWSTR pszPathOut, + _In_ size_t cchPathOut, + _In_opt_ PCWSTR pszPathIn, + _In_opt_ PCWSTR pszMore); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchCombineEx( + _Out_writes_(cchPathOut) PWSTR pszPathOut, + _In_ size_t cchPathOut, + _In_opt_ PCWSTR pszPathIn, + _In_opt_ PCWSTR pszMore, + _In_ /* PATHCCH_OPTIONS */ ULONG dwFlags); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchFindExtension( + _In_reads_(cchPath) PCWSTR pszPath, + _In_ size_t cchPath, + _Outptr_ PCWSTR* ppszExt); + +WINPATHCCHAPI +BOOL +APIENTRY +PathCchIsRoot( + _In_opt_ PCWSTR pszPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchRemoveBackslash( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchRemoveBackslashEx( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _Outptr_opt_result_buffer_(*pcchRemaining) PWSTR* ppszEnd, + _Out_opt_ size_t* pcchRemaining); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchRemoveExtension( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchRemoveFileSpec( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchRenameExtension( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _In_ PCWSTR pszExt); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchSkipRoot( + _In_ PCWSTR pszPath, + _Outptr_ PCWSTR* ppszRootEnd); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchStripPrefix( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +HRESULT +APIENTRY +PathCchStripToRoot( + _Inout_updates_(cchPath) PWSTR pszPath, + _In_ size_t cchPath); + +WINPATHCCHAPI +BOOL +APIENTRY +PathIsUNCEx( + _In_ PCWSTR pszPath, + _Outptr_opt_ PCWSTR* ppszServer); + + +#ifndef PATHCCH_NO_DEPRECATE + +#undef PathAddBackslash +#undef PathAddBackslashA +#undef PathAddBackslashW + +#undef PathAddExtension +#undef PathAddExtensionA +#undef PathAddExtensionW + +#undef PathAppend +#undef PathAppendA +#undef PathAppendW + +#undef PathCanonicalize +#undef PathCanonicalizeA +#undef PathCanonicalizeW + +#undef PathCombine +#undef PathCombineA +#undef PathCombineW + +#undef PathRenameExtension +#undef PathRenameExtensionA +#undef PathRenameExtensionW + + +#ifdef DEPRECATE_SUPPORTED + +// #pragma deprecated(PathIsRelativeWorker) +// #pragma deprecated(StrIsEqualWorker) +// #pragma deprecated(FindPreviousBackslashWorker) +// #pragma deprecated(IsHexDigitWorker) +// #pragma deprecated(StringIsGUIDWorker) +// #pragma deprecated(PathIsVolumeGUIDWorker) +// #pragma deprecated(IsValidExtensionWorker) + +#pragma deprecated(PathAddBackslash) +#pragma deprecated(PathAddBackslashA) +#pragma deprecated(PathAddBackslashW) + +#pragma deprecated(PathAddExtension) +#pragma deprecated(PathAddExtensionA) +#pragma deprecated(PathAddExtensionW) + +#pragma deprecated(PathAppend) +#pragma deprecated(PathAppendA) +#pragma deprecated(PathAppendW) + +#pragma deprecated(PathCanonicalize) +#pragma deprecated(PathCanonicalizeA) +#pragma deprecated(PathCanonicalizeW) + +#pragma deprecated(PathCombine) +#pragma deprecated(PathCombineA) +#pragma deprecated(PathCombineW) + +#pragma deprecated(PathRenameExtension) +#pragma deprecated(PathRenameExtensionA) +#pragma deprecated(PathRenameExtensionW) + +#else // !DEPRECATE_SUPPORTED + +// #define PathIsRelativeWorker PathIsRelativeWorker_is_internal_to_pathcch; +// #define StrIsEqualWorker StrIsEqualWorker_is_internal_to_pathcch; +// #define FindPreviousBackslashWorker FindPreviousBackslashWorker_is_internal_to_pathcch; +// #define IsHexDigitWorker IsHexDigitWorker_is_internal_to_pathcch; +// #define StringIsGUIDWorker StringIsGUIDWorker_is_internal_to_pathcch; +// #define PathIsVolumeGUIDWorker PathIsVolumeGUIDWorker_is_internal_to_pathcch; +// #define IsValidExtensionWorker IsValidExtensionWorker_is_internal_to_pathcch; + +#define PathAddBackslash PathAddBackslash_instead_use_PathCchAddBackslash; +#define PathAddBackslashA PathAddBackslash_instead_use_PathCchAddBackslash; +#define PathAddBackslashW PathAddBackslash_instead_use_PathCchAddBackslash; + +#define PathAddExtension PathAddExtension_instead_use_PathCchAddExtension; +#define PathAddExtensionA PathAddExtension_instead_use_PathCchAddExtension; +#define PathAddExtensionW PathAddExtension_instead_use_PathCchAddExtension; + +#define PathAppend PathAppend_instead_use_PathCchAppend; +#define PathAppendA PathAppend_instead_use_PathCchAppend; +#define PathAppendW PathAppend_instead_use_PathCchAppend; + +#define PathCanonicalize PathCanonicalize_instead_use_PathCchCanonicalize; +#define PathCanonicalizeA PathCanonicalize_instead_use_PathCchCanonicalize; +#define PathCanonicalizeW PathCanonicalize_instead_use_PathCchCanonicalize; + +#define PathCombine PathCombine_instead_use_PathCchCombine; +#define PathCombineA PathCombine_instead_use_PathCchCombine; +#define PathCombineW PathCombine_instead_use_PathCchCombine; + +#define PathRenameExtension PathRenameExtension_instead_use_PathCchRenameExtension; +#define PathRenameExtensionA PathRenameExtension_instead_use_PathCchRenameExtension; +#define PathRenameExtensionW PathRenameExtension_instead_use_PathCchRenameExtension; + +#endif // DEPRECATE_SUPPORTED + +#endif // PATHCCH_NO_DEPRECATE + +#ifdef __cplusplus +} +#endif + + +/* C++ non-const overloads */ +#ifdef __cplusplus + +__inline HRESULT +PathCchFindExtension( + _In_reads_(cchPath) PWSTR pszPath, + _In_ size_t cchPath, + _Outptr_ PWSTR* ppszExt) +{ + return PathCchFindExtension(const_cast<PCWSTR>(pszPath), cchPath, const_cast<PCWSTR*>(ppszExt)); +} + +__inline HRESULT +PathCchSkipRoot( + _In_ PWSTR pszPath, + _Outptr_ PWSTR* ppszRootEnd) +{ + return PathCchSkipRoot(const_cast<PCWSTR>(pszPath), const_cast<PCWSTR*>(ppszRootEnd)); +} + +__inline BOOL +PathIsUNCEx( + _In_ PWSTR pszPath, + _Outptr_opt_ PWSTR* ppszServer) +{ + return PathIsUNCEx(const_cast<PCWSTR>(pszPath), const_cast<PCWSTR*>(ppszServer)); +} + +#endif // __cplusplus

9 months, 3 weeks

[reactos] 01/01: [ZIPFLDR] Fix off-by-one count error during enumeration (#6040)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7777f59637e3137f3e18… commit c7777f59637e3137f3e18d20fd0191e1b258bdf7 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Nov 26 13:41:02 2023 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 26 13:41:02 2023 +0100 [ZIPFLDR] Fix off-by-one count error during enumeration (#6040) CORE-19342 --- dll/shellext/zipfldr/CEnumZipContents.cpp | 33 +++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dll/shellext/zipfldr/CEnumZipContents.cpp b/dll/shellext/zipfldr/CEnumZipContents.cpp index a3f5bcbf79c..4367c279f53 100644 --- a/dll/shellext/zipfldr/CEnumZipContents.cpp +++ b/dll/shellext/zipfldr/CEnumZipContents.cpp @@ -37,22 +37,35 @@ public: if (!rgelt || (!pceltFetched && celt != 1)) return E_POINTER; + HRESULT hr = S_OK; + ULONG fetched = 0; LPITEMIDLIST item; CStringW name; bool dir; unz_file_info64 info; - for (ULONG i = 0; i < celt; ++i) + + while (fetched < celt) { - if (pceltFetched) - *pceltFetched = i; - if (!mEnumerator.next_unique(m_Prefix, name, dir, info)) - return S_FALSE; - item = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info); - if (!item) - return i ? S_FALSE : E_OUTOFMEMORY; - rgelt[i] = item; + if (mEnumerator.next_unique(m_Prefix, name, dir, info)) + { + item = _ILCreate(dir ? ZIP_PIDL_DIRECTORY : ZIP_PIDL_FILE, name, info); + if (!item) + { + hr = fetched ? S_FALSE : E_OUTOFMEMORY; + break; + } + rgelt[fetched++] = item; + } + else + { + hr = S_FALSE; + break; + } } - return S_OK; + + if (pceltFetched) + *pceltFetched = fetched; + return hr; } STDMETHODIMP Skip(ULONG celt) {

9 months, 3 weeks

[reactos] 01/01: [KERNEL32] Implement SetComPlusPackageInstallStatus

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af7defb5566c715a6a0a6… commit af7defb5566c715a6a0a63835e79cd4a31fd6965 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 26 21:30:00 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 26 21:30:00 2023 +0900 [KERNEL32] Implement SetComPlusPackageInstallStatus --- dll/win32/kernel32/client/appcache.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dll/win32/kernel32/client/appcache.c b/dll/win32/kernel32/client/appcache.c index 81ffaefc3b8..0b2ebec1afe 100644 --- a/dll/win32/kernel32/client/appcache.c +++ b/dll/win32/kernel32/client/appcache.c @@ -415,14 +415,32 @@ GetComPlusPackageInstallStatus(VOID) } /* - * @unimplemented + * @implemented */ BOOL WINAPI -SetComPlusPackageInstallStatus(LPVOID lpInfo) +SetComPlusPackageInstallStatus(IN ULONG ComPlusPackage) { - STUB; - return FALSE; + NTSTATUS Status; + + DPRINT("(0x%X)\n", ComPlusPackage); + + if (ComPlusPackage & ~1) + { + DPRINT1("0x%lX\n", ComPlusPackage); + BaseSetLastNTError(STATUS_INVALID_PARAMETER); + return FALSE; + } + + Status = NtSetSystemInformation(SystemComPlusPackage, &ComPlusPackage, sizeof(ComPlusPackage)); + if (!NT_SUCCESS(Status)) + { + DPRINT1("0x%lX\n", Status); + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } /*

9 months, 3 weeks

[reactos] 01/01: [GDI32_APITEST] Strengthen PatBlt with negative values

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f3bd8ffb203180a09299b… commit f3bd8ffb203180a09299b767571d1db8f59008f1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 26 15:31:00 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 26 15:31:00 2023 +0900 [GDI32_APITEST] Strengthen PatBlt with negative values CORE-19334 --- modules/rostests/apitests/gdi32/PatBlt.c | 42 ++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/modules/rostests/apitests/gdi32/PatBlt.c b/modules/rostests/apitests/gdi32/PatBlt.c index 456319218e2..ee0244ac9cc 100644 --- a/modules/rostests/apitests/gdi32/PatBlt.c +++ b/modules/rostests/apitests/gdi32/PatBlt.c @@ -1,8 +1,9 @@ /* * PROJECT: ReactOS api tests * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: Test for ... + * PURPOSE: Test for PatBlt * PROGRAMMERS: Timo Kreuzer + * Katayama Hirofumi MZ */ #include "precomp.h" @@ -16,6 +17,8 @@ void Test_PatBlt_Params() BOOL ret; ULONG i, rop; HDC hdc; + HBITMAP hBitmap; + HGDIOBJ hOldBitmap; /* Test a rop that contains only the operation index */ ret = PatBlt(hdcTarget, 0, 0, 1, 1, PATCOPY & 0x00FF0000); @@ -73,8 +76,36 @@ void Test_PatBlt_Params() ok_err(0); DeleteDC(hdc); - - + /* Test with bitmap and negative values */ + hdc = CreateCompatibleDC(NULL); + hBitmap = CreateCompatibleBitmap(hdc, 8, 8); + hOldBitmap = SelectObject(hdc, hBitmap); + SelectObject(hdc, GetStockObject(WHITE_BRUSH)); + ok_long(PatBlt(hdc, 2, 2, -1, 1, PATCOPY), TRUE); + ok_long(GetPixel(hdc, 1, 1), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 1, 2), RGB(255, 255, 255)); + ok_long(GetPixel(hdc, 1, 3), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 1), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 2), RGB(0, 0, 0)); + SetPixel(hdc, 1, 2, RGB(0, 0, 0)); + ok_long(PatBlt(hdc, 2, 2, 1, -1, PATCOPY), TRUE); + ok_long(GetPixel(hdc, 1, 2), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 1, 3), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 1), RGB(255, 255, 255)); + ok_long(GetPixel(hdc, 2, 2), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 3), RGB(0, 0, 0)); + SetPixel(hdc, 2, 1, RGB(0, 0, 0)); + ok_long(PatBlt(hdc, 3, 2, -2, -1, PATCOPY), TRUE); + ok_long(GetPixel(hdc, 0, 2), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 0, 3), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 1, 1), RGB(255, 255, 255)); + ok_long(GetPixel(hdc, 1, 2), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 1, 3), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 1), RGB(255, 255, 255)); + ok_long(GetPixel(hdc, 2, 2), RGB(0, 0, 0)); + ok_long(GetPixel(hdc, 2, 3), RGB(0, 0, 0)); + DeleteObject(SelectObject(hdc, hOldBitmap)); + DeleteDC(hdc); } void Test_BrushOrigin() @@ -120,7 +151,6 @@ void Test_BrushOrigin() ok_long(gpulTargetBits[16], 0); ok_long(gpulTargetBits[17], 0xffffff); ok_long(gpulTargetBits[18], 0); - } START_TEST(PatBlt) @@ -157,7 +187,6 @@ START_TEST(PatBlt) return; } - if (!SelectObject(hdcTarget, ghbmpTarget)) { printf("Failed to select bitmap\n"); @@ -167,7 +196,4 @@ START_TEST(PatBlt) Test_PatBlt_Params(); Test_BrushOrigin(); - - } -

9 months, 3 weeks

[reactos] 01/01: [NTGDI] Fix PatBlt with negative values (#6038)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bfa0cd0d27a31580abc2… commit 0bfa0cd0d27a31580abc2d0598fdd1f02c49ee71 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 26 11:46:42 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 26 11:46:42 2023 +0900 [NTGDI] Fix PatBlt with negative values (#6038) When I am implementing the IME soft keyboard (#6021 and #6036), I noticed an issue with PatBlt function. - Fix the rectangle coordinates when the value was negative in NtGdiPatBlt function. - Fix NC_DrawFrame function. - Fix UserDrawWindowFrame function. CORE-19334 --- win32ss/gdi/ntgdi/bitblt.c | 12 ++++++------ win32ss/user/ntuser/nonclient.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/win32ss/gdi/ntgdi/bitblt.c b/win32ss/gdi/ntgdi/bitblt.c index c86bbbc53ba..ab45fe82019 100644 --- a/win32ss/gdi/ntgdi/bitblt.c +++ b/win32ss/gdi/ntgdi/bitblt.c @@ -858,26 +858,26 @@ IntPatBlt( return TRUE; } - if (Width > 0) + if (Width >= 0) { DestRect.left = XLeft; DestRect.right = XLeft + Width; } else { - DestRect.left = XLeft + Width + 1; - DestRect.right = XLeft + 1; + DestRect.left = XLeft + Width; + DestRect.right = XLeft; } - if (Height > 0) + if (Height >= 0) { DestRect.top = YLeft; DestRect.bottom = YLeft + Height; } else { - DestRect.top = YLeft + Height + 1; - DestRect.bottom = YLeft + 1; + DestRect.top = YLeft + Height; + DestRect.bottom = YLeft; } IntLPtoDP(pdc, (LPPOINT)&DestRect, 2); diff --git a/win32ss/user/ntuser/nonclient.c b/win32ss/user/ntuser/nonclient.c index 69291c50adb..a3852066b69 100644 --- a/win32ss/user/ntuser/nonclient.c +++ b/win32ss/user/ntuser/nonclient.c @@ -47,8 +47,8 @@ UserDrawWindowFrame(HDC hdc, HBRUSH hbrush = NtGdiSelectBrush( hdc, gpsi->hbrGray ); NtGdiPatBlt( hdc, rect->left, rect->top, rect->right - rect->left - width, height, PATINVERT ); NtGdiPatBlt( hdc, rect->left, rect->top + height, width, rect->bottom - rect->top - height, PATINVERT ); - NtGdiPatBlt( hdc, rect->left + width, rect->bottom - 1, rect->right - rect->left - width, -(LONG)height, PATINVERT ); - NtGdiPatBlt( hdc, rect->right - 1, rect->top, -(LONG)width, rect->bottom - rect->top - height, PATINVERT ); + NtGdiPatBlt( hdc, rect->left + width, rect->bottom, rect->right - rect->left - width, -(LONG)height, PATINVERT ); + NtGdiPatBlt( hdc, rect->right, rect->top, -(LONG)width, rect->bottom - rect->top - height, PATINVERT ); NtGdiSelectBrush( hdc, hbrush ); } @@ -891,8 +891,8 @@ NC_DrawFrame( HDC hDC, RECT *CurrentRect, BOOL Active, DWORD Style, DWORD ExStyl /* Draw frame */ NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->top, CurrentRect->right - CurrentRect->left, Height, PATCOPY); NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->top, Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); - NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->bottom - 1, CurrentRect->right - CurrentRect->left, -Height, PATCOPY); - NtGdiPatBlt(hDC, CurrentRect->right - 1, CurrentRect->top, -Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); + NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->bottom, CurrentRect->right - CurrentRect->left, -Height, PATCOPY); + NtGdiPatBlt(hDC, CurrentRect->right, CurrentRect->top, -Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); RECTL_vInflateRect(CurrentRect, -Width, -Height); } @@ -912,8 +912,8 @@ NC_DrawFrame( HDC hDC, RECT *CurrentRect, BOOL Active, DWORD Style, DWORD ExStyl /* Draw frame */ NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->top, CurrentRect->right - CurrentRect->left, Height, PATCOPY); NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->top, Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); - NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->bottom - 1, CurrentRect->right - CurrentRect->left, -Height, PATCOPY); - NtGdiPatBlt(hDC, CurrentRect->right - 1, CurrentRect->top, -Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); + NtGdiPatBlt(hDC, CurrentRect->left, CurrentRect->bottom, CurrentRect->right - CurrentRect->left, -Height, PATCOPY); + NtGdiPatBlt(hDC, CurrentRect->right, CurrentRect->top, -Width, CurrentRect->bottom - CurrentRect->top, PATCOPY); RECTL_vInflateRect(CurrentRect, -Width, -Height); }

9 months, 3 weeks

[reactos] 01/01: [IMM32] Implement CtfImmTIMCreateInputContext

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90e17817fed7be025617c… commit 90e17817fed7be025617c296ee66ca0240b3f700 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 26 09:20:07 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 26 09:20:07 2023 +0900 [IMM32] Implement CtfImmTIMCreateInputContext CORE-19268 --- dll/win32/imm32/ctf.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index a1768d2d659..dd325d472f7 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -410,8 +410,52 @@ HRESULT CtfImmTIMCreateInputContext( _In_ HIMC hIMC) { + PCLIENTIMC pClientImc; + DWORD_PTR dwImeThreadId, dwCurrentThreadId; + HRESULT hr = S_FALSE; + TRACE("(%p)\n", hIMC); - return E_NOTIMPL; + + pClientImc = ImmLockClientImc(hIMC); + if (!pClientImc) + return E_FAIL; + + if (GetWin32ClientInfo()->CI_flags & CI_AIMMACTIVATED) + { + if (!pClientImc->bUnknown4) + { + dwImeThreadId = NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); + dwCurrentThreadId = GetCurrentThreadId(); + if (dwImeThreadId == dwCurrentThreadId) + { + pClientImc->bUnknown4 = 1; + hr = CtfImeCreateInputContext(hIMC); + if (FAILED(hr)) + pClientImc->bUnknown4 = 0; + } + } + } + else + { + if (!(GetWin32ClientInfo()->CI_flags & 0x100)) + return S_OK; + + if (!pClientImc->bUnknown4) + { + dwImeThreadId = NtUserQueryInputContext(hIMC, QIC_INPUTTHREADID); + dwCurrentThreadId = GetCurrentThreadId(); + if ((dwImeThreadId == dwCurrentThreadId) && IS_CICERO_MODE() && !IS_16BIT_MODE()) + { + pClientImc->bUnknown4 = 1; + hr = CtfImeCreateInputContext(hIMC); + if (FAILED(hr)) + pClientImc->bUnknown4 = 0; + } + } + } + + ImmUnlockClientImc(pClientImc); + return hr; } /***********************************************************************

9 months, 3 weeks

[reactos] 01/01: [IMM32][SDK] Implement CtfImmSetCiceroStartInThread

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d0b6f318589c5a07bce1… commit 9d0b6f318589c5a07bce1fc164a29c6264860fad Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Nov 26 08:58:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Nov 26 08:58:59 2023 +0900 [IMM32][SDK] Implement CtfImmSetCiceroStartInThread - Add CtfImmSetCiceroStartInThread function. - Add its prototype to <imm32_undoc.h> - Modify imm32.spec. CORE-19268 --- dll/win32/imm32/ctf.c | 12 ++++++++++++ dll/win32/imm32/imm32.spec | 1 + sdk/include/reactos/imm32_undoc.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index 1fc124f24b5..a1768d2d659 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -330,6 +330,18 @@ CtfImmIsCiceroStartedInThread(VOID) return !!(GetWin32ClientInfo()->CI_flags & 0x200); } +/*********************************************************************** + * CtfImmSetCiceroStartInThread (IMM32.@) + */ +VOID WINAPI CtfImmSetCiceroStartInThread(_In_ BOOL bStarted) +{ + TRACE("(%d)\n", bStarted); + if (bStarted) + GetWin32ClientInfo()->CI_flags |= 0x200; + else + GetWin32ClientInfo()->CI_flags &= ~0x200; +} + /*********************************************************************** * CtfImmSetAppCompatFlags (IMM32.@) * diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index bf0d216f723..14044ca710b 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -11,6 +11,7 @@ @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmRestoreToolbarWnd(ptr long) @ stdcall CtfImmSetAppCompatFlags(long) +@ stdcall CtfImmSetCiceroStartInThread(long) @ stdcall CtfImmTIMActivate(ptr) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index 84d962e77c4..28039bcb857 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -26,6 +26,7 @@ HRESULT WINAPI CtfAImmActivate(_Out_opt_ HINSTANCE *phinstCtfIme); HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); BOOL WINAPI CtfAImmIsIME(_In_ HKL hKL); BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); +VOID WINAPI CtfImmSetCiceroStartInThread(_In_ BOOL bStarted); VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); DWORD WINAPI CtfImmHideToolbarWnd(VOID); VOID WINAPI CtfImmRestoreToolbarWnd(_In_ LPVOID pUnused, _In_ DWORD dwShowFlags);

9 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2023