Ros-diffs

ros-diffs@reactos.org

12 participants
81028 discussions

[reactos] 01/01: [MSPAINT] Delete globalvar.h and move code to precomp.h

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=470d86f1e5bd74c276779… commit 470d86f1e5bd74c276779057cff142ef11ee031e Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 24 10:12:37 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Fri Nov 24 10:12:37 2023 +0900 [MSPAINT] Delete globalvar.h and move code to precomp.h Refactoring. CORE-19094 --- base/applications/mspaint/globalvar.h | 50 --------------------------------- base/applications/mspaint/precomp.h | 52 +++++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 56 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h deleted file mode 100644 index e2257fbb693..00000000000 --- a/base/applications/mspaint/globalvar.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * PROJECT: PAINT for ReactOS - * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) - * PURPOSE: Declaring global variables for later initialization - * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> - */ - -#pragma once - -/* VARIABLES declared in main.cpp ***********************************/ - -extern BOOL g_askBeforeEnlarging; - -extern HINSTANCE g_hinstExe; - -extern WCHAR g_szFileName[MAX_LONG_PATH]; -extern BOOL g_isAFile; -extern BOOL g_imageSaved; -extern BOOL g_showGrid; - -extern CMainWindow mainWindow; - -/* VARIABLES declared in dialogs.cpp ********************************/ - -extern CMirrorRotateDialog mirrorRotateDialog; -extern CAttributesDialog attributesDialog; -extern CStretchSkewDialog stretchSkewDialog; -extern CFontsDialog fontsDialog; - -/* VARIABLES declared in the other places ***************************/ - -extern RegistrySettings registrySettings; -extern ImageModel imageModel; -extern ToolsModel toolsModel; -extern SelectionModel selectionModel; -extern PaletteModel paletteModel; - -extern HWND g_hStatusBar; -extern float g_xDpi; -extern float g_yDpi; -extern INT g_fileSize; -extern SYSTEMTIME g_fileTime; - -extern CFullscreenWindow fullscreenWindow; -extern CMiniatureWindow miniature; -extern CToolBox toolBoxContainer; -extern CToolSettingsWindow toolSettingsWindow; -extern CPaletteWindow paletteWindow; -extern CCanvasWindow canvasWindow; -extern CTextEditWindow textEditWindow; diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index 8d1aaf0f608..346c7bda846 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -1,5 +1,11 @@ -#ifndef _MSPAINT_H -#define _MSPAINT_H +/* + * PROJECT: PAINT for ReactOS + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: The precompiled header + * COPYRIGHT: Copyright 2015 Benedikt Freisen <b.freisen(a)gmx.net> + */ + +#pragma once #ifdef NDEBUG #undef DBG @@ -26,7 +32,7 @@ #include <shellapi.h> #include <htmlhelp.h> #include <strsafe.h> -#include "atlimagedx.h" +#include <ui/CWaitCursor.h> #include <debug.h> @@ -49,7 +55,41 @@ #include "toolsmodel.h" #include "main.h" #include "dialogs.h" -#include <ui/CWaitCursor.h> -#include "globalvar.h" +#include "atlimagedx.h" + +/* GLOBAL VARIABLES *************************************************/ + +extern HINSTANCE g_hinstExe; + +extern WCHAR g_szFileName[MAX_LONG_PATH]; +extern BOOL g_isAFile; +extern BOOL g_imageSaved; +extern BOOL g_showGrid; +extern BOOL g_askBeforeEnlarging; + +extern CMainWindow mainWindow; + +extern CMirrorRotateDialog mirrorRotateDialog; +extern CAttributesDialog attributesDialog; +extern CStretchSkewDialog stretchSkewDialog; +extern CFontsDialog fontsDialog; + +extern RegistrySettings registrySettings; +extern ImageModel imageModel; +extern ToolsModel toolsModel; +extern SelectionModel selectionModel; +extern PaletteModel paletteModel; + +extern HWND g_hStatusBar; +extern float g_xDpi; +extern float g_yDpi; +extern INT g_fileSize; +extern SYSTEMTIME g_fileTime; -#endif /* _MSPAINT_H */ +extern CFullscreenWindow fullscreenWindow; +extern CMiniatureWindow miniature; +extern CToolBox toolBoxContainer; +extern CToolSettingsWindow toolSettingsWindow; +extern CPaletteWindow paletteWindow; +extern CCanvasWindow canvasWindow; +extern CTextEditWindow textEditWindow;

1 year, 1 month

[reactos] 01/01: [SETUPAPI] CM_Request_Device_Eject_ExW: Allow ulNameLength to be zero when pszVetoName is not NULL (#6031)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=40bc5bf4899161e901ffc… commit 40bc5bf4899161e901ffc6afe730b05eced65184 Author: Thamatip Chitpong <thamatip.chitpong(a)reactos.org> AuthorDate: Fri Nov 24 07:47:01 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 24 07:47:01 2023 +0700 [SETUPAPI] CM_Request_Device_Eject_ExW: Allow ulNameLength to be zero when pszVetoName is not NULL (#6031) Addendum to 7f346b1aa (#5943) --- dll/win32/setupapi/cfgmgr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index 1b25536f9e3..929e35cc14d 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -7550,6 +7550,11 @@ CM_Request_Device_Eject_ExW( if (pszVetoName == NULL && ulNameLength != 0) return CR_INVALID_POINTER; + /* Windows 2003 SP2 ignores pszVetoName when ulNameLength is zero + * and behaves like when pszVetoName is NULL */ + if (ulNameLength == 0) + pszVetoName = NULL; + if (hMachine != NULL) { BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle;

1 year, 1 month

[reactos] 01/01: Revert my last commits that break build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c77a5ff99b08f3d01596e… commit c77a5ff99b08f3d01596e51de74b615830a9827b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 17:20:05 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> 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>

1 year, 1 month

[reactos] 03/03: [PSDK][AFD][VGADDI] Further build and MS PSDK compatibility fixes.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99efc2ae50fef55c182c5… commit 99efc2ae50fef55c182c5576937ee99e6b926b3e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 15:56:42 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 16:26:30 2023 +0100 [PSDK][AFD][VGADDI] Further build and MS PSDK compatibility fixes. - windows.h: * should define _WINDOWS_ and _INC_WINDOWS instead of _WINDOWS_H * include winresrc.h if RC_INVOKED and not NOWINRES (Wine also agrees with that) * also, some .h included from there should _not_ be included if their respective NO*** flags are defined. - batclass.h: Use correct _WINDOWS_ guard. - winsnmp.h: * should define _INC_WINSNMP instead of _WINSNMP_H * use _INC_WINDOWS instead of _WINDOWS_H - afd.h, vgaddi.h: Use the correct guards. - winnt.rh: Define the (SUB)LANG_* exactly as they are in the winnt.h, otherwise we get macro redefinition compile errors. NOTE: Ideally these .rh files should be auto-generated from their corresponding .h files. - afxres.h: Do not include the whole windows.h, but instead, only the winres.h file, and only if RC_INVOKED is defined. NOTE: Both afxres.h and winres.h do not really belong to the PSDK, but belong instead to MFC. The reason why we have them here is twofold: 1. Wine used to have also winres.h (from where we got ours). This is because the .rc resource files of some non-MFC modules were generated with Visual Studio, which always includes afxres.h for these, and the solution was to use a slightly less MFC-specific header: winres.h (Wine commit cb08c82244673f26842e7a0766de90f091b5a493). However, this winres.h has been since removed from Wine tree (Wine commit 197f4059ab2af5f13f9c56faa26e3b4af902f869). 2. Few of our modules either use afxres.h or winres.h in their resource files, and we still want to be able to compile them. --- 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/winsnmp.h | 9 +++---- win32ss/drivers/displays/vga/vgaddi.h | 2 +- 7 files changed, 70 insertions(+), 30 deletions(-) diff --git a/drivers/network/afd/include/afd.h b/drivers/network/afd/include/afd.h index 2ddfcf4ad2d..df6ebdc7bae 100644 --- a/drivers/network/afd/include/afd.h +++ b/drivers/network/afd/include/afd.h @@ -16,7 +16,6 @@ #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 717e10d2b6f..cc87b2ac223 100644 --- a/sdk/include/psdk/afxres.h +++ b/sdk/include/psdk/afxres.h @@ -5,8 +5,11 @@ extern "C" { #endif -#ifndef _WINDOWS_H -#include <windows.h> +#ifdef RC_INVOKED +#ifndef _INC_WINDOWS +#define _INC_WINDOWS + #include "winres.h" +#endif #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 f97140d9b05..584f041937c 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_H +#ifndef _WINDOWS_ /* BATTERY_MINIPORT_INFO.XxxVersion */ #define BATTERY_CLASS_MAJOR_VERSION 0x0001 @@ -388,7 +388,7 @@ NTAPI BatteryClassUnload( _In_ PVOID ClassData); -#endif /* _WINDOWS_H */ +#endif /* _WINDOWS_ */ #endif /* _BATCLASS_ */ diff --git a/sdk/include/psdk/windows.h b/sdk/include/psdk/windows.h index 347b164c33d..af8f33410c1 100644 --- a/sdk/include/psdk/windows.h +++ b/sdk/include/psdk/windows.h @@ -10,8 +10,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef _WINDOWS_H -#define _WINDOWS_H + +#ifndef _WINDOWS_ +#define _WINDOWS_ + +#ifndef _INC_WINDOWS +#define _INC_WINDOWS #ifdef __GNUC__ #include <msvctarget.h> @@ -44,11 +48,33 @@ #endif -#ifdef RC_INVOKED +#if defined(RC_INVOKED) && !defined(NOWINRES) /* 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> @@ -60,29 +86,39 @@ #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" @@ -122,4 +158,5 @@ #undef BOOL #endif -#endif +#endif /* _INC_WINDOWS */ +#endif /* _WINDOWS_ */ diff --git a/sdk/include/psdk/winnt.rh b/sdk/include/psdk/winnt.rh index 38cefd61c53..40452071ba9 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 LANG_AZERBAIJANI +#define LANG_AZERI 0x2c // 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 0x0004 +#define LANG_CHINESE_SIMPLIFIED 0x04 #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 LANG_PERSIAN +#define LANG_FARSI 0x29 // 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 LANG_ODIA +#define LANG_ORIYA 0x48 // LANG_ODIA #define LANG_PASHTO 0x63 #define LANG_PERSIAN 0x29 #define LANG_POLISH 0x15 #define LANG_PORTUGUESE 0x16 -#define LANG_PULAR LANG_FULAH +#define LANG_PULAR 0x67 // 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 LANG_TIGRINYA +#define LANG_TIGRIGNA 0x73 // 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 LANG_CATALAN +#define LANG_VALENCIAN 0x03 // LANG_CATALAN #define LANG_VIETNAMESE 0x2a #define LANG_WELSH 0x52 #define LANG_WOLOF 0x88 #define LANG_XHOSA 0x34 -#define LANG_YAKUT LANG_SAKHA +#define LANG_YAKUT 0x85 // 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 SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN -#define SUBLANG_AZERI_CYRILLIC SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC +#define SUBLANG_AZERI_LATIN 0x01 // SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN +#define SUBLANG_AZERI_CYRILLIC 0x02 // 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 SUBLANG_ODIA_INDIA +#define SUBLANG_ORIYA_INDIA 0x01 // 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 SUBLANG_FULAH_SENEGAL +#define SUBLANG_PULAR_SENEGAL 0x02 // 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 SUBLANG_SINDHI_AFGHANISTAN +#define SUBLANG_SINDHI_PAKISTAN 0x02 // 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 SUBLANG_TIGRINYA_ERITREA +#define SUBLANG_TIGRIGNA_ERITREA 0x02 // 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 SUBLANG_SAKHA_RUSSIA +#define SUBLANG_YAKUT_RUSSIA 0x01 // 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/winsnmp.h b/sdk/include/psdk/winsnmp.h index b61cddef057..08b97ee809c 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 _WINSNMP_H -#define _WINSNMP_H +#ifndef _INC_WINSNMP +#define _INC_WINSNMP -#ifndef _WINDOWS_H +#ifndef _INC_WINDOWS #include <windows.h> #endif @@ -323,4 +323,5 @@ SNMPAPI_STATUS WINSNMPAPI SnmpPasswordToKey(smiLPOCTETS,smiINT32,smiLPOCTETS); } #endif #include <poppack.h> -#endif + +#endif /* _INC_WINSNMP */ diff --git a/win32ss/drivers/displays/vga/vgaddi.h b/win32ss/drivers/displays/vga/vgaddi.h index e2b4ef46342..ef7e043268d 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 _WINDOWS_H +#define _INC_WINDOWS #include <stdarg.h> #include <windef.h> #include <wingdi.h>

1 year, 1 month

[reactos] 02/03: [PSDK] Sync winresrc.h with wine-8.20

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3e83562aa7e0116e9345d… commit 3e83562aa7e0116e9345d1b02cb829efcfb64071 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 15:21:05 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 16:25:35 2023 +0100 [PSDK] Sync winresrc.h with wine-8.20 It is also compatible with MS PSDK file. NOTE: I have observed that at least one .rh file (commctrl.rh) we have from Wine, is not yet fully compatible with its MS PSDK counterpart (for example it misses the TBSTYLE_* defines). --- sdk/include/psdk/winresrc.h | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/winresrc.h b/sdk/include/psdk/winresrc.h index dfddbc80c9b..2f99661f39e 100644 --- a/sdk/include/psdk/winresrc.h +++ b/sdk/include/psdk/winresrc.h @@ -1,11 +1,44 @@ +/* + * 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_ #define _WINRESRC_ -#define WIN32_LEAN_AND_MEAN +#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 <winnt.rh> #include <commctrl.rh> #include <dde.rh> +#include <winnt.rh> #include <dlgs.h> #include <winver.h>

1 year, 1 month

[reactos] 01/03: [OSK][PROGMAN] Fix resource file build.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e4ad0a82c780025c440… commit 84e4ad0a82c780025c440ac1de26f82047140c37 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 16:16:44 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 16:25:33 2023 +0100 [OSK][PROGMAN] Fix resource file build. --- base/applications/osk/osk.rc | 7 ++++--- base/shell/progman/new_resources.rc | 4 ++++ base/shell/progman/resource_2.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/base/applications/osk/osk.rc b/base/applications/osk/osk.rc index a599e616184..ddc38062090 100644 --- a/base/applications/osk/osk.rc +++ b/base/applications/osk/osk.rc @@ -5,8 +5,10 @@ * COPYRIGHT: Denis ROBERT */ -/* INCLUDES ******************************************************************/ -#include "precomp.h" +#include <windef.h> +#include <winuser.h> + +#include "osk_res.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS On Screen Keyboard" #define REACTOS_STR_INTERNAL_NAME "osk" @@ -17,7 +19,6 @@ 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 333c93cb6fe..27acccdf5ab 100644 --- a/base/shell/progman/new_resources.rc +++ b/base/shell/progman/new_resources.rc @@ -7,7 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // +#if 0 #include "afxres.h" +#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -32,7 +34,9 @@ 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 981cc6ab2e1..b164d52d117 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

1 year, 1 month

[reactos] 03/03: [PSDK] Use the new .rh files in winresrc.h

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6fb7c48c9b9d3127cfd1… commit f6fb7c48c9b9d3127cfd1e0e42638e1988e666ad Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 13:04:32 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 13:04:32 2023 +0100 [PSDK] Use the new .rh files in winresrc.h --- sdk/include/psdk/winresrc.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sdk/include/psdk/winresrc.h b/sdk/include/psdk/winresrc.h index 8540e42e88a..dfddbc80c9b 100644 --- a/sdk/include/psdk/winresrc.h +++ b/sdk/include/psdk/winresrc.h @@ -1,11 +1,12 @@ -#ifndef _WINRESRC_H -#define _WINRESRC_H +#ifndef _WINRESRC_ +#define _WINRESRC_ #define WIN32_LEAN_AND_MEAN -#include <winuser.h> -#include <winnt.h> -#include <winver.h> -#include <dde.h> +#include <winuser.rh> +#include <winnt.rh> +#include <commctrl.rh> +#include <dde.rh> #include <dlgs.h> -#include <commctrl.h> -#endif +#include <winver.h> + +#endif /* _WINRESRC_ */

1 year, 1 month

[reactos] 02/03: [PSDK] Import commctrl.rh, dde.rh, winnt.rh from wine-8.20

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9384e742eb9469dc3ee54… commit 9384e742eb9469dc3ee54b98ae7e9988aa73a02b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 12:45:55 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 12:45:55 2023 +0100 [PSDK] Import commctrl.rh, dde.rh, winnt.rh from wine-8.20 --- sdk/include/psdk/commctrl.rh | 216 +++++++++++++++++++++ sdk/include/psdk/dde.rh | 32 +++ sdk/include/psdk/winnt.rh | 450 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 698 insertions(+) diff --git a/sdk/include/psdk/commctrl.rh b/sdk/include/psdk/commctrl.rh new file mode 100644 index 00000000000..7cd3deb097d --- /dev/null +++ b/sdk/include/psdk/commctrl.rh @@ -0,0 +1,216 @@ +/* + * Copyright (C) 2008 Vijay Kiran Kamuju + * + * 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 + */ + +/* Macro to deal with LP64 <=> LLP64 differences in numeric constants with 'l' modifier */ +#ifndef __MSABI_LONG +# if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__) +# define __MSABI_LONG(x) x ## l +# else +# define __MSABI_LONG(x) x +# endif +#endif + +/* Header Control */ +#define HDS_HORZ 0x0000 +#define HDS_BUTTONS 0x0002 +#define HDS_HOTTRACK 0x0004 +#define HDS_HIDDEN 0x0008 +#define HDS_DRAGDROP 0x0040 +#define HDS_FULLDRAG 0x0080 +#define HDS_FILTERBAR 0x0100 +#define HDS_FLAT 0x0200 +#define HDS_CHECKBOXES 0x0400 +#define HDS_NOSIZING 0x0800 +#define HDS_OVERFLOW 0x1000 + +/* Rebar Control */ +#define RBS_TOOLTIPS 0x0100 +#define RBS_VARHEIGHT 0x0200 +#define RBS_BANDBORDERS 0x0400 +#define RBS_FIXEDORDER 0x0800 +#define RBS_REGISTERDROP 0x1000 +#define RBS_AUTOSIZE 0x2000 +#define RBS_VERTICALGRIPPER 0x4000 +#define RBS_DBLCLKTOGGLE 0x8000 + +/* Tool tips */ +#define TTS_ALWAYSTIP 0x01 +#define TTS_NOPREFIX 0x02 +#define TTS_NOANIMATE 0x10 +#define TTS_NOFADE 0x20 +#define TTS_BALLOON 0x40 +#define TTS_CLOSE 0x80 +#define TTS_USEVISUALSTYLE 0x100 + +/* Statusbar Control */ +#define SBARS_SIZEGRIP 0x0100 +#define SBARS_TOOLTIPS 0x0800 +#define SBT_TOOLTIPS 0x0800 + +/* Toolbar Control */ +#define TBS_AUTOTICKS 0x0001 +#define TBS_VERT 0x0002 +#define TBS_HORZ 0x0000 +#define TBS_TOP 0x0004 +#define TBS_BOTTOM 0x0000 +#define TBS_LEFT 0x0004 +#define TBS_RIGHT 0x0000 +#define TBS_BOTH 0x0008 +#define TBS_NOTICKS 0x0010 +#define TBS_ENABLESELRANGE 0x0020 +#define TBS_FIXEDLENGTH 0x0040 +#define TBS_NOTHUMB 0x0080 +#define TBS_TOOLTIPS 0x0100 +#define TBS_REVERSED 0x0200 +#define TBS_DOWNISLEFT 0x0400 +#define TBS_NOTIFYBEFOREREMOVE 0x0800 +#define TBS_TRANSPARENTBKGND 0x1000 + +/* UpDown Control */ +#define UDS_WRAP 0x0001 +#define UDS_SETBUDDYINT 0x0002 +#define UDS_ALIGNRIGHT 0x0004 +#define UDS_ALIGNLEFT 0x0008 +#define UDS_AUTOBUDDY 0x0010 +#define UDS_ARROWKEYS 0x0020 +#define UDS_HORZ 0x0040 +#define UDS_NOTHOUSANDS 0x0080 +#define UDS_HOTTRACK 0x0100 + +/* Progressbar Control */ +#define PBS_SMOOTH 0x01 +#define PBS_VERTICAL 0x04 +#define PBS_MARQUEE 0x08 +#define PBS_SMOOTHREVERSE 0x10 + +/* Common Control Styles */ +#define CCS_TOP __MSABI_LONG(0x00000001) +#define CCS_NOMOVEY __MSABI_LONG(0x00000002) +#define CCS_BOTTOM __MSABI_LONG(0x00000003) +#define CCS_NORESIZE __MSABI_LONG(0x00000004) +#define CCS_NOPARENTALIGN __MSABI_LONG(0x00000008) +#define CCS_ADJUSTABLE __MSABI_LONG(0x00000020) +#define CCS_NODIVIDER __MSABI_LONG(0x00000040) +#define CCS_VERT __MSABI_LONG(0x00000080) +#define CCS_LEFT (CCS_VERT | CCS_TOP) +#define CCS_RIGHT (CCS_VERT | CCS_BOTTOM) +#define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY) + +/* Listview Control */ +#define LVS_ICON 0x0000 +#define LVS_REPORT 0x0001 +#define LVS_SMALLICON 0x0002 +#define LVS_LIST 0x0003 +#define LVS_TYPEMASK 0x0003 +#define LVS_SINGLESEL 0x0004 +#define LVS_SHOWSELALWAYS 0x0008 +#define LVS_SORTASCENDING 0x0010 +#define LVS_SORTDESCENDING 0x0020 +#define LVS_SHAREIMAGELISTS 0x0040 +#define LVS_NOLABELWRAP 0x0080 +#define LVS_AUTOARRANGE 0x0100 +#define LVS_EDITLABELS 0x0200 +#define LVS_OWNERDATA 0x1000 +#define LVS_NOSCROLL 0x2000 +#define LVS_TYPESTYLEMASK 0xfc00 +#define LVS_ALIGNTOP 0x0000 +#define LVS_ALIGNLEFT 0x0800 +#define LVS_ALIGNMASK 0x0c00 +#define LVS_OWNERDRAWFIXED 0x0400 +#define LVS_NOCOLUMNHEADER 0x4000 +#define LVS_NOSORTHEADER 0x8000 + +/* Treeview Control */ +#define TVS_HASBUTTONS 0x0001 +#define TVS_HASLINES 0x0002 +#define TVS_LINESATROOT 0x0004 +#define TVS_EDITLABELS 0x0008 +#define TVS_DISABLEDRAGDROP 0x0010 +#define TVS_SHOWSELALWAYS 0x0020 +#define TVS_RTLREADING 0x0040 +#define TVS_NOTOOLTIPS 0x0080 +#define TVS_CHECKBOXES 0x0100 +#define TVS_TRACKSELECT 0x0200 +#define TVS_SINGLEEXPAND 0x0400 +#define TVS_INFOTIP 0x0800 +#define TVS_FULLROWSELECT 0x1000 +#define TVS_NOSCROLL 0x2000 +#define TVS_NONEVENHEIGHT 0x4000 +#define TVS_NOHSCROLL 0x8000 + +/* Tab Control */ +#define TCS_SCROLLOPPOSITE 0x0001 /* assumes multiline tab */ +#define TCS_BOTTOM 0x0002 +#define TCS_RIGHT 0x0002 +#define TCS_MULTISELECT 0x0004 /* allow multi-select in button mode */ +#define TCS_FLATBUTTONS 0x0008 +#define TCS_FORCEICONLEFT 0x0010 +#define TCS_FORCELABELLEFT 0x0020 +#define TCS_HOTTRACK 0x0040 +#define TCS_VERTICAL 0x0080 +#define TCS_TABS 0x0000 +#define TCS_BUTTONS 0x0100 +#define TCS_SINGLELINE 0x0000 +#define TCS_MULTILINE 0x0200 +#define TCS_RIGHTJUSTIFY 0x0000 +#define TCS_FIXEDWIDTH 0x0400 +#define TCS_RAGGEDRIGHT 0x0800 +#define TCS_FOCUSONBUTTONDOWN 0x1000 +#define TCS_OWNERDRAWFIXED 0x2000 +#define TCS_TOOLTIPS 0x4000 +#define TCS_FOCUSNEVER 0x8000 + +/* Animate Control */ +#define ACS_CENTER 0x0001 +#define ACS_TRANSPARENT 0x0002 +#define ACS_AUTOPLAY 0x0004 +#define ACS_TIMER 0x0008 /* no threads, just timers */ + +/* Month Calendar Control */ +#define MCS_DAYSTATE 0x0001 +#define MCS_MULTISELECT 0x0002 +#define MCS_WEEKNUMBERS 0x0004 +#define MCS_NOTODAY 0x0010 +#define MCS_NOTODAYCIRCLE 0x0008 +#define MCS_NOTRAILINGDATES 0x0040 +#define MCS_SHORTDAYSOFWEEK 0x0080 +#define MCS_NOSELCHANGEONNAV 0x0100 + +/* Datetime Control */ +#define DTS_SHORTDATEFORMAT 0x0000 +#define DTS_UPDOWN 0x0001 +#define DTS_SHOWNONE 0x0002 +#define DTS_LONGDATEFORMAT 0x0004 +#define DTS_TIMEFORMAT 0x0009 +#define DTS_SHORTDATECENTURYFORMAT 0x000c +#define DTS_APPCANPARSE 0x0010 +#define DTS_RIGHTALIGN 0x0020 + +/* Pager Control */ +#define PGS_VERT 0x00000000 +#define PGS_HORZ 0x00000001 +#define PGS_AUTOSCROLL 0x00000002 +#define PGS_DRAGNDROP 0x00000004 + +/* Native Font Control */ +#define NFS_EDIT 0x0001 +#define NFS_STATIC 0x0002 +#define NFS_LISTCOMBO 0x0004 +#define NFS_BUTTON 0x0008 +#define NFS_ALL 0x0010 +#define NFS_USEFONTASSOC 0x0020 diff --git a/sdk/include/psdk/dde.rh b/sdk/include/psdk/dde.rh new file mode 100644 index 00000000000..3b59f8e14e8 --- /dev/null +++ b/sdk/include/psdk/dde.rh @@ -0,0 +1,32 @@ +/* + * Copyright 1995, Technion, Israel Institute of Technology + * Electrical Eng, Software Lab. + * Author: Michael Veksler. + * Purpose: dde declarations + * + * 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 + */ + +#define WM_DDE_INITIATE 0x3E0 +#define WM_DDE_TERMINATE 0x3E1 +#define WM_DDE_ADVISE 0x3E2 +#define WM_DDE_UNADVISE 0x3E3 +#define WM_DDE_ACK 0x3E4 +#define WM_DDE_DATA 0x3E5 +#define WM_DDE_REQUEST 0x3E6 +#define WM_DDE_POKE 0x3E7 +#define WM_DDE_EXECUTE 0x3E8 +#define WM_DDE_LAST WM_DDE_EXECUTE +#define WM_DDE_FIRST WM_DDE_INITIATE diff --git a/sdk/include/psdk/winnt.rh b/sdk/include/psdk/winnt.rh new file mode 100644 index 00000000000..38cefd61c53 --- /dev/null +++ b/sdk/include/psdk/winnt.rh @@ -0,0 +1,450 @@ +/* + * Win32 definitions for Windows NT + * + * Copyright 1996 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 + */ + + +/* These are only defined for Winelib, i.e. _not_ defined for + * the emulator. The reason is they depend on the UNICODE + * macro which only exists in the user's code. + */ +#ifndef WINE_NO_UNICODE_MACROS +# ifndef UNICODE +# define __TEXT(string) string +# elif defined(WINE_UNICODE_NATIVE) +# define __TEXT(string) L##string +# else +# define __TEXT(string) u##string +# endif +# define TEXT(string) __TEXT(string) +#endif + + +/* Language definitions */ +#define LANG_NEUTRAL 0x00 +#define LANG_INVARIANT 0x7f + +#define LANG_AFRIKAANS 0x36 +#define LANG_ALBANIAN 0x1c +#define LANG_ALSATIAN 0x84 +#define LANG_AMHARIC 0x5e +#define LANG_ARABIC 0x01 +#define LANG_ARMENIAN 0x2b +#define LANG_ASSAMESE 0x4d +#define LANG_AZERBAIJANI 0x2c +#define LANG_AZERI LANG_AZERBAIJANI +#define LANG_BANGLA 0x45 +#define LANG_BASHKIR 0x6d +#define LANG_BASQUE 0x2d +#define LANG_BELARUSIAN 0x23 +#define LANG_BENGALI 0x45 +#define LANG_BOSNIAN 0x1a +#define LANG_BOSNIAN_NEUTRAL 0x781a +#define LANG_BRETON 0x7e +#define LANG_BULGARIAN 0x02 +#define LANG_CATALAN 0x03 +#define LANG_CENTRAL_KURDISH 0x92 +#define LANG_CHEROKEE 0x5c +#define LANG_CHINESE 0x04 +#define LANG_CHINESE_SIMPLIFIED 0x0004 +#define LANG_CHINESE_TRADITIONAL 0x7c04 +#define LANG_CORSICAN 0x83 +#define LANG_CROATIAN 0x1a +#define LANG_CZECH 0x05 +#define LANG_DANISH 0x06 +#define LANG_DARI 0x8c +#define LANG_DIVEHI 0x65 +#define LANG_DUTCH 0x13 +#define LANG_ENGLISH 0x09 +#define LANG_ESTONIAN 0x25 +#define LANG_FAEROESE 0x38 +#define LANG_FARSI LANG_PERSIAN +#define LANG_FILIPINO 0x64 +#define LANG_FINNISH 0x0b +#define LANG_FRENCH 0x0c +#define LANG_FRISIAN 0x62 +#define LANG_FULAH 0x67 +#define LANG_GALICIAN 0x56 +#define LANG_GEORGIAN 0x37 +#define LANG_GERMAN 0x07 +#define LANG_GREEK 0x08 +#define LANG_GREENLANDIC 0x6f +#define LANG_GUJARATI 0x47 +#define LANG_HAUSA 0x68 +#define LANG_HAWAIIAN 0x75 +#define LANG_HEBREW 0x0d +#define LANG_HINDI 0x39 +#define LANG_HUNGARIAN 0x0e +#define LANG_ICELANDIC 0x0f +#define LANG_IGBO 0x70 +#define LANG_INDONESIAN 0x21 +#define LANG_INUKTITUT 0x5d +#define LANG_IRISH 0x3c +#define LANG_ITALIAN 0x10 +#define LANG_JAPANESE 0x11 +#define LANG_KANNADA 0x4b +#define LANG_KASHMIRI 0x60 +#define LANG_KAZAK 0x3f +#define LANG_KHMER 0x53 +#define LANG_KICHE 0x86 +#define LANG_KINYARWANDA 0x87 +#define LANG_KONKANI 0x57 +#define LANG_KOREAN 0x12 +#define LANG_KYRGYZ 0x40 +#define LANG_LAO 0x54 +#define LANG_LATVIAN 0x26 +#define LANG_LITHUANIAN 0x27 +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_LUXEMBOURGISH 0x6e +#define LANG_MACEDONIAN 0x2f +#define LANG_MALAY 0x3e +#define LANG_MALAYALAM 0x4c +#define LANG_MALTESE 0x3a +#define LANG_MANIPURI 0x58 +#define LANG_MAORI 0x81 +#define LANG_MAPUDUNGUN 0x7a +#define LANG_MARATHI 0x4e +#define LANG_MOHAWK 0x7c +#define LANG_MONGOLIAN 0x50 +#define LANG_NEPALI 0x61 +#define LANG_NORWEGIAN 0x14 +#define LANG_OCCITAN 0x82 +#define LANG_ODIA 0x48 +#define LANG_ORIYA LANG_ODIA +#define LANG_PASHTO 0x63 +#define LANG_PERSIAN 0x29 +#define LANG_POLISH 0x15 +#define LANG_PORTUGUESE 0x16 +#define LANG_PULAR LANG_FULAH +#define LANG_PUNJABI 0x46 +#define LANG_QUECHUA 0x6b +#define LANG_ROMANIAN 0x18 +#define LANG_ROMANSH 0x17 +#define LANG_RUSSIAN 0x19 +#define LANG_SAKHA 0x85 +#define LANG_SAMI 0x3b +#define LANG_SANSKRIT 0x4f +#define LANG_SCOTTISH_GAELIC 0x91 +#define LANG_SERBIAN 0x1a +#define LANG_SERBIAN_NEUTRAL 0x7c1a +#define LANG_SINDHI 0x59 +#define LANG_SINHALESE 0x5b +#define LANG_SLOVAK 0x1b +#define LANG_SLOVENIAN 0x24 +#define LANG_SOTHO 0x6c +#define LANG_SPANISH 0x0a +#define LANG_SWAHILI 0x41 +#define LANG_SWEDISH 0x1d +#define LANG_SYRIAC 0x5a +#define LANG_TAJIK 0x28 +#define LANG_TAMAZIGHT 0x5f +#define LANG_TAMIL 0x49 +#define LANG_TATAR 0x44 +#define LANG_TELUGU 0x4a +#define LANG_THAI 0x1e +#define LANG_TIBETAN 0x51 +#define LANG_TIGRINYA 0x73 +#define LANG_TIGRIGNA LANG_TIGRINYA +#define LANG_TSWANA 0x32 +#define LANG_TURKISH 0x1f +#define LANG_TURKMEN 0x42 +#define LANG_UIGHUR 0x80 +#define LANG_UKRAINIAN 0x22 +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_URDU 0x20 +#define LANG_UZBEK 0x43 +#define LANG_VALENCIAN LANG_CATALAN +#define LANG_VIETNAMESE 0x2a +#define LANG_WELSH 0x52 +#define LANG_WOLOF 0x88 +#define LANG_XHOSA 0x34 +#define LANG_YAKUT LANG_SAKHA +#define LANG_YI 0x78 +#define LANG_YORUBA 0x6a +#define LANG_ZULU 0x35 + +/* Sublanguage definitions */ +#define SUBLANG_NEUTRAL 0x00 /* language neutral */ +#define SUBLANG_DEFAULT 0x01 /* user default */ +#define SUBLANG_SYS_DEFAULT 0x02 /* system default */ +#define SUBLANG_CUSTOM_DEFAULT 0x03 +#define SUBLANG_CUSTOM_UNSPECIFIED 0x04 +#define SUBLANG_UI_CUSTOM_DEFAULT 0x05 + +#define SUBLANG_AFRIKAANS_SOUTH_AFRICA 0x01 +#define SUBLANG_ALBANIAN_ALBANIA 0x01 +#define SUBLANG_ALSATIAN_FRANCE 0x01 +#define SUBLANG_AMHARIC_ETHIOPIA 0x01 +#define SUBLANG_ARABIC_SAUDI_ARABIA 0x01 +#define SUBLANG_ARABIC_IRAQ 0x02 +#define SUBLANG_ARABIC_EGYPT 0x03 +#define SUBLANG_ARABIC_LIBYA 0x04 +#define SUBLANG_ARABIC_ALGERIA 0x05 +#define SUBLANG_ARABIC_MOROCCO 0x06 +#define SUBLANG_ARABIC_TUNISIA 0x07 +#define SUBLANG_ARABIC_OMAN 0x08 +#define SUBLANG_ARABIC_YEMEN 0x09 +#define SUBLANG_ARABIC_SYRIA 0x0a +#define SUBLANG_ARABIC_JORDAN 0x0b +#define SUBLANG_ARABIC_LEBANON 0x0c +#define SUBLANG_ARABIC_KUWAIT 0x0d +#define SUBLANG_ARABIC_UAE 0x0e +#define SUBLANG_ARABIC_BAHRAIN 0x0f +#define SUBLANG_ARABIC_QATAR 0x10 +#define SUBLANG_ARMENIAN_ARMENIA 0x01 +#define SUBLANG_ASSAMESE_INDIA 0x01 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN 0x01 +#define SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC 0x02 +#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 +#define SUBLANG_BASQUE_BASQUE 0x01 +#define SUBLANG_BELARUSIAN_BELARUS 0x01 +#define SUBLANG_BENGALI_INDIA 0x01 +#define SUBLANG_BENGALI_BANGLADESH 0x02 +#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_LATIN 0x05 +#define SUBLANG_BOSNIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x08 +#define SUBLANG_BRETON_FRANCE 0x01 +#define SUBLANG_BULGARIAN_BULGARIA 0x01 +#define SUBLANG_CATALAN_CATALAN 0x01 +#define SUBLANG_CENTRAL_KURDISH_IRAQ 0x01 +#define SUBLANG_CHEROKEE_CHEROKEE 0x01 +#define SUBLANG_CHINESE_TRADITIONAL 0x01 +#define SUBLANG_CHINESE_SIMPLIFIED 0x02 +#define SUBLANG_CHINESE_HONGKONG 0x03 +#define SUBLANG_CHINESE_SINGAPORE 0x04 +#define SUBLANG_CHINESE_MACAU 0x05 +#define SUBLANG_CORSICAN_FRANCE 0x01 +#define SUBLANG_CROATIAN_CROATIA 0x01 +#define SUBLANG_CROATIAN_BOSNIA_HERZEGOVINA_LATIN 0x04 +#define SUBLANG_CZECH_CZECH_REPUBLIC 0x01 +#define SUBLANG_DANISH_DENMARK 0x01 +#define SUBLANG_DARI_AFGHANISTAN 0x01 +#define SUBLANG_DIVEHI_MALDIVES 0x01 +#define SUBLANG_DUTCH 0x01 +#define SUBLANG_DUTCH_BELGIAN 0x02 +#define SUBLANG_ENGLISH_US 0x01 +#define SUBLANG_ENGLISH_UK 0x02 +#define SUBLANG_ENGLISH_AUS 0x03 +#define SUBLANG_ENGLISH_CAN 0x04 +#define SUBLANG_ENGLISH_NZ 0x05 +#define SUBLANG_ENGLISH_EIRE 0x06 +#define SUBLANG_ENGLISH_SOUTH_AFRICA 0x07 +#define SUBLANG_ENGLISH_JAMAICA 0x08 +#define SUBLANG_ENGLISH_CARIBBEAN 0x09 +#define SUBLANG_ENGLISH_BELIZE 0x0a +#define SUBLANG_ENGLISH_TRINIDAD 0x0b +#define SUBLANG_ENGLISH_ZIMBABWE 0x0c +#define SUBLANG_ENGLISH_PHILIPPINES 0x0d +#define SUBLANG_ENGLISH_INDIA 0x10 +#define SUBLANG_ENGLISH_MALAYSIA 0x11 +#define SUBLANG_ENGLISH_SINGAPORE 0x12 +#define SUBLANG_ESTONIAN_ESTONIA 0x01 +#define SUBLANG_FAEROESE_FAROE_ISLANDS 0x01 +#define SUBLANG_FILIPINO_PHILIPPINES 0x01 +#define SUBLANG_FINNISH_FINLAND 0x01 +#define SUBLANG_FRENCH 0x01 +#define SUBLANG_FRENCH_BELGIAN 0x02 +#define SUBLANG_FRENCH_CANADIAN 0x03 +#define SUBLANG_FRENCH_SWISS 0x04 +#define SUBLANG_FRENCH_LUXEMBOURG 0x05 +#define SUBLANG_FRENCH_MONACO 0x06 +#define SUBLANG_FRISIAN_NETHERLANDS 0x01 +#define SUBLANG_FULAH_SENEGAL 0x02 +#define SUBLANG_GALICIAN_GALICIAN 0x01 +#define SUBLANG_GEORGIAN_GEORGIA 0x01 +#define SUBLANG_GERMAN 0x01 +#define SUBLANG_GERMAN_SWISS 0x02 +#define SUBLANG_GERMAN_AUSTRIAN 0x03 +#define SUBLANG_GERMAN_LUXEMBOURG 0x04 +#define SUBLANG_GERMAN_LIECHTENSTEIN 0x05 +#define SUBLANG_GREEK_GREECE 0x01 +#define SUBLANG_GREENLANDIC_GREENLAND 0x01 +#define SUBLANG_GUJARATI_INDIA 0x01 +#define SUBLANG_HAUSA_NIGERIA_LATIN 0x01 +#define SUBLANG_HAWAIIAN_US 0x01 +#define SUBLANG_HEBREW_ISRAEL 0x01 +#define SUBLANG_HINDI_INDIA 0x01 +#define SUBLANG_HUNGARIAN_HUNGARY 0x01 +#define SUBLANG_ICELANDIC_ICELAND 0x01 +#define SUBLANG_IGBO_NIGERIA 0x01 +#define SUBLANG_INDONESIAN_INDONESIA 0x01 +#define SUBLANG_INUKTITUT_CANADA 0x01 +#define SUBLANG_INUKTITUT_CANADA_LATIN 0x02 +#define SUBLANG_IRISH_IRELAND 0x02 +#define SUBLANG_ITALIAN 0x01 +#define SUBLANG_ITALIAN_SWISS 0x02 +#define SUBLANG_JAPANESE_JAPAN 0x01 +#define SUBLANG_KANNADA_INDIA 0x01 +#define SUBLANG_KASHMIRI_SASIA 0x02 +#define SUBLANG_KASHMIRI_INDIA 0x02 +#define SUBLANG_KAZAK_KAZAKHSTAN 0x01 +#define SUBLANG_KHMER_CAMBODIA 0x01 +#define SUBLANG_KICHE_GUATEMALA 0x01 +#define SUBLANG_KINYARWANDA_RWANDA 0X01 +#define SUBLANG_KONKANI_INDIA 0x01 +#define SUBLANG_KOREAN 0x01 +#define SUBLANG_KYRGYZ_KYRGYZSTAN 0x01 +#define SUBLANG_LAO_LAO 0x01 +#define SUBLANG_LATVIAN_LATVIA 0x01 +#define SUBLANG_LITHUANIAN 0x01 +#define SUBLANG_LOWER_SORBIAN_GERMANY 0x02 +#define SUBLANG_LUXEMBOURGISH_LUXEMBOURG 0x01 +#define SUBLANG_MACEDONIAN_MACEDONIA 0x01 +#define SUBLANG_MALAY_MALAYSIA 0x01 +#define SUBLANG_MALAY_BRUNEI_DARUSSALAM 0x02 +#define SUBLANG_MALAYALAM_INDIA 0x01 +#define SUBLANG_MALTESE_MALTA 0x01 +#define SUBLANG_MAORI_NEW_ZEALAND 0x01 +#define SUBLANG_MAPUDUNGUN_CHILE 0x01 +#define SUBLANG_MARATHI_INDIA 0x01 +#define SUBLANG_MOHAWK_MOHAWK 0x01 +#define SUBLANG_MONGOLIAN_CYRILLIC_MONGOLIA 0x01 +#define SUBLANG_MONGOLIAN_PRC 0x02 +#define SUBLANG_NEPALI_INDIA 0x02 +#define SUBLANG_NEPALI_NEPAL 0x01 +#define SUBLANG_NORWEGIAN_BOKMAL 0x01 +#define SUBLANG_NORWEGIAN_NYNORSK 0x02 +#define SUBLANG_OCCITAN_FRANCE 0x01 +#define SUBLANG_ODIA_INDIA 0x01 +#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 SUBLANG_FULAH_SENEGAL +#define SUBLANG_PUNJABI_INDIA 0x01 +#define SUBLANG_PUNJABI_PAKISTAN 0x02 +#define SUBLANG_QUECHUA_BOLIVIA 0x01 +#define SUBLANG_QUECHUA_ECUADOR 0x02 +#define SUBLANG_QUECHUA_PERU 0x03 +#define SUBLANG_ROMANIAN_ROMANIA 0x01 +#define SUBLANG_ROMANSH_SWITZERLAND 0x01 +#define SUBLANG_RUSSIAN_RUSSIA 0x01 +#define SUBLANG_SAKHA_RUSSIA 0x01 +#define SUBLANG_SAMI_NORTHERN_NORWAY 0x01 +#define SUBLANG_SAMI_NORTHERN_SWEDEN 0x02 +#define SUBLANG_SAMI_NORTHERN_FINLAND 0x03 +#define SUBLANG_SAMI_LULE_NORWAY 0x04 +#define SUBLANG_SAMI_LULE_SWEDEN 0x05 +#define SUBLANG_SAMI_SOUTHERN_NORWAY 0x06 +#define SUBLANG_SAMI_SOUTHERN_SWEDEN 0x07 +#define SUBLANG_SAMI_SKOLT_FINLAND 0x08 +#define SUBLANG_SAMI_INARI_FINLAND 0x09 +#define SUBLANG_SANSKRIT_INDIA 0x01 +#define SUBLANG_SCOTTISH_GAELIC 0x01 +#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_LATIN 0x06 +#define SUBLANG_SERBIAN_BOSNIA_HERZEGOVINA_CYRILLIC 0x07 +#define SUBLANG_SERBIAN_CROATIA 0x01 +#define SUBLANG_SERBIAN_LATIN 0x02 +#define SUBLANG_SERBIAN_CYRILLIC 0x03 +#define SUBLANG_SERBIAN_SERBIA_LATIN 0x09 +#define SUBLANG_SERBIAN_SERBIA_CYRILLIC 0x0a +#define SUBLANG_SERBIAN_MONTENEGRO_LATIN 0x0b +#define SUBLANG_SERBIAN_MONTENEGRO_CYRILLIC 0x0c +#define SUBLANG_SINDHI_INDIA 0x01 +#define SUBLANG_SINDHI_AFGHANISTAN 0x02 +#define SUBLANG_SINDHI_PAKISTAN SUBLANG_SINDHI_AFGHANISTAN +#define SUBLANG_SINHALESE_SRI_LANKA 0x01 +#define SUBLANG_SLOVAK_SLOVAKIA 0x01 +#define SUBLANG_SLOVENIAN_SLOVENIA 0x01 +#define SUBLANG_SOTHO_NORTHERN_SOUTH_AFRICA 0x01 +#define SUBLANG_SPANISH 0x01 +#define SUBLANG_SPANISH_MEXICAN 0x02 +#define SUBLANG_SPANISH_MODERN 0x03 +#define SUBLANG_SPANISH_GUATEMALA 0x04 +#define SUBLANG_SPANISH_COSTA_RICA 0x05 +#define SUBLANG_SPANISH_PANAMA 0x06 +#define SUBLANG_SPANISH_DOMINICAN_REPUBLIC 0x07 +#define SUBLANG_SPANISH_VENEZUELA 0x08 +#define SUBLANG_SPANISH_COLOMBIA 0x09 +#define SUBLANG_SPANISH_PERU 0x0a +#define SUBLANG_SPANISH_ARGENTINA 0x0b +#define SUBLANG_SPANISH_ECUADOR 0x0c +#define SUBLANG_SPANISH_CHILE 0x0d +#define SUBLANG_SPANISH_URUGUAY 0x0e +#define SUBLANG_SPANISH_PARAGUAY 0x0f +#define SUBLANG_SPANISH_BOLIVIA 0x10 +#define SUBLANG_SPANISH_EL_SALVADOR 0x11 +#define SUBLANG_SPANISH_HONDURAS 0x12 +#define SUBLANG_SPANISH_NICARAGUA 0x13 +#define SUBLANG_SPANISH_PUERTO_RICO 0x14 +#define SUBLANG_SPANISH_US 0x15 +#define SUBLANG_SWAHILI_KENYA 0x01 +#define SUBLANG_SWEDISH 0x01 +#define SUBLANG_SWEDISH_FINLAND 0x02 +#define SUBLANG_SYRIAC_SYRIA 0x01 +#define SUBLANG_TAJIK_TAJIKISTAN 0x01 +#define SUBLANG_TAMAZIGHT_ALGERIA_LATIN 0x02 +#define SUBLANG_TAMAZIGHT_MOROCCO_TIFINAGH 0x04 +#define SUBLANG_TAMIL_INDIA 0x01 +#define SUBLANG_TAMIL_SRI_LANKA 0x02 +#define SUBLANG_TATAR_RUSSIA 0x01 +#define SUBLANG_TELUGU_INDIA 0x01 +#define SUBLANG_THAI_THAILAND 0x01 +#define SUBLANG_TIBETAN_PRC 0x01 +#define SUBLANG_TIBETAN_BHUTAN 0x02 +#define SUBLANG_TIGRINYA_ERITREA 0x02 +#define SUBLANG_TIGRINYA_ETHIOPIA 0x01 +#define SUBLANG_TIGRIGNA_ERITREA SUBLANG_TIGRINYA_ERITREA +#define SUBLANG_TSWANA_SOUTH_AFRICA 0x01 +#define SUBLANG_TSWANA_BOTSWANA 0x02 +#define SUBLANG_TURKISH_TURKEY 0x01 +#define SUBLANG_TURKMEN_TURKMENISTAN 0x01 +#define SUBLANG_UIGHUR_PRC 0x01 +#define SUBLANG_UKRAINIAN_UKRAINE 0x01 +#define SUBLANG_UPPER_SORBIAN_GERMANY 0x01 +#define SUBLANG_URDU_PAKISTAN 0x01 +#define SUBLANG_URDU_INDIA 0x02 +#define SUBLANG_UZBEK_LATIN 0x01 +#define SUBLANG_UZBEK_CYRILLIC 0x02 +#define SUBLANG_VALENCIAN_VALENCIA 0x02 +#define SUBLANG_VIETNAMESE_VIETNAM 0x01 +#define SUBLANG_WELSH_UNITED_KINGDOM 0x01 +#define SUBLANG_WOLOF_SENEGAL 0x01 +#define SUBLANG_XHOSA_SOUTH_AFRICA 0x01 +#define SUBLANG_YAKUT_RUSSIA SUBLANG_SAKHA_RUSSIA +#define SUBLANG_YI_PRC 0x01 +#define SUBLANG_YORUBA_NIGERIA 0x01 +#define SUBLANG_ZULU_SOUTH_AFRICA 0x01 + +/* + * Sort definitions + */ + +#define SORT_DEFAULT 0x0 +#define SORT_INVARIANT_MATH 0x1 +#define SORT_JAPANESE_XJIS 0x0 +#define SORT_JAPANESE_UNICODE 0x1 +#define SORT_JAPANESE_RADICALSTROKE 0x4 +#define SORT_CHINESE_BIG5 0x0 +#define SORT_CHINESE_PRCP 0x0 +#define SORT_CHINESE_UNICODE 0x1 +#define SORT_CHINESE_PRC 0x2 +#define SORT_CHINESE_BOPOMOFO 0x3 +#define SORT_CHINESE_RADICALSTROKE 0x4 +#define SORT_KOREAN_KSC 0x0 +#define SORT_KOREAN_UNICODE 0x1 +#define SORT_GERMAN_PHONE_BOOK 0x1 +#define SORT_HUNGARIAN_DEFAULT 0x0 +#define SORT_HUNGARIAN_TECHNICAL 0x1 +#define SORT_GEORGIAN_TRADITIONAL 0x0 +#define SORT_GEORGIAN_MODERN 0x1

1 year, 1 month

[reactos] 01/03: [PSDK] Make winuser.rh more compatible with the one from MS PSDK

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a3c479b62f14118dc5f4… commit 1a3c479b62f14118dc5f402c916faaa66dea4e86 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 12:35:50 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 12:44:50 2023 +0100 [PSDK] Make winuser.rh more compatible with the one from MS PSDK Note that this file is already in sync with wine-8.20 NOWINMESSAGES, NOWINSTYLES, NOCLIPBOARD, NOMENUS, NOSYSCOMMANDS, OEMRESOURCE and NOICONS #ifndef guards should not be present in the .rh file, contrary to the .h file. However, #ifndef NONCMESSAGES guard should be present. Finally, remove the useless SC_SIZE redefinition ("At least HP-UX defines it in /usr/include/sys/signal.h" -- like, what the hell, we are developing ReactOS...) --- sdk/include/psdk/winuser.rh | 62 ++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/sdk/include/psdk/winuser.rh b/sdk/include/psdk/winuser.rh index fd984a91742..d7ffcaf91e8 100644 --- a/sdk/include/psdk/winuser.rh +++ b/sdk/include/psdk/winuser.rh @@ -293,7 +293,7 @@ /*** Messages ***/ -#ifndef NOWINMESSAGES +// #ifndef NOWINMESSAGES #define WM_NULL 0x0000 #define WM_CREATE 0x0001 #define WM_DESTROY 0x0002 @@ -695,6 +695,7 @@ #define WMSZ_BOTTOMRIGHT 8 /* WM_NCHITTEST return codes */ +#ifndef NONCMESSAGES #define HTERROR (-2) #define HTTRANSPARENT (-1) #define HTNOWHERE 0 @@ -731,6 +732,7 @@ #define SMTO_ABORTIFHUNG 0x0002 #define SMTO_NOTIMEOUTIFNOTHUNG 0x0008 #define SMTO_ERRORONEXIT 0x0020 +#endif /* !NONCMESSAGES */ /* WM_MOUSEACTIVATE return values */ #define MA_ACTIVATE 1 @@ -785,11 +787,11 @@ #define HOVER_DEFAULT 0xFFFFFFFF #endif /* NOTRACKMOUSEEVENT */ -#endif /* NOWINMESSAGES */ +// #endif /* NOWINMESSAGES */ /*** Window Styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define WS_OVERLAPPED __MSABI_LONG(0x00000000) #define WS_POPUP __MSABI_LONG(0x80000000) #define WS_CHILD __MSABI_LONG(0x40000000) @@ -817,11 +819,11 @@ #define WS_POPUPWINDOW (WS_POPUP | WS_BORDER | WS_SYSMENU) #define WS_CHILDWINDOW WS_CHILD #define WS_TILEDWINDOW WS_OVERLAPPEDWINDOW -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Window extended styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define WS_EX_DLGMODALFRAME __MSABI_LONG(0x00000001) #define WS_EX_DRAGDETECT __MSABI_LONG(0x00000002) /* Undocumented */ #define WS_EX_NOPARENTNOTIFY __MSABI_LONG(0x00000004) @@ -851,11 +853,11 @@ #define WS_EX_OVERLAPPEDWINDOW (WS_EX_WINDOWEDGE | WS_EX_CLIENTEDGE) #define WS_EX_PALETTEWINDOW (WS_EX_WINDOWEDGE | WS_EX_TOOLWINDOW | WS_EX_TOPMOST) -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Class styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define CS_VREDRAW 0x00000001 #define CS_HREDRAW 0x00000002 #define CS_KEYCVTWINDOW 0x00000004 /* DDK / Win16 */ @@ -871,11 +873,11 @@ #define CS_GLOBALCLASS 0x00004000 #define CS_IME 0x00010000 #define CS_DROPSHADOW 0x00020000 -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Predefined Clipboard Formats ***/ -#ifndef NOCLIPBOARD +// #ifndef NOCLIPBOARD #define CF_TEXT 1 #define CF_BITMAP 2 #define CF_METAFILEPICT 3 @@ -908,11 +910,11 @@ /* "GDIOBJ" formats do get DeleteObject()'d */ #define CF_GDIOBJFIRST 0x0300 #define CF_GDIOBJLAST 0x03FF -#endif /* NOCLIPBOARD */ +// #endif /* NOCLIPBOARD */ /*** Menu flags ***/ -#ifndef NOMENUS +// #ifndef NOMENUS #define MF_INSERT __MSABI_LONG(0x00000000) #define MF_CHANGE __MSABI_LONG(0x00000080) #define MF_APPEND __MSABI_LONG(0x00000100) @@ -971,15 +973,11 @@ #define MFS_BOTTOMGAPDROP __MSABI_LONG(0x40000000) #define MFS_TOPGAPDROP __MSABI_LONG(0x80000000) #define MFS_GAPDROP (MFS_BOTTOMGAPDROP | MFS_TOPGAPDROP) -#endif /* NOMENUS */ +// #endif /* NOMENUS */ /*** WM_SYSCOMMAND parameters ***/ -#ifndef NOSYSCOMMANDS -/* At least HP-UX defines it in /usr/include/sys/signal.h */ -# ifdef SC_SIZE -# undef SC_SIZE -# endif +// #ifndef NOSYSCOMMANDS #define SC_SIZE 0xf000 #define SC_MOVE 0xf010 #define SC_MINIMIZE 0xf020 @@ -1009,11 +1007,11 @@ /* Obsolete names */ #define SC_ICON SC_MINIMIZE #define SC_ZOOM SC_MAXIMIZE -#endif /* NOSYSCOMMANDS */ +// #endif /* NOSYSCOMMANDS */ /*** OEM Resource Ordinal Numbers ***/ -#ifdef OEMRESOURCE +// #ifdef OEMRESOURCE #define OBM_RDRVERT 32559 #define OBM_RDRHORZ 32660 #define OBM_RDR2DIM 32661 @@ -1093,11 +1091,11 @@ #define OIC_INFORMATION OIC_NOTE #define OIC_WINLOGO 32517 #define OIC_SHIELD 32518 -#endif /* OEMRESOURCE */ +// #endif /* OEMRESOURCE */ /*** Predefined resources ***/ -#ifndef NOICONS +// #ifndef NOICONS #define IDI_APPLICATION MAKEINTRESOURCE(32512) #define IDI_HAND MAKEINTRESOURCE(32513) #define IDI_QUESTION MAKEINTRESOURCE(32514) @@ -1109,7 +1107,7 @@ #define IDI_WARNING IDI_EXCLAMATION #define IDI_ERROR IDI_HAND #define IDI_INFORMATION IDI_ASTERISK -#endif /* NOICONS */ +// #endif /* NOICONS */ /*** Standard dialog button IDs ***/ @@ -1130,7 +1128,7 @@ /*** Edit control styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define ES_LEFT __MSABI_LONG(0x00000000) #define ES_CENTER __MSABI_LONG(0x00000001) #define ES_RIGHT __MSABI_LONG(0x00000002) @@ -1146,11 +1144,11 @@ #define ES_READONLY __MSABI_LONG(0x00000800) #define ES_WANTRETURN __MSABI_LONG(0x00001000) #define ES_NUMBER __MSABI_LONG(0x00002000) -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Edit control messages ***/ -#ifndef NOWINMESSAGES +// #ifndef NOWINMESSAGES #define EM_GETSEL 0x00b0 #define EM_SETSEL 0x00b1 #define EM_GETRECT 0x00b2 @@ -1193,7 +1191,7 @@ #define EM_CHARFROMPOS 0x00d7 #define EM_SETIMESTATUS 0x00d8 #define EM_GETIMESTATUS 0x00d9 -#endif /* NOWINMESSAGES */ +// #endif /* NOWINMESSAGES */ /*** Button control styles ***/ @@ -1316,7 +1314,7 @@ /*** Listbox styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define LBS_NOTIFY __MSABI_LONG(0x00000001) #define LBS_SORT __MSABI_LONG(0x00000002) #define LBS_NOREDRAW __MSABI_LONG(0x00000004) @@ -1334,10 +1332,10 @@ #define LBS_NOSEL __MSABI_LONG(0x00004000) #define LBS_COMBOBOX __MSABI_LONG(0x00008000) #define LBS_STANDARD (LBS_NOTIFY | LBS_SORT | WS_VSCROLL | WS_BORDER) -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Combo box styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define CBS_SIMPLE __MSABI_LONG(0x00000001) #define CBS_DROPDOWN __MSABI_LONG(0x00000002) #define CBS_DROPDOWNLIST __MSABI_LONG(0x00000003) @@ -1352,11 +1350,11 @@ #define CBS_UPPERCASE __MSABI_LONG(0x00002000) #define CBS_LOWERCASE __MSABI_LONG(0x00004000) -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** Scrollbar styles ***/ -#ifndef NOWINSTYLES +// #ifndef NOWINSTYLES #define SBS_HORZ __MSABI_LONG(0x00000000) #define SBS_VERT __MSABI_LONG(0x00000001) #define SBS_TOPALIGN __MSABI_LONG(0x00000002) @@ -1367,7 +1365,7 @@ #define SBS_SIZEBOXBOTTOMRIGHTALIGN __MSABI_LONG(0x00000004) #define SBS_SIZEBOX __MSABI_LONG(0x00000008) #define SBS_SIZEGRIP __MSABI_LONG(0x00000010) -#endif /* NOWINSTYLES */ +// #endif /* NOWINSTYLES */ /*** WinHelp commands ***/ #define HELP_CONTEXT __MSABI_LONG(0x00000001)

1 year, 1 month

[reactos] 01/01: [USER32] Fix OEM resources compilation due to missing OBM_, OIC_, OCR_ defines...

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c2827a3f3134925b03a2… commit 0c2827a3f3134925b03a2d5a45e8febc31b820bd Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Nov 23 11:39:48 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Nov 23 11:39:57 2023 +0100 [USER32] Fix OEM resources compilation due to missing OBM_, OIC_, OCR_ defines... ... addendum to commits 072965eb0 and 6cdaad13b. Due to the wrapping of these defines within an #ifdef OEMRESOURCE block in winuser.h (for MS PSDK compatibility), these defines became unavailable in user32.rc resource file. Thus, during user32 resources compilation, the resource compiler fell back to the behaviour of considering these resource IDs as literal string IDs (not numerical ones). Thus, whenever code was trying to refer to these resources via their numerical IDs, these resources could not be found now, rendering ReactOS unusuable. --- win32ss/user/user32/user32.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/user32/user32.rc b/win32ss/user/user32/user32.rc index ec23bbb21ec..a3210a30787 100644 --- a/win32ss/user/user32/user32.rc +++ b/win32ss/user/user32/user32.rc @@ -1,4 +1,5 @@ #include <windef.h> +#define OEMRESOURCE #include <winuser.h> #include "include/resource.h"

1 year, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs