Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[navaraf] 15969: Get rid of the prehistoric GNU Windows32 headers.

by navaraf＠svn.reactos.com

Get rid of the prehistoric GNU Windows32 headers. Deleted: trunk/reactos/include/base.h Deleted: trunk/reactos/include/defines.h Deleted: trunk/reactos/include/funcs.h Deleted: trunk/reactos/include/structs.h Deleted: trunk/reactos/include/unicode.h Deleted: trunk/reactos/include/windows.h _____ Deleted: trunk/reactos/include/base.h --- trunk/reactos/include/base.h 2005-06-17 11:28:23 UTC (rev 15968) +++ trunk/reactos/include/base.h 2005-06-17 11:29:07 UTC (rev 15969) @@ -1,749 +0,0 @@ -/* - Base.h - - Base definitions - - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - - Author: Scott Christley <scottc(a)net-community.com> - - This file is part of the Windows32 API Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - If you are interested in a warranty or support for this source code, - contact Scott Christley <scottc(a)net-community.com> for more information. - - You should have received a copy of the GNU Library General Public - License along with this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef _GNU_H_WINDOWS32_BASE -#define _GNU_H_WINDOWS32_BASE - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifndef NULL -#ifdef __cplusplus -#define NULL (0) -#else -#define NULL ((void *)0) -#endif -#endif /* !NULL */ - -#include <ntos/types.h> - -/* Check VOID before defining CHAR, SHORT, and LONG */ -#ifndef VOID -#define VOID void -typedef char CHAR; -typedef short SHORT; -typedef long LONG; -#endif - - -#define CONST const - -#define WINAPI STDCALL -#define APIENTRY STDCALL -#define WINGDIAPI - - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef wchar_t *LPTCH; -typedef wchar_t *LPTSTR; -#else -typedef char *LPTCH; -typedef char *LPTSTR; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -#ifndef RC_INVOKED - -/* typedef ACMDRIVERENUMCB; -typedef ACMDRIVERPROC; -typedef ACMFILERCHOOSEHOOKPROC; -typedef ACMFILTERENUMCB; -typedef ACMFILTERTAGENUMCB; -typedef ACMFORMATCHOOSEHOOKPROC; -typedef ACMFORMATENUMCB; -typedef ACMFORMATTAGENUMCB; -typedef APPLET_PROC; -*/ -/* Changed from BOOL to WINBOOL to avoid Objective-C conflict */ -typedef unsigned long CALTYPE; -typedef unsigned long CALID; -typedef unsigned long COLORREF; - -/* -typedef CTRYID; -typedef DLGPROC; -*/ -#ifdef __GNUC__ -typedef unsigned long long DWORDLONG, *PDWORDLONG; -#else -typedef unsigned __int64 DWORDLONG, *PDWORDLONG; -#endif -/* -typedef EDITWORDBREAKPROC; -typedef ENHMFENUMPROC; -typedef ENUMRESLANGPROC; -typedef ENUMRESNAMEPROC; -typedef ENUMRESTYPEPROC; -*/ -typedef float FLOAT; -/* typedef GLOBALHANDLE; */ -typedef HANDLE HACCEL; -typedef HANDLE HBITMAP; -typedef HANDLE HBRUSH; -typedef HANDLE HCOLORSPACE; -typedef HANDLE HCONV; -typedef HANDLE HCONVLIST; -typedef HANDLE HCURSOR; -typedef HANDLE HDBC; -typedef HANDLE HDC; -typedef HANDLE HDDEDATA; -typedef HANDLE HDESK; -typedef HANDLE HDROP; -typedef HANDLE HDWP; -typedef HANDLE HENHMETAFILE; -typedef HANDLE HENV; -typedef USHORT COLOR16; -typedef int HFILE; -typedef HANDLE HFONT; -typedef HANDLE HGDIOBJ; -typedef HANDLE HGLOBAL; -typedef HANDLE HGLRC; -typedef HANDLE HHOOK; -typedef HANDLE HICON; -typedef HANDLE HIMAGELIST; -typedef HANDLE HINSTANCE; -typedef HANDLE HKEY, *PHKEY; -typedef HANDLE HKL; -typedef LONG GEOID; -typedef DWORD GEOTYPE; -typedef DWORD GEOCLASS; -typedef HANDLE HLOCAL; -typedef HANDLE HMENU; -typedef HANDLE HMETAFILE; -typedef HANDLE HMODULE; -typedef HANDLE HPALETTE; -typedef HANDLE HPEN; -typedef HANDLE HRASCONN; -typedef DWORD LGRPID; -typedef long HRESULT; -typedef HANDLE HRGN; -typedef HANDLE HRSRC; -typedef HANDLE HSTMT; -typedef HANDLE HSZ; -typedef HANDLE HWINSTA; -typedef HANDLE HWND; -typedef HANDLE HRAWINPUT; -typedef HANDLE HTASK; -typedef HANDLE HWINEVENTHOOK; -typedef VOID (CALLBACK *WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime); -//typedef unsigned short LANGID; -/*typedef DWORD LCID; */ -typedef DWORD LCTYPE; -/* typedef LOCALHANDLE */ -typedef unsigned short *LP; -typedef long LPARAM; -typedef int WINBOOL; -typedef WINBOOL *LPBOOL; -typedef CONST CHAR *LPCCH; -typedef CHAR *LPCH; -typedef COLORREF *LPCOLORREF; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef const wchar_t *LPCTSTR; -#else -typedef const char *LPCTSTR; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef const wchar_t *LPCWCH; -typedef DWORD *LPDWORD; -/* typedef LPFRHOOKPROC; */ -typedef HANDLE *LPHANDLE; -typedef DWORD FULLSCREENCONTROL; -typedef DWORD UNIVERSAL_FONT_ID; -typedef UNIVERSAL_FONT_ID *PUNIVERSAL_FONT_ID; -typedef DWORD REALIZATION_INFO; -typedef REALIZATION_INFO *PREALIZATION_INFO; -typedef DWORD SHAREDHANDLETABLE; -typedef SHAREDHANDLETABLE *PSHAREDHANDLETABLE; -typedef DWORD CHWIDTHINFO; -typedef CHWIDTHINFO *PCHWIDTHINFO; -/* typedef LPHANDLER_FUNCTION; */ -typedef PINT LPINT; -typedef PLONG LPLONG; - -typedef long LRESULT; -typedef wchar_t *LPWCH; -typedef unsigned short *LPWORD; -/* typedef NPSTR; */ -typedef wchar_t *NWPSTR; -typedef WINBOOL *PWINBOOL; -typedef const CHAR *PCCH; -typedef const char *PCSTR; -typedef const wchar_t *PCWCH; -/* typedef PHKEY; */ -/* typedef LCID *PLCID; */ -typedef short *PSHORT; -/* typedef PSID; */ -typedef char *PSTR; -typedef char *PSZ; - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef wchar_t *PTBYTE; -typedef wchar_t *PTCH; -typedef wchar_t *PTCHAR; -typedef wchar_t *PTSTR; -#else -typedef unsigned char *PTBYTE; -typedef char *PTCH; -typedef char *PTCHAR; -typedef char *PTSTR; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -/* - typedef PWSTR; - */ -typedef DWORD REGSAM; - - -typedef short RETCODE; - -typedef HANDLE SC_HANDLE; -typedef LPVOID SC_LOCK; -typedef SC_HANDLE *LPSC_HANDLE; -typedef DWORD SERVICE_STATUS_HANDLE; -/* typedef SPHANDLE; */ - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -typedef wchar_t TBYTE; -#ifndef _TCHAR_DEFINED -#define _TCHAR_DEFINED -typedef wchar_t TCHAR; -#endif /* _TCHAR_DEFINED */ -typedef wchar_t BCHAR; -#else -typedef unsigned char TBYTE; -#ifndef _TCHAR_DEFINED -#define _TCHAR_DEFINED -typedef char TCHAR; -#endif /* _TCHAR_DEFINED */ -typedef BYTE BCHAR; -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -typedef unsigned int WPARAM; -/* typedef YIELDPROC; */ - -/* Only use __stdcall under WIN32 compiler */ - -#define _export - -/* - Enumerations -*/ - - -#define GEOID_NOT_AVAILABLE (-1) -/* - GEO information types for clients to query -*/ - -enum SYSGEOTYPE { - GEO_NATION = 0x01, - GEO_LATITUDE = 0x02, - GEO_LONGITUDE = 0x03, - GEO_ISO2 = 0x04, - GEO_ISO3 = 0x05, - GEO_RFC1766 = 0x06, - GEO_LCID = 0x07, - GEO_FRIENDLYNAME = 0x08, - GEO_OFFICIALNAME = 0x09, - GEO_TIMEZONES = 0x0A, - GEO_OFFICIALLANGUAGES = 0x0B, -}; - -/* - More GEOCLASS defines will be listed here -*/ - -enum SYSGEOCLASS { - GEOCLASS_NATION = 16, - GEOCLASS_REGION = 14, -}; - - -#define RASCS_DONE 0x2000 -#define RASCS_PAUSED 0x1000 -typedef enum _RASCONNSTATE { - RASCS_OpenPort = 0, - RASCS_PortOpened, - RASCS_ConnectDevice, - RASCS_DeviceConnected, - RASCS_AllDevicesConnected, - RASCS_Authenticate, - RASCS_AuthNotify, - RASCS_AuthRetry, - RASCS_AuthCallback, - RASCS_AuthChangePassword, - RASCS_AuthProject, - RASCS_AuthLinkSpeed, - RASCS_AuthAck, - RASCS_ReAuthenticate, - RASCS_Authenticated, - RASCS_PrepareForCallback, - RASCS_WaitForModemReset, - RASCS_WaitForCallback, - RASCS_Projected, - - RASCS_StartAuthentication, - RASCS_CallbackComplete, - RASCS_LogonNetwork, - - RASCS_Interactive = RASCS_PAUSED, - RASCS_RetryAuthentication, - RASCS_CallbackSetByCaller, - RASCS_PasswordExpired, - - RASCS_Connected = RASCS_DONE, - RASCS_Disconnected -} RASCONNSTATE ; - -typedef enum _RASPROJECTION { - RASP_Amb = 0x10000, - RASP_PppNbf = 0x803F, - RASP_PppIpx = 0x802B, - RASP_PppIp = 0x8021 -} RASPROJECTION ; - -typedef enum _SID_NAME_USE { - SidTypeUser = 1, - SidTypeGroup, - SidTypeDomain, - SidTypeAlias, - SidTypeWellKnownGroup, - SidTypeDeletedAccount, - SidTypeInvalid, - SidTypeUnknown -} SID_NAME_USE, *PSID_NAME_USE; - -#endif /* ! defined (RC_INVOKED) */ - -/* - Macros -*/ -#define FORWARD_WM_NOTIFY(hwnd, idFrom, pnmhdr, fn) (void)(fn)((hwnd), WM_NOTIFY, (WPARAM)(int)(id), (LPARAM)(NMHDR FAR*)(pnmhdr)) - -#define GetBValue(rgb) ((BYTE) ((rgb) >> 16)) -#define GetGValue(rgb) ((BYTE) (((WORD) (rgb)) >> 8)) -#define GetRValue(rgb) ((BYTE) (rgb)) -#define RGB(r, g ,b) ((DWORD) (((BYTE) (r) | ((WORD) (g) << 8)) | (((DWORD) (BYTE) (b)) << 16))) - -#define HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) (fn)((hwnd), (int)(wParam), (NMHDR FAR*)(lParam)) - -#define HIBYTE(w) ((BYTE) (((WORD) (w) >> 8) & 0xFF)) -#define HIWORD(l) ((WORD) (((DWORD) (l) >> 16) & 0xFFFF)) -#define SHIWORD(l) ((INT16) (((DWORD) (l) >> 16) & 0xFFFF)) -#define LOBYTE(w) ((BYTE) (w)) -#define LOWORD(l) ((WORD) (l)) -#define SLOWORD(l) ((INT16) (l)) -#define MAKELONG(a, b) ((LONG) (((WORD) (a)) | ((DWORD) ((WORD) (b))) << 16)) -#define MAKEWORD(a, b) ((WORD) (((BYTE) (a)) | ((WORD) ((BYTE) (b))) << 8)) - -/* original Cygnus headers also had the following defined: */ -#define SEXT_HIWORD(l) ((((int)l) >> 16)) -#define ZEXT_HIWORD(l) ((((unsigned int)l) >> 16)) -#define SEXT_LOWORD(l) ((int)(short)l) - -#define INDEXTOOVERLAYMASK(i) ((i) << 8) -#define INDEXTOSTATEIMAGEMASK(i) ((i) << 12) - -#define MAKEINTATOM(i) (LPTSTR) ((DWORD) ((WORD) (i))) -#ifndef _DISABLE_TIDENTS -#define MAKEINTRESOURCE(i) (LPTSTR) ((ULONG_PTR) ((WORD) (i))) -#endif /* _DISABLE_TIDENTS */ -#define MAKEINTRESOURCEA(i) (LPSTR) ((ULONG_PTR) ((WORD) (i))) -#define MAKEINTRESOURCEW(i) (LPWSTR) ((ULONG_PTR) ((WORD) (i))) -#define IS_INTRESOURCE(n) ((((ULONG_PTR) (n)) >> 16) == 0) - -#define MAKELANGID(p, s) ((((WORD) (s)) << 10) | (WORD) (p)) -#define PRIMARYLANGID(lgid) ((WORD )(lgid) & 0x3ff) -#define SUBLANGID(lgid) ((WORD )(lgid) >> 10) - -#define LANGIDFROMLCID(lcid) ((WORD) (lcid)) -#define SORTIDFROMLCID(lcid) ((WORD )((((DWORD)(lcid)) & 0x000FFFFF) >> 16)) -#define MAKELCID(lgid, srtid) ((DWORD)((((DWORD)((WORD)(srtid))) << 16) | ((DWORD)((WORD)(lgid))))) -#define MAKELPARAM(l, h) ((LPARAM) MAKELONG(l, h)) -#define MAKELRESULT(l, h) ((LRESULT) MAKELONG(l, h)) -#define MAKEPOINTS(l) (*((POINTS FAR *) & (l))) -#define MAKEROP4(fore,back) (DWORD)((((back) << 8) & 0xFF000000) | (fore)) -#define MAKEWPARAM(l, h) ((WPARAM) MAKELONG(l, h)) - - -#define PALETTEINDEX(i) ((COLORREF) (0x01000000 | (DWORD) (WORD) (i))) -#define PALETTERGB(r, g, b) (0x02000000 | RGB(r, g, b)) -#define POINTSTOPOINT(pt, pts) {(pt).x = (SHORT) LOWORD(pts); (pt).y = (SHORT) HIWORD(pts);} -#define POINTTOPOINTS(pt) (MAKELONG((short) ((pt).x), (short) ((pt).y))) - -#define INDEXTOOVERLAYMASK(i) ((i) << 8) -#define INDEXTOSTATEIMAGEMASK(i) ((i) << 12) - -#ifndef _DISABLE_TIDENTS -# ifdef UNICODE -# ifndef _TEXT -# define TEXT(quote) L##quote -# endif /* _TEXT */ -# else /* UNICODE */ -# ifndef _TEXT -# define TEXT(quote) quote -# endif /* _TEXT */ -# endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -#ifndef RC_INVOKED - -/* - Definitions for callback procedures -*/ -typedef enum { - - WinNullSid = 0, - WinWorldSid = 1, - WinLocalSid = 2, - WinCreatorOwnerSid = 3, - WinCreatorGroupSid = 4, - WinCreatorOwnerServerSid = 5, - WinCreatorGroupServerSid = 6, - WinNtAuthoritySid = 7, - WinDialupSid = 8, - WinNetworkSid = 9, - WinBatchSid = 10, - WinInteractiveSid = 11, - WinServiceSid = 12, - WinAnonymousSid = 13, - WinProxySid = 14, - WinEnterpriseControllersSid = 15, - WinSelfSid = 16, - WinAuthenticatedUserSid = 17, - WinRestrictedCodeSid = 18, - WinTerminalServerSid = 19, - WinRemoteLogonIdSid = 20, - WinLogonIdsSid = 21, - WinLocalSystemSid = 22, - WinLocalServiceSid = 23, - WinNetworkServiceSid = 24, - WinBuiltinDomainSid = 25, - WinBuiltinAdministratorsSid = 26, - WinBuiltinUsersSid = 27, - WinBuiltinGuestsSid = 28, - WinBuiltinPowerUsersSid = 29, - WinBuiltinAccountOperatorsSid = 30, - WinBuiltinSystemOperatorsSid = 31, - WinBuiltinPrintOperatorsSid = 32, - WinBuiltinBackupOperatorsSid = 33, - WinBuiltinReplicatorSid = 34, - WinBuiltinPreWindows2000CompatibleAccessSid = 35, - WinBuiltinRemoteDesktopUsersSid = 36, - WinBuiltinNetworkConfigurationOperatorsSid = 37, - WinAccountAdministratorSid = 38, - WinAccountGuestSid = 39, - WinAccountKrbtgtSid = 40, - WinAccountDomainAdminsSid = 41, - WinAccountDomainUsersSid = 42, - WinAccountDomainGuestsSid = 43, - WinAccountComputersSid = 44, - WinAccountControllersSid = 45, - WinAccountCertAdminsSid = 46, - WinAccountSchemaAdminsSid = 47, - WinAccountEnterpriseAdminsSid = 48, - WinAccountPolicyAdminsSid = 49, - WinAccountRasAndIasServersSid = 50, - WinNTLMAuthenticationSid = 51, - WinDigestAuthenticationSid = 52, - WinSChannelAuthenticationSid = 53, - WinThisOrganizationSid = 54, - WinOtherOrganizationSid = 55, - WinBuiltinIncomingForestTrustBuildersSid = 56, - WinBuiltinPerfMonitoringUsersSid = 57, - WinBuiltinPerfLoggingUsersSid = 58, - WinBuiltinAuthorizationAccessSid = 59, - WinBuiltinTerminalServerLicenseServersSid = 60, - -} WELL_KNOWN_SID_TYPE; -typedef enum _AUDIT_EVENT_TYPE { - AuditEventObjectAccess, - AuditEventDirectoryServiceAccess -} AUDIT_EVENT_TYPE, *PAUDIT_EVENT_TYPE; -typedef int (CALLBACK *BFFCALLBACK) (HWND, UINT, LPARAM, LPARAM); -typedef UINT (CALLBACK *LPCCHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPCFHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef DWORD (CALLBACK *EDITSTREAMCALLBACK) (DWORD, LPBYTE, LONG, LONG); -typedef UINT (CALLBACK *LPFRHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPPRINTHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef UINT (CALLBACK *LPSETUPHOOKPROC) (HWND, UINT, WPARAM, LPARAM); -typedef WINBOOL (CALLBACK *DLGPROC) (HWND, UINT, WPARAM, LPARAM); -typedef int (CALLBACK *PFNPROPSHEETCALLBACK) (HWND, UINT, LPARAM); -typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONA) (DWORD, LPSTR*); -typedef VOID (CALLBACK *LPSERVICE_MAIN_FUNCTIONW) (DWORD, LPWSTR*); -typedef int (CALLBACK *PFNTVCOMPARE) (LPARAM, LPARAM, LPARAM); -typedef LRESULT (CALLBACK *WNDPROC) (HWND, UINT, WPARAM, LPARAM); -typedef int (CALLBACK *FARPROC)(void); -typedef FARPROC PROC; -typedef WINBOOL (CALLBACK *ENUMRESTYPEPROCA) (HANDLE, LPSTR, LONG); -typedef WINBOOL (CALLBACK *ENUMRESTYPEPROCW) (HANDLE, LPWSTR, LONG); -typedef WINBOOL (CALLBACK *ENUMRESNAMEPROCA) (HANDLE, LPCSTR, LPSTR, LONG); -typedef WINBOOL (CALLBACK *ENUMRESNAMEPROCW) (HANDLE, LPCWSTR, LPWSTR, LONG); -typedef WINBOOL (CALLBACK *ENUMRESLANGPROCA) (HANDLE, LPCSTR, LPCSTR, WORD, LONG); -typedef WINBOOL (CALLBACK *ENUMRESLANGPROCW) (HANDLE, LPCWSTR, LPCWSTR, WORD, LONG); -typedef WINBOOL (CALLBACK *DESKTOPENUMPROCA) (LPSTR, LPARAM); -typedef WINBOOL (CALLBACK *DESKTOPENUMPROCW) (LPWSTR, LPARAM); -typedef WINBOOL (CALLBACK *ENUMWINDOWSPROC) (HWND, LPARAM); -typedef WINBOOL (CALLBACK *ENUMWINDOWSTATIONPROCA) (LPSTR, LPARAM); -typedef WINBOOL (CALLBACK *ENUMWINDOWSTATIONPROCW) (LPWSTR, LPARAM); -typedef VOID (CALLBACK *SENDASYNCPROC) (HWND, UINT, DWORD, LRESULT); -typedef VOID (CALLBACK *TIMERPROC) (HWND, UINT, UINT, DWORD); -typedef WINBOOL (CALLBACK *GRAYSTRINGPROC) (HDC, LPARAM, int); -typedef WINBOOL (CALLBACK *DRAWSTATEPROC) (HDC, LPARAM, WPARAM, int, int); -typedef WINBOOL (CALLBACK *PROPENUMPROCEXA) (HWND, LPCSTR, HANDLE, DWORD); -typedef WINBOOL (CALLBACK *PROPENUMPROCEXW) (HWND, LPCWSTR, HANDLE, DWORD); -typedef WINBOOL (CALLBACK *PROPENUMPROCA) (HWND, LPCSTR, HANDLE); -typedef WINBOOL (CALLBACK *PROPENUMPROCW) (HWND, LPCWSTR, HANDLE); -typedef LRESULT (CALLBACK *HOOKPROC) (int, WPARAM, LPARAM); -typedef VOID (CALLBACK *ENUMOBJECTSPROC) (LPVOID, LPARAM); -typedef VOID (CALLBACK *LINEDDAPROC) (int, int, LPARAM); -typedef WINBOOL (CALLBACK *ABORTPROC) (HDC, int); -typedef UINT (CALLBACK *LPPAGEPAINTHOOK) (HWND, UINT, WPARAM, LPARAM ); -typedef UINT (CALLBACK *LPPAGESETUPHOOK) (HWND, UINT, WPARAM, LPARAM ); -typedef int (CALLBACK *ICMENUMPROCA) (LPSTR, LPARAM); -typedef int (CALLBACK *ICMENUMPROCW) (LPWSTR, LPARAM); -typedef LONG (*EDITWORDBREAKPROCEX) (char *, LONG, BYTE, INT); -typedef int (CALLBACK *PFNLVCOMPARE) (LPARAM, LPARAM, LPARAM); -typedef WINBOOL (CALLBACK *LOCALE_ENUMPROCA) (LPSTR); -typedef WINBOOL (CALLBACK *LOCALE_ENUMPROCW) (LPWSTR); -typedef WINBOOL (CALLBACK *CODEPAGE_ENUMPROCA) (LPSTR); -typedef WINBOOL (CALLBACK *CODEPAGE_ENUMPROCW) (LPWSTR); -typedef WINBOOL (CALLBACK *DATEFMT_ENUMPROCA) (LPSTR); -typedef WINBOOL (CALLBACK *DATEFMT_ENUMPROCW) (LPWSTR); -typedef WINBOOL (CALLBACK *TIMEFMT_ENUMPROCA) (LPSTR); -typedef WINBOOL (CALLBACK *TIMEFMT_ENUMPROCW) (LPWSTR); -typedef WINBOOL (CALLBACK *CALINFO_ENUMPROCA) (LPSTR); -typedef int (CALLBACK *EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery ); -typedef WINBOOL (CALLBACK *CALINFO_ENUMPROCW) (LPWSTR); -typedef WINBOOL (CALLBACK *PHANDLER_ROUTINE) (DWORD); -typedef VOID (CALLBACK *LPHANDLER_FUNCTION) (DWORD); -typedef DWORD (CALLBACK *LPHANDLER_FUNCTION_EX)(DWORD,DWORD,LPVOID,LPVOID); -typedef UINT (CALLBACK *PFNGETPROFILEPATHA) (LPCSTR, LPSTR, UINT); -typedef UINT (CALLBACK *PFNGETPROFILEPATHW) (LPCWSTR, LPWSTR, UINT); -typedef UINT (CALLBACK *PFNRECONCILEPROFILEA) (LPCSTR, LPCSTR, DWORD); -typedef UINT (CALLBACK *PFNRECONCILEPROFILEW) (LPCWSTR, LPCWSTR, DWORD); -typedef WINBOOL (CALLBACK *PFNPROCESSPOLICIESA) (HWND, LPCSTR, LPCSTR, LPCSTR, DWORD); -typedef WINBOOL (CALLBACK *PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR, DWORD); - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define LPSERVICE_MAIN_FUNCTION LPSERVICE_MAIN_FUNCTIONW -#define ENUMRESTYPEPROC ENUMRESTYPEPROCW -#define ENUMRESNAMEPROC ENUMRESNAMEPROCW -#define ENUMRESLANGPROC ENUMRESLANGPROCW -#define DESKTOPENUMPROC DESKTOPENUMPROCW -#define ENUMWINDOWSTATIONPROC ENUMWINDOWSTATIONPROCW -#define PROPENUMPROCEX PROPENUMPROCEXW -#define PROPENUMPROC PROPENUMPROCW -#define ICMENUMPROC ICMENUMPROCW -#define LOCALE_ENUMPROC LOCALE_ENUMPROCW -#define CODEPAGE_ENUMPROC CODEPAGE_ENUMPROCW -#define DATEFMT_ENUMPROC DATEFMT_ENUMPROCW -#define TIMEFMT_ENUMPROC TIMEFMT_ENUMPROCW -#define CALINFO_ENUMPROC CALINFO_ENUMPROCW -#define PFNGETPROFILEPATH PFNGETPROFILEPATHW -#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEW -#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESW -#else /* UNICODE */ -#define LPSERVICE_MAIN_FUNCTION LPSERVICE_MAIN_FUNCTIONA -#define ENUMRESTYPEPROC ENUMRESTYPEPROCA -#define ENUMRESNAMEPROC ENUMRESNAMEPROCA -#define ENUMRESLANGPROC ENUMRESLANGPROCA -#define DESKTOPENUMPROC DESKTOPENUMPROCA -#define ENUMWINDOWSTATIONPROC ENUMWINDOWSTATIONPROCA -#define PROPENUMPROCEX PROPENUMPROCEXA -#define PROPENUMPROC PROPENUMPROCA -#define ICMENUMPROC ICMENUMPROCA -#define LOCALE_ENUMPROC LOCALE_ENUMPROCA -#define CODEPAGE_ENUMPROC CODEPAGE_ENUMPROCA -#define DATEFMT_ENUMPROC DATEFMT_ENUMPROCA -#define TIMEFMT_ENUMPROC TIMEFMT_ENUMPROCA -#define CALINFO_ENUMPROC CALINFO_ENUMPROCA -#define PFNGETPROFILEPATH PFNGETPROFILEPATHA -#define PFNRECONCILEPROFILE PFNRECONCILEPROFILEA -#define PFNPROCESSPOLICIES PFNPROCESSPOLICIESA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -#define SECURITY_NULL_SID_AUTHORITY {0,0,0,0,0,0} -#define SECURITY_WORLD_SID_AUTHORITY {0,0,0,0,0,1} -#define SECURITY_LOCAL_SID_AUTHORITY {0,0,0,0,0,2} -#define SECURITY_CREATOR_SID_AUTHORITY {0,0,0,0,0,3} -#define SECURITY_NON_UNIQUE_AUTHORITY {0,0,0,0,0,4} -#define SECURITY_NT_AUTHORITY {0,0,0,0,0,5} - -#define SE_CREATE_TOKEN_NAME TEXT("SeCreateTokenPrivilege") -#define SE_ASSIGNPRIMARYTOKEN_NAME TEXT("SeAssignPrimaryTokenPrivilege") -#define SE_LOCK_MEMORY_NAME TEXT("SeLockMemoryPrivilege") -#define SE_INCREASE_QUOTA_NAME TEXT("SeIncreaseQuotaPrivilege") -#define SE_UNSOLICITED_INPUT_NAME TEXT("SeUnsolicitedInputPrivilege") -#define SE_MACHINE_ACCOUNT_NAME TEXT("SeMachineAccountPrivilege") -#define SE_TCB_NAME TEXT("SeTcbPrivilege") -#define SE_SECURITY_NAME TEXT("SeSecurityPrivilege") -#define SE_TAKE_OWNERSHIP_NAME TEXT("SeTakeOwnershipPrivilege") -#define SE_LOAD_DRIVER_NAME TEXT("SeLoadDriverPrivilege") -#define SE_SYSTEM_PROFILE_NAME TEXT("SeSystemProfilePrivilege") -#define SE_SYSTEMTIME_NAME TEXT("SeSystemtimePrivilege") -#define SE_PROF_SINGLE_PROCESS_NAME TEXT("SeProfileSingleProcessPrivilege") -#define SE_INC_BASE_PRIORITY_NAME TEXT("SeIncreaseBasePriorityPrivilege") -#define SE_CREATE_PAGEFILE_NAME TEXT("SeCreatePagefilePrivilege") -#define SE_CREATE_PERMANENT_NAME TEXT("SeCreatePermanentPrivilege") -#define SE_BACKUP_NAME TEXT("SeBackupPrivilege") -#define SE_RESTORE_NAME TEXT("SeRestorePrivilege") -#define SE_SHUTDOWN_NAME TEXT("SeShutdownPrivilege") -#define SE_DEBUG_NAME TEXT("SeDebugPrivilege") -#define SE_AUDIT_NAME TEXT("SeAuditPrivilege") -#define SE_SYSTEM_ENVIRONMENT_NAME TEXT("SeSystemEnvironmentPrivilege") -#define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege") -#define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege") - -typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR); -typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR); -typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR); -typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXA)(LPSTR, CALID); -typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXA)(LPSTR, CALID); - -typedef BOOL (CALLBACK *LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR); -typedef BOOL (CALLBACK *LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR); -typedef BOOL (CALLBACK *UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR); -typedef BOOL (CALLBACK *DATEFMT_ENUMPROCEXW)(LPWSTR, CALID); -typedef BOOL (CALLBACK *CALINFO_ENUMPROCEXW)(LPWSTR, CALID); -typedef BOOL (CALLBACK *GEO_ENUMPROC)(GEOID); - -#define SERVICES_ACTIVE_DATABASEW L"ServicesActive" -#define SERVICES_FAILED_DATABASEW L"ServicesFailed" -#define SERVICES_ACTIVE_DATABASEA "ServicesActive" -#define SERVICES_FAILED_DATABASEA "ServicesFailed" -#define SC_GROUP_IDENTIFIERW L'+' -#define SC_GROUP_IDENTIFIERA '+' - -#ifndef _DISABLE_TIDENTS -#ifdef UNICODE -#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEW -#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEW -#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERW -#else -#define SERVICES_ACTIVE_DATABASE SERVICES_ACTIVE_DATABASEA -#define SERVICES_FAILED_DATABASE SERVICES_FAILED_DATABASEA -#define SC_GROUP_IDENTIFIER SC_GROUP_IDENTIFIERA -#endif /* UNICODE */ -#endif /* _DISABLE_TIDENTS */ - -#define MM_MAX_NUMAXES 16 - -/* ---------------------------------- */ -/* From ddeml.h in old Cygnus headers */ - -typedef void (*CALLB) (void); -typedef CALLB PFNCALLBACK; - - -typedef enum _COMPUTER_NAME_FORMAT { - ComputerNameNetBIOS, - ComputerNameDnsHostname, - ComputerNameDnsDomain, - ComputerNameDnsFullyQualified, - ComputerNamePhysicalNetBIOS, - ComputerNamePhysicalDnsHostname, - ComputerNamePhysicalDnsDomain, - ComputerNamePhysicalDnsFullyQualified, - ComputerNameMax -} COMPUTER_NAME_FORMAT ; - -typedef enum _HEAP_INFORMATION_CLASS { - - HeapCompatibilityInformation - -} HEAP_INFORMATION_CLASS; - -typedef enum { - LT_DONT_CARE, - LT_LOWEST_LATENCY -} LATENCY_TIME; - -typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)( - struct _EXCEPTION_POINTERS *ExceptionInfo - ); - -typedef -VOID -(CALLBACK *PAPCFUNC)( - ULONG_PTR dwParam - ); - -#ifdef __cplusplus -#define REFGUID const GUID & -#else -#define REFGUID const GUID * -#endif - -typedef DWORD (CALLBACK *PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength); - -typedef DWORD (CALLBACK *PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength); -typedef VOID (CALLBACK *PFIBER_START_ROUTINE)( - LPVOID lpFiberParameter - ); -typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; - -typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE { - LowMemoryResourceNotification, - HighMemoryResourceNotification -} MEMORY_RESOURCE_NOTIFICATION_TYPE; - -typedef VOID (CALLBACK *WAITORTIMERCALLBACK) (PVOID, BOOLEAN ); - -/* End of stuff from ddeml.h in old Cygnus headers */ -/* ----------------------------------------------- */ - -typedef FARPROC WNDENUMPROC; -typedef FARPROC MFENUMPROC; -typedef FARPROC ENHMFENUMPROC; -typedef DWORD CCSTYLE, *PCCSTYLE, *LPCCSTYLE; -typedef DWORD CCSTYLEFLAGA, *PCCSTYLEFLAGA, *LPCCSTYLEFLAGA; -#define DECLARE_HANDLE(s) typedef HANDLE s -//typedef LANGID *PLANGID; - -#endif /* ! defined (RC_INVOKED) */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _GNU_H_WINDOWS32_BASE */ _____ Deleted: trunk/reactos/include/defines.h --- trunk/reactos/include/defines.h 2005-06-17 11:28:23 UTC (rev 15968) +++ trunk/reactos/include/defines.h 2005-06-17 11:29:07 UTC (rev 15969) @@ -1,5294 +0,0 @@ -/* - Defines.h - - Windows32 API definitions - - Copyright (C) 1996, 1997 Free Software Foundation, Inc. - - Author: Scott Christley <scottc(a)net-community.com> - - This file is part of the Windows32 API Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 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 - Library General Public License for more details. - - If you are interested in a warranty or support for this source code, - contact Scott Christley <scottc(a)net-community.com> for more information. - - You should have received a copy of the GNU Library General Public - License along with this library; see the file COPYING.LIB. - If not, write to the Free Software Foundation, - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ -/* WARNING: This file is automatically generated. */ - -#ifndef _GNU_H_WINDOWS32_DEFINES -#define _GNU_H_WINDOWS32_DEFINES - -#ifndef RC_INVOKED -#include <ntos/ntdef.h> -#include <ntos/registry.h> -#endif - -#define WINBASEAPI - - - -#ifndef WIN32_NO_STATUS -/* -#define STATUS_WAIT_0 (0x00000000L) -#define STATUS_ABANDONED_WAIT_0 (0x00000080L) -#define STATUS_USER_APC (0x000000C0L) -#define STATUS_TIMEOUT (0x00000102L) -#define STATUS_PENDING (0x00000103L) -*/ -#endif /* WIN32_NO_STATUS */ - -#define GA_PARENT (1) -#define GA_ROOT (2) -#define GA_ROOTOWNER (3) - -/* CreateFile, GetFileAttributes, SetFileAttributes */ - -#define SECURITY_ANONYMOUS (0) -#define SECURITY_IDENTIFICATION (65536) -#define SECURITY_IMPERSONATION (131072) -#define SECURITY_DELEGATION (196608) -#define SECURITY_CONTEXT_TRACKING (262144) -#define SECURITY_EFFECTIVE_ONLY (524288) -#define SECURITY_SQOS_PRESENT (1048576) - - - - -#ifndef WIN32_LEAN_AND_MEAN - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#define MAX_PATH (260) -#define UNICODE_NULL ((WCHAR)0) -#define LF_FACESIZE (32) -#define LF_FULLFACESIZE (64) -#define ELF_VENDOR_SIZE (4) -#define MAX_DEFAULTCHAR (2) -#define MAX_LEADBYTES (12) -#define MENU_TEXT_LEN (40) -#define MAX_LANA (254) -#define NCBNAMSZ (16) -#define NETBIOS_NAME_LEN (16) -#define OFS_MAXPATHNAME (128) -#define MAX_TAB_STOPS (32) -#define RAS_MaxCallbackNumber (128) -#define RAS_MaxDeviceName (128) -#define RAS_MaxDeviceType (16) -#define RAS_MaxEntryName (256) -#define RAS_MaxIpAddress (15) -#define RAS_MaxIpxAddress (21) -#define RAS_MaxPhoneNumber (128) -#define UNLEN (256) -#define PWLEN (256) -#define CNLEN (15) -#define DNLEN (15) -/* Unsigned types max */ -#define MAXDWORD (0xFFFFFFFF) -#define MAXWORD (0xFFFF) -#define MAXBYTE (0xFF) -/* Signed types max/min */ -#define MINCHAR (0x80) -#define MAXCHAR (0x7F) -#define MINSHORT (0x8000) -#define MAXSHORT (0x7FFF) -#define MINLONG (0x80000000) -#define MAXLONG (0x7FFFFFFF) - -/* _llseek */ -#define FILE_BEGIN (0) -#define FILE_CURRENT (1) -#define FILE_END (2) - -/* _lopen, LZOpenFile, OpenFile */ -#define OF_READ (0) -#define OF_READWRITE (2) -#define OF_WRITE (1) -#define OF_SHARE_COMPAT (0) -#define OF_SHARE_DENY_NONE (64) -#define OF_SHARE_DENY_READ (48) -#define OF_SHARE_DENY_WRITE (32) -#define OF_SHARE_EXCLUSIVE (16) -#define OF_CANCEL (2048) -#define OF_CREATE (4096) -#define OF_DELETE (512) -#define OF_EXIST (16384) -#define OF_PARSE (256) -#define OF_PROMPT (8192) -#define OF_REOPEN (32768) -#define OF_VERIFY (1024) - -/* ActivateKeyboardLayout, LoadKeyboardLayout */ -#define HKL_NEXT (1) -#define HKL_PREV (0) -#define KLF_REORDER (8) -#define KLF_UNLOADPREVIOUS (4) -#define KLF_ACTIVATE (1) -#define KLF_NOTELLSHELL (128) -#define KLF_REPLACELANG (16) -#define KLF_SUBSTITUTE_OK (2) - -/* AddFontResourceEx */ -#define FR_PRIVATE (0x10) -#define FR_NOT_ENUM (0x20) - - -/* AppendMenu */ -#define MF_BITMAP (0x4L) -#define MF_DISABLED (0x2L) -#define MF_ENABLED (0L) -#define MF_GRAYED (0x1L) -#define MF_HELP (0x4000L) -#define MF_MENUBARBREAK (0x20L) -#define MF_MENUBREAK (0x40L) -#define MF_MOUSESELECT (0x8000L) -#define MF_OWNERDRAW (0x100L) -#define MF_POPUP (0x10L) -#define MF_SEPARATOR (0x800L) -#define MF_STRING (0L) -#define MF_SYSMENU (0x2000L) -#define MF_USECHECKBITMAPS (0x200L) -#define MF_RIGHTJUSTIFY MF_HELP - - -/* Ternary Raster Operations - BitBlt */ -#define BLACKNESS 0x00000042 -#define NOTSRCERASE 0x001100A6 -#define NOTSRCCOPY 0x00330008 -#define SRCERASE 0x00440328 -#define DSTINVERT 0x00550009 -#define PATINVERT 0x005A0049 -#define SRCINVERT 0x00660046 -#define SRCAND 0x008800C6 -#define MERGEPAINT 0x00BB0226 -#define MERGECOPY 0x00C000CA -#define SRCCOPY 0x00CC0020 -#define SRCPAINT 0x00EE0086 -#define PATCOPY 0x00F00021 -#define PATPAINT 0x00FB0A09 -#define WHITENESS 0x00FF0062 - -/* Binary Raster Operations */ -#define R2_BLACK (1) -#define R2_COPYPEN (13) -#define R2_MASKNOTPEN (3) -#define R2_MASKPEN (9) -#define R2_MASKPENNOT (5) -#define R2_MERGENOTPEN (12) -#define R2_MERGEPEN (15) -#define R2_MERGEPENNOT (14) -#define R2_NOP (11) -#define R2_NOT (6) -#define R2_NOTCOPYPEN (4) -#define R2_NOTMASKPEN (8) -#define R2_NOTMERGEPEN (2) -#define R2_NOTXORPEN (10) -#define R2_WHITE (16) -#define R2_XORPEN (7) - -/* BroadcastSystemMessage */ -#define BSF_FLUSHDISK (4) -#define BSF_FORCEIFHUNG (32) -#define BSF_IGNORECURRENTTASK (2) -#define BSF_NOHANG (8) -#define BSF_POSTMESSAGE (16) -#define BSF_QUERY (1) -#define BSM_ALLCOMPONENTS (0) -#define BSM_APPLICATIONS (8) -#define BSM_INSTALLABLEDRIVERS (4) -#define BSM_NETDRIVER (2) -#define BSM_VXDS (1) -#define BROADCAST_QUERY_DENY (1112363332) - -/* BrowseCallbackProc */ - -/* CallNamedPipe */ -#define NMPWAIT_NOWAIT (1) -#define NMPWAIT_WAIT_FOREVER (-1) -#define NMPWAIT_USE_DEFAULT_WAIT (0) - -/* CascadeWindows, TileWindows */ -#define MDITILE_SKIPDISABLED (2) -#define MDITILE_HORIZONTAL (1) -#define MDITILE_VERTICAL (0) - -/* CBTProc */ -#define HCBT_ACTIVATE (5) -#define HCBT_CLICKSKIPPED (6) -#define HCBT_CREATEWND (3) -#define HCBT_DESTROYWND (4) -#define HCBT_KEYSKIPPED (7) -#define HCBT_MINMAX (1) -#define HCBT_MOVESIZE (0) -#define HCBT_QS (2) -#define HCBT_SETFOCUS (9) -#define HCBT_SYSCOMMAND (8) - [truncated at 1000 lines; 26554 more skipped]

19 years, 6 months

[navaraf] 15968: Do NOT include defines.h in .rc files.

by navaraf＠svn.reactos.com

Do NOT include defines.h in .rc files. Modified: trunk/reactos/lib/acledit/acledit.rc Modified: trunk/reactos/lib/aclui/aclui.rc Modified: trunk/reactos/lib/aclui/aclui_De.rc Modified: trunk/reactos/lib/aclui/aclui_En.rc Modified: trunk/reactos/lib/aclui/aclui_Sv.rc Modified: trunk/reactos/lib/advapi32/advapi32.rc Modified: trunk/reactos/lib/advpack/advpack.rc Modified: trunk/reactos/lib/cpl/access/access.rc Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc Modified: trunk/reactos/lib/cpl/control/control.rc Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc Modified: trunk/reactos/lib/cpl/intl/intl.rc Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc Modified: trunk/reactos/lib/cpl/main/main.rc Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc Modified: trunk/reactos/lib/cpl/timedate/timedate.rc Modified: trunk/reactos/lib/devmgr/devmgr.rc Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc Modified: trunk/reactos/lib/msgina/msgina.rc Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc Modified: trunk/reactos/lib/shellext/slayer/slayer.rc Modified: trunk/reactos/lib/user32/user32.rc Modified: trunk/reactos/subsys/system/explorer/explorer.rc Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.rc Modified: trunk/reactos/subsys/system/reactos/reactos.rc Modified: trunk/reactos/subsys/system/regedit/regedit.rc Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc Modified: trunk/reactos/subsys/system/welcome/welcome.rc Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc _____ Modified: trunk/reactos/lib/acledit/acledit.rc --- trunk/reactos/lib/acledit/acledit.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/acledit/acledit.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/aclui/aclui.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,5 @@ -#include <defines.h> +#include <windows.h> +#include <reactos/resource.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/aclui/aclui_De.rc --- trunk/reactos/lib/aclui/aclui_De.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/aclui/aclui_De.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,7 +1,3 @@ -#include <reactos/resource.h> -#include <defines.h> -#include "resource.h" - LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 _____ Modified: trunk/reactos/lib/aclui/aclui_En.rc --- trunk/reactos/lib/aclui/aclui_En.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/aclui/aclui_En.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,7 +1,3 @@ -#include <reactos/resource.h> -#include <defines.h> -#include "resource.h" - LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 _____ Modified: trunk/reactos/lib/aclui/aclui_Sv.rc --- trunk/reactos/lib/aclui/aclui_Sv.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/aclui/aclui_Sv.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -16,10 +16,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <reactos/resource.h> -#include <defines.h> -#include "resource.h" - LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT IDD_SECPAGE DIALOGEX 0, 0, 227, 215 _____ Modified: trunk/reactos/lib/advapi32/advapi32.rc --- trunk/reactos/lib/advapi32/advapi32.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/advapi32/advapi32.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Advanced W32 Base API\0" _____ Modified: trunk/reactos/lib/advpack/advpack.rc --- trunk/reactos/lib/advpack/advpack.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/advpack/advpack.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Advpack User Library\0" _____ Modified: trunk/reactos/lib/cpl/access/access.rc --- trunk/reactos/lib/cpl/access/access.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/access/access.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc --- trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/appwiz/appwiz.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,9 +1,5 @@ #include "resource.h" -#ifdef _MSC_VER -#include <../../../include/defines.h> -#else -#include <defines.h> -#endif +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Software Control Panel\0" _____ Modified: trunk/reactos/lib/cpl/control/control.rc --- trunk/reactos/lib/cpl/control/control.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/control/control.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,12 +1,8 @@ //Microsoft Developer Studio generated resource script. // #include "resource.h" -#ifndef MS_COMPILER #include <reactos/resource.h> -#include <defines.h> -#else -#include <../../../include/defines.h> -#endif +#include <windows.h> #define REACTOS_STR_FILE_DESCRIPTION "ReactOS System Control Panel\0" #define REACTOS_STR_INTERNAL_NAME "control\0" _____ Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc --- trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/cplsample/cplsample.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/cpl/intl/intl.rc --- trunk/reactos/lib/cpl/intl/intl.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/intl/intl.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc --- trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/liccpa/liccpa.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/cpl/main/main.rc --- trunk/reactos/lib/cpl/main/main.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/main/main.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc --- trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/ncpa/ncpa.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,11 +1,7 @@ /* $Id$ */ #include "resource.h" -#ifdef _MSC_VER -#include <../../../include/defines.h> -#else -#include <defines.h> -#endif +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Control Panel\0" _____ Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc --- trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/sysdm/sysdm.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -2,7 +2,6 @@ #include "resource.h" #include "windows.h" -#include <defines.h> #include <commctrl.h> #include "resource.h" _____ Modified: trunk/reactos/lib/cpl/timedate/timedate.rc --- trunk/reactos/lib/cpl/timedate/timedate.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/cpl/timedate/timedate.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,5 @@ #include <windows.h> #include <commctrl.h> -#include <defines.h> #include "resource.h" _____ Modified: trunk/reactos/lib/devmgr/devmgr.rc --- trunk/reactos/lib/devmgr/devmgr.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/devmgr/devmgr.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc --- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/dhcpcapi/dhcpcapi.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "DHCP Client API\0" _____ Modified: trunk/reactos/lib/msgina/msgina.rc --- trunk/reactos/lib/msgina/msgina.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/msgina/msgina.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include "defines.h" +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc --- trunk/reactos/lib/rpcrt4/rpcrt4.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/rpcrt4/rpcrt4.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS RPC server API\0" _____ Modified: trunk/reactos/lib/shellext/slayer/slayer.rc --- trunk/reactos/lib/shellext/slayer/slayer.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/shellext/slayer/slayer.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_VERSION_DLL _____ Modified: trunk/reactos/lib/user32/user32.rc --- trunk/reactos/lib/user32/user32.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/lib/user32/user32.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,7 +1,6 @@ /* $Id$ */ -#include <defines.h> -#include <winuser.h> +#include <windows.h> #include <resource.h> _____ Modified: trunk/reactos/subsys/system/explorer/explorer.rc --- trunk/reactos/subsys/system/explorer/explorer.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/explorer/explorer.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "explorer_intres.rc" _____ Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.rc --- trunk/reactos/subsys/system/ibrowser/ibrowser.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/ibrowser/ibrowser.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id: ibrowser.rc 12752 2005-01-03 11:25:40Z mf $ */ -#include <defines.h> +#include <windows.h> #include "ibrowser_intres.rc" _____ Modified: trunk/reactos/subsys/system/reactos/reactos.rc --- trunk/reactos/subsys/system/reactos/reactos.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/reactos/reactos.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Setup\0" _____ Modified: trunk/reactos/subsys/system/regedit/regedit.rc --- trunk/reactos/subsys/system/regedit/regedit.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/regedit/regedit.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Registry Explorer\0" _____ Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc --- trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/reporterror/reporterror.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,4 +1,4 @@ -#include <defines.h> +#include <windows.h> #include "reporterror.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Error Reporting Assistant\0" _____ Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc --- trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resources.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Sound Volume Control\0" _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc --- trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "vmwinst.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS VMware(r) driver installation utility\0" _____ Modified: trunk/reactos/subsys/system/welcome/welcome.rc --- trunk/reactos/subsys/system/welcome/welcome.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/welcome/welcome.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS-Welcome\0" _____ Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc --- trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-06-17 11:22:47 UTC (rev 15967) +++ trunk/reactos/subsys/system/winlogon/winlogon.rc 2005-06-17 11:28:23 UTC (rev 15968) @@ -1,6 +1,6 @@ /* $Id$ */ -#include <defines.h> +#include <windows.h> #include "resource.h" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Logon Application\0"

19 years, 6 months

[navaraf] 15967: Use W32API.

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/regtests/shared/rtshared.xml _____ Modified: trunk/reactos/regtests/shared/rtshared.xml --- trunk/reactos/regtests/shared/rtshared.xml 2005-06-17 11:05:49 UTC (rev 15966) +++ trunk/reactos/regtests/shared/rtshared.xml 2005-06-17 11:22:47 UTC (rev 15967) @@ -1,4 +1,5 @@ <module name="rtshared" type="staticlibrary"> <include base="rtshared">.</include> + <define name="__USE_W32API" /> <file>regtests.c</file> </module>

19 years, 6 months

[navaraf] 15966: Use W32API.

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/lib/user32/misc/dllmain.c _____ Modified: trunk/reactos/lib/user32/misc/dllmain.c --- trunk/reactos/lib/user32/misc/dllmain.c 2005-06-17 10:54:34 UTC (rev 15965) +++ trunk/reactos/lib/user32/misc/dllmain.c 2005-06-17 11:05:49 UTC (rev 15966) @@ -1,4 +1,3 @@ -#undef __USE_W32API #include <windows.h> #include <debug.h> #include <ddk/ntddk.h> @@ -12,6 +11,9 @@ #include <strpool.h> #include <roscfg.h> +/* FIXME: Belongs to some header. */ +WINBOOL STDCALL GdiDllInitialize(HANDLE, DWORD, LPVOID); + #ifdef DBG /* See debug.h for debug/trace constants */

19 years, 6 months

[navaraf] 15965: Don't include windows.h in drivers.

by navaraf＠svn.reactos.com

Don't include windows.h in drivers. Modified: trunk/reactos/drivers/dd/blue/blue.c Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h Modified: trunk/reactos/drivers/dd/mpu401/portio.c Modified: trunk/reactos/drivers/dd/mpu401/settings.c Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h _____ Modified: trunk/reactos/drivers/dd/blue/blue.c --- trunk/reactos/drivers/dd/blue/blue.c 2005-06-17 10:43:58 UTC (rev 15964) +++ trunk/reactos/drivers/dd/blue/blue.c 2005-06-17 10:54:34 UTC (rev 15965) @@ -16,7 +16,6 @@ #include <ddk/ntddblue.h> #include <rosrtl/string.h> #include <string.h> -#include <defines.h> #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/dd/mpu401/mpu401.h --- trunk/reactos/drivers/dd/mpu401/mpu401.h 2005-06-17 10:43:58 UTC (rev 15964) +++ trunk/reactos/drivers/dd/mpu401/mpu401.h 2005-06-17 10:54:34 UTC (rev 15965) @@ -12,7 +12,6 @@ #ifndef __INCLUDES_MPU401_H__ #define __INCLUDES_MPU401_H__ -#include <windows.h> //#include <mmsystem.h> //#include <mmddk.h> //#include <winioctl.h> _____ Modified: trunk/reactos/drivers/dd/mpu401/portio.c --- trunk/reactos/drivers/dd/mpu401/portio.c 2005-06-17 10:43:58 UTC (rev 15964) +++ trunk/reactos/drivers/dd/mpu401/portio.c 2005-06-17 10:54:34 UTC (rev 15965) @@ -9,7 +9,6 @@ * Sept 26, 2003: Created */ -#include <windows.h> #include <ddk/ntddk.h> #include "mpu401.h" _____ Modified: trunk/reactos/drivers/dd/mpu401/settings.c --- trunk/reactos/drivers/dd/mpu401/settings.c 2005-06-17 10:43:58 UTC (rev 15964) +++ trunk/reactos/drivers/dd/mpu401/settings.c 2005-06-17 10:54:34 UTC (rev 15965) @@ -9,8 +9,7 @@ * Sept 27, 2003: Created */ -//#include <ntddk.h> -#include <windows.h> +#include <ntddk.h> #include "mpu401.h" _____ Modified: trunk/reactos/drivers/lib/bzip2/bzlib.h --- trunk/reactos/drivers/lib/bzip2/bzlib.h 2005-06-17 10:43:58 UTC (rev 15964) +++ trunk/reactos/drivers/lib/bzip2/bzlib.h 2005-06-17 10:54:34 UTC (rev 15965) @@ -112,7 +112,7 @@ #ifdef _WIN32 # include <stdio.h> -# include <windows.h> +# define WINAPI __stdcall # ifdef small /* windows.h define small to char */ # undef small

19 years, 6 months

[navaraf] 15964: - Use W32API.

by navaraf＠svn.reactos.com

- Use W32API. - Fix some protoypes. Modified: trunk/reactos/lib/winspool/stubs.c _____ Modified: trunk/reactos/lib/winspool/stubs.c --- trunk/reactos/lib/winspool/stubs.c 2005-06-17 10:43:16 UTC (rev 15963) +++ trunk/reactos/lib/winspool/stubs.c 2005-06-17 10:43:58 UTC (rev 15964) @@ -8,7 +8,6 @@ * REVISIONS: */ -#undef __USE_W32API #include <windows.h> #include <winerror.h> @@ -616,7 +615,7 @@ /* * @unimplemented */ -int +DWORD STDCALL DeviceCapabilitiesA(LPCSTR Device, LPCSTR Port, WORD Capability, LPSTR Buffer, CONST DEVMODEA *DevMode) { @@ -630,7 +629,7 @@ /* * @unimplemented */ -int +DWORD STDCALL DeviceCapabilitiesW(LPCWSTR Device, LPCWSTR Port, WORD Capability, LPWSTR Buffer, CONST DEVMODEW *DevMode) { @@ -993,7 +992,7 @@ */ BOOL STDCALL -FreePrinterNotifyInfo(PVOID /* Really PPRINTER_NOTIFY_INFO */ NotifyInfo) +FreePrinterNotifyInfo(PPRINTER_NOTIFY_INFO NotifyInfo) { OutputDebugStringW(L"winspool FreePrinterNotifyInfo stub called\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);

19 years, 6 months

[navaraf] 15963: Fix declaration of AdvancedDocumentProperties[AW].

by navaraf＠svn.reactos.com

Fix declaration of AdvancedDocumentProperties[AW]. Modified: trunk/reactos/w32api/include/winspool.h _____ Modified: trunk/reactos/w32api/include/winspool.h --- trunk/reactos/w32api/include/winspool.h 2005-06-17 10:30:59 UTC (rev 15962) +++ trunk/reactos/w32api/include/winspool.h 2005-06-17 10:43:16 UTC (rev 15963) @@ -563,8 +563,8 @@ BOOL WINAPI AddPrintProcessorW(LPWSTR,LPWSTR,LPWSTR,LPWSTR); BOOL WINAPI AddPrintProvidorA(LPSTR,DWORD,PBYTE); BOOL WINAPI AddPrintProvidorW(LPWSTR,DWORD,PBYTE); -LONG WINAPI AdvancedDocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODE,PDEVMODEA); -LONG WINAPI AdvancedDocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODE,PDEVMODEW); +LONG WINAPI AdvancedDocumentPropertiesA(HWND,HANDLE,LPSTR,PDEVMODEA,PDEVMODEA); +LONG WINAPI AdvancedDocumentPropertiesW(HWND,HANDLE,LPWSTR,PDEVMODEW,PDEVMODEW); BOOL WINAPI ClosePrinter(HANDLE); BOOL WINAPI ConfigurePortA(LPSTR,HWND,LPSTR); BOOL WINAPI ConfigurePortW(LPWSTR,HWND,LPWSTR);

19 years, 6 months

[weiden] 15962: implemented the TokenRestrictedSids information class for NtQueryInformationToken, however restricted SIDs are not yet supported!

by weiden＠svn.reactos.com

implemented the TokenRestrictedSids information class for NtQueryInformationToken, however restricted SIDs are not yet supported! Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-06-17 10:15:21 UTC (rev 15961) +++ trunk/reactos/ntoskrnl/se/token.c 2005-06-17 10:30:59 UTC (rev 15962) @@ -1047,9 +1047,49 @@ break; case TokenRestrictedSids: - DPRINT1("NtQueryInformationToken(TokenRestrictedSids) not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + { + PTOKEN_GROUPS tg = (PTOKEN_GROUPS)TokenInformation; + + DPRINT("NtQueryInformationToken(TokenRestrictedSids)\n"); + RequiredLength = sizeof(tg->GroupCount) + + RtlLengthSidAndAttributes(Token->RestrictedSidCount, Token->RestrictedSids); + + _SEH_TRY + { + if(TokenInformationLength >= RequiredLength) + { + ULONG SidLen = RequiredLength - sizeof(tg->GroupCount) - + (Token->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES)); + PSID_AND_ATTRIBUTES Sid = (PSID_AND_ATTRIBUTES)((ULONG_PTR)TokenInformation + sizeof(tg->GroupCount) + + (Token->RestrictedSidCount * sizeof(SID_AND_ATTRIBUTES))); + + tg->GroupCount = Token->RestrictedSidCount; + Status = RtlCopySidAndAttributesArray(Token->RestrictedSidCount, + Token->RestrictedSids, + SidLen, + &tg->Groups[0], + (PSID)Sid, + &Unused.Ptr, + &Unused.Ulong); + } + else + { + Status = STATUS_BUFFER_TOO_SMALL; + } + + if(ReturnLength != NULL) + { + *ReturnLength = RequiredLength; + } + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + } case TokenSandBoxInert: DPRINT1("NtQueryInformationToken(TokenSandboxInert) not implemented\n");

19 years, 6 months

[navaraf] 15961: Use W32API.

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/drivers/dd/sndblst/portio.c Modified: trunk/reactos/drivers/dd/sndblst/settings.c Modified: trunk/reactos/drivers/dd/sndblst/sndblst.xml _____ Modified: trunk/reactos/drivers/dd/sndblst/portio.c --- trunk/reactos/drivers/dd/sndblst/portio.c 2005-06-17 09:57:53 UTC (rev 15960) +++ trunk/reactos/drivers/dd/sndblst/portio.c 2005-06-17 10:15:21 UTC (rev 15961) @@ -9,7 +9,6 @@ * Sept 28, 2003: Created */ -#include <windows.h> #include <ddk/ntddk.h> #include "sndblst.h" _____ Modified: trunk/reactos/drivers/dd/sndblst/settings.c --- trunk/reactos/drivers/dd/sndblst/settings.c 2005-06-17 09:57:53 UTC (rev 15960) +++ trunk/reactos/drivers/dd/sndblst/settings.c 2005-06-17 10:15:21 UTC (rev 15961) @@ -10,7 +10,6 @@ */ #include <ntddk.h> -#include <windows.h> #include "sndblst.h" #include "sbdebug.h" // our own debug helper _____ Modified: trunk/reactos/drivers/dd/sndblst/sndblst.xml --- trunk/reactos/drivers/dd/sndblst/sndblst.xml 2005-06-17 09:57:53 UTC (rev 15960) +++ trunk/reactos/drivers/dd/sndblst/sndblst.xml 2005-06-17 10:15:21 UTC (rev 15961) @@ -1,5 +1,6 @@ <module name="sndblst" type="kernelmodedriver" warnings="true"> <include base="sndblst">.</include> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>card.c</file>

19 years, 6 months

[navaraf] 15960: Use W32API.

by navaraf＠svn.reactos.com

Use W32API. Modified: trunk/reactos/services/eventlog/eventlog.xml _____ Modified: trunk/reactos/services/eventlog/eventlog.xml --- trunk/reactos/services/eventlog/eventlog.xml 2005-06-17 09:57:28 UTC (rev 15959) +++ trunk/reactos/services/eventlog/eventlog.xml 2005-06-17 09:57:53 UTC (rev 15960) @@ -2,6 +2,7 @@ <include base="eventlog">.</include> <define name="UNICODE" /> <define name="_UNICODE" /> + <define name="__USE_W32API" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library>

19 years, 6 months

← Newer
1
...
37
38
39
40
41
42
43
...
65
Older →

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 June 2005