[ROSAPPS]

General improvements to rosapps by Jared Smudde
ROSAPPS-301 #resolve #comment Committed, thx for help.

svn path=/trunk/; revision=67926
This commit is contained in:
Daniel Reimer 2015-05-26 17:35:57 +00:00
parent 3b85679f99
commit 3b10de3445
5 changed files with 40 additions and 263 deletions

View file

@ -1,31 +1,12 @@
//Microsoft Developer Studio generated resource script.
//
// #include "resrc1.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include <windows.h> #include <windows.h>
#include "resource.h" #include "resource.h"
///////////////////////////////////////////////////////////////////////////// #define REACTOS_STR_FILE_DESCRIPTION "Tab Control Test\0"
#undef APSTUDIO_READONLY_SYMBOLS #define REACTOS_STR_INTERNAL_NAME "template_dialog\0"
#define REACTOS_STR_ORIGINAL_FILENAME "template_dialog.exe\0"
#include <reactos/version.rc>
///////////////////////////////////////////////////////////////////////////// LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// English (Australia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_TABBED_DIALOG DIALOGEX DISCARDABLE 0, 0, 243, 230 IDD_TABBED_DIALOG DIALOGEX DISCARDABLE 0, 0, 243, 230
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
@ -62,47 +43,3 @@ BEGIN
CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |
TBS_NOTICKS | WS_TABSTOP,40,30,92,17 TBS_NOTICKS | WS_TABSTOP,40,30,92,17
END END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resrc1.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""windows.h""\r\n"
"#include ""reactos\\resource.h""\r\n"
"#include ""resource.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // English (Australia) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View file

@ -1,4 +1,4 @@
#include "resource.h"
#include <windows.h> #include <windows.h>
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS MDI Sample Application by Robert Dickenson\0" #define REACTOS_STR_FILE_DESCRIPTION "ReactOS MDI Sample Application by Robert Dickenson\0"
@ -7,55 +7,16 @@
#define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright © 2002 Robert Dickenson\0" #define REACTOS_STR_ORIGINAL_COPYRIGHT "Copyright © 2002 Robert Dickenson\0"
#include <reactos/version.rc> #include <reactos/version.rc>
//Microsoft Developer Studio generated resource script. LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS /* Icons */
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#define APSTUDIO_HIDDEN_SYMBOLS
#include "windows.h"
#undef APSTUDIO_HIDDEN_SYMBOLS
#include "resource.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
/* UTF-8 */
#pragma code_page(65001)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_MDI_APP ICON DISCARDABLE "res/mdi.ico" IDI_MDI_APP ICON DISCARDABLE "res/mdi.ico"
IDI_SMALL ICON DISCARDABLE "res/small.ico" IDI_SMALL ICON DISCARDABLE "res/small.ico"
//////////////////////////////////////////////////////////////////////////////// /* Bitmaps */
// Bitmaps
//
IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// Menu
//
IDC_MDI_APP MENU DISCARDABLE IDC_MDI_APP MENU DISCARDABLE
BEGIN BEGIN
POPUP "&File" POPUP "&File"
@ -98,10 +59,14 @@ BEGIN
END END
END END
///////////////////////////////////////////////////////////////////////////// IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95
// STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
// Dialog CAPTION "Dialog"
// FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
END
IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75 IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 230, 75
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
@ -115,36 +80,6 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP DEFPUSHBUTTON "OK",IDOK,195,6,30,11,WS_GROUP
END END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""windows.h""\r\n"
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
"#include ""resource.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_APP_TITLE "ReactOS Application" IDS_APP_TITLE "ReactOS Application"
@ -183,90 +118,3 @@ BEGIN
IDC_MDI_APP "MDI_APP" IDC_MDI_APP "MDI_APP"
IDC_MDI_APP_CHILD "MDI_APP_CHILD" IDC_MDI_APP_CHILD "MDI_APP_CHILD"
END END
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// English (Australia) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
#pragma code_page(1252)
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
//
// Dialog
//
IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Shell Dlg"
BEGIN
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
END
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// DESIGNINFO
//
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG1, DIALOGEX
BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 179
TOPMARGIN, 7
BOTTOMMARGIN, 88
END
END
#endif // APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// String Table
//
STRINGTABLE DISCARDABLE
BEGIN
ID_HELP_ABOUT "Displays program information, version number, and copyright."
END
#endif // English (Australia) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED

View file

@ -7,7 +7,7 @@ list(APPEND SOURCE
opensave.c opensave.c
wordpad.c) wordpad.c)
add_executable(old_wordpad ${SOURCE} wordpad.rc) add_executable(old_wordpad ${SOURCE} rsrc.rc)
set_module_type(old_wordpad win32gui UNICODE) set_module_type(old_wordpad win32gui UNICODE)
add_importlibs(old_wordpad user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll) add_importlibs(old_wordpad user32 gdi32 comdlg32 advapi32 shell32 comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET old_wordpad DESTINATION reactos/system32 FOR all) add_cd_file(TARGET old_wordpad DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,22 @@
#include <commctrl.h> #include <commctrl.h>
#include "resource.h" #include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Document Editor\0"
#define REACTOS_STR_INTERNAL_NAME "wordpad\0"
#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0"
//#include <reactos/version.rc>
STRINGTABLE DISCARDABLE
BEGIN
IDS_APPNAME "WordPad"
IDS_VERSION "v0.1"
END
IDI_ICON ICON "res/wordpad.ico"
/* main toolbar icons */
IDB_TEXTTOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
#include <reactos/manifest_exe.rc> #include <reactos/manifest_exe.rc>
/* UTF-8 */ /* UTF-8 */

View file

@ -1,24 +0,0 @@
#include <windows.h>
#include <commctrl.h>
#include "resource.h"
#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Document Editor\0"
#define REACTOS_STR_INTERNAL_NAME "wordpad\0"
#define REACTOS_STR_ORIGINAL_FILENAME "wordpad.exe\0"
//#include <reactos/version.rc>
STRINGTABLE DISCARDABLE
BEGIN
IDS_APPNAME "WordPad"
IDS_VERSION "v0.1"
END
IDI_ICON ICON "res/wordpad.ico"
/* main toolbar icons */
IDB_TEXTTOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp"
#include "rsrc.rc"