Skip to content

Commit 2cbc32e

Browse files
committed
[NTOBJSHEX] Improve the existing PCH and make use of it.
1 parent 2a3392b commit 2cbc32e

File tree

3 files changed

+14
-17
lines changed

3 files changed

+14
-17
lines changed

dll/shellext/ntobjshex/CMakeLists.txt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,16 @@ spec2def(ntobjshex.dll ntobjshex.spec)
1717
file(GLOB_RECURSE ntobjshex_rc_deps resources/*.*)
1818
add_rc_deps(ntobjshex.rc ${ntobjshex_rc_deps})
1919

20-
add_library(ntobjshex SHARED
20+
list(APPEND SOURCE
2121
ntobjenum.cpp
2222
ntobjfolder.cpp
2323
ntobjshex.cpp
24-
ntobjshex.rc
2524
regfolder.cpp
25+
precomp.h)
26+
27+
add_library(ntobjshex SHARED
28+
${SOURCE}
29+
ntobjshex.rc
2630
${CMAKE_CURRENT_BINARY_DIR}/ntobjshex.def)
2731

2832
set_module_type(ntobjshex win32dll UNICODE)
@@ -42,4 +46,5 @@ add_importlibs(ntobjshex
4246
kernel32
4347
ntdll)
4448

49+
add_pch(ntobjshex precomp.h SOURCE)
4550
add_cd_file(TARGET ntobjshex DESTINATION reactos/system32 FOR all)

dll/shellext/ntobjshex/ntobjfolder.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include "precomp.h"
1010

11+
#include <wine/unicode.h>
12+
1113
// {845B0FB2-66E0-416B-8F91-314E23F7C12D}
1214
const GUID CLSID_NtObjectFolder = { 0x845b0fb2, 0x66e0, 0x416b, { 0x8f, 0x91, 0x31, 0x4e, 0x23, 0xf7, 0xc1, 0x2d } };
1315

dll/shellext/ntobjshex/precomp.h

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,27 @@
1-
#pragma once
1+
#ifndef _NTOBJSHEX_PRECOMP_H_
2+
#define _NTOBJSHEX_PRECOMP_H_
23

3-
#define WIN32_NO_STATUS
44
#include <stdarg.h>
55
#include <tchar.h>
66

7-
#define COBJMACROS
87
#define WIN32_NO_STATUS
8+
#define COBJMACROS
99
#define _INC_WINDOWS
1010
#define COM_NO_WINDOWS_H
1111
#define NTOS_MODE_USER
1212

1313
#include <windef.h>
1414
#include <winbase.h>
1515
#include <winreg.h>
16-
#include <winuser.h>
17-
#include <wincon.h>
18-
#include <ddeml.h>
19-
#include <shlguid_undoc.h>
2016
#include <shlwapi.h>
2117
#include <shlobj.h>
22-
#include <shlobj_undoc.h>
23-
#include <shlwapi_undoc.h>
24-
#include <tchar.h>
2518
#include <strsafe.h>
2619
#include <atlbase.h>
2720
#include <atlcom.h>
28-
#include <atlwin.h>
2921
#include <undocshell.h>
3022
#include <shellutils.h>
3123

32-
#include <shellapi.h>
33-
3424
#include <wine/debug.h>
35-
#include <wine/unicode.h>
3625

3726
#include "resource.h"
3827

@@ -59,7 +48,6 @@ DEFINE_GUID(CLSID_NtObjectFolder,
5948

6049
WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
6150

62-
#include <rtlfuncs.h>
6351
#include <ntquery.h>
6452
#include "util.h"
6553

@@ -68,3 +56,5 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex);
6856
#include "foldercommon.h"
6957
#include "ntobjfolder.h"
7058
#include "regfolder.h"
59+
60+
#endif /* _NTOBJSHEX_PRECOMP_H_ */

0 commit comments

Comments
 (0)