Ros-diffs

ros-diffs@reactos.org

81390 discussions

[peterw] 21381: [AUDIT] reactos\lib\tgetopt (Unlocked): - No reason for this to be locked (obviously clean).
by aleksey＠studiocerebral.com 25 Mar '06

25 Mar '06

Author: peterw Date: Sat Mar 25 03:46:39 2006 New Revision: 21381 URL: http://svn.reactos.ru/svn/reactos?rev=21381&view=rev Log: [AUDIT] reactos\lib\tgetopt (Unlocked): - No reason for this to be locked (obviously clean). Modified: trunk/reactos/lib/tgetopt/_wgetopt.c (props changed) trunk/reactos/lib/tgetopt/getopt.c (props changed) trunk/reactos/lib/tgetopt/tgetopt.h (props changed) Propchange: trunk/reactos/lib/tgetopt/_wgetopt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/tgetopt/getopt.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/tgetopt/tgetopt.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[peterw] 21380: [AUDIT] reactos\dll\keyboard (Unlocked): - No reason for this to be locked (obviously clean).
by aleksey＠studiocerebral.com 25 Mar '06

25 Mar '06

Author: peterw Date: Sat Mar 25 03:38:20 2006 New Revision: 21380 URL: http://svn.reactos.ru/svn/reactos?rev=21380&view=rev Log: [AUDIT] reactos\dll\keyboard (Unlocked): - No reason for this to be locked (obviously clean). Modified: trunk/reactos/dll/keyboard/kbdbe/kbdbe.c (props changed) trunk/reactos/dll/keyboard/kbdbe/kbdbe.def (props changed) trunk/reactos/dll/keyboard/kbdbe/kbdbe.rc (props changed) trunk/reactos/dll/keyboard/kbdda/kbdda.c (props changed) trunk/reactos/dll/keyboard/kbdda/kbdda.def (props changed) trunk/reactos/dll/keyboard/kbdda/kbdda.rc (props changed) trunk/reactos/dll/keyboard/kbddv/kbddv.c (props changed) trunk/reactos/dll/keyboard/kbddv/kbddv.def (props changed) trunk/reactos/dll/keyboard/kbddv/kbddv.rc (props changed) trunk/reactos/dll/keyboard/kbdes/kbdes.c (props changed) trunk/reactos/dll/keyboard/kbdes/kbdes.def (props changed) trunk/reactos/dll/keyboard/kbdes/kbdes.rc (props changed) trunk/reactos/dll/keyboard/kbdfr/kbdfr.c (props changed) trunk/reactos/dll/keyboard/kbdfr/kbdfr.def (props changed) trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc (props changed) trunk/reactos/dll/keyboard/kbdgr/kbdgr.c (props changed) trunk/reactos/dll/keyboard/kbdgr/kbdgr.def (props changed) trunk/reactos/dll/keyboard/kbdgr/kbdgr.rc (props changed) trunk/reactos/dll/keyboard/kbdhe/kbdhe.c (props changed) trunk/reactos/dll/keyboard/kbdhe/kbdhe.def (props changed) trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc (props changed) trunk/reactos/dll/keyboard/kbdheb/kbdheb.c (props changed) trunk/reactos/dll/keyboard/kbdheb/kbdheb.def (props changed) trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc (props changed) trunk/reactos/dll/keyboard/kbdhu/kbdhu.c (props changed) trunk/reactos/dll/keyboard/kbdhu/kbdhu.def (props changed) trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc (props changed) trunk/reactos/dll/keyboard/kbdpo/kbdpo.c (props changed) trunk/reactos/dll/keyboard/kbdpo/kbdpo.def (props changed) trunk/reactos/dll/keyboard/kbdpo/kbdpo.rc (props changed) trunk/reactos/dll/keyboard/kbdru/kbdru.c (props changed) trunk/reactos/dll/keyboard/kbdru/kbdru.def (props changed) trunk/reactos/dll/keyboard/kbdru/kbdru.rc (props changed) trunk/reactos/dll/keyboard/kbdse/kbdse.c (props changed) trunk/reactos/dll/keyboard/kbdse/kbdse.def (props changed) trunk/reactos/dll/keyboard/kbdse/kbdse.rc (props changed) trunk/reactos/dll/keyboard/kbdsg/kbdsg.c (props changed) trunk/reactos/dll/keyboard/kbdsg/kbdsg.def (props changed) trunk/reactos/dll/keyboard/kbdsg/kbdsg.rc (props changed) trunk/reactos/dll/keyboard/kbdsk/kbdsk.c (props changed) trunk/reactos/dll/keyboard/kbdsk/kbdsk.def (props changed) trunk/reactos/dll/keyboard/kbdsk/kbdsk.rc (props changed) trunk/reactos/dll/keyboard/kbduk/kbduk.c (props changed) trunk/reactos/dll/keyboard/kbduk/kbduk.def (props changed) trunk/reactos/dll/keyboard/kbduk/kbduk.rc (props changed) trunk/reactos/dll/keyboard/kbdur/kbdur.c (props changed) trunk/reactos/dll/keyboard/kbdur/kbdur.def (props changed) trunk/reactos/dll/keyboard/kbdur/kbdur.rc (props changed) trunk/reactos/dll/keyboard/kbdus/kbdus.c (props changed) trunk/reactos/dll/keyboard/kbdus/kbdus.def (props changed) trunk/reactos/dll/keyboard/kbdus/kbdus.rc (props changed) Propchange: trunk/reactos/dll/keyboard/kbdbe/kbdbe.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdbe/kbdbe.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdbe/kbdbe.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdda/kbdda.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdda/kbdda.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdda/kbdda.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbddv/kbddv.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbddv/kbddv.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbddv/kbddv.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdes/kbdes.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdes/kbdes.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdes/kbdes.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdfr/kbdfr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdfr/kbdfr.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdfr/kbdfr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdgr/kbdgr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdgr/kbdgr.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdgr/kbdgr.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhe/kbdhe.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhe/kbdhe.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhe/kbdhe.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdheb/kbdheb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdheb/kbdheb.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdheb/kbdheb.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhu/kbdhu.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhu/kbdhu.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdhu/kbdhu.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdpo/kbdpo.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdpo/kbdpo.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdpo/kbdpo.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdru/kbdru.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdru/kbdru.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdru/kbdru.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdse/kbdse.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdse/kbdse.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdse/kbdse.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsg/kbdsg.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsg/kbdsg.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsg/kbdsg.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsk/kbdsk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsk/kbdsk.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdsk/kbdsk.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbduk/kbduk.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbduk/kbduk.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbduk/kbduk.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdur/kbdur.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdur/kbdur.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdur/kbdur.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdus/kbdus.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdus/kbdus.def ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/keyboard/kbdus/kbdus.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[mbosma] 21379: Removed on kjk's request
by aleksey＠studiocerebral.com 25 Mar '06

25 Mar '06

Author: mbosma Date: Sat Mar 25 03:18:44 2006 New Revision: 21379 URL: http://svn.reactos.ru/svn/reactos?rev=21379&view=rev Log: Removed on kjk's request Removed: trunk/posix/

1 0

[gedmurphy] 21378: - cleannup code - an excuse to commit to make encoded happy :)
by aleksey＠studiocerebral.com 25 Mar '06

25 Mar '06

Author: gedmurphy Date: Sat Mar 25 03:04:29 2006 New Revision: 21378 URL: http://svn.reactos.ru/svn/reactos?rev=21378&view=rev Log: - cleannup code - an excuse to commit to make encoded happy :) Modified: trunk/reactos/base/applications/imagesoft/about.c trunk/reactos/base/applications/imagesoft/imagesoft.rc Modified: trunk/reactos/base/applications/imagesoft/about.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/about.c (original) +++ trunk/reactos/base/applications/imagesoft/about.c Sat Mar 25 03:04:29 2006 @@ -1,7 +1,10 @@ #include <precomp.h> INT_PTR CALLBACK -AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +AboutDialogProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) { HWND hLicenseEditWnd; HICON hIcon = NULL; @@ -11,24 +14,36 @@ { case WM_INITDIALOG: - hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + hIcon = LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), + IMAGE_ICON, + 16, + 16, + 0); - hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + SendMessage(hDlg, + WM_SETICON, + ICON_SMALL, + (LPARAM)hIcon); - LoadString(hInstance, IDS_LICENSE, strLicense, - sizeof(strLicense) / sizeof(TCHAR)); + hLicenseEditWnd = GetDlgItem(hDlg, + IDC_LICENSE_EDIT); - SetWindowText(hLicenseEditWnd, strLicense); + LoadString(hInstance, + IDS_LICENSE, + strLicense, + sizeof(strLicense) / sizeof(TCHAR)); + SetWindowText(hLicenseEditWnd, + strLicense); return TRUE; case WM_COMMAND: - if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { DestroyIcon(hIcon); - EndDialog(hDlg, LOWORD(wParam)); + EndDialog(hDlg, + LOWORD(wParam)); return TRUE; } Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Sat Mar 25 03:04:29 2006 @@ -19,6 +19,7 @@ IDI_ICON ICON "res/imagesoft.ico" +/* main toolbar icons */ IDB_MAINCOPYICON BITMAP DISCARDABLE "res/icons/MainCopyIcon.bmp" IDB_MAINCUTICON BITMAP DISCARDABLE "res/icons/MainCutIcon.bmp" IDB_MAINPASTEICON BITMAP DISCARDABLE "res/icons/MainPasteIcon.bmp" @@ -30,6 +31,7 @@ IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/MainPrintPreIcon.bmp" IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/MainSaveIcon.bmp" +/* text toolbar icons */ IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/TextBoldIcon.bmp" IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/TextItalicIcon.bmp" IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/TextUnderlineIcon.bmp" @@ -37,6 +39,10 @@ IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/TextAlignCenterIcon.bmp" IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/TextAlignRightIcon.bmp" +/* tools window icons */ + + +/* cursors */ IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur"

1 0

[gedmurphy] 21377: docking toolbar fixes from Thomas. 1st attempt at always active floating toolbars
by aleksey＠studiocerebral.com 24 Mar '06

24 Mar '06

Author: gedmurphy Date: Fri Mar 24 23:59:38 2006 New Revision: 21377 URL: http://svn.reactos.ru/svn/reactos?rev=21377&view=rev Log: docking toolbar fixes from Thomas. 1st attempt at always active floating toolbars Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/tooldock.c Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Fri Mar 24 23:59:38 2006 @@ -978,11 +978,28 @@ break; } + case WM_ENABLE: + { + TbdHandleEnabling(&Info->ToolDocks, + hwnd, + (BOOL)wParam); + goto HandleDefaultMessage; + } + + case WM_NCACTIVATE: + { + TbdHandleActivation(&Info->ToolDocks, + hwnd, + &wParam, + &lParam); + goto HandleDefaultMessage; + } + case WM_ACTIVATEAPP: { //TbdShowFloatingToolbars(&Info->ToolDocks, // (BOOL)wParam); - break; + goto HandleDefaultMessage; } case WM_CREATE: @@ -1001,7 +1018,6 @@ /* Show the window */ ShowWindow(hwnd, Info->nCmdShow); - /* get the windows position */ GetWindowRect(hwnd, &wndOldPos); Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Fri Mar 24 23:59:38 2006 @@ -254,6 +254,13 @@ BOOL TbdHandleNotifications(PTOOLBAR_DOCKS TbDocks, LPNMHDR pnmh, LRESULT *Result); +VOID TbdHandleEnabling(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + BOOL Enable); +VOID TbdHandleActivation(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + WPARAM *wParam, + LPARAM *lParam); VOID TbdShowFloatingToolbars(PTOOLBAR_DOCKS TbDocks, BOOL Show); BOOL TbdInitImpl(VOID); Modified: trunk/reactos/base/applications/imagesoft/tooldock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/tooldock.c (original) +++ trunk/reactos/base/applications/imagesoft/tooldock.c Fri Mar 24 23:59:38 2006 @@ -611,7 +611,9 @@ return FALSE; } -#define GWLP_DOCKITEM 0 +#define GWLP_TBDOCKS 0 +#define GWLP_DOCKITEM (GWLP_TBDOCKS + sizeof(PTOOLBAR_DOCKS)) +#define TD_EXTRA_BYTES (GWLP_DOCKITEM + sizeof(PDOCKBAR_ITEM)) static LRESULT CALLBACK ToolDockWndProc(HWND hwnd, @@ -625,9 +627,10 @@ /* Get the window context */ TbDocks = (PTOOLBAR_DOCKS)GetWindowLongPtr(hwnd, - GWLP_USERDATA); + GWLP_TBDOCKS); Item = (PDOCKBAR_ITEM)GetWindowLongPtr(hwnd, GWLP_DOCKITEM); + if ((TbDocks == NULL || Item == NULL) && uMsg != WM_CREATE) { goto HandleDefaultMessage; @@ -635,6 +638,15 @@ switch (uMsg) { + case WM_NCACTIVATE: + { + TbdHandleActivation(TbDocks, + hwnd, + &wParam, + &lParam); + goto HandleDefaultMessage; + } + case WM_CREATE: { TbDocks = ((PTOOLDOCKWND_INIT)(((LPCREATESTRUCT)lParam)->lpCreateParams))->TbDocks; @@ -642,11 +654,13 @@ Item->hWndTool = hwnd; SetWindowLongPtr(hwnd, - GWLP_USERDATA, + GWLP_TBDOCKS, (LONG_PTR)TbDocks); SetWindowLongPtr(hwnd, GWLP_DOCKITEM, - (LONG_PTR)GWLP_DOCKITEM); + (LONG_PTR)Item); + + Ret = TRUE; break; } @@ -933,6 +947,76 @@ } VOID +TbdHandleEnabling(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + BOOL Enable) +{ + PDOCKBAR_ITEM Item; + + Item = TbDocks->Items; + while (Item != NULL) + { + if (Item->hWndTool != NULL && + Item->hWndTool != hWnd) + { + EnableWindow(Item->hWndTool, + Enable); + } + Item = Item->Next; + } +} + +VOID +TbdHandleActivation(PTOOLBAR_DOCKS TbDocks, + HWND hWnd, + WPARAM *wParam, + LPARAM *lParam) +{ + BOOL SynchronizeSiblings = TRUE; + BOOL KeepActive = *(BOOL*)wParam; + HWND hWndActivate = *(HWND*)lParam; + PDOCKBAR_ITEM Item; +DbgPrint("-- 0x%p --\n", hWnd); + Item = TbDocks->Items; + while (Item != NULL) + { + if (Item->hWndTool != NULL && + Item->hWndTool == hWndActivate) + {DbgPrint("Activate toolbars (0x%p)\n", hWndActivate); + KeepActive = TRUE; + SynchronizeSiblings = FALSE; + break; + } + Item = Item->Next; + } + + if (hWndActivate != (HWND)-1) + { + if (SynchronizeSiblings) + { + Item = TbDocks->Items; + while (Item != NULL) + { + if (Item->hWndTool != NULL && + Item->hWndTool != hWnd && + Item->hWndTool != hWndActivate) + {DbgPrint("WM_NCACTIVE %p (wnd %p)\n", KeepActive, Item->hWndTool); + SendMessage(Item->hWndTool, + WM_NCACTIVATE, + (WPARAM)KeepActive, + (LPARAM)-1); + } + Item = Item->Next; + } + } + } + else + *lParam = 0; + + *wParam = (WPARAM)KeepActive; +} + +VOID TbdShowFloatingToolbars(PTOOLBAR_DOCKS TbDocks, BOOL Show) { @@ -1014,7 +1098,7 @@ wc.cbSize = sizeof(WNDCLASSEX); wc.style = CS_HREDRAW | CS_VREDRAW; wc.lpfnWndProc = ToolDockWndProc; - wc.cbWndExtra = sizeof(PDOCKBAR_ITEM); + wc.cbWndExtra = TD_EXTRA_BYTES; wc.hInstance = hInstance; wc.hCursor = LoadCursor(NULL, IDC_ARROW);

1 0

[gedmurphy] 21376: - Fix drawing onto loaded bitmaps. - Don't call CreateCompatibleDC for each paint - Make the floating windows translucent unless the cursor is over them - Put in some temp code for basic sketches. (this functionality needs incorporating into separate tool functions) - change the internal name 'floating toolbars' to 'floating windows' to avoid confusion.
by aleksey＠studiocerebral.com 24 Mar '06

24 Mar '06

Author: gedmurphy Date: Fri Mar 24 22:39:07 2006 New Revision: 21376 URL: http://svn.reactos.ru/svn/reactos?rev=21376&view=rev Log: - Fix drawing onto loaded bitmaps. - Don't call CreateCompatibleDC for each paint - Make the floating windows translucent unless the cursor is over them - Put in some temp code for basic sketches. (this functionality needs incorporating into separate tool functions) - change the internal name 'floating toolbars' to 'floating windows' to avoid confusion. Added: trunk/reactos/base/applications/imagesoft/floatwindow.c trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp (with props) trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp (with props) Removed: trunk/reactos/base/applications/imagesoft/floattoolbar.c Modified: trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/imagesoft/buttons.h trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rbuild trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/En.rc Fri Mar 24 22:39:07 2006 @@ -33,6 +33,8 @@ POPUP "&View" BEGIN MENUITEM "&Tools", ID_TOOLS, CHECKED + MENUITEM "&Color", -1, CHECKED + MENUITEM "&History", -1, CHECKED MENUITEM "&Status Bar", ID_STATUSBAR, CHECKED END POPUP "&Image" Modified: trunk/reactos/base/applications/imagesoft/buttons.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/buttons.h (original) +++ trunk/reactos/base/applications/imagesoft/buttons.h Fri Mar 24 22:39:07 2006 @@ -1,5 +1,6 @@ +/* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + TBBUTTON StdButtons[] = { - /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ @@ -22,3 +23,17 @@ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, }; + +TBBUTTON TextButtons[] = { + {TBICON_BOLD, ID_BOLD, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* bold */ + {TBICON_ITALIC, ID_ITALIC, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* italic */ + {TBICON_ULINE, ID_ULINE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* underline */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_TXTLEFT, ID_TXTLEFT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* left justified */ + {TBICON_TXTCENTER,ID_TXTCENTER,TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* centered */ + {TBICON_TXTRIGHT, ID_TXTRIGHT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* right justified */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ +}; Removed: trunk/reactos/base/applications/imagesoft/floattoolbar.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floattoolbar.c (original) +++ trunk/reactos/base/applications/imagesoft/floattoolbar.c (removed) @@ -1,87 +1,0 @@ -#include <precomp.h> - -static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); - - - -BOOL -ShowHideToolbar(HWND hwnd) -{ - static BOOL Hidden = FALSE; - - ShowWindow(hwnd, Hidden ? SW_SHOW : SW_HIDE); - Hidden = ~Hidden; - - return Hidden; -} - - -LRESULT CALLBACK -FloatToolbarWndProc(HWND hwnd, - UINT Message, - WPARAM wParam, - LPARAM lParam) -{ - switch(Message) - { - case WM_CREATE: - - break; - - /*case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL) - ShowHideToolbar(hwnd); - - switch(LOWORD(wParam)) - { - case IDC_PRESS: - MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), - MB_OK | MB_ICONEXCLAMATION); - break; - } - break;*/ - - case WM_NCACTIVATE: - return DefWindowProc(hwnd, Message, TRUE, lParam); - - case WM_CLOSE: - ShowHideToolbar(hwnd); - break; - - default: - return DefWindowProc(hwnd, - Message, - wParam, - lParam); - } - - return 0; -} - - -BOOL -InitFloatWndClass(VOID) -{ - WNDCLASSEX wc = {0}; - - wc.cbSize = sizeof(WNDCLASSEX); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = FloatToolbarWndProc; - wc.hInstance = hInstance; - wc.hIcon = NULL; - wc.hCursor = LoadCursor(NULL, - IDC_ARROW); - wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); - wc.lpszClassName = szFloatWndClass; - wc.hIconSm = NULL; - - return RegisterClassEx(&wc) != (ATOM)0; -} - -VOID -UninitFloatWndImpl(VOID) -{ - UnregisterClass(szFloatWndClass, - hInstance); -} - Added: trunk/reactos/base/applications/imagesoft/floatwindow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floatwindow.c (added) +++ trunk/reactos/base/applications/imagesoft/floatwindow.c Fri Mar 24 22:39:07 2006 @@ -1,0 +1,169 @@ +#include <precomp.h> + +static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); + +#define ID_TIMER 1 + +BOOL +ShowHideWindow(HWND hwnd) +{ + static BOOL Hidden = FALSE; + + ShowWindow(hwnd, Hidden ? SW_SHOW : SW_HIDE); + Hidden = ~Hidden; + + return Hidden; +} + + +LRESULT CALLBACK +FloatToolbarWndProc(HWND hwnd, + UINT Message, + WPARAM wParam, + LPARAM lParam) +{ + switch(Message) + { + static BOOL bOpaque = FALSE; + + case WM_CREATE: + + SetWindowLong(hwnd, + GWL_EXSTYLE, + GetWindowLong(hwnd, + GWL_EXSTYLE) | WS_EX_LAYERED); + + /* set the tranclucency to 60% */ + SetLayeredWindowAttributes(hwnd, + 0, + (255 * 60) / 100, + LWA_ALPHA); + + break; + + case WM_TIMER: + { + POINT pt; + + if (bOpaque != TRUE) + { + KillTimer(hwnd, + ID_TIMER); + break; + } + + if (GetCursorPos(&pt)) + { + RECT rect; + + if (GetWindowRect(hwnd, + &rect)) + { + if (! PtInRect(&rect, + pt)) + { + KillTimer(hwnd, + ID_TIMER); + + bOpaque = FALSE; + + SetWindowLong(hwnd, + GWL_EXSTYLE, + GetWindowLong(hwnd, + GWL_EXSTYLE) | WS_EX_LAYERED); + + /* set the tranclucency to 60% */ + SetLayeredWindowAttributes(hwnd, + 0, + (255 * 60) / 100, + LWA_ALPHA); + + } + } + } + } + break; + + case WM_NCMOUSEMOVE: + case WM_MOUSEMOVE: + if (bOpaque == FALSE) + { + SetWindowLong(hwnd, + GWL_EXSTYLE, + GetWindowLong(hwnd, + GWL_EXSTYLE) & ~WS_EX_LAYERED); + + RedrawWindow(hwnd, + NULL, + NULL, + RDW_ERASE | RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN); + + bOpaque = TRUE; + SetTimer(hwnd, + ID_TIMER, + 200, + NULL); + } + break; + + case WM_COMMAND: + if (LOWORD(wParam) == IDCANCEL) + ShowHideWindow(hwnd); + + switch(LOWORD(wParam)) + { + case IDC_PRESS: + MessageBox(hwnd, _T("Kapow!"), _T("Hit test"), + MB_OK | MB_ICONEXCLAMATION); + break; + } + break; + + case WM_NCACTIVATE: + /* FIXME: needs fully implementing */ + return DefWindowProc(hwnd, + Message, + TRUE, + lParam); + + case WM_CLOSE: + ShowHideWindow(hwnd); + break; + + default: + return DefWindowProc(hwnd, + Message, + wParam, + lParam); + } + + return 0; +} + + +BOOL +InitFloatWndClass(VOID) +{ + WNDCLASSEX wc = {0}; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = FloatToolbarWndProc; + wc.hInstance = hInstance; + wc.hIcon = NULL; + wc.hCursor = LoadCursor(NULL, + IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszClassName = szFloatWndClass; + wc.hIconSm = NULL; + + return RegisterClassEx(&wc) != (ATOM)0; +} + +VOID +UninitFloatWndImpl(VOID) +{ + UnregisterClass(szFloatWndClass, + hInstance); +} + Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Fri Mar 24 22:39:07 2006 @@ -1,4 +1,4 @@ -#include "precomp.h" +#include <precomp.h> HINSTANCE hInstance; HANDLE ProcessHeap; Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rbuild URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rbuild (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rbuild Fri Mar 24 22:39:07 2006 @@ -18,7 +18,7 @@ <library>comdlg32</library> <compilationunit name="unit.c"> <file>about.c</file> - <file>floattoolbar.c</file> + <file>floatwindow.c</file> <file>imageprop.c</file> <file>imagesoft.c</file> <file>imgedwnd.c</file> Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Fri Mar 24 22:39:07 2006 @@ -30,6 +30,13 @@ IDB_MAINPRINTPREICON BITMAP DISCARDABLE "res/icons/MainPrintPreIcon.bmp" IDB_MAINSAVEICON BITMAP DISCARDABLE "res/icons/MainSaveIcon.bmp" +IDB_TEXTBOLD BITMAP DISCARDABLE "res/icons/TextBoldIcon.bmp" +IDB_TEXTITALIC BITMAP DISCARDABLE "res/icons/TextItalicIcon.bmp" +IDB_TEXTULINE BITMAP DISCARDABLE "res/icons/TextUnderlineIcon.bmp" +IDB_TEXTLEFT BITMAP DISCARDABLE "res/icons/TextAlignLeftIcon.bmp" +IDB_TEXTCENTER BITMAP DISCARDABLE "res/icons/TextAlignCenterIcon.bmp" +IDB_TEXTRIGHT BITMAP DISCARDABLE "res/icons/TextAlignRightIcon.bmp" + IDC_PAINTBRUSHCURSOR CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursor.cur" IDC_PAINTBRUSHCURSORMOUSEDOWN CURSOR DISCARDABLE "res/cursors/PaintBrushToolCursorMouseDown.cur" Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Fri Mar 24 22:39:07 2006 @@ -46,9 +46,16 @@ if (Info->OpenInfo != NULL) { + HDC hDC = GetDC(Info->hSelf); + Info->hDCMem = CreateCompatibleDC(hDC); + ReleaseDC(Info->hSelf, hDC); + if (Info->OpenInfo->CreateNew) { /* FIXME: convert this to a DIB Section */ + /* set bitmap dimensions */ + Info->Width = Info->OpenInfo->New.Width; + Info->Height = Info->OpenInfo->New.Height; } else @@ -157,10 +164,12 @@ fail: if (! hFile) CloseHandle(hFile); + if (! pbmi) HeapFree(ProcessHeap, 0, pbmi); + return FALSE; } @@ -169,6 +178,8 @@ { PEDIT_WND_INFO *PrevEditor; PEDIT_WND_INFO Editor; + + DeleteDC(Info->hDCMem); /* FIXME - free resources and run down editor */ @@ -196,24 +207,20 @@ if (Info->hBitmap) { - Info->hDCMem = CreateCompatibleDC(hDC); - hOldBitmap = (HBITMAP) SelectObject(Info->hDCMem, - Info->hBitmap); + Info->hBitmap); BitBlt(hDC, - 0, - 0, - Info->Width, - Info->Height, + lpps->rcPaint.left, + lpps->rcPaint.top, + lpps->rcPaint.right - lpps->rcPaint.left, + lpps->rcPaint.bottom - lpps->rcPaint.top, Info->hDCMem, - 0, - 0, + lpps->rcPaint.left, + lpps->rcPaint.top, SRCCOPY); Info->hBitmap = SelectObject(Info->hDCMem, hOldBitmap); - - DeleteDC(Info->hDCMem); } } @@ -225,7 +232,9 @@ { PEDIT_WND_INFO Info; LRESULT Ret = 0; - static BOOL bLMButtonDown = FALSE; + HDC hDC; + static INT xMouse, yMouse; + static BOOL bLeftButtonDown, bRightButtonDown; /* Get the window context */ Info = (PEDIT_WND_INFO)GetWindowLongPtr(hwnd, @@ -262,24 +271,96 @@ break; case WM_LBUTTONDOWN: + if (! bRightButtonDown) + SetCapture(Info->hSelf); + + bLeftButtonDown = TRUE; + xMouse = LOWORD(lParam); + yMouse = HIWORD(lParam); + SetCursor(LoadCursor(hInstance, MAKEINTRESOURCE(IDC_PAINTBRUSHCURSORMOUSEDOWN))); - bLMButtonDown = TRUE; - break; case WM_LBUTTONUP: - bLMButtonDown = FALSE; + if (bLeftButtonDown) + SetCapture(NULL); + + bLeftButtonDown = FALSE; break; + case WM_RBUTTONDOWN: + if (! bLeftButtonDown) + SetCapture(Info->hSelf); + + bRightButtonDown = TRUE; + xMouse = LOWORD(lParam); + yMouse = HIWORD(lParam); + + SetCursor(LoadCursor(hInstance, + MAKEINTRESOURCE(IDC_PAINTBRUSHCURSORMOUSEDOWN))); + break; + + case WM_RBUTTONUP: + if (bRightButtonDown) + SetCapture(NULL); + + bRightButtonDown = FALSE; + + break; + case WM_MOUSEMOVE: - if (bLMButtonDown) - SetCursor(LoadCursor(hInstance, - MAKEINTRESOURCE(IDC_PAINTBRUSHCURSORMOUSEDOWN))); + { + HPEN hPen, hPenOld; + + if (!bLeftButtonDown && !bRightButtonDown) + break; + + hDC = GetDC(Info->hSelf); + + SelectObject(Info->hDCMem, + Info->hBitmap); + + if (bLeftButtonDown) + hPen = CreatePen(PS_SOLID, + 3, + RGB(0, 0, 0)); else - SetCursor(LoadCursor(hInstance, - MAKEINTRESOURCE(IDC_PAINTBRUSHCURSOR))); + hPen = CreatePen(PS_SOLID, + 3, + RGB(255, 255, 255)); + + hPenOld = SelectObject(hDC, + hPen); + + MoveToEx(hDC, + xMouse, + yMouse, + NULL); + + MoveToEx(Info->hDCMem, + xMouse, + yMouse, + NULL); + + xMouse = (short)LOWORD(lParam); + yMouse = (short)HIWORD(lParam); + + LineTo(hDC, + xMouse, + yMouse); + + LineTo(Info->hDCMem, + xMouse, + yMouse); + + DeleteObject(SelectObject(hDC, + hPenOld)); + + ReleaseDC(Info->hSelf, + hDC); + } break; case WM_PAINT: Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Fri Mar 24 22:39:07 2006 @@ -5,7 +5,7 @@ #define ID_MDI_FIRSTCHILD 50000 #define ID_MDI_WINDOWMENU 5 -#define NUM_FLT_TB 3 +#define NUM_FLT_WND 3 /* menu hints */ static const MENU_HINT MainMenuHintTable[] = { @@ -27,26 +27,29 @@ {SC_NEXTWINDOW, IDS_HINT_SYS_NEXT}, }; -static FLT_TB FloatingToolbar[NUM_FLT_TB] = { +static FLT_WND FloatingWindow[NUM_FLT_WND] = { {NULL, NULL, 0, 0, 55, 300}, {NULL, NULL, 0, 0, 200, 200}, {NULL, NULL, 0, 0, 150, 150} }; -/* Standard Toolbar */ +/* Toolbars */ #define ID_TOOLBAR_STANDARD 0 +#define ID_TOOLBAR_TEXT 1 static const TCHAR szToolbarStandard[] = TEXT("STANDARD"); +static const TCHAR szToolbarText[] = TEXT("TEXT"); /* Test Toolbar */ -#define ID_TOOLBAR_TEST 1 +#define ID_TOOLBAR_TEST 5 static const TCHAR szToolbarTest[] = TEXT("TEST"); /* Toolbars table */ static const DOCKBAR MainDockBars[] = { {ID_TOOLBAR_STANDARD, szToolbarStandard, IDS_TOOLBAR_STANDARD, TOP_DOCK}, {ID_TOOLBAR_TEST, szToolbarTest, IDS_TOOLBAR_TEST, TOP_DOCK}, + {ID_TOOLBAR_TEXT, szToolbarText, IDS_TOOLBAR_TEXT, TOP_DOCK}, }; @@ -108,6 +111,7 @@ { const TBBUTTON *Buttons = NULL; UINT NumButtons = 0; + UINT StartImageRes; HWND hWndClient = NULL; UNREFERENCED_PARAMETER(Context); @@ -119,6 +123,15 @@ { Buttons = StdButtons; NumButtons = sizeof(StdButtons) / sizeof(StdButtons[0]); + StartImageRes = IDB_MAINNEWICON; + break; + } + + case ID_TOOLBAR_TEXT: + { + Buttons = TextButtons; + NumButtons = sizeof(TextButtons) / sizeof(TextButtons[0]); + StartImageRes = IDB_TEXTBOLD; break; } @@ -158,7 +171,7 @@ NULL); if (hWndClient != NULL) { - HIMAGELIST hMainTBImageList; + HIMAGELIST hImageList; SendMessage(hWndClient, TB_SETEXTENDEDSTYLE, @@ -176,18 +189,20 @@ 0, (LPARAM)MAKELONG(TB_BMP_WIDTH, TB_BMP_HEIGHT)); - hMainTBImageList = InitImageList(NUM_MAINTB_IMAGES, - IDB_MAINNEWICON); + hImageList = InitImageList(NumButtons, + StartImageRes); ImageList_Destroy((HIMAGELIST)SendMessage(hWndClient, TB_SETIMAGELIST, 0, - (LPARAM)hMainTBImageList)); + (LPARAM)hImageList)); SendMessage(hWndClient, TB_ADDBUTTONS, NumButtons, - (LPARAM)&StdButtons); + (LPARAM)Buttons); + + } } @@ -224,6 +239,7 @@ { switch (rbi->wID) { + case ID_TOOLBAR_TEXT: case ID_TOOLBAR_STANDARD: { SIZE Size; @@ -273,6 +289,7 @@ { switch (rbi->wID) { + case ID_TOOLBAR_TEXT: case ID_TOOLBAR_STANDARD: { SIZE Size; @@ -350,118 +367,125 @@ } static VOID -MainWndMoveFloatingToolbars(HWND hwnd, PRECT wndOldPos) +MainWndMoveFloatingWindows(HWND hwnd, PRECT wndOldPos) { RECT wndNewPos, TbRect; INT i, xMoved, yMoved; - GetWindowRect(hwnd, - &wndNewPos); - - xMoved = wndNewPos.left - wndOldPos->left; - yMoved = wndNewPos.top - wndOldPos->top; - - for (i = 0; i < NUM_FLT_TB; i++) - { - GetWindowRect(FloatingToolbar[i].hSelf, - &TbRect); - - FloatingToolbar[i].x = TbRect.left + xMoved; - FloatingToolbar[i].y = TbRect.top + yMoved; - - MoveWindow(FloatingToolbar[i].hSelf, - FloatingToolbar[i].x, - FloatingToolbar[i].y, - FloatingToolbar[i].Width, - FloatingToolbar[i].Height, + if (GetWindowRect(hwnd, + &wndNewPos)) + { + + xMoved = wndNewPos.left - wndOldPos->left; + yMoved = wndNewPos.top - wndOldPos->top; + + for (i = 0; i < NUM_FLT_WND; i++) + { + GetWindowRect(FloatingWindow[i].hSelf, + &TbRect); + + FloatingWindow[i].x = TbRect.left + xMoved; + FloatingWindow[i].y = TbRect.top + yMoved; + + MoveWindow(FloatingWindow[i].hSelf, + FloatingWindow[i].x, + FloatingWindow[i].y, + FloatingWindow[i].Width, + FloatingWindow[i].Height, + TRUE); + } + + CopyMemory(wndOldPos, + &wndNewPos, + sizeof(RECT)); + } +} + + +static VOID +MainWndResetFloatingWindows(HWND hwnd) +{ + RECT rect; + + if (GetWindowRect(hwnd, + &rect)) + { + + /* tools datum */ + MoveWindow(FloatingWindow[0].hSelf, + rect.left + 5, + rect.top + 5, + FloatingWindow[0].Width, + FloatingWindow[0].Height, TRUE); - } - - CopyMemory(wndOldPos, - &wndNewPos, - sizeof(RECT)); -} - + + /* colors datum */ + MoveWindow(FloatingWindow[1].hSelf, + rect.left + 5, + rect.bottom - FloatingWindow[1].Height - 5, + FloatingWindow[1].Width, + FloatingWindow[1].Height, + TRUE); + + /* history datum */ + MoveWindow(FloatingWindow[2].hSelf, + rect.right - FloatingWindow[2].Width - 5, + rect.top + 5, + FloatingWindow[2].Width, + FloatingWindow[2].Height, + TRUE); + } +} static VOID -MainWndResetFloatingToolbars(HWND hwnd) -{ - RECT rect; - - GetWindowRect(hwnd, - &rect); - - /* tools datum */ - MoveWindow(FloatingToolbar[0].hSelf, - rect.left + 5, - rect.top + 5, - FloatingToolbar[0].Width, - FloatingToolbar[0].Height, - TRUE); - - /* colors datum */ - MoveWindow(FloatingToolbar[1].hSelf, - rect.left + 5, - rect.bottom - FloatingToolbar[1].Height - 5, - FloatingToolbar[1].Width, - FloatingToolbar[1].Height, - TRUE); - - /* history datum */ - MoveWindow(FloatingToolbar[2].hSelf, - rect.right - FloatingToolbar[2].Width - 5, - rect.top + 5, - FloatingToolbar[2].Width, - FloatingToolbar[2].Height, - TRUE); -} - -static VOID -MainWndCreateFloatToolbars(PMAIN_WND_INFO Info) +MainWndCreateFloatWindows(PMAIN_WND_INFO Info) { RECT rect; const TBBUTTON *Buttons = NULL; UINT Res, NumButtons = 2; INT i = 0; - GetWindowRect(Info->hMdiClient, - &rect); + if (! GetWindowRect(Info->hMdiClient, + &rect)) + { + return; + } /* tools datum */ - FloatingToolbar[0].x = rect.left + 5; - FloatingToolbar[0].y = rect.top + 5; + FloatingWindow[0].x = rect.left + 5; + FloatingWindow[0].y = rect.top + 5; /* colors datum */ - FloatingToolbar[1].x = rect.left + 5; - FloatingToolbar[1].y = rect.bottom - FloatingToolbar[1].Height - 5; + FloatingWindow[1].x = rect.left + 5; + FloatingWindow[1].y = rect.bottom - FloatingWindow[1].Height - 5; /* history datum */ - FloatingToolbar[2].x = rect.right - FloatingToolbar[2].Width - 5; - FloatingToolbar[2].y = rect.top + 5; - - for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_TB; Res++, i++) - { - if (! AllocAndLoadString(&FloatingToolbar[i].lpName, + FloatingWindow[2].x = rect.right - FloatingWindow[2].Width - 5; + FloatingWindow[2].y = rect.top + 5; + + for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_WND; Res++, i++) + { + if (! AllocAndLoadString(&FloatingWindow[i].lpName, hInstance, Res)) { - FloatingToolbar[i].lpName = NULL; + FloatingWindow[i].lpName = NULL; } /* create the 'tools' toolbar */ - FloatingToolbar[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, - TEXT("ImageSoftFloatWndClass"), - FloatingToolbar[i].lpName, - WS_POPUPWINDOW | WS_DLGFRAME | WS_VISIBLE, - FloatingToolbar[i].x, - FloatingToolbar[i].y, - FloatingToolbar[i].Width, - FloatingToolbar[i].Height, - Info->hSelf, - NULL, - hInstance, - NULL); + FloatingWindow[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, + TEXT("ImageSoftFloatWndClass"), + FloatingWindow[i].lpName, + WS_POPUPWINDOW | WS_DLGFRAME | WS_VISIBLE, + FloatingWindow[i].x, + FloatingWindow[i].y, + FloatingWindow[i].Width, + FloatingWindow[i].Height, + Info->hSelf, + NULL, + hInstance, + NULL); } @@ -527,7 +551,7 @@ &MainWndDockBarCallbacks); } - MainWndCreateFloatToolbars(Info); + MainWndCreateFloatWindows(Info); } static VOID CALLBACK @@ -707,6 +731,10 @@ break; } + case ID_BOLD: + MessageBox(NULL, _T("Bingo"), NULL, 0); + break; + case ID_OPEN: { OPEN_IMAGE_EDIT_INFO OpenInfo; @@ -861,7 +889,7 @@ /* reposition the floating toolbars */ if ((wParam == SIZE_MAXIMIZED) || (wParam == SIZE_RESTORED)) - MainWndResetFloatingToolbars(Info->hMdiClient); + MainWndResetFloatingWindows(Info->hMdiClient); break; } @@ -875,6 +903,7 @@ break; case WM_NCLBUTTONUP : + bLBMouseDown = FALSE; DefWindowProc(hwnd, uMsg, @@ -886,7 +915,7 @@ { /* if the main window is moved, move the toolbars too */ if (bLBMouseDown) - MainWndMoveFloatingToolbars(hwnd, &wndOldPos); + MainWndMoveFloatingWindows(hwnd, &wndOldPos); } break; Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Fri Mar 24 22:39:07 2006 @@ -131,6 +131,7 @@ struct _EDIT_WND_INFO *Next; POINT ScrollPos; USHORT Zoom; + DWORD Tool; POPEN_IMAGE_EDIT_INFO OpenInfo; /* Only valid during initialization */ @@ -332,7 +333,7 @@ BOOL DoSaveFile(HWND hwnd); /* floattoolbar.c */ -typedef struct _FLT_TB +typedef struct _FLT_WND { HWND hSelf; LPTSTR lpName; @@ -340,10 +341,11 @@ INT y; INT Width; INT Height; -} FLT_TB, *PFLT_TB; + BOOL bOpaque; +} FLT_WND, *PFLT_WND; BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); -BOOL ShowHideToolbar(HWND hwnd); +BOOL ShowHideWindow(HWND hwnd); #endif /* __IMAGESOFT_PRECOMP_H */ Added: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignCenterIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignLeftIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextAlignRightIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextBoldIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextItalicIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/imagesoft/res/icons/TextUnderlineIcon.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Fri Mar 24 22:39:07 2006 @@ -29,7 +29,12 @@ #define ID_EDITCOLOURS 2017 #define ID_TOOLS 2018 #define ID_STATUSBAR 2019 - +#define ID_BOLD 2030 +#define ID_ITALIC 2031 +#define ID_ULINE 2032 +#define ID_TXTLEFT 2033 +#define ID_TXTCENTER 2034 +#define ID_TXTRIGHT 2035 #define ID_REFRESH 3000 #define ID_HELP 3001 @@ -77,6 +82,13 @@ #define TBICON_HELP 8 #define TBICON_EXIT 9 +#define TBICON_BOLD 10 +#define TBICON_ITALIC 11 +#define TBICON_ULINE 12 +#define TBICON_TXTLEFT 13 +#define TBICON_TXTCENTER 14 +#define TBICON_TXTRIGHT 15 + /* about box info */ #define IDD_ABOUTBOX 200 #define IDC_LICENSE_EDIT 201 @@ -87,7 +99,8 @@ #define IDS_READY 104 #define IDS_TOOLBAR_STANDARD 201 #define IDS_TOOLBAR_TEST 202 -#define IDS_IMAGE_NAME 203 +#define IDS_TOOLBAR_TEXT 203 +#define IDS_IMAGE_NAME 210 /* menu hints */ #define IDS_HINT_EXIT 20001 @@ -127,8 +140,6 @@ #define IDS_UNIT_KB 4110 - - /* toolbar buttons resources * these must be numbered consecutively * see loop in InitImageList */ @@ -142,6 +153,13 @@ #define IDB_MAINPASTEICON 10007 #define IDB_MAINUNDOICON 10008 #define IDB_MAINREDOICON 10009 +#define IDB_TEXTBOLD 10020 +#define IDB_TEXTITALIC 10021 +#define IDB_TEXTULINE 10022 +#define IDB_TEXTLEFT 10023 +#define IDB_TEXTCENTER 10024 +#define IDB_TEXTRIGHT 10025 + /* toolbar buttons */ #define TBICON_NEW 0

1 0

[peterw] 21375: [AUDIT] reactos\tools\wine2ros (Unlocked): - No reason for these to be locked (obviously clean).
by aleksey＠studiocerebral.com 24 Mar '06

24 Mar '06

Author: peterw Date: Fri Mar 24 21:43:52 2006 New Revision: 21375 URL: http://svn.reactos.ru/svn/reactos?rev=21375&view=rev Log: [AUDIT] reactos\tools\wine2ros (Unlocked): - No reason for these to be locked (obviously clean). Modified: trunk/reactos/tools/wine2ros/wine2ros.c (props changed) Propchange: trunk/reactos/tools/wine2ros/wine2ros.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[tretiakov] 21374: Implement RpcBindingCopy()
by aleksey＠studiocerebral.com 24 Mar '06

24 Mar '06

Author: tretiakov Date: Fri Mar 24 17:14:34 2006 New Revision: 21374 URL: http://svn.reactos.ru/svn/reactos?rev=21374&view=rev Log: Implement RpcBindingCopy() Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindin… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_binding.c (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_binding.c Fri Mar 24 17:14:34 2006 @@ -592,6 +592,42 @@ return ndst; } +/*********************************************************************** + * RpcBindingCopy (RPCRT4.@) + */ +RPC_STATUS RPC_ENTRY RpcBindingCopy( + RPC_BINDING_HANDLE SourceBinding, + RPC_BINDING_HANDLE* DestinationBinding) +{ + TRACE("RpcBindingCopy called\n"); + RpcBinding *DestBinding = 0, *SrcBinding = (RpcBinding*)SourceBinding; + + if(SrcBinding->server) + { + *DestinationBinding = NULL; + return RPC_S_WRONG_KIND_OF_BINDING; + } + + DestBinding = (RpcBinding*) + HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcBinding)); + + if(!DestBinding) + { + *DestinationBinding = NULL; + return ERROR_NOT_ENOUGH_MEMORY; + } + + memcpy(DestBinding, SrcBinding, sizeof(RpcBinding)); + DestBinding->refs = 1; + DestBinding->Next = NULL; + DestBinding->server = FALSE; + DestBinding->Protseq = RPCRT4_strndupA(SrcBinding->Protseq, -1); + DestBinding->NetworkAddr = RPCRT4_strndupA(SrcBinding->NetworkAddr, -1); + DestBinding->Endpoint = RPCRT4_strndupA(SrcBinding->Endpoint, -1); + + *DestinationBinding = DestBinding; + return RPC_S_OK; +} /*********************************************************************** * RpcStringBindingComposeA (RPCRT4.@) Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.spe… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Fri Mar 24 17:14:34 2006 @@ -369,7 +369,7 @@ @ stub RpcAsyncGetCallStatus @ stub RpcAsyncInitializeHandle @ stub RpcAsyncRegisterInfo -@ stub RpcBindingCopy +@ stdcall RpcBindingCopy(ptr ptr) @ stdcall RpcBindingFree(ptr) @ stdcall RpcBindingFromStringBindingA(str ptr) @ stdcall RpcBindingFromStringBindingW(wstr ptr)

1 0

[gedmurphy] 21373: Add the floating windows and anchor them the the main window if moved
by aleksey＠studiocerebral.com 23 Mar '06

23 Mar '06

Author: gedmurphy Date: Thu Mar 23 22:27:38 2006 New Revision: 21373 URL: http://svn.reactos.ru/svn/reactos?rev=21373&view=rev Log: Add the floating windows and anchor them the the main window if moved Added: trunk/reactos/base/applications/imagesoft/buttons.h Modified: trunk/reactos/base/applications/imagesoft/En.rc trunk/reactos/base/applications/imagesoft/floattoolbar.c trunk/reactos/base/applications/imagesoft/imagesoft.c trunk/reactos/base/applications/imagesoft/imagesoft.rc trunk/reactos/base/applications/imagesoft/imgedwnd.c trunk/reactos/base/applications/imagesoft/mainwnd.c trunk/reactos/base/applications/imagesoft/precomp.h trunk/reactos/base/applications/imagesoft/resource.h Modified: trunk/reactos/base/applications/imagesoft/En.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/En.rc (original) +++ trunk/reactos/base/applications/imagesoft/En.rc Thu Mar 23 22:27:38 2006 @@ -117,38 +117,16 @@ PUSHBUTTON "Cancel", IDCANCEL, 102, 144, 48, 13 END - -/* floating toolbar */ -IDD_FLOATTOOLS DIALOGEX 1, 17, 32, 112 -STYLE WS_POPUP | WS_SYSMENU | WS_CAPTION | WS_VISIBLE -EXSTYLE WS_EX_TOOLWINDOW -CAPTION "Tools" -FONT 8, "MS Sans Serif" -BEGIN -/* - PUSHBUTTON "1", IDC_PRESS,0,0,16,16 - PUSHBUTTON "2", IDC_PRESS,16,0,16,16 - PUSHBUTTON "3", IDC_PRESS,0,16,16,16 - PUSHBUTTON "4", IDC_PRESS,16,16,16,16 - PUSHBUTTON "5", IDC_PRESS,0,32,16,16 - PUSHBUTTON "6", IDC_PRESS,16,32,16,16 - PUSHBUTTON "7", IDC_PRESS,0,48,16,16 - PUSHBUTTON "8", IDC_PRESS,16,48,16,16 - PUSHBUTTON "9", IDC_PRESS,0,64,16,16 - PUSHBUTTON "10", IDC_PRESS,16,64,16,16 -*/ -END - - STRINGTABLE DISCARDABLE BEGIN - IDS_APPNAME "ImageSoft" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." IDS_READY " Ready." - IDS_TOOLBAR_STANDARD "Standard" IDS_TOOLBAR_TEST "Test" IDS_IMAGE_NAME "Image %1!u!" + IDS_FLT_TOOLS "Tools" + IDS_FLT_COLORS "Colors" + IDS_FLT_HISTORY "History" END /* imageprop.c */ Added: trunk/reactos/base/applications/imagesoft/buttons.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/buttons.h (added) +++ trunk/reactos/base/applications/imagesoft/buttons.h Thu Mar 23 22:27:38 2006 @@ -1,0 +1,24 @@ +TBBUTTON StdButtons[] = { + /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ + {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ + {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ + {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ + {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, +}; Modified: trunk/reactos/base/applications/imagesoft/floattoolbar.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/floattoolbar.c (original) +++ trunk/reactos/base/applications/imagesoft/floattoolbar.c Thu Mar 23 22:27:38 2006 @@ -1,6 +1,8 @@ -#include "precomp.h" +#include <precomp.h> static const TCHAR szFloatWndClass[] = TEXT("ImageSoftFloatWndClass"); + + BOOL ShowHideToolbar(HWND hwnd) @@ -39,12 +41,11 @@ } break;*/ + case WM_NCACTIVATE: + return DefWindowProc(hwnd, Message, TRUE, lParam); + case WM_CLOSE: - DestroyWindow(hwnd); - break; - - case WM_DESTROY: - PostQuitMessage(0); + ShowHideToolbar(hwnd); break; default: Modified: trunk/reactos/base/applications/imagesoft/imagesoft.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.c (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.c Thu Mar 23 22:27:38 2006 @@ -1,4 +1,4 @@ -#include <precomp.h> +#include "precomp.h" HINSTANCE hInstance; HANDLE ProcessHeap; @@ -12,11 +12,11 @@ LPSTR lpCmdLine, int nCmdShow) { - LPTSTR lpAppName; + LPTSTR lpAppName, lpVersion, lpTitle; HWND hMainWnd; MSG Msg; BOOL bRet; - int Ret = 1; + int Ret = 1, len; INITCOMMONCONTROLSEX icex; hInstance = hThisInstance; @@ -26,12 +26,21 @@ icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; InitCommonControlsEx(&icex); - if (!AllocAndLoadString(&lpAppName, - hInstance, - IDS_APPNAME)) + if (!AllocAndLoadString(&lpAppName, hInstance, IDS_APPNAME) || + !AllocAndLoadString(&lpVersion, hInstance, IDS_VERSION) ) { return 1; } + + len = _tcslen(lpAppName) + _tcslen(lpVersion); + lpTitle = HeapAlloc(ProcessHeap, + 0, + (len + 2) * sizeof(TCHAR)); + + wsprintf(lpTitle, + _T("%s %s"), + lpAppName, + lpVersion); if (TbdInitImpl()) { @@ -41,7 +50,7 @@ { if (InitFloatWndClass()) { - hMainWnd = CreateMainWindow(lpAppName, + hMainWnd = CreateMainWindow(lpTitle, nCmdShow); if (hMainWnd != NULL) { Modified: trunk/reactos/base/applications/imagesoft/imagesoft.rc URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imagesoft.rc (original) +++ trunk/reactos/base/applications/imagesoft/imagesoft.rc Thu Mar 23 22:27:38 2006 @@ -5,11 +5,17 @@ #define REACTOS_STR_FILE_DESCRIPTION "ReactOS image editor\0" #define REACTOS_STR_INTERNAL_NAME "imagesoft\0" #define REACTOS_STR_ORIGINAL_FILENAME "imagesoft.exe\0" -//#include <reactos/version.rc> +#include <reactos/version.rc> LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 24 DISCARDABLE "manifest.xml" + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END IDI_ICON ICON "res/imagesoft.ico" Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Thu Mar 23 22:27:38 2006 @@ -40,7 +40,6 @@ PBITMAPINFO pbmi = NULL; PBYTE pBits; HANDLE hFile; - HDC hDC; BITMAP bitmap; Info->Zoom = 100; @@ -51,24 +50,6 @@ { /* FIXME: convert this to a DIB Section */ - /* set bitmap dimensions */ - Info->Width = Info->OpenInfo->New.Width; - Info->Height = Info->OpenInfo->New.Height; - - /* create bitmap */ - hDC = GetDC(Info->hSelf); - Info->hBitmap = CreateCompatibleBitmap(hDC, Info->Width, Info->Height); - //Info->hDCMem = CreateCompatibleDC(hDC); - ReleaseDC(Info->hSelf, hDC); - - if (!Info->hBitmap) - { - DeleteDC(Info->hDCMem); - return FALSE; - } - - //SelectObject(Info->hDCMem, Info->hBitmap); - PatBlt(Info->hDCMem, 0, 0, Info->Width, Info->Height, WHITENESS); } else { Modified: trunk/reactos/base/applications/imagesoft/mainwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/mainwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/mainwnd.c Thu Mar 23 22:27:38 2006 @@ -1,9 +1,11 @@ #include <precomp.h> +#include "buttons.h" static const TCHAR szMainWndClass[] = TEXT("ImageSoftWndClass"); #define ID_MDI_FIRSTCHILD 50000 #define ID_MDI_WINDOWMENU 5 +#define NUM_FLT_TB 3 /* menu hints */ static const MENU_HINT MainMenuHintTable[] = { @@ -25,33 +27,17 @@ {SC_NEXTWINDOW, IDS_HINT_SYS_NEXT}, }; +static FLT_TB FloatingToolbar[NUM_FLT_TB] = { + {NULL, NULL, 0, 0, 55, 300}, + {NULL, NULL, 0, 0, 200, 200}, + {NULL, NULL, 0, 0, 150, 150} +}; + + /* Standard Toolbar */ #define ID_TOOLBAR_STANDARD 0 static const TCHAR szToolbarStandard[] = TEXT("STANDARD"); -static TBBUTTON StdButtons[] = { - /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ - {TBICON_NEW, ID_NEW, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* new */ - {TBICON_OPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ - {TBICON_SAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_PRINT, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ - {TBICON_PRINTPRE, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ - {TBICON_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ - {TBICON_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - - {TBICON_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ - {TBICON_REDO, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ - - {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, -}; + /* Test Toolbar */ #define ID_TOOLBAR_TEST 1 @@ -363,32 +349,120 @@ } } +static VOID +MainWndMoveFloatingToolbars(HWND hwnd, PRECT wndOldPos) +{ + RECT wndNewPos, TbRect; + INT i, xMoved, yMoved; + + GetWindowRect(hwnd, + &wndNewPos); + + xMoved = wndNewPos.left - wndOldPos->left; + yMoved = wndNewPos.top - wndOldPos->top; + + for (i = 0; i < NUM_FLT_TB; i++) + { + GetWindowRect(FloatingToolbar[i].hSelf, + &TbRect); + + FloatingToolbar[i].x = TbRect.left + xMoved; + FloatingToolbar[i].y = TbRect.top + yMoved; + + MoveWindow(FloatingToolbar[i].hSelf, + FloatingToolbar[i].x, + FloatingToolbar[i].y, + FloatingToolbar[i].Width, + FloatingToolbar[i].Height, + TRUE); + } + + CopyMemory(wndOldPos, + &wndNewPos, + sizeof(RECT)); +} + + +static VOID +MainWndResetFloatingToolbars(HWND hwnd) +{ + RECT rect; + + GetWindowRect(hwnd, + &rect); + + /* tools datum */ + MoveWindow(FloatingToolbar[0].hSelf, + rect.left + 5, + rect.top + 5, + FloatingToolbar[0].Width, + FloatingToolbar[0].Height, + TRUE); + + /* colors datum */ + MoveWindow(FloatingToolbar[1].hSelf, + rect.left + 5, + rect.bottom - FloatingToolbar[1].Height - 5, + FloatingToolbar[1].Width, + FloatingToolbar[1].Height, + TRUE); + + /* history datum */ + MoveWindow(FloatingToolbar[2].hSelf, + rect.right - FloatingToolbar[2].Width - 5, + rect.top + 5, + FloatingToolbar[2].Width, + FloatingToolbar[2].Height, + TRUE); +} static VOID MainWndCreateFloatToolbars(PMAIN_WND_INFO Info) { + RECT rect; const TBBUTTON *Buttons = NULL; - UINT NumButtons = 2; - - /* create the 'tools' toolbar */ - /*Info->hFloatTools = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_FLOATTOOLS), - Info->hSelf, - FloatToolbarWndProc);*/ - - - Info->hFloatTools = CreateWindowEx(WS_EX_TOOLWINDOW, - TEXT("ImageSoftFloatWndClass"), - TEXT("Test"), - WS_POPUPWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_DLGFRAME, - 0, - 0, - 36, - 132, - Info->hSelf, - NULL, - hInstance, - NULL); + UINT Res, NumButtons = 2; + INT i = 0; + + GetWindowRect(Info->hMdiClient, + &rect); + + /* tools datum */ + FloatingToolbar[0].x = rect.left + 5; + FloatingToolbar[0].y = rect.top + 5; + + /* colors datum */ + FloatingToolbar[1].x = rect.left + 5; + FloatingToolbar[1].y = rect.bottom - FloatingToolbar[1].Height - 5; + + /* history datum */ + FloatingToolbar[2].x = rect.right - FloatingToolbar[2].Width - 5; + FloatingToolbar[2].y = rect.top + 5; + + for (Res = IDS_FLT_TOOLS; Res < IDS_FLT_TOOLS + NUM_FLT_TB; Res++, i++) + { + if (! AllocAndLoadString(&FloatingToolbar[i].lpName, + hInstance, + Res)) + { + FloatingToolbar[i].lpName = NULL; + } + + + /* create the 'tools' toolbar */ + FloatingToolbar[i].hSelf = CreateWindowEx(WS_EX_TOOLWINDOW, + TEXT("ImageSoftFloatWndClass"), + FloatingToolbar[i].lpName, + WS_POPUPWINDOW | WS_DLGFRAME | WS_VISIBLE, + FloatingToolbar[i].x, + FloatingToolbar[i].y, + FloatingToolbar[i].Width, + FloatingToolbar[i].Height, + Info->hSelf, + NULL, + hInstance, + NULL); + } if (Info->hFloatTools != NULL) @@ -414,10 +488,10 @@ hFloatToolsImageList = InitImageList(2, IDB_MAINNEWICON); - ImageList_Destroy((HIMAGELIST)SendMessage(Info->hFloatTools, - TB_SETIMAGELIST, - 0, - (LPARAM)hFloatToolsImageList)); + SendMessage(Info->hFloatTools, + TB_SETIMAGELIST, + 0, + (LPARAM)hFloatToolsImageList); SendMessage(Info->hFloatTools, TB_ADDBUTTONS, @@ -425,9 +499,6 @@ (LPARAM)&StdButtons); } - - - /* other floating toolbars may include colours, history and layers */ } @@ -767,6 +838,8 @@ { PMAIN_WND_INFO Info; LRESULT Ret = 0; + static BOOL bLBMouseDown = FALSE; + static RECT wndOldPos; /* Get the window context */ Info = (PMAIN_WND_INFO)GetWindowLongPtr(hwnd, @@ -785,8 +858,37 @@ HIWORD(lParam)); /* NOTE - do *not* forward this message to DefFrameProc! Otherwise the MDI client will attempt to resize itself */ - break; - } + + /* reposition the floating toolbars */ + if ((wParam == SIZE_MAXIMIZED) || (wParam == SIZE_RESTORED)) + MainWndResetFloatingToolbars(Info->hMdiClient); + + break; + } + + case WM_NCLBUTTONDOWN: + bLBMouseDown = TRUE; + DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + + case WM_NCLBUTTONUP : + bLBMouseDown = FALSE; + DefWindowProc(hwnd, + uMsg, + wParam, + lParam); + break; + + case WM_MOVE: + { + /* if the main window is moved, move the toolbars too */ + if (bLBMouseDown) + MainWndMoveFloatingToolbars(hwnd, &wndOldPos); + } + break; case WM_NOTIFY: { @@ -870,6 +972,10 @@ /* Show the window */ ShowWindow(hwnd, Info->nCmdShow); + + /* get the windows position */ + GetWindowRect(hwnd, + &wndOldPos); break; } Modified: trunk/reactos/base/applications/imagesoft/precomp.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/precomp.h (original) +++ trunk/reactos/base/applications/imagesoft/precomp.h Thu Mar 23 22:27:38 2006 @@ -331,13 +331,19 @@ BOOL DoOpenFile(HWND hwnd, LPTSTR lpFileName, LPTSTR lpName); BOOL DoSaveFile(HWND hwnd); -/* floating toolbars */ +/* floattoolbar.c */ +typedef struct _FLT_TB +{ + HWND hSelf; + LPTSTR lpName; + INT x; + INT y; + INT Width; + INT Height; +} FLT_TB, *PFLT_TB; + BOOL InitFloatWndClass(VOID); VOID UninitFloatWndImpl(VOID); -/*LRESULT CALLBACK FloatToolbarWndProc(HWND hwnd, - UINT Message, - WPARAM wParam, - LPARAM lParam);*/ BOOL ShowHideToolbar(HWND hwnd); #endif /* __IMAGESOFT_PRECOMP_H */ Modified: trunk/reactos/base/applications/imagesoft/resource.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/resource.h (original) +++ trunk/reactos/base/applications/imagesoft/resource.h Thu Mar 23 22:27:38 2006 @@ -60,6 +60,11 @@ #define IDI_ICON 50 #define IDB_BUTTONS 51 +/* these need to be kept consecutive */ +#define IDS_FLT_TOOLS 60 +#define IDS_FLT_COLORS 61 +#define IDS_FLT_HISTORY 62 + /* toolbar buttons */ #define TBICON_PROP 0 #define TBICON_REFRESH 1 @@ -77,8 +82,9 @@ #define IDC_LICENSE_EDIT 201 #define IDS_APPNAME 101 -#define IDS_LICENSE 102 -#define IDS_READY 103 +#define IDS_VERSION 102 +#define IDS_LICENSE 103 +#define IDS_READY 104 #define IDS_TOOLBAR_STANDARD 201 #define IDS_TOOLBAR_TEST 202 #define IDS_IMAGE_NAME 203 @@ -121,6 +127,8 @@ #define IDS_UNIT_KB 4110 + + /* toolbar buttons resources * these must be numbered consecutively * see loop in InitImageList */

1 0

cwittich: 21372 - /trunk/reactos/base/applications/imagesoft/imgedwnd.c
by aleksey＠studiocerebral.com 22 Mar '06

22 Mar '06

Author: cwittich Date: Thu Mar 23 01:22:33 2006 New Revision: 21372 URL: http://svn.reactos.ru/svn/reactos?rev=21372&view=rev Log: restore the bitmap in hDCMem before deleting the DC Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c Modified: trunk/reactos/base/applications/imagesoft/imgedwnd.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/applications/imagesoft… ============================================================================== --- trunk/reactos/base/applications/imagesoft/imgedwnd.c (original) +++ trunk/reactos/base/applications/imagesoft/imgedwnd.c Thu Mar 23 01:22:33 2006 @@ -211,11 +211,13 @@ HDC hDC, LPPAINTSTRUCT lpps) { + HBITMAP hOldBitmap; + if (Info->hBitmap) { Info->hDCMem = CreateCompatibleDC(hDC); - SelectObject(Info->hDCMem, + hOldBitmap = (HBITMAP) SelectObject(Info->hDCMem, Info->hBitmap); BitBlt(hDC, @@ -227,6 +229,8 @@ 0, 0, SRCCOPY); + + Info->hBitmap = SelectObject(Info->hDCMem, hOldBitmap); DeleteDC(Info->hDCMem); }

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