This commit is contained in:
dougt@meer.net 2008-03-04 11:43:44 -08:00
Родитель e49a6df6f9
Коммит dc15854401
4 изменённых файлов: 32 добавлений и 37 удалений

Просмотреть файл

@ -791,4 +791,15 @@ typedef struct
#endif
#define SHGetSpecialFolderPathW SHGetSpecialFolderPath
// On Windows CE, there are some functions that are wide, but there
// isn't a function named "functionW".
#define SHGetPathFromIDListW SHGetPathFromIDList
#define GetUserNameW GetUserName
#define RemovePropW RemoveProp
#define GetPropW GetProp
#define SetPropW SetProp
#define FONTENUMPROCW FONTENUMPROC
#define GetLongPathNameW GetLongPathName
#endif // _MOZCE_DEFS

Просмотреть файл

@ -125,39 +125,10 @@
#define SetWindowLongA SetWindowLongW
#define GetMonitorInfoW GetMonitorInfo
#if 0
#define GetProp GetPropA
#define SetProp SetPropA
#define RemoveProp RemovePropA
#define SetWorldTransform SetWorldTransform
#define GetWorldTransform GetWorldTransform
#define SetGraphicsMode SetGraphicsMode
#define ScriptFreeCache ScriptFreeCache
#undef GetProcAddress
#define GetProcAddress GetProcAddressA
// OutlineTextMetrics are tricky. It is a pain to convert W->A text metrics,
// and we have no A functions. Because we do not define UNICODE, headers specify A function versions
// We can override the function defines here, but can't override the typedefs (typedef TEXTMETRICW TEXTMETRIC)
// A define is a hack around this, but it might fail elsewhere.
// dougt code review
#undef GetOutlineTextMetrics
#define GetOutlineTextMetrics GetOutlineTextMetricsW
#undef GetTextMetrics
#define GetTextMetrics GetTextMetricsW
#define OUTLINETEXTMETRIC OUTLINETEXTMETRICW
#define TEXTMETRIC TEXTMETRICW
#undef wsprintf
#define wsprintf wsprintfW
#endif //if 0
//still need these
#define GetCurrentDirectory GetCurrentDirectoryW
#define OpenSemaphore OpenSemaphoreW
@ -211,6 +182,9 @@ extern "C" {
MOZCE_SHUNT_API int stat(const char *inPath, struct stat * outStat);
// From stdio.cpp
MOZCE_SHUNT_API int _waccess(const wchar_t *path, int mode);
MOZCE_SHUNT_API int access(const char *path, int mode);
MOZCE_SHUNT_API void rewind(FILE* inStream);
MOZCE_SHUNT_API FILE* fdopen(int inFD, const char* inMode);
@ -307,6 +281,8 @@ extern "C" {
MOZCE_SHUNT_API void GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime);
MOZCE_SHUNT_API DWORD GetLongPathNameW(LPCWSTR lpszShortPath, LPCWSTR lpszLongPath, DWORD cchBuffer);
#define GetFullPathNameW GetFullPathName
MOZCE_SHUNT_API DWORD GetFullPathName(const char* lpFileName, DWORD nBufferLength, const char* lpBuffer, const char** lpFilePart);

Просмотреть файл

@ -93,6 +93,14 @@ _getnewfd()
}
MOZCE_SHUNT_API int _waccess(const wchar_t *path, int mode)
{
#ifdef API_LOGGING
mozce_printf("-- _waccess called\n");
#endif
return 0;
}
MOZCE_SHUNT_API int access(const char *path, int mode)

Просмотреть файл

@ -552,14 +552,14 @@ MOZCE_SHUNT_API void GetSystemTimeAsFileTime(LPFILETIME lpSystemTimeAsFileTime)
SystemTimeToFileTime(&st,lpSystemTimeAsFileTime);
}
#ifndef MIN
#define MIN(a,b) (((a)<(b)) ? (a) : (b))
MOZCE_SHUNT_API DWORD GetLongPathNameW(LPCWSTR lpszShortPath, LPCWSTR lpszLongPath, DWORD cchBuffer)
{
#ifdef API_LOGGING
mozce_printf("GetLongPathNameW called\n");
#endif
#ifndef MAX
#define MAX(a,b) (((a)>(b)) ? (a) : (b))
#endif
return 0;
}
MOZCE_SHUNT_API DWORD GetFullPathName(const char* lpFileName,
DWORD nBufferLength,