Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-29 01:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete all Trailing spaces in code.

Browse source 
svn path=/trunk/; revision=29690
This commit is contained in:
Daniel Reimer 2007-10-19 23:21:45 +00:00
parent a7fddf9c07
commit ae7da04787
2821 changed files with 211074 additions and 211075 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/cacls/lang/uk-UA.rc
View file

@ -1,5 +1,5 @@
/* /*
* PROJECT: ReactOS CACLS * PROJECT: ReactOS CACLS
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: applications/cacls/lang/uk-UA.rc * FILE: applications/cacls/lang/uk-UA.rc
* PURPOSE: Ukraianian Language File for PROJECT * PURPOSE: Ukraianian Language File for PROJECT

2
reactos/base/applications/cacls/lang/zh-TW.rc
View file

@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

2
reactos/base/applications/calc/lang/fr-FR.rc
View file

@ -19,7 +19,7 @@
*/ */
/* /*
* Translation made by Jerome Signouret, 2005. * Translation made by Jerome Signouret, 2005.
* Updated by Pierre Schweitzer, 2007. * Updated by Pierre Schweitzer, 2007.
*/ */
#include "windows.h" #include "windows.h"
#include "resource.h" #include "resource.h"

14
reactos/base/applications/calc/lang/ja-JP.rc
View file

@ -39,7 +39,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
// Menu // Menu
// //
MAIN_MENU MENU MAIN_MENU MENU
BEGIN BEGIN
POPUP "•Ò<E280A2>W(&E)" POPUP "•Ò<E280A2>W(&E)"
BEGIN BEGIN
@ -61,7 +61,7 @@ BEGIN
END END
END END
SCIMS_MENU MENU SCIMS_MENU MENU
BEGIN BEGIN
POPUP "•Ò<E280A2>W(&E)" POPUP "•Ò<E280A2>W(&E)"
BEGIN BEGIN
@ -92,7 +92,7 @@ BEGIN
END END
END END
SCIWS_MENU MENU SCIWS_MENU MENU
BEGIN BEGIN
POPUP "•Ò<E280A2>W(&E)" POPUP "•Ò<E280A2>W(&E)"
BEGIN BEGIN
@ -124,7 +124,7 @@ BEGIN
END END
END END
WHATS_THIS_MENU MENU WHATS_THIS_MENU MENU
BEGIN BEGIN
POPUP "" POPUP ""
BEGIN BEGIN
@ -138,9 +138,9 @@ END
// Accelerator // Accelerator
// //
MAIN_MENU ACCELERATORS MAIN_MENU ACCELERATORS
BEGIN BEGIN
VK_F1, IDV_HELP, VIRTKEY VK_F1, IDV_HELP, VIRTKEY
END END
@ -173,7 +173,7 @@ END
// String Table // String Table
// //
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APPNAME "“d‘ì" IDS_APPNAME "“d‘ì"
IDS_BTN_BACKSPACE "Back" IDS_BTN_BACKSPACE "Back"

2
reactos/base/applications/calc/lang/zh-CN.rc
View file

@ -140,7 +140,7 @@ END
DLG_ABOUT DIALOGEX 12, 0, 140, 95 DLG_ABOUT DIALOGEX 12, 0, 140, 95
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
WS_SYSMENU WS_SYSMENU
CAPTION "关于 GNU winecalc" CAPTION "关于 GNU winecalc"
FONT 9, "MS Shell Dlg", 0, 0, 0x0 FONT 9, "MS Shell Dlg", 0, 0, 0x0

2
reactos/base/applications/calc/resource.h
View file

@ -32,7 +32,7 @@
#define IDM_SEPARATOR3 1010 #define IDM_SEPARATOR3 1010
#define IDM_WHATS_THIS 1011 #define IDM_WHATS_THIS 1011
#define IDI_CALCICON 1050 #define IDI_CALCICON 1050
/* strings */ /* strings */

40
reactos/base/applications/calc/winecalc.c
View file

@ -2948,16 +2948,16 @@ void calc_buffer_display(CALC *calc) {
calcfloat real; calcfloat real;
static int old_base = NBASE_DECIMAL; static int old_base = NBASE_DECIMAL;
switch (calc->numBase) { switch (calc->numBase) {
case NBASE_HEX: case NBASE_HEX:
real = calc_atof(calc->buffer, old_base); real = calc_atof(calc->buffer, old_base);
_stprintf(calc->display, _T("%lx"), (long)real); _stprintf(calc->display, _T("%lx"), (long)real);
_stprintf(calc->buffer, _T("%lx"), (long)real); _stprintf(calc->buffer, _T("%lx"), (long)real);
old_base = NBASE_HEX; old_base = NBASE_HEX;
break; break;
case NBASE_OCTAL: case NBASE_OCTAL:
real = calc_atof(calc->buffer, old_base); real = calc_atof(calc->buffer, old_base);
_stprintf(calc->display, TEXT("%lo"), (long)real); _stprintf(calc->display, TEXT("%lo"), (long)real);
_stprintf(calc->buffer, TEXT("%lo"), (long)real); _stprintf(calc->buffer, TEXT("%lo"), (long)real);
@ -2966,7 +2966,7 @@ void calc_buffer_display(CALC *calc) {
case NBASE_BINARY: case NBASE_BINARY:
{ {
int buf=0; int buf=0;
int t; int t;
if (calc->buffer[0]==_T('\0')) if (calc->buffer[0]==_T('\0'))
@ -2977,11 +2977,11 @@ void calc_buffer_display(CALC *calc) {
{ {
real = calc_atof(calc->buffer, old_base); real = calc_atof(calc->buffer, old_base);
} }
calc->display[buf]=_T('0'); calc->display[buf]=_T('0');
calc->buffer[buf]=_T('0'); calc->buffer[buf]=_T('0');
for (t=31;t>=0;t--) for (t=31;t>=0;t--)
{ {
if (((((long)real)>>t) & ~0xFFFFFFFE)==0) if (((((long)real)>>t) & ~0xFFFFFFFE)==0)
{ {
calc->display[buf]=_T('0'); calc->display[buf]=_T('0');
@ -2994,16 +2994,16 @@ void calc_buffer_display(CALC *calc) {
calc->buffer[buf]=_T('1'); calc->buffer[buf]=_T('1');
buf++; buf++;
} }
} }
if (buf==0) if (buf==0)
{ {
buf++; buf++;
} }
calc->buffer[buf]=_T('\0'); calc->buffer[buf]=_T('\0');
calc->display[buf]=_T('\0'); calc->display[buf]=_T('\0');
old_base = NBASE_BINARY; old_base = NBASE_BINARY;
} }
break; break;
@ -3021,7 +3021,7 @@ void calc_buffer_display(CALC *calc) {
int lz = 0; int lz = 0;
int exp = 0; int exp = 0;
real = calc_atof(calc->buffer,old_base); real = calc_atof(calc->buffer,old_base);
_stprintf(s, FMT_DESC_EXP, real); _stprintf(s, FMT_DESC_EXP, real);
@ -3072,10 +3072,10 @@ void calc_buffer_display(CALC *calc) {
else else
{ {
real = calc_atof(calc->buffer, old_base); real = calc_atof(calc->buffer, old_base);
} }
_stprintf(calc->display, _T("%.f"), real); _stprintf(calc->display, _T("%.f"), real);
_stprintf(calc->buffer, _T("%.f"), real); _stprintf(calc->buffer, _T("%.f"), real);
} }
_tcscpy(s,calc->buffer); _tcscpy(s,calc->buffer);
p = s; p = s;
@ -3102,7 +3102,7 @@ void calc_buffer_display(CALC *calc) {
} }
old_base = NBASE_DECIMAL; old_base = NBASE_DECIMAL;
} }
InvalidateRect(calc->hWnd, NULL, FALSE); InvalidateRect(calc->hWnd, NULL, FALSE);
UpdateWindow(calc->hWnd); UpdateWindow(calc->hWnd);
} }

4
reactos/base/applications/charmap/lang/el-GR.rc
View file

@ -6,7 +6,7 @@ CAPTION "
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
LTEXT "ÃñáììáôïóåéñÜ :",IDC_STATIC,6,7,60,9 LTEXT "ÃñáììáôïóåéñÜ :",IDC_STATIC,6,7,60,9
COMBOBOX IDC_FONTCOMBO,65,5,181,210,CBS_DROPDOWNLIST | CBS_SORT | COMBOBOX IDC_FONTCOMBO,65,5,181,210,CBS_DROPDOWNLIST | CBS_SORT |
CBS_HASSTRINGS | WS_VSCROLL CBS_HASSTRINGS | WS_VSCROLL
PUSHBUTTON "ÂïÞèåéá",IDC_CMHELP,249,5,35,13 PUSHBUTTON "ÂïÞèåéá",IDC_CMHELP,249,5,35,13
CONTROL "",IDC_FONTMAP,"FontMapWnd",WS_VSCROLL | WS_TABSTOP,20, CONTROL "",IDC_FONTMAP,"FontMapWnd",WS_VSCROLL | WS_TABSTOP,20,
@ -26,7 +26,7 @@ BEGIN
IDC_STATIC,48,7,150,36 IDC_STATIC,48,7,150,36
PUSHBUTTON "Êëåßóçìï",IDOK,75,162,44,15 PUSHBUTTON "Êëåßóçìï",IDOK,75,162,44,15
ICON 100,IDC_STATIC,10,10,7,30 ICON 100,IDC_STATIC,10,10,7,30
EDITTEXT IDC_LICENSE_EDIT,8,44,194,107,ES_MULTILINE | ES_READONLY | EDITTEXT IDC_LICENSE_EDIT,8,44,194,107,ES_MULTILINE | ES_READONLY |
WS_VSCROLL WS_VSCROLL
END END

8
reactos/base/applications/charmap/lang/pl-PL.rc
View file

@ -1,8 +1,8 @@
/* /*
* translated by xrogers * translated by xrogers
* xxrogers@users.sourceforge.net * xxrogers@users.sourceforge.net
* https://sourceforge.net/projects/reactospl * https://sourceforge.net/projects/reactospl
*/ */
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233 IDD_CHARMAP DIALOGEX 6, 6, 293, 205 //233

8
reactos/base/applications/charmap/lrgcell.c
View file

@ -20,7 +20,7 @@ SetLrgFont(PMAP infoPtr)
LPTSTR lpFontName; LPTSTR lpFontName;
INT Len; INT Len;
hCombo = GetDlgItem(infoPtr->hParent, hCombo = GetDlgItem(infoPtr->hParent,
IDC_FONTCOMBO); IDC_FONTCOMBO);
Len = GetWindowTextLength(hCombo); Len = GetWindowTextLength(hCombo);
@ -37,14 +37,14 @@ SetLrgFont(PMAP infoPtr)
WM_GETTEXT, WM_GETTEXT,
31, 31,
(LPARAM)lpFontName); (LPARAM)lpFontName);
ZeroMemory(&lf, ZeroMemory(&lf,
sizeof(lf)); sizeof(lf));
hdc = GetDC(infoPtr->hLrgWnd); hdc = GetDC(infoPtr->hLrgWnd);
lf.lfHeight = GetDeviceCaps(hdc, lf.lfHeight = GetDeviceCaps(hdc,
LOGPIXELSY) / 2; LOGPIXELSY) / 2;
ReleaseDC(infoPtr->hLrgWnd, ReleaseDC(infoPtr->hLrgWnd,
hdc); hdc);
lf.lfCharSet = DEFAULT_CHARSET; lf.lfCharSet = DEFAULT_CHARSET;

2
reactos/base/applications/cmdutils/find/lang/bg-BG.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "FIND:
/I Пренебрегва ГлАвНОсТта\n\ /I Пренебрегва ГлАвНОсТта\n\
/N Брой показани редове, като се започва от 1\n\ /N Брой показани редове, като се започва от 1\n\
/V Извеждане на редовете, НЕсъдържащи низа." /V Извеждане на редовете, НЕсъдържащи низа."
IDS_NO_SUCH_FILE, "FIND: %s: Няма такъв файл\n" IDS_NO_SUCH_FILE, "FIND: %s: Няма такъв файл\n"
IDS_CANNOT_OPEN, "FIND: %s: Отварянето на файла е невъзможно\n" IDS_CANNOT_OPEN, "FIND: %s: Отварянето на файла е невъзможно\n"

2
reactos/base/applications/cmdutils/find/lang/ca-ES.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "FIND: Mostra totes les linies que continguin una determinada cadena
/I Ignore case\n\ /I Ignore case\n\
/N Numero de linies mostrades, començant per la primera\n\ /N Numero de linies mostrades, començant per la primera\n\
/V Mostra les linies que no contenen la cadena de caràcters" /V Mostra les linies que no contenen la cadena de caràcters"
IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n" IDS_NO_SUCH_FILE, "FIND: %s: No he trobat el fitxer\n"
IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n" IDS_CANNOT_OPEN, "FIND: %s: No puc obrir el fitxer\n"

2
reactos/base/applications/cmdutils/find/lang/de-DE.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "Sucht in einer Datei nach einer Zeichenfolge.\n\n\
/I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\ /I Ignoriert Groß-/Kleinbuchstaben bei der Suche.\n\
/N Zeigt die Zeilen mit ihren Zeilennummern an.\n\ /N Zeigt die Zeilen mit ihren Zeilennummern an.\n\
/V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten." /V Zeigt alle Zeilen an, die die Zeichenfolge NICHT enhalten."
IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n" IDS_NO_SUCH_FILE, "Datei %s nicht gefunden\n"
IDS_CANNOT_OPEN, "Datei %s kann nicht geöffnet werden.\n" IDS_CANNOT_OPEN, "Datei %s kann nicht geöffnet werden.\n"

2
reactos/base/applications/cmdutils/find/lang/en-US.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "FIND: Prints all lines of a file that contain a string.\n\n\
/I Ignore case\n\ /I Ignore case\n\
/N Number the displayed lines, starting at 1\n\ /N Number the displayed lines, starting at 1\n\
/V Print lines that do not contain the string" /V Print lines that do not contain the string"
IDS_NO_SUCH_FILE, "FIND: %s: No such file\n" IDS_NO_SUCH_FILE, "FIND: %s: No such file\n"
IDS_CANNOT_OPEN, "FIND: %s: Cannot open file\n" IDS_CANNOT_OPEN, "FIND: %s: Cannot open file\n"

2
reactos/base/applications/cmdutils/find/lang/it-IT.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "FIND: Visualizza le linee di un file che contengono un stringa.\n\n\
/I Ignora maiuscole/minuscole\n\ /I Ignora maiuscole/minuscole\n\
/N Numera le linee visualizzate a partire da 1\n\ /N Numera le linee visualizzate a partire da 1\n\
/V Visualizza le linee che non contengono la stringa" /V Visualizza le linee che non contengono la stringa"
IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n" IDS_NO_SUCH_FILE, "FIND: %s: File non trovato\n"
IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n" IDS_CANNOT_OPEN, "FIND: %s: Impossibile aprire il file\n"

2
reactos/base/applications/cmdutils/find/lang/lt-LT.rc
View file

@ -18,7 +18,7 @@ IDS_USAGE, "FIND: Spausdina visas bylos eilutes, kuriose yra ie
/I Ignoruoti raidþiø dydá\n\ /I Ignoruoti raidþiø dydá\n\
/N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\ /N Numeruoti vaizduojamas eilutes, pradedant nuo 1\n\
/V Spausdinti eilutes, kuriose nëra ieðkomo teksto" /V Spausdinti eilutes, kuriose nëra ieðkomo teksto"
IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos nëra\n" IDS_NO_SUCH_FILE, "FIND: %s: Tokios bylos nëra\n"
IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n" IDS_CANNOT_OPEN, "FIND: %s: Nepavyko atverti bylos\n"

2
reactos/base/applications/cmdutils/find/lang/ru-RU.rc
View file

@ -9,7 +9,7 @@ IDS_USAGE, "FIND:
/I Поиск без учета регистра символов.\n\ /I Поиск без учета регистра символов.\n\
/N Вывод номеров отображаемых строк (начиная с 1).\n\ /N Вывод номеров отображаемых строк (начиная с 1).\n\
/V Вывод всех строк, НЕ содержащих заданную строку." /V Вывод всех строк, НЕ содержащих заданную строку."
IDS_NO_SUCH_FILE, "FIND: %s: Файл не существует.\n" IDS_NO_SUCH_FILE, "FIND: %s: Файл не существует.\n"
IDS_CANNOT_OPEN, "FIND: %s: Невозможно открыть файл.\n" IDS_CANNOT_OPEN, "FIND: %s: Невозможно открыть файл.\n"

2
reactos/base/applications/cmdutils/find/lang/uk-UA.rc
View file

@ -17,7 +17,7 @@ IDS_USAGE, "FIND:
/I Не враховувати регістр символів\n\ /I Не враховувати регістр символів\n\
/N Нумерувати рядки, які відображаються (починаючи з 1)\n\ /N Нумерувати рядки, які відображаються (починаючи з 1)\n\
/V Виведення рядків, які не містять заданий рядок" /V Виведення рядків, які не містять заданий рядок"
IDS_NO_SUCH_FILE, "FIND: %s: Файл не існує\n" IDS_NO_SUCH_FILE, "FIND: %s: Файл не існує\n"
IDS_CANNOT_OPEN, "FIND: %s: Неможливо відкрити файл\n" IDS_CANNOT_OPEN, "FIND: %s: Неможливо відкрити файл\n"

2
reactos/base/applications/control/control.c
View file

@ -40,7 +40,7 @@
//#define CONTROL_DEBUG_ENABLE //#define CONTROL_DEBUG_ENABLE
#ifdef CONTROL_DEBUG_ENABLE #ifdef CONTROL_DEBUG_ENABLE
#define CTL_DEBUG(x) dbgprint x #define CTL_DEBUG(x) dbgprint x
#else #else
#define CTL_DEBUG(x) #define CTL_DEBUG(x)
#endif #endif

2
reactos/base/applications/control/lang/bg-BG.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Ôàéë" POPUP "&Ôàéë"
BEGIN BEGIN

2
reactos/base/applications/control/lang/cs-CZ.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Soubor" POPUP "&Soubor"
BEGIN BEGIN

2
reactos/base/applications/control/lang/da-DK.rc
View file

@ -6,7 +6,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
// //
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Fil" POPUP "&Fil"
BEGIN BEGIN

2
reactos/base/applications/control/lang/de-DE.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Datei" POPUP "&Datei"
BEGIN BEGIN

2
reactos/base/applications/control/lang/el-GR.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Áñ÷åßï" POPUP "&Áñ÷åßï"
BEGIN BEGIN

2
reactos/base/applications/control/lang/en-US.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN

2
reactos/base/applications/control/lang/es-ES.rc
View file

@ -11,7 +11,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Archivo" POPUP "&Archivo"
BEGIN BEGIN

2
reactos/base/applications/control/lang/fi-FI.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Tiedosto" POPUP "&Tiedosto"
BEGIN BEGIN

2
reactos/base/applications/control/lang/fr-FR.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Fichier" POPUP "&Fichier"
BEGIN BEGIN

2
reactos/base/applications/control/lang/hu-HU.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Fájl" POPUP "&Fájl"
BEGIN BEGIN

2
reactos/base/applications/control/lang/id-ID.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN

2
reactos/base/applications/control/lang/it-IT.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
BEGIN BEGIN

2
reactos/base/applications/control/lang/ja-JP.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "ファイル(&F)" POPUP "ファイル(&F)"
BEGIN BEGIN

2
reactos/base/applications/control/lang/lt-LT.rc
View file

@ -9,7 +9,7 @@
LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Byla" POPUP "&Byla"
BEGIN BEGIN

2
reactos/base/applications/control/lang/nl-NL.rc
View file

@ -8,7 +8,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Bestand" POPUP "&Bestand"
BEGIN BEGIN

2
reactos/base/applications/control/lang/pl-PL.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Plik" POPUP "&Plik"
BEGIN BEGIN

2
reactos/base/applications/control/lang/pt-BR.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Arquivo" POPUP "&Arquivo"
BEGIN BEGIN

2
reactos/base/applications/control/lang/ru-RU.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Ôàéë" POPUP "&Ôàéë"
BEGIN BEGIN

2
reactos/base/applications/control/lang/sk-SK.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Súbor" POPUP "&Súbor"
BEGIN BEGIN

2
reactos/base/applications/control/lang/sv-SE.rc
View file

@ -7,7 +7,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Arkiv" POPUP "&Arkiv"
BEGIN BEGIN

2
reactos/base/applications/control/lang/th-TH.rc
View file

@ -14,7 +14,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "á&¿éÁ" POPUP "á&¿éÁ"
BEGIN BEGIN

2
reactos/base/applications/control/lang/uk-UA.rc
View file

@ -13,7 +13,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Ôàéë" POPUP "&Ôàéë"
BEGIN BEGIN

2
reactos/base/applications/control/lang/zh-CN.rc
View file

@ -25,7 +25,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
// Menu // Menu
// //
IDM_MAINMENU MENU DISCARDABLE IDM_MAINMENU MENU DISCARDABLE
BEGIN BEGIN
POPUP "文件(&F)" POPUP "文件(&F)"
BEGIN BEGIN

2
reactos/base/applications/control/resource.h
View file

@ -12,7 +12,7 @@
#define IDM_CLOSE 40005 #define IDM_CLOSE 40005
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_RESOURCE_VALUE 102

50
reactos/base/applications/games/solitaire/cardlib/cardbitmaps.cpp
View file

@ -32,13 +32,13 @@ void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)
{ {
//convert into the range used by the cdt_xxx functions //convert into the range used by the cdt_xxx functions
int val; int val;
if(i < 52) val = (i % 4) * 13 + (i/4); if(i < 52) val = (i % 4) * 13 + (i/4);
else val = i; else val = i;
hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1)); hBitmap = LoadBitmap(hCardDll, MAKEINTRESOURCE(val + 1));
GetObject(hBitmap, sizeof(bmp), &bmp); GetObject(hBitmap, sizeof(bmp), &bmp);
width = bmp.bmWidth; width = bmp.bmWidth;
height = bmp.bmHeight; height = bmp.bmHeight;
@ -53,11 +53,11 @@ void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)
ReleaseDC(0, hdc); ReleaseDC(0, hdc);
} }
hOld = SelectObject(hdcCard, hBitmap); hOld = SelectObject(hdcCard, hBitmap);
BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY); BitBlt(__hdcCardBitmaps, i*width, 0, width, height, hdcCard, 0, 0, SRCCOPY);
SelectObject(hdcCard, hOld); SelectObject(hdcCard, hOld);
//Now draw a black border around each card... //Now draw a black border around each card...
xpos = i*width; xpos = i*width;
MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0); MoveToEx(__hdcCardBitmaps, xpos+2, 0, 0);
@ -69,21 +69,21 @@ void LoadCardBitmapsFromLibrary(HINSTANCE hCardDll, int *pwidth, int *pheight)
LineTo(__hdcCardBitmaps, xpos+0, height - 3); LineTo(__hdcCardBitmaps, xpos+0, height - 3);
LineTo(__hdcCardBitmaps, xpos+0, 2); LineTo(__hdcCardBitmaps, xpos+0, 2);
LineTo(__hdcCardBitmaps, xpos+2, 0); LineTo(__hdcCardBitmaps, xpos+2, 0);
DeleteObject(hBitmap); DeleteObject(hBitmap);
} }
DeleteDC(hdcCard); DeleteDC(hdcCard);
*pwidth = width; *pwidth = width;
*pheight = height; *pheight = height;
} }
void LoadCardBitmaps(void) void LoadCardBitmaps(void)
{ {
HINSTANCE hCardDll; HINSTANCE hCardDll;
//If Windows NT/2000/XP //If Windows NT/2000/XP
if(GetVersion() < 0x80000000) if(GetVersion() < 0x80000000)
@ -96,9 +96,9 @@ void LoadCardBitmaps(void)
PostQuitMessage(0); PostQuitMessage(0);
return; return;
} }
LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight); LoadCardBitmapsFromLibrary(hCardDll, &__cardwidth, &__cardheight);
FreeLibrary(hCardDll); FreeLibrary(hCardDll);
} }
#ifndef __REACTOS__ #ifndef __REACTOS__
@ -132,9 +132,9 @@ void FreeCardBitmaps()
// //
static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg) static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg)
{ {
static WORD wCheckPat[8] = static WORD wCheckPat[8] =
{ {
0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555, 0xaaaa, 0x5555
}; };
HBITMAP hbmp; HBITMAP hbmp;
@ -152,15 +152,15 @@ static void DrawCheckedRect(HDC hdc, RECT *rect, COLORREF fg, COLORREF bg)
fgold = SetTextColor(hdc, fg); fgold = SetTextColor(hdc, fg);
bgold = SetBkColor(hdc, bg); bgold = SetBkColor(hdc, bg);
PatBlt(hdc, rect->left, rect->top, PatBlt(hdc, rect->left, rect->top,
rect->right - rect->left, rect->right - rect->left,
rect->bottom - rect->top, rect->bottom - rect->top,
PATCOPY); PATCOPY);
SetBkColor(hdc, bgold); SetBkColor(hdc, bgold);
SetTextColor(hdc, fgold); SetTextColor(hdc, fgold);
SelectObject(hdc, hbrold); SelectObject(hdc, hbrold);
DeleteObject(hbr); DeleteObject(hbr);
DeleteObject(hbmp); DeleteObject(hbmp);
@ -196,13 +196,13 @@ HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int heigh
hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg)); hpfg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(fg));
hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg)); hpbg = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(bg));
hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow)); hpsh = CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow));
hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2)); hpsh2= CreatePen(PS_SOLID, 0, MAKE_PALETTERGB(shadow2));
hpold = SelectObject(hdc, hpsh); hpold = SelectObject(hdc, hpsh);
MoveToEx(hdc, 2, 0, NULL); MoveToEx(hdc, 2, 0, NULL);
LineTo (hdc, width-3,0); LineTo (hdc, width-3,0);
LineTo (hdc, width-1, 2); LineTo (hdc, width-1, 2);
SelectObject(hdc, hpold); SelectObject(hdc, hpold);
hpold = SelectObject(hdc, hpsh2); hpold = SelectObject(hdc, hpsh2);
LineTo (hdc, width-1, height-3); //vertical LineTo (hdc, width-1, height-3); //vertical
@ -222,12 +222,12 @@ HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int heigh
hpold = SelectObject(hdc, hpfg); hpold = SelectObject(hdc, hpfg);
MoveToEx(hdc, width - 2, 3, NULL); MoveToEx(hdc, width - 2, 3, NULL);
LineTo (hdc, width - 2, height - 2); LineTo (hdc, width - 2, height - 2);
//(horz) //(horz)
MoveToEx(hdc, width - 3, height-2, NULL); MoveToEx(hdc, width - 3, height-2, NULL);
LineTo (hdc, 3, height-2); LineTo (hdc, 3, height-2);
SelectObject(hdc, hpold); SelectObject(hdc, hpold);
//draw the background //draw the background
InflateRect(&rect, -2, -2); InflateRect(&rect, -2, -2);
DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg)); DrawCheckedRect(hdc, &rect, MAKE_PALETTERGB(bg), MAKE_PALETTERGB(fg));
@ -240,7 +240,7 @@ HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, COLORREF col, int width, int heigh
DeleteObject(hpfg); DeleteObject(hpfg);
DeleteObject(hpbg); DeleteObject(hpbg);
return hbm; return hbm;
} }

64
reactos/base/applications/games/solitaire/cardlib/cardbutton.cpp
View file

@ -24,7 +24,7 @@ CardButton::CardButton(CardWindow &parent, int Id, TCHAR *szText, UINT Style, bo
{ {
crText = RGB(255,255,255); crText = RGB(255,255,255);
crBack = RGB(0, 128, 0); crBack = RGB(0, 128, 0);
xadjust = 0; xadjust = 0;
yadjust = 0; yadjust = 0;
xjustify = 0; xjustify = 0;
@ -57,16 +57,16 @@ void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal)
HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight)); HPEN hhi = CreatePen(0, 0, MAKE_PALETTERGB(crHighlight));
HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow)); HPEN hsh = CreatePen(0, 0, MAKE_PALETTERGB(crShadow));
HPEN hbl = (HPEN)GetStockObject(BLACK_PEN); HPEN hbl = (HPEN)GetStockObject(BLACK_PEN);
int x = rect->left; int x = rect->left;
int y = rect->top; int y = rect->top;
int width = rect->right-rect->left - 1; int width = rect->right-rect->left - 1;
int height = rect->bottom-rect->top - 1; int height = rect->bottom-rect->top - 1;
SetRect(&fill, x+1, y+1, x+width-1, y+height-1); SetRect(&fill, x+1, y+1, x+width-1, y+height-1);
int one = 1; int one = 1;
if(!fNormal) if(!fNormal)
{ {
x += width; x += width;
@ -76,7 +76,7 @@ void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal)
one = -1; one = -1;
OffsetRect(&fill, 1, 1); OffsetRect(&fill, 1, 1);
} }
if(fNormal) if(fNormal)
hOld = SelectObject(hdc, hhi); hOld = SelectObject(hdc, hhi);
else else
@ -107,7 +107,7 @@ void CardButton::DrawRect(HDC hdc, RECT *rect, bool fNormal)
void CardButton::Clip(HDC hdc) void CardButton::Clip(HDC hdc)
{ {
if(fVisible == false) return; if(fVisible == false) return;
ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom); ExcludeClipRect(hdc, rect.left, rect.top, rect.right, rect.bottom);
} }
@ -123,12 +123,12 @@ void CardButton::Draw(HDC hdc, bool fNormal)
if(fVisible == 0) return; if(fVisible == 0) return;
if(hFont == 0) if(hFont == 0)
SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT)); SelectObject(hdc, GetStockObject(DEFAULT_GUI_FONT));
else else
SelectObject(hdc, hFont); SelectObject(hdc, hFont);
GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize); GetTextExtentPoint32(hdc, szText, lstrlen(szText), &textsize);
if(hIcon) if(hIcon)
{ {
x = rect.left + 32 + 8; x = rect.left + 32 + 8;
@ -150,11 +150,11 @@ void CardButton::Draw(HDC hdc, bool fNormal)
x += rect.left + iconwidth; x += rect.left + iconwidth;
} }
} }
y = rect.bottom - rect.top; y = rect.bottom - rect.top;
y = (y - textsize.cy) / 2; y = (y - textsize.cy) / 2;
y += rect.top; y += rect.top;
//calc icon position.. //calc icon position..
ix = rect.left + 4; ix = rect.left + 4;
iy = rect.top + (rect.bottom-rect.top-32) / 2; iy = rect.top + (rect.bottom-rect.top-32) / 2;
@ -174,20 +174,20 @@ void CardButton::Draw(HDC hdc, bool fNormal)
// //
// Calc icon pos // Calc icon pos
// //
if(hIcon) if(hIcon)
{ {
ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32); ExcludeClipRect(hdc, ix, iy, ix + 32, iy + 32);
} }
if(uStyle & CB_PUSHBUTTON) if(uStyle & CB_PUSHBUTTON)
{ {
DrawRect(hdc, &rect, fNormal); DrawRect(hdc, &rect, fNormal);
SetBkColor(hdc, MAKE_PALETTERGB(crBack)); SetBkColor(hdc, MAKE_PALETTERGB(crBack));
SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText)); SetTextColor(hdc, crText);//MAKE_PALETTERGB(crText));
SelectClipRgn(hdc, 0); SelectClipRgn(hdc, 0);
ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0); ExtTextOut(hdc, x, y, ETO_OPAQUE, &cliprect, szText, lstrlen(szText), 0);
} }
@ -257,7 +257,7 @@ void CardButton::AdjustPosition(int winwidth, int winheight)
int CardButton::OnLButtonDown(HWND hwnd, int x, int y) int CardButton::OnLButtonDown(HWND hwnd, int x, int y)
{ {
if((uStyle & CB_PUSHBUTTON) == 0) if((uStyle & CB_PUSHBUTTON) == 0)
return 0; return 0;
//make sure that the user is allowed to do something //make sure that the user is allowed to do something
@ -269,7 +269,7 @@ int CardButton::OnLButtonDown(HWND hwnd, int x, int y)
{ {
ReleaseMutex(mxlock); ReleaseMutex(mxlock);
} }
fMouseDown = true; fMouseDown = true;
fButtonDown = true; fButtonDown = true;
@ -287,19 +287,19 @@ int CardButton::OnMouseMove(HWND hwnd, int x, int y)
bool fOldButtonDown = fButtonDown; bool fOldButtonDown = fButtonDown;
POINT pt; POINT pt;
pt.x = x; pt.x = x;
pt.y = y; pt.y = y;
if(PtInRect(&rect, pt)) if(PtInRect(&rect, pt))
fButtonDown = true; fButtonDown = true;
else else
fButtonDown = false; fButtonDown = false;
if(fButtonDown != fOldButtonDown) if(fButtonDown != fOldButtonDown)
Redraw(); Redraw();
} }
return 0; return 0;
} }
@ -309,19 +309,19 @@ int CardButton::OnLButtonUp(HWND hwnd, int x, int y)
{ {
fMouseDown = false; fMouseDown = false;
fButtonDown = false; fButtonDown = false;
if(uStyle & CB_PUSHBUTTON) if(uStyle & CB_PUSHBUTTON)
{ {
Redraw(); Redraw();
ReleaseCapture(); ReleaseCapture();
} }
//if have clicked the button //if have clicked the button
if(parentWnd.CardButtonFromPoint(x, y) == this) if(parentWnd.CardButtonFromPoint(x, y) == this)
{ {
if(ButtonCallback) if(ButtonCallback)
{ {
ButtonCallback(*this); ButtonCallback(*this);
} }
else else
{ {
@ -340,7 +340,7 @@ CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fV
{ {
CardButton *cb; CardButton *cb;
if(nNumButtons == MAXBUTTONS) if(nNumButtons == MAXBUTTONS)
return 0; return 0;
cb = new CardButton(*this, id, szText, uStyle, fVisible, x, y, width, height); cb = new CardButton(*this, id, szText, uStyle, fVisible, x, y, width, height);
@ -357,7 +357,7 @@ CardButton *CardWindow::CreateButton(int id, TCHAR *szText, UINT uStyle, bool fV
cb->SetBackColor(crBackgnd); cb->SetBackColor(crBackgnd);
cb->SetForeColor(RGB(255,255,255)); cb->SetForeColor(RGB(255,255,255));
} }
return cb; return cb;
} }
@ -394,9 +394,9 @@ void CardButton::Redraw()
HPALETTE hOldPal = UseNicePalette(hdc, __hPalette); HPALETTE hOldPal = UseNicePalette(hdc, __hPalette);
Draw(hdc, !fButtonDown); Draw(hdc, !fButtonDown);
RestorePalette(hdc, hOldPal); RestorePalette(hdc, hOldPal);
ReleaseDC((HWND)parentWnd, hdc); ReleaseDC((HWND)parentWnd, hdc);
} }
@ -411,7 +411,7 @@ void CardButton::SetBackColor(COLORREF cr)
crHighlight = GetHighlight(cr); crHighlight = GetHighlight(cr);
crShadow = GetShadow(cr); crShadow = GetShadow(cr);
//crHighlight = ScaleLumRGB(cr, +0.25); //crHighlight = ScaleLumRGB(cr, +0.25);
//crShadow = ScaleLumRGB(cr, -0.25); //crShadow = ScaleLumRGB(cr, -0.25);
} }
@ -444,7 +444,7 @@ void CardButton::SetPlacement(UINT xJustify, UINT yJustify, int xAdjust, int yAd
void CardButton::SetIcon(HICON hicon, bool fRedraw) void CardButton::SetIcon(HICON hicon, bool fRedraw)
{ {
hIcon = hicon; hIcon = hicon;
if(fRedraw) if(fRedraw)
Redraw(); Redraw();
} }
@ -465,7 +465,7 @@ bool CardButton::Lock()
DWORD dw = WaitForSingleObject(mxlock, 0); DWORD dw = WaitForSingleObject(mxlock, 0);
if(dw == WAIT_OBJECT_0) if(dw == WAIT_OBJECT_0)
return true; return true;
else else
return false; return false;
} }

44
reactos/base/applications/games/solitaire/cardlib/cardcolor.cpp
View file

@ -25,7 +25,7 @@ inline double fMin(double a, double b)
COPYRIGHT:1995-1997 Robert Mashlan COPYRIGHT:1995-1997 Robert Mashlan
Modified for LabWindows/CVI, 1999 Guillaume Dargaud Modified for LabWindows/CVI, 1999 Guillaume Dargaud
******************************************************************************/ ******************************************************************************/
void RGBtoHLS(const COLORREF rgb, double *H, double *L, double *S ) void RGBtoHLS(const COLORREF rgb, double *H, double *L, double *S )
{ {
double delta; double delta;
double r = (double)((rgb )&0xFF)/255; double r = (double)((rgb )&0xFF)/255;
@ -34,19 +34,19 @@ void RGBtoHLS(const COLORREF rgb, double *H, double *L, double *S )
double cmax = MAX3(r,g,b); double cmax = MAX3(r,g,b);
double cmin = MIN3(r,g,b); double cmin = MIN3(r,g,b);
*L=(cmax+cmin)/2.0; *L=(cmax+cmin)/2.0;
if(cmax == cmin) if(cmax == cmin)
{ {
*S = *H = 0; // it's really undefined *S = *H = 0; // it's really undefined
} }
else else
{ {
if(*L < 0.5) *S = (cmax-cmin)/(cmax+cmin); if(*L < 0.5) *S = (cmax-cmin)/(cmax+cmin);
else *S = (cmax-cmin)/(2.0-cmax-cmin); else *S = (cmax-cmin)/(2.0-cmax-cmin);
delta = cmax - cmin; delta = cmax - cmin;
if(r == cmax) if(r == cmax)
{ {
*H = (g - b) / delta; *H = (g - b) / delta;
} }
@ -66,7 +66,7 @@ void RGBtoHLS(const COLORREF rgb, double *H, double *L, double *S )
COPYRIGHT:1995-1997 Robert Mashlan COPYRIGHT:1995-1997 Robert Mashlan
Modified for LabWindows/CVI, 1999 Guillaume Dargaud Modified for LabWindows/CVI, 1999 Guillaume Dargaud
******************************************************************************/ ******************************************************************************/
double HueToRGB(const double m1, const double m2, double h ) double HueToRGB(const double m1, const double m2, double h )
{ {
if (h<0) h+=1.0; if (h<0) h+=1.0;
if (h>1) h-=1.0; if (h>1) h-=1.0;
@ -86,20 +86,20 @@ double HueToRGB(const double m1, const double m2, double h )
Modified for LabWindows/CVI, 1999 Guillaume Dargaud Modified for LabWindows/CVI, 1999 Guillaume Dargaud
******************************************************************************/ ******************************************************************************/
COLORREF HLStoRGB(const double H, const double L, const double S ) COLORREF HLStoRGB(const double H, const double L, const double S )
{ {
double r,g,b; double r,g,b;
double m1, m2; double m1, m2;
if(S == 0) if(S == 0)
{ {
r = g = b = L; r = g = b = L;
} }
else else
{ {
if (L <= 0.5) if (L <= 0.5)
m2 = L * (1.0 + S); m2 = L * (1.0 + S);
else else
m2 = L + S - L * S; m2 = L + S - L * S;
m1 = 2.0 * L - m2; m1 = 2.0 * L - m2;
@ -108,7 +108,7 @@ COLORREF HLStoRGB(const double H, const double L, const double S )
g = HueToRGB(m1,m2,H); g = HueToRGB(m1,m2,H);
b = HueToRGB(m1,m2,H-1.0/3.0); b = HueToRGB(m1,m2,H-1.0/3.0);
} }
return RGB(r*255, g*255, b*255); return RGB(r*255, g*255, b*255);
} }
@ -118,7 +118,7 @@ COLORREF HLStoRGB(const double H, const double L, const double S )
FUNCTION: ColorScaleHSL FUNCTION: ColorScaleHSL
PURPOSE: Returns the HSL linear interpolated color between 2 colors PURPOSE: Returns the HSL linear interpolated color between 2 colors
(more natural looking than RGB interpolation) (more natural looking than RGB interpolation)
For instance if the luminance is the same in Col1 and Col2, For instance if the luminance is the same in Col1 and Col2,
then the luminance of the result will be the same then the luminance of the result will be the same
If Ratio=0, you get Col1, If Ratio=0, you get Col1,
If Ratio=1, you get Col2 If Ratio=1, you get Col2
@ -127,10 +127,10 @@ COLORREF HLStoRGB(const double H, const double L, const double S )
Ratio: 0 for low color, 1 for high color, or in between Ratio: 0 for low color, 1 for high color, or in between
EXAMPLE: Col1=0, Col2=0xFF00FF, Ratio=0.5 returns 0x1F5F3F EXAMPLE: Col1=0, Col2=0xFF00FF, Ratio=0.5 returns 0x1F5F3F
******************************************************************************/ ******************************************************************************/
COLORREF ColorScaleHSL( const COLORREF Col1, const COLORREF Col2, const double Ratio) COLORREF ColorScaleHSL( const COLORREF Col1, const COLORREF Col2, const double Ratio)
{ {
static double H1, H2, S1, S2, L1, L2; static double H1, H2, S1, S2, L1, L2;
if (Ratio<=0) return Col1; // Ratio parameter must be between 0 and 1 if (Ratio<=0) return Col1; // Ratio parameter must be between 0 and 1
else if (Ratio>=1) return Col2; else if (Ratio>=1) return Col2;
@ -150,8 +150,8 @@ COLORREF ColorScaleHSL( const COLORREF Col1, const COLORREF Col2, const doubl
Ratio: 0 for low color, 1 for high color, or in between Ratio: 0 for low color, 1 for high color, or in between
EXAMPLE: Col1=0, Col2=0xFF00FF, Ratio=0.5 returns 0x800080 EXAMPLE: Col1=0, Col2=0xFF00FF, Ratio=0.5 returns 0x800080
******************************************************************************/ ******************************************************************************/
COLORREF ColorScaleRGB( const COLORREF Col1, COLORREF ColorScaleRGB( const COLORREF Col1,
const COLORREF Col2, const COLORREF Col2,
const double Ratio) { const double Ratio) {
int R1=(Col1)&0xFF, G1=(Col1>>8)&0xFF, B1=(Col1>>16)&0xFF; int R1=(Col1)&0xFF, G1=(Col1>>8)&0xFF, B1=(Col1>>16)&0xFF;
int R2=(Col2)&0xFF, G2=(Col2>>8)&0xFF, B2=(Col2>>16)&0xFF; int R2=(Col2)&0xFF, G2=(Col2>>8)&0xFF, B2=(Col2>>16)&0xFF;
@ -285,7 +285,7 @@ COLORREF HLStoRGB(const double Hue, const double Lum, const double Sat)
if(Sat == 0) if(Sat == 0)
{ {
red = green = blue = (BYTE)(Lum * 255); red = green = blue = (BYTE)(Lum * 255);
} }
else else
{ {
@ -317,10 +317,10 @@ COLORREF ScaleLumRGB(COLORREF col1, double ratio)
return HLStoRGB(H1, L1, S1); return HLStoRGB(H1, L1, S1);
} }
COLORREF ColorScaleHSL(const COLORREF Col1, const COLORREF Col2, const double Ratio) COLORREF ColorScaleHSL(const COLORREF Col1, const COLORREF Col2, const double Ratio)
{ {
static double H1, H2, S1, S2, L1, L2; static double H1, H2, S1, S2, L1, L2;
if(Ratio <= 0) return Col1; // Ratio parameter must be between 0 and 1 if(Ratio <= 0) return Col1; // Ratio parameter must be between 0 and 1
else if(Ratio >= 1) return Col2; else if(Ratio >= 1) return Col2;

8
reactos/base/applications/games/solitaire/cardlib/cardcolor.h
View file

@ -1,10 +1,10 @@
COLORREF ColorScaleRGB( const COLORREF Col1, COLORREF ColorScaleRGB( const COLORREF Col1,
const COLORREF Col2, const COLORREF Col2,
const double Ratio); const double Ratio);
COLORREF ColorScaleHSL( const COLORREF Col1, COLORREF ColorScaleHSL( const COLORREF Col1,
const COLORREF Col2, const COLORREF Col2,
const double Ratio); const double Ratio);

12
reactos/base/applications/games/solitaire/cardlib/cardcount.cpp
View file

@ -1,16 +1,16 @@
// //
// CardCount is a helper library for CardStacks. // CardCount is a helper library for CardStacks.
// //
// When you initialize a CardCount object with a // When you initialize a CardCount object with a
// cardstack, it keeps track of the number of cards // cardstack, it keeps track of the number of cards
// the stack contains. // the stack contains.
// //
// e.g. CardCount count(cardstack); // e.g. CardCount count(cardstack);
// //
// Then you can do: // Then you can do:
// //
// int num_fives = count[5] // int num_fives = count[5]
// //
// count.Add(cardstack2); - combine with another stack // count.Add(cardstack2); - combine with another stack
// //
// int num_aces = count[1] - aces low // int num_aces = count[1] - aces low
@ -53,7 +53,7 @@ void CardCount::Sub(const CardStack &cs)
{ {
Card card = cs[i]; Card card = cs[i];
int val = card.LoVal(); int val = card.LoVal();
if(count[val - 1] > 0) if(count[val - 1] > 0)
count[val - 1]--; count[val - 1]--;
} }
@ -85,6 +85,6 @@ void CardCount::Dec(size_t index)
index -= 1; index -= 1;
if(count[index] > 0) if(count[index] > 0)
count[index]--; count[index]--;
} }

2
reactos/base/applications/games/solitaire/cardlib/cardcount.h
View file

@ -24,7 +24,7 @@ public:
CardCount &operator += (const CardStack &cs); CardCount &operator += (const CardStack &cs);
private: private:
int count[13]; //13 different card values int count[13]; //13 different card values
//(ace,2,3,4,5,6,7,8,9,10,J,Q,K) //(ace,2,3,4,5,6,7,8,9,10,J,Q,K)
}; };

2
reactos/base/applications/games/solitaire/cardlib/cardlib.cpp
View file

@ -48,7 +48,7 @@ void CardLib_SetZoomSpeed(int speed)
It uses the Card(int uval) constructor, It uses the Card(int uval) constructor,
which results in a 2 of clubs... which results in a 2 of clubs...
not what was expected not what was expected
*/ */
/* /*
void CardLib_SetAcesHigh(bool fHigh); void CardLib_SetAcesHigh(bool fHigh);
bool operator != (const Card &lhs, const Card &rhs); bool operator != (const Card &lhs, const Card &rhs);

68
reactos/base/applications/games/solitaire/cardlib/cardregion.cpp
View file

@ -15,7 +15,7 @@ HBITMAP CreateSinkBmp(HDC hdcCompat, HDC hdc, int width, int height);
void PaintRect(HDC hdc, RECT *rect, COLORREF colour); void PaintRect(HDC hdc, RECT *rect, COLORREF colour);
CardRegion::CardRegion(CardWindow &parent, int Id, bool visible, int x, int y, int xOffset, int yOffset) CardRegion::CardRegion(CardWindow &parent, int Id, bool visible, int x, int y, int xOffset, int yOffset)
: id(Id), parentWnd(parent), xpos(x), ypos(y), xoffset(xOffset), yoffset(yOffset), fVisible(visible) : id(Id), parentWnd(parent), xpos(x), ypos(y), xoffset(xOffset), yoffset(yOffset), fVisible(visible)
{ {
width = __cardwidth; width = __cardwidth;
@ -40,7 +40,7 @@ CardRegion::CardRegion(CardWindow &parent, int Id, bool visible, int x, int y, i
nDragCardWidth = 0; nDragCardWidth = 0;
nDragCardHeight = 0; nDragCardHeight = 0;
CanDragCallback = 0; CanDragCallback = 0;
CanDropCallback = 0; CanDropCallback = 0;
AddCallback = 0; AddCallback = 0;
@ -116,7 +116,7 @@ CardRegion *CardWindow::CreateRegion(int id, bool fVisible, int x, int y, int xo
cr->SetBackCardIdx(nBackCardIdx); cr->SetBackCardIdx(nBackCardIdx);
Regions[nNumCardRegions++] = cr; Regions[nNumCardRegions++] = cr;
return cr; return cr;
} }
@ -147,7 +147,7 @@ int CardRegion::GetOverlapRatio(int x, int y, int w, int h)
} }
bool CardRegion::SetDragRule(UINT uDragType, pCanDragProc proc) bool CardRegion::SetDragRule(UINT uDragType, pCanDragProc proc)
{ {
switch(uDragType) switch(uDragType)
{ {
case CS_DRAG_NONE: case CS_DRAG_ALL: case CS_DRAG_TOP: case CS_DRAG_NONE: case CS_DRAG_ALL: case CS_DRAG_TOP:
@ -165,10 +165,10 @@ bool CardRegion::SetDragRule(UINT uDragType, pCanDragProc proc)
} }
bool CardRegion::SetDropRule(UINT uDropType, pCanDropProc proc) bool CardRegion::SetDropRule(UINT uDropType, pCanDropProc proc)
{ {
switch(uDropType) switch(uDropType)
{ {
case CS_DROP_NONE: case CS_DROP_ALL: case CS_DROP_NONE: case CS_DROP_ALL:
uDropRule = uDropType; uDropRule = uDropType;
return true; return true;
@ -205,14 +205,14 @@ void CardRegion::SetRemoveCardProc(pRemoveProc proc)
void CardRegion::Update() void CardRegion::Update()
{ {
CalcApparentCards(); CalcApparentCards();
UpdateSize(); UpdateSize();
UpdateFaceDir(cardstack); UpdateFaceDir(cardstack);
} }
bool CardRegion::SetThreedCount(int count) bool CardRegion::SetThreedCount(int count)
{ {
if(count < 1) if(count < 1)
{ {
return false; return false;
} }
@ -241,7 +241,7 @@ void CardRegion::Show(bool fShow)
} }
bool CardRegion::IsVisible() bool CardRegion::IsVisible()
{ {
return fVisible; return fVisible;
} }
@ -283,13 +283,13 @@ void CardRegion::AdjustPosition(int winwidth, int winheight)
switch(xjustify) switch(xjustify)
{ {
default: case CS_XJUST_NONE: break; default: case CS_XJUST_NONE: break;
case CS_XJUST_CENTER: //centered case CS_XJUST_CENTER: //centered
xpos = (winwidth - (width & ~0x1)) / 2; xpos = (winwidth - (width & ~0x1)) / 2;
xpos += xadjust; xpos += xadjust;
if(xoffset < 0) xpos += (width - __cardwidth); if(xoffset < 0) xpos += (width - __cardwidth);
break; break;
case CS_XJUST_RIGHT: //right-aligned case CS_XJUST_RIGHT: //right-aligned
@ -301,7 +301,7 @@ void CardRegion::AdjustPosition(int winwidth, int winheight)
switch(yjustify) switch(yjustify)
{ {
default: case CS_YJUST_NONE: break; default: case CS_YJUST_NONE: break;
case CS_YJUST_CENTER: //centered case CS_YJUST_CENTER: //centered
ypos = (winheight - height) / 2; ypos = (winheight - height) / 2;
ypos += yadjust; ypos += yadjust;
@ -324,7 +324,7 @@ void CardRegion::Flash(int count, int milliseconds)
nFlashCount = count; nFlashCount = count;
fFlashVisible = false; fFlashVisible = false;
uFlashTimer = SetTimer((HWND)parentWnd, (WPARAM)this, milliseconds, 0); uFlashTimer = SetTimer((HWND)parentWnd, (WPARAM)this, milliseconds, 0);
parentWnd.Redraw(); parentWnd.Redraw();
} }
@ -351,7 +351,7 @@ void CardRegion::DoFlash()
uFlashTimer = (UINT)-1; uFlashTimer = (UINT)-1;
fFlashVisible = true; fFlashVisible = true;
} }
parentWnd.Redraw(); parentWnd.Redraw();
} }
} }
@ -376,7 +376,7 @@ void CardRegion::SetEmptyImage(UINT uImage)
uEmptyImage = CS_EI_NONE; uEmptyImage = CS_EI_NONE;
break; break;
} }
} }
void CardRegion::SetBackCardIdx(UINT uBackIdx) void CardRegion::SetBackCardIdx(UINT uBackIdx)
@ -386,18 +386,18 @@ void CardRegion::SetBackCardIdx(UINT uBackIdx)
} }
void CardRegion::SetCardStack(const CardStack &cs) void CardRegion::SetCardStack(const CardStack &cs)
{ {
//make a complete copy of the specified stack.. //make a complete copy of the specified stack..
cardstack = cs; cardstack = cs;
// Update the face-direction and stack-size // Update the face-direction and stack-size
Update(); Update();
} }
const CardStack & CardRegion::GetCardStack() const CardStack & CardRegion::GetCardStack()
{ {
//return reference to our internal stack //return reference to our internal stack
return cardstack; return cardstack;
} }
// //
@ -488,7 +488,7 @@ bool CardRegion::MoveCard(CardRegion *pDestStack, int nNumCards, bool fAnimate)
oldx = x; oldx = x;
oldy = y; oldy = y;
dragstack = cardstack.Pop(nNumCards); dragstack = cardstack.Pop(nNumCards);
//Alter the drag-stack so that it's cards are the same way up //Alter the drag-stack so that it's cards are the same way up
@ -515,7 +515,7 @@ bool CardRegion::MoveCard(CardRegion *pDestStack, int nNumCards, bool fAnimate)
hdc = GetDC((HWND)parentWnd); hdc = GetDC((HWND)parentWnd);
ZoomCard(hdc, x, y, pDestStack); ZoomCard(hdc, x, y, pDestStack);
ReleaseDC((HWND)parentWnd, hdc); ReleaseDC((HWND)parentWnd, hdc);
ReleaseDragBitmaps(); ReleaseDragBitmaps();
} }
@ -523,9 +523,9 @@ bool CardRegion::MoveCard(CardRegion *pDestStack, int nNumCards, bool fAnimate)
// Get a copy of the cardstack // Get a copy of the cardstack
CardStack cs = pDestStack->GetCardStack(); CardStack cs = pDestStack->GetCardStack();
cs.Push(dragstack); cs.Push(dragstack);
pDestStack->SetCardStack(cs); pDestStack->SetCardStack(cs);
//cs = pDestStack->GetCardStack(); //cs = pDestStack->GetCardStack();
//pDestStack->Update(); //pDestStack->Update();
//pDestStack->UpdateFaceDir(cs); //pDestStack->UpdateFaceDir(cs);
@ -544,7 +544,7 @@ int CardRegion::NumCards() const
if(fMouseDragging) if(fMouseDragging)
return cardstack.NumCards() + dragstack.NumCards(); return cardstack.NumCards() + dragstack.NumCards();
else else
return cardstack.NumCards(); return cardstack.NumCards();
} }
bool CardRegion::Lock() bool CardRegion::Lock()
@ -554,7 +554,7 @@ bool CardRegion::Lock()
if(dw == WAIT_OBJECT_0) if(dw == WAIT_OBJECT_0)
{ {
//TRACE("LockStack succeeded\n"); //TRACE("LockStack succeeded\n");
return true; return true;
} }
else else
{ {
@ -573,7 +573,7 @@ bool CardRegion::UnLock()
} }
else else
{ {
//TRACE("Unlocking stack failed\n"); //TRACE("Unlocking stack failed\n");
return false; return false;
} }
} }
@ -611,8 +611,8 @@ void CardRegion::RedrawIfNotDim(CardRegion *pCompare, bool fFullRedraw)
// //
// //
// //
if( pCompare->xoffset != xoffset || if( pCompare->xoffset != xoffset ||
pCompare->yoffset != yoffset || pCompare->yoffset != yoffset ||
pCompare->nThreedCount != nThreedCount || pCompare->nThreedCount != nThreedCount ||
pCompare->uFaceDirType != uFaceDirType || pCompare->uFaceDirType != uFaceDirType ||
pCompare->uFaceDirType != CS_FACE_ANY pCompare->uFaceDirType != CS_FACE_ANY
@ -623,7 +623,7 @@ void CardRegion::RedrawIfNotDim(CardRegion *pCompare, bool fFullRedraw)
else else
pCompare->Redraw(); pCompare->Redraw();
} }
} }
// //
@ -641,18 +641,18 @@ bool CardRegion::SimulateDrag(CardRegion *pDestStack, int iNumDragCards, bool fA
//make a list of the cards that would be in the drag list //make a list of the cards that would be in the drag list
CardStack tempstack = cardstack.Top(iNumDragCards); CardStack tempstack = cardstack.Top(iNumDragCards);
if(pDestStack->CanDropCards(tempstack)) if(pDestStack->CanDropCards(tempstack))
{ {
MoveCard(pDestStack, iNumDragCards, fAnimate); MoveCard(pDestStack, iNumDragCards, fAnimate);
if(RemoveCallback) if(RemoveCallback)
RemoveCallback(*this, iNumDragCards); RemoveCallback(*this, iNumDragCards);
if(pDestStack->AddCallback) if(pDestStack->AddCallback)
pDestStack->AddCallback(*pDestStack, pDestStack->cardstack); pDestStack->AddCallback(*pDestStack, pDestStack->cardstack);
RedrawIfNotDim(pDestStack, true); RedrawIfNotDim(pDestStack, true);
} }
} }

30
reactos/base/applications/games/solitaire/cardlib/cardregion.h
View file

@ -21,7 +21,7 @@ class CardRegion
// Constructor is PRIVATE - only // Constructor is PRIVATE - only
// a CardWindow can create cardstacks! // a CardWindow can create cardstacks!
// //
CardRegion(CardWindow &parent, int id, bool fVisible, CardRegion(CardWindow &parent, int id, bool fVisible,
int x, int y, int xOffset, int yOffset); int x, int y, int xOffset, int yOffset);
~CardRegion(); ~CardRegion();
@ -29,7 +29,7 @@ class CardRegion
public: public:
void SetBackColor(COLORREF cr); void SetBackColor(COLORREF cr);
void SetCardStack(const CardStack &cs); void SetCardStack(const CardStack &cs);
const CardStack & GetCardStack(); const CardStack & GetCardStack();
@ -38,7 +38,7 @@ public:
// //
bool SetDragRule(UINT uDragType, pCanDragProc proc = 0); bool SetDragRule(UINT uDragType, pCanDragProc proc = 0);
bool SetDropRule(UINT uDropType, pCanDropProc proc = 0); bool SetDropRule(UINT uDropType, pCanDropProc proc = 0);
void SetClickProc (pClickProc proc); void SetClickProc (pClickProc proc);
void SetDblClickProc (pClickProc proc); void SetDblClickProc (pClickProc proc);
@ -87,7 +87,7 @@ public:
void Clear() { cardstack.Clear(); } void Clear() { cardstack.Clear(); }
void Reverse() { cardstack.Reverse(); } void Reverse() { cardstack.Reverse(); }
void Push(const Card card) { cardstack.Push(card); } void Push(const Card card) { cardstack.Push(card); }
void Push(const CardStack &cs) { cardstack.Push(cs); } void Push(const CardStack &cs) { cardstack.Push(cs); }
@ -118,7 +118,7 @@ private:
bool CanDragCards(int iNumCards); bool CanDragCards(int iNumCards);
bool CanDropCards(CardStack &cards); bool CanDropCards(CardStack &cards);
void CalcApparentCards(); void CalcApparentCards();
int CalcApparentCards(int realnum); int CalcApparentCards(int realnum);
@ -133,15 +133,15 @@ private:
bool OnMouseMove(int x, int y); bool OnMouseMove(int x, int y);
bool OnLButtonUp(int x, int y); bool OnLButtonUp(int x, int y);
// //
// Private data members // Private data members
// //
int id; int id;
CardWindow &parentWnd; CardWindow &parentWnd;
CardStack cardstack; //cards in this stack CardStack cardstack; //cards in this stack
CardStack dragstack; //cards which we might be dragging CardStack dragstack; //cards which we might be dragging
@ -167,14 +167,14 @@ private:
// Used for mouse-dragging / moving cards // Used for mouse-dragging / moving cards
// //
int iNumDragCards; int iNumDragCards;
int mousexoffset; int mousexoffset;
int mouseyoffset; int mouseyoffset;
int oldx; int oldx;
int oldy; int oldy;
int nDragCardWidth; int nDragCardWidth;
int nDragCardHeight; int nDragCardHeight;
HDC hdcBackGnd; HDC hdcBackGnd;
HBITMAP hbmBackGnd; HBITMAP hbmBackGnd;
HDC hdcDragCard; HDC hdcDragCard;
@ -183,7 +183,7 @@ private:
int nNumApparentCards; int nNumApparentCards;
int nThreedCount; int nThreedCount;
bool fVisible; bool fVisible;
int nFlashCount; int nFlashCount;
bool fFlashVisible; bool fFlashVisible;
UINT uFlashTimer; UINT uFlashTimer;
@ -197,10 +197,10 @@ private:
UINT uDragRule; UINT uDragRule;
UINT uDropRule; UINT uDropRule;
// //
// Stack callback support // Stack callback support
// //
pCanDragProc CanDragCallback; pCanDragProc CanDragCallback;
pCanDropProc CanDropCallback; pCanDropProc CanDropCallback;
pClickProc ClickCallback; pClickProc ClickCallback;
@ -209,7 +209,7 @@ private:
pRemoveProc RemoveCallback; pRemoveProc RemoveCallback;
//locking mechanism to prevent user dragging etc //locking mechanism to prevent user dragging etc
HANDLE mxlock; HANDLE mxlock;
}; };
#endif #endif

64
reactos/base/applications/games/solitaire/cardlib/cardrgndraw.cpp
View file

@ -80,7 +80,7 @@ void DrawHorzCardStrip(HDC hdc, int x, int y, int nCardNum, int height, BOOL fDr
// draw the outer-most lips // draw the outer-most lips
BitBlt(hdc, x, y+two, 1, height-two*tips, __hdcCardBitmaps, sx, sy+two, SRCCOPY); BitBlt(hdc, x, y+two, 1, height-two*tips, __hdcCardBitmaps, sx, sy+two, SRCCOPY);
BitBlt(hdc, x+__cardwidth-1, y+two, 1, height-two*tips, __hdcCardBitmaps, sx+__cardwidth-1, sy+two, SRCCOPY); BitBlt(hdc, x+__cardwidth-1, y+two, 1, height-two*tips, __hdcCardBitmaps, sx+__cardwidth-1, sy+two, SRCCOPY);
} }
// //
@ -107,7 +107,7 @@ void DrawVertCardStrip(HDC hdc, int x, int y, int nCardNum, int width, BOOL fDra
BOOL tips = fDrawTips ? FALSE : TRUE; BOOL tips = fDrawTips ? FALSE : TRUE;
if(width == 0) return; if(width == 0) return;
if(width < 0) if(width < 0)
{ {
@ -145,7 +145,7 @@ void DrawCardCorner(HDC hdc, int x, int y, int cardval, int xdir, int ydir)
HDC hdcSource = __hdcCardBitmaps; HDC hdcSource = __hdcCardBitmaps;
if(xdir < 0) if(xdir < 0)
{ {
x += __cardwidth + xdir - 1; x += __cardwidth + xdir - 1;
sx += __cardwidth + xdir - 1; sx += __cardwidth + xdir - 1;
@ -156,7 +156,7 @@ void DrawCardCorner(HDC hdc, int x, int y, int cardval, int xdir, int ydir)
sx += xdir; sx += xdir;
} }
if(ydir < 0) if(ydir < 0)
{ {
y += __cardheight + ydir - 1; y += __cardheight + ydir - 1;
sy += __cardheight + ydir - 1; sy += __cardheight + ydir - 1;
@ -212,13 +212,13 @@ void CardRegion::Clip(HDC hdc)
{ {
int numtoclip; int numtoclip;
if(fVisible == false) if(fVisible == false)
return; return;
Update(); //Update this stack's size+card count Update(); //Update this stack's size+card count
numtoclip = nNumApparentCards; numtoclip = nNumApparentCards;
//if we are making this stack flash on/off, then only //if we are making this stack flash on/off, then only
//clip the stack for drawing if the flash is in its ON state //clip the stack for drawing if the flash is in its ON state
if(nFlashCount != 0) if(nFlashCount != 0)
{ {
@ -230,9 +230,9 @@ void CardRegion::Clip(HDC hdc)
if(xoffset != 0 && yoffset != 0 && cardstack.NumCards() != 0) if(xoffset != 0 && yoffset != 0 && cardstack.NumCards() != 0)
{ {
for(int j = 0; j < numtoclip; j ++) for(int j = 0; j < numtoclip; j ++)
{ {
ClipCard(hdc, xpos + xoffset * j, ypos + yoffset * j, __cardwidth, __cardheight); ClipCard(hdc, xpos + xoffset * j, ypos + yoffset * j, __cardwidth, __cardheight);
} }
} }
//otherwise if just offset along a horizontal/vertical axis //otherwise if just offset along a horizontal/vertical axis
else else
@ -258,7 +258,7 @@ void CardRegion::Render(HDC hdc)
int cardnum = 0; int cardnum = 0;
int numtodraw; int numtodraw;
BOOL fDrawTips; BOOL fDrawTips;
Update(); //Update this stack's card count + size Update(); //Update this stack's card count + size
numtodraw = nNumApparentCards; numtodraw = nNumApparentCards;
@ -270,26 +270,26 @@ void CardRegion::Render(HDC hdc)
} }
if(fVisible == 0) return; if(fVisible == 0) return;
cardnum = cardstack.NumCards() - numtodraw; cardnum = cardstack.NumCards() - numtodraw;
int counter; int counter;
for(counter = 0; counter < numtodraw; counter++) for(counter = 0; counter < numtodraw; counter++)
{ {
int cardval; int cardval;
int x = xoffset * counter + xpos; int x = xoffset * counter + xpos;
int y = yoffset * counter + ypos; int y = yoffset * counter + ypos;
//if about to draw last card, then actually draw the top card //if about to draw last card, then actually draw the top card
if(counter == numtodraw - 1) cardnum = cardstack.NumCards() - 1; if(counter == numtodraw - 1) cardnum = cardstack.NumCards() - 1;
Card card = cardstack.cardlist[cardnum]; Card card = cardstack.cardlist[cardnum];
cardval = card.Idx(); cardval = card.Idx();
if(card.FaceDown()) if(card.FaceDown())
cardval = nBackCardIdx; //card-back cardval = nBackCardIdx; //card-back
//only draw the visible part of the card //only draw the visible part of the card
if(counter < numtodraw - 1) if(counter < numtodraw - 1)
{ {
@ -302,7 +302,7 @@ void CardRegion::Render(HDC hdc)
fDrawTips = TRUE; fDrawTips = TRUE;
//draw horizontal strips //draw horizontal strips
if(yoffset > 0) if(yoffset > 0)
{ {
DrawHorzCardStrip(hdc, x, y, cardval, yoffset, fDrawTips); DrawHorzCardStrip(hdc, x, y, cardval, yoffset, fDrawTips);
} }
@ -339,12 +339,12 @@ void CardRegion::Render(HDC hdc)
cardnum ++; cardnum ++;
} //end of index } //end of index
if(counter == 0) //if the cardstack is empty, then draw it that way if(counter == 0) //if the cardstack is empty, then draw it that way
{ {
int x = xpos; int x = xpos;
int y = ypos; int y = ypos;
switch(uEmptyImage) switch(uEmptyImage)
{ {
default: default:
@ -354,7 +354,7 @@ void CardRegion::Render(HDC hdc)
//PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd)); //PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd));
parentWnd.PaintCardRgn(hdc, x, y, __cardwidth, __cardheight, x, y); parentWnd.PaintCardRgn(hdc, x, y, __cardwidth, __cardheight, x, y);
break; break;
case CS_EI_SUNK: case CS_EI_SUNK:
DrawCard(hdc, x, y, __hdcPlaceHolder, __cardwidth, __cardheight); DrawCard(hdc, x, y, __hdcPlaceHolder, __cardwidth, __cardheight);
break; break;
@ -364,7 +364,7 @@ void CardRegion::Render(HDC hdc)
CardBlt(hdc, x, y, uEmptyImage); CardBlt(hdc, x, y, uEmptyImage);
break; break;
} }
} }
return; return;
@ -375,7 +375,7 @@ int calc_offset(int offset, int numcards, int numtodrag, int realvisible)
if(offset >= 0) if(offset >= 0)
return -offset * numcards; return -offset * numcards;
else else
return -offset * (numtodrag) + return -offset * (numtodrag) +
-offset * (realvisible - 1); -offset * (realvisible - 1);
} }
@ -423,10 +423,10 @@ void CardRegion::PrepareDragBitmaps(int numtodrag)
//background buffer, so it appears if we have lifted the card from the stack //background buffer, so it appears if we have lifted the card from the stack
//PaintRect(hdcBackGnd, &rect, crBackgnd); //PaintRect(hdcBackGnd, &rect, crBackgnd);
SetRect(&rect, 0, 0, nDragCardWidth, nDragCardHeight); SetRect(&rect, 0, 0, nDragCardWidth, nDragCardHeight);
xoff = calc_offset(xoffset, numcards, numtodrag, realvisible); xoff = calc_offset(xoffset, numcards, numtodrag, realvisible);
yoff = calc_offset(yoffset, numcards, numtodrag, realvisible); yoff = calc_offset(yoffset, numcards, numtodrag, realvisible);
parentWnd.PaintCardRgn(hdcBackGnd, 0, 0, nDragCardWidth, nDragCardHeight, xpos - xoff, ypos - yoff); parentWnd.PaintCardRgn(hdcBackGnd, 0, 0, nDragCardWidth, nDragCardHeight, xpos - xoff, ypos - yoff);
// //
@ -438,7 +438,7 @@ void CardRegion::PrepareDragBitmaps(int numtodrag)
{ {
Card card = cardstack.cardlist[iwhichcard]; Card card = cardstack.cardlist[iwhichcard];
int nCardVal; int nCardVal;
nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx; nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx;
xoff = xoffset * icard + calc_offset(xoffset, numcards, numtodrag, realvisible);//- xoffset * ((numcards+numtodrag) / nThreedCount - numtodrag); xoff = xoffset * icard + calc_offset(xoffset, numcards, numtodrag, realvisible);//- xoffset * ((numcards+numtodrag) / nThreedCount - numtodrag);
@ -447,11 +447,11 @@ void CardRegion::PrepareDragBitmaps(int numtodrag)
CardBlt(hdcBackGnd, xoff, yoff, nCardVal); CardBlt(hdcBackGnd, xoff, yoff, nCardVal);
iwhichcard++; iwhichcard++;
} }
// //
// If there are no cards under this one, just draw the place holder // If there are no cards under this one, just draw the place holder
// //
if(numcards == 0) if(numcards == 0)
{ {
int xoff = 0, yoff = 0; int xoff = 0, yoff = 0;
@ -491,12 +491,12 @@ void CardRegion::PrepareDragBitmaps(int numtodrag)
if(xoffset >= 0) xoff = xoffset * icard; if(xoffset >= 0) xoff = xoffset * icard;
else xoff = -xoffset * (numtodrag - icard - 1); else xoff = -xoffset * (numtodrag - icard - 1);
if(yoffset >= 0) yoff = yoffset * icard; if(yoffset >= 0) yoff = yoffset * icard;
else yoff = -yoffset * (numtodrag - icard - 1); else yoff = -yoffset * (numtodrag - icard - 1);
Card card = dragstack.cardlist[icard]; Card card = dragstack.cardlist[icard];
nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx; nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx;
CardBlt(hdcDragCard, xoff, yoff, nCardVal); CardBlt(hdcDragCard, xoff, yoff, nCardVal);
@ -539,11 +539,11 @@ void CardRegion::PrepareDragBitmapsThreed(int numtodrag)
//--PaintRect(hdcBackGnd, &rect, crBackgnd); //--PaintRect(hdcBackGnd, &rect, crBackgnd);
int threedadjust = numcards % nThreedCount == 0; int threedadjust = numcards % nThreedCount == 0;
numunder = CalcApparentCards(numcards); numunder = CalcApparentCards(numcards);
iwhichcard = (numcards+numtodrag) - numunder - 1; iwhichcard = (numcards+numtodrag) - numunder - 1;
if(nThreedCount == 1) iwhichcard = 0; if(nThreedCount == 1) iwhichcard = 0;
int xoff = calc_offset(xoffset, numunder, numtodrag, numunder); int xoff = calc_offset(xoffset, numunder, numtodrag, numunder);
int yoff = calc_offset(yoffset, numunder, numtodrag, numunder); int yoff = calc_offset(yoffset, numunder, numtodrag, numunder);
@ -559,14 +559,14 @@ void CardRegion::PrepareDragBitmapsThreed(int numtodrag)
Card card = cardstack.cardlist[iwhichcard]; Card card = cardstack.cardlist[iwhichcard];
int nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx; int nCardVal = card.FaceUp() ? card.Idx() : nBackCardIdx;
CardBlt(hdcBackGnd, CardBlt(hdcBackGnd,
xoffset * icard - xoffset*(numunder-numtodrag+threedadjust), xoffset * icard - xoffset*(numunder-numtodrag+threedadjust),
yoffset * icard - yoffset*(numunder-numtodrag+threedadjust), yoffset * icard - yoffset*(numunder-numtodrag+threedadjust),
nCardVal); nCardVal);
iwhichcard++; iwhichcard++;
} }
// //
// If there are no cards under this one, just draw the place holder // If there are no cards under this one, just draw the place holder
// //
@ -596,7 +596,7 @@ void CardRegion::PrepareDragBitmapsThreed(int numtodrag)
// now render the drag-cards into the dragcard image // now render the drag-cards into the dragcard image
// //
PaintRect(hdcDragCard, &rect, crBackgnd); PaintRect(hdcDragCard, &rect, crBackgnd);
for(icard = 0; icard < numtodrag; icard++) for(icard = 0; icard < numtodrag; icard++)
{ {
Card card = dragstack.cardlist[icard]; Card card = dragstack.cardlist[icard];

94
reactos/base/applications/games/solitaire/cardlib/cardrgnmouse.cpp
View file

@ -53,7 +53,7 @@ CardRegion *CardWindow::GetBestStack(int x, int y, int w, int h)
maxoverlapidx = i; maxoverlapidx = i;
} }
} }
//if we found a stack to drop onto //if we found a stack to drop onto
if(maxoverlapidx != -1) if(maxoverlapidx != -1)
{ {
@ -69,7 +69,7 @@ bool CardRegion::IsPointInStack(int x, int y)
{ {
int axpos = xoffset < 0 ? xpos + (nNumApparentCards-1)*xoffset : xpos; int axpos = xoffset < 0 ? xpos + (nNumApparentCards-1)*xoffset : xpos;
int aypos = yoffset < 0 ? ypos + (nNumApparentCards-1)*yoffset : ypos; int aypos = yoffset < 0 ? ypos + (nNumApparentCards-1)*yoffset : ypos;
if(x >= axpos && x < axpos + width && y >= aypos && y < aypos + height && fVisible) if(x >= axpos && x < axpos + width && y >= aypos && y < aypos + height && fVisible)
return true; return true;
else else
@ -84,7 +84,7 @@ int CardRegion::GetNumDragCards(int x, int y)
//make x,y relative to the stack's upper left corner //make x,y relative to the stack's upper left corner
x -= xpos + (xoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * xoffset : 0); x -= xpos + (xoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * xoffset : 0);
y -= ypos + (yoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * yoffset : 0); y -= ypos + (yoffset < 0 ? (nNumApparentCards/*cardstack.NumCards()*/ - 1) * yoffset : 0);
//if stack is empty, cannot drag any cards from it //if stack is empty, cannot drag any cards from it
if(cardstack.NumCards() <= 0) if(cardstack.NumCards() <= 0)
return 0; return 0;
@ -158,19 +158,19 @@ bool CardRegion::CanDragCards(int iNumCards)
{ {
case CS_DRAG_ALL: case CS_DRAG_ALL:
return true; return true;
case CS_DRAG_TOP: case CS_DRAG_TOP:
if(iNumCards == 1) if(iNumCards == 1)
return true; return true;
else else
return false; return false;
case CS_DRAG_NONE: case CS_DRAG_NONE:
return false; return false;
case CS_DRAG_CALLBACK: case CS_DRAG_CALLBACK:
if(CanDragCallback) if(CanDragCallback)
{ {
return CanDragCallback(*this, iNumCards); return CanDragCallback(*this, iNumCards);
@ -179,7 +179,7 @@ bool CardRegion::CanDragCards(int iNumCards)
{ {
return false; return false;
} }
default: default:
return false; return false;
} }
@ -203,7 +203,7 @@ bool CardRegion::CanDropCards(CardStack &cards)
return false; return false;
case CS_DROP_CALLBACK: case CS_DROP_CALLBACK:
if(CanDropCallback) if(CanDropCallback)
{ {
return CanDropCallback(*this, cards); return CanDropCallback(*this, cards);
@ -220,7 +220,7 @@ bool CardRegion::CanDropCards(CardStack &cards)
bool CardRegion::OnLButtonDblClk(int x, int y) bool CardRegion::OnLButtonDblClk(int x, int y)
{ {
iNumDragCards = GetNumDragCards(x, y); iNumDragCards = GetNumDragCards(x, y);
if(DblClickCallback) if(DblClickCallback)
DblClickCallback(*this, iNumDragCards); DblClickCallback(*this, iNumDragCards);
@ -230,7 +230,7 @@ bool CardRegion::OnLButtonDblClk(int x, int y)
bool CardRegion::OnLButtonDown(int x, int y) bool CardRegion::OnLButtonDown(int x, int y)
{ {
iNumDragCards = GetNumDragCards(x, y); iNumDragCards = GetNumDragCards(x, y);
#ifdef _DEBUG #ifdef _DEBUG
if(DebugStackClickProc) if(DebugStackClickProc)
@ -250,13 +250,13 @@ bool CardRegion::OnLButtonDown(int x, int y)
//of the cards that are being dragged //of the cards that are being dragged
mousexoffset = x - xpos - xoffset * (nNumApparentCards - iNumDragCards); mousexoffset = x - xpos - xoffset * (nNumApparentCards - iNumDragCards);
mouseyoffset = y - ypos - yoffset * (nNumApparentCards - iNumDragCards); mouseyoffset = y - ypos - yoffset * (nNumApparentCards - iNumDragCards);
if(xoffset < 0) if(xoffset < 0)
mousexoffset += -xoffset * (iNumDragCards - 1); mousexoffset += -xoffset * (iNumDragCards - 1);
if(yoffset < 0) if(yoffset < 0)
mouseyoffset += -yoffset * (iNumDragCards - 1); mouseyoffset += -yoffset * (iNumDragCards - 1);
//remove the cards from the source stack //remove the cards from the source stack
dragstack = cardstack.Pop(iNumDragCards); dragstack = cardstack.Pop(iNumDragCards);
@ -265,7 +265,7 @@ bool CardRegion::OnLButtonDown(int x, int y)
oldx = x - mousexoffset; oldx = x - mousexoffset;
oldy = y - mouseyoffset; oldy = y - mouseyoffset;
Update(); //Update this stack's card count + size Update(); //Update this stack's card count + size
SetCapture((HWND)parentWnd); SetCapture((HWND)parentWnd);
@ -284,7 +284,7 @@ bool CardRegion::OnLButtonUp(int x, int y)
CardRegion *pDestStack = 0; CardRegion *pDestStack = 0;
HDC hdc; HDC hdc;
int dropstackid = CS_DROPZONE_NODROP; int dropstackid = CS_DROPZONE_NODROP;
RECT dragrect; RECT dragrect;
DropZone *dropzone; DropZone *dropzone;
@ -298,7 +298,7 @@ bool CardRegion::OnLButtonUp(int x, int y)
if(dropzone) if(dropzone)
{ {
dropstackid = dropzone->DropCards(dragstack); dropstackid = dropzone->DropCards(dragstack);
if(dropstackid != CS_DROPZONE_NODROP) if(dropstackid != CS_DROPZONE_NODROP)
pDestStack = parentWnd.CardRegionFromId(dropstackid); pDestStack = parentWnd.CardRegionFromId(dropstackid);
else else
@ -308,28 +308,28 @@ bool CardRegion::OnLButtonUp(int x, int y)
{ {
pDestStack = parentWnd.GetBestStack(x - mousexoffset, y - mouseyoffset, nDragCardWidth, nDragCardHeight); pDestStack = parentWnd.GetBestStack(x - mousexoffset, y - mouseyoffset, nDragCardWidth, nDragCardHeight);
} }
// If have found a stack to drop onto // If have found a stack to drop onto
// //
TRACE ( "can I drop card?\n" ); TRACE ( "can I drop card?\n" );
if(pDestStack && pDestStack->CanDropCards(dragstack)) if(pDestStack && pDestStack->CanDropCards(dragstack))
{ {
TRACE ( "yes, dropping card\n" ); TRACE ( "yes, dropping card\n" );
hdc = GetDC((HWND)parentWnd); hdc = GetDC((HWND)parentWnd);
// UseNicePalette(hdc); // UseNicePalette(hdc);
ZoomCard(hdc, x - mousexoffset, y - mouseyoffset, pDestStack); ZoomCard(hdc, x - mousexoffset, y - mouseyoffset, pDestStack);
ReleaseDC((HWND)parentWnd, hdc); ReleaseDC((HWND)parentWnd, hdc);
// //
//add the cards to the destination stack //add the cards to the destination stack
// //
CardStack temp = pDestStack->GetCardStack(); CardStack temp = pDestStack->GetCardStack();
temp.Push(dragstack); temp.Push(dragstack);
pDestStack->SetCardStack(temp); pDestStack->SetCardStack(temp);
// pDestStack->Update(); //Update this stack's card count + size // pDestStack->Update(); //Update this stack's card count + size
// pDestStack->UpdateFaceDir(temp); // pDestStack->UpdateFaceDir(temp);
// Call the remove callback on THIS stack, if one is specified // Call the remove callback on THIS stack, if one is specified
// //
if(RemoveCallback) if(RemoveCallback)
@ -339,7 +339,7 @@ bool CardRegion::OnLButtonUp(int x, int y)
// //
if(pDestStack->AddCallback) if(pDestStack->AddCallback)
pDestStack->AddCallback(*pDestStack, pDestStack->cardstack);//index, deststack->numcards); pDestStack->AddCallback(*pDestStack, pDestStack->cardstack);//index, deststack->numcards);
RedrawIfNotDim(pDestStack, true); RedrawIfNotDim(pDestStack, true);
TRACE ( "done dropping card\n" ); TRACE ( "done dropping card\n" );
} }
@ -362,10 +362,10 @@ bool CardRegion::OnLButtonUp(int x, int y)
Update(); //Update this stack's card count + size Update(); //Update this stack's card count + size
TRACE ( "done putting card back\n" ); TRACE ( "done putting card back\n" );
} }
ReleaseDragBitmaps(); ReleaseDragBitmaps();
ReleaseCapture(); ReleaseCapture();
TRACE ( "OnLButtonUp() done\n" ); TRACE ( "OnLButtonUp() done\n" );
return true; return true;
} }
@ -375,20 +375,20 @@ bool CardRegion::OnMouseMove(int x, int y)
HDC hdc; HDC hdc;
hdc = GetDC((HWND)parentWnd); hdc = GetDC((HWND)parentWnd);
x -= mousexoffset; x -= mousexoffset;
y -= mouseyoffset; y -= mouseyoffset;
MoveDragCardTo(hdc, x, y); MoveDragCardTo(hdc, x, y);
//BitBlt(hdc, nDragCardWidth+10, 0, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY); //BitBlt(hdc, nDragCardWidth+10, 0, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY);
//BitBlt(hdc, 0, 0, nDragCardWidth, nDragCardHeight, hdcDragCard, 0, 0, SRCCOPY); //BitBlt(hdc, 0, 0, nDragCardWidth, nDragCardHeight, hdcDragCard, 0, 0, SRCCOPY);
ReleaseDC((HWND)parentWnd, hdc); ReleaseDC((HWND)parentWnd, hdc);
oldx = x; oldx = x;
oldy = y; oldy = y;
return true; return true;
} }
@ -423,48 +423,48 @@ void CardRegion::MoveDragCardTo(HDC hdc, int x, int y)
//mask off the new position of the drag-card, so //mask off the new position of the drag-card, so
//that it will not be painted over //that it will not be painted over
ClipCard(hdc, x, y, nDragCardWidth, nDragCardHeight); ClipCard(hdc, x, y, nDragCardWidth, nDragCardHeight);
//restore the area covered by the card at its previous position //restore the area covered by the card at its previous position
BitBlt(hdc, oldx, oldy, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY); BitBlt(hdc, oldx, oldy, nDragCardWidth, nDragCardHeight, hdcBackGnd, 0, 0, SRCCOPY);
//remove clipping so we can draw the card at its new place //remove clipping so we can draw the card at its new place
SelectClipRgn(hdc, NULL); SelectClipRgn(hdc, NULL);
//if the card's old and new positions overlap, then we //if the card's old and new positions overlap, then we
//need some funky code to update the "saved background" image, //need some funky code to update the "saved background" image,
SetRect(&rect1, oldx, oldy, oldx+nDragCardWidth, oldy+nDragCardHeight); SetRect(&rect1, oldx, oldy, oldx+nDragCardWidth, oldy+nDragCardHeight);
SetRect(&rect2, x, y, x+nDragCardWidth, y+nDragCardHeight); SetRect(&rect2, x, y, x+nDragCardWidth, y+nDragCardHeight);
if(IntersectRect(&inter, &rect1, &rect2)) if(IntersectRect(&inter, &rect1, &rect2))
{ {
int interwidth = inter.right-inter.left; int interwidth = inter.right-inter.left;
int interheight = inter.bottom-inter.top; int interheight = inter.bottom-inter.top;
int destx, desty, srcx, srcy; int destx, desty, srcx, srcy;
if(rect2.left > rect1.left) if(rect2.left > rect1.left)
{ {
destx = 0; srcx = nDragCardWidth - interwidth; destx = 0; srcx = nDragCardWidth - interwidth;
} }
else else
{ {
destx = nDragCardWidth - interwidth; srcx = 0; destx = nDragCardWidth - interwidth; srcx = 0;
} }
if(rect2.top > rect1.top) if(rect2.top > rect1.top)
{ {
desty = 0; srcy = nDragCardHeight - interheight; desty = 0; srcy = nDragCardHeight - interheight;
} }
else else
{ {
desty = nDragCardHeight - interheight; srcy = 0; desty = nDragCardHeight - interheight; srcy = 0;
} }
//shift the bit we didn't use for the restore (due to the clipping) //shift the bit we didn't use for the restore (due to the clipping)
//into the opposite corner //into the opposite corner
BitBlt(hdcBackGnd, destx,desty, interwidth, interheight, hdcBackGnd, srcx, srcy, SRCCOPY); BitBlt(hdcBackGnd, destx,desty, interwidth, interheight, hdcBackGnd, srcx, srcy, SRCCOPY);
ExcludeClipRect(hdcBackGnd, destx, desty, destx+interwidth, desty+interheight); ExcludeClipRect(hdcBackGnd, destx, desty, destx+interwidth, desty+interheight);
//this bit requires us to clip the BitBlt (from screen to background) //this bit requires us to clip the BitBlt (from screen to background)
//as BitBlt is a bit buggy it seems //as BitBlt is a bit buggy it seems
ClippedBitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY); ClippedBitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY);
@ -474,7 +474,7 @@ void CardRegion::MoveDragCardTo(HDC hdc, int x, int y)
{ {
BitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY); BitBlt(hdcBackGnd, 0,0, nDragCardWidth, nDragCardHeight, hdc, x, y, SRCCOPY);
} }
//finally draw the card to the screen //finally draw the card to the screen
DrawCard(hdc, x, y, hdcDragCard, nDragCardWidth, nDragCardHeight); DrawCard(hdc, x, y, hdcDragCard, nDragCardWidth, nDragCardHeight);
} }
@ -494,7 +494,7 @@ void ZoomCard(HDC hdc, int xpos, int ypos, CARDSTACK *dest)
{ {
long dx, dy, x , y; long dx, dy, x , y;
int apparentcards; int apparentcards;
x = xpos << PRECISION; y = ypos << PRECISION; x = xpos << PRECISION; y = ypos << PRECISION;
@ -503,7 +503,7 @@ void ZoomCard(HDC hdc, int xpos, int ypos, CARDSTACK *dest)
apparentcards=dest->numcards/dest->threedcount; apparentcards=dest->numcards/dest->threedcount;
int idestx = dest->xpos + dest->xoffset * (apparentcards);// - iNumDragCards); int idestx = dest->xpos + dest->xoffset * (apparentcards);// - iNumDragCards);
int idesty = dest->ypos + dest->yoffset * (apparentcards);// - iNumDragCards); int idesty = dest->ypos + dest->yoffset * (apparentcards);// - iNumDragCards);
//normalise the motion vector //normalise the motion vector
@ -511,7 +511,7 @@ void ZoomCard(HDC hdc, int xpos, int ypos, CARDSTACK *dest)
dy = (idesty<<PRECISION) - y; dy = (idesty<<PRECISION) - y;
long recip = (1 << PRECISION) / 1;//sqrt(dx*dx + dy*dy); long recip = (1 << PRECISION) / 1;//sqrt(dx*dx + dy*dy);
dx *= recip * 16;//CARDZOOMSPEED; dx *= recip * 16;//CARDZOOMSPEED;
dy *= recip * 16;//CARDZOOMSPEED; dy *= recip * 16;//CARDZOOMSPEED;
//if(dx < 0) dxinc = 1.001; else //if(dx < 0) dxinc = 1.001; else
@ -612,7 +612,7 @@ void CardRegion::ZoomCard(HDC hdc, int xpos, int ypos, CardRegion *pDestStack)
if(pDestStack->xoffset < 0) if(pDestStack->xoffset < 0)
xdraw = -pDestStack->xoffset * (iNumDragCards-i-1); xdraw = -pDestStack->xoffset * (iNumDragCards-i-1);
if(pDestStack->facedirection == CS_FACEUP && if(pDestStack->facedirection == CS_FACEUP &&
pDestStack->numcards+i >= dest->numfacedown) pDestStack->numcards+i >= dest->numfacedown)
{ {
//cdtDraw(hdcDragCard, xdraw, ydraw, iDragCards[i], ectFACES, 0); //cdtDraw(hdcDragCard, xdraw, ydraw, iDragCards[i], ectFACES, 0);

6
reactos/base/applications/games/solitaire/cardlib/cardstack.cpp
View file

@ -61,10 +61,10 @@ void CardStack::Shuffle()
//want to do this: //want to do this:
// bad: src = rand() % (dest + 1) // bad: src = rand() % (dest + 1)
// good: src = rand() / (RAND_MAX / (dest+1) + 1) // good: src = rand() / (RAND_MAX / (dest+1) + 1)
//positions from 0 to dest //positions from 0 to dest
src = rand() / (RAND_MAX / (dest+1) + 1); src = rand() / (RAND_MAX / (dest+1) + 1);
//swap the cards //swap the cards
temp = cardlist[src]; temp = cardlist[src];
cardlist[src] = cardlist[dest]; cardlist[src] = cardlist[dest];
@ -93,7 +93,7 @@ void CardStack::Push(const CardStack &cardstack)
if(nNumCards + cardstack.nNumCards < MAX_CARDSTACK_SIZE) if(nNumCards + cardstack.nNumCards < MAX_CARDSTACK_SIZE)
{ {
int num = cardstack.NumCards(); int num = cardstack.NumCards();
for(int i = 0; i < num; i++) for(int i = 0; i < num; i++)
cardlist[nNumCards++] = cardstack.cardlist[i]; cardlist[nNumCards++] = cardstack.cardlist[i];
} }

6
reactos/base/applications/games/solitaire/cardlib/cardstack.h
View file

@ -17,7 +17,7 @@ public:
void Shuffle(); void Shuffle();
void Clear(); void Clear();
void Reverse(); void Reverse();
void Push(const Card card); void Push(const Card card);
void Push(const CardStack &cardstack); void Push(const CardStack &cardstack);
@ -41,8 +41,8 @@ public:
CardStack operator + (Card card); CardStack operator + (Card card);
CardStack operator + (CardStack &cs); CardStack operator + (CardStack &cs);
private: private:
CardStack(CardStack &copythis, size_t fromindex); CardStack(CardStack &copythis, size_t fromindex);

72
reactos/base/applications/games/solitaire/cardlib/cardwindow.cpp
View file

@ -94,7 +94,7 @@ CardWindow::CardWindow() : m_hWnd(0)
__hPalette = CreateCardPalette(); __hPalette = CreateCardPalette();
__hdcPlaceHolder = CreateCompatibleDC(hdc); __hdcPlaceHolder = CreateCompatibleDC(hdc);
__holdplacepal = UseNicePalette(__hdcPlaceHolder, __hPalette); __holdplacepal = UseNicePalette(__hdcPlaceHolder, __hPalette);
__hbmPlaceHolder = CreateSinkBmp(hdc, __hdcPlaceHolder, crBackgnd, __cardwidth, __cardheight); __hbmPlaceHolder = CreateSinkBmp(hdc, __hdcPlaceHolder, crBackgnd, __cardwidth, __cardheight);
@ -118,9 +118,9 @@ BOOL CardWindow::Create(HWND hwndParent, DWORD dwExStyle, DWORD dwStyle, int x,
return FALSE; return FALSE;
//Create the window associated with this object //Create the window associated with this object
m_hWnd = CreateWindowEx(WS_EX_CLIENTEDGE, szCardName, 0, m_hWnd = CreateWindowEx(WS_EX_CLIENTEDGE, szCardName, 0,
WS_CHILD | WS_VISIBLE, WS_CHILD | WS_VISIBLE,
0,0,100,100, 0,0,100,100,
hwndParent, 0, GetModuleHandle(0), this); hwndParent, 0, GetModuleHandle(0), this);
return TRUE; return TRUE;
@ -183,7 +183,7 @@ void CardWindow::SetBackColor(COLORREF cr)
{ {
crBackgnd = cr; crBackgnd = cr;
int i; int i;
// //
// Create the exact palette we need to render the buttons/stacks // Create the exact palette we need to render the buttons/stacks
// //
@ -249,7 +249,7 @@ CardButton* CardWindow::CardButtonFromPoint(int x, int y)
return bptr; return bptr;
} }
return 0; return 0;
} }
CardRegion* CardWindow::CardRegionFromPoint(int x, int y) CardRegion* CardWindow::CardRegionFromPoint(int x, int y)
@ -266,7 +266,7 @@ CardRegion* CardWindow::CardRegionFromPoint(int x, int y)
return Regions[i]; return Regions[i];
} }
return 0; return 0;
} }
// //
@ -297,7 +297,7 @@ void CardWindow::Paint(HDC hdc)
} }
// //
// Clip the buttons // Clip the buttons
// //
for(i = 0; i < nNumButtons; i++) for(i = 0; i < nNumButtons; i++)
{ {
@ -305,10 +305,10 @@ void CardWindow::Paint(HDC hdc)
} }
// Now paint the whole screen with background colour, // Now paint the whole screen with background colour,
// //
GetClientRect(m_hWnd, &rect); GetClientRect(m_hWnd, &rect);
//PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd)); //PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd));
PaintCardRgn(hdc, 0, 0, rect.right, rect.bottom, 0, 0); PaintCardRgn(hdc, 0, 0, rect.right, rect.bottom, 0, 0);
SelectClipRgn(hdc, NULL); SelectClipRgn(hdc, NULL);
@ -326,7 +326,7 @@ void CardWindow::Paint(HDC hdc)
{ {
Regions[i]->Render(hdc); Regions[i]->Render(hdc);
} }
// Paint each button now // Paint each button now
// //
SelectClipRgn(hdc, NULL); SelectClipRgn(hdc, NULL);
@ -377,7 +377,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
case WM_SIZE: case WM_SIZE:
nWidth = LOWORD(lParam); nWidth = LOWORD(lParam);
nHeight = HIWORD(lParam); nHeight = HIWORD(lParam);
// //
// reposition all the stacks and buttons // reposition all the stacks and buttons
// in case any of them are centered, right-justified etc // in case any of them are centered, right-justified etc
@ -386,17 +386,17 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
{ {
Regions[i]->AdjustPosition(nWidth, nHeight); Regions[i]->AdjustPosition(nWidth, nHeight);
} }
for(i = 0; i < nNumButtons; i++) for(i = 0; i < nNumButtons; i++)
{ {
Buttons[i]->AdjustPosition(nWidth, nHeight); Buttons[i]->AdjustPosition(nWidth, nHeight);
} }
// //
// Call the user-defined resize proc AFTER all the stacks // Call the user-defined resize proc AFTER all the stacks
// have been positioned // have been positioned
// //
if(ResizeWndCallback) if(ResizeWndCallback)
ResizeWndCallback(nWidth, nHeight); ResizeWndCallback(nWidth, nHeight);
return 0; return 0;
@ -411,7 +411,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
return 0; return 0;
case WM_TIMER: case WM_TIMER:
//find the timer object in the registered funcs //find the timer object in the registered funcs
/*if(wParam >= 0x10000) /*if(wParam >= 0x10000)
{ {
@ -420,10 +420,10 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
if(RegFuncs[i].id == wParam) if(RegFuncs[i].id == wParam)
{ {
KillTimer(hwnd, wParam); KillTimer(hwnd, wParam);
//call the registered function!! //call the registered function!!
RegFuncs[i].func(RegFuncs[i].dwParam); RegFuncs[i].func(RegFuncs[i].dwParam);
RegFuncs[i] = RegFuncs[nRegFuncs-1]; RegFuncs[i] = RegFuncs[nRegFuncs-1];
nRegFuncs--; nRegFuncs--;
} }
@ -476,11 +476,11 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
if(!stackptr->OnLButtonDown(x, y)) if(!stackptr->OnLButtonDown(x, y))
stackptr = 0; stackptr = 0;
} }
return 0; return 0;
case WM_LBUTTONUP: case WM_LBUTTONUP:
x = (short)LOWORD(lParam); x = (short)LOWORD(lParam);
y = (short)HIWORD(lParam); y = (short)HIWORD(lParam);
@ -493,7 +493,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
buttonptr = 0; buttonptr = 0;
return 0; return 0;
} }
if(stackptr != 0) if(stackptr != 0)
{ {
stackptr->OnLButtonUp(x, y); stackptr->OnLButtonUp(x, y);
@ -504,7 +504,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
return 0; return 0;
case WM_MOUSEMOVE: case WM_MOUSEMOVE:
x = (short)LOWORD(lParam); x = (short)LOWORD(lParam);
y = (short)HIWORD(lParam); y = (short)HIWORD(lParam);
@ -519,7 +519,7 @@ LRESULT CALLBACK CardWindow::WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
{ {
return stackptr->OnMouseMove(x, y); return stackptr->OnMouseMove(x, y);
} }
return 0; return 0;
} }
@ -563,7 +563,7 @@ bool CardWindow::DeleteButton(CardButton *pButton)
if(Buttons[i] == pButton) if(Buttons[i] == pButton)
{ {
CardButton *cb = Buttons[i]; CardButton *cb = Buttons[i];
//shift any after this one backwards //shift any after this one backwards
for(int j = i; j < nNumButtons - 1; j++) for(int j = i; j < nNumButtons - 1; j++)
{ {
@ -572,7 +572,7 @@ bool CardWindow::DeleteButton(CardButton *pButton)
delete cb; delete cb;
nNumButtons--; nNumButtons--;
return true; return true;
} }
} }
@ -587,7 +587,7 @@ bool CardWindow::DeleteRegion(CardRegion *pRegion)
if(Regions[i] == pRegion) if(Regions[i] == pRegion)
{ {
CardRegion *cr = Regions[i]; CardRegion *cr = Regions[i];
//shift any after this one backwards //shift any after this one backwards
for(int j = i; j < nNumCardRegions - 1; j++) for(int j = i; j < nNumCardRegions - 1; j++)
{ {
@ -641,7 +641,7 @@ bool CardWindow::DistributeStacks(int nIdFrom, int nNumStacks, UINT xJustify, in
if(Regions[i]->IsVisible()) if(Regions[i]->IsVisible())
numvisiblestacks++; numvisiblestacks++;
} }
if(xJustify == CS_XJUST_CENTER) if(xJustify == CS_XJUST_CENTER)
{ {
//startx -= ((numvisiblestacks + spacing) * cardwidth - spacing) / 2; //startx -= ((numvisiblestacks + spacing) * cardwidth - spacing) / 2;
@ -658,7 +658,7 @@ bool CardWindow::DistributeStacks(int nIdFrom, int nNumStacks, UINT xJustify, in
Regions[i]->xjustify = CS_XJUST_CENTER; Regions[i]->xjustify = CS_XJUST_CENTER;
curx += Regions[i]->width + xSpacing; curx += Regions[i]->width + xSpacing;
} }
} }
} }
@ -666,7 +666,7 @@ bool CardWindow::DistributeStacks(int nIdFrom, int nNumStacks, UINT xJustify, in
{ {
nStartX -= ((numvisiblestacks + xSpacing) * __cardwidth - xSpacing); nStartX -= ((numvisiblestacks + xSpacing) * __cardwidth - xSpacing);
} }
if(xJustify == CS_XJUST_NONE) if(xJustify == CS_XJUST_NONE)
{ {
for(i = startindex; i < startindex + nNumStacks; i++) for(i = startindex; i < startindex + nNumStacks; i++)
@ -677,7 +677,7 @@ bool CardWindow::DistributeStacks(int nIdFrom, int nNumStacks, UINT xJustify, in
curx += Regions[i]->width + xSpacing; curx += Regions[i]->width + xSpacing;
Regions[i]->UpdateSize(); Regions[i]->UpdateSize();
} }
} }
} }
@ -748,7 +748,7 @@ void CardWindow::PaintCardRgn(HDC hdc, int dx, int dy, int width, int height, in
if(hbmBackImage == 0) if(hbmBackImage == 0)
{ {
SetRect(&rect, dx, dy, dx+width, dy+height); SetRect(&rect, dx, dy, dx+width, dy+height);
/*if(GetVersion() < 0x80000000) /*if(GetVersion() < 0x80000000)
{ {
PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd)); PaintRect(hdc, &rect, MAKE_PALETTERGB(crBackgnd));
@ -763,7 +763,7 @@ void CardWindow::PaintCardRgn(HDC hdc, int dx, int dy, int width, int height, in
//otherwise, paint using the bitmap //otherwise, paint using the bitmap
else else
{ {
// Draw whatever part of background we can // Draw whatever part of background we can
BitBlt(hdc, dx, dy, width, height, hdcBackImage, sx, sy, SRCCOPY); BitBlt(hdc, dx, dy, width, height, hdcBackImage, sx, sy, SRCCOPY);
// Now we need to paint any area outside the bitmap, // Now we need to paint any area outside the bitmap,
@ -778,14 +778,14 @@ void CardWindow::PaintCardRgn(HDC hdc, int dx, int dy, int width, int height, in
HRGN hr2 = CreateRectRgn(0, 0, bm.bmWidth, bm.bmHeight); HRGN hr2 = CreateRectRgn(0, 0, bm.bmWidth, bm.bmHeight);
HRGN hr3 = CreateRectRgn(0,0, 1, 1); HRGN hr3 = CreateRectRgn(0,0, 1, 1);
HRGN hr4 = CreateRectRgn(0,0, 1, 1); HRGN hr4 = CreateRectRgn(0,0, 1, 1);
CombineRgn(hr3, hr1, hr2, RGN_DIFF); CombineRgn(hr3, hr1, hr2, RGN_DIFF);
GetClipRgn(hdc, hr4); GetClipRgn(hdc, hr4);
CombineRgn(hr3, hr4, hr3, RGN_AND); CombineRgn(hr3, hr4, hr3, RGN_AND);
SelectClipRgn(hdc, hr3); SelectClipRgn(hdc, hr3);
// Fill remaining space not filled with bitmap // Fill remaining space not filled with bitmap
HBRUSH hbr = CreateSolidBrush(crBackgnd); HBRUSH hbr = CreateSolidBrush(crBackgnd);
FillRgn(hdc, hr3, hbr); FillRgn(hdc, hr3, hbr);
@ -793,7 +793,7 @@ void CardWindow::PaintCardRgn(HDC hdc, int dx, int dy, int width, int height, in
// Clean up // Clean up
SelectClipRgn(hdc, hr4); SelectClipRgn(hdc, hr4);
DeleteObject(hr1); DeleteObject(hr1);
DeleteObject(hr2); DeleteObject(hr2);
DeleteObject(hr3); DeleteObject(hr3);

6
reactos/base/applications/games/solitaire/cardlib/cardwindow.h
View file

@ -17,7 +17,7 @@ class CardWindow
{ {
friend class CardRegion; friend class CardRegion;
friend class CardButton; friend class CardButton;
friend void RegisterCardWindow(); friend void RegisterCardWindow();
public: public:
@ -57,7 +57,7 @@ public:
void SetResizeProc(pResizeWndProc proc); void SetResizeProc(pResizeWndProc proc);
int GetWidth() { return nWidth; } int GetWidth() { return nWidth; }
int GetHeight() { return nHeight; } int GetHeight() { return nHeight; }
// //
// Dropzone support // Dropzone support
// //
@ -93,7 +93,7 @@ static LRESULT CALLBACK CardWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
HWND m_hWnd; //window handle! HWND m_hWnd; //window handle!
int nWidth, nHeight; int nWidth, nHeight;
UINT nBackCardIdx; //all stacks share this card index by default UINT nBackCardIdx; //all stacks share this card index by default
HBITMAP hbmBackImage; HBITMAP hbmBackImage;

8
reactos/base/applications/games/solitaire/cardlib/dropzone.cpp
View file

@ -16,7 +16,7 @@ bool CardWindow::RegisterDropZone(int id, RECT *rect, pDropZoneProc proc)
return false; return false;
DropZone *dz = new DropZone(id, rect, proc); DropZone *dz = new DropZone(id, rect, proc);
dropzone[nNumDropZones++] = dz; dropzone[nNumDropZones++] = dz;
return false; return false;
@ -28,7 +28,7 @@ DropZone *CardWindow::GetDropZoneFromRect(RECT *rect)
{ {
RECT inter; RECT inter;
RECT zone; RECT zone;
//if any part of the drag rectangle falls within a drop zone, //if any part of the drag rectangle falls within a drop zone,
//let that take priority over any other card stack. //let that take priority over any other card stack.
dropzone[i]->GetZone(&zone); dropzone[i]->GetZone(&zone);
@ -51,7 +51,7 @@ bool CardWindow::DeleteDropZone(int id)
if(dropzone[i]->id == id) if(dropzone[i]->id == id)
{ {
DropZone *dz = dropzone[i]; DropZone *dz = dropzone[i];
//shift any after this one backwards //shift any after this one backwards
for(int j = i; j < nNumDropZones - 1; j++) for(int j = i; j < nNumDropZones - 1; j++)
{ {
@ -61,7 +61,7 @@ bool CardWindow::DeleteDropZone(int id)
delete dz; delete dz;
nNumDropZones--; nNumDropZones--;
return true; return true;
} }
} }
return false; return false;

4
reactos/base/applications/games/solitaire/cardlib/dropzone.h
View file

@ -12,7 +12,7 @@ class DropZone
{ {
friend class CardWindow; friend class CardWindow;
DropZone(int Id, RECT *rect, pDropZoneProc proc) : DropZone(int Id, RECT *rect, pDropZoneProc proc) :
id(Id), DropZoneCallback(proc) { CopyRect(&zone, rect); } id(Id), DropZoneCallback(proc) { CopyRect(&zone, rect); }
public: public:
@ -21,7 +21,7 @@ public:
void GetZone(RECT *rect) { CopyRect(rect, &zone); } void GetZone(RECT *rect) { CopyRect(rect, &zone); }
void SetCallback(pDropZoneProc callback) { DropZoneCallback = callback; } void SetCallback(pDropZoneProc callback) { DropZoneCallback = callback; }
int DropCards(CardStack &cardstack) int DropCards(CardStack &cardstack)
{ {
if(DropZoneCallback) if(DropZoneCallback)
return DropZoneCallback(id, cardstack); return DropZoneCallback(id, cardstack);

2
reactos/base/applications/games/solitaire/lang/lt-LT.rc
View file

@ -4,7 +4,7 @@
* FILE: base/applications/games/solitaire/lang/lt-LT.rc * FILE: base/applications/games/solitaire/lang/lt-LT.rc
* PURPOSE: Lithuanian Language File for Solitaire * PURPOSE: Lithuanian Language File for Solitaire
* PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de) * PROGRAMMERS: Daniel "EmuandCo" Reimer (reimer.daniel@freenet.de)
* TRANSLATORS: Vytis "CMan" Girdþijauskas (cman@cman.us) * TRANSLATORS: Vytis "CMan" Girdþijauskas (cman@cman.us)
*/ */
#include "resource.h" #include "resource.h"

2
reactos/base/applications/games/solitaire/lang/sk-SK.rc
View file

@ -57,7 +57,7 @@ END
/* Menus */ /* Menus */
IDR_MENU1 MENU DISCARDABLE IDR_MENU1 MENU DISCARDABLE
BEGIN BEGIN
POPUP "&Hra" POPUP "&Hra"
BEGIN BEGIN

2
reactos/base/applications/games/solitaire/lang/th-TH.rc
View file

@ -56,7 +56,7 @@ END
/* Menus */ /* Menus */
IDR_MENU1 MENU DISCARDABLE IDR_MENU1 MENU DISCARDABLE
BEGIN BEGIN
POPUP "à&¡Á" POPUP "à&¡Á"
BEGIN BEGIN

4
reactos/base/applications/games/solitaire/solcreate.cpp
View file

@ -68,8 +68,8 @@ void CreateSol()
pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset); pRowStack[i] = SolWnd.CreateRegion(ROW_ID+i, true, 0, Y_BORDER + __cardheight + Y_ROWSTACK_BORDER, 0, yRowStackCardOffset);
pRowStack[i]->SetEmptyImage(CS_EI_SUNK); pRowStack[i]->SetEmptyImage(CS_EI_SUNK);
pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i); pRowStack[i]->SetFaceDirection(CS_FACE_DOWNUP, i);
pRowStack[i]->SetPlacement(CS_XJUST_CENTER, 0, pRowStack[i]->SetPlacement(CS_XJUST_CENTER, 0,
(i - NUM_ROW_STACKS/2) * (__cardwidth + X_ROWSTACK_BORDER), 0); (i - NUM_ROW_STACKS/2) * (__cardwidth + X_ROWSTACK_BORDER), 0);
pRowStack[i]->SetEmptyImage(CS_EI_NONE); pRowStack[i]->SetEmptyImage(CS_EI_NONE);

12
reactos/base/applications/games/solitaire/solgame.cpp
View file

@ -24,7 +24,7 @@ void NewGame(void)
int i, j; int i, j;
SolWnd.EmptyStacks(); SolWnd.EmptyStacks();
//create a new card-stack //create a new card-stack
CardStack deck; CardStack deck;
deck.NewDeck(); deck.NewDeck();
@ -88,7 +88,7 @@ bool CARDLIBPROC RowStackDragProc(CardRegion &stackobj, int iNumDragCards)
} }
// //
// Row a row-stack, we can only drop cards // Row a row-stack, we can only drop cards
// that are lower / different colour // that are lower / different colour
// //
bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, const CardStack &dragcards) bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, const CardStack &dragcards)
@ -108,7 +108,7 @@ bool CARDLIBPROC RowStackDropProc(CardRegion &stackobj, const CardStack &dragca
else else
{ {
const CardStack &mystack = stackobj.GetCardStack(); const CardStack &mystack = stackobj.GetCardStack();
//can only drop if card is 1 less //can only drop if card is 1 less
if(mystack[0].LoVal() != dragcard.LoVal() + 1) if(mystack[0].LoVal() != dragcard.LoVal() + 1)
{ {
@ -194,7 +194,7 @@ void CARDLIBPROC RowStackClickProc(CardRegion &stackobj, int iNumClicked)
{ {
TRACE("ENTER RowStackClickProc()\n"); TRACE("ENTER RowStackClickProc()\n");
int numfacedown; int numfacedown;
stackobj.GetFaceDirection(&numfacedown); stackobj.GetFaceDirection(&numfacedown);
//if all face-down, then make top card face-up //if all face-down, then make top card face-up
@ -249,7 +249,7 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
if(fGameOver) if(fGameOver)
{ {
MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION); MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
pSuitStack[i]->Flash(11, 100); pSuitStack[i]->Flash(11, 100);
@ -277,7 +277,7 @@ void CARDLIBPROC RowStackDblClickProc(CardRegion &stackobj, int iNumClicked)
//find a suit-stack to move the card to... //find a suit-stack to move the card to...
const CardStack &cardstack = stackobj.GetCardStack(); const CardStack &cardstack = stackobj.GetCardStack();
CardRegion *pDest = FindSuitStackFromCard(cardstack[0]); CardRegion *pDest = FindSuitStackFromCard(cardstack[0]);
if(pDest != 0) if(pDest != 0)
{ {
fGameStarted = true; fGameStarted = true;

6
reactos/base/applications/games/solitaire/solitaire.cpp
View file

@ -277,7 +277,7 @@ VOID ShowGameOptionsDlg(HWND hwnd)
} }
LRESULT CALLBACK LRESULT CALLBACK
CardImageWndProc(HWND hwnd, CardImageWndProc(HWND hwnd,
UINT msg, UINT msg,
WPARAM wParam, WPARAM wParam,
@ -464,7 +464,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
//SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0); //SendMessage(hwndStatus, SB_SIMPLE, (WPARAM)TRUE, 0);
SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts);
SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)""); SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)"");
SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0); SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0);
@ -502,7 +502,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE); MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE);
} }
//parts[0] = nWidth - 256; //parts[0] = nWidth - 256;
//SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts); //SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts);
return 0; return 0;
case WM_GETMINMAXINFO: case WM_GETMINMAXINFO:

6
reactos/base/applications/games/solitaire/solitaire.rbuild
View file

@ -8,9 +8,9 @@
<define name="_WIN32_IE">0x0501</define> <define name="_WIN32_IE">0x0501</define>
<define name="_WIN32_WINNT">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>
<library>kernel32</library> <library>kernel32</library>
<library>user32</library> <library>user32</library>
<library>gdi32</library> <library>gdi32</library>
<library>comctl32</library> <library>comctl32</library>
<file>solcreate.cpp</file> <file>solcreate.cpp</file>
<file>solgame.cpp</file> <file>solgame.cpp</file>
<file>solitaire.cpp</file> <file>solitaire.cpp</file>

2
reactos/base/applications/games/winemine/lang/fr-FR.rc
View file

@ -5,7 +5,7 @@
* Initial file : http://svn.reactos.org/viewcvs/trunk/reactos/base/applications/games/winemine/En.rc * Initial file : http://svn.reactos.org/viewcvs/trunk/reactos/base/applications/games/winemine/En.rc
* Revision : 85 * Revision : 85
*/ */
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
STRINGTABLE { STRINGTABLE {

2
reactos/base/applications/games/winemine/lang/pl-PL.rc
View file

@ -1,6 +1,6 @@
//Polish translation Emil Kaczmarek 2006 //Polish translation Emil Kaczmarek 2006
/* /*
* small changes by TestamenT * small changes by TestamenT
* testament@users.sourceforge.net * testament@users.sourceforge.net
* https://sourceforge.net/projects/reactospl * https://sourceforge.net/projects/reactospl
*/ */

2
reactos/base/applications/hh/hh.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no"> <module name="hh" type="win32gui" installbase="system32" installname="hh.exe" unicode="no">
<include base="hh">.</include> <include base="hh">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define> <define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

46
reactos/base/applications/hh/main.c
View file

@ -1,23 +1,23 @@
#include <windows.h> #include <windows.h>
typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline); typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline);
int WINAPI int WINAPI
WinMain(HINSTANCE hInst, WinMain(HINSTANCE hInst,
HINSTANCE hPrevInst, HINSTANCE hPrevInst,
LPSTR cmdline, LPSTR cmdline,
int cmdshow) int cmdshow)
{ {
HMODULE hModule; HMODULE hModule;
DOWINMAIN *doWinMain; DOWINMAIN *doWinMain;
int ret = -1; int ret = -1;
hModule = LoadLibraryA("hhctrl.ocx"); hModule = LoadLibraryA("hhctrl.ocx");
doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain"); doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain");
ret = doWinMain(hInst, cmdline); ret = doWinMain(hInst, cmdline);
FreeLibrary(hModule); FreeLibrary(hModule);
return ret; return ret;
} }

2
reactos/base/applications/hostname/hostname.c
View file

@ -19,7 +19,7 @@
/* $Id$ /* $Id$
* *
* COPYRIGHT : See COPYING in the top level directory * COPYRIGHT : See COPYING in the top level directory
* PROJECT : ReactOS/Win32 get host name * PROJECT : ReactOS/Win32 get host name
* FILE : subsys/system/hostname/hostname.c * FILE : subsys/system/hostname/hostname.c
* PROGRAMMER: Emanuele Aliberti (ea@reactos.com) * PROGRAMMER: Emanuele Aliberti (ea@reactos.com)
*/ */

40
reactos/base/applications/logoff/logoff.c
View file

@ -5,12 +5,12 @@
* PURPOSE: Logoff current session, or another session, potentially on another machine * PURPOSE: Logoff current session, or another session, potentially on another machine
* AUTHOR: 30.07.2007 - Frode Lillerud * AUTHOR: 30.07.2007 - Frode Lillerud
*/ */
/* Note /* Note
* This application is a lightweight version of shutdown.exe. It is intended to be function-compatible * This application is a lightweight version of shutdown.exe. It is intended to be function-compatible
* with Windows' system32\logoff.exe commandline application. * with Windows' system32\logoff.exe commandline application.
*/ */
#define NDEBUG #define NDEBUG
#include "precomp.h" #include "precomp.h"
@ -18,18 +18,18 @@
LPTSTR szRemoteServerName = NULL; LPTSTR szRemoteServerName = NULL;
BOOL bVerbose; BOOL bVerbose;
//---------------------------------------------------------------------- //----------------------------------------------------------------------
// //
//Retrieve resource string and output the Usage to the console //Retrieve resource string and output the Usage to the console
// //
//---------------------------------------------------------------------- //----------------------------------------------------------------------
static void PrintUsage() { static void PrintUsage() {
LPTSTR lpUsage = NULL; LPTSTR lpUsage = NULL;
if (AllocAndLoadString(&lpUsage, GetModuleHandle(NULL), IDS_USAGE)) { if (AllocAndLoadString(&lpUsage, GetModuleHandle(NULL), IDS_USAGE)) {
_putts(lpUsage); _putts(lpUsage);
} }
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -41,7 +41,7 @@ void DisplayLastError()
{ {
int errorCode = GetLastError(); int errorCode = GetLastError();
LPTSTR lpMsgBuf; LPTSTR lpMsgBuf;
// Display the error message to the user // Display the error message to the user
FormatMessage( FormatMessage(
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
@ -51,10 +51,10 @@ void DisplayLastError()
(LPTSTR) &lpMsgBuf, (LPTSTR) &lpMsgBuf,
0, 0,
NULL); NULL);
_ftprintf(stderr, lpMsgBuf); _ftprintf(stderr, lpMsgBuf);
_ftprintf(stderr, _T("Error code: %d\n"), errorCode); _ftprintf(stderr, _T("Error code: %d\n"), errorCode);
LocalFree(lpMsgBuf); LocalFree(lpMsgBuf);
} }
@ -67,10 +67,10 @@ BOOL ParseCommandLine(int argc, TCHAR *argv[])
{ {
int i; int i;
LPTSTR lpIllegalMsg; LPTSTR lpIllegalMsg;
//FIXME: Add handling of commandline arguments to select the session number and name, and also name of remote machine //FIXME: Add handling of commandline arguments to select the session number and name, and also name of remote machine
//Example: logoff.exe 4 /SERVER:Master should logoff session number 4 on remote machine called Master. //Example: logoff.exe 4 /SERVER:Master should logoff session number 4 on remote machine called Master.
for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
switch(argv[i][0]){ switch(argv[i][0]){
case '-': case '-':
@ -83,11 +83,11 @@ BOOL ParseCommandLine(int argc, TCHAR *argv[])
// -? (usage) // -? (usage)
else if(argv[i][1] == '?') { else if(argv[i][1] == '?') {
return FALSE; //display the Usage return FALSE; //display the Usage
} }
default: default:
//Invalid parameter detected //Invalid parameter detected
if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM)) if (AllocAndLoadString(&lpIllegalMsg, GetModuleHandle(NULL), IDS_ILLEGAL_PARAM))
_putts(lpIllegalMsg); _putts(lpIllegalMsg);
return FALSE; return FALSE;
} }
} }
@ -107,20 +107,20 @@ int _tmain(int argc, TCHAR *argv[])
// //
// Parse command line // Parse command line
// //
if (!ParseCommandLine(argc, argv)) { if (!ParseCommandLine(argc, argv)) {
PrintUsage(); PrintUsage();
return 1; return 1;
} }
// //
//Should we log off session on remote server? //Should we log off session on remote server?
// //
if (szRemoteServerName) { if (szRemoteServerName) {
if (bVerbose) { if (bVerbose) {
if (AllocAndLoadString(&lpLogoffRemote, GetModuleHandle(NULL), IDS_LOGOFF_REMOTE)) if (AllocAndLoadString(&lpLogoffRemote, GetModuleHandle(NULL), IDS_LOGOFF_REMOTE))
_putts(lpLogoffRemote); _putts(lpLogoffRemote);
} }
//FIXME: Add Remote Procedure Call to logoff user on a remote machine //FIXME: Add Remote Procedure Call to logoff user on a remote machine
_ftprintf(stderr, "Remote Procedure Call in logoff.exe has not been implemented"); _ftprintf(stderr, "Remote Procedure Call in logoff.exe has not been implemented");
} }
@ -131,16 +131,16 @@ int _tmain(int argc, TCHAR *argv[])
if (bVerbose) { if (bVerbose) {
//Get resource string, and print it. //Get resource string, and print it.
if (AllocAndLoadString(&lpLogoffLocal, GetModuleHandle(NULL), IDS_LOGOFF_LOCAL)) if (AllocAndLoadString(&lpLogoffLocal, GetModuleHandle(NULL), IDS_LOGOFF_LOCAL))
_putts(lpLogoffLocal); _putts(lpLogoffLocal);
} }
//Actual logoff //Actual logoff
if (!ExitWindows(NULL, NULL)) { if (!ExitWindows(NULL, NULL)) {
DisplayLastError(); DisplayLastError();
return 1; return 1;
} }
} }
return 0; return 0;
} }
/* EOF */ /* EOF */

8
reactos/base/applications/mmc/lang/pl-PL.rc
View file

@ -1,8 +1,8 @@
/* /*
* translated by xrogers * translated by xrogers
* xxrogers@users.sourceforge.net * xxrogers@users.sourceforge.net
* https://sourceforge.net/projects/reactospl * https://sourceforge.net/projects/reactospl
*/ */
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT

2
reactos/base/applications/mmc/mmc.rbuild
View file

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes"> <module name="mmcclient" type="win32gui" installbase="system32" installname="mmc.exe" unicode="yes">
<include base="mmcclient">.</include> <include base="mmcclient">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="_WIN32_IE">0x0600</define> <define name="_WIN32_IE">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

10
reactos/base/applications/msconfig/lang/bg-BG.rc
View file

@ -89,7 +89,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Ðàç&øèðåíè íàñòðîéêè...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 PUSHBUTTON "Ðàç&øèðåíè íàñòðîéêè...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12
LTEXT "&Èç÷àêâàíå:", -1, 265, 91, 40, 10 LTEXT "&Èç÷àêâàíå:", -1, 265, 91, 40, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "ñåê.", -1, 340, 91, 15, 10 LTEXT "ñåê.", -1, 340, 91, 15, 10
@ -125,9 +125,9 @@ BEGIN
IDS_MSCONFIG "Ïðèëîæåíèå çà íàñòðîéêà íà ñèñòåìàòà" IDS_MSCONFIG "Ïðèëîæåíèå çà íàñòðîéêà íà ñèñòåìàòà"
IDS_TAB_GENERAL "Îáùè" IDS_TAB_GENERAL "Îáùè"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Óñëóãè" IDS_TAB_SERVICES "Óñëóãè"
IDS_TAB_STARTUP "Çàïóñê" IDS_TAB_STARTUP "Çàïóñê"
IDS_TAB_TOOLS "Ñðåäñòâà" IDS_TAB_TOOLS "Ñðåäñòâà"
END END
@ -171,6 +171,6 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Çàïóñíàò" IDS_SERVICES_STATUS_RUNNING "Çàïóñíàò"
IDS_SERVICES_STATUS_STOPPED "Ñïðÿí" IDS_SERVICES_STATUS_STOPPED "Ñïðÿí"
IDS_SERVICES_YES "Äà" IDS_SERVICES_YES "Äà"
IDS_SERVICES_UNKNOWN "Íåèçâåñòåí" IDS_SERVICES_UNKNOWN "Íåèçâåñòåí"
END END

10
reactos/base/applications/msconfig/lang/ca-ES.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BOO&TLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Op&cions Avançades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "Op&cions Avançades...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "Temps:", -1, 280, 91, 30, 10 LTEXT "Temps:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sec.", -1, 340, 91, 15, 10 LTEXT "sec.", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "Programa de configuracio de sistema" IDS_MSCONFIG "Programa de configuracio de sistema"
IDS_TAB_GENERAL "General" IDS_TAB_GENERAL "General"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Serveis" IDS_TAB_SERVICES "Serveis"
IDS_TAB_STARTUP "Arrencada" IDS_TAB_STARTUP "Arrencada"
IDS_TAB_TOOLS "Eines" IDS_TAB_TOOLS "Eines"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "En marxa" IDS_SERVICES_STATUS_RUNNING "En marxa"
IDS_SERVICES_STATUS_STOPPED "Parat" IDS_SERVICES_STATUS_STOPPED "Parat"
IDS_SERVICES_YES "Si" IDS_SERVICES_YES "Si"
IDS_SERVICES_UNKNOWN "Indeterminat" IDS_SERVICES_UNKNOWN "Indeterminat"
END END

10
reactos/base/applications/msconfig/lang/cs-CZ.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 56, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 56, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&Upøesnit možnosti...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "&Upøesnit možnosti...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Limit:", -1, 280, 91, 30, 10 LTEXT "&Limit:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sek.", -1, 340, 91, 15, 10 LTEXT "sek.", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "Nástroj pro konfiguraci systému" IDS_MSCONFIG "Nástroj pro konfiguraci systému"
IDS_TAB_GENERAL "Obecné" IDS_TAB_GENERAL "Obecné"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Služby" IDS_TAB_SERVICES "Služby"
IDS_TAB_STARTUP "Po spuštìní" IDS_TAB_STARTUP "Po spuštìní"
IDS_TAB_TOOLS "Nástroje" IDS_TAB_TOOLS "Nástroje"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Spuštìno" IDS_SERVICES_STATUS_RUNNING "Spuštìno"
IDS_SERVICES_STATUS_STOPPED "Zastaveno" IDS_SERVICES_STATUS_STOPPED "Zastaveno"
IDS_SERVICES_YES "Ano" IDS_SERVICES_YES "Ano"
IDS_SERVICES_UNKNOWN "Neznámý" IDS_SERVICES_UNKNOWN "Neznámý"
END END

12
reactos/base/applications/msconfig/lang/de-DE.rc
View file

@ -89,7 +89,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "E&rweiterte Optionen...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12 PUSHBUTTON "E&rweiterte Optionen...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 90, 12
LTEXT "&Zeitlimit:", -1, 280, 91, 30, 10 LTEXT "&Zeitlimit:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "Sek.", -1, 340, 91, 15, 10 LTEXT "Sek.", -1, 340, 91, 15, 10
@ -125,9 +125,9 @@ BEGIN
IDS_MSCONFIG "Systemkonfigurationsprogramm" IDS_MSCONFIG "Systemkonfigurationsprogramm"
IDS_TAB_GENERAL "Allgemein" IDS_TAB_GENERAL "Allgemein"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Dienste" IDS_TAB_SERVICES "Dienste"
IDS_TAB_STARTUP "Systemstart" IDS_TAB_STARTUP "Systemstart"
IDS_TAB_TOOLS "Tools" IDS_TAB_TOOLS "Tools"
END END
@ -145,7 +145,7 @@ BEGIN
IDS_TOOLS_COLUMN_DESCR "Beschreibung" IDS_TOOLS_COLUMN_DESCR "Beschreibung"
IDS_TOOLS_CMD_NAME "Konsole" IDS_TOOLS_CMD_NAME "Konsole"
IDS_TOOLS_CMD_DESCR "" IDS_TOOLS_CMD_DESCR ""
IDS_TOOLS_CMD_CMD "cmd.exe" IDS_TOOLS_CMD_CMD "cmd.exe"
IDS_TOOLS_INFO_NAME "Version" IDS_TOOLS_INFO_NAME "Version"
@ -171,5 +171,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Gestartet" IDS_SERVICES_STATUS_RUNNING "Gestartet"
IDS_SERVICES_STATUS_STOPPED "Beendet" IDS_SERVICES_STATUS_STOPPED "Beendet"
IDS_SERVICES_YES "Ja" IDS_SERVICES_YES "Ja"
IDS_SERVICES_UNKNOWN "Unbekannt" IDS_SERVICES_UNKNOWN "Unbekannt"
END END

10
reactos/base/applications/msconfig/lang/en-US.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "Ad&vanced Options...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Timeout:", -1, 280, 91, 30, 10 LTEXT "&Timeout:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sec.", -1, 340, 91, 15, 10 LTEXT "sec.", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "System configuration program" IDS_MSCONFIG "System configuration program"
IDS_TAB_GENERAL "General" IDS_TAB_GENERAL "General"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Services" IDS_TAB_SERVICES "Services"
IDS_TAB_STARTUP "Startup" IDS_TAB_STARTUP "Startup"
IDS_TAB_TOOLS "Tools" IDS_TAB_TOOLS "Tools"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Running" IDS_SERVICES_STATUS_RUNNING "Running"
IDS_SERVICES_STATUS_STOPPED "Stopped" IDS_SERVICES_STATUS_STOPPED "Stopped"
IDS_SERVICES_YES "Yes" IDS_SERVICES_YES "Yes"
IDS_SERVICES_UNKNOWN "Unknown" IDS_SERVICES_UNKNOWN "Unknown"
END END

10
reactos/base/applications/msconfig/lang/fr-FR.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Options A&vancées...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "Options A&vancées...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Délai:", -1, 280, 91, 30, 10 LTEXT "&Délai:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sec.", -1, 340, 91, 15, 10 LTEXT "sec.", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "Utilitaire de configuration système" IDS_MSCONFIG "Utilitaire de configuration système"
IDS_TAB_GENERAL "Général" IDS_TAB_GENERAL "Général"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Services" IDS_TAB_SERVICES "Services"
IDS_TAB_STARTUP "Démarrage" IDS_TAB_STARTUP "Démarrage"
IDS_TAB_TOOLS "Outils" IDS_TAB_TOOLS "Outils"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "En cours" IDS_SERVICES_STATUS_RUNNING "En cours"
IDS_SERVICES_STATUS_STOPPED "Arrêté" IDS_SERVICES_STATUS_STOPPED "Arrêté"
IDS_SERVICES_YES "Oui" IDS_SERVICES_YES "Oui"
IDS_SERVICES_UNKNOWN "Inconnu" IDS_SERVICES_UNKNOWN "Inconnu"
END END

6
reactos/base/applications/msconfig/lang/hu-HU.rc
View file

@ -67,9 +67,9 @@ BEGIN
IDS_MSCONFIG "Rendszerkonfiguráciüs segédprogram" IDS_MSCONFIG "Rendszerkonfiguráciüs segédprogram"
IDS_TAB_GENERAL "Általános" IDS_TAB_GENERAL "Általános"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Szolgáltatások" IDS_TAB_SERVICES "Szolgáltatások"
IDS_TAB_STARTUP "Automatikus indítás" IDS_TAB_STARTUP "Automatikus indítás"
IDS_TAB_TOOLS "Segédprogramok" IDS_TAB_TOOLS "Segédprogramok"
END END

10
reactos/base/applications/msconfig/lang/id-ID.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Opsi &Lanjutan...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "Opsi &Lanjutan...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Berakhir:", -1, 280, 91, 30, 10 LTEXT "&Berakhir:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "detik", -1, 340, 91, 15, 10 LTEXT "detik", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "Program konfigurasi sistem" IDS_MSCONFIG "Program konfigurasi sistem"
IDS_TAB_GENERAL "Umum" IDS_TAB_GENERAL "Umum"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Layanan" IDS_TAB_SERVICES "Layanan"
IDS_TAB_STARTUP "Startup" IDS_TAB_STARTUP "Startup"
IDS_TAB_TOOLS "Piranti" IDS_TAB_TOOLS "Piranti"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Berjalan" IDS_SERVICES_STATUS_RUNNING "Berjalan"
IDS_SERVICES_STATUS_STOPPED "Dihentikan" IDS_SERVICES_STATUS_STOPPED "Dihentikan"
IDS_SERVICES_YES "Ya" IDS_SERVICES_YES "Ya"
IDS_SERVICES_UNKNOWN "Tidak Dikenal" IDS_SERVICES_UNKNOWN "Tidak Dikenal"
END END

10
reactos/base/applications/msconfig/lang/it-IT.rc
View file

@ -88,7 +88,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 122, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 122, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 137, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 137, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 152, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 152, 50, 10
PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 148, 70, 16 PUSHBUTTON "Op&zioni avanzate...", IDC_BTN_ADVANCED_OPTIONS, 100, 148, 70, 16
LTEXT "&Timeout:", -1, 280, 91, 30, 10 LTEXT "&Timeout:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sec.", -1, 340, 91, 15, 10 LTEXT "sec.", -1, 340, 91, 15, 10
@ -124,9 +124,9 @@ BEGIN
IDS_MSCONFIG "Utilità di configurazione del sistema" IDS_MSCONFIG "Utilità di configurazione del sistema"
IDS_TAB_GENERAL "Generale" IDS_TAB_GENERAL "Generale"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Servizi" IDS_TAB_SERVICES "Servizi"
IDS_TAB_STARTUP "Avvio" IDS_TAB_STARTUP "Avvio"
IDS_TAB_TOOLS "Strumenti" IDS_TAB_TOOLS "Strumenti"
END END
@ -170,5 +170,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Esecuzione" IDS_SERVICES_STATUS_RUNNING "Esecuzione"
IDS_SERVICES_STATUS_STOPPED "Interrotto" IDS_SERVICES_STATUS_STOPPED "Interrotto"
IDS_SERVICES_YES "Sì" IDS_SERVICES_YES "Sì"
IDS_SERVICES_UNKNOWN "Sconosciuto" IDS_SERVICES_UNKNOWN "Sconosciuto"
END END

10
reactos/base/applications/msconfig/lang/nl-NL.rc
View file

@ -108,7 +108,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&Geavanceerde opties...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "&Geavanceerde opties...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "Time-&out:", -1, 280, 91, 30, 10 LTEXT "Time-&out:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "sec.", -1, 340, 91, 15, 10 LTEXT "sec.", -1, 340, 91, 15, 10
@ -144,9 +144,9 @@ BEGIN
IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie" IDS_MSCONFIG "Hulpprogramma voor systeemconfiguratie"
IDS_TAB_GENERAL "Algemeen" IDS_TAB_GENERAL "Algemeen"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Services" IDS_TAB_SERVICES "Services"
IDS_TAB_STARTUP "Opstarten" IDS_TAB_STARTUP "Opstarten"
IDS_TAB_TOOLS "Hulpmiddelen" IDS_TAB_TOOLS "Hulpmiddelen"
END END
@ -190,5 +190,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Wordt uitgevoerd" IDS_SERVICES_STATUS_RUNNING "Wordt uitgevoerd"
IDS_SERVICES_STATUS_STOPPED "Gestopt" IDS_SERVICES_STATUS_STOPPED "Gestopt"
IDS_SERVICES_YES "Ja" IDS_SERVICES_YES "Ja"
IDS_SERVICES_UNKNOWN "Onbekend" IDS_SERVICES_UNKNOWN "Onbekend"
END END

12
reactos/base/applications/msconfig/lang/pl-PL.rc
View file

@ -1,5 +1,5 @@
/* /*
* translated by TestamenT * translated by TestamenT
* testament@users.sourceforge.net * testament@users.sourceforge.net
* https://sourceforge.net/projects/reactospl * https://sourceforge.net/projects/reactospl
*/ */
@ -94,7 +94,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&Opcje zaawansowane...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "&Opcje zaawansowane...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Limit czasu:", -1, 280, 91, 30, 10 LTEXT "&Limit czasu:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "s", -1, 340, 91, 15, 10 LTEXT "s", -1, 340, 91, 15, 10
@ -130,9 +130,9 @@ BEGIN
IDS_MSCONFIG "Program konfiguracji systemu" IDS_MSCONFIG "Program konfiguracji systemu"
IDS_TAB_GENERAL "Ogólne" IDS_TAB_GENERAL "Ogólne"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Us³ugi" IDS_TAB_SERVICES "Us³ugi"
IDS_TAB_STARTUP "Uruchamianie" IDS_TAB_STARTUP "Uruchamianie"
IDS_TAB_TOOLS "Narzêdzia" IDS_TAB_TOOLS "Narzêdzia"
END END
@ -176,5 +176,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Dzia³a" IDS_SERVICES_STATUS_RUNNING "Dzia³a"
IDS_SERVICES_STATUS_STOPPED "Zatrzymano" IDS_SERVICES_STATUS_STOPPED "Zatrzymano"
IDS_SERVICES_YES "Tak" IDS_SERVICES_YES "Tak"
IDS_SERVICES_UNKNOWN "Nieznany" IDS_SERVICES_UNKNOWN "Nieznany"
END END

10
reactos/base/applications/msconfig/lang/ru-RU.rc
View file

@ -90,7 +90,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "&Äîïîëíèòåëüíî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Òàéìàóò:", -1, 280, 82, 30, 10 LTEXT "&Òàéìàóò:", -1, 280, 82, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 93, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 280, 93, 25, 12, ES_LEFT
LTEXT "ñåê.", -1, 310, 91, 15, 10 LTEXT "ñåê.", -1, 310, 91, 15, 10
@ -126,9 +126,9 @@ BEGIN
IDS_MSCONFIG "Íàñòðîéêà ñèñòåìû" IDS_MSCONFIG "Íàñòðîéêà ñèñòåìû"
IDS_TAB_GENERAL "Îáùèå" IDS_TAB_GENERAL "Îáùèå"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Ñëóæáû" IDS_TAB_SERVICES "Ñëóæáû"
IDS_TAB_STARTUP "Àâòîçàãðóçêà" IDS_TAB_STARTUP "Àâòîçàãðóçêà"
IDS_TAB_TOOLS "Óòèëèòû" IDS_TAB_TOOLS "Óòèëèòû"
END END
@ -172,5 +172,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Çàïóùåíî" IDS_SERVICES_STATUS_RUNNING "Çàïóùåíî"
IDS_SERVICES_STATUS_STOPPED "Îñòàíîâëåíî" IDS_SERVICES_STATUS_STOPPED "Îñòàíîâëåíî"
IDS_SERVICES_YES "Äà" IDS_SERVICES_YES "Äà"
IDS_SERVICES_UNKNOWN "Íåèçâåñòíûé" IDS_SERVICES_UNKNOWN "Íåèçâåñòíûé"
END END

10
reactos/base/applications/msconfig/lang/th-TH.rc
View file

@ -108,7 +108,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "&µÑÇàÅ×Í¡ÃдѺÊÙ§...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "&µÑÇàÅ×Í¡ÃдѺÊÙ§...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&ËÁ´àÇÅÒ:", -1, 280, 91, 30, 10 LTEXT "&ËÁ´àÇÅÒ:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "ÇÔ¹Ò·Õ", -1, 340, 91, 15, 10 LTEXT "ÇÔ¹Ò·Õ", -1, 340, 91, 15, 10
@ -144,9 +144,9 @@ BEGIN
IDS_MSCONFIG "â»Ãá¡ÃÁâ¤Ã§áººÃкº" IDS_MSCONFIG "â»Ãá¡ÃÁâ¤Ã§áººÃкº"
IDS_TAB_GENERAL "·ÑèÇä»" IDS_TAB_GENERAL "·ÑèÇä»"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "ºÃÔ¡ÒÃ" IDS_TAB_SERVICES "ºÃÔ¡ÒÃ"
IDS_TAB_STARTUP "àÃÔèÁ§Ò¹à¤Ã×èͧ" IDS_TAB_STARTUP "àÃÔèÁ§Ò¹à¤Ã×èͧ"
IDS_TAB_TOOLS "à¤Ã×èͧÁ×Í" IDS_TAB_TOOLS "à¤Ã×èͧÁ×Í"
END END
@ -190,5 +190,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "¡ÓÅѧ´Óà¹Ô¹§Ò¹" IDS_SERVICES_STATUS_RUNNING "¡ÓÅѧ´Óà¹Ô¹§Ò¹"
IDS_SERVICES_STATUS_STOPPED "ËÂØ´áÅéÇ" IDS_SERVICES_STATUS_STOPPED "ËÂØ´áÅéÇ"
IDS_SERVICES_YES "ãªè" IDS_SERVICES_YES "ãªè"
IDS_SERVICES_UNKNOWN "äÁè·ÃÒº" IDS_SERVICES_UNKNOWN "äÁè·ÃÒº"
END END

10
reactos/base/applications/msconfig/lang/uk-UA.rc
View file

@ -96,7 +96,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "Ä&îäàòêîâî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "Ä&îäàòêîâî...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "&Çàòðèìêà:", -1, 280, 91, 30, 10 LTEXT "&Çàòðèìêà:", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "ñåê.", -1, 340, 91, 15, 10 LTEXT "ñåê.", -1, 340, 91, 15, 10
@ -132,9 +132,9 @@ BEGIN
IDS_MSCONFIG "Ïðîãðàìà íàëàøòóâàííÿ ñèñòåìè" IDS_MSCONFIG "Ïðîãðàìà íàëàøòóâàííÿ ñèñòåìè"
IDS_TAB_GENERAL "Çàãàëüí³" IDS_TAB_GENERAL "Çàãàëüí³"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "Ñëóæáè" IDS_TAB_SERVICES "Ñëóæáè"
IDS_TAB_STARTUP "Àâòîçàâàíòàæåííÿ" IDS_TAB_STARTUP "Àâòîçàâàíòàæåííÿ"
IDS_TAB_TOOLS "Óòèë³òè" IDS_TAB_TOOLS "Óòèë³òè"
END END
@ -178,5 +178,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "Ïðàöþº" IDS_SERVICES_STATUS_RUNNING "Ïðàöþº"
IDS_SERVICES_STATUS_STOPPED "Çóïèíåíà" IDS_SERVICES_STATUS_STOPPED "Çóïèíåíà"
IDS_SERVICES_YES "Òàê" IDS_SERVICES_YES "Òàê"
IDS_SERVICES_UNKNOWN "Íåâ³äîìî" IDS_SERVICES_UNKNOWN "Íåâ³äîìî"
END END

10
reactos/base/applications/msconfig/lang/zh-CN.rc
View file

@ -108,7 +108,7 @@ BEGIN
CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10
CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10
CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10
PUSHBUTTON "高级选项(&V)...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 PUSHBUTTON "高级选项(&V)...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12
LTEXT "超时(&T):", -1, 280, 91, 30, 10 LTEXT "超时(&T):", -1, 280, 91, 30, 10
EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT
LTEXT "秒", -1, 340, 91, 15, 10 LTEXT "秒", -1, 340, 91, 15, 10
@ -144,9 +144,9 @@ BEGIN
IDS_MSCONFIG "系统配置实用程序" IDS_MSCONFIG "系统配置实用程序"
IDS_TAB_GENERAL "一般" IDS_TAB_GENERAL "一般"
IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_SYSTEM "SYSTEM.INI"
IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_FREELDR "FREELDR.INI"
IDS_TAB_SERVICES "服务" IDS_TAB_SERVICES "服务"
IDS_TAB_STARTUP "启动" IDS_TAB_STARTUP "启动"
IDS_TAB_TOOLS "工具" IDS_TAB_TOOLS "工具"
END END
@ -190,5 +190,5 @@ BEGIN
IDS_SERVICES_STATUS_RUNNING "正在运行" IDS_SERVICES_STATUS_RUNNING "正在运行"
IDS_SERVICES_STATUS_STOPPED "已停止" IDS_SERVICES_STATUS_STOPPED "已停止"
IDS_SERVICES_YES "是" IDS_SERVICES_YES "是"
IDS_SERVICES_UNKNOWN "未知" IDS_SERVICES_UNKNOWN "未知"
END END

2
reactos/base/applications/msconfig/systempage.c
View file

@ -18,7 +18,7 @@ SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam);
switch (message) { switch (message) {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
hSystemDialog = hDlg; hSystemDialog = hDlg;
SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
return TRUE; return TRUE;

8
reactos/base/applications/msconfig/toolspage.c
View file

@ -18,7 +18,7 @@ void FillListView ( void );
DWORD ListItems_Cmds[20]; DWORD ListItems_Cmds[20];
DWORD ListItems_Params[20]; DWORD ListItems_Params[20];
void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) { void AddItem ( DWORD name_id, DWORD descr_id, DWORD cmd_id , DWORD param_id ) {
TCHAR szTemp[256]; TCHAR szTemp[256];
LV_ITEM item; LV_ITEM item;
@ -91,9 +91,9 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
case WM_COMMAND: case WM_COMMAND:
{ {
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
case IDC_BTN_RUN: case IDC_BTN_RUN:
{ {
if (ListView_GetSelectionMark(hToolsListCtrl) != -1) if (ListView_GetSelectionMark(hToolsListCtrl) != -1)
{ {
LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256); LoadString(hInst, ListItems_Cmds[ListView_GetSelectionMark(hToolsListCtrl)], szTemp, 256);
@ -112,7 +112,7 @@ ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
switch (nmh->code) switch (nmh->code)
{ {
case NM_CLICK: case NM_CLICK:
{ {
lpnmitem = (LPNMITEMACTIVATE) lParam; lpnmitem = (LPNMITEMACTIVATE) lParam;
if (lpnmitem->iItem > -1) if (lpnmitem->iItem > -1)
{ {

8
reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc
View file

@ -1,7 +1,7 @@
/* /*
* translated by xrogers * translated by xrogers
* xxrogers@users.sourceforge.net * xxrogers@users.sourceforge.net
* https://sourceforge.net/projects/reactospl * https://sourceforge.net/projects/reactospl
*/ */
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
@ -83,6 +83,6 @@ BEGIN
IDS_HINT_SYS_MOVE " Przesuwa to okno." IDS_HINT_SYS_MOVE " Przesuwa to okno."
IDS_HINT_SYS_SIZE " Zmienia rozmiar tego okna." IDS_HINT_SYS_SIZE " Zmienia rozmiar tego okna."
IDS_HINT_SYS_MINIMIZE " Minimalizuje to okno do ikony." IDS_HINT_SYS_MINIMIZE " Minimalizuje to okno do ikony."
IDS_HINT_SYS_MAXIMIZE " Rozszerza to okno do rozmiarów ekranu." IDS_HINT_SYS_MAXIMIZE " Rozszerza to okno do rozmiarów ekranu."
IDS_HINT_SYS_CLOSE " Zamyka okno." IDS_HINT_SYS_CLOSE " Zamyka okno."
END END

188
reactos/base/applications/mscutils/eventvwr/eventvwr.c
View file

@ -31,8 +31,8 @@
#include <time.h> #include <time.h>
#if _MSC_VER #if _MSC_VER
#pragma warning(disable: 4996) // 'strdup' was declared deprecated #pragma warning(disable: 4996) // 'strdup' was declared deprecated
#define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions #define _CRT_SECURE_NO_DEPRECATE // all deprecated 'unsafe string functions
#endif #endif
static const LPSTR EVENT_SOURCE_APPLICATION = "Application"; static const LPSTR EVENT_SOURCE_APPLICATION = "Application";
@ -42,8 +42,8 @@ static const TCHAR szWindowClass[] = _T("EVENTVWR"); // the main window class
//MessageFile message buffer size //MessageFile message buffer size
#define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10 #define EVENT_MESSAGE_EVENTTEXT_BUFFER 1024*10
#define EVENT_MESSAGE_FILE_BUFFER 1024*10 #define EVENT_MESSAGE_FILE_BUFFER 1024*10
#define EVENT_DLL_SEPARATOR ";" #define EVENT_DLL_SEPARATOR ";"
#define EVENT_MESSAGE_FILE "EventMessageFile" #define EVENT_MESSAGE_FILE "EventMessageFile"
#define EVENT_CATEGORY_MESSAGE_FILE "CategoryMessageFile" #define EVENT_CATEGORY_MESSAGE_FILE "CategoryMessageFile"
#define EVENT_PARAMETER_MESSAGE_FILE "ParameterMessageFile" #define EVENT_PARAMETER_MESSAGE_FILE "ParameterMessageFile"
@ -122,7 +122,7 @@ VOID EventTimeToSystemTime (DWORD EventTime, SYSTEMTIME *pSystemTime)
FILETIME ft; FILETIME ft;
ULONGLONG ll; ULONGLONG ll;
} u1970, uUCT; } u1970, uUCT;
uUCT.ft.dwHighDateTime = 0; uUCT.ft.dwHighDateTime = 0;
uUCT.ft.dwLowDateTime = EventTime; uUCT.ft.dwLowDateTime = EventTime;
SystemTimeToFileTime(&st1970, &u1970.ft); SystemTimeToFileTime(&st1970, &u1970.ft);
@ -131,24 +131,24 @@ VOID EventTimeToSystemTime (DWORD EventTime, SYSTEMTIME *pSystemTime)
FileTimeToSystemTime(&ftLocal, pSystemTime); FileTimeToSystemTime(&ftLocal, pSystemTime);
} }
void void
TrimNulls ( LPSTR s ) TrimNulls ( LPSTR s )
{ {
char *c; char *c;
if ( s != (char *) NULL ) if ( s != (char *) NULL )
{ {
c = s + strlen ( s ) - 1; c = s + strlen ( s ) - 1;
while ( c >= s && isspace ( *c ) ) while ( c >= s && isspace ( *c ) )
--c; --c;
*++c = '\0'; *++c = '\0';
} }
} }
BOOL GetEventMessageFileDLL( BOOL GetEventMessageFileDLL(
IN LPCTSTR lpLogName, IN LPCTSTR lpLogName,
IN LPCTSTR SourceName, IN LPCTSTR SourceName,
IN LPCTSTR EntryName, IN LPCTSTR EntryName,
OUT LPSTR ExpandedName) OUT LPSTR ExpandedName)
{ {
DWORD dwSize; DWORD dwSize;
@ -161,13 +161,13 @@ BOOL GetEventMessageFileDLL(
_tcscpy(szKeyName, TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog")); _tcscpy(szKeyName, TEXT("SYSTEM\\CurrentControlSet\\Services\\EventLog"));
_tcscat(szKeyName, _T("\\")); _tcscat(szKeyName, _T("\\"));
_tcscat(szKeyName, lpLogName); _tcscat(szKeyName, lpLogName);
if (RegOpenKeyEx( if (RegOpenKeyEx(
HKEY_LOCAL_MACHINE, HKEY_LOCAL_MACHINE,
szKeyName, szKeyName,
0, 0,
KEY_READ, KEY_READ,
&hAppKey) == ERROR_SUCCESS) &hAppKey) == ERROR_SUCCESS)
{ {
if (RegOpenKeyEx( if (RegOpenKeyEx(
hAppKey, hAppKey,
@ -196,15 +196,15 @@ BOOL GetEventMessageFileDLL(
else else
{ {
MessageBox (NULL , MessageBox (NULL ,
_TEXT("Registry access failed!") , _TEXT("Registry access failed!") ,
_TEXT("Event Log") , _TEXT("Event Log") ,
MB_OK | MB_ICONINFORMATION); MB_OK | MB_ICONINFORMATION);
} }
if (hSourceKey != NULL) if (hSourceKey != NULL)
RegCloseKey(hSourceKey); RegCloseKey(hSourceKey);
if (hAppKey != NULL) if (hAppKey != NULL)
RegCloseKey(hAppKey); RegCloseKey(hAppKey);
return bReturn; return bReturn;
@ -212,7 +212,7 @@ BOOL GetEventMessageFileDLL(
BOOL GetEventCategory( BOOL GetEventCategory(
IN LPCTSTR KeyName, IN LPCTSTR KeyName,
IN LPCTSTR SourceName, IN LPCTSTR SourceName,
IN EVENTLOGRECORD *pevlr, IN EVENTLOGRECORD *pevlr,
OUT LPTSTR CategoryName) OUT LPTSTR CategoryName)
{ {
@ -227,9 +227,9 @@ BOOL GetEventCategory(
NULL, NULL,
DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
if(hLibrary != NULL) if(hLibrary != NULL)
{ {
// Retrieve the message string. // Retrieve the message string.
if(FormatMessage( if(FormatMessage(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY, FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_ARGUMENT_ARRAY,
hLibrary, hLibrary,
@ -255,7 +255,7 @@ BOOL GetEventCategory(
strcpy (CategoryName, "None"); strcpy (CategoryName, "None");
} }
if(hLibrary != NULL) if(hLibrary != NULL)
FreeLibrary(hLibrary); FreeLibrary(hLibrary);
// Free the buffer allocated by FormatMessage // Free the buffer allocated by FormatMessage
@ -273,7 +273,7 @@ BOOL GetEventCategory(
BOOL GetEventMessage( BOOL GetEventMessage(
IN LPCTSTR KeyName, IN LPCTSTR KeyName,
IN LPCTSTR SourceName, IN LPCTSTR SourceName,
IN EVENTLOGRECORD *pevlr, IN EVENTLOGRECORD *pevlr,
OUT LPTSTR EventText) OUT LPTSTR EventText)
{ {
@ -299,7 +299,7 @@ BOOL GetEventMessage(
for (i = 0; i < pevlr->NumStrings ; i++) for (i = 0; i < pevlr->NumStrings ; i++)
{ {
if (strstr(szMessage , "%%")) if (strstr(szMessage , "%%"))
{ {
if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE , ParameterModuleName)) if (GetEventMessageFileDLL (KeyName , SourceName, EVENT_PARAMETER_MESSAGE_FILE , ParameterModuleName))
{ {
@ -318,37 +318,37 @@ BOOL GetEventMessage(
szDll = strtok(SourceModuleName, EVENT_DLL_SEPARATOR); szDll = strtok(SourceModuleName, EVENT_DLL_SEPARATOR);
while ((szDll != NULL) && (!bDone)) while ((szDll != NULL) && (!bDone))
{ {
hLibrary = LoadLibraryEx( hLibrary = LoadLibraryEx(
szDll, szDll,
NULL, NULL,
DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE); DONT_RESOLVE_DLL_REFERENCES | LOAD_LIBRARY_AS_DATAFILE);
if (hLibrary == NULL) if (hLibrary == NULL)
{ {
// The DLL could not be loaded try the next one (if any) // The DLL could not be loaded try the next one (if any)
szDll = strtok (NULL, EVENT_DLL_SEPARATOR); szDll = strtok (NULL, EVENT_DLL_SEPARATOR);
} }
else else
{ {
// Retrieve the message string. // Retrieve the message string.
if(FormatMessage( if(FormatMessage(
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_HMODULE |
FORMAT_MESSAGE_ARGUMENT_ARRAY, FORMAT_MESSAGE_ARGUMENT_ARRAY,
hLibrary, hLibrary,
pevlr->EventID, pevlr->EventID,
MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
(LPTSTR)&lpMsgBuf, (LPTSTR)&lpMsgBuf,
0, 0,
szArguments) == 0) szArguments) == 0)
{ {
// We haven't found the string , get next DLL (if any) // We haven't found the string , get next DLL (if any)
szDll = strtok (NULL, EVENT_DLL_SEPARATOR); szDll = strtok (NULL, EVENT_DLL_SEPARATOR);
} }
else else
{ {
if (lpMsgBuf) if (lpMsgBuf)
{ {
// The ID was found and the message was formated // The ID was found and the message was formated
@ -411,7 +411,7 @@ GetEventType (WORD dwEventType, OUT LPSTR eventTypeText)
} }
} }
BOOL BOOL
GetEventUserName (EVENTLOGRECORD *pelr, OUT LPSTR pszUser) GetEventUserName (EVENTLOGRECORD *pelr, OUT LPSTR pszUser)
{ {
PSID lpSid; PSID lpSid;
@ -421,19 +421,19 @@ GetEventUserName (EVENTLOGRECORD *pelr, OUT LPSTR pszUser)
DWORD cbName = 1024; DWORD cbName = 1024;
DWORD cbDomain = 1024; DWORD cbDomain = 1024;
// Point to the SID. // Point to the SID.
lpSid = (PSID)((LPBYTE) pelr + pelr->UserSidOffset); lpSid = (PSID)((LPBYTE) pelr + pelr->UserSidOffset);
// User SID // User SID
if(pelr->UserSidLength > 0) if(pelr->UserSidLength > 0)
{ {
if (LookupAccountSid( if (LookupAccountSid(
NULL, NULL,
lpSid, lpSid,
szName, szName,
&cbName, &cbName,
szDomain, szDomain,
&cbDomain, &cbDomain,
&peUse)) &peUse))
{ {
strcpy (pszUser , szName); strcpy (pszUser , szName);
@ -475,7 +475,7 @@ ShowStatusMessageThread(
} }
VOID QueryEventMessages ( VOID QueryEventMessages (
LPTSTR lpMachineName , LPTSTR lpMachineName ,
LPTSTR lpLogName) LPTSTR lpLogName)
{ {
HWND hwndDlg; HWND hwndDlg;
@ -509,7 +509,7 @@ VOID QueryEventMessages (
lpComputerName = lpMachineName; lpComputerName = lpMachineName;
// Open the event log. // Open the event log.
hEventLog = OpenEventLog( hEventLog = OpenEventLog(
lpMachineName, lpMachineName,
lpLogName); lpLogName);
@ -517,7 +517,7 @@ VOID QueryEventMessages (
{ {
MessageBox (NULL , MessageBox (NULL ,
_TEXT("Could not open the event log.") , _TEXT("Could not open the event log.") ,
_TEXT("Event Log") , _TEXT("Event Log") ,
MB_OK | MB_ICONINFORMATION); MB_OK | MB_ICONINFORMATION);
return; return;
} }
@ -527,7 +527,7 @@ VOID QueryEventMessages (
// Clear the list view // Clear the list view
(void)ListView_DeleteAllItems (hwndListView); (void)ListView_DeleteAllItems (hwndListView);
// Initialize the event record buffer. // Initialize the event record buffer.
pevlr = (EVENTLOGRECORD *)&bBuffer; pevlr = (EVENTLOGRECORD *)&bBuffer;
@ -552,7 +552,7 @@ VOID QueryEventMessages (
while (dwCurrentRecord < dwTotalRecords) while (dwCurrentRecord < dwTotalRecords)
{ {
pevlr = (EVENTLOGRECORD*)malloc(MAX_PATH); pevlr = (EVENTLOGRECORD*)malloc(MAX_PATH);
bResult = ReadEventLog( bResult = ReadEventLog(
hEventLog, // Event log handle hEventLog, // Event log handle
dwFlags, // Sequential read dwFlags, // Sequential read
@ -588,36 +588,36 @@ VOID QueryEventMessages (
// Get the computer name // Get the computer name
lpComputerName = (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD) + lstrlen(lpSourceName) + 1); lpComputerName = (LPSTR) ((LPBYTE) pevlr + sizeof(EVENTLOGRECORD) + lstrlen(lpSourceName) + 1);
// This ist the data section of the current event // This ist the data section of the current event
lpData = (LPSTR) ((LPBYTE)pevlr + pevlr->DataOffset); lpData = (LPSTR) ((LPBYTE)pevlr + pevlr->DataOffset);
// This is the text of the current event // This is the text of the current event
lpEventStr = (LPSTR) ((LPBYTE) pevlr + pevlr->StringOffset); lpEventStr = (LPSTR) ((LPBYTE) pevlr + pevlr->StringOffset);
// Compute the event type // Compute the event type
EventTimeToSystemTime(pevlr->TimeWritten, &time); EventTimeToSystemTime(pevlr->TimeWritten, &time);
// Get the username that generated the event // Get the username that generated the event
GetEventUserName (pevlr , szUsername); GetEventUserName (pevlr , szUsername);
GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH ); GetDateFormat( LOCALE_USER_DEFAULT, DATE_SHORTDATE, &time, NULL, szLocalDate, MAX_PATH );
GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH ); GetTimeFormat( LOCALE_USER_DEFAULT, TIME_NOSECONDS, &time, NULL, szLocalTime, MAX_PATH );
GetEventType (pevlr->EventType , szEventTypeText); GetEventType (pevlr->EventType , szEventTypeText);
GetEventCategory (lpLogName , lpSourceName , pevlr , szCategory); GetEventCategory (lpLogName , lpSourceName , pevlr , szCategory);
wsprintf (szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF)); wsprintf (szEventID, "%u", (DWORD)(pevlr->EventID & 0xFFFF));
wsprintf (szCategoryID, "%u", (DWORD)(pevlr->EventCategory)); wsprintf (szCategoryID, "%u", (DWORD)(pevlr->EventCategory));
lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM; lviEventItem.mask = LVIF_IMAGE | LVIF_TEXT | LVIF_PARAM;
lviEventItem.iItem = 0; lviEventItem.iItem = 0;
lviEventItem.iSubItem = 0; lviEventItem.iSubItem = 0;
lviEventItem.lParam = (LPARAM)pevlr; lviEventItem.lParam = (LPARAM)pevlr;
lviEventItem.pszText = szEventTypeText; lviEventItem.pszText = szEventTypeText;
switch(pevlr->EventType) switch(pevlr->EventType)
{ {
case EVENTLOG_ERROR_TYPE: case EVENTLOG_ERROR_TYPE:
lviEventItem.iImage = 2; lviEventItem.iImage = 2;
break; break;
case EVENTLOG_AUDIT_FAILURE: case EVENTLOG_AUDIT_FAILURE:
@ -647,7 +647,7 @@ VOID QueryEventMessages (
ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User ListView_SetItemText(hwndListView, lviEventItem.iItem, 6, szUsername); //User
ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer ListView_SetItemText(hwndListView, lviEventItem.iItem, 7, lpComputerName); //Computer
ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text ListView_SetItemText(hwndListView, lviEventItem.iItem, 8, lpData); //Event Text
dwRead -= pevlr->Length; dwRead -= pevlr->Length;
pevlr = (EVENTLOGRECORD *) ((LPBYTE) pevlr + pevlr->Length); pevlr = (EVENTLOGRECORD *) ((LPBYTE) pevlr + pevlr->Length);
} }
@ -672,16 +672,16 @@ VOID QueryEventMessages (
//Resume list view redraw //Resume list view redraw
SendMessage(hwndListView, WM_SETREDRAW, TRUE, 0); SendMessage(hwndListView, WM_SETREDRAW, TRUE, 0);
// Close the event log. // Close the event log.
CloseEventLog(hEventLog); CloseEventLog(hEventLog);
} }
VOID VOID
Refresh (VOID) Refresh (VOID)
{ {
QueryEventMessages( QueryEventMessages(
lpComputerName , lpComputerName ,
lpSourceLogName); lpSourceLogName);
} }
@ -737,13 +737,13 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
hInst = hInstance; // Store instance handle in our global variable hInst = hInstance; // Store instance handle in our global variable
hwndMainWindow = CreateWindow( hwndMainWindow = CreateWindow(
szWindowClass, szWindowClass,
szTitle, szTitle,
WS_OVERLAPPEDWINDOW, WS_OVERLAPPEDWINDOW,
CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
NULL, NULL,
NULL, NULL,
hInstance, hInstance,
NULL); NULL);
if (!hwndMainWindow) if (!hwndMainWindow)
@ -751,10 +751,10 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
return FALSE; return FALSE;
} }
hwndStatus = CreateWindowEx( hwndStatus = CreateWindowEx(
0, // no extended styles 0, // no extended styles
STATUSCLASSNAME, // status bar STATUSCLASSNAME, // status bar
"Done.", // no text "Done.", // no text
WS_CHILD | WS_BORDER | WS_VISIBLE, // styles WS_CHILD | WS_BORDER | WS_VISIBLE, // styles
0, 0, 0, 0, // x, y, cx, cy 0, 0, 0, 0, // x, y, cx, cy
hwndMainWindow, // parent window hwndMainWindow, // parent window
@ -766,17 +766,17 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
// and WS_BORDER to create the normal "sunken" look. Also note that // and WS_BORDER to create the normal "sunken" look. Also note that
// LVS_EX_ styles cannot be set in CreateWindowEx(). // LVS_EX_ styles cannot be set in CreateWindowEx().
hwndListView = CreateWindowEx( hwndListView = CreateWindowEx(
WS_EX_CLIENTEDGE, WS_EX_CLIENTEDGE,
WC_LISTVIEW, WC_LISTVIEW,
_T(""), _T(""),
LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT, LVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | LVS_REPORT,
0, 0,
0, 0,
243, 243,
200, 200,
hwndMainWindow, hwndMainWindow,
NULL, NULL,
hInstance, hInstance,
NULL); NULL);
// After the ListView is created, we can add extended list view styles. // After the ListView is created, we can add extended list view styles.
@ -785,11 +785,11 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
// Create the ImageList // Create the ImageList
hSmall = ImageList_Create( hSmall = ImageList_Create(
GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CXSMICON),
GetSystemMetrics(SM_CYSMICON), GetSystemMetrics(SM_CYSMICON),
ILC_MASK, ILC_MASK,
1, 1,
1); 1);
// Add event type icons to ImageList // Add event type icons to ImageList
ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_INFORMATIONICON))); ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_INFORMATIONICON)));
ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WARNINGICON))); ImageList_AddIcon (hSmall, LoadIcon(hInstance, MAKEINTRESOURCE(IDI_WARNINGICON)));
@ -929,8 +929,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
case IDM_HELP: case IDM_HELP:
MessageBox ( MessageBox (
NULL , NULL ,
_TEXT("Help not implemented yet!") , _TEXT("Help not implemented yet!") ,
_TEXT("Event Log") , _TEXT("Event Log") ,
MB_OK | MB_ICONINFORMATION); MB_OK | MB_ICONINFORMATION);
break; break;
case IDM_EXIT: case IDM_EXIT:
@ -944,14 +944,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
//Gets the window rectangle //Gets the window rectangle
GetClientRect(hWnd, &rect); GetClientRect(hWnd, &rect);
//Relocate the listview //Relocate the listview
MoveWindow( MoveWindow(
hwndListView, hwndListView,
0, 0,
0, 0,
rect.right, rect.right,
rect.bottom - 20, rect.bottom - 20,
1); 1);
// Resize the statusbar; // Resize the statusbar;
@ -989,7 +989,7 @@ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
return (INT_PTR)FALSE; return (INT_PTR)FALSE;
} }
VOID VOID
DisplayEvent (HWND hDlg) DisplayEvent (HWND hDlg)
{ {
char szEventType[MAX_PATH]; char szEventType[MAX_PATH];
@ -1057,7 +1057,7 @@ DisplayEvent (HWND hDlg)
} }
} }
static static
INT_PTR CALLBACK StatusMessageWindowProc( INT_PTR CALLBACK StatusMessageWindowProc(
IN HWND hwndDlg, IN HWND hwndDlg,
IN UINT uMsg, IN UINT uMsg,
@ -1126,8 +1126,8 @@ INT_PTR CALLBACK EventDetails(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
if (LOWORD(wParam) == IDHELP) if (LOWORD(wParam) == IDHELP)
{ {
MessageBox (NULL , MessageBox (NULL ,
_TEXT("Help not implemented yet!") , _TEXT("Help not implemented yet!") ,
_TEXT("Event Log") , _TEXT("Event Log") ,
MB_OK | MB_ICONINFORMATION); MB_OK | MB_ICONINFORMATION);
return (INT_PTR)TRUE; return (INT_PTR)TRUE;
} }

8
reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc
View file

@ -1,6 +1,6 @@
LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
IDC_EVENTVWR MENU IDC_EVENTVWR MENU
BEGIN BEGIN
POPUP "&Protokoll" POPUP "&Protokoll"
BEGIN BEGIN
@ -23,7 +23,7 @@ BEGIN
END END
END END
IDC_EVENTVWR ACCELERATORS IDC_EVENTVWR ACCELERATORS
BEGIN BEGIN
"?", IDM_ABOUT, ASCII, ALT "?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT
@ -41,7 +41,7 @@ BEGIN
END END
IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
CAPTION "Bitte warten.." CAPTION "Bitte warten.."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -82,7 +82,7 @@ BEGIN
CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 CONTROL "&Wörter",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
END END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APP_TITLE "Ereignisanzeige" IDS_APP_TITLE "Ereignisanzeige"
IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt." IDC_EVENTSTRINGIDNOTFOUND "Die Bezeichnung für die Ereignis-ID ( %lu ) in der Quelle ( %s ) kann nicht gefunden werden. Es könnte sein, dass der Lokale Computer die notwendigen Registry Einträge oder Nachrichten DLLs, um Nachrichten von Remoten Computern anzuzeigen, nicht besitzt."

8
reactos/base/applications/mscutils/eventvwr/lang/en-US.rc
View file

@ -1,6 +1,6 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
IDC_EVENTVWR MENU IDC_EVENTVWR MENU
BEGIN BEGIN
POPUP "&Log" POPUP "&Log"
BEGIN BEGIN
@ -23,7 +23,7 @@ BEGIN
END END
END END
IDC_EVENTVWR ACCELERATORS IDC_EVENTVWR ACCELERATORS
BEGIN BEGIN
"?", IDM_ABOUT, ASCII, ALT "?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT
@ -41,7 +41,7 @@ BEGIN
END END
IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
CAPTION "Wait.." CAPTION "Wait.."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -82,7 +82,7 @@ BEGIN
CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
END END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APP_TITLE "Event Viewer" IDS_APP_TITLE "Event Viewer"
IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer."

8
reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc
View file

@ -1,6 +1,6 @@
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
IDC_EVENTVWR MENU IDC_EVENTVWR MENU
BEGIN BEGIN
POPUP "Journa&l" POPUP "Journa&l"
BEGIN BEGIN
@ -23,7 +23,7 @@ BEGIN
END END
END END
IDC_EVENTVWR ACCELERATORS IDC_EVENTVWR ACCELERATORS
BEGIN BEGIN
"?", IDM_ABOUT, ASCII, ALT "?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT
@ -41,7 +41,7 @@ BEGIN
END END
IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
CAPTION "Patientez.." CAPTION "Patientez.."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -82,7 +82,7 @@ BEGIN
CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10 CONTROL "&Word",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,77,194,33,10
END END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APP_TITLE "Visionneuse d'événements" IDS_APP_TITLE "Visionneuse d'événements"
IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant." IDC_EVENTSTRINGIDNOTFOUND "La description pour l'événement d'ID ( %lu ) dans la source ( %s ) ne peut être trouvée. L'ordinateur local pourrait ne pas avoir les informations registres nécéssaires ou les fichiers DLL de message pour afficher les messages depuis un ordinateur distant."

8
reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc
View file

@ -1,6 +1,6 @@
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
IDC_EVENTVWR MENU IDC_EVENTVWR MENU
BEGIN BEGIN
POPUP "&Ëîãè" POPUP "&Ëîãè"
BEGIN BEGIN
@ -23,7 +23,7 @@ BEGIN
END END
END END
IDC_EVENTVWR ACCELERATORS IDC_EVENTVWR ACCELERATORS
BEGIN BEGIN
"?", IDM_ABOUT, ASCII, ALT "?", IDM_ABOUT, ASCII, ALT
"/", IDM_ABOUT, ASCII, ALT "/", IDM_ABOUT, ASCII, ALT
@ -41,7 +41,7 @@ BEGIN
END END
IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40 IDD_PROGRESSBOX DIALOGEX 0, 0, 230, 40
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER
CAPTION "Ïîäîæäèòå.." CAPTION "Ïîäîæäèòå.."
FONT 8, "MS Shell Dlg", 0, 0, 0x0 FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN BEGIN
@ -82,7 +82,7 @@ BEGIN
CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10 CONTROL "&Ñëîâà",IDC_WORDRADIO,"Button",BS_AUTORADIOBUTTON,87,192,33,10
END END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé" IDS_APP_TITLE "Ïðîñìîòð ñîáûòèé"
IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer." IDC_EVENTSTRINGIDNOTFOUND "The description for Event ID ( %lu ) in Source ( %s ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer."

2
reactos/base/applications/mscutils/eventvwr/resource.h
View file

@ -57,7 +57,7 @@
#define IDC_STATIC -1 #define IDC_STATIC -1
// Next default values for new objects // Next default values for new objects
// //
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1

2
reactos/base/applications/mscutils/servman/control.c
View file

@ -88,7 +88,7 @@ Control(PMAIN_WND_INFO Info,
} }
} }
} }
CloseServiceHandle(hSc); CloseServiceHandle(hSc);
} }

Some files were not shown because too many files have changed in this diff Show more