Changeset 21916 for trunk/include/win


Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/include/win/commdlg.h

    r21497 r21916  
    182182        HWND            hInstance;
    183183        DWORD           rgbResult;
    184         LPDWORD         *lpCustColors;
     184        LPDWORD         lpCustColors;
    185185        DWORD           Flags;
    186186        DWORD           lCustData;

  • trunk/include/win/dde.h

    r7869 r21916  
    2828#define WM_DDE_LAST       WM_DDE_EXECUTE
    2929#define WM_DDE_FIRST      WM_DDE_INITIATE
     30
     31#ifdef __cplusplus
     32extern "C" {
     33#endif
    3034
    3135/* DDEACK: wStatus in WM_DDE_ACK message */
    … …  
    7579LPARAM      WINAPI ReuseDDElParam(LPARAM,UINT,UINT,UINT,UINT);
    7680
     81#ifdef __cplusplus
     82} // extern "C"
     83#endif
     84
    7785#endif /* __WINE_DDE_H */

  • trunk/include/win/debugtools.h

    r21352 r21916  
    99
    1010#ifndef __MISC_H__
     11
     12#ifdef __cplusplus
     13extern "C" {
     14#endif
    1115
    1216#ifdef DEBUG
    … …  
    4751#endif
    4852
    49 int  SYSTEM WriteLog(char *tekst, ...);
    50 int  SYSTEM WritePrivateLog(void *logfile, char *tekst, ...);
     53int  SYSTEM WriteLog(const char *tekst, ...);
     54int  SYSTEM WritePrivateLog(void *logfile, const char *tekst, ...);
    5155
    5256void SYSTEM DecreaseLogCount();
    5357void SYSTEM IncreaseLogCount();
     58
     59#ifdef __cplusplus
     60} // extern "C"
     61#endif
    5462
    5563#endif //__MISC_H__
    … …  
    169177#  define MESSAGE WriteLog
    170178#else
    171 #  define TRACE 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    172 #  define TRACE_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    173 #  define FIXME 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    174 #  define FIXME_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    175 #  define WARN  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    176 #  define WARN_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    177 #  define ERR_(ch) 1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    178 #  define ERR  1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    179 #  define DPRINTF   1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
    180 #  define MESSAGE   1 ? (void)0 : (void)((int (*)(char *, ...)) NULL)
     179#ifdef __GNUC__
     180#  define TRACE 1 ? (void) 0 : (void)
     181#  define TRACE_(ch) 1 ? (void) 0 : (void)
     182#  define FIXME  1 ? (void) 0 : (void)
     183#  define FIXME_(ch) 1 ? (void) 0 : (void)
     184#  define WARN 1 ? (void) 0 : (void)
     185#  define WARN_(ch) 1 ? (void) 0 : (void)
     186#  define ERR_(ch) 1 ? (void) 0 : (void)
     187#  define ERR 1 ? (void) 0 : (void)
     188#  define DPRINTF 1 ? (void) 0 : (void)
     189#  define MESSAGE 1 ? (void) 0 : (void)
     190#else
     191#  define TRACE 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     192#  define TRACE_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     193#  define FIXME 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     194#  define FIXME_(ch) 1 ? (void)0 : (void)((int (*)(constchar *, ...)) NULL)
     195#  define WARN  1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     196#  define WARN_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     197#  define ERR_(ch) 1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     198#  define ERR  1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     199#  define DPRINTF   1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     200#  define MESSAGE   1 ? (void)0 : (void)((int (*)(const char *, ...)) NULL)
     201#endif
    181202#endif
    182203#undef __GET_DEBUGGING

  • trunk/include/win/dsound.h

    r21572 r21916  
    181181typedef LPVOID* LPLPVOID;
    182182
    183 typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPWSTR,LPWSTR,LPVOID);
    184 typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPSTR,LPSTR,LPVOID);
     183typedef BOOL (* CALLBACK LPDSENUMCALLBACKW)(LPGUID,LPCWSTR,LPCWSTR,LPVOID);
     184typedef BOOL (* CALLBACK LPDSENUMCALLBACKA)(LPGUID,LPCSTR,LPCSTR,LPVOID);
    185185DECL_WINELIB_TYPE_AW(LPDSENUMCALLBACK)
    186186

  • trunk/include/win/global.h

    r4 r21916  
    1818    int shmid;
    1919} SHMDATA;
     20
     21#ifdef __cplusplus
     22extern "C" {
     23#endif
    2024
    2125/* memory/global.c */
    … …  
    4549extern BOOL ATOM_Init( WORD globalTableSel );
    4650
     51#ifdef __cplusplus
     52} // extern "C"
     53#endif
     54
    4755#endif  /* __WINE_GLOBAL_H */

  • trunk/include/win/guiddef.h

    r21520 r21916  
    3333#ifndef __LPCGUID_DEFINED__
    3434#define __LPCGUID_DEFINED__
     35typedef const GUID *PCGUID;
    3536typedef const GUID *LPCGUID;
    3637#endif

  • trunk/include/win/minivcrt.h

    r21506 r21916  
    107107
    108108#define swprintf    NTDLL_swprintf
     109#define snwprintf   NTDLL_snwprintf
    109110#define swscanf     NTDLL_swscanf
    110111
    111112int         swprintf(WCHAR*,const WCHAR*,...);
     113int         snwprintf(WCHAR*,unsigned int,const WCHAR*,...);
    112114int         swscanf(const WCHAR*,const WCHAR*,...);
    113115

  • trunk/include/win/monitor.h

    r1859 r21916  
    1010
    1111//#include "windef.h"
     12
     13#ifdef __cplusplus
     14extern "C" {
     15#endif
    1216
    1317struct tagMONITOR_DRIVER;
    … …  
    4650extern void MONITOR_SetScreenSaveTimeout(MONITOR *pMonitor, int nTimeout);
    4751
     52#ifdef __cplusplus
     53} // extern "C"
     54#endif
     55
    4856#endif /* __WINE_MONITOR_H */
    4957

  • trunk/include/win/ntddk.h

    r21327 r21916  
    876876
    877877/*      mathematics */
    878 #if defined(__WIN32OS2__) && defined(__IBMC__)
     878#if defined(__WIN32OS2__) && defined(WINE_LARGE_INTEGER) && !defined(WINE_LONGLONG)
     879
    879880LARGE_INTEGER  WINAPI RtlpConvertLongToLargeInteger( LONG a );
    880881LARGE_INTEGER  WINAPI RtlpEnlargedIntegerMultiply( INT a, INT b );

  • trunk/include/win/ntdef.h

    r21419 r21916  
    99#endif
    1010
    11 #define NTAPI   __stdcall 
     11#define NTAPI   __stdcall
    1212
    1313#ifndef IN
    … …  
    2727#endif
    2828
     29#ifndef WINE_NTSTATUS_DECLARED
     30#define WINE_NTSTATUS_DECLARED
    2931typedef LONG NTSTATUS;
     32#endif
     33#ifndef WINE_PNTSTATUS_DECLARED
     34#define WINE_PNTSTATUS_DECLARED
    3035typedef NTSTATUS *PNTSTATUS;
     36#endif
    3137
     38typedef char *PSZ;
    3239typedef CONST char *PCSZ;
    3340
    3441typedef short CSHORT;
    35 typedef CSHORT *PCSHORT; 
     42typedef CSHORT *PCSHORT;
    3643
    3744/* NT lowlevel Strings (handled by Rtl* functions in NTDLL)
    … …  
    7380#define OBJ_VALID_ATTRIBUTES    0x000003F2L
    7481
    75 typedef struct _OBJECT_ATTRIBUTES 
     82typedef struct _OBJECT_ATTRIBUTES
    7683{   ULONG Length;
    7784    HANDLE RootDirectory;

  • trunk/include/win/pe_image.h

    r4124 r21916  
    3232extern HGLOBAL PE_LoadResource(struct _wine_modref *wm,HRSRC);
    3333extern HMODULE PE_LoadImage( HFILE hFile, OFSTRUCT *ofs, LPCSTR *modName );
    34 extern struct _wine_modref *PE_CreateModule( HMODULE hModule, OFSTRUCT *ofs, 
     34extern struct _wine_modref *PE_CreateModule( HMODULE hModule, OFSTRUCT *ofs,
    3535                                             DWORD flags, BOOL builtin );
    36 extern BOOL PE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env, 
     36extern BOOL PE_CreateProcess( HFILE hFile, OFSTRUCT *ofs, LPCSTR cmd_line, LPCSTR env,
    3737                              LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa,
    3838                              BOOL inherit, LPSTARTUPINFOA startup,
    … …  
    4848
    4949typedef struct {
    50         WORD    popl    WINE_PACKED;    /* 0x8f 0x05 */
    51         DWORD   addr_popped WINE_PACKED;/* ...  */
    52         BYTE    pushl1  WINE_PACKED;    /* 0x68 */
    53         DWORD   newret WINE_PACKED;     /* ...  */
    54         BYTE    pushl2  WINE_PACKED;    /* 0x68 */
    55         DWORD   origfun WINE_PACKED;    /* original function */
    56         BYTE    ret1    WINE_PACKED;    /* 0xc3 */
    57         WORD    addesp  WINE_PACKED;    /* 0x83 0xc4 */
    58         BYTE    nrofargs WINE_PACKED;   /* nr of arguments to add esp, */
    59         BYTE    pushl3  WINE_PACKED;    /* 0x68 */
    60         DWORD   oldret  WINE_PACKED;    /* Filled out from popl above  */
    61         BYTE    ret2    WINE_PACKED;    /* 0xc3 */
    62 } ELF_STDCALL_STUB;
     50        WORD    popl;       /* 0x8f 0x05 */
     51        DWORD   addr_popped;/* ...  */
     52        BYTE    pushl1;     /* 0x68 */
     53        DWORD   newret;     /* ...  */
     54        BYTE    pushl2;     /* 0x68 */
     55        DWORD   origfun;    /* original function */
     56        BYTE    ret1;       /* 0xc3 */
     57        WORD    addesp;     /* 0x83 0xc4 */
     58        BYTE    nrofargs;       /* nr of arguments to add esp, */
     59        BYTE    pushl3;     /* 0x68 */
     60        DWORD   oldret;     /* Filled out from popl above  */
     61        BYTE    ret2;       /* 0xc3 */
     62} WINE_PACKED ELF_STDCALL_STUB;
    6363
    6464typedef struct {

  • trunk/include/win/setupapi.h

    r9402 r21916  
    2929    unsigned short Data3;
    3030    unsigned char Data4[8];
    31 } GUID, *PGUID, *LPGUID;
     31} GUID;
     32#endif
     33#ifndef __LPCGUID_DEFINED__
     34#define __LPCGUID_DEFINED__
     35typedef const GUID *PCGUID;
     36typedef const GUID *LPCGUID;
    3237#endif
    3338#include <wtypes.h>

  • trunk/include/win/shellapi.h

    r21510 r21916  
    33
    44#include "windef.h"
     5
     6#ifdef __cplusplus
     7extern "C" {
     8#endif
    59
    610#pragma pack(1)
    … …  
    166170typedef WORD PRINTEROP_FLAGS;
    167171
    168 typedef struct _SHNAMEMAPPINGW { 
    169     LPWSTR pszOldPath; 
    170     LPWSTR pszNewPath; 
    171     int   cchOldPath; 
    172     int   cchNewPath; 
    173 } SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW; 
     172typedef struct _SHNAMEMAPPINGW {
     173    LPWSTR pszOldPath;
     174    LPWSTR pszNewPath;
     175    int   cchOldPath;
     176    int   cchNewPath;
     177} SHNAMEMAPPINGW, *LPSHNAMEMAPPINGW;
    174178
    175179typedef struct _SHFILEOPSTRUCTA
    … …  
    292296#pragma pack(4)
    293297
     298#ifdef __cplusplus
     299} // extern "C"
     300#endif
     301
    294302#endif /* _WINE_SHELLAPI_H */

  • trunk/include/win/task.h

    r2651 r21916  
    6060
    6161  /* Task database. See 'Windows Internals' p. 226.
    62    * Note that 16-bit OLE 2 libs like to read it directly 
    63    * so we have to keep entry offsets as they are. 
     62   * Note that 16-bit OLE 2 libs like to read it directly
     63   * so we have to keep entry offsets as they are.
    6464   */
    6565typedef struct _TDB
    … …  
    104104    DWORD     dlls_to_init;               /* ac Ptr to DLLs to initialize */
    105105    HANDLE16  hCSAlias;                   /* b0 Code segment for this TDB */
    106     THUNKS    thunks WINE_PACKED;         /* b2 Make proc instance thunks */
     106    THUNKS    thunks;                     /* b2 Make proc instance thunks */
    107107    WORD      more_thunks[6*4];           /* c2 Space for 6 more thunks */
    108108    BYTE      module_name[8];             /* f2 Module name for task */

  • trunk/include/win/vfw.h

    r6387 r21916  
    5050
    5151/* Installable Compressor Manager */
    52 
    53 DECLARE_HANDLE(HIC);
    5452
    5553#ifdef __WINE__

  • trunk/include/win/virtual.h

    r7566 r21916  
    88#define __VIRTUAL_H
    99
     10#ifdef __cplusplus
     11extern "C" {
     12#endif
     13
    1014HANDLE WINAPI VIRTUAL_MapFileA( LPCSTR name , LPVOID *lpMapping, BOOL fReadIntoMemory = FALSE);
    1115HANDLE WINAPI VIRTUAL_MapFileW( LPCWSTR name , LPVOID *lpMapping, BOOL fReadIntoMemory = FALSE);
    … …  
    1418                          DWORD  fdwProtect, LPSTR name);
    1519
     20#ifdef __cplusplus
     21} // extern "C"
     22#endif
     23
    1624#endif  /* __VIRTUAL_H */

  • trunk/include/win/wine/debug.h

    r8208 r21916  
    2222#define __WINE_WINE_DEBUG_H
    2323
    24 #include <win\debugtools.h>
     24#include <win/debugtools.h>
    2525#include <stdarg.h>
    2626

  • trunk/include/win/wine/obj_base.h

    r21493 r21916  
    703703typedef struct IMalloc16 IMalloc16,*LPMALLOC16;
    704704typedef struct IMalloc IMalloc,*LPMALLOC;
     705typedef const IMalloc *LPCMALLOC;
    705706
    706707DEFINE_OLEGUID(IID_IUnknown,            0x00000000L, 0, 0);

  • trunk/include/win/wine/obj_surrogate.h

    r641 r21916  
    4646#endif // __WINE_WINE_OBJ_SURROGATE_H
    4747
    48 
     48

  • trunk/include/win/wine/winbase16.h

    r641 r21916  
    171171DWORD       WINAPI RegCreateKey16(HKEY,LPCSTR,LPHKEY);
    172172DWORD       WINAPI RegDeleteKey16(HKEY,LPCSTR);
    173 DWORD       WINAPI RegDeleteValue16(HKEY,LPSTR);
     173DWORD       WINAPI RegDeleteValue16(HKEY,LPCSTR);
    174174DWORD       WINAPI RegEnumKey16(HKEY,DWORD,LPSTR,DWORD);
    175175DWORD       WINAPI RegEnumValue16(HKEY,DWORD,LPSTR,LPDWORD,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    … …  
    178178DWORD       WINAPI RegQueryValueEx16(HKEY,LPSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);
    179179DWORD       WINAPI RegSetValue16(HKEY,LPCSTR,DWORD,LPCSTR,DWORD);
    180 DWORD       WINAPI RegSetValueEx16(HKEY,LPSTR,DWORD,DWORD,LPBYTE,DWORD);
     180DWORD       WINAPI RegSetValueEx16(HKEY,LPSTR,DWORD,DWORD,const BYTE *,DWORD);
    181181BOOL16      WINAPI RemoveDirectory16(LPCSTR);
    182182BOOL16      WINAPI SetCurrentDirectory16(LPCSTR);

  • trunk/include/win/winnls.h

    r21360 r21916  
    560560 */
    561561
     562#ifdef __cplusplus
     563extern "C" {
     564#endif
     565
    562566UINT        WINAPI CompareStringA(LCID,DWORD,LPCSTR,DWORD,LPCSTR,DWORD);
    563567UINT        WINAPI CompareStringW(LCID,DWORD,LPCWSTR,DWORD,LPCWSTR,DWORD);
    … …  
    633637INT         WINAPI WideCharToMultiByte(UINT,DWORD,LPCWSTR,INT,LPSTR,INT,LPCSTR,LPBOOL);
    634638
     639#ifdef __cplusplus
     640} // extern "C"
     641#endif
     642
    635643#endif //#ifndef OS2_INCLUDED
    636644

  • trunk/include/win/winprocess.h

    r8771 r21916  
    186186#define  GPD_USERDATA            (  0)
    187187
     188#ifdef __cplusplus
     189extern "C" {
     190#endif
     191
    188192extern DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset );
    189193void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value );
    … …  
    214218extern DWORD DEBUG_SendUnloadDLLEvent( HMODULE module );
    215219
     220#ifdef __cplusplus
     221} // extern "C"
     222#endif
     223
    216224#include <wprocess.h>
    217225

  • trunk/include/win/winreg.h

    r21327 r21916  
    124124    DWORD       ve_type;
    125125} VALENTW, *PVALENTW;
     126
     127#ifdef __cplusplus
     128extern "C" {
     129#endif
    126130
    127131BOOL      WINAPI LookupPrivilegeValueA(LPCSTR,LPCSTR,LPVOID);
    … …  
    195199LONG       WINAPI RegDeleteKeyW(HKEY,LPCWSTR);
    196200#define     RegDeleteKey WINELIB_NAME_AW(RegDeleteKey)
    197 LONG       WINAPI RegDeleteValueA(HKEY,LPSTR);
    198 LONG       WINAPI RegDeleteValueW(HKEY,LPWSTR);
     201LONG       WINAPI RegDeleteValueA(HKEY,LPCSTR);
     202LONG       WINAPI RegDeleteValueW(HKEY,LPCWSTR);
    199203#define     RegDeleteValue WINELIB_NAME_AW(RegDeleteValue)
    200204LSTATUS   WINAPI RegDeleteTreeA(HKEY,LPCSTR);
    … …  
    219223LONG       WINAPI RegSetValueW(HKEY,LPCWSTR,DWORD,LPCWSTR,DWORD);
    220224#define     RegSetValue WINELIB_NAME_AW(RegSetValue)
    221 LONG       WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,LPBYTE,DWORD);
    222 LONG       WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,LPBYTE,DWORD);
     225LONG       WINAPI RegSetValueExA(HKEY,LPCSTR,DWORD,DWORD,const BYTE *,DWORD);
     226LONG       WINAPI RegSetValueExW(HKEY,LPCWSTR,DWORD,DWORD,const BYTE *,DWORD);
    223227#define     RegSetValueEx WINELIB_NAME_AW(RegSetValueEx)
    224228
    … …  
    227231#define     RegQueryMultipleValues WINELIB_NAME_AW(RegQueryMultipleValues)
    228232
     233#ifdef __cplusplus
     234} // extern "C"
     235#endif
     236
    229237#endif  /* __WINE_WINREG_H */

  • trunk/include/win/winuser.h

    r21553 r21916  
    32053205#define DI_DEFAULTSIZE          8
    32063206
    3207   /* misc messages */
     3207/* misc messages */
    32083208#define WM_NULL             0x0000
    3209 #define WM_CPL_LAUNCH       (WM_USER + 1000)
    3210 #define WM_CPL_LAUNCHED     (WM_USER + 1001)
    32113209
    32123210/* WM_NOTIFYFORMAT commands and return values */
Note: See TracChangeset for help on using the changeset viewer.