| version 1.15, 2004/04/05 09:45:07 | version 1.18, 2004/06/20 04:32:18 | 
| Line 51  static const TCHAR szClassName[] = STRLI | Line 51  static const TCHAR szClassName[] = STRLI | 
 | HWND            hWndMain; | HWND            hWndMain; | 
 | HINSTANCE       hInst; | HINSTANCE       hInst; | 
 | HINSTANCE       hPrev; | HINSTANCE       hPrev; | 
| char            modulefile[MAX_PATH]; | OEMCHAR         modulefile[MAX_PATH]; | 
 | GXKeyList       gx_keylist; | GXKeyList       gx_keylist; | 
 |  |  | 
 | enum { | enum { | 
| Line 316  static void processwait(UINT cnt) { | Line 316  static void processwait(UINT cnt) { | 
 |  |  | 
 | // ---- | // ---- | 
 |  |  | 
| #if !defined(UNICODE) | #if defined(UNICODE) && defined(OSLANG_SJIS) | 
| #define GetModuleFileName_A(a, b, c)    GetModuleFileName(a, b, c) | static DWORD _GetModuleFileName(HMODULE hModule, | 
| #else | OEMCHAR *lpFileName, DWORD nSize) { | 
| static DWORD GetModuleFileName_A(HMODULE hModule, |  | 
| LPSTR lpFileName, DWORD nSize) { |  | 
 |  |  | 
| TCHAR   *FileNameW; | UINT16  ucs2[MAX_PATH]; | 
| DWORD   len; |  | 
 |  |  | 
| if (nSize) { | GetModuleFileName(hModule, ucs2, NELEMENTS(ucs2)); | 
| FileNameW = (TCHAR *)_MALLOC(nSize * sizeof(TCHAR), "ModuleFile"); | nSize = WideCharToMultiByte(CP_ACP, 0, ucs2, -1, | 
| if (FileNameW) { |  | 
| len = GetModuleFileName(hModule, FileNameW, nSize); |  | 
| nSize = WideCharToMultiByte(CP_ACP, 0, FileNameW, -1, |  | 
 | lpFileName, nSize, NULL, NULL); | lpFileName, nSize, NULL, NULL); | 
| if (nSize) { | if (nSize) { | 
| nSize--; | nSize--; | 
| } |  | 
| _MFREE(FileNameW); |  | 
| } |  | 
| else { |  | 
| nSize = 0; |  | 
| } |  | 
 | } | } | 
 | return(nSize); | return(nSize); | 
 | } | } | 
 |  | #elif defined(OSLANG_UTF8) | 
 |  | static DWORD _GetModuleFileName(HMODULE hModule, | 
 |  | OEMCHAR *lpFileName, DWORD nSize) { | 
 |  |  | 
 |  | UINT16  ucs2[MAX_PATH]; | 
 |  |  | 
 |  | GetModuleFileName(hModule, ucs2, NELEMENTS(ucs2)); | 
 |  | nSize = ucscnv_ucs2toutf8(lpFileName, nSize, ucs2, (UINT)-1); | 
 |  | if (nSize) { | 
 |  | nSize--; | 
 |  | } | 
 |  | return(nSize); | 
 |  | } | 
 |  | #else | 
 |  | #define _GetModuleFileName(a, b, c)             GetModuleFileName(a, b, c) | 
 | #endif | #endif | 
 |  |  | 
 | int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, |  | 
 | LPTSTR lpszCmdLine, int nCmdShow) { |  | 
 |  |  | 
 |  | #if defined(_WIN32_WCE) | 
 |  | int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, | 
 |  | LPWSTR lpszCmdLine, int nCmdShow) | 
 |  | #elif defined(UNICODE) | 
 |  | int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPreInst, | 
 |  | LPSTR lpszCmdLine, int nCmdShow) | 
 |  | #else | 
 |  | int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPreInst, | 
 |  | LPSTR lpszCmdLine, int nCmdShow) | 
 |  | #endif | 
 |  | { | 
 | HWND            hWnd; | HWND            hWnd; | 
 | WNDCLASS        np2; | WNDCLASS        np2; | 
 | int                     id; | int                     id; | 
| Line 364  int WINAPI WinMain(HINSTANCE hInstance, | Line 376  int WINAPI WinMain(HINSTANCE hInstance, | 
 | return(0); | return(0); | 
 | } | } | 
 |  |  | 
| GetModuleFileName_A(NULL, modulefile, sizeof(modulefile)); | _GetModuleFileName(NULL, modulefile, sizeof(modulefile)); | 
 | dosio_init(); | dosio_init(); | 
 | file_setcd(modulefile); | file_setcd(modulefile); | 
 | initload(); | initload(); |