Changeset 5470 for trunk/include


Ignore:
Timestamp:
Apr 4, 2001, 10:59:28 AM (25 years ago)
Author:
sandervl
Message:

header updates

Location:
trunk/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/heapstring.h

    r5456 r5470  
    1 /* $Id: heapstring.h,v 1.13 2001-04-03 17:45:54 sandervl Exp $ */
    2 
    31/*
    42 * Project Odin Software License can be found in LICENSE.TXT

  • trunk/include/misc.h

    r5427 r5470  
    132132
    133133
    134 #include "unicode.h"
    135 
    136134#endif

  • trunk/include/unicode.h

    r1871 r5470  
    1 /* $Id: unicode.h,v 1.7 1999-11-28 23:23:45 bird Exp $ */
    2 
    31/*
    42 *
    … …  
    97#define __UNICODE_H__
    108
    11 #include <uniconv.h>
     9#include <heapstring.h>
    1210
    13 #ifdef __cplusplus
    14  extern "C" {
    15 #endif
    1611
    17 /* also used from Windows only files ported from WINE */
    18 #ifndef WIN32API
    19 #define WIN32API WINAPI
    20 #endif
     12#define UnicodeToAsciiString(u)  HEAP_strdupWtoA(GetProcessHeap(), 0, u)
     13#define AsciiToUnicodeString(a)  HEAP_strdupAtoW(GetProcessHeap(), 0, a)
     14#define FreeAsciiString(a)       HEAP_free(a)
    2115
    22 char *  WIN32API UnicodeToAsciiString(LPCWSTR ustring);
    23 int     WIN32API UnicodeToAscii(LPCWSTR ustring, char *astring);
    24 int     WIN32API UnicodeToAsciiN(LPCWSTR ustring, char *astring, int unilen);
    25 void    WIN32API FreeAsciiString(char *astring);
    26 LPWSTR  WIN32API AsciiToUnicodeString(const char *astring);
    27 void    WIN32API AsciiToUnicode(const char *ascii, LPWSTR unicode);
    28 void    WIN32API AsciiToUnicodeN(const char *ascii, LPWSTR unicode, int asciilen);
    29 
    30 #ifdef __cplusplus
    31  }
    32 #endif
    33 
    34 #ifdef __cplusplus
    35 char *  WIN32API UnicodeToAsciiStringN(LPCWSTR ustring, ULONG length);
    36 #endif
     16#define UnicodeToAscii(u, a)     lstrcpyWtoA(a, u)
     17#define UnicodeToAsciiN(u, a, n) lstrcpynWtoA(a, u, n)
     18#define AsciiToUnicode(a, u)     lstrcpyAtoW(u, a)
     19#define AsciiToUnicodeN(a, u, n) lstrcpynAtoW(u, a, n)
    3720
    3821#endif

  • trunk/include/win/debugtools.h

    r4834 r5470  
    2626  #define dassert(a, b)   if(!(a)) WriteLogError b
    2727  #define dbgCheckObj(a)   a->checkObject()
    28   #define DisableLogging  DecreaseLogCount
    29   #define EnableLogging   IncreaseLogCount
    3028
    3129#ifdef DEBUG_ENABLELOG_LEVEL2
    … …  
    4644  #define dassert(a, b)
    4745  #define dbgCheckObj(a)
    48   #define DisableLogging
    49   #define EnableLogging
    5046#endif
    5147

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

    r5461 r5470  
    88#define __WINE_UNICODE_H
    99
    10 #ifndef OS2_INCLUDED
     10#if !defined(OS2_INCLUDED) && !defined(__WIN32TYPE_H__)
    1111#include <windef.h>
    1212#endif
Note: See TracChangeset for help on using the changeset viewer.