Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[mf] 17891: add comment
by mf＠svn.reactos.com 17 Sep '05

17 Sep '05

add comment Modified: trunk/reactos/subsys/system/winefile/winefile.c _____ Modified: trunk/reactos/subsys/system/winefile/winefile.c --- trunk/reactos/subsys/system/winefile/winefile.c 2005-09-16 21:15:58 UTC (rev 17890) +++ trunk/reactos/subsys/system/winefile/winefile.c 2005-09-17 10:52:43 UTC (rev 17891) @@ -1821,12 +1821,12 @@ static TCHAR sTranslation[] = {'\\','V','a','r','F','i','l','e','I','n','f','o','\\','T','r','a','n',' s','l','a','t','i','o','n','\0'}; static TCHAR sStringFileInfo[] = {'\\','S','t','r','i','n','g','F','i','l','e','I','n','f','o','\\', '%','0','4','x','%','0','4','x','\\','%','s','\0'}; - DWORD dwVersionDataLen = GetFileVersionInfoSize((LPTSTR)strFilename, NULL); + DWORD dwVersionDataLen = GetFileVersionInfoSize((LPTSTR)strFilename, NULL); /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ if (dwVersionDataLen) { dlg->pVersionData = malloc(dwVersionDataLen); - if (GetFileVersionInfo((LPTSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { + if (GetFileVersionInfo((LPTSTR)strFilename, 0, dwVersionDataLen, dlg->pVersionData)) { /* VC6 and MinGW headers use LPTSTR instead of LPCTSTR */ LPVOID pVal; UINT nValLen;

1 0

[gvg] 17890: Hopefully the last in a series of fixes for size of maximized windows
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Hopefully the last in a series of fixes for size of maximized windows Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c --- trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-16 20:13:26 UTC (rev 17889) +++ trunk/reactos/subsys/win32k/ntuser/winpos.c 2005-09-16 21:15:58 UTC (rev 17890) @@ -351,8 +351,8 @@ case SW_MAXIMIZE: { - co_WinPosGetMinMaxInfo(Window, NULL, &InternalPos->MaxPos, - NULL, &Size); + co_WinPosGetMinMaxInfo(Window, &Size, &InternalPos->MaxPos, + NULL, NULL); DPRINT("Maximize: %d,%d %dx%d\n", InternalPos->MaxPos.x, InternalPos->MaxPos.y, Size.x, Size.y); if (Window->Style & WS_MINIMIZE) @@ -420,25 +420,23 @@ IntGetDesktopWorkArea(Desktop, &WorkArea); /* Get default values. */ - Info->ptMaxSize.x = WorkArea.right - WorkArea.left; - Info->ptMaxSize.y = WorkArea.bottom - WorkArea.top; Info->ptMinTrackSize.x = UserGetSystemMetrics(SM_CXMINTRACK); Info->ptMinTrackSize.y = UserGetSystemMetrics(SM_CYMINTRACK); + + IntGetWindowBorderMeasures(Window, &XInc, &YInc); + Info->ptMaxSize.x = WorkArea.right - WorkArea.left + 2 * XInc; + Info->ptMaxSize.y = WorkArea.bottom - WorkArea.top + 2 * YInc; Info->ptMaxTrackSize.x = Info->ptMaxSize.x; Info->ptMaxTrackSize.y = Info->ptMaxSize.y; - IntGetWindowBorderMeasures(Window, &XInc, &YInc); - Info->ptMaxTrackSize.x += 2 * XInc; - Info->ptMaxTrackSize.y += 2 * YInc; - if (Window->InternalPos != NULL) { Info->ptMaxPosition = Window->InternalPos->MaxPos; } else { - Info->ptMaxPosition.x -= WorkArea.left + XInc; - Info->ptMaxPosition.y -= WorkArea.top + YInc; + Info->ptMaxPosition.x = WorkArea.left - XInc; + Info->ptMaxPosition.y = WorkArea.top - YInc; } }

1 0

[gvg] 17889: Bletch <npwoods@mess.org>
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Bletch <npwoods(a)mess.org> Partially implemented the treeview right-click menu on Regedit. Just supporting Expand and Collapse for now, and also started work on renaming keys. Modified: trunk/reactos/subsys/system/regedit/En.rc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/En.rc --- trunk/reactos/subsys/system/regedit/En.rc 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/En.rc 2005-09-16 20:13:26 UTC (rev 17889) @@ -123,6 +123,23 @@ MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE END END + POPUP "" + BEGIN + MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH + POPUP "&New" + BEGIN + MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Find", ID_EDIT_FIND, GRAYED + MENUITEM "&Delete", ID_TREE_DELETE + MENUITEM "&Rename", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME, GRAYED + END END @@ -314,6 +331,12 @@ IDS_INHERIT_SUBKEYSONLY "Subkeys only" END +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expand" + IDS_COLLAPSE "&Collapse" +END + /*****************************************************************/ _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -110,6 +110,16 @@ case ID_VIEW_REFRESH: /* TODO */ break; + case ID_TREE_EXPANDBRANCH: + TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_EXPAND); + break; + case ID_TREE_COLLAPSEBRANCH: + TreeView_Expand(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd), TVE_COLLAPSE); + break; + case ID_TREE_RENAME: + SetFocus(pChildWnd->hTreeWnd); + TreeView_EditLabel(pChildWnd->hTreeWnd, TreeView_GetSelection(pChildWnd->hTreeWnd)); + break; case ID_SWITCH_PANELS: pChildWnd->nFocusPanel = !pChildWnd->nFocusPanel; SetFocus(pChildWnd->nFocusPanel? pChildWnd->hListWnd: pChildWnd->hTreeWnd); @@ -296,6 +306,13 @@ case NM_SETFOCUS: pChildWnd->nFocusPanel = 0; break; + case TVN_ENDLABELEDIT: + { + TCHAR msg[32]; + _stprintf(msg, _T("rename to %s"), ((NMTVDISPINFO *) lParam)->item.pszText); + MessageBox(pChildWnd->hTreeWnd, msg, NULL, MB_OK); + } + break; default: return 0; } @@ -347,6 +364,45 @@ TrackPopupMenu(mnu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, hFrameWnd, NULL); } } + else if ((HWND)wParam == pChildWnd->hTreeWnd) + { + TVHITTESTINFO hti; + HMENU hContextMenu; + TVITEM item; + MENUITEMINFO mii; + TCHAR buffer[256]; + LPTSTR s; + + pt = MAKEPOINTS(lParam); + hti.pt.x = pt.x; + hti.pt.y = pt.y; + ScreenToClient(pChildWnd->hTreeWnd, &hti.pt); + TreeView_HitTest(pChildWnd->hTreeWnd, &hti); + + if ((hti.flags & TVHT_ONITEM) != 0) + { + hContextMenu = GetSubMenu(hPopupMenus, PM_TREECONTEXT); + TreeView_SelectItem(pChildWnd->hTreeWnd, hti.hItem); + + memset(&item, 0, sizeof(item)); + item.mask = TVIF_STATE | TVIF_CHILDREN; + item.hItem = hti.hItem; + TreeView_GetItem(pChildWnd->hTreeWnd, &item); + + LoadString(hInst, (item.state & TVIS_EXPANDED) ? IDS_COLLAPSE : IDS_EXPAND, buffer, sizeof(buffer) / sizeof(buffer[0])); + + memset(&mii, 0, sizeof(mii)); + mii.cbSize = sizeof(mii); + mii.fMask = MIIM_STRING | MIIM_STATE | MIIM_ID; + mii.fState = (item.cChildren > 0) ? MFS_DEFAULT : MFS_GRAYED; + mii.wID = (item.state & TVIS_EXPANDED) ? ID_TREE_COLLAPSEBRANCH : ID_TREE_EXPANDBRANCH; + s = buffer; + memcpy(&mii.dwTypeData, &s, sizeof(mii.dwTypeData)); /* arg MinGW */ + SetMenuItemInfo(hContextMenu, 0, TRUE, &mii); + + TrackPopupMenu(hContextMenu, TPM_RIGHTBUTTON, pt.x, pt.y, 0, pChildWnd->hWnd, NULL); + } + } break; } _____ Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -24,6 +24,7 @@ #include <stdlib.h> #include <stdio.h> #include <tchar.h> +#include <zmouse.h> #include "hexedit.h" _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/main.h 2005-09-16 20:13:26 UTC (rev 17889) @@ -35,6 +35,7 @@ #define PM_MODIFYVALUE 0 #define PM_NEW 1 +#define PM_TREECONTEXT 2 extern HINSTANCE hInst; _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-09-16 20:13:26 UTC (rev 17889) @@ -128,6 +128,8 @@ #define IDS_ERR_RENVAL_TOEMPTY 32857 #define ID_SWITCH_PANELS 32871 #define ID_EDIT_PERMISSIONS 32872 +#define ID_TREE_DELETE 32873 +#define ID_TREE_RENAME 32874 #define IDS_FLT_REGFILES 31001 #define IDS_FLT_REGFILES_FLT 31002 @@ -152,6 +154,8 @@ #define IDS_INHERIT_THISKEYONLY 31121 #define IDS_INHERIT_THISKEYANDSUBKEYS 31122 #define IDS_INHERIT_SUBKEYSONLY 31123 +#define IDS_EXPAND 31124 +#define IDS_COLLAPSE 31125 #define IDD_EDIT_STRING 2000 _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-09-16 19:47:44 UTC (rev 17888) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-09-16 20:13:26 UTC (rev 17889) @@ -273,7 +273,7 @@ /* Get the dimensions of the parent window's client area, and create the tree view control. */ GetClientRect(hwndParent, &rcClient); hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, - WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT, + WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, hwndParent, (HMENU)id, hInst, NULL); /* Initialize the image list, and add items to the control. */

1 0

[gvg] 17888: RegQueryValueExW retrieves Unicode strings but the size must be specified in
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

RegQueryValueExW retrieves Unicode strings but the size must be specified in bytes. Fixes bug 770. Modified: trunk/reactos/lib/comctl32/comctl32undoc.c _____ Modified: trunk/reactos/lib/comctl32/comctl32undoc.c --- trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-16 18:18:48 UTC (rev 17887) +++ trunk/reactos/lib/comctl32/comctl32undoc.c 2005-09-16 19:47:44 UTC (rev 17888) @@ -682,17 +682,17 @@ /* get values from key 'MRUList' */ if (newkey) { - datasize = mp->extview.nMaxItems + 1; + datasize = (mp->extview.nMaxItems + 1) * sizeof(WCHAR); if((err=RegQueryValueExW( newkey, strMRUList, 0, &type, (LPBYTE)mp->realMRU, &datasize))) { - /* not present - set size to 1 (will become 0 later) */ - datasize = 1; + /* not present - set size to 2 (will become 0 later) */ + datasize = 2; *mp->realMRU = 0; } TRACE("MRU list = %s, datasize = %ld\n", debugstr_w(mp->realMRU), datasize); - mp->cursize = datasize - 1; + mp->cursize = datasize / sizeof(WCHAR) - 1; /* datasize now has number of items in the MRUList */ /* get actual values for each entry */

1 0

[gvg] 17887: Do some boundschecking on iOrder. Fixes bug 770.
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Do some boundschecking on iOrder. Fixes bug 770. Modified: trunk/reactos/lib/comctl32/header.c _____ Modified: trunk/reactos/lib/comctl32/header.c --- trunk/reactos/lib/comctl32/header.c 2005-09-16 18:07:19 UTC (rev 17886) +++ trunk/reactos/lib/comctl32/header.c 2005-09-16 18:18:48 UTC (rev 17887) @@ -930,6 +930,10 @@ nItem = infoPtr->uNumItem; iOrder = (phdi->mask & HDI_ORDER) ? phdi->iOrder : nItem; + if (iOrder < 0) + iOrder = 0; + else if (infoPtr->uNumItem < iOrder) + iOrder = infoPtr->uNumItem; if (infoPtr->uNumItem == 0) { infoPtr->items = Alloc (sizeof (HEADER_ITEM));

1 0

[amunger] 17886: Fix release build of ntdll by adding __NO_CTYPE_INLINES to rtl.xml
by amunger＠svn.reactos.com 16 Sep '05

16 Sep '05

Fix release build of ntdll by adding __NO_CTYPE_INLINES to rtl.xml Modified: trunk/reactos/lib/rtl/rtl.xml _____ Modified: trunk/reactos/lib/rtl/rtl.xml --- trunk/reactos/lib/rtl/rtl.xml 2005-09-16 18:00:49 UTC (rev 17885) +++ trunk/reactos/lib/rtl/rtl.xml 2005-09-16 18:07:19 UTC (rev 17886) @@ -1,6 +1,7 @@ <module name="rtl" type="staticlibrary"> <define name="__USE_W32API" /> <define name="_NTOSKRNL_" /> + <define name="__NO_CTYPE_INLINES" /> <include base="rtl">.</include> <if property="ARCH" value="i386"> <directory name="i386">

1 0

[amunger] 17885: Fix release build of dflat32, initalizing some vars and fixing one typo.
by amunger＠svn.reactos.com 16 Sep '05

16 Sep '05

Fix release build of dflat32, initalizing some vars and fixing one typo. Modified: trunk/rosapps/dflat32/search.c Modified: trunk/rosapps/dflat32/watch.c _____ Modified: trunk/rosapps/dflat32/search.c --- trunk/rosapps/dflat32/search.c 2005-09-16 17:53:40 UTC (rev 17884) +++ trunk/rosapps/dflat32/search.c 2005-09-16 18:00:49 UTC (rev 17885) @@ -47,7 +47,8 @@ /* ------- search for the occurrance of a string ------- */ static void SearchTextBox(DFWINDOW wnd, int incr) { - char *s1 = NULL, *s2, *cp1; + char *s1 , *s2, *cp1; + s1 = s2 = cp1 = NULL; DF_DBOX *db = Replacing ? &ReplaceTextDB : &SearchTextDB; char *cp = DfGetEditBoxText(db, DF_ID_SEARCHFOR); BOOL rpl = TRUE, FoundOne = FALSE; _____ Modified: trunk/rosapps/dflat32/watch.c --- trunk/rosapps/dflat32/watch.c 2005-09-16 17:53:40 UTC (rev 17884) +++ trunk/rosapps/dflat32/watch.c 2005-09-16 18:00:49 UTC (rev 17885) @@ -44,7 +44,7 @@ // (DF_PARAM) &mx, (DF_PARAM) &my); mx = 0;//DF_SCREENWIDTH / 2; - mx = 0;//DF_SCREENHEIGHT / 2; + my = 0;//DF_SCREENHEIGHT / 2; wnd = DfDfCreateWindow( DF_BOX, NULL,

1 0

[gvg] 17884: Fix "var might be used uninitialized" warning
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Fix "var might be used uninitialized" warning Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-16 15:34:19 UTC (rev 17883) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-16 17:53:40 UTC (rev 17884) @@ -140,7 +140,7 @@ HANDLE hFile; DWORD dwNumWrite; LPWSTR pTemp; - LPVOID pConverted; + LPVOID pConverted = NULL; DWORD size; BYTE bom[3]; int iBomSize = 0;

1 0

[gvg] 17883: Only access dwTypeData if the caller pronounced it valid.
by gvg＠svn.reactos.com 16 Sep '05

16 Sep '05

Only access dwTypeData if the caller pronounced it valid. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-09-16 15:18:23 UTC (rev 17882) +++ trunk/reactos/lib/user32/windows/menu.c 2005-09-16 15:34:19 UTC (rev 17883) @@ -4646,7 +4646,10 @@ MENUITEMINFOW MenuItemInfoW; RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); - MenuItemInfoW.cch = wcslen(MenuItemInfoW.dwTypeData); + if (0 != (MenuItemInfoW.fMask & MIIM_STRING)) + { + MenuItemInfoW.cch = wcslen(MenuItemInfoW.dwTypeData); + } return NtUserMenuItemInfo(hMenu, uItem, fByPosition, (PROSMENUITEMINFO)&MenuItemInfoW, TRUE);

1 0

[hbirr] 17882: Free all messages in LpcpDeletePort.
by hbirr＠svn.reactos.com 16 Sep '05

16 Sep '05

Free all messages in LpcpDeletePort. Modified: trunk/reactos/ntoskrnl/lpc/close.c _____ Modified: trunk/reactos/ntoskrnl/lpc/close.c --- trunk/reactos/ntoskrnl/lpc/close.c 2005-09-16 15:18:07 UTC (rev 17881) +++ trunk/reactos/ntoskrnl/lpc/close.c 2005-09-16 15:18:23 UTC (rev 17882) @@ -87,9 +87,27 @@ VOID STDCALL LpcpDeletePort (PVOID ObjectBody) { - // PEPORT Port = (PEPORT)ObjectBody; + PLIST_ENTRY Entry; + PQUEUEDMESSAGE Message; - // DPRINT1("Deleting port %x\n", Port); + PEPORT Port = (PEPORT)ObjectBody; + + DPRINT("Deleting port %x\n", Port); + + /* Free all waiting messages */ + while (!IsListEmpty(&Port->QueueListHead)) + { + Entry = RemoveHeadList(&Port->QueueListHead); + Message = CONTAINING_RECORD (Entry, QUEUEDMESSAGE, QueueListEntry); + ExFreePool(Message); + } + + while (!IsListEmpty(&Port->ConnectQueueListHead)) + { + Entry = RemoveHeadList(&Port->ConnectQueueListHead); + Message = CONTAINING_RECORD (Entry, QUEUEDMESSAGE, QueueListEntry); + ExFreePool(Message); + } }

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
59
Older →

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 September 2005