Ros-diffs October 2005

ros-diffs@reactos.org

26 participants
737 discussions

[mf] 18518: fix for Bugzilla entry 900 by mrnobo1024 at yahoo.com: don't destroy menus when switching between normal and scientific mode
by mf＠svn.reactos.com 17 Oct '05

17 Oct '05

fix for Bugzilla entry 900 by mrnobo1024 at yahoo.com: don't destroy menus when switching between normal and scientific mode Modified: trunk/reactos/subsys/system/calc/winecalc.c Modified: trunk/reactos/subsys/system/calc/winecalc.h _____ Modified: trunk/reactos/subsys/system/calc/winecalc.c --- trunk/reactos/subsys/system/calc/winecalc.c 2005-10-17 12:44:16 UTC (rev 18517) +++ trunk/reactos/subsys/system/calc/winecalc.c 2005-10-17 12:58:07 UTC (rev 18518) @@ -269,6 +269,7 @@ } DestroyCalc( &calc ); + DestroyMenus(); PostQuitMessage( 0 ); return 0; @@ -2839,6 +2840,12 @@ { int i; + for (i=0;i<calc->numButtons;i++) + DestroyWindow(calc->cb[i].hBtn); +} + +void DestroyMenus() +{ if (menus[MENU_STD] != 0) DestroyMenu(menus[MENU_STD]); @@ -2847,9 +2854,6 @@ if (menus[MENU_SCIWS] != 0) DestroyMenu(menus[MENU_SCIWS]); - - for (i=0;i<calc->numButtons;i++) - DestroyWindow(calc->cb[i].hBtn); } void calc_buffer_format(CALC *calc) { _____ Modified: trunk/reactos/subsys/system/calc/winecalc.h --- trunk/reactos/subsys/system/calc/winecalc.h 2005-10-17 12:44:16 UTC (rev 18517) +++ trunk/reactos/subsys/system/calc/winecalc.h 2005-10-17 12:58:07 UTC (rev 18518) @@ -338,6 +338,7 @@ void InitLuts(void); void InitMenus(HINSTANCE hInst); +void DestroyMenus(); void InitCalc (CALC *calc); void DestroyCalc (CALC *calc);

1 0

[cwittich] 18517: fixed "index out of range"
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

fixed "index out of range" Modified: trunk/reactos/subsys/system/welcome/welcome.c _____ Modified: trunk/reactos/subsys/system/welcome/welcome.c --- trunk/reactos/subsys/system/welcome/welcome.c 2005-10-17 12:41:52 UTC (rev 18516) +++ trunk/reactos/subsys/system/welcome/welcome.c 2005-10-17 12:44:16 UTC (rev 18517) @@ -566,7 +566,7 @@ 0, SRCCOPY); } - else if (hTopicBitmap[nTopic] != 0) + else if ((nTopic != -1) && (hTopicBitmap[nTopic] != 0)) { GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo); hOldBitmap = SelectObject (hdcMem, hTopicBitmap[nTopic]);

1 0

[mf] 18516: fix a few taskbar context menu bugs including Bugzilla entry 720
by mf＠svn.reactos.com 17 Oct '05

17 Oct '05

fix a few taskbar context menu bugs including Bugzilla entry 720 Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-10-17 12:23:19 UTC (rev 18515) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-10-17 12:41:52 UTC (rev 18516) @@ -194,7 +194,7 @@ Point pt(lparam); ScreenToClient(_htoolbar, &pt); - if ((HWND)wparam==_htoolbar && SendMessage(_htoolbar, TB_HITTEST, 0, (LPARAM)&pt)>0) + if ((HWND)wparam==_htoolbar && SendMessage(_htoolbar, TB_HITTEST, 0, (LPARAM)&pt)>=0) break; // avoid displaying context menu for application button _and_ desktop bar at the same time goto def;} @@ -258,7 +258,7 @@ (it=_map.find_id(btninfo.idCommand))!=_map.end()) { //TaskBarEntry& entry = it->second; - ActivateApp(it, false); + ActivateApp(it, false, false); // don't restore minimized windows on right button click #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) static DynamicFct<DWORD(STDAPICALLTYPE*)(RESTRICTIONS)> pSHRestricted(TEXT("SHELL32"), "SHRestricted"); @@ -277,7 +277,7 @@ } -void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize) +void TaskBar::ActivateApp(TaskBarMap::iterator it, bool can_minimize, bool can_restore) { HWND hwnd = it->first; @@ -285,7 +285,7 @@ (hwnd==GetForegroundWindow() || hwnd==_last_foreground_wnd); // switch to selected application window - if (!minimize_it) + if (can_restore && !minimize_it) if (IsIconic(hwnd)) PostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0); @@ -312,8 +312,10 @@ GetCursorPos(&pt); int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, _hwnd, NULL); - if (cmd) + if (cmd) { + ActivateApp(it, false, false); // reactivate window after the context menu has closed PostMessage(it->first, WM_SYSCOMMAND, cmd, 0); + } } } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.h --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-10-17 12:23:19 UTC (rev 18515) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.h 2005-10-17 12:41:52 UTC (rev 18516) @@ -94,7 +94,7 @@ int Command(int id, int code); int Notify(int id, NMHDR* pnmh); - void ActivateApp(TaskBarMap::iterator it, bool can_minimize=true); + void ActivateApp(TaskBarMap::iterator it, bool can_minimize=true, bool can_restore=true); void ShowAppSystemMenu(TaskBarMap::iterator it); static BOOL CALLBACK EnumWndProc(HWND hwnd, LPARAM lparam);

1 0

[cwittich] 18515: removed HeapFree because of unexpected behaviour
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

removed HeapFree because of unexpected behaviour Modified: trunk/reactos/subsys/system/regedit/listview.c _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-10-17 12:07:49 UTC (rev 18514) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-10-17 12:23:19 UTC (rev 18515) @@ -242,7 +242,6 @@ break; } } - HeapFree(GetProcessHeap(), 0, linfo); } static BOOL CreateListColumns(HWND hWndListView)

1 0

[mf] 18514: remove some unused special handling code and comments
by mf＠svn.reactos.com 17 Oct '05

17 Oct '05

remove some unused special handling code and comments Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp Modified: trunk/reactos/subsys/system/explorer/utility/window.h _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.cpp --- trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-17 12:04:26 UTC (rev 18513) +++ trunk/reactos/subsys/system/explorer/utility/window.cpp 2005-10-17 12:07:49 UTC (rev 18514) @@ -277,15 +277,6 @@ LRESULT Window::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { -/**@todo: replaced by StartMenu::TrackStartmenu() - HWND hwnd = _hwnd; - - // close startup menu and other popup menus - // This functionality is for tray notification icons missing in MS Windows. - if (nmsg == WM_SETFOCUS) - CancelModes((HWND)wparam); // erronesly cancels desktop bar resize when switching from another process -*/ - return DefWindowProc(_hwnd, nmsg, wparam, lparam); } @@ -299,12 +290,9 @@ return 0; } -void Window::CancelModes(HWND hwnd) +void Window::CancelModes() { - if (hwnd) - PostMessage(hwnd, WM_CANCELMODE, 0, 0); - else - PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0); + PostMessage(HWND_BROADCAST, WM_CANCELMODE, 0, 0); } @@ -352,12 +340,6 @@ LRESULT SubclassedWindow::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) { -/**@todo: replaced by StartMenu::TrackStartmenu() - // close startup menu and other popup menus - // This functionality is for tray notification icons missing in MS Windows. - if (nmsg == WM_SETFOCUS) - CancelModes((HWND)wparam); -*/ return CallWindowProc(_orgWndProc, _hwnd, nmsg, wparam, lparam); } _____ Modified: trunk/reactos/subsys/system/explorer/utility/window.h --- trunk/reactos/subsys/system/explorer/utility/window.h 2005-10-17 12:04:26 UTC (rev 18513) +++ trunk/reactos/subsys/system/explorer/utility/window.h 2005-10-17 12:07:49 UTC (rev 18514) @@ -102,7 +102,7 @@ LRESULT SendParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0); LRESULT PostParent(UINT nmsg, WPARAM wparam=0, LPARAM lparam=0); - static void CancelModes(HWND hwnd=0); + static void CancelModes(); protected:

1 0

[cwittich] 18513: fix compile with gcc
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

fix compile with gcc now it compiles with gcc && msvc Modified: trunk/reactos/w32api/include/objsel.h _____ Modified: trunk/reactos/w32api/include/objsel.h --- trunk/reactos/w32api/include/objsel.h 2005-10-17 12:02:31 UTC (rev 18512) +++ trunk/reactos/w32api/include/objsel.h 2005-10-17 12:04:26 UTC (rev 18513) @@ -25,8 +25,10 @@ #include <oaidl.h> #include <objidl.h> +#if defined (_MSC_VER) #define INITGUID #include <initguid.h> +#endif DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7);

1 0

[hpoussin] 18512: Add PCI_WHICHSPACE_CONFIG and PCI_WHICHSPACE_ROM constants
by hpoussin＠svn.reactos.com 17 Oct '05

17 Oct '05

Add PCI_WHICHSPACE_CONFIG and PCI_WHICHSPACE_ROM constants Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-10-17 11:49:36 UTC (rev 18511) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-10-17 12:02:31 UTC (rev 18512) @@ -3402,6 +3402,11 @@ #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 +/* IO_STACK_LOCATION.Parameters.ReadWriteControl.WhichSpace */ + +#define PCI_WHICHSPACE_CONFIG 0x0 +#define PCI_WHICHSPACE_ROM 0x52696350 /* 'PciR' */ + typedef enum _KEY_INFORMATION_CLASS { KeyBasicInformation, KeyNodeInformation,

1 0

[cwittich] 18511: added missing HEAP_ZERO_MEMORY
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

added missing HEAP_ZERO_MEMORY added missing HeapFree Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/listview.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-17 11:10:11 UTC (rev 18510) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-10-17 11:49:36 UTC (rev 18511) @@ -270,7 +270,8 @@ /* load "My Computer" string */ LoadString(hInst, IDS_MY_COMPUTER, buffer, sizeof(buffer)/sizeof(TCHAR)); - g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), 0, sizeof(ChildWnd)); + g_pChildWnd = pChildWnd = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ChildWnd)); + if (!pChildWnd) return 0; _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-10-17 11:10:11 UTC (rev 18510) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-10-17 11:49:36 UTC (rev 18511) @@ -242,6 +242,7 @@ break; } } + HeapFree(GetProcessHeap(), 0, linfo); } static BOOL CreateListColumns(HWND hWndListView)

1 0

[cwittich] 18510: fix regedit to compile with MSVC
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

fix regedit to compile with MSVC Modified: trunk/reactos/subsys/system/regedit/framewnd.c Modified: trunk/reactos/subsys/system/regedit/regproc.c Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/framewnd.c --- trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-17 11:09:35 UTC (rev 18509) +++ trunk/reactos/subsys/system/regedit/framewnd.c 2005-10-17 11:10:11 UTC (rev 18510) @@ -28,6 +28,7 @@ #include <shellapi.h> #include <objsel.h> #include <objbase.h> +#include <ole2.h> #include "main.h" #include "regproc.h" _____ Modified: trunk/reactos/subsys/system/regedit/regproc.c --- trunk/reactos/subsys/system/regedit/regproc.c 2005-10-17 11:09:35 UTC (rev 18509) +++ trunk/reactos/subsys/system/regedit/regproc.c 2005-10-17 11:10:11 UTC (rev 18510) @@ -23,6 +23,7 @@ #include <limits.h> #include <stdio.h> #include <ctype.h> +#include <stdlib.h> #include <windows.h> #include <winnt.h> #include <winreg.h> _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-10-17 11:09:35 UTC (rev 18509) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-10-17 11:10:11 UTC (rev 18510) @@ -124,7 +124,11 @@ tvi.iSelectedImage = Image_Open; tvi.cChildren = dwChildren; tvi.lParam = (LPARAM)hKey; +#if defined(__MINGW32__) tvins.u.item = tvi; +#else + tvins.item = tvi; +#endif tvins.hInsertAfter = (HTREEITEM)(hKey ? TVI_LAST : TVI_FIRST); tvins.hParent = hParent; return TreeView_InsertItem(hwndTV, &tvins); @@ -362,7 +366,11 @@ tvi.cChildren = 5; /* Save the heading level in the item's application-defined data area. */ tvi.lParam = (LPARAM)NULL; - tvins.u.item = tvi; +#if defined(__MINGW32__) + tvins.u.item = tvi; +#else + tvins.item = tvi; +#endif tvins.hInsertAfter = (HTREEITEM)TVI_FIRST; tvins.hParent = TVI_ROOT; /* Add the item to the tree view control. */

1 0

[cwittich] 18509: fix some headers to compile with MSVC
by cwittich＠svn.reactos.com 17 Oct '05

17 Oct '05

fix some headers to compile with MSVC Modified: trunk/reactos/w32api/include/excpt.h Modified: trunk/reactos/w32api/include/objsel.h _____ Modified: trunk/reactos/w32api/include/excpt.h --- trunk/reactos/w32api/include/excpt.h 2005-10-17 11:03:30 UTC (rev 18508) +++ trunk/reactos/w32api/include/excpt.h 2005-10-17 11:09:35 UTC (rev 18509) @@ -14,8 +14,10 @@ #ifndef _EXCPT_H_ #define _EXCPT_H_ -/* All the headers include this file. */ +/* All the headers include this file. */ +#if defined(__MINGW32__) #include <_mingw.h> +#endif #include <windef.h> _____ Modified: trunk/reactos/w32api/include/objsel.h --- trunk/reactos/w32api/include/objsel.h 2005-10-17 11:03:30 UTC (rev 18508) +++ trunk/reactos/w32api/include/objsel.h 2005-10-17 11:09:35 UTC (rev 18509) @@ -22,7 +22,12 @@ #endif #include <unknwn.h> +#include <oaidl.h> +#include <objidl.h> +#define INITGUID +#include <initguid.h> + DEFINE_GUID(CLSID_DsObjectPicker, 0x17d6ccd8, 0x3b7b, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7); DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0x00b9, 0xe0,0x00,0xc0,0x4f,0xd8,0xdb,0xf7);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2005