From 9f3dee1b0347904631c1899b7a905dd746011029 Mon Sep 17 00:00:00 2001 From: "dougt%meer.net" Date: Wed, 20 Apr 2005 23:06:46 +0000 Subject: [PATCH] Defaulting SetCurrentDirectory to ASCII. Windows CE only. NOT PART OF DEFAULT BUILD --- build/wince/shunt/include/mozce_shunt.h | 13 ++++++++++++- build/wince/shunt/win32.cpp | 11 +++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/build/wince/shunt/include/mozce_shunt.h b/build/wince/shunt/include/mozce_shunt.h index b721b4babf22..75b2030c0ad3 100755 --- a/build/wince/shunt/include/mozce_shunt.h +++ b/build/wince/shunt/include/mozce_shunt.h @@ -423,11 +423,17 @@ #endif #define GetCurrentProcess mozce_GetCurrentProcess +#ifdef GetCurrentProcessId +#undef GetCurrentProcessId +#endif +#define GetCurrentProcessId mozce_GetCurrentProcessId + #ifdef GetCurrentThreadId #undef GetCurrentThreadId #endif #define GetCurrentThreadId mozce_GetCurrentThreadId + #ifdef GetDIBits #undef GetDIBits #endif @@ -644,7 +650,6 @@ #define _OleSetClipboard mozce_OleSetClipboard - // From win32a.cpp #ifdef CopyFileA @@ -992,6 +997,11 @@ #endif #define SetCurrentDirectoryA mozce_SetCurrentDirectoryA +#ifdef SetCurrentDirectory +#undef SetCurrentDirectory +#endif +#define SetCurrentDirectory mozce_SetCurrentDirectoryA + #ifdef SetDlgItemTextA #undef SetDlgItemTextA #endif @@ -1271,6 +1281,7 @@ extern "C" { MOZCE_SHUNT_API UINT mozce_GetACP(void); MOZCE_SHUNT_API HANDLE mozce_GetCurrentProcess(void); + MOZCE_SHUNT_API HANDLE mozce_GetCurrentProcessId(void); MOZCE_SHUNT_API DWORD mozce_TlsAlloc(void); MOZCE_SHUNT_API BOOL mozce_TlsFree(DWORD dwTlsIndex); MOZCE_SHUNT_API DWORD GetCurrentThreadId(void); diff --git a/build/wince/shunt/win32.cpp b/build/wince/shunt/win32.cpp index 84262dae5407..7308a90c8566 100755 --- a/build/wince/shunt/win32.cpp +++ b/build/wince/shunt/win32.cpp @@ -1032,6 +1032,17 @@ MOZCE_SHUNT_API DWORD mozce_GetCurrentThreadId(void) return GetCurrentThreadId(); } + +MOZCE_SHUNT_API DWORD mozce_GetCurrentProcessId(void) +{ + MOZCE_PRECHECK + +#ifdef DEBUG + mozce_printf("mozce_GetCurrentProcessId called\n"); +#endif + return GetCurrentProcessId(); +} + MOZCE_SHUNT_API DWORD mozce_TlsAlloc(void) { MOZCE_PRECHECK