Changeset 21299 for trunk/include/win


Ignore:
Timestamp:
Jun 16, 2009, 3:08:41 PM (16 years ago)
Author:
ydario
Message:

Header updates.

Location:
trunk/include/win
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/win/winbase.h

    r10579 r21299  
    185185  DWORD  dwLowDateTime;
    186186  DWORD  dwHighDateTime;
    187 } FILETIME, *LPFILETIME;
     187} FILETIME, *LPFILETIME, *PFILETIME;
    188188#endif /* _FILETIME_ */
    189189

  • trunk/include/win/windef.h

    r10627 r21299  
    151151#endif
    152152
    153 
     153#ifndef __EMX__
    154154#if (__IBMC__ < 400) && (__IBMCPP__ < 360)
    155155#ifndef __declspec
    … …  
    165165#endif
    166166#endif // (__IBMC__ < 400) && (__IBMCPP__ < 360)
     167#endif // __EMX__
    167168
    168169#ifndef CONST
    … …  
    309310typedef double          __int64;
    310311#elif defined (__EMX__)
     312#ifndef _JAVASOFT_JNI_MD_H_
    311313typedef long long       __int64;
     314#endif
    312315#endif
    313316#else
    … …  
    532535#define __TEXT(string) L##string /*probably wrong */
    533536# else  /* UNICODE */
    534 typedef CHAR TCHAR;
     537typedef CHAR            TCHAR,      *PTCHAR;
    535538typedef LPSTR LPTSTR;
    536539typedef LPCSTR LPCTSTR;

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

    r9962 r21299  
    6868
    6969#ifdef __EMX__
    70 #define _K32CONV _optlink
     70#define _K32CONV _Optlink
    7171#else
    7272#define _K32CONV

  • trunk/include/win/winnt.h

    r10421 r21299  
    122122#  define __TEXT(string) L##string
    123123# else  /* UNICODE */
     124#ifndef __WINE_WINDEF_H
    124125typedef CHAR            TCHAR,      *PTCHAR;
    125126typedef LPSTR           PTSTR;
    126127typedef LPCSTR          PCTSTR;
     128#endif
    127129#  define __TEXT(string) string
    128130# endif /* UNICODE */

  • trunk/include/win/winuser.h

    r10579 r21299  
    37313731LONG        WINAPI GetWindowLongW(HWND,INT);
    37323732#define     GetWindowLong WINELIB_NAME_AW(GetWindowLong)
     3733
     3734#ifndef GetWindowLongPtr
     3735  #define GetWindowLongPtrA   GetWindowLongA
     3736  #define GetWindowLongPtrW   GetWindowLongW
     3737  #ifdef UNICODE
     3738    #define GetWindowLongPtr  GetWindowLongPtrW
     3739  #else
     3740    #define GetWindowLongPtr  GetWindowLongPtrA
     3741  #endif // !UNICODE
     3742#endif // !GetWindowLongPtr
     3743
     3744#ifndef SetWindowLongPtr
     3745  #define SetWindowLongPtrA   SetWindowLongA
     3746  #define SetWindowLongPtrW   SetWindowLongW
     3747  #ifdef UNICODE
     3748    #define SetWindowLongPtr  SetWindowLongPtrW
     3749  #else
     3750    #define SetWindowLongPtr  SetWindowLongPtrA
     3751  #endif // !UNICODE
     3752#endif // !SetWindowLongPtr
     3753
    37333754BOOL      WINAPI GetWindowPlacement(HWND,LPWINDOWPLACEMENT);
    37343755BOOL      WINAPI GetWindowRect(HWND,LPRECT);
Note: See TracChangeset for help on using the changeset viewer.