Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 18578: fix compile with msvc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

fix compile with msvc Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Modified: trunk/reactos/subsys/system/msconfig/toolspage.c _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-18 23:25:46 UTC (rev 18577) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-10-18 23:34:34 UTC (rev 18578) @@ -9,6 +9,7 @@ <library>kernel32</library> <library>user32</library> <library>comctl32</library> + <library>shell32</library> <file>toolspage.c</file> <file>srvpage.c</file> <file>msconfig.c</file> _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-18 23:25:46 UTC (rev 18577) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-10-18 23:34:34 UTC (rev 18578) @@ -9,6 +9,7 @@ { LV_COLUMN column; TCHAR szTemp[256]; + DWORD dwStyle; switch (message) { case WM_INITDIALOG: @@ -16,7 +17,6 @@ hServicesListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); hServicesDialog = hDlg; - DWORD dwStyle; dwStyle = SendMessage(hServicesListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES; SendMessage(hServicesListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle); _____ Modified: trunk/reactos/subsys/system/msconfig/toolspage.c --- trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-18 23:25:46 UTC (rev 18577) +++ trunk/reactos/subsys/system/msconfig/toolspage.c 2005-10-18 23:34:34 UTC (rev 18578) @@ -47,6 +47,7 @@ TCHAR szTemp2[256]; LPNMITEMACTIVATE lpnmitem; LPNMHDR nmh; + DWORD dwStyle; switch (message) { case WM_INITDIALOG: @@ -54,7 +55,6 @@ hToolsListCtrl = GetDlgItem(hDlg, IDC_TOOLS_LIST); hToolsDialog = hDlg; - DWORD dwStyle; dwStyle = SendMessage(hToolsListCtrl, LVM_GETEXTENDEDLISTVIEWSTYLE, 0, 0); dwStyle = dwStyle | LVS_EX_FULLROWSELECT; SendMessage(hToolsListCtrl, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, dwStyle);

1 0

[cwittich] 18577: revert 18576
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

revert 18576 fix rbuild instead Modified: trunk/reactos/subsys/system/expand/expand.xml Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp _____ Modified: trunk/reactos/subsys/system/expand/expand.xml --- trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 23:00:31 UTC (rev 18576) +++ trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 23:25:46 UTC (rev 18577) @@ -1,4 +1,5 @@ <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false"> + <include base="ReactOS">include/wine</include> <include base="cmd">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" /> _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-18 23:00:31 UTC (rev 18576) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-18 23:25:46 UTC (rev 18577) @@ -105,10 +105,15 @@ const vector<Include*>& incs = data.includes; for ( i = 0; i < incs.size(); i++ ) { + // explicitly omit win32api directories if ( !strncmp(incs[i]->directory.c_str(), "w32api", 6 ) ) continue; + // explicitly omit include/wine directories + if ( !strncmp(incs[i]->directory.c_str(), "include\\wine", 12 ) ) + continue; + string path = Path::RelativeFromDirectory ( incs[i]->directory, module.GetBasePath() );

1 0

[cwittich] 18576: remove include/wine, this will fix compiling with msvc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

remove include/wine, this will fix compiling with msvc Modified: trunk/reactos/subsys/system/expand/expand.xml _____ Modified: trunk/reactos/subsys/system/expand/expand.xml --- trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 22:55:29 UTC (rev 18575) +++ trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 23:00:31 UTC (rev 18576) @@ -1,5 +1,4 @@ <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false"> - <include base="ReactOS">include/wine</include> <include base="cmd">.</include> <define name="__USE_W32API" /> <define name="ANONYMOUSUNIONS" />

1 0

[cwittich] 18575: added missing user32.lib
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

added missing user32.lib Modified: trunk/reactos/subsys/system/expand/expand.xml _____ Modified: trunk/reactos/subsys/system/expand/expand.xml --- trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 22:34:04 UTC (rev 18574) +++ trunk/reactos/subsys/system/expand/expand.xml 2005-10-18 22:55:29 UTC (rev 18575) @@ -5,6 +5,7 @@ <define name="ANONYMOUSUNIONS" /> <define name="_WIN32_WINNT">0x0501</define> <library>lz32</library> + <library>user32</library> <file>expand.c</file> <file>expand.rc</file> </module>

1 0

[cwittich] 18574: add missing libs to xml file
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

add missing libs to xml file Modified: trunk/reactos/subsys/system/notepad/notepad.xml _____ Modified: trunk/reactos/subsys/system/notepad/notepad.xml --- trunk/reactos/subsys/system/notepad/notepad.xml 2005-10-18 22:27:38 UTC (rev 18573) +++ trunk/reactos/subsys/system/notepad/notepad.xml 2005-10-18 22:34:04 UTC (rev 18574) @@ -6,6 +6,8 @@ <library>user32</library> <library>gdi32</library> <library>comdlg32</library> + <library>advapi32</library> + <library>shell32</library> <file>License_En.c</file> <file>dialog.c</file> <file>license.c</file>

1 0

[cwittich] 18573: fixed WINVER in calc.xml for compile with msvc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

fixed WINVER in calc.xml for compile with msvc now it can be compiled with 0 errors, 0 warnings Modified: trunk/reactos/subsys/system/calc/calc.xml _____ Modified: trunk/reactos/subsys/system/calc/calc.xml --- trunk/reactos/subsys/system/calc/calc.xml 2005-10-18 21:56:39 UTC (rev 18572) +++ trunk/reactos/subsys/system/calc/calc.xml 2005-10-18 22:27:38 UTC (rev 18573) @@ -2,6 +2,7 @@ <include base="calc">.</include> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> + <define name="WINVER">0x0501</define> <define name="UNICODE" /> <define name="_UNICODE" /> <library>kernel32</library>

1 0

[cwittich] 18572: changed windres back to rc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

changed windres back to rc fixed rc preprocessor defines in dsp file generation Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-18 21:41:45 UTC (rev 18571) +++ trunk/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp 2005-10-18 21:56:39 UTC (rev 18572) @@ -250,7 +250,7 @@ fprintf ( OUT, "# PROP Scc_LocalPath \"\"\r\n" ); fprintf ( OUT, "CPP=cl.exe\r\n" ); if ( !lib && !exe ) fprintf ( OUT, "MTL=midl.exe\r\n" ); - fprintf ( OUT, "RSC=windres.exe\r\n" ); + fprintf ( OUT, "RSC=rc.exe\r\n" ); int n = 0; @@ -481,6 +481,11 @@ fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); } } + + for ( i = 0; i < defines.size(); i++ ) + { + fprintf ( OUT, " /D \"%s\"", defines[i].c_str() ); + } fprintf ( OUT, " /d \"_DEBUG\"\r\n" ); } else @@ -498,6 +503,13 @@ for ( i = 0; i < includes.size(); i++ ) fprintf ( OUT, " /i \"%s\"", includes[i].c_str() ); } + + for ( i = 0; i < defines.size(); i++ ) + { + fprintf ( OUT, " /D \"%s\"", defines[i].c_str() ); + } + + fprintf ( OUT, "/d \"NDEBUG\"\r\n" ); } fprintf ( OUT, "BSC32=bscmake.exe\r\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-18 21:41:45 UTC (rev 18571) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-10-18 21:56:39 UTC (rev 18572) @@ -151,6 +151,7 @@ { printf ( "Generates project files for buildsystems\n\n" ); printf ( " rbuild [switches] buildsystem\n" ); + printf ( " rbuild msvc\n" ); printf ( "Switches:\n" ); printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); @@ -163,9 +164,10 @@ printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); printf ( " tree.\n" ); printf ( "\n" ); - printf ( " buildsystem Target build system. Can be one of:\n" ); + printf ( " buildsystem Target build system. Can be one of:\n" ); printf ( " mingw MinGW\n" ); - printf ( " devcpp DevC++\n" ); + printf ( " devcpp DevC++\n\n" ); + printf ( " msvc Generates dsp files for MSVC" ); return 1; } try

1 0

[gedmurphy] 18571: move the apps into the same position they are found in windows.
by gedmurphy＠svn.reactos.com 18 Oct '05

18 Oct '05

move the apps into the same position they are found in windows. Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/syssetup/resource.h _____ Modified: trunk/reactos/lib/syssetup/install.c --- trunk/reactos/lib/syssetup/install.c 2005-10-18 21:39:20 UTC (rev 18570) +++ trunk/reactos/lib/syssetup/install.c 2005-10-18 21:41:45 UTC (rev 18571) @@ -433,14 +433,15 @@ /* create desktop shortcuts */ CreateShortcut(CSIDL_DESKTOP, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - /* create program startmenu shortcuts */ - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); - CreateShortcut(CSIDL_PROGRAMS, NULL, _T("explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); + /* create program startmenu shortcuts */ CreateShortcut(CSIDL_PROGRAMS, NULL, _T("winefile.lnk"), _T("winefile.exe"), IDS_CMT_WINEFILE); /* create and fill Accessories subfolder */ if (CreateShortcutFolder(CSIDL_PROGRAMS, IDS_ACCESSORIES, sAccessories, 256)) { + //CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Calculator.lnk"), _T("calc.exe"), IDS_CMT_CALC); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("Command Prompt.lnk"), _T("cmd.exe"), IDS_CMT_CMD); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("notepad.lnk"), _T("notepad.exe"), IDS_CMT_NOTEPAD); + CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("explorer.lnk"), _T("explorer.exe"), IDS_CMT_EXPLORER); CreateShortcut(CSIDL_PROGRAMS, sAccessories, _T("regedit.lnk"), _T("regedit.exe"), IDS_CMT_REGEDIT); } _____ Modified: trunk/reactos/lib/syssetup/resource.h --- trunk/reactos/lib/syssetup/resource.h 2005-10-18 21:39:20 UTC (rev 18570) +++ trunk/reactos/lib/syssetup/resource.h 2005-10-18 21:41:45 UTC (rev 18571) @@ -92,6 +92,7 @@ #define IDS_CMT_WINEFILE 3212 #define IDS_CMT_NOTEPAD 3213 #define IDS_CMT_REGEDIT 3214 +#define IDS_CMT_CALC 3215 #define IDR_GPL 4000

1 0

[fireball] 18570: German translations by FooDerGrosse, kevin_schnabel at gmx dot de (Bug 915)
by fireball＠svn.reactos.com 18 Oct '05

18 Oct '05

German translations by FooDerGrosse, kevin_schnabel at gmx dot de (Bug 915) (now I didn't forget anything) Added: trunk/rosapps/games/winemine/De.rc Added: trunk/rosapps/games/winemine/En.rc Modified: trunk/rosapps/games/winemine/winemine.rc _____ Added: trunk/rosapps/games/winemine/De.rc --- trunk/rosapps/games/winemine/De.rc 2005-10-18 21:39:15 UTC (rev 18569) +++ trunk/rosapps/games/winemine/De.rc 2005-10-18 21:39:20 UTC (rev 18570) @@ -0,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Optionen" { + MENUITEM "&Neu", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Anfõnger", IDM_BEGINNER + MENUITEM "&Fortgeschrittene", IDM_ADVANCED + MENUITEM "&Experten", IDM_EXPERT + MENUITEM "&Benutzerdefiniert", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "Beenden", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Bestzeiten", IDM_TIMES + MENUITEM "&?ber", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Bestzeiten" +{ + GROUPBOX "Bestzeiten", IDIGNORE, 10, 10, 140, 45 + LTEXT "Anfõnger", IDIGNORE, 20, 20, 40, 8 + LTEXT "Fortgeschrittene", IDIGNORE, 20, 30, 40, 8 + LTEXT "Experten", IDIGNORE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Gl³ckwunsch!" +{ + LTEXT "Bitte geben Sie ihren Namen ein", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Benutzerdefiniertes Spiel" +{ + LTEXT "Zeilen", IDIGNORE, 5, 5, 30, 10 + LTEXT "Spalten", IDIGNORE, 5, 35, 30, 10 + LTEXT "Minen", IDIGNORE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "About" +{ + LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 + LTEXT "unter der Wine Lizenz", IDIGNORE, 35, 35, 100, 10 + ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} _____ Added: trunk/rosapps/games/winemine/En.rc --- trunk/rosapps/games/winemine/En.rc 2005-10-18 21:39:15 UTC (rev 18569) +++ trunk/rosapps/games/winemine/En.rc 2005-10-18 21:39:20 UTC (rev 18570) @@ -0,0 +1,83 @@ +#include "resource.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE { + IDS_APPNAME, "WineMine" + +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "&Options" { + MENUITEM "&New", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Mark Question", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "&Beginner", IDM_BEGINNER + MENUITEM "&Advanced", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "&Custom", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "E&xit", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Fastest Times", IDM_TIMES + MENUITEM "&About", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Fastest Times" +{ + GROUPBOX "Fastest Times", IDIGNORE, 10, 10, 140, 45 + LTEXT "Beginner", IDIGNORE, 20, 20, 40, 8 + LTEXT "Advanced", IDIGNORE, 20, 30, 40, 8 + LTEXT "Expert", IDIGNORE, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Congratulations!" +{ + LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Custom Game" +{ + LTEXT "Rows", IDIGNORE, 5, 5, 30, 10 + LTEXT "Cols", IDIGNORE, 5, 35, 30, 10 + LTEXT "Mines", IDIGNORE, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 +} + +DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "About" +{ + LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 + LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 + LTEXT "under the Wine license", IDIGNORE, 35, 35, 100, 10 + ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 + DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 +} _____ Modified: trunk/rosapps/games/winemine/winemine.rc --- trunk/rosapps/games/winemine/winemine.rc 2005-10-18 21:39:15 UTC (rev 18569) +++ trunk/rosapps/games/winemine/winemine.rc 2005-10-18 21:39:20 UTC (rev 18570) @@ -21,6 +21,9 @@ #include <windows.h> #include "resource.h" +#include "En.rc" +#include "De.rc" + IDI_WINEMINE ICON MOVEABLE "rc/winemine.ico" IDB_FACES BITMAP MOVEABLE "rc/faces.bmp" @@ -29,87 +32,3 @@ IDB_MINES BITMAP MOVEABLE "rc/mines.bmp" -/* English-US Resources */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE { - IDS_APPNAME, "WineMine" - -} - -MENU_WINEMINE MENU DISCARDABLE -{ - POPUP "&Options" { - MENUITEM "&New", IDM_NEW - MENUITEM SEPARATOR - MENUITEM "&Mark Question", IDM_MARKQ - MENUITEM SEPARATOR - MENUITEM "&Beginner", IDM_BEGINNER - MENUITEM "&Advanced", IDM_ADVANCED - MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Custom", IDM_CUSTOM - MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_EXIT - } - POPUP "&Info" { - MENUITEM "&Fastest Times", IDM_TIMES - MENUITEM "&About", IDM_ABOUT - } -} - -DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Fastest Times" -{ - GROUPBOX "Fastest Times", IDIGNORE, 10, 10, 140, 45 - LTEXT "Beginner", IDIGNORE, 20, 20, 40, 8 - LTEXT "Advanced", IDIGNORE, 20, 30, 40, 8 - LTEXT "Expert", IDIGNORE, 20, 40, 40, 8 - LTEXT "999", IDC_TIME1, 70, 20, 15, 8 - LTEXT "999", IDC_TIME2, 70, 30, 15, 8 - LTEXT "999", IDC_TIME3, 70, 40, 15, 8 - LTEXT "", IDC_NAME1, 90, 20, 55, 8 - LTEXT "", IDC_NAME2, 90, 30, 55, 8 - LTEXT "", IDC_NAME3, 90, 40, 55, 8 - DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 -} - -DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Congratulations!" -{ - LTEXT "Please enter your name", IDIGNORE, 10, 10, 150, 10 - EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 - DEFPUSHBUTTON "Ok", IDOK, 60, 40, 40, 15 -} - -DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "Custom Game" -{ - LTEXT "Rows", IDIGNORE, 5, 5, 30, 10 - LTEXT "Cols", IDIGNORE, 5, 35, 30, 10 - LTEXT "Mines", IDIGNORE, 5, 65, 30, 10 - EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER - EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER - DEFPUSHBUTTON "Ok", IDOK, 40, 30, 50, 15 - PUSHBUTTON "Cancel", IDCANCEL, 40, 50, 50, 15 -} - -DLG_ABOUT DIALOG DISCARDABLE 0, 0, 145, 80 -STYLE DS_MODALFRAME | DS_3DLOOK | - WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "About" -{ - LTEXT "Winemine", IDIGNORE, 10, 10, 35, 10 - LTEXT "Copyright 2000, Joshua Thielen", IDIGNORE, 35, 25, 100, 10 - LTEXT "under the Wine license", IDIGNORE, 35, 35, 100, 10 - ICON "WINEMINE", IDIGNORE, 10, 25, 20, 20 - DEFPUSHBUTTON "Ok", IDOK, 50, 60, 55, 15 -} - -/* End of English-US Resources */

1 0

[cwittich] 18569: fix taskmgr.rc to compile with ms rc
by cwittich＠svn.reactos.com 18 Oct '05

18 Oct '05

fix taskmgr.rc to compile with ms rc Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc --- trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2005-10-18 21:35:01 UTC (rev 18568) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2005-10-18 21:39:15 UTC (rev 18569) @@ -3,13 +3,13 @@ #include "windows.h" #ifdef WINE -#define res_dir . +#define res . #else -#define res_dir res +#define res res #endif /* BINRES taskmgr.ico */ -IDI_TASKMANAGER ICON DISCARDABLE res_dir/taskmgr.ico +IDI_TASKMANAGER ICON DISCARDABLE res/taskmgr.ico /* { '00 00 01 00 02 00 20 20 10 00 00 00 00 00 E8 02' '00 00 26 00 00 00 10 10 10 00 00 00 00 00 28 01' @@ -82,7 +82,7 @@ } */ /* BINRES window.ico */ -IDI_WINDOW ICON DISCARDABLE res_dir/window.ico +IDI_WINDOW ICON DISCARDABLE res/window.ico /* { '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02' '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00' @@ -135,7 +135,7 @@ } */ /* BINRES windowsm.ico */ -IDI_WINDOWSM ICON DISCARDABLE res_dir/windowsm.ico +IDI_WINDOWSM ICON DISCARDABLE res/windowsm.ico /* { '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01' '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00' @@ -160,7 +160,7 @@ } */ /* BINRES traymask.bmp */ -IDB_TRAYMASK BITMAP DISCARDABLE res_dir/traymask.bmp +IDB_TRAYMASK BITMAP DISCARDABLE res/traymask.bmp /* { '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' @@ -181,7 +181,7 @@ } */ /* BINRES trayicon.bmp */ -IDB_TRAYICON BITMAP DISCARDABLE res_dir/trayicon.bmp +IDB_TRAYICON BITMAP DISCARDABLE res/trayicon.bmp /* { '42 4D F6 00 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 10 00 00 00 10 00 00 00 01 00 04 00 00 00' @@ -202,7 +202,7 @@ } */ /* BINRES font.bmp */ -IDB_FONT BITMAP DISCARDABLE res_dir/font.bmp +IDB_FONT BITMAP DISCARDABLE res/font.bmp /* { '42 4D 86 02 00 00 00 00 00 00 76 00 00 00 28 00' '00 00 60 00 00 00 0B 00 00 00 01 00 04 00 00 00'

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs