Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

It is a part of a multipart commit, related to making ReactOS compilable both under MinGW and MSVC6.

Browse source 
Main work on converting ROS to be able to be compiled under MSVC6 was done by Mark Nordell.
Work done by me - incorporating all this stuff into the newest CVS tree.

svn path=/trunk/; revision=7327
This commit is contained in:
Aleksey Bragin 2003-12-30 11:53:35 +00:00
parent 077fbea4d3
commit f43d6624c8
5 changed files with 34 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/include/WinDNS.h
View file

@ -325,11 +325,11 @@ DNS_STATUS WINAPI DnsAcquireContextHandle_A
PVOID Credentials, PVOID Credentials,
HANDLE *ContextHandle ); HANDLE *ContextHandle );
DNS_STATUS DnsValidateName_W DNS_STATUS WINAPI DnsValidateName_W
( LPCWSTR Name, DNS_NAME_FORMAT Format ); ( LPCWSTR Name, DNS_NAME_FORMAT Format );
DNS_STATUS DnsValidateName_UTF8 DNS_STATUS WINAPI DnsValidateName_UTF8
( LPCSTR Name, DNS_NAME_FORMAT Format ); ( LPCSTR Name, DNS_NAME_FORMAT Format );
DNS_STATUS DnsValidateName_A DNS_STATUS WINAPI DnsValidateName_A
( LPCSTR Name, DNS_NAME_FORMAT Format ); ( LPCSTR Name, DNS_NAME_FORMAT Format );
DNS_STATUS WINAPI DnsQuery_W DNS_STATUS WINAPI DnsQuery_W

40
reactos/include/base.h
View file

@ -150,7 +150,7 @@ typedef HANDLE HWND;
typedef HANDLE HRAWINPUT; typedef HANDLE HRAWINPUT;
typedef HANDLE HTASK; typedef HANDLE HTASK;
typedef HANDLE HWINEVENTHOOK; typedef HANDLE HWINEVENTHOOK;
typedef VOID (CALLBACK* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime); typedef VOID CALLBACK(* WINEVENTPROC)(HWINEVENTHOOK hWinEventHook,DWORD event,HWND hwnd,LONG idObject,LONG idChild,DWORD idEventThread,DWORD dwmsEventTime);
typedef unsigned short LANGID; typedef unsigned short LANGID;
/*typedef DWORD LCID; */ /*typedef DWORD LCID; */
typedef DWORD LCTYPE; typedef DWORD LCTYPE;
@ -355,7 +355,7 @@ typedef enum _SID_NAME_USE {
#define GetBValue(rgb) ((BYTE) ((rgb) >> 16)) #define GetBValue(rgb) ((BYTE) ((rgb) >> 16))
#define GetGValue(rgb) ((BYTE) (((WORD) (rgb)) >> 8)) #define GetGValue(rgb) ((BYTE) (((WORD) (rgb)) >> 8))
#define GetRValue(rgb) ((BYTE) (rgb)) #define GetRValue(rgb) ((BYTE) (rgb))
#define RGB(r,g,b) ((COLORREF)(((BYTE)(r)|((WORD)((BYTE)(g))<<8))|(((DWORD)(BYTE)(b))<<16))) #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 HANDLE_WM_NOTIFY(hwnd, wParam, lParam, fn) (fn)((hwnd), (int)(wParam), (NMHDR FAR*)(lParam))
@ -552,7 +552,7 @@ typedef WINBOOL CALLBACK (*DATEFMT_ENUMPROCW) (LPWSTR);
typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCA) (LPSTR); typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCA) (LPSTR);
typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCW) (LPWSTR); typedef WINBOOL CALLBACK (*TIMEFMT_ENUMPROCW) (LPWSTR);
typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCA) (LPSTR); typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCA) (LPSTR);
typedef int (CALLBACK* EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery ); typedef int CALLBACK (*EMFPLAYPROC)( HDC hdc, INT iFunction, HANDLE hPageQuery );
typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCW) (LPWSTR); typedef WINBOOL CALLBACK (*CALINFO_ENUMPROCW) (LPWSTR);
typedef WINBOOL CALLBACK (*PHANDLER_ROUTINE) (DWORD); typedef WINBOOL CALLBACK (*PHANDLER_ROUTINE) (DWORD);
typedef VOID CALLBACK (*LPHANDLER_FUNCTION) (DWORD); typedef VOID CALLBACK (*LPHANDLER_FUNCTION) (DWORD);
@ -636,18 +636,18 @@ typedef WINBOOL CALLBACK (*PFNPROCESSPOLICIESW) (HWND, LPCWSTR, LPCWSTR, LPCWSTR
#define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege") #define SE_CHANGE_NOTIFY_NAME TEXT("SeChangeNotifyPrivilege")
#define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege") #define SE_REMOTE_SHUTDOWN_NAME TEXT("SeRemoteShutdownPrivilege")
typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR); typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCA)(LGRPID, LPSTR, LPSTR, DWORD, LONG_PTR);
typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR); typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCA)(LGRPID, LCID, LPSTR, LONG_PTR);
typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR); typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCA)(LPSTR, LONG_PTR);
typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXA)(LPSTR, CALID); typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXA)(LPSTR, CALID);
typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXA)(LPSTR, CALID); typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXA)(LPSTR, CALID);
typedef BOOL (CALLBACK* LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR); typedef BOOL CALLBACK (*LANGUAGEGROUP_ENUMPROCW)(LGRPID, LPWSTR, LPWSTR, DWORD, LONG_PTR);
typedef BOOL (CALLBACK* LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR); typedef BOOL CALLBACK (*LANGGROUPLOCALE_ENUMPROCW)(LGRPID, LCID, LPWSTR, LONG_PTR);
typedef BOOL (CALLBACK* UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR); typedef BOOL CALLBACK (*UILANGUAGE_ENUMPROCW)(LPWSTR, LONG_PTR);
typedef BOOL (CALLBACK* DATEFMT_ENUMPROCEXW)(LPWSTR, CALID); typedef BOOL CALLBACK (*DATEFMT_ENUMPROCEXW)(LPWSTR, CALID);
typedef BOOL (CALLBACK* CALINFO_ENUMPROCEXW)(LPWSTR, CALID); typedef BOOL CALLBACK (*CALINFO_ENUMPROCEXW)(LPWSTR, CALID);
typedef BOOL (CALLBACK* GEO_ENUMPROC)(GEOID); typedef BOOL CALLBACK (*GEO_ENUMPROC)(GEOID);
#define SERVICES_ACTIVE_DATABASEW L"ServicesActive" #define SERVICES_ACTIVE_DATABASEW L"ServicesActive"
#define SERVICES_FAILED_DATABASEW L"ServicesFailed" #define SERVICES_FAILED_DATABASEW L"ServicesFailed"
@ -700,13 +700,13 @@ typedef enum {
LT_LOWEST_LATENCY LT_LOWEST_LATENCY
} LATENCY_TIME; } LATENCY_TIME;
typedef LONG (CALLBACK *PVECTORED_EXCEPTION_HANDLER)( typedef LONG CALLBACK (*PVECTORED_EXCEPTION_HANDLER)(
struct _EXCEPTION_POINTERS *ExceptionInfo struct _EXCEPTION_POINTERS *ExceptionInfo
); );
typedef typedef
VOID VOID
(CALLBACK *PAPCFUNC)( CALLBACK (*PAPCFUNC)(
ULONG_PTR dwParam ULONG_PTR dwParam
); );
@ -716,10 +716,10 @@ VOID
#define REFGUID const GUID * #define REFGUID const GUID *
#endif #endif
typedef DWORD (CALLBACK *PFE_EXPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,ULONG ulLength); 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 DWORD CALLBACK (*PFE_IMPORT_FUNC)(PBYTE pbData,PVOID pvCallbackContext,PULONG ulLength);
typedef VOID (CALLBACK *PFIBER_START_ROUTINE)( typedef VOID CALLBACK (*PFIBER_START_ROUTINE)(
LPVOID lpFiberParameter LPVOID lpFiberParameter
); );
typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE; typedef PFIBER_START_ROUTINE LPFIBER_START_ROUTINE;
@ -729,7 +729,7 @@ typedef enum _MEMORY_RESOURCE_NOTIFICATION_TYPE {
HighMemoryResourceNotification HighMemoryResourceNotification
} MEMORY_RESOURCE_NOTIFICATION_TYPE; } MEMORY_RESOURCE_NOTIFICATION_TYPE;
typedef VOID (CALLBACK* WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN ); typedef VOID CALLBACK (*WAITORTIMERCALLBACKFUNC) (PVOID, BOOLEAN );
typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK; typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK;
/* End of stuff from ddeml.h in old Cygnus headers */ /* End of stuff from ddeml.h in old Cygnus headers */
/* ----------------------------------------------- */ /* ----------------------------------------------- */

26
reactos/include/defines.h
View file

@ -2800,25 +2800,13 @@ extern "C" {
#define SPIF_SENDCHANGE (2) #define SPIF_SENDCHANGE (2)
/* TrackPopupMenu, TrackPopMenuEx */ /* TrackPopupMenu, TrackPopMenuEx */
#define TPM_LEFTBUTTON (0) #define TPM_CENTERALIGN (0x4L)
#define TPM_RIGHTBUTTON (2) #define TPM_LEFTALIGN (0L)
#define TPM_LEFTALIGN (0) #define TPM_RIGHTALIGN (0x8L)
#define TPM_CENTERALIGN (4) #define TPM_LEFTBUTTON (0L)
#define TPM_RIGHTALIGN (8) #define TPM_RIGHTBUTTON (0x2L)
#define TPM_TOPALIGN (0) #define TPM_HORIZONTAL (0L)
#define TPM_VCENTERALIGN (16) #define TPM_VERTICAL (0x40L)
#define TPM_BOTTOMALIGN (32)
#define TPM_HORIZONTAL (0)
#define TPM_VERTICAL (64)
#define TPM_NONOTIFY (128)
#define TPM_RETURNCMD (256)
#define TPM_RECURSE (1)
#define TPM_HORPOSANIMATION (1024)
#define TPM_HORNEGANIMATION (2048)
#define TPM_VERPOSANIMATION (4096)
#define TPM_VERNEGANIMATION (8192)
#define TPM_NOANIMATION (16384)
#define TPM_LAYOUTRTL (32768)
/* TranslateCharsetInfo */ /* TranslateCharsetInfo */
#define TCI_SRCCHARSET (1) #define TCI_SRCCHARSET (1)

6
reactos/include/funcs.h
View file

@ -38,7 +38,7 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
typedef typedef
DWORD (CALLBACK *PPROGRESS_ROUTINE)( DWORD CALLBACK (*PPROGRESS_ROUTINE)(
LARGE_INTEGER TotalFileSize, LARGE_INTEGER TotalFileSize,
LARGE_INTEGER TotalBytesTransferred, LARGE_INTEGER TotalBytesTransferred,
LARGE_INTEGER StreamSize, LARGE_INTEGER StreamSize,
@ -1710,7 +1710,7 @@ RtlSetCriticalSectionSpinCount(
typedef typedef
VOID VOID
(CALLBACK *POVERLAPPED_COMPLETION_ROUTINE)( CALLBACK (*POVERLAPPED_COMPLETION_ROUTINE)(
DWORD dwErrorCode, DWORD dwErrorCode,
DWORD dwNumberOfBytesTransfered, DWORD dwNumberOfBytesTransfered,
LPOVERLAPPED lpOverlapped LPOVERLAPPED lpOverlapped
@ -6778,7 +6778,7 @@ TlsFree(
DWORD dwTlsIndex DWORD dwTlsIndex
); );
typedef VOID STDCALL (*PFLS_CALLBACK_FUNCTION)(PVOID lpFlsData); typedef VOID STDCALL_FUNC (*PFLS_CALLBACK_FUNCTION)(PVOID lpFlsData);
DWORD STDCALL FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback); DWORD STDCALL FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback);

2
reactos/include/structs.h
View file

@ -510,7 +510,7 @@ typedef struct _RTL_RANGE {
typedef typedef
BOOLEAN BOOLEAN
(CALLBACK *PRTL_CONFLICT_RANGE_CALLBACK) ( CALLBACK (*PRTL_CONFLICT_RANGE_CALLBACK) (
PVOID Context, PVOID Context,
PRTL_RANGE Range PRTL_RANGE Range
); );