Merge with trunk

svn path=/branches/vs_jc/; revision=59263

README

@@ -27,3 +27,6 @@ See the media\doc subdirectory for some sparse notes.
 4. Who is responsible
 
 See the CREDITS file.
+
+
+Hey, JC is just added some text to this file!!!

base/applications/CMakeLists.txt

@@ -36,4 +36,4 @@ add_subdirectory(taskmgr)
 add_subdirectory(winhlp32)
 add_subdirectory(winver)
 add_subdirectory(wordpad)
-add_subdirectory(write)
+add_subdirectory(write)

base/applications/atactl/atactl.cpp

@@ -1,9 +1,6 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
+#include <windows.h>
 #include <winioctl.h>
-#include <stdlib.h>
+#include <stdio.h>
 //#include <ntdddisk.h>
 //#include <ntddscsi.h>
 #include <ntddscsi.h>
@@ -337,7 +334,7 @@ ata_send_scsi(
 {
     ULONG status;
     PSCSI_PASS_THROUGH_WITH_BUFFERS sptwb;
-    //ULONG data_len = BufferLength;
+    ULONG data_len = BufferLength;
     ULONG len;
 
     len = BufferLength + offsetof(SCSI_PASS_THROUGH_WITH_BUFFERS, ucDataBuf);
@@ -1065,7 +1062,7 @@ ata_list(
 {
     char dev_name[64];
     HANDLE h;
-    //BOOLEAN uniata_driven;
+    BOOLEAN uniata_driven;
 
     if(bus_id == -1) {
         for(bus_id=0; TRUE; bus_id++) {
@@ -1074,7 +1071,7 @@ ata_list(
         }
         return TRUE;
     }
-    /*uniata_driven =*/ ata_adapter_info(bus_id, g_adapter_info);
+    uniata_driven = ata_adapter_info(bus_id, g_adapter_info);
     sprintf(dev_name, "\\\\.\\Scsi%d:", bus_id);
     h = ata_open_dev(dev_name);
     if(!h)
@@ -1230,13 +1227,8 @@ ata_hide(
                             &to, sizeof(to),
                             NULL, 0,
                             &returned);
-    if(!status) {
-        printf("Delete failed\n");
-    } else {
-        printf("Device is detached\n");
-    }
     ata_close_dev(h);
-    return status ? TRUE : FALSE;
+    return TRUE;
 } // end ata_hide()
 
 BOOLEAN
@@ -1294,7 +1286,7 @@ ata_scan(
                                  FALSE);
     }
     ata_close_dev(h);
-    return status ? TRUE : FALSE;
+    return TRUE;
 } // end ata_scan()
 
 CHAR*
@@ -1661,7 +1653,7 @@ ata_power_mode(
                             NULL, 0, FALSE,
                             &senseData, &returned);
     ata_close_dev(h);
-    return status ? TRUE : FALSE;
+    return TRUE;
 } // end ata_power_mode()
 
 int

base/applications/cacls/cacls.c

@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 static GENERIC_MAPPING FileGenericMapping =
 {

base/applications/cacls/cacls.rc

@@ -1,4 +1,4 @@
-#include <windef.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Control ACLs Program\0"

base/applications/cacls/lang/ja-JP.rc

@@ -3,7 +3,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 STRINGTABLE DISCARDABLE
 BEGIN
 
-IDS_HELP, "ファイルのアクセス制御リスト(ACL) を表示または変更します。\n\n\
+IDS_HELP, "ファイルのアクセス制御リスト(ACL) を表 示または変更します。n\n\
 CACLS ファイル名 [/T] [/E] [/C] [/G ユーザー名:アクセス権]\n\
                  [/R ユーザー名 [...]] [/P ユーザー名:アクセス権 [...]]\n\
                  [/D ユーザー名 [...]]\n\

base/applications/cacls/precomp.h

@@ -1,13 +1,10 @@
 #ifndef _CACLS_PRECOMP_H
 #define _CACLS_PRECOMP_H
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
+#include <windows.h>
 #include <sddl.h>
 #include <tchar.h>
-
+#include <stdio.h>
 #include "resource.h"
 
 #endif /* _CACLS_PRECOMP_H */

base/applications/calc/calc.h

@@ -1,12 +1,8 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <winreg.h>
+
+#include <windows.h>
 #include <tchar.h>
-//#include <stdio.h>
-//#include <string.h>
+#include <stdio.h>
+#include <string.h>
 #include <math.h>
 #include <float.h>
 #include <malloc.h>

base/applications/calc/lang/el-GR.rc

@@ -444,7 +444,7 @@ BEGIN
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Συνάλλαγμα"
     IDS_CONV_ENERGY         "Ενέργεια"
-    IDS_CONV_LENGTH         "Lengths"
+    IDS_CONV_LENGTH         "Lenghts"
     IDS_CONV_POWER          "Δύναμη"
     IDS_CONV_PRESSURE       "Πίεση"
     IDS_CONV_TEMPERATURE    "Θερμοκρασία"

base/applications/calc/lang/ko-KR.rc

@@ -448,7 +448,7 @@ BEGIN
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Currencies"
     IDS_CONV_ENERGY         "Energy"
-    IDS_CONV_LENGTH         "Lengths"
+    IDS_CONV_LENGTH         "Lenghts"
     IDS_CONV_POWER          "Power"
     IDS_CONV_PRESSURE       "Pressure"
     IDS_CONV_TEMPERATURE    "Temperature"

base/applications/calc/lang/th-TH.rc

@@ -449,7 +449,7 @@ BEGIN
     IDS_CONV_CONSUMPTION    "Consumption (engines)"
     IDS_CONV_CURRENCY       "Currencies"
     IDS_CONV_ENERGY         "Energy"
-    IDS_CONV_LENGTH         "Lengths"
+    IDS_CONV_LENGTH         "Lenghts"
     IDS_CONV_POWER          "Power"
     IDS_CONV_PRESSURE       "Pressure"
     IDS_CONV_TEMPERATURE    "Temperature"

base/applications/calc/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDS_STRING_LICENSE              1
 #define IDS_MATH_ERROR                  2
 #define IDS_QUICKHELP                   3
@@ -378,3 +376,4 @@
 #define IDM_VIEW_BYTE                   40018
 #define IDM_VIEW_DWORD                  40019
 #define IDM_VIEW_CONVERSION             40020
+

base/applications/calc/resource.rc

@@ -18,8 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <windef.h>
-#include <winuser.h>
+#include <windows.h>
 
 #include "resource.h"
 
@@ -67,9 +66,6 @@ IDB_BITMAP_ROS          BITMAP  DISCARDABLE     "res/ROS_logo.bmp"
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_HU_HU
     #include "lang/hu-HU.rc"
 #endif

base/applications/calc/winmain.c

@@ -229,12 +229,12 @@ static void load_config(void)
 
     /* Try to load last selected layout */
     GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1)
+    if (_stscanf(buf, TEXT("%ld"), &calc.layout) != 1)
         calc.layout = CALC_LAYOUT_STANDARD;
 
     /* Try to load last selected formatting option */
     GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%lu"), &tmp) != 1)
+    if (_stscanf(buf, TEXT("%ld"), &tmp) != 1)
         calc.usesep = FALSE;
     else
         calc.usesep = (tmp == 1) ? TRUE : FALSE;

base/applications/charmap/charmap.rc

@@ -1,8 +1,6 @@
-#include <windef.h>
-#include <winuser.h>
-//#include <commctrl.h>
+#include <windows.h>
+#include <commctrl.h>
 #include <richedit.h>
-
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

base/applications/charmap/precomp.h

@@ -1,19 +1,14 @@
 #ifndef __CHARMAP_PRECOMP_H
 #define __CHARMAP_PRECOMP_H
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <wingdi.h>
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <windowsx.h>
 #include <tchar.h>
-//#include <stdio.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <commctrl.h>
 #include <richedit.h>
-
 #include "resource.h"
 
 #define SIZEOF(_v)  (sizeof(_v) / sizeof(*_v))

base/applications/charmap/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDC_STATIC          -1
 
 #define IDI_ICON            100

base/applications/charmap/rsrc.rc

@@ -24,9 +24,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_ID_ID
     #include "lang/id-ID.rc"
 #endif

base/applications/cmdutils/CMakeLists.txt

@@ -5,5 +5,4 @@ add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(more)
 add_subdirectory(reg)
-add_subdirectory(taskkill)
 add_subdirectory(xcopy)

base/applications/cmdutils/dbgprint/dbgprint.c

@@ -1,4 +1,5 @@
-/*
+/* $Id: dbgprint.c 24720 2006-11-11 16:07:35Z janderwald $
+ *
  * PROJECT:         ReactOS DbgPrint Utility
  * LICENSE:         GPL - See COPYING in the top level directory
  * FILE:            tools/dbgprint/dbgprint.c
@@ -7,11 +8,9 @@
  *                  Christoph von Wittich (Christoph_vW@ReactOS.org)
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
+#include <windows.h>
 #include <tchar.h>
-//#include <debug.h>
+#include <debug.h>
 #include <stdio.h>
 
 int _tmain(int argc, TCHAR ** argv)

base/applications/cmdutils/doskey/doskey.c

@@ -1,13 +1,8 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wincon.h>
+#include <windows.h>
 #include <stdio.h>
 #include <wchar.h>
 #include <assert.h>
 #include <locale.h>
-
 #include "doskey.h"
 
 #define MAX_STRING 2000

base/applications/cmdutils/doskey/doskey.h

@@ -1,4 +1,47 @@
-#pragma once
-
 #define IDS_HELP 0
 #define IDS_INVALID_MACRO_DEF 1
+
+#ifndef RC_INVOKED
+
+#ifdef UNICODE
+#define TNAME(x) x##W
+#else
+#define TNAME(x) x##A
+#endif
+
+/* Missing from include/psdk/wincon.h */
+#ifndef ENABLE_INSERT_MODE
+#define ENABLE_INSERT_MODE 0x20
+#endif
+#ifndef ENABLE_EXTENDED_FLAGS
+#define ENABLE_EXTENDED_FLAGS 0x80
+#endif
+
+/* Undocumented APIs */
+#ifndef AddConsoleAlias
+BOOL WINAPI AddConsoleAliasA(LPSTR, LPSTR, LPSTR);
+BOOL WINAPI AddConsoleAliasW(LPWSTR, LPWSTR, LPWSTR);
+#define AddConsoleAlias TNAME(AddConsoleAlias)
+#endif
+#ifndef GetConsoleAliases
+DWORD WINAPI GetConsoleAliasesA(LPSTR, DWORD, LPSTR);
+DWORD WINAPI GetConsoleAliasesW(LPWSTR, DWORD, LPWSTR);
+#define GetConsoleAliases TNAME(GetConsoleAliases)
+#endif
+#ifndef GetConsoleAliasesLength
+DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); 
+DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); 
+#define GetConsoleAliasesLength TNAME(GetConsoleAliasesLength)
+#endif
+#ifndef GetConsoleAliasExes
+DWORD WINAPI GetConsoleAliasExesA(LPSTR, DWORD);
+DWORD WINAPI GetConsoleAliasExesW(LPWSTR, DWORD);
+#define GetConsoleAliasExes TNAME(GetConsoleAliasExes)
+#endif
+#ifndef GetConsoleAliasExesLength
+DWORD WINAPI GetConsoleAliasExesLengthA(VOID);
+DWORD WINAPI GetConsoleAliasExesLengthW(VOID);
+#define GetConsoleAliasExesLength TNAME(GetConsoleAliasExesLength)
+#endif
+
+#endif /* RC_INVOKED */

base/applications/cmdutils/doskey/doskey.rc

@@ -1,5 +1,4 @@
-#include <windef.h>
-
+#include <windows.h>
 #include "doskey.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 doskey command\0"
@@ -18,15 +17,6 @@
 #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_IT_IT
-    #include "lang/it-IT.rc"
-#endif
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
@@ -42,3 +32,9 @@
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_ES_ES
+    #include "lang/es-ES.rc"
+#endif

base/applications/cmdutils/find/find.c

@@ -27,21 +27,20 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-//#include <string.h>
-//#include <ctype.h>
+#include <string.h>
+#include <ctype.h>
+#include <windows.h>
 
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-
-//#include <io.h>
+#include <io.h>
 #include <dos.h>
 
 #include "resource.h"
 
+
 /* Symbol definition */
 #define MAX_STR 1024
 
+
 /* This function prints out all lines containing a substring.  There are some
  * conditions that may be passed to the function.
  *
@@ -252,3 +251,5 @@ main (int argc, char **argv)
   */
   exit ( (ret ? 0 : 1) );
 }
+
+

base/applications/cmdutils/find/find.rc

@@ -1,7 +1,3 @@
-#include <windef.h>
-
-#include "resource.h"
-
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 find command\0"
 #define REACTOS_STR_INTERNAL_NAME	"find\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"find.exe\0"

base/applications/cmdutils/find/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDS_USAGE                 1000
 #define IDS_NO_SUCH_FILE          1001
 #define IDS_CANNOT_OPEN           1002

base/applications/cmdutils/find/rsrc.rc

@@ -1,3 +1,6 @@
+#include <windows.h>
+#include "resource.h"
+
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

base/applications/cmdutils/hostname/hostname.c

@@ -16,19 +16,17 @@
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/*
+/* $Id$
+ *
  * COPYRIGHT : See COPYING in the top level directory
  * PROJECT   : ReactOS/Win32 get host name
  * FILE      : subsys/system/hostname/hostname.c
  * PROGRAMMER: Emanuele Aliberti (ea@reactos.com)
  */
-
+#include <windows.h>
 #include <stdio.h>
 #include <stdlib.h>
-//#include <string.h>
-
-#include <windef.h>
-#include <winbase.h>
+#include <string.h>
 
 int main (int argc, char ** argv)
 {
@@ -43,7 +41,7 @@ int main (int argc, char ** argv)
 			printf ("%s\n", ComputerName);
 			return EXIT_SUCCESS;
 		}
-		fprintf (stderr, "%s: Win32 error %lu.\n",
+		fprintf (stderr, "%s: Win32 error %ld.\n",
 			argv[0], GetLastError());
 		return EXIT_FAILURE;
 	}else{

base/applications/cmdutils/lodctr/lodctr_main.c

@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
+#include <windows.h>
 #include <loadperf.h>
 
 int wmain(int argc, WCHAR *argv[])

base/applications/cmdutils/more/more.c

@@ -1,4 +1,5 @@
-/*
+/* $Id$
+ * 
  * MORE.C - external command.
  *
  * clone from 4nt more command
@@ -9,15 +10,10 @@
  *     use window size instead of buffer size.
  */
 
-#include <stdio.h>
+#include <windows.h>
 #include <malloc.h>
 #include <tchar.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wincon.h>
-
+#include <stdio.h>
 #include "resource.h"
 
 static TCHAR szCont[128];

base/applications/cmdutils/more/more.rc

@@ -1,4 +1,4 @@
-#include <windef.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 more command\0"

base/applications/cmdutils/reg/reg.c

@@ -16,14 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <wincon.h>
+#include <windows.h>
 #include <wine/unicode.h>
-
 #include "reg.h"
 
 static int reg_printfW(const WCHAR *msg, ...)

base/applications/cmdutils/reg/reg.h

@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
-
-//#include <windef.h>
+#include <windef.h>
 
 /* Translation IDs. */
 #define STRING_USAGE            101

base/applications/cmdutils/reg/reg.rc

@@ -1,7 +1,6 @@
-#include <windef.h>
-//#include <commctrl.h>
-
-//#include "reg.h"
+#include <windows.h>
+#include <commctrl.h>
+#include "reg.h"
 
 /* Define language neutral resources */
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

base/applications/cmdutils/reg/rsrc.rc

@@ -1,3 +1,7 @@
+#include <windows.h>
+#include "reg.h"
+
+/* Include localised resources */
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

base/applications/cmdutils/xcopy/xcopy.c

@@ -39,19 +39,11 @@
  *   5 - Disk write error
  */
 
+
 #include <stdio.h>
-#include <stdlib.h>
-//#include <tchar.h>
-//#include <malloc.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winnls.h>
-#include <wincon.h>
+#include <windows.h>
 #include <wine/debug.h>
-//#include <wine/unicode.h>
-
+#include <wine/unicode.h>
 #include "xcopy.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(xcopy);

base/applications/cmdutils/xcopy/xcopy.h

@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
-
 #include <windef.h>
 
 /* Local #defines */

base/applications/control/control.h

@@ -6,13 +6,8 @@
  *                  Colin Finck (mail@colinfinck.de)
  */
 
+#include <windows.h>
 #include <tchar.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <shellapi.h>
-
 #include "resource.h"
 
 #define CCH_UINT_MAX   11

base/applications/control/resource.h

@@ -1,3 +1 @@
-#pragma once
-
 #define IDI_MAINICON                    100

base/applications/dxdiag/d3dtest7.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-//#include <d3d.h>
+#include <d3d.h>
 
 BOOL D3D7Test(HWND hWnd)
 {

base/applications/dxdiag/d3dtest8.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-//#include <d3d8.h>
+#include <d3d8.h>
 
 BOOL D3D8Test(HWND hWnd)
 {

base/applications/dxdiag/d3dtest9.c

@@ -7,7 +7,7 @@
  */
 
 #include "precomp.h"
-//#include <d3d9.h>
+#include <d3d9.h>
 
 BOOL D3D9Test(HWND hWnd)
 {

base/applications/dxdiag/dxdiag.rc

@@ -1,5 +1,4 @@
-#include <windef.h>
-#include <winuser.h>
+#include <windows.h>
 #include <commctrl.h>
 
 #include "resource.h"

base/applications/dxdiag/precomp.h

@@ -6,26 +6,18 @@
 #define D3D_OVERLOADS
 
 #include <stdio.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winsvc.h>
-#include <wingdi.h>
-#include <winnls.h>
-#include <winver.h>
-#include <winuser.h>
+#include <windows.h>
+#include <limits.h>
 #include <mmsystem.h>
 #include <setupapi.h>
+#include <commctrl.h>
 #include <ddraw.h>
 #include <initguid.h>
 #include <devguid.h>
 #include <mmreg.h>
-
+#include <wintrust.h>
+#include <softpub.h>
+#include <mscat.h>
 #include "resource.h"
 
 typedef struct

base/applications/dxdiag/rsrc.rc

@@ -1,6 +1,5 @@
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -19,12 +18,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
 #ifdef LANGUAGE_JA_JP
     #include "lang/ja-JP.rc"
 #endif
@@ -37,6 +30,12 @@
 #ifdef LANGUAGE_NB_NO
     #include "lang/no-NO.rc"
 #endif
+#ifdef LANGUAGE_SK_SK
+    #include "lang/sk-SK.rc"
+#endif
+#ifdef LANGUAGE_SV_SE
+    #include "lang/sv-SE.rc"
+#endif
 #ifdef LANGUAGE_PL_PL
     #include "lang/pl-PL.rc"
 #endif
@@ -49,18 +48,12 @@
 #ifdef LANGUAGE_RU_RU
     #include "lang/ru-RU.rc"
 #endif
-#ifdef LANGUAGE_SK_SK
-    #include "lang/sk-SK.rc"
-#endif
-#ifdef LANGUAGE_SV_SE
-    #include "lang/sv-SE.rc"
+#ifdef LANGUAGE_UK_UA
+    #include "lang/uk-UA.rc"
 #endif
 #ifdef LANGUAGE_TR_TR
     #include "lang/tr-TR.rc"
 #endif
-#ifdef LANGUAGE_UK_UA
-    #include "lang/uk-UA.rc"
-#endif
 #ifdef LANGUAGE_ZH_CN
     #include "lang/zh-CN.rc"
 #endif

base/applications/extrac32/extrac32.c

@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <shellapi.h>
 #include <setupapi.h>
 #include <shlwapi.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+
+#include "wine/unicode.h"
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(extrac32);
 

base/applications/findstr/findstr.c

@@ -27,16 +27,16 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-//#include <string.h>
-//#include <ctype.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include <io.h>
+#include <string.h>
+#include <ctype.h>
+#include <windows.h>
+
+#include <io.h>
 #include <dos.h>
 
 #include "resource.h"
 
+
 /* Symbol definition */
 #define MAX_STR 1024
 

base/applications/findstr/findstr.rc

@@ -1,7 +1,3 @@
-#include <windef.h>
-
-#include "resource.h"
-
 #define REACTOS_STR_FILE_DESCRIPTION	"W32 findstr command\0"
 #define REACTOS_STR_INTERNAL_NAME	"findstr\0"
 #define REACTOS_STR_ORIGINAL_FILENAME	"findstr.exe\0"

base/applications/findstr/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDS_USAGE                 1000
 #define IDS_NO_SUCH_FILE          1001
 #define IDS_CANNOT_OPEN           1002

base/applications/findstr/rsrc.rc

@@ -1,3 +1,6 @@
+#include <windows.h>
+#include "resource.h"
+
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG

base/applications/fontview/display.c

@@ -20,6 +20,9 @@
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <windows.h>
+#include <stdio.h>
+
 #include "display.h"
 
 #define SPACING1 8
@@ -88,7 +91,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
 	GetTextMetrics(hDC, &tm);
 
 	swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat);
-	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
+	TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));
 	y += tm.tmHeight + SPACING1;
 
 	/* Draw a seperation Line */
@@ -103,15 +106,15 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
 	SelectObject(hDC, pData->hCharSetFont);
 	GetTextMetrics(hDC, &tm);
 	swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz");
-	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
+	TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
 	swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ");
-	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
+	TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
 	swprintf(szCaption, L"0123456789.:,;(\"~!@#$%^&*')");
-	TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption));
+	TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));
 	y += tm.tmHeight + 1;
 
 	/* Draw a seperation Line */
@@ -124,40 +127,18 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
 	for (i = 0; i < MAX_SIZES; i++)
 	{
 		SelectObject(hDC, pData->hFonts[i]);
-		TextOutW(hDC, 20, y, pData->szString, (INT)wcslen(pData->szString));
+		TextOutW(hDC, 20, y, pData->szString, wcslen(pData->szString));
 		GetTextMetrics(hDC, &tm);
 		y += tm.tmHeight + 1;
 		SelectObject(hDC, pData->hSizeFont);
 		swprintf(szSize, L"%d", pData->nSizes[i]);
-		TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, (INT)wcslen(szSize));
+		TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, wcslen(szSize));
 	}
 	SelectObject(hDC, hOldFont);
 
 	return y;
 }
 
-static int
-CALLBACK
-EnumFontFamProcW(
-	const LOGFONTW *lpelfe,
-	const TEXTMETRICW *lptm,
-	DWORD FontType,
-	LPARAM lParam)
-{
-	PNEWTEXTMETRICW pntmw = (PNEWTEXTMETRICW)lptm;
-	PBOOL pfOpenType = (PBOOL)lParam;
-
-	if (FontType & TRUETYPE_FONTTYPE)
-	{
-		if (pntmw->ntmFlags & (NTM_TT_OPENTYPE | NTM_PS_OPENTYPE))
-		{
-			*pfOpenType = TRUE;
-			return FALSE;
-		}
-	}
-	return TRUE;
-}
-
 static LRESULT
 Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
 {
@@ -182,27 +163,12 @@ Display_SetTypeFace(HWND hwnd, PEXTLOGFONTW pExtLogFont)
 	pData->hCharSetFont = CreateFontIndirectW(&logfont);
 
 	/* Get font format */
+	// FIXME: Get the real font format (OpenType?)
 	SelectObject(hDC, pData->hCharSetFont);
 	GetTextMetrics(hDC, &tm);
-	if (tm.tmPitchAndFamily & TMPF_TRUETYPE)
+	if ((tm.tmPitchAndFamily & TMPF_TRUETYPE) == TMPF_TRUETYPE)
 	{
-		BOOL fOpenType = FALSE;
-
-		EnumFontFamiliesExW(hDC, &logfont,
-			EnumFontFamProcW, (LPARAM)&fOpenType, 0);
-
-		if (fOpenType)
-			swprintf(pData->szFormat, L" (OpenType)");
-		else
-			swprintf(pData->szFormat, L" (TrueType)");
-	}
-	else if (tm.tmPitchAndFamily & TMPF_VECTOR)
-	{
-		swprintf(pData->szFormat, L" (Vector)");
-	}
-	else
-	{
-		swprintf(pData->szFormat, L" (Raster)");
+		swprintf(pData->szFormat, L" (TrueType)");
 	}
 
 	for (i = 0; i < MAX_SIZES; i++)
@@ -418,7 +384,7 @@ Display_OnPrint(HWND hwnd)
 	TEXTMETRIC tm;
 	int copies, yPos;
 	DISPLAYDATA* pData;
-
+	
 	pData = malloc(sizeof(DISPLAYDATA));
 	ZeroMemory(pData, sizeof(DISPLAYDATA));
 

base/applications/fontview/display.h

@@ -1,13 +1,5 @@
 #pragma once
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <commdlg.h>
-
 /* Messages for the display class */
 #define FVM_SETTYPEFACE WM_USER
 #define FVM_SETSTRING (WM_USER + 1)

base/applications/fontview/fontview.c

@@ -104,14 +104,14 @@ WinMain (HINSTANCE hThisInstance,
 		OPENFILENAMEW fontOpen;
 		WCHAR szFileName[MAX_PATH] = L"";
 		HLOCAL dialogTitle = NULL;
-
+		
 		/* Gets the title for the dialog box ready */
 		FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,
 		          NULL, IDS_OPEN, 0, (LPWSTR)&dialogTitle, 0, NULL);
-
+		
 		/* Clears out any values of fontOpen before we use it */
 		ZeroMemory(&fontOpen, sizeof(fontOpen));
-
+		
 		/* Sets up the open dialog box */
 		fontOpen.lStructSize = sizeof(fontOpen);
 		fontOpen.hwndOwner = NULL;
@@ -122,7 +122,7 @@ WinMain (HINSTANCE hThisInstance,
 		fontOpen.nMaxFile = MAX_PATH;
 		fontOpen.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
 		fontOpen.lpstrDefExt = L"ttf";
-
+		
 		/* Opens up the Open File dialog box in order to chose a font file. */
 		if(GetOpenFileNameW(&fontOpen))
 		{
@@ -133,7 +133,7 @@ WinMain (HINSTANCE hThisInstance,
 			exiting the program altogether */
 			return 0;
 		}
-
+		
 		LocalFree(dialogTitle);
 	}
 	else
@@ -142,7 +142,7 @@ WinMain (HINSTANCE hThisInstance,
 		fileName = argv[1];
 		g_fileName = fileName;
 	}
-
+	
 	if (!AddFontResourceW(fileName))
 	{
 		ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName);
@@ -221,7 +221,7 @@ WinMain (HINSTANCE hThisInstance,
 
 	RemoveFontResourceW(argv[1]);
 
-	return (int)msg.wParam;
+	return msg.wParam;
 }
 
 static LRESULT
@@ -326,7 +326,7 @@ static LRESULT
 MainWnd_OnInstall(HWND hwnd)
 {
 	DWORD fontExists;
-
+	
 	/* First, we have to find out if the font still exists. */
 	fontExists = GetFileAttributes((LPCSTR)g_fileName);
 	if (fontExists != 0xFFFFFFFF) /* If the file does not exist */
@@ -334,11 +334,11 @@ MainWnd_OnInstall(HWND hwnd)
 		ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, g_fileName);
 		return -1;
 	}
-
+	
 	//CopyFile(g_fileName, NULL, TRUE);
-
+	
 	MessageBox(hwnd, TEXT("This function is unimplemented"), TEXT("Unimplemented"), MB_OK);
-
+	
 	return 0;
 }
 

base/applications/fontview/fontview.h

@@ -1,7 +1,4 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <shellapi.h>
+#include <windows.h>
 
 #include "resource.h"
 #include "display.h"

base/applications/fontview/fontview.rc

@@ -1,5 +1,4 @@
-#include <windef.h>
-
+#include <windows.h>
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -20,7 +19,6 @@ END
 
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -36,12 +34,6 @@ END
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
-#ifdef LANGUAGE_IT_IT
-    #include "lang/it-IT.rc"
-#endif
 #ifdef LANGUAGE_LT_LT
     #include "lang/lt-LT.rc"
 #endif

base/applications/fontview/lang/it-IT.rc

@@ -1,13 +0,0 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
-
-STRINGTABLE DISCARDABLE
-BEGIN
-	IDS_INSTALL, "Installa"
-	IDS_PRINT, "Stampa"
-	IDS_STRING, ""
-	IDS_OPEN, "Open Font..."
-	IDS_ERROR, "Errore"
-	IDS_ERROR_NOMEM, "Memoria insufficiente per completare l'operazione."
-	IDS_ERROR_NOFONT, "Il file% 1 non è un file di origine valido."
-	IDS_ERROR_NOCLASS, "Impossibile avviare la classe."
-END

base/applications/fontview/lang/ro-RO.rc

@@ -1,12 +1,12 @@
-//2012.09.09 - Fulea Ștefan: update caused by r56898, corrections
+//2011.10.17 - Fulea Ștefan: diacritics changes, other minor changes
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE DISCARDABLE
 BEGIN
-	IDS_INSTALL,        "Inst&alează"
-    IDS_PRINT,          "I&mprimă"
+	IDS_INSTALL,        "Install"
+    IDS_PRINT,          "Imprimare"
 	IDS_STRING,         "Turubinele eoliene generează câțiva MJ (câțiva kW•h) în exces, acoperind și necesarul familiei. QY 1234567890"
-	IDS_OPEN, 			"Deschidere font…"
+	IDS_OPEN, 			"Open Font..."
 	IDS_ERROR,          "Eroare"
 	IDS_ERROR_NOMEM,    "Nu e destulă memorie pentru a încheia operația."
 	IDS_ERROR_NOFONT,   "Fișierul «%1» este un fișier font deteriorat."

base/applications/fontview/resource.h

@@ -1,4 +1,3 @@
-#pragma once
 
 #define IDS_ERROR 100
 #define IDS_ERROR_NOMEM 101
@@ -13,3 +12,4 @@
 #define IDS_CHARSLOWER 700
 #define IDS_CHARSUPPER 701
 #define IDS_SPECIALCHARS 702
+

base/applications/games/solitaire/lang/en-US.rc

@@ -5,7 +5,6 @@
  * PURPOSE:     English Language File for Solitaire
  * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
  */
-
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 

base/applications/games/solitaire/lang/ja-JP.rc

@@ -19,8 +19,8 @@ BEGIN
     AUTORADIOBUTTON "1 枚ずつ取る(&O)", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
     AUTORADIOBUTTON "3 枚ずつ取る(&T)", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
 
-    AUTOCHECKBOX    "時間を表示する(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "ステータスバーを表示する(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+    AUTOCHECKBOX    "時間を表 示する(&S)", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+    AUTOCHECKBOX    "ステータスバーを表 示する(&T)", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
 
     DEFPUSHBUTTON   "OK", IDOK, 35, 97, 50, 14
     PUSHBUTTON      "キャンセル", IDCANCEL, 101, 97, 50, 14
@@ -53,8 +53,8 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_SOL_NAME    "ソリティア"
-    IDS_SOL_ABOUT   "J Brown によるソリティア\n\nCardLib バージョン 1.0。"
+    IDS_SOL_NAME    "ソ リティア"
+    IDS_SOL_ABOUT   "J Brown によるソ リティア\n\nCardLib バージョン 1.0。"
     IDS_SOL_QUIT    "現在のゲームを終了しますか?"
     IDS_SOL_WIN     "おめでとう、あなたの勝ちです!"
     IDS_SOL_DEAL    "もう一度カードを配りますか?"

base/applications/games/solitaire/lang/tr-TR.rc

@@ -1,94 +0,0 @@
-/*
- * PROJECT:     Solitaire
- * LICENSE:     Freeware, permission to use under Public Domain
- * FILE:        base/applications/games/solitaire/lang/tr-TR.rc
- * PURPOSE:     Turkish Language File for Solitaire
- * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
- * TRANSLATOR:  Erdem Ersoy (eersoy93)
- */
-
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-
-/* Dialogs */
-
-IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Ayarlar"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    GROUPBOX        "Kağıtlar", -1, 7, 7, 90, 40
-    AUTORADIOBUTTON "&Tekli çek", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "&Üçlü çek", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
-
-    AUTOCHECKBOX    "&Süreyi göster", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
-    AUTOCHECKBOX    "&Durum çubuğu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
-
-    DEFPUSHBUTTON   "Tamam", IDOK, 35, 97, 50, 14
-    PUSHBUTTON      "Vazgeç", IDCANCEL, 101, 97, 50, 14
-END
-
-
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "Deste Seç"
-FONT 8, "MS Shell Dlg"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-BEGIN
-    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Tamam", IDOK, 66, 84, 54, 13
-    PUSHBUTTON    "Vazgeç", IDCANCEL, 126, 84, 54, 13
-END
-
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SOL_NAME    "Solitaire"
-    IDS_SOL_ABOUT   "Solitaire, J Brown tarafından yapılmıştır.\n\nCardLib sürümü: 1.0"
-    IDS_SOL_QUIT    "Bu oyundan çıkmak ister misiniz?"
-    IDS_SOL_WIN     "Tebrikler, kazandınız!"
-    IDS_SOL_DEAL    "Tekrar dağıtılsın mı?"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&Oyun"
-    BEGIN
-        MENUITEM "&Dağıt\tF2",                  IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "D&esteler...",                IDM_GAME_DECK
-        MENUITEM "&Ayarlar...",                 IDM_GAME_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkış",                      IDM_GAME_EXIT
-    END
-    POPUP "&Yardım"
-    BEGIN
-        MENUITEM "&Yardım Konuları\tF1",        IDM_HELP_CONTENTS
-        MENUITEM "&Hakkında",                   IDM_HELP_ABOUT
-    END
-END
-
-
-
-/* Accelerator */
-
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
-BEGIN
-    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
-    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
-END

base/applications/games/solitaire/resource.h

@@ -1,4 +1,3 @@
-#pragma once
 
 /* Icon */
 #define IDI_SOLITAIRE                   100

base/applications/games/solitaire/rsrc.rc

@@ -1,6 +1,4 @@
-#include <windef.h>
-#include <winuser.h>
-
+#include <windows.h>
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -36,9 +34,6 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_HU_HU
     #include "lang/hu-HU.rc"
 #endif
@@ -81,9 +76,6 @@ IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
 #ifdef LANGUAGE_TH_TH
     #include "lang/th-TH.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

base/applications/games/solitaire/solitaire.h

@@ -1,14 +1,11 @@
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
+
+#include <windows.h>
 #include <commctrl.h>
 #include <tchar.h>
-#include <cardlib.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include "resource.h"
+#include "cardlib.h"
 
 extern CardWindow SolWnd;
 extern TCHAR szAppName[];

base/applications/games/spider/lang/ja-JP.rc

@@ -49,7 +49,7 @@ END
 STRINGTABLE
 BEGIN
     IDS_SPI_NAME    "スパイダ"
-    IDS_SPI_ABOUT   "Gregor Schneider によるスパイダ ソリティア\n\nCardLib バージョン 1.0"
+    IDS_SPI_ABOUT   "Gregor Schneider によるスパイダ ソ リティア\n\nCardLib バージョン 1.0"
     IDS_SPI_QUIT    "現在のゲームを終了しますか?"
     IDS_SPI_WIN     "おめでとう、あなたの勝ちです!"
     IDS_SPI_DEAL    "もう一度カードを配りますか?"

base/applications/games/spider/lang/tr-TR.rc

@@ -1,86 +0,0 @@
-/*
- * PROJECT:      Spider Solitaire
- * LICENSE:      See COPYING in top level directory
- * FILE:         base/applications/games/spider/lang/tr-TR.rc
- * PURPOSE:      Turkish Language File for Spider Solitaire
- * TRANSLATOR:   Erdem Ersoy (eersoy93)
- */
-
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-/* Dialogs */
-
-IDD_CARDBACK DIALOGEX 6, 6, 186, 104
-CAPTION "Deste Seç"
-FONT 8, "MS Shell Dlg"
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-BEGIN
-    CONTROL       "", IDC_CARDBACK1, "Static", SS_NOTIFY, 4, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK2, "Static", SS_NOTIFY, 34, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK3, "Static", SS_NOTIFY, 64, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK4, "Static", SS_NOTIFY, 94, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK5, "Static", SS_NOTIFY, 124, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK6, "Static", SS_NOTIFY, 154, 7, 26, 32
-    CONTROL       "", IDC_CARDBACK7, "Static", SS_NOTIFY, 4, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK8, "Static", SS_NOTIFY, 34, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK9, "Static", SS_NOTIFY, 64, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK10, "Static", SS_NOTIFY, 94, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK11, "Static", SS_NOTIFY, 124, 46, 26, 32
-    CONTROL       "", IDC_CARDBACK12, "Static", SS_NOTIFY, 154, 46, 26, 32
-    DEFPUSHBUTTON "Tamam", IDOK, 66, 84, 54, 13
-    PUSHBUTTON    "Vazgeç", IDCANCEL, 126, 84, 54, 13
-END
-
-IDD_DIFFICULTY DIALOGEX DISCARDABLE 100, 100, 106, 80
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
-CAPTION "Zorluk"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    AUTORADIOBUTTON "Kolay: &Tek renk", IDC_DIF_ONECOLOR,   8, 10, 80, 10, WS_GROUP | WS_TABSTOP
-    AUTORADIOBUTTON "Orta: &İki renk",  IDC_DIF_TWOCOLORS,  8, 23, 80, 10
-    AUTORADIOBUTTON "Zor: &Dört Renk",  IDC_DIF_FOURCOLORS, 8, 36, 80, 10
-
-    DEFPUSHBUTTON   "Tamam", IDOK, 8, 58, 40, 14
-    PUSHBUTTON      "Vazgeç", IDCANCEL, 58, 58, 40, 14
-END
-
-/* Strings */
-
-STRINGTABLE
-BEGIN
-    IDS_SPI_NAME    "Spider"
-    IDS_SPI_ABOUT   "Spider Solitaire Gregor Schneider tarafından yapılmıştır.\n\nCardLib sürümü: 1.0"
-    IDS_SPI_QUIT    "Bu oyundan çıkmak ister misiniz?"
-    IDS_SPI_WIN     "Tebrikler, kazandınız!"
-    IDS_SPI_DEAL    "Tekrar dağıtılsın mı?"
-END
-
-
-/* Menus */
-
-IDR_MENU1 MENU DISCARDABLE
-BEGIN
-    POPUP "&Oyun"
-    BEGIN
-        MENUITEM "&Yeni oyun\tF2",              IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "&Desteler...",                IDM_GAME_DECK
-        MENUITEM SEPARATOR
-        MENUITEM "&Çıkış",                      IDM_GAME_EXIT
-    END
-    POPUP "&Yardım"
-    BEGIN
-        MENUITEM "&Yardım Konuları\tF1",        IDM_HELP_CONTENTS
-        MENUITEM "&Hakkında",                   IDM_HELP_ABOUT
-    END
-END
-
-
-
-/* Accelerator */
-
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE
-BEGIN
-    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
-    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT
-END

base/applications/games/spider/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 /* Icon */
 #define IDI_SPIDER                      100
 
@@ -39,3 +37,4 @@
 #define IDS_SPI_QUIT                    1302
 #define IDS_SPI_WIN                     1303
 #define IDS_SPI_DEAL                    1304
+

base/applications/games/spider/rsrc.rc

@@ -1,6 +1,4 @@
-#include <windef.h>
-#include <winuser.h>
-
+#include <windows.h>
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -24,9 +22,6 @@ IDI_SPIDER ICON DISCARDABLE "spider.ico"
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_HU_HU
     #include "lang/hu-HU.rc"
 #endif
@@ -57,9 +52,6 @@ IDI_SPIDER ICON DISCARDABLE "spider.ico"
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

base/applications/games/spider/spider.h

@@ -1,13 +1,12 @@
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
+
+#include <windows.h>
 #include <commctrl.h>
 #include <tchar.h>
-#include <cardlib.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include "resource.h"
+#include "cardlib.h"
+
 
 #define DIFFICULTY_ONE_COLOR     1
 #define DIFFICULTY_TWO_COLORS    2

base/applications/games/winmine/dialog.c

@@ -18,10 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
+#define WIN32_LEAN_AND_MEAN
 
+#include <windows.h>
 #include "main.h"
 #include "resource.h"
 

base/applications/games/winmine/lang/tr-TR.rc

@@ -2,8 +2,7 @@
  * WineMine
  * Turkish Language Support
  *
- * Copyright 2006 Fatih Aşıcı
- * Copyright 2013 Erdem Ersoy (eersoy93)
+ * Copyright 2006 Fatih Aþýcý
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,40 +22,40 @@
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE BEGIN
-     IDS_APPNAME, "Mayın Tarlası"
+     IDS_APPNAME, "Wine Mayýn Tarlasý"
      IDS_NOBODY,  "Hiç kimse"
-     IDS_ABOUT,   "Telif hakkı: Joshua Thielen, 2000"
+     IDS_ABOUT,   "Telif hakký 2000, Joshua Thielen"
 END
 
 MENU_WINEMINE MENU
 BEGIN
     POPUP "&Seçenekler" BEGIN
-        MENUITEM "&Yeni\tF2",           IDM_NEW
+        MENUITEM "&Yeni\tF2",      IDM_NEW
         MENUITEM SEPARATOR
-        MENUITEM "&Soru İmi",           IDM_MARKQ
+        MENUITEM "&Soru Ýþareti",  IDM_MARKQ
         MENUITEM SEPARATOR
-        MENUITEM "&Başlangıç",          IDM_BEGINNER
-        MENUITEM "&Orta",               IDM_ADVANCED
-        MENUITEM "&İleri",              IDM_EXPERT
-        MENUITEM "&Özel...",            IDM_CUSTOM
+        MENUITEM "&Acemi",         IDM_BEGINNER
+        MENUITEM "&Geliþmiþ",      IDM_ADVANCED
+        MENUITEM "&Uzman",         IDM_EXPERT
+        MENUITEM "&Özel",          IDM_CUSTOM
         MENUITEM SEPARATOR
-        MENUITEM "&Çıkış\tAlt+X",       IDM_EXIT
+        MENUITEM "&Çýkýþ\tAlt+X",  IDM_EXIT
     END
     POPUP "&Bilgi" BEGIN
-        MENUITEM "&En Kısa Süreler...", IDM_TIMES
-        MENUITEM "&Hakkında",           IDM_ABOUT
+        MENUITEM "&En Kýsa Süreler",    IDM_TIMES
+        MENUITEM "&Hakkýnda",      IDM_ABOUT
     END
 END
 
 DLG_TIMES DIALOGEX 0, 0, 160, 80
 STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
-CAPTION "En Kısa Süreler"
+CAPTION "En Kýsa Süreler"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    GROUPBOX        "En Kısa Süreler", -1,  10,  10, 140,  45
-    LTEXT           "Başlangıç",       -1,  20,  20,  40,   8
-    LTEXT           "Orta",            -1,  20,  30,  40,   8
-    LTEXT           "İleri",           -1,  20,  40,  40,   8
+    GROUPBOX        "En Kýsa Süreler", -1,  10,  10, 140,  45
+    LTEXT           "Acemi",           -1,  20,  20,  40,   8
+    LTEXT           "Geliþmiþ",        -1,  20,  30,  40,   8
+    LTEXT           "Uzman",           -1,  20,  40,  40,   8
     LTEXT           "999",          IDC_TIME1,  70,  20,  15,   8
     LTEXT           "999",          IDC_TIME2,  70,  30,  15,   8
     LTEXT           "999",          IDC_TIME3,  70,  40,  15,   8
@@ -71,9 +70,9 @@ STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL
 CAPTION "Tebrikler!"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Lütfen adınızı giriniz:", -1,  10,  10, 150,  10
+    LTEXT           "Lütfen adýnýzý girin", -1,  10,  10, 150,  10
     EDITTEXT                              IDC_EDITNAME,  25,  20, 110,  12
-    DEFPUSHBUTTON   "Tamam",                      IDOK,  60,  40,  40,  15
+    DEFPUSHBUTTON   "Tamam",                         IDOK,  60,  40,  40,  15
 END
 
 DLG_CUSTOM DIALOGEX  0, 0, 100, 100
@@ -81,12 +80,12 @@ STYLE  DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL
 CAPTION "Özel Oyun"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    LTEXT           "Satırlar",   -1,   5,   5,  30,  10
+    LTEXT           "Satýrlar",   -1,   5,   5,  30,  10
     LTEXT           "Sütunlar",   -1,   5,  35,  30,  10
-    LTEXT           "Mayınlar",   -1,   5,  65,  30,  10
+    LTEXT           "Mayýnlar",   -1,   5,  65,  30,  10
     EDITTEXT              IDC_EDITROWS,   5,  15,  20,  12, ES_NUMBER
     EDITTEXT              IDC_EDITCOLS,   5,  45,  20,  12, ES_NUMBER
     EDITTEXT             IDC_EDITMINES,   5,  75,  20,  12, ES_NUMBER
-    DEFPUSHBUTTON   "Tamam",  IDOK,      40,  30,  50,  15
-    PUSHBUTTON      "Vazgeç", IDCANCEL,  40,  50,  50,  15
+    DEFPUSHBUTTON   "Tamam",     IDOK,      40,  30,  50,  15
+    PUSHBUTTON      "Ýptal", IDCANCEL,  40,  50,  50,  15
 END

base/applications/games/winmine/lang/uk-UA.rc

@@ -1,3 +1,4 @@
+/*
 /*
  * WineMine
  * Ukrainian Language Support

base/applications/games/winmine/main.c

@@ -18,16 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <wingdi.h>
+#define WIN32_LEAN_AND_MEAN
+
+#include <string.h>
 #include <time.h>
+#include <windows.h>
 #include <stdlib.h>
 #include <shellapi.h>
-
 #include "main.h"
 #include "resource.h"
 
@@ -108,7 +105,7 @@ static void LoadBoard( BOARD *p_board )
         p_board->IsMarkQ = TRUE;
 
     for( i = 0; i < 3; i++ ) {
-        wsprintf( key_name, "Name%u", i+1 );
+        wsprintf( key_name, "Name%d", i+1 );
         size = sizeof( data );
         if( RegQueryValueEx( hkey, key_name, NULL, &type,
                 (LPBYTE) data, &size ) == ERROR_SUCCESS )
@@ -118,7 +115,7 @@ static void LoadBoard( BOARD *p_board )
     }
 
     for( i = 0; i < 3; i++ ) {
-        wsprintf( key_name, "Time%u", i+1 );
+        wsprintf( key_name, "Time%d", i+1 );
         size = sizeof( p_board->best_time[i] );
         if( !RegQueryValueEx( hkey, key_name, NULL, &type,
                 (LPBYTE) &p_board->best_time[i], &size ) == ERROR_SUCCESS )

base/applications/games/winmine/main.h

@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
-
-#include <winuser.h>
+#include <windows.h>
 
 #define BEGINNER_MINES        10
 #define BEGINNER_COLS         9

base/applications/games/winmine/resource.h

@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#pragma once
+#include <windef.h>
+#include <winuser.h>
 
 #define ID_TIMER        1000
 

base/applications/games/winmine/rsrc.rc

@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-
 #include "resource.h"
 
 LANGUAGE LANG_NEUTRAL,SUBLANG_NEUTRAL
@@ -47,7 +44,6 @@ MINES BITMAP rc/mines.bmp
 /* include localised resources */
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -72,9 +68,6 @@ MINES BITMAP rc/mines.bmp
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif

base/applications/hh/hh.rc

@@ -1,4 +1,4 @@
-//#include <windows.h>
+#include <windows.h>
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS HTML Help Executable\0"
 #define REACTOS_STR_INTERNAL_NAME	"hh\0"
@@ -6,3 +6,4 @@
 #include <reactos/version.rc>
 
 2 ICON DISCARDABLE hh.ico
+

base/applications/hh/main.c

@@ -1,6 +1,4 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
+#include <windows.h>
 
 typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline);
 

base/applications/iexplore/main.c

@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
+#include <windows.h>
 
 extern DWORD WINAPI IEWinMain(LPSTR, int);
 

base/applications/kbswitch/kbswitch.h

@@ -1,11 +1,7 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <windows.h>
 #include <winuser.h>
-#include <winnls.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <shellapi.h>
 #include <tchar.h>
 
 #include "resource.h"

base/applications/kbswitch/kbswitch.rc

@@ -1,6 +1,5 @@
-#include <windef.h>
-
 #include "resource.h"
+#include <windows.h>
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

base/applications/kbswitch/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 /* Icons */
 #define IDI_MAIN         100
 

base/applications/kbswitch/rsrc.rc

@@ -1,6 +1,5 @@
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -19,9 +18,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif

base/applications/logoff/lang/ja-JP.rc

@@ -4,8 +4,8 @@ STRINGTABLE DISCARDABLE
 BEGIN
 
 IDS_USAGE, "セッションを終了します。\n\n\
-  /v\t\t実行中に詳細情報を表示します。\n\
-  /?\t\tこの情報を表示します。\n\n"
+  /v\t\t実行中に詳細情報を表 示します。\n\
+  /?\t\tこの情報を表 示します。\n\n"
 
 IDS_LOGOFF_REMOTE, "リモート マシンのセッションを終了しています。"
 IDS_LOGOFF_LOCAL,  "このマシンの現在のセッションを終了しています。"

base/applications/logoff/logoff.rc

@@ -1,5 +1,4 @@
-#include <windef.h>
-
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logoff Utility\0"

base/applications/logoff/precomp.h

@@ -1,16 +1,11 @@
 #ifndef __SHUTDOWN_PRECOMP_H
 #define __SHUTDOWN_PRECOMP_H
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-
 #include <stdio.h>
-//#include <stdlib.h>
+#include <stdlib.h>
+#include <windows.h>
 #include <tchar.h>
-//#include <reason.h> //shutdown codes
-
+#include <reason.h> //shutdown codes
 #include "resource.h"
 
 // misc.c

base/applications/logoff/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDS_USAGE    1000
 #define IDS_LOGOFF_REMOTE	1001
 #define IDS_LOGOFF_LOCAL	1002

base/applications/magnify/lang/tr-TR.rc

@@ -1,72 +0,0 @@
-/*
- * PROJECT:     ReactOS Magnifier
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        base/applications/magnify/lang/tr-TR.rc
- * PURPOSE:     Turkish Language File for Magnifier
- * TRANSLATOR:  2013 - Erdem Ersoy (eersoy93)
- */
- 
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-IDC_MAGNIFIER MENU
-BEGIN
-    POPUP "&Seçke"
-    BEGIN
-        MENUITEM "&Çıkış",                     IDM_EXIT
-        MENUITEM "&Ayarlar...",                IDM_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Hakkında",                  IDM_ABOUT
-    END
-END
-
-IDC_MAGNIFIER ACCELERATORS
-BEGIN
-    "?",            IDM_ABOUT,              ASCII,  ALT
-    "/",            IDM_ABOUT,              ASCII,  ALT
-END
-
-IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU
-CAPTION "Hakkında"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
-    ICON            IDI_ICON,IDC_MYICON,14,9,20,20
-    LTEXT           "Büyüteç: Sürüm 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX
-    LTEXT           "Telif Hakkı: 2007 - Marc Piulachs (marc.piulachs@codexchange.net)",IDC_STATIC,48,24,125,22
-    PUSHBUTTON      "Tamam",IDOK,162,48,50,14
-END
-
-IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Büyüteç Ayarları"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Çıkış",IDOK,96,161,50,14
-    PUSHBUTTON      "Yardım",IDC_BUTTON_HELP,38,161,50,14
-    LTEXT           "Büyütme düzeyi:",IDC_STATIC,6,8,68,8
-    COMBOBOX        IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "İzleme",IDC_STATIC,7,25,139,59
-    GROUPBOX        "Sunum",IDC_STATIC,7,87,139,57
-    CONTROL         "Fare imlecini takip et",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10
-    CONTROL         "Düğme takımı odağını izle",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10
-    CONTROL         "Metin düzenlemesini izle",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10
-    CONTROL         "Renkleri ters çevir",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10
-    CONTROL         "Simge durumunda başlat",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10
-    CONTROL         "Büyüteci göster",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10
-END
-
-IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97
-STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "ReactOS Büyüteç"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Tamam",IDOK,193,76,50,14
-    ICON            IDI_ICON,IDC_STATIC,7,17,20,20
-    LTEXT           "Büyüteç, hafif görme engelli kullanıcıların en az çaba harcamaları için tasarlanmıştır. Görme engelli bir çok kullanıcı, günlük kullanım için bu aracı kullanmaya gereksinim duyacaktır.",IDC_STATIC,36,7,207,33
-    CONTROL         "Bunu bir daha gösterme",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10
-END
-
-STRINGTABLE
-BEGIN
-    IDS_APP_TITLE           "Büyüteç"
-END

base/applications/magnify/magnifier.h

@@ -18,14 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <winreg.h>
-#include <wingdi.h>
-#include <tchar.h>
+//////////////////////////////////////////////////////////////////
 
+#include <windows.h>
+#include <commctrl.h>
+#include <tchar.h>
+#include <shellapi.h>
 #include "resource.h"
 
 extern int iZoom;

base/applications/magnify/magnify.rc

@@ -1,7 +1,5 @@
-#include <windef.h>
-#include <winuser.h>
 
-#include "resource.h"
+#include "magnifier.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 

base/applications/magnify/resource.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define IDC_STATIC                      -1
 
 #define IDI_ICON                        101

base/applications/magnify/rsrc.rc

@@ -1,6 +1,8 @@
+#include <windows.h>
+#include "resource.h"
+
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -16,9 +18,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif
@@ -46,9 +45,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

base/applications/mmc/mmc.rc

@@ -1,5 +1,6 @@
-#include <windef.h>
+/* $Id: sndvol32.rc 23239 2006-07-23 09:59:30Z janderwald $ */
 
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Management Console\0"

base/applications/mmc/precomp.h

@@ -1,10 +1,8 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <commctrl.h>
-#include <tchar.h>
 
+#include <windows.h>
+#include <commctrl.h>
+#include <shellapi.h>
+#include <tchar.h>
 #include "resource.h"
 
 /* console.c */

base/applications/mmc/rsrc.rc

@@ -1,6 +1,8 @@
+#include <windows.h>
+#include "resource.h"
+
 // UTF-8
 #pragma code_page(65001)
-
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -25,9 +27,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif

base/applications/mplay32/lang/tr-TR.rc

@@ -1,30 +0,0 @@
-LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
-
-IDR_MAINMENU MENU
-BEGIN
-	POPUP "&Kütük"
-	BEGIN
-		MENUITEM "&Aç...",       IDM_OPEN_FILE
-		MENUITEM "&Kapat",       IDM_CLOSE_FILE
-		MENUITEM SEPARATOR
-		MENUITEM "&Çıkış",       IDM_EXIT
-	END
-	POPUP "&Yardım"
-	BEGIN
-		MENUITEM "&Hakkında",    IDM_ABOUT
-	END
-END
-
-STRINGTABLE DISCARDABLE
-BEGIN
-	IDS_ALL_TYPES_FILTER "Tüm Desteklenen Dosyalar (*.wav, *.cda, *.mid, *.midi, *.avi)\0*.wav;*.cda;*.mid;*.midi;*.avi\0"
-	IDS_TOOLTIP_PLAY "Çal"
-	IDS_TOOLTIP_STOP "Durdur"
-	IDS_TOOLTIP_EJECT "Çıkar"
-	IDS_TOOLTIP_BACKWARD "Bir Önceki"
-	IDS_TOOLTIP_SEEKBACK "Geri Sar"
-	IDS_TOOLTIP_SEEKFORW "İleri Sar"
-	IDS_TOOLTIP_FORWARD "Bir Sonraki"
-	IDS_APPTITLE "ReactOS Çokluortam Oynatıcısı"
-	IDS_PLAY "Çal"
-END

base/applications/mplay32/mplay32.h

@@ -1,11 +1,4 @@
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-#include <wingdi.h>
-#include <commdlg.h>
-#include <shellapi.h>
-#include <mmsystem.h>
+#include <windows.h>
 #include <commctrl.h>
 #include <tchar.h>
 

base/applications/mplay32/mplay32.rc

@@ -1,5 +1,4 @@
-#include <windef.h>
-
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Multimedia Player\0"

base/applications/mplay32/rsrc.rc

@@ -1,3 +1,6 @@
+#include <windows.h>
+#include "resource.h"
+
 // UTF-8
 #pragma code_page(65001)
 #ifdef LANGUAGE_BG_BG
@@ -18,9 +21,6 @@
 #ifdef LANGUAGE_FR_FR
     #include "lang/fr-FR.rc"
 #endif
-#ifdef LANGUAGE_HE_IL
-    #include "lang/he-IL.rc"
-#endif
 #ifdef LANGUAGE_IT_IT
     #include "lang/it-IT.rc"
 #endif
@@ -51,9 +51,6 @@
 #ifdef LANGUAGE_SV_SE
     #include "lang/sv-SE.rc"
 #endif
-#ifdef LANGUAGE_TR_TR
-    #include "lang/tr-TR.rc"
-#endif
 #ifdef LANGUAGE_UK_UA
     #include "lang/uk-UA.rc"
 #endif

base/applications/msconfig/freeldrpage.c

@@ -7,7 +7,7 @@
  *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
  */
 
-#include "precomp.h"
+#include <precomp.h>
 
 HWND hFreeLdrPage;
 HWND hFreeLdrDialog;