mirror of
https://github.com/reactos/reactos.git
synced 2025-02-23 17:05:46 +00:00
[RTL][NTOS_VISTA] Move the RTL UTF8 functions to the main RTL library, to be linked in the rtl_vista target instead.
The reason is that both RtlUTF8ToUnicodeN() and RtlUnicodeToUTF8N() are exported in both kernel and user-mode (ntdll) in Windows 7+. Conversion from and to UTF8 are fundamental enough that they indeed deserve to be in a separate file.
This commit is contained in:
parent
fe452a1dad
commit
6f559e9c54
4 changed files with 16 additions and 13 deletions
|
@ -4,14 +4,14 @@ add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_)
|
add_definitions(-DUNICODE -D_UNICODE -D__NTOSKRNL__ -D_NTOSKRNL_ -D_NTSYSTEM_)
|
||||||
|
|
||||||
list(APPEND SOURCE
|
list(APPEND SOURCE
|
||||||
etw.c
|
etw.c
|
||||||
fsrtl.c
|
fsrtl.c
|
||||||
io.c
|
io.c
|
||||||
po.c
|
po.c
|
||||||
ke.c
|
ke.c)
|
||||||
rtl.c)
|
|
||||||
|
|
||||||
add_library(ntoskrnl_vista ${SOURCE})
|
add_library(ntoskrnl_vista ${SOURCE})
|
||||||
|
target_link_libraries(ntoskrnl_vista PRIVATE rtl_vista)
|
||||||
add_dependencies(ntoskrnl_vista bugcodes xdk)
|
add_dependencies(ntoskrnl_vista bugcodes xdk)
|
||||||
|
|
||||||
target_compile_definitions(ntoskrnl_vista PUBLIC NTKRNLVISTA)
|
target_compile_definitions(ntoskrnl_vista PUBLIC NTKRNLVISTA)
|
||||||
|
|
|
@ -116,7 +116,7 @@ list(APPEND SOURCE_VISTA
|
||||||
condvar.c
|
condvar.c
|
||||||
runonce.c
|
runonce.c
|
||||||
srw.c
|
srw.c
|
||||||
)
|
utf8.c)
|
||||||
|
|
||||||
add_library(rtl_vista ${SOURCE_VISTA})
|
add_library(rtl_vista ${SOURCE_VISTA})
|
||||||
add_pch(rtl_vista rtl_vista.h SOURCE_VISTA)
|
add_pch(rtl_vista rtl_vista.h SOURCE_VISTA)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
/* Taken from Wine ntdll/sync.c */
|
/* Taken from Wine ntdll/sync.c */
|
||||||
|
|
||||||
#include "rtl_vista.h"
|
#include <rtl_vista.h>
|
||||||
#include <wine/config.h>
|
#include <wine/config.h>
|
||||||
#include <wine/port.h>
|
#include <wine/port.h>
|
||||||
|
|
||||||
|
|
|
@ -1,15 +1,18 @@
|
||||||
/*
|
/*
|
||||||
* PROJECT: ReactOS Kernel - Vista+ APIs
|
* PROJECT: ReactOS Kernel - Vista+ APIs
|
||||||
* LICENSE: GPL v2 - See COPYING in the top level directory
|
* LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later)
|
||||||
* FILE: lib/drivers/ntoskrnl_vista/rtl.c
|
* PURPOSE: Rtl functions of Vista+
|
||||||
* PURPOSE: Rtl functions of Vista+
|
* COPYRIGHT: 2016 Thomas Faber <thomas.faber@reactos.org>
|
||||||
* PROGRAMMERS: Thomas Faber <thomas.faber@reactos.org>
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <ntdef.h>
|
/* INCLUDES ******************************************************************/
|
||||||
#include <ntifs.h>
|
|
||||||
|
|
||||||
typedef UCHAR BYTE;
|
#include <rtl_vista.h>
|
||||||
|
|
||||||
|
#define NDEBUG
|
||||||
|
#include <debug.h>
|
||||||
|
|
||||||
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* RtlUnicodeToUTF8N [NTDLL.@]
|
* RtlUnicodeToUTF8N [NTDLL.@]
|
Loading…
Reference in a new issue