X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/linexec-j720/blobdiff_plain/77a37381836de85306ad128def744d879c38f95a..2f5dc0a0a12a2ca01ad0a7ae1620703324379c4d:/tester1.cpp

diff --git a/tester1.cpp b/tester1.cpp
index fe629ba..25571b5 100644
--- a/tester1.cpp
+++ b/tester1.cpp
@@ -22,7 +22,7 @@ LRESULT CALLBACK	WndProc			(HWND, UINT, WPARAM, LPARAM);
 LRESULT CALLBACK	About			(HWND, UINT, WPARAM, LPARAM);
 HWND				CreateRpCommandBar(HWND);
 
-
+
 #pragma warning(disable: 4100 4710 4189; error: 4701)
 /* who cares?! 
 	4100: whining about parameters not being used.
@@ -30,7 +30,7 @@ HWND				CreateRpCommandBar(HWND);
 	4189: initialized but not used. make that an error: later.
 	4701: usage w/o initialization.
 	*/
-
+
 int WINAPI WinMain(	HINSTANCE hInstance,
 					HINSTANCE hPrevInstance,
 					LPTSTR    lpCmdLine,
@@ -87,42 +87,42 @@ ATOM MyRegisterClass(HINSTANCE hInstance, LPTSTR szWindowClass)
 
 	return RegisterClass(&wc);
 }
-
-HANDLE OpenCOM1() {
-
-	static HANDLE COM1handle = INVALID_HANDLE_VALUE;
-	const char msg[] = "\r\n--------linexec--------\r\n";
-	unsigned long wrote;
-	int speed = CBR_115200;
-	HANDLE h;
-
-	if (COM1handle != INVALID_HANDLE_VALUE)
-		return (COM1handle);
-
-	h = CreateFile(TEXT("COM1:"),
-	    GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0,
-	    NULL);
-	if (h == INVALID_HANDLE_VALUE)
-		return (h);
-
-	DCB dcb;
-	if (!GetCommState(h, &dcb))
-		goto bad;
-
-	dcb.BaudRate = speed;
-	if (!SetCommState(h, &dcb))
-		goto bad;
-
-	// Print banner on serial console.
-	WriteFile(h, msg, sizeof msg, &wrote, 0);
-
-	COM1handle = h;
-
-	return (h);
- bad:
-	CloseHandle(h);
-	return (INVALID_HANDLE_VALUE);
-}
+
+HANDLE OpenCOM1() {
+
+	static HANDLE COM1handle = INVALID_HANDLE_VALUE;
+	const char msg[] = "\r\n--------linexec--------\r\n";
+	unsigned long wrote;
+	int speed = CBR_115200;
+	HANDLE h;
+
+	if (COM1handle != INVALID_HANDLE_VALUE)
+		return (COM1handle);
+
+	h = CreateFile(TEXT("COM1:"),
+	    GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0,
+	    NULL);
+	if (h == INVALID_HANDLE_VALUE)
+		return (h);
+
+	DCB dcb;
+	if (!GetCommState(h, &dcb))
+		goto bad;
+
+	dcb.BaudRate = speed;
+	if (!SetCommState(h, &dcb))
+		goto bad;
+
+	// Print banner on serial console.
+	WriteFile(h, msg, sizeof msg, &wrote, 0);
+
+	COM1handle = h;
+
+	return (h);
+ bad:
+	CloseHandle(h);
+	return (INVALID_HANDLE_VALUE);
+}
 
 //
 //  FUNCTION: InitInstance(HANDLE, int)
@@ -137,15 +137,15 @@ HANDLE OpenCOM1() {
 
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
-	HWND	hWnd = NULL;
-	TCHAR	szTitle[MAX_LOADSTRING];			// The title bar text
+	HWND	hWnd = NULL;
+	TCHAR	szTitle[MAX_LOADSTRING];			// The title bar text
 	TCHAR	szWindowClass[MAX_LOADSTRING];		// The window class name
-
-	hInst = hInstance;		// Store instance handle in our global variable
-	// Initialize global string
-	LoadString(hInstance, IDC_TESTER1, szWindowClass, MAX_LOADSTRING);
+
+	hInst = hInstance;		// Store instance handle in our global variable
+	// Initialize global string
+	LoadString(hInstance, IDC_TESTER1, szWindowClass, MAX_LOADSTRING);
 	LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
-
+
 	//If it is already running, then focus on the window
 	hWnd = FindWindow(szWindowClass, szTitle);	
 	if (hWnd) 
@@ -158,11 +158,14 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 	
 	RECT	rect;
 	GetClientRect(hWnd, &rect);
-
+
 	OpenCOM1();
 	load_boot("\\My Documents\\params.txt");
 	load_boot("\\Storage Card\\params.txt");
-	load_boot("\\ÒÓØ ¶°ÄÞ\\params.txt");
+	load_boot("\\Speicherkarte\\params.txt");
+	load_boot("\\Carte de stockage\\params.txt");
+	load_boot("\\Mes documents\\params.txt");
+	load_boot("\\ÒÓØ ¶°ÄÞ\\params.txt");
 
 	hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE,
 		CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, hInstance, NULL);
@@ -203,187 +206,187 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 //
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
-
+
 	HDC hdc;
-
+
 	int wmId, wmEvent;
-
+
 	PAINTSTRUCT ps;
-
+
 	TCHAR szHello[MAX_LOADSTRING];
-
 
-
+
+
 	switch (message) 
-
+
 	{
-
+
 		case WM_COMMAND:
-
+
 			wmId    = LOWORD(wParam); 
-
+
 			wmEvent = HIWORD(wParam); 
-
+
 			// Parse the menu selections:
-
+
 			switch (wmId)
-
+
 			{	
-
+
 				case IDM_HELP_ABOUT:
-
+
 					DialogBox(hInst, (LPCTSTR)IDD_ABOUTBOX, hWnd, (DLGPROC)About);
-
+
 				    break;
-
+
 				case IDOK:
-
+
 					SendMessage(hWnd, WM_ACTIVATE, MAKEWPARAM(WA_INACTIVE, 0), (LPARAM)hWnd);
-
+
 					SendMessage (hWnd, WM_CLOSE, 0, 0);
-
+
 					break;
-
+
 				default:
-
+
 				   return DefWindowProc(hWnd, message, wParam, lParam);
-
+
 			}
-
+
 			break;
-
+
 		case WM_CREATE:
-
+
 			hwndCB = CreateRpCommandBar(hWnd);
-
+
 			break;
-
+
 		case WM_PAINT:
-
+
 			RECT rt;
-
+
 			hdc = BeginPaint(hWnd, &ps);
-
+
 			GetClientRect(hWnd, &rt);
-
+
 			LoadString(hInst, IDS_HELLO, szHello, MAX_LOADSTRING);
-
+
 			DrawText(hdc, szHello, _tcslen(szHello), &rt, 
-
+
 				DT_SINGLELINE | DT_VCENTER | DT_CENTER);
-
+
 			EndPaint(hWnd, &ps);
-
+
 			break; 
-
+
 		case WM_DESTROY:
-
+
 			CommandBar_Destroy(hwndCB);
-
+
 			PostQuitMessage(0);
-
+
 			break;
-
+
 		case WM_SETTINGCHANGE:
-
+
 //			SHHandleWMSettingChange(hWnd, wParam, lParam, &s_sai);
-
+
      		break;
-
+
 		default:
-
+
 			return DefWindowProc(hWnd, message, wParam, lParam);
-
+
    }
-
+
    return 0;
-
+
 }
-
 
-
+
+
 HWND CreateRpCommandBar(HWND hwnd)
-
+
 {
-/*
+/*
 	SHMENUBARINFO mbi;
-
 
-
+
+
 	memset(&mbi, 0, sizeof(SHMENUBARINFO));
-
+
 	mbi.cbSize     = sizeof(SHMENUBARINFO);
-
+
 	mbi.hwndParent = hwnd;
-
+
 	mbi.nToolBarId = IDM_MENU;
-
+
 	mbi.hInstRes   = hInst;
-
+
 	mbi.nBmpId     = 0;
-
+
 	mbi.cBmpImages = 0;
-
 
-
+
+
 	if (!SHCreateMenuBar(&mbi)) 
-
+
 		return NULL;
-
 
-
+
+
 	return mbi.hwndMB;
-*/
-	return NULL;
+*/
+	return NULL;
 }
-
 
-
+
+
 // Mesage handler for the About box.
-
+
 LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
-
+
 {
-
+
 //	SHINITDLGINFO shidi;
-
 
-
+
+
 	switch (message)
-
+
 	{
-
+
 		case WM_INITDIALOG:
-
+
 			// Create a Done button and size it.  
-
+
 //			shidi.dwMask = SHIDIM_FLAGS;
-
+
 //			 shidi.dwFlags = SHIDIF_DONEBUTTON | SHIDIF_SIPDOWN | SHIDIF_SIZEDLGFULLSCREEN;
-
+
 //			shidi.hDlg = hDlg;
-
+
 //			SHInitDialog(&shidi);
-
+
 			return TRUE; 
-
 
-
+
+
 		case WM_COMMAND:
-
+
 			if (LOWORD(wParam) == IDOK) {
-
+
 				EndDialog(hDlg, LOWORD(wParam));
-
+
 				return TRUE;
-
+
 			}
-
+
 			break;
-
+
 	}
-
+
     return FALSE;
-
+
 }
-
+