[FDEBUG]

- Fix build

svn path=/trunk/; revision=64688

diff --git a/reactos/boot/freeldr/CMakeLists.txt b/reactos/boot/freeldr/CMakeLists.txt
index 7c60d8e..9069134 100644 (file)
--- a/reactos/boot/freeldr/CMakeLists.txt
+++ b/reactos/boot/freeldr/CMakeLists.txt
@@ -1,4 +1,5 @@
 
 add_subdirectory(bootsect)
+add_subdirectory(fdebug)
 add_subdirectory(freeldr)
 add_subdirectory(install)

diff --git a/reactos/boot/freeldr/fdebug/CMakeLists.txt b/reactos/boot/freeldr/fdebug/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6fed628
--- /dev/null
+++ b/reactos/boot/freeldr/fdebug/CMakeLists.txt
@@ -0,0 +1,4 @@
+
+add_executable(fdebug fdebug.c rs232.c fdebug.rc)
+set_module_type(fdebug win32gui UNICODE)
+add_importlibs(fdebug comdlg32 user32 gdi32 msvcrt kernel32)

diff --git a/reactos/boot/freeldr/fdebug/fdebug.c b/reactos/boot/freeldr/fdebug/fdebug.c
index 34ae5ae..9bd764d 100644 (file)
--- a/reactos/boot/freeldr/fdebug/fdebug.c
+++ b/reactos/boot/freeldr/fdebug/fdebug.c
@@ -99,7 +99,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
     wcex.cbSize = sizeof(WNDCLASSEX);
 
     wcex.style            = CS_HREDRAW | CS_VREDRAW;
-    wcex.lpfnWndProc    = (WNDPROC)WndProc;
+    wcex.lpfnWndProc    = WndProc;
     wcex.cbClsExtra        = 0;
     wcex.cbWndExtra        = 0;
     wcex.hInstance        = hInstance;
@@ -283,6 +283,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         break;
     case WM_PAINT:
         hdc = BeginPaint(hWnd, &ps);
+        (void)hdc; // FIXME
         EndPaint(hWnd, &ps);
         break;
     case WM_SIZE:

diff --git a/reactos/boot/freeldr/fdebug/fdebug.rc b/reactos/boot/freeldr/fdebug/fdebug.rc
index 7ed5768..0b38b11 100644 (file)
--- a/reactos/boot/freeldr/fdebug/fdebug.rc
+++ b/reactos/boot/freeldr/fdebug/fdebug.rc
@@ -1,4 +1,5 @@
 #include <windef.h>
+#include <winuser.h>
 
 #include "resource.h"
 
@@ -6,26 +7,64 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 IDI_FDEBUG ICON "fdebug.ico"
 
-#include "lang/bg-BG.rc"
-#include "lang/cs-CZ.rc"
-#include "lang/de-DE.rc"
-#include "lang/el-GR.rc"
-#include "lang/en-US.rc"
-#include "lang/es-ES.rc"
-#include "lang/fr-FR.rc"
-#include "lang/hu-HU.rc"
-#include "lang/id-ID.rc"
-#include "lang/it-IT.rc"
-#include "lang/ja-JP.rc"
-#include "lang/no-NO.rc"
-#include "lang/sk-SK.rc"
+#ifdef LANGUAGE_BG_BG
+    #include "lang/bg-BG.rc"
+#endif
+#ifdef LANGUAGE_CS_CZ
+    #include "lang/cs-CZ.rc"
+#endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EL_GR
+    #include "lang/el-GR.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_HU_HU
+    #include "lang/hu-HU.rc"
+#endif
+#ifdef LANGUAGE_ID_ID
+    #include "lang/id-ID.rc"
+#endif
+#ifdef LANGUAGE_IT_IT
+    #include "lang/it-IT.rc"
+#endif
+#ifdef LANGUAGE_JA_JP
+    #include "lang/ja-JP.rc"
+#endif
+#ifdef LANGUAGE_NB_NO
+    #include "lang/no-NO.rc"
+#endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
 
 /* UTF-8 */
 #pragma code_page(65001)
 
-#include "lang/pl-PL.rc"
-#include "lang/ro-RO.rc"
-#include "lang/ru-RU.rc"
-#include "lang/sq-AL.rc"
-#include "lang/tr-TR.rc"
-#include "lang/uk-UA.rc"
+#ifdef LANGUAGE_PL_PL
+    #include "lang/pl-PL.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_SQ_AL
+    #include "lang/sq-AL.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
+#endif

diff --git a/reactos/boot/freeldr/fdebug/lang/ro-RO.rc b/reactos/boot/freeldr/fdebug/lang/ro-RO.rc
index 61e2e2c..c433626 100644 (file)
--- a/reactos/boot/freeldr/fdebug/lang/ro-RO.rc
+++ b/reactos/boot/freeldr/fdebug/lang/ro-RO.rc
@@ -66,7 +66,7 @@ BEGIN
     LTEXT "Numele fișierului:", IDC_STATIC, 7, 17, 62, 8
     EDITTEXT IDC_CAPTUREFILENAME, 7, 26, 181, 14, ES_AUTOHSCROLL
     PUSHBUTTON "&Caută", IDC_BROWSE, 194, 26, 50, 14
-    DEFPUSHBUTTON "Con&firmă", 139, 74, 50, 14
+    DEFPUSHBUTTON "Con&firmă", IDOK, 139, 74, 50, 14
     PUSHBUTTON "A&nulează", IDCANCEL, 194, 74, 50, 14
 END