luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make code compile with MINGW (preliminary)

This commit is contained in:
Holger Vogt 2020-03-04 22:45:30 +01:00
parent bcfdc806a5
commit 08a2f04e8d
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/winmain.c
View File

@ -12,6 +12,10 @@
#ifdef HAS_WINGUI #ifdef HAS_WINGUI
#ifndef _WIN32
#define _WIN32
#endif
#define STRICT // strict type checking #define STRICT // strict type checking
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> // standard Windows calls #include <windows.h> // standard Windows calls
@ -27,7 +31,10 @@
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#ifndef _MSC_VER
#include <wchar.h>
#include <stdio.h>
#endif
#include "hist_info.h" /* history management */ #include "hist_info.h" /* history management */
#include "ngspice/bool.h" /* bool defined as unsigned char */ #include "ngspice/bool.h" /* bool defined as unsigned char */
@ -107,6 +114,7 @@ static LPCWSTR hwElementClassNameW = L"ElementClass";
static LPCWSTR hwSourceWindowNameW = L"SourceDisplay"; static LPCWSTR hwSourceWindowNameW = L"SourceDisplay";
static LPCWSTR hwAnalyseWindowNameW = L"AnalyseDisplay"; static LPCWSTR hwAnalyseWindowNameW = L"AnalyseDisplay";
#endif #endif
static size_t TBufEnd = 0; /* Pointer to \0 */ static size_t TBufEnd = 0; /* Pointer to \0 */
static char TBuffer[TBufSize + 1]; /* Text buffer */ static char TBuffer[TBufSize + 1]; /* Text buffer */
static SBufLine SBuffer; /* Input buffer */ static SBufLine SBuffer; /* Input buffer */
@ -624,7 +632,7 @@ StringWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
/* for utf-8 the number of characters is not the number of bytes returned */ /* for utf-8 the number of characters is not the number of bytes returned */
GetWindowTextW(hwnd, WBuffer, sizeof SBuffer - (sizeof CRLF - 1)); GetWindowTextW(hwnd, WBuffer, sizeof SBuffer - (sizeof CRLF - 1));
WideCharToMultiByte(CP_UTF8, 0, WBuffer, WideCharToMultiByte(CP_UTF8, 0, WBuffer,
-1, SBuffer, sizeof SBuffer - 1, NULL, NULL); -1, SBuffer, sizeof SBuffer - 1, NULL, FALSE);
/* retrive here the number of bytes returned */ /* retrive here the number of bytes returned */
const int n_char_returned = (int)strlen(SBuffer); const int n_char_returned = (int)strlen(SBuffer);
tfree(WBuffer); tfree(WBuffer);
@ -961,12 +969,14 @@ MakeArgcArgv(char *cmdline, int *argc, char ***argv)
#ifdef EXT_ASC #ifdef EXT_ASC
int WINAPI int WINAPI
WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpszCmdLine, _In_ int nCmdShow) WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR lpszCmdLine, _In_ int nCmdShow)
#elif __MINGW32__ /* MINGW bug not knowing wWinMain */
int WINAPI
WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR nolpszCmdLine, _In_ int nCmdShow)
#else #else
#ifdef _MSC_VER
int WINAPI int WINAPI
wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR wlpszCmdLine, _In_ int nCmdShow) wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR wlpszCmdLine, _In_ int nCmdShow)
#else
int WINAPI // MINGW bug not knowing wWinMain
WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPSTR nolpszCmdLine, _In_ int nCmdShow)
#endif
#endif #endif
{ {
int ix, iy; /* width and height of screen */ int ix, iy; /* width and height of screen */
@ -988,11 +998,13 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
#ifndef EXT_ASC #ifndef EXT_ASC
/* convert wchar to utf-8 */ /* convert wchar to utf-8 */
#ifdef _MSC_VER
char lpszCmdLine[1024];
WideCharToMultiByte(CP_UTF8, 0, wlpszCmdLine, -1, lpszCmdLine, 1023, NULL, FALSE);
#else
/* MINGW not knowing wWinMain /* MINGW not knowing wWinMain
https://github.com/coderforlife/mingw-unicode-main/blob/master/mingw-unicode-gui.c https://github.com/coderforlife/mingw-unicode-main/blob/master/mingw-unicode-gui.c
*/ */
#ifdef __MINGW32__
NG_IGNORE(nolpszCmdLine); NG_IGNORE(nolpszCmdLine);
char lpszCmdLine[1024]; char lpszCmdLine[1024];
wchar_t *lpCmdLine = GetCommandLineW(); wchar_t *lpCmdLine = GetCommandLineW();
@ -1013,9 +1025,6 @@ wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _In_ LPWSTR
} }
} }
WideCharToMultiByte(CP_UTF8, 0, lpCmdLine, -1, lpszCmdLine, 1023, NULL, NULL); WideCharToMultiByte(CP_UTF8, 0, lpCmdLine, -1, lpszCmdLine, 1023, NULL, NULL);
#else
char lpszCmdLine[1024];
WideCharToMultiByte(CP_UTF8, 0, wlpszCmdLine, -1, lpszCmdLine, 1023, NULL, NULL);
#endif #endif
#endif #endif
/* fill global variables */ /* fill global variables */