Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fix build issues reported by some users

Browse source 
- move definition into root resource file
- fix msvc warnings

svn path=/trunk/; revision=22387
This commit is contained in:
Ged Murphy 2006-06-17 19:21:25 +00:00
parent 5a05448343
commit 9f9c084af1
13 changed files with 25 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/boot/freeldr/fdebug/.cvsignore
View file

@ -1 +0,0 @@
*.res

9
reactos/boot/freeldr/fdebug/De.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/En.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/Hu.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/Ja.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
#pragma code_page(932)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/No.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/Pl.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL
#pragma code_page(1250)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

9
reactos/boot/freeldr/fdebug/Tr.rc
View file

@ -7,15 +7,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_FDEBUG ICON "fdebug.ico"
/////////////////////////////////////////////////////////////////////////////
//
// Menu

24
reactos/boot/freeldr/fdebug/fdebug.c
View file

@ -51,6 +51,9 @@ int APIENTRY WinMain(HINSTANCE hInstance,
MSG msg;
HACCEL hAccelTable;
UNREFERENCED_PARAMETER(lpCmdLine);
UNREFERENCED_PARAMETER(hPrevInstance);
// Initialize global strings
LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
LoadString(hInstance, IDC_FDEBUG, szWindowClass, MAX_LOADSTRING);
@ -74,7 +77,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
}
}
return msg.wParam;
return (int)msg.wParam;
}
@ -103,12 +106,17 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
wcex.cbClsExtra = 0;
wcex.cbWndExtra = 0;
wcex.hInstance = hInstance;
wcex.hIcon = LoadIcon(hInstance, (LPCTSTR)IDI_FDEBUG);
wcex.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_FDEBUG));
wcex.hCursor = LoadCursor(NULL, IDC_ARROW);
wcex.hbrBackground = NULL;//(HBRUSH)(COLOR_WINDOW+1);
wcex.lpszMenuName = (LPCTSTR)IDC_FDEBUG;
wcex.lpszMenuName = MAKEINTRESOURCE(IDC_FDEBUG);
wcex.lpszClassName = szWindowClass;
wcex.hIconSm = LoadIcon(wcex.hInstance, (LPCTSTR)IDI_SMALL);
wcex.hIconSm = (HICON)LoadImage(hInstance,
MAKEINTRESOURCE(IDI_FDEBUG),
IMAGE_ICON,
16,
16,
LR_SHARED);
return RegisterClassEx(&wcex);
}
@ -299,6 +307,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
HWND hLicenseEditWnd;
TCHAR strLicense[0x1000];
UNREFERENCED_PARAMETER(lParam);
switch (message)
{
case WM_INITDIALOG:
@ -324,6 +334,8 @@ LRESULT CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
UNREFERENCED_PARAMETER(lParam);
switch (message)
{
case WM_INITDIALOG:
@ -354,6 +366,8 @@ LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARA
{
OPENFILENAME ofn;
UNREFERENCED_PARAMETER(lParam);
switch (message)
{
case WM_INITDIALOG:
@ -499,6 +513,8 @@ VOID Rs232Thread(VOID* Parameter)
MSG msg;
DWORD dwNumberOfBytesWritten;
UNREFERENCED_PARAMETER(Parameter);
dwThreadId = GetCurrentThreadId();
if (!Rs232OpenPortWin32(strComPort))

BIN
reactos/boot/freeldr/fdebug/fdebug.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

4
reactos/boot/freeldr/fdebug/fdebug.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe" allowwarnings="true">
<include base="ReactOS">.</include>
<module name="freeldr_fdebug" type="win32gui" installbase="system32" installname="fdebug.exe">
<include base="freeldr_fdebug">.</include>
<define name="UNICODE" />
<define name="_UNICODE" />
<define name="__REACTOS__" />

16
reactos/boot/freeldr/fdebug/fdebug.rc
View file

@ -1,19 +1,9 @@
//Microsoft Developer Studio generated resource script.
//
#include <windows.h>
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
#include "resource.h"
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
IDI_FDEBUG ICON "fdebug.ico"
#include "En.rc"
#include "De.rc"

1
reactos/boot/freeldr/fdebug/resource.h
View file

@ -10,7 +10,6 @@
#define IDM_EXIT 105
#define IDS_HELLO 106
#define IDI_FDEBUG 107
#define IDI_SMALL 108
#define IDC_FDEBUG 109
#define IDR_MAINFRAME 128
#define IDD_CONNECTION 130