Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 19:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert my last commits that break build.

Browse source 
Revert "[PSDK][AFD][VGADDI] Further build and MS PSDK compatibility fixes."
This reverts commit 99efc2ae50.

Revert "[PSDK] Sync winresrc.h with wine-8.20"
This reverts commit 3e83562aa7.

Revert "[OSK][PROGMAN] Fix resource file build."
This reverts commit 84e4ad0a82.

Revert "[PSDK] Use the new .rh files in winresrc.h"
This reverts commit f6fb7c48c9.
This commit is contained in:
Hermès Bélusca-Maïto 2023-11-23 17:20:05 +01:00
parent 99efc2ae50
commit c77a5ff99b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
11 changed files with 43 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

45
sdk/include/psdk/windows.h
View file

@ -10,12 +10,8 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
#ifndef _WINDOWS_
#define _WINDOWS_
#ifndef _INC_WINDOWS
#define _INC_WINDOWS
#ifndef _WINDOWS_H
#define _WINDOWS_H
#ifdef __GNUC__
#include <msvctarget.h>
@ -48,33 +44,11 @@
#endif
#if defined(RC_INVOKED) && !defined(NOWINRES)
#ifdef RC_INVOKED
/* winresrc.h includes the necessary headers */
#include <winresrc.h>
#else
#ifdef RC_INVOKED
/* Turn off some modules to ensure RC files compile OK */
#define NOATOM
#define NOGDI
#define NOGDICAPMASKS
#define NOMETAFILE
#define NOMINMAX
#define NOMSG
#define NOOPENFILE
#define NORASTEROPS
#define NOSCROLL
#define NOSOUND
#define NOSYSMETRICS
#define NOTEXTMETRIC
#define NOWH
#define NOCOMM
#define NOKANJI
#define NOCRYPT
#define NOMCX
#endif /* RC_INVOKED */
#include <excpt.h>
#include <stdarg.h>
#include <windef.h>
@ -86,39 +60,29 @@
#include <winver.h>
#include <winnetwk.h>
#include <winreg.h>
#ifndef NOSERVICE
#include <winsvc.h>
#endif
#ifndef WIN32_LEAN_AND_MEAN
#include <cderr.h>
#include <dde.h>
#include <ddeml.h>
#include <dlgs.h>
#ifndef NOIME
#include <imm.h>
#endif
#include <lzexpand.h>
#include <mmsystem.h>
#include <nb30.h>
#include <rpc.h>
#include <shellapi.h>
#include <winperf.h>
#ifndef NOCRYPT
#include <wincrypt.h>
#include <winefs.h>
#include <winscard.h>
#endif
#ifndef NOGDI
#include <commdlg.h>
#include <winspool.h>
#endif
#if defined(Win32_Winsock)
#warning "The Win32_Winsock macro name is deprecated.\
Please use __USE_W32_SOCKETS instead"
@ -158,5 +122,4 @@
#undef BOOL
#endif
#endif /* _INC_WINDOWS */
#endif /* _WINDOWS_ */
#endif