[ros-diffs] [gedmurphy] 22387: - fix build issues reported by some users - move definition into root resource file - fix msvc warnings
gedmurphy at svn.reactos.org
gedmurphy at svn.reactos.org
Sat Jun 17 21:21:26 CEST 2006
Author: gedmurphy
Date: Sat Jun 17 23:21:25 2006
New Revision: 22387
URL: http://svn.reactos.ru/svn/reactos?rev=22387&view=rev
Log:
- fix build issues reported by some users
- move definition into root resource file
- fix msvc warnings
Removed:
trunk/reactos/boot/freeldr/fdebug/.cvsignore
Modified:
trunk/reactos/boot/freeldr/fdebug/De.rc
trunk/reactos/boot/freeldr/fdebug/En.rc
trunk/reactos/boot/freeldr/fdebug/Hu.rc
trunk/reactos/boot/freeldr/fdebug/Ja.rc
trunk/reactos/boot/freeldr/fdebug/No.rc
trunk/reactos/boot/freeldr/fdebug/Pl.rc
trunk/reactos/boot/freeldr/fdebug/Tr.rc
trunk/reactos/boot/freeldr/fdebug/fdebug.c
trunk/reactos/boot/freeldr/fdebug/fdebug.ico
trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild
trunk/reactos/boot/freeldr/fdebug/fdebug.rc
trunk/reactos/boot/freeldr/fdebug/resource.h
Removed: trunk/reactos/boot/freeldr/fdebug/.cvsignore
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/.cvsignore?rev=22386&view=auto
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/.cvsignore (original)
+++ trunk/reactos/boot/freeldr/fdebug/.cvsignore (removed)
@@ -1,1 +1,0 @@
-*.res
Modified: trunk/reactos/boot/freeldr/fdebug/De.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/De.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/De.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/De.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/En.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/En.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/En.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/En.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/Hu.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Hu.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Hu.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Hu.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/Ja.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Ja.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Ja.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Ja.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/No.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/No.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/No.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/No.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/Pl.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Pl.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Pl.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Pl.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/Tr.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/Tr.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/Tr.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/Tr.rc Sat Jun 17 23:21:25 2006
@@ -6,15 +6,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"
/////////////////////////////////////////////////////////////////////////////
//
Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.c?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.c (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.c Sat Jun 17 23:21:25 2006
@@ -51,6 +51,9 @@
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 @@
}
}
- return msg.wParam;
+ return (int)msg.wParam;
}
@@ -103,12 +106,17 @@
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 @@
HWND hLicenseEditWnd;
TCHAR strLicense[0x1000];
+ UNREFERENCED_PARAMETER(lParam);
+
switch (message)
{
case WM_INITDIALOG:
@@ -324,6 +334,8 @@
LRESULT CALLBACK ConnectionDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
+ UNREFERENCED_PARAMETER(lParam);
+
switch (message)
{
case WM_INITDIALOG:
@@ -353,6 +365,8 @@
LRESULT CALLBACK CaptureDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
{
OPENFILENAME ofn;
+
+ UNREFERENCED_PARAMETER(lParam);
switch (message)
{
@@ -499,6 +513,8 @@
MSG msg;
DWORD dwNumberOfBytesWritten;
+ UNREFERENCED_PARAMETER(Parameter);
+
dwThreadId = GetCurrentThreadId();
if (!Rs232OpenPortWin32(strComPort))
Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.ico
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.ico?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
Binary files - no diff available.
Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.rbuild Sat Jun 17 23:21:25 2006
@@ -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__" />
Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug.rc?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.rc (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc Sat Jun 17 23:21:25 2006
@@ -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"
Modified: trunk/reactos/boot/freeldr/fdebug/resource.h
URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/boot/freeldr/fdebug/resource.h?rev=22387&r1=22386&r2=22387&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/resource.h (original)
+++ trunk/reactos/boot/freeldr/fdebug/resource.h Sat Jun 17 23:21:25 2006
@@ -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
More information about the Ros-diffs
mailing list