diff --git a/reactos/include/crt/sys/types.h b/reactos/include/crt/sys/types.h index 8ba3df7e7da..eef90b05782 100644 --- a/reactos/include/crt/sys/types.h +++ b/reactos/include/crt/sys/types.h @@ -36,4 +36,21 @@ typedef unsigned int dev_t; # endif #endif +#ifdef _WINE +#ifndef _PID_T_ +#define _PID_T_ +#ifndef _WIN64 +typedef int _pid_t; +#else +typedef __int64 _pid_t; +#endif +#ifndef NO_OLDNAMES +#ifndef __pid_t_defined +#define __pid_t_defined +typedef _pid_t pid_t; +#endif /* __pid_t_defined */ +#endif +#endif /* Not _PID_T_ */ +#endif + #endif /* !_INC_TYPES */ diff --git a/reactos/include/psdk/dlgs.h b/reactos/include/psdk/dlgs.h index 302794c5f2d..3ce96f5ec27 100644 --- a/reactos/include/psdk/dlgs.h +++ b/reactos/include/psdk/dlgs.h @@ -16,6 +16,11 @@ extern "C" { #define FORMATDLGORD30 1544 #define RUNDLGORD 1545 +#ifdef _WINE +#define OFN_DONTADDTORECENT 0x02000000 +#define OFN_ENABLEINCLUDENOTIFY 0x00400000 +#endif + #if (WINVER >= 0x0400) #define PAGESETUPDLGORD 1546 #define NEWFILEOPENORD 1547 diff --git a/reactos/include/psdk/mmsystem.h b/reactos/include/psdk/mmsystem.h index c2c2377c1f5..da8b9699c6a 100644 --- a/reactos/include/psdk/mmsystem.h +++ b/reactos/include/psdk/mmsystem.h @@ -126,6 +126,11 @@ extern "C" { #define DRV_RESTART DRVCNF_RESTART #define DRV_MCI_FIRST DRV_RESERVED #define DRV_MCI_LAST (DRV_RESERVED+0xFFF) +#ifdef _WINE +#define DRV_SUCCESS 0x0001 +#define DRV_FAILURE 0x0000 +#define DRV_EXITAPPLICATION 0x000C +#endif #define CALLBACK_TYPEMASK 0x70000 #define CALLBACK_NULL 0 #define CALLBACK_WINDOW 0x10000 @@ -905,6 +910,12 @@ extern "C" { #define MCI_OVLY_WHERE_DESTINATION 0x40000 #define MCI_OVLY_WHERE_FRAME 0x80000 #define MCI_OVLY_WHERE_VIDEO 0x100000 +#ifdef _WINE +#define MCI_OPEN_DRIVER 0x0801 +#define MCI_CLOSE_DRIVER 0x0802 +#define MCI_SOUND 0x0812 +#define MCI_SOUND_NAME 0x00000100L +#endif #define NEWTRANSPARENT 3 #define QUERYROPSUPPORT 40 #define SELECTDIB 41 @@ -922,6 +933,18 @@ extern "C" { #define SEEK_END 2 #endif +#ifdef _WINE +#define MAXWAVEDRIVERS 10 +#define MAXMIDIDRIVERS 10 +#define MAXAUXDRIVERS 10 +#define MAXMCIDRIVERS 32 +#define MAXMIXERDRIVERS 10 +#endif + +#ifdef _WINE +typedef LPCSTR HPCSTR; +#endif + typedef DWORD MCIERROR; typedef UINT MCIDEVICEID; typedef UINT(CALLBACK *YIELDPROC)(MCIDEVICEID,DWORD); @@ -1132,6 +1155,9 @@ typedef struct midievent_tag { DWORD dwEvent; DWORD dwParms[1]; } MIDIEVENT; +#ifdef _WINE +typedef struct midievent_tag *LPMIDIEVENT; +#endif typedef struct midistrmbuffver_tag { DWORD dwVersion; @@ -1508,6 +1534,24 @@ typedef struct tagMCI_SEEK_PARMS { DWORD dwTo; } MCI_SEEK_PARMS, *PMCI_SEEK_PARMS,*LPMCI_SEEK_PARMS; +#ifdef _WINE +typedef struct tagMCI_SOUND_PARMSA { + DWORD_PTR dwCallback; + LPCSTR lpstrSoundName; +} MCI_SOUND_PARMSA, *LPMCI_SOUND_PARMSA; + +typedef struct tagMCI_SOUND_PARMSW { + DWORD_PTR dwCallback; + LPCWSTR lpstrSoundName; +} MCI_SOUND_PARMSW, *LPMCI_SOUND_PARMSW; + +#ifdef UNICODE +typedef MCI_SOUND_PARMSW MCI_SOUND_PARMS; +#else +typedef MCI_SOUND_PARMSA MCI_SOUND_PARMS; +#endif +#endif + typedef struct tagMCI_STATUS_PARMS { DWORD dwCallback; DWORD dwReturn; diff --git a/reactos/include/psdk/prsht.h b/reactos/include/psdk/prsht.h index 987653d1226..91f3e76de14 100644 --- a/reactos/include/psdk/prsht.h +++ b/reactos/include/psdk/prsht.h @@ -63,6 +63,10 @@ extern "C" { #else #define PSH_WIZARD97 0x01000000 #endif +#ifdef _WINE +#define PSH_WIZARD97_OLD 0x00002000 +#define PSH_WIZARD97_NEW 0x01000000 +#endif #endif /* _WIN32_IE >= 0x0400 */ #if (_WIN32_IE >= 0x0500) #define PSH_WIZARD_LITE 0x400000 diff --git a/reactos/include/psdk/winnetwk.h b/reactos/include/psdk/winnetwk.h index a39744919a7..c391472adce 100644 --- a/reactos/include/psdk/winnetwk.h +++ b/reactos/include/psdk/winnetwk.h @@ -287,6 +287,24 @@ DWORD WINAPI WNetRestoreConnectionA(HWND,LPCSTR); DWORD WINAPI WNetRestoreConnectionW(HWND,LPCWSTR); DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); DWORD APIENTRY MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT); + +#ifdef _WINE +typedef struct tagPASSWORD_CACHE_ENTRY +{ + WORD cbEntry; + WORD cbResource; + WORD cbPassword; + BYTE iEntry; + BYTE nType; + BYTE abResource[1]; +} PASSWORD_CACHE_ENTRY; + +typedef BOOL (CALLBACK *ENUMPASSWORDPROC)(PASSWORD_CACHE_ENTRY *, DWORD); +DWORD WINAPI WNetCachePassword( LPSTR, WORD, LPSTR, WORD, BYTE, WORD ); +UINT WINAPI WNetEnumCachedPasswords( LPSTR, WORD, BYTE, ENUMPASSWORDPROC, DWORD); +DWORD WINAPI WNetGetCachedPassword( LPSTR, WORD, LPSTR, LPWORD, BYTE ); +#endif + #ifdef UNICODE #define PFNPROCESSPOLICIES PFNPROCESSPOLICIESW #define PFNRECONCILEPROFILE PFNRECONCILEPROFILEW diff --git a/reactos/include/psdk/winnls.h b/reactos/include/psdk/winnls.h index 4d956d1f54d..b63760ffae7 100644 --- a/reactos/include/psdk/winnls.h +++ b/reactos/include/psdk/winnls.h @@ -174,6 +174,9 @@ extern "C" { #endif #define CP_ACP 0 +#ifdef _WINE +#define CP_UNIXCP CP_ACP +#endif #define CP_OEMCP 1 #define CP_MACCP 2 #define CP_THREAD_ACP 3 diff --git a/reactos/include/psdk/winnt.h b/reactos/include/psdk/winnt.h index c95c1312395..d177ddc3865 100644 --- a/reactos/include/psdk/winnt.h +++ b/reactos/include/psdk/winnt.h @@ -70,11 +70,13 @@ extern "C" { #endif #endif +/*#ifdef _WINE*/ #if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) #define __WINE_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) #else #define __WINE_ALLOC_SIZE(x) #endif +/*#endif*/ #ifndef FORCEINLINE #if (_MSC_VER >= 1200) @@ -881,6 +883,27 @@ typedef enum { #define LANG_YI 0x78 #define LANG_YORUBA 0x6a #define LANG_ZULU 0x35 + +#ifdef _WINE +#define LANG_ESPERANTO 0x8f +#define LANG_WALON 0x90 +#define LANG_CORNISH 0x91 + +#define LANG_GAELIC 0x94 +#define LANG_MALTESE 0x3a +#define LANG_ROMANSH 0x17 +#define LANG_SAAMI 0x3b +#define LANG_LOWER_SORBIAN 0x2e +#define LANG_UPPER_SORBIAN 0x2e +#define LANG_SUTU 0x30 +#define LANG_TAJIK 0x28 +#define LANG_TSONGA 0x31 +#define LANG_TSWANA 0x32 +#define LANG_VENDA 0x33 +#define LANG_XHOSA 0x34 +#define LANG_ZULU 0x35 +#endif + #define SUBLANG_CUSTOM_UNSPECIFIED 0x04 #define SUBLANG_CUSTOM_DEFAULT 0x03 #define SUBLANG_UI_CUSTOM_DEFAULT 0x05 diff --git a/reactos/include/psdk/winspool.h b/reactos/include/psdk/winspool.h index 5a6009fcf37..d8c91959aaf 100644 --- a/reactos/include/psdk/winspool.h +++ b/reactos/include/psdk/winspool.h @@ -827,6 +827,7 @@ BOOL WINAPI EnumPrintProcessorDatatypesA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PD BOOL WINAPI EnumPrintProcessorDatatypesW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); BOOL WINAPI EnumPrintProcessorsA(LPSTR,LPSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); BOOL WINAPI EnumPrintProcessorsW(LPWSTR,LPWSTR,DWORD,PBYTE,DWORD,PDWORD,PDWORD); +LONG WINAPI ExtDeviceMode(HWND,HANDLE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD); BOOL WINAPI FindClosePrinterChangeNotification(HANDLE); HANDLE WINAPI FindFirstPrinterChangeNotification(HANDLE,DWORD,DWORD,PVOID); HANDLE WINAPI FindNextPrinterChangeNotification(HANDLE,PDWORD,PVOID,PVOID*); @@ -870,6 +871,11 @@ BOOL WINAPI SetPrinterA(HANDLE,DWORD,PBYTE,DWORD); BOOL WINAPI SetPrinterW(HANDLE,DWORD,PBYTE,DWORD); BOOL WINAPI SetPrinterDataA(HANDLE,LPSTR,DWORD,PBYTE,DWORD); BOOL WINAPI SetPrinterDataW(HANDLE,LPWSTR,DWORD,PBYTE,DWORD); +#ifdef _WINE +LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); +LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); +#define StartDocDlg WINELIB_NAME_AW(StartDocDlg) +#endif DWORD WINAPI StartDocPrinterA(HANDLE,DWORD,PBYTE); DWORD WINAPI StartDocPrinterW(HANDLE,DWORD,PBYTE); BOOL WINAPI StartPagePrinter(HANDLE); diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h index fa4190852e5..4237993503c 100644 --- a/reactos/include/psdk/winuser.h +++ b/reactos/include/psdk/winuser.h @@ -1938,6 +1938,9 @@ extern "C" { #define EN_VSCROLL 1538 #define LB_ADDFILE 406 #define LB_ADDSTRING 384 +#ifdef _WINE +#define LB_CARETOFF 420 +#endif #define LB_DELETESTRING 386 #define LB_DIR 397 #define LB_FINDSTRING 399 @@ -2026,6 +2029,9 @@ extern "C" { #define DCX_INTERSECTRGN 128 #define DCX_VALIDATE 0x200000 #define DCX_EXCLUDEUPDATE 0x100 +#ifdef _WINE +#define DCX_USESTYLE 0x10000 +#endif #define GMDI_GOINTOPOPUPS 2 #define GMDI_USEDISABLED 1 #define FKF_AVAILABLE 2 @@ -4151,6 +4157,8 @@ BOOL WINAPI PostThreadMessageW(DWORD,UINT,WPARAM,LPARAM); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI PrintWindow(HWND,HDC,UINT); #endif +UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); +UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); BOOL WINAPI PtInRect(LPCRECT,POINT); HWND WINAPI RealChildWindowFromPoint(HWND,POINT); UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); @@ -4487,6 +4495,7 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX; #define PostAppMessage PostAppMessageW #define PostMessage PostMessageW #define PostThreadMessage PostThreadMessageW +#define PrivateExtractIcons PrivateExtractIconsW #define RealGetWindowClass RealGetWindowClassW #define RegisterClass RegisterClassW #define RegisterClassEx RegisterClassExW @@ -4654,6 +4663,7 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX; #define PostAppMessage PostAppMessageA #define PostMessage PostMessageA #define PostThreadMessage PostThreadMessageA +#define PrivateExtractIcons PrivateExtractIconsA #define RealGetWindowClass RealGetWindowClassA #define RegisterClass RegisterClassA #define RegisterClassEx RegisterClassExA diff --git a/reactos/include/reactos/wine/winspool.h b/reactos/include/reactos/wine/winspool.h index dd3084c03c1..a6d2be8b8a0 100644 --- a/reactos/include/reactos/wine/winspool.h +++ b/reactos/include/reactos/wine/winspool.h @@ -36,9 +36,6 @@ extern "C" { /* DECLARATIONS */ -LONG WINAPI ExtDeviceMode( HWND hWnd, HANDLE hInst, LPDEVMODEA pDevModeOutput, - LPSTR pDeviceName, LPSTR pPort, LPDEVMODEA pDevModeInput, LPSTR pProfile, - DWORD fMode); LPSTR WINAPI StartDocDlgA(HANDLE hPrinter, DOCINFOA *doc); LPWSTR WINAPI StartDocDlgW(HANDLE hPrinter, DOCINFOW *doc); diff --git a/reactos/include/reactos/wine/winuser.h b/reactos/include/reactos/wine/winuser.h index 8ce6344dcff..df8efa3862a 100644 --- a/reactos/include/reactos/wine/winuser.h +++ b/reactos/include/reactos/wine/winuser.h @@ -12,7 +12,4 @@ #define DCX_USESTYLE 0x00010000 #define LB_CARETOFF 0x01a4 -WINUSERAPI UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); -WINUSERAPI UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); - #endif /* __WINE_WINUSER_H */