From 4bf2a303952fb7fd8a3c89e981de84e81eeae693 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 28 Apr 2026 10:46:13 +0300 Subject: [PATCH] [WIDL] Remove a hack that inserted WIN32_LEAN_AND_MEAN into headers This was supposedly to improve compile times, but it breaks our headers. --- base/services/netlogon/CMakeLists.txt | 2 ++ dll/win32/netapi32/CMakeLists.txt | 2 ++ modules/rostests/winetests/hlink/CMakeLists.txt | 2 +- sdk/tools/widl/header.c | 8 -------- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/base/services/netlogon/CMakeLists.txt b/base/services/netlogon/CMakeLists.txt index f0e533b6b65..0163b2e016d 100644 --- a/base/services/netlogon/CMakeLists.txt +++ b/base/services/netlogon/CMakeLists.txt @@ -3,6 +3,8 @@ include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl) add_rpc_files(server ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/netlogon.idl) spec2def(netlogon.dll netlogon.spec ADD_IMPORTLIB) +add_definitions(-DWIN32_LEAN_AND_MEAN=) + list(APPEND SOURCE netlogon.c rpcserver.c diff --git a/dll/win32/netapi32/CMakeLists.txt b/dll/win32/netapi32/CMakeLists.txt index 64e137914b4..d657bc34675 100644 --- a/dll/win32/netapi32/CMakeLists.txt +++ b/dll/win32/netapi32/CMakeLists.txt @@ -12,6 +12,8 @@ add_rpc_files(client ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/srvsvc.idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl/wkssvc.idl) +add_definitions(-DWIN32_LEAN_AND_MEAN=) + list(APPEND SOURCE apibuf.c browser.c diff --git a/modules/rostests/winetests/hlink/CMakeLists.txt b/modules/rostests/winetests/hlink/CMakeLists.txt index 45ac9317730..4f9b7dfd367 100644 --- a/modules/rostests/winetests/hlink/CMakeLists.txt +++ b/modules/rostests/winetests/hlink/CMakeLists.txt @@ -1,5 +1,5 @@ -add_definitions(-DUSE_WINE_TODOS) +add_definitions(-DUSE_WINE_TODOS -DWIN32_LEAN_AND_MEAN=) list(APPEND SOURCE browse_ctx.c diff --git a/sdk/tools/widl/header.c b/sdk/tools/widl/header.c index 38036bfbb2a..5a60063bfc8 100644 --- a/sdk/tools/widl/header.c +++ b/sdk/tools/widl/header.c @@ -2095,15 +2095,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#ifdef _WIN32\n"); fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); -#ifdef __REACTOS__ - fprintf(header, "#endif\n\n"); - - fprintf(header, "#ifdef __REACTOS__\n"); - fprintf(header, "#define WIN32_LEAN_AND_MEAN\n"); - fprintf(header, "#endif\n\n"); -#else fprintf(header, "#endif\n"); -#endif fprintf(header, "#include \n" ); fprintf(header, "#include \n" ); if (!for_each_serializable(stmts, NULL, serializable_exists))