print KERNEL_VERSION_STR

svn path=/trunk/; revision=5963
This commit is contained in:
Martin Fuchs 2003-09-02 21:23:47 +00:00
parent 190fc39af4
commit 3205402fac
10 changed files with 38 additions and 7 deletions

View file

@ -0,0 +1,11 @@
/* Do not edit - Machine generated */
#ifndef _INC_REACTOS_BUILDNO
#define _INC_REACTOS_BUILDNO
#define KERNEL_VERSION_BUILD 2
#define KERNEL_VERSION_BUILD_STR "2"
#define KERNEL_RELEASE_RC "0.1.3.2\0"
#define KERNEL_RELEASE_STR "0.1.3.2"
#define KERNEL_VERSION_RC "0.1.3\0"
#define KERNEL_VERSION_STR "0.1.3"
#endif
/* EOF */

View file

@ -69,7 +69,8 @@ static void draw_desktop_background(HWND hwnd, HDC hdc)
rect.right = rect.left + 250;
rect.bottom = rect.top + 40;
static const LPCTSTR BkgndText = _T("ReactOS 0.1.2 Explorer\nby Martin Fuchs");
#include "../buildno.h"
static const LPCTSTR BkgndText = _T("ReactOS ")_T(KERNEL_VERSION_STR)_T(" Explorer\nby Martin Fuchs");
BkMode bkMode(hdc, TRANSPARENT);

View file

@ -15,3 +15,4 @@
- Application Desktop Toolbars
- desktop switching
- command line in explorer windows
- printer and RAS connection icons in desktop notification area

View file

@ -545,6 +545,10 @@ SOURCE=.\shell\winfs.h
# End Group
# Begin Source File
SOURCE=.\buildno.h
# End Source File
# Begin Source File
SOURCE=.\explorer.cpp
# End Source File
# Begin Source File

View file

@ -22,6 +22,7 @@
#define IDS_DRIVES 18
#define IDS_SEARCH_COMPUTER 19
#define IDS_SETTINGS_WND 20
#define IDS_PRINTERS 21
#define IDI_REACTOS 100
#define IDI_EXPLORER 101
#define IDI_STARTMENU 102

View file

@ -8,10 +8,8 @@
// Generated from the TEXTINCLUDE 2 resource.
//
#ifndef _ROS_
#ifndef __WINE__
#include "afxres.h"
#endif
#endif
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
@ -110,6 +108,7 @@ BEGIN
IDS_DRIVES "Discuri"
IDS_SEARCH_COMPUTER "Search Computer..."
IDS_SETTINGS_WND "Control Panel"
IDS_PRINTERS "Printers"
END
#endif // Romanian resources
@ -143,7 +142,8 @@ IDB_LOGOV BITMAP DISCARDABLE "res/logov.bmp"
IDA_EXPLORER ACCELERATORS DISCARDABLE
BEGIN
0x58, ID_FILE_EXIT, VIRTKEY, ALT, NOINVERT
0x53, ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL, NOINVERT
0x53, ID_VIEW_FULLSCREEN, VIRTKEY, SHIFT, CONTROL,
NOINVERT
END
#endif // Neutral resources
@ -368,6 +368,7 @@ BEGIN
IDS_DRIVES "Verzeichnisse"
IDS_SEARCH_COMPUTER "Suche Computer..."
IDS_SETTINGS_WND "Systemsteuerung"
IDS_PRINTERS "Drucker"
END
#endif // German (Germany) resources
@ -578,6 +579,7 @@ BEGIN
IDS_DRIVES "Drives"
IDS_SEARCH_COMPUTER "Search Computer..."
IDS_SETTINGS_WND "Control Panel"
IDS_PRINTERS "Printers"
END
#endif // English (U.S.) resources

View file

@ -22,7 +22,7 @@ ifdef UNICODE
TARGET_CFLAGS += -DUNICODE
TARGET_CPPFLAGS += -DUNICODE
TARGET_RCFLAGS += -DUNICODE
MK_DEFENTRY := _wWinMain@16
MK_DEFENTRY = _wWinMain@16
endif
VPATH += shell
@ -38,9 +38,12 @@ WINE_INCLUDE = ./
TARGET_GCCLIBS = comctl32 ole32 uuid stdc++
all: explorer.exe
all: buildno.h explorer.exe
@strip explorer.exe
buildno.h: ../../../include/reactos/buildno.h
cp ../../../include/reactos/buildno.h $@
TARGET_SDKLIBS = \
kernel32.a \
user32.a \

View file

@ -54,6 +54,7 @@
#define IDC_CONNECTIONS 0x100F
#define IDC_DRIVES 0x1010
#define IDC_SETTINGS_WND 0x1011
#define IDC_PRINTERS 0x1012
#define IDC_FIRST_MENU 0x3000

View file

@ -631,6 +631,7 @@ LRESULT StartMenuRoot::Init(LPCREATESTRUCT pcs)
AddButton(ResString(IDS_DOCUMENTS), 0, true, IDC_DOCUMENTS);
AddButton(ResString(IDS_RECENT), 0, true, IDC_RECENT);
AddButton(ResString(IDS_SETTINGS), 0, true, IDC_SETTINGS);
AddButton(ResString(IDS_PRINTERS), 0, true, IDC_PRINTERS);
AddButton(ResString(IDS_SETTINGS_WND), 0, false, IDC_SETTINGS_WND);
AddButton(ResString(IDS_ADMIN), 0, true, IDC_ADMIN);
AddButton(ResString(IDS_DRIVES), 0, true, IDC_DRIVES);
@ -709,6 +710,10 @@ int StartMenuRoot::Command(int id, int code)
CreateSubmenu(id, CSIDL_CONTROLS);
break;
case IDC_PRINTERS:
CreateSubmenu(id, CSIDL_PRINTERS, CSIDL_PRINTHOOD);
break;
case IDC_SETTINGS_WND:
CloseStartMenu(id);
MainFrame::Create(_T("::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{21EC2020-3AEA-1069-A2DD-08002B30309D}"), FALSE);

View file

@ -146,7 +146,9 @@ LRESULT NotifyArea::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
if (found != _sorted_icons.end()) {
NotifyInfo& entry = const_cast<NotifyInfo&>(*found); // Why does GCC 3.3 need this additional const_cast ?!
// Notify the message the the owner if it's still alive
//TODO: AttachThreadInput() für SetForegroundWindow() in Client-Prozess
// Notify the message if the owner if it's still alive
if (IsWindow(entry._hWnd))
PostMessage(entry._hWnd, entry._uCallbackMessage, entry._uID, nmsg);
else if (_icon_map.erase(entry)) // delete icons without valid owner window