[ros-diffs] [tfaber] 64688: [FDEBUG] - Fix build

Author: tfaber
Date: Sun Oct 12 06:21:22 2014
New Revision: 64688

URL: http://svn.reactos.org/svn/reactos?rev=64688&view=rev
Log:
[FDEBUG]
- Fix build

Added:
    trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt   (with props)
Modified:
    trunk/reactos/boot/freeldr/CMakeLists.txt
    trunk/reactos/boot/freeldr/fdebug/fdebug.c
    trunk/reactos/boot/freeldr/fdebug/fdebug.rc
    trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc

Modified: trunk/reactos/boot/freeldr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/CMakeLists.txt...
==============================================================================
--- trunk/reactos/boot/freeldr/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/CMakeLists.txt	[iso-8859-1] Sun Oct 12 06:21:22 2014
@@ -1,4 +1,5 @@

add_subdirectory(bootsect)
+add_subdirectory(fdebug)
 add_subdirectory(freeldr)
 add_subdirectory(install)

Added: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/CMakeLi...
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt	(added)
+++ trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt	[iso-8859-1] Sun Oct 12 06:21:22 2014
@@ -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)

Propchange: trunk/reactos/boot/freeldr/fdebug/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug....
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.c	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.c	[iso-8859-1] Sun Oct 12 06:21:22 2014
@@ -99,7 +99,7 @@
     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 @@
         break;
     case WM_PAINT:
         hdc = BeginPaint(hWnd, &ps);
+        (void)hdc; // FIXME
         EndPaint(hWnd, &ps);
         break;
     case WM_SIZE:

Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug....
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/fdebug.rc	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc	[iso-8859-1] Sun Oct 12 06:21:22 2014
@@ -1,4 +1,5 @@
 #include <windef.h>
+#include <winuser.h>

#include "resource.h"

@@ -6,26 +7,64 @@

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

Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/ro...
==============================================================================
--- trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc	[iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc	[iso-8859-1] Sun Oct 12 06:21:22 2014
@@ -66,7 +66,7 @@
     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