ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KERNELBASE][PATHCCH] Unhack path.c

Browse Source
This commit is contained in:
Timo Kreuzer
2026-06-09 17:40:07 +00:00
parent 2820072004
commit 4ba2db3c6e
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/kernelbase/wine/path.c
+5 -29
View File
@@ -23,8 +23,6 @@
#include <string.h>
#include <wchar.h>
#ifndef STATIC_PATHCCH
#include "windef.h"
#include "winbase.h"
#include "pathcch.h"
@@ -39,25 +37,20 @@
#include "wine/debug.h"
#include "wine/heap.h"
#ifndef STATIC_PATHCCH
WINE_DEFAULT_DEBUG_CHANNEL(path);
#else
#undef TRACE
#define TRACE(...)
#endif /* !STATIC_PATHCCH */
#else // STATIC_PATHCCH
#ifdef __REACTOS__
/* This is the static implementation of the PathCch library */
#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... */
#undef SIZE_T
#define SIZE_T size_t
#include <pathcch.h>
#include <strsafe.h>
#define TRACE(...)
#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 compat_wcsnlen(const wchar_t* str, size_t size)
@@ -68,24 +61,7 @@ static inline size_t compat_wcsnlen(const wchar_t* str, size_t size)
#define wcsnlen compat_wcsnlen
#endif /* _WIN32_WINNT || DLL_EXPORT_VERSION */
// Implementation from string.c copied here in order not
// to depend on the whole file just for the PathCch library.
WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch)
{
WCHAR *ret = NULL;
if (!str) return NULL;
if (!end) end = str + lstrlenW(str);
while (str < end)
{
if (*str == ch) ret = (WCHAR *)str;
str++;
}
return ret;
}
#endif /* __REACTOS__ */
#endif // STATIC_PATHCCH
#ifndef STATIC_PATHCCH
sdk/lib/pathcch/CMakeLists.txt
+4 -2
View File
@@ -1,9 +1,11 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
# Down-level static PathCch library, to be used for
# programs that need to run on Windows 7 and below.
add_library(pathcch_static STATIC ${REACTOS_SOURCE_DIR}/dll/win32/kernelbase/wine/path.c)
add_library(pathcch_static STATIC ${REACTOS_SOURCE_DIR}/dll/win32/kernelbase/wine/path.c StrRChrW.c)
add_dependencies(pathcch_static xdk)
target_compile_definitions(pathcch_static PRIVATE wcsnicmp=_wcsnicmp STATIC_PATHCCH)
target_compile_definitions(pathcch_static PRIVATE wcsnicmp=_wcsnicmp STATIC_PATHCCH PATHCCH_NO_DEPRECATE WINSHLWAPI=)
# Windows 8+ compatible libraries, importing from either
# kernelbase.dll or api-ms-win-core-path-l1-1-0.dll
sdk/lib/pathcch/StrRChrW.c
+19
View File
@@ -0,0 +1,19 @@
#include <windef.h>
#include <winbase.h>
// Implementation from string.c copied here in order not
// to depend on the whole file just for the PathCch library.
WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch)
{
WCHAR *ret = NULL;
if (!str) return NULL;
if (!end) end = str + lstrlenW(str);
while (str < end)
{
if (*str == ch) ret = (WCHAR *)str;
str++;
}
return ret;
}