Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:25:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETAPI32] Revert to Wine module (#8004)

Browse source 
Partially revert #7912.
JIRA issue: CORE-5743
Use wine instead of wine2ros.
This commit is contained in:
Katayama Hirofumi MZ 2025-05-15 07:43:14 +09:00 • committed by GitHub
parent e2e6fcdb96
commit 490f7af4ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/netapi32/CMakeLists.txt
View file

@ -51,7 +51,7 @@ add_library(netapi32 MODULE
${CMAKE_CURRENT_BINARY_DIR}/netapi32.def) ${CMAKE_CURRENT_BINARY_DIR}/netapi32.def)
set_module_type(netapi32 win32dll) set_module_type(netapi32 win32dll)
target_link_libraries(netapi32 wine2ros ${PSEH_LIB}) target_link_libraries(netapi32 wine ${PSEH_LIB})
add_delay_importlibs(netapi32 samlib secur32) add_delay_importlibs(netapi32 samlib secur32)
add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll) add_importlibs(netapi32 iphlpapi ws2_32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(netapi32 netapi32.h "${PCH_SKIP_SOURCE}") add_pch(netapi32 netapi32.h "${PCH_SKIP_SOURCE}")

6
dll/win32/netapi32/netapi32.h
View file

@ -1,9 +1,7 @@
#ifndef __WINE_NETAPI32_H__ #ifndef __WINE_NETAPI32_H__
#define __WINE_NETAPI32_H__ #define __WINE_NETAPI32_H__
#ifndef __REACTOS__
#include <wine/config.h> #include <wine/config.h>
#endif
#include <limits.h> #include <limits.h>
#include <stdarg.h> #include <stdarg.h>
@ -21,12 +19,8 @@
#include <nb30.h> #include <nb30.h>
#include <iphlpapi.h> #include <iphlpapi.h>
#ifdef __REACTOS__
#include <wine2ros.h>
#else
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h> #include <wine/unicode.h>
#endif
#define NTOS_MODE_USER #define NTOS_MODE_USER
#include <ndk/rtlfuncs.h> #include <ndk/rtlfuncs.h>