https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c77a5ff99b08f3d01596e51de74b615830a9827b
commit c77a5ff99b08f3d01596e51de74b615830a9827b Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Thu Nov 23 17:20:05 2023 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Thu Nov 23 17:20:47 2023 +0100 Revert my last commits that break build. Revert "[PSDK][AFD][VGADDI] Further build and MS PSDK compatibility fixes." This reverts commit 99efc2ae50fef55c182c5576937ee99e6b926b3e. Revert "[PSDK] Sync winresrc.h with wine-8.20" This reverts commit 3e83562aa7e0116e9345d1b02cb829efcfb64071. Revert "[OSK][PROGMAN] Fix resource file build." This reverts commit 84e4ad0a82c780025c440ac1de26f82047140c37. Revert "[PSDK] Use the new .rh files in winresrc.h" This reverts commit f6fb7c48c9b9d3127cfd1e0e42638e1988e666ad. --- base/applications/osk/osk.rc | 7 ++--- base/shell/progman/new_resources.rc | 4 --- base/shell/progman/resource_2.h | 2 +- drivers/network/afd/include/afd.h | 1 + sdk/include/psdk/afxres.h | 7 ++--- sdk/include/psdk/batclass.h | 4 +-- sdk/include/psdk/windows.h | 45 +++--------------------------- sdk/include/psdk/winnt.rh | 32 ++++++++++----------- sdk/include/psdk/winresrc.h | 52 ++++++----------------------------- sdk/include/psdk/winsnmp.h | 9 +++--- win32ss/drivers/displays/vga/vgaddi.h | 2 +- 11 files changed, 43 insertions(+), 122 deletions(-) diff --git a/base/applications/osk/osk.rc b/base/applications/osk/osk.rc index ddc38062090..a599e616184 100644 --- a/base/applications/osk/osk.rc +++ b/base/applications/osk/osk.rc @@ -5,10 +5,8 @@ * COPYRIGHT: Denis ROBERT */ -#include <windef.h> -#include <winuser.h> - -#include "osk_res.h" +/* INCLUDES ******************************************************************/ +#include "precomp.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS On Screen Keyboard" #define REACTOS_STR_INTERNAL_NAME "osk" @@ -19,6 +17,7 @@ IDI_OSK ICON "res/osk.ico" IDI_SOUNDCLICK WAVE "res/click.wav" + IDI_BACK ICON "res/back.ico" IDI_TAB ICON "res/tab.ico" IDI_CAPS_LOCK ICON "res/caps_lock.ico" diff --git a/base/shell/progman/new_resources.rc b/base/shell/progman/new_resources.rc index 27acccdf5ab..333c93cb6fe 100644 --- a/base/shell/progman/new_resources.rc +++ b/base/shell/progman/new_resources.rc @@ -7,9 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#if 0 #include "afxres.h" -#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,9 +32,7 @@ END 2 TEXTINCLUDE BEGIN - "#if 0\r\n" "#include ""afxres.h""\r\n" - "#endif\r\n" "\0" END diff --git a/base/shell/progman/resource_2.h b/base/shell/progman/resource_2.h index b164d52d117..981cc6ab2e1 100644 --- a/base/shell/progman/resource_2.h +++ b/base/shell/progman/resource_2.h @@ -3,7 +3,7 @@ // Used by new_resources.rc // -// #include <winuser.h> +#include <winuser.h> #define IDHELP 9 diff --git a/drivers/network/afd/include/afd.h b/drivers/network/afd/include/afd.h index df6ebdc7bae..2ddfcf4ad2d 100644 --- a/drivers/network/afd/include/afd.h +++ b/drivers/network/afd/include/afd.h @@ -16,6 +16,7 @@ #include <tdi.h> #include <tcpioctl.h> #define _WINBASE_ +#define _WINDOWS_H #define _INC_WINDOWS #include <windef.h> #include <winsock2.h> diff --git a/sdk/include/psdk/afxres.h b/sdk/include/psdk/afxres.h index cc87b2ac223..717e10d2b6f 100644 --- a/sdk/include/psdk/afxres.h +++ b/sdk/include/psdk/afxres.h @@ -5,11 +5,8 @@ extern "C" { #endif -#ifdef RC_INVOKED -#ifndef _INC_WINDOWS -#define _INC_WINDOWS - #include "winres.h" -#endif +#ifndef _WINDOWS_H +#include <windows.h> #endif /* IDC_STATIC is documented in winuser.h, but not defined. */ diff --git a/sdk/include/psdk/batclass.h b/sdk/include/psdk/batclass.h index 584f041937c..f97140d9b05 100644 --- a/sdk/include/psdk/batclass.h +++ b/sdk/include/psdk/batclass.h @@ -157,7 +157,7 @@ typedef struct _BATTERY_STATUS { LONG Rate; } BATTERY_STATUS, *PBATTERY_STATUS; -#ifndef _WINDOWS_ +#ifndef _WINDOWS_H /* BATTERY_MINIPORT_INFO.XxxVersion */ #define BATTERY_CLASS_MAJOR_VERSION 0x0001 @@ -388,7 +388,7 @@ NTAPI BatteryClassUnload( _In_ PVOID ClassData); -#endif /* _WINDOWS_ */ +#endif /* _WINDOWS_H */ #endif /* _BATCLASS_ */ diff --git a/sdk/include/psdk/windows.h b/sdk/include/psdk/windows.h index af8f33410c1..347b164c33d 100644 --- a/sdk/include/psdk/windows.h +++ b/sdk/include/psdk/windows.h @@ -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 diff --git a/sdk/include/psdk/winnt.rh b/sdk/include/psdk/winnt.rh index 40452071ba9..38cefd61c53 100644 --- a/sdk/include/psdk/winnt.rh +++ b/sdk/include/psdk/winnt.rh @@ -47,7 +47,7 @@ #define LANG_ARMENIAN 0x2b #define LANG_ASSAMESE 0x4d #define LANG_AZERBAIJANI 0x2c -#define LANG_AZERI 0x2c // LANG_AZERBAIJANI +#define LANG_AZERI LANG_AZERBAIJANI #define LANG_BANGLA 0x45 #define LANG_BASHKIR 0x6d #define LANG_BASQUE 0x2d @@ -61,7 +61,7 @@ #define LANG_CENTRAL_KURDISH 0x92 #define LANG_CHEROKEE 0x5c #define LANG_CHINESE 0x04 -#define LANG_CHINESE_SIMPLIFIED 0x04 +#define LANG_CHINESE_SIMPLIFIED 0x0004 #define LANG_CHINESE_TRADITIONAL 0x7c04 #define LANG_CORSICAN 0x83 #define LANG_CROATIAN 0x1a @@ -73,7 +73,7 @@ #define LANG_ENGLISH 0x09 #define LANG_ESTONIAN 0x25 #define LANG_FAEROESE 0x38 -#define LANG_FARSI 0x29 // LANG_PERSIAN +#define LANG_FARSI LANG_PERSIAN #define LANG_FILIPINO 0x64 #define LANG_FINNISH 0x0b #define LANG_FRENCH 0x0c @@ -125,12 +125,12 @@ #define LANG_NORWEGIAN 0x14 #define LANG_OCCITAN 0x82 #define LANG_ODIA 0x48 -#define LANG_ORIYA 0x48 // LANG_ODIA +#define LANG_ORIYA LANG_ODIA #define LANG_PASHTO 0x63 #define LANG_PERSIAN 0x29 #define LANG_POLISH 0x15 #define LANG_PORTUGUESE 0x16 -#define LANG_PULAR 0x67 // LANG_FULAH +#define LANG_PULAR LANG_FULAH #define LANG_PUNJABI 0x46 #define LANG_QUECHUA 0x6b #define LANG_ROMANIAN 0x18 @@ -159,7 +159,7 @@ #define LANG_THAI 0x1e #define LANG_TIBETAN 0x51 #define LANG_TIGRINYA 0x73 -#define LANG_TIGRIGNA 0x73 // LANG_TIGRINYA +#define LANG_TIGRIGNA LANG_TIGRINYA #define LANG_TSWANA 0x32 #define LANG_TURKISH 0x1f #define LANG_TURKMEN 0x42 @@ -168,12 +168,12 @@ #define LANG_UPPER_SORBIAN 0x2e #define LANG_URDU 0x20 #define LANG_UZBEK 0x43 -#define LANG_VALENCIAN 0x03 // LANG_CATALAN +#define LANG_VALENCIAN LANG_CATALAN #define LANG_VIETNAMESE 0x2a #define LANG_WELSH 0x52 #define LANG_WOLOF 0x88 #define LANG_XHOSA 0x34 -#define LANG_YAKUT 0x85 // LANG_SAKHA +#define LANG_YAKUT LANG_SAKHA #define LANG_YI 0x78 #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 @@ -210,8 +210,8 @@ #define SUBLANG_ASSAMESE_INDIA 0x01 #define SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN 0x01 #define SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC 0x02 -#define SUBLANG_AZERI_LATIN 0x01 // SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN -#define SUBLANG_AZERI_CYRILLIC 0x02 // SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC +#define SUBLANG_AZERI_LATIN SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN +#define SUBLANG_AZERI_CYRILLIC SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC #define SUBLANG_BANGLA_BANGLADESH 0x02 #define SUBLANG_BANGLA_INDIA 0x01 #define SUBLANG_BASHKIR_RUSSIA 0x01 @@ -298,7 +298,7 @@ #define SUBLANG_KAZAK_KAZAKHSTAN 0x01 #define SUBLANG_KHMER_CAMBODIA 0x01 #define SUBLANG_KICHE_GUATEMALA 0x01 -#define SUBLANG_KINYARWANDA_RWANDA 0x01 +#define SUBLANG_KINYARWANDA_RWANDA 0X01 #define SUBLANG_KONKANI_INDIA 0x01 #define SUBLANG_KOREAN 0x01 #define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 @@ -324,13 +324,13 @@ #define SUBLANG_NORWEGIAN_NYNORSK 0x02 #define SUBLANG_OCCITAN_FRANCE 0x01 #define SUBLANG_ODIA_INDIA 0x01 -#define SUBLANG_ORIYA_INDIA 0x01 // SUBLANG_ODIA_INDIA +#define SUBLANG_ORIYA_INDIA SUBLANG_ODIA_INDIA #define SUBLANG_PASHTO_AFGHANISTAN 0x01 #define SUBLANG_PERSIAN_IRAN 0x01 #define SUBLANG_POLISH_POLAND 0x01 #define SUBLANG_PORTUGUESE 0x02 #define SUBLANG_PORTUGUESE_BRAZILIAN 0x01 -#define SUBLANG_PULAR_SENEGAL 0x02 // SUBLANG_FULAH_SENEGAL +#define SUBLANG_PULAR_SENEGAL SUBLANG_FULAH_SENEGAL #define SUBLANG_PUNJABI_INDIA 0x01 #define SUBLANG_PUNJABI_PAKISTAN 0x02 #define SUBLANG_QUECHUA_BOLIVIA 0x01 @@ -362,7 +362,7 @@ #define SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC 0x0c #define SUBLANG_SINDHI_INDIA 0x01 #define SUBLANG_SINDHI_AFGHANISTAN 0x02 -#define SUBLANG_SINDHI_PAKISTAN 0x02 // SUBLANG_SINDHI_AFGHANISTAN +#define SUBLANG_SINDHI_PAKISTAN SUBLANG_SINDHI_AFGHANISTAN #define SUBLANG_SINHALESE_SRI_LANKA 0x01 #define SUBLANG_SLOVAK_SLOVAKIA 0x01 #define SUBLANG_SLOVENIAN_SLOVENIA 0x01 @@ -404,7 +404,7 @@ #define SUBLANG_TIBETAN_BHUTAN 0x02 #define SUBLANG_TIGRINYA_ERITREA 0x02 #define SUBLANG_TIGRINYA_ETHIOPIA 0x01 -#define SUBLANG_TIGRIGNA_ERITREA 0x02 // SUBLANG_TIGRINYA_ERITREA +#define SUBLANG_TIGRIGNA_ERITREA SUBLANG_TIGRINYA_ERITREA #define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 #define SUBLANG_TSWANA_BOTSWANA 0x02 #define SUBLANG_TURKISH_TURKEY 0x01 @@ -421,7 +421,7 @@ #define SUBLANG_WELSH_UNITED_KINGDOM 0x01 #define SUBLANG_WOLOF_SENEGAL 0x01 #define SUBLANG_XHOSA_SOUTH_AFRICA 0x01 -#define SUBLANG_YAKUT_RUSSIA 0x01 // SUBLANG_SAKHA_RUSSIA +#define SUBLANG_YAKUT_RUSSIA SUBLANG_SAKHA_RUSSIA #define SUBLANG_YI_PRC 0x01 #define SUBLANG_YORUBA_NIGERIA 0x01 #define SUBLANG_ZULU_SOUTH_AFRICA 0x01 diff --git a/sdk/include/psdk/winresrc.h b/sdk/include/psdk/winresrc.h index 2f99661f39e..8540e42e88a 100644 --- a/sdk/include/psdk/winresrc.h +++ b/sdk/include/psdk/winresrc.h @@ -1,45 +1,11 @@ -/* - * Copyright (C) 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ +#ifndef _WINRESRC_H +#define _WINRESRC_H -#ifndef _WINRESRC_ -#define _WINRESRC_ - -#ifndef WINVER -#define WINVER 0x0500 -#endif - -#ifndef _WIN32_IE -#define _WIN32_IE 0x0501 -#endif - -#ifndef _WIN32_WINDOWS -#define _WIN32_WINDOWS 0x0410 -#endif - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0500 -#endif - -#include <winuser.rh> -#include <commctrl.rh> -#include <dde.rh> -#include <winnt.rh> -#include <dlgs.h> +#define WIN32_LEAN_AND_MEAN +#include <winuser.h> +#include <winnt.h> #include <winver.h> - -#endif /* _WINRESRC_ */ +#include <dde.h> +#include <dlgs.h> +#include <commctrl.h> +#endif diff --git a/sdk/include/psdk/winsnmp.h b/sdk/include/psdk/winsnmp.h index 08b97ee809c..b61cddef057 100644 --- a/sdk/include/psdk/winsnmp.h +++ b/sdk/include/psdk/winsnmp.h @@ -21,10 +21,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef _INC_WINSNMP -#define _INC_WINSNMP +#ifndef _WINSNMP_H +#define _WINSNMP_H -#ifndef _INC_WINDOWS +#ifndef _WINDOWS_H #include <windows.h> #endif @@ -323,5 +323,4 @@ SNMPAPI_STATUS WINSNMPAPI SnmpPasswordToKey(smiLPOCTETS,smiINT32,smiLPOCTETS); } #endif #include <poppack.h> - -#endif /* _INC_WINSNMP */ +#endif diff --git a/win32ss/drivers/displays/vga/vgaddi.h b/win32ss/drivers/displays/vga/vgaddi.h index ef7e043268d..e2b4ef46342 100644 --- a/win32ss/drivers/displays/vga/vgaddi.h +++ b/win32ss/drivers/displays/vga/vgaddi.h @@ -2,7 +2,7 @@ #define _VGADDI_PCH_ #define _WINBASE_ -#define _INC_WINDOWS +#define _WINDOWS_H #include <stdarg.h> #include <windef.h> #include <wingdi.h>
