Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 36663: Cecill Etheredge <ijsf@gmx.net> - The RtlEnumerateGenericTableWithoutSplaying function in RTL (generictable.c) effectively performs an endless enumeration, never advancing to the next successor element in the tree because of a bug in the code. Fix this. (Bug #3756). - The RtlDelete code misses a line of code checking whether the node is a root, and instead always returns NULL (assuming it is the root). Fix this. (Bug #3760). See issue #3760 for more details.
by fireball＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: fireball Date: Mon Oct 6 05:50:22 2008 New Revision: 36663 URL: http://svn.reactos.org/svn/reactos?rev=36663&view=rev Log: Cecill Etheredge <ijsf(a)gmx.net> - The RtlEnumerateGenericTableWithoutSplaying function in RTL (generictable.c) effectively performs an endless enumeration, never advancing to the next successor element in the tree because of a bug in the code. Fix this. (Bug #3756). - The RtlDelete code misses a line of code checking whether the node is a root, and instead always returns NULL (assuming it is the root). Fix this. (Bug #3760). See issue #3760 for more details. Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Mon Oct 6 05:50:22 2008 @@ -390,7 +390,7 @@ else { /* Otherwise, try using the real successor */ - FoundNode = RtlRealSuccessor(Table->TableRoot); + FoundNode = RtlRealSuccessor(*RestartKey); if (FoundNode) *RestartKey = FoundNode; } Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=36… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Mon Oct 6 05:50:22 2008 @@ -40,7 +40,7 @@ if (!(RtlLeftChild(N)) && !(RtlRightChild(N))) { /* If we are also the root, then the tree is gone */ - return NULL; + if (RtlIsRoot(N)) return NULL; /* Get our parent */ P = RtlParent(N);

1 0

[fireball] 36662: Dmitry Gorbachev - Specify a no-entrypoint for modules without one (otherwise ld sets entry point to a random function). See issue #3758 for more details.
by fireball＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: fireball Date: Mon Oct 6 05:36:33 2008 New Revision: 36662 URL: http://svn.reactos.org/svn/reactos?rev=36662&view=rev Log: Dmitry Gorbachev - Specify a no-entrypoint for modules without one (otherwise ld sets entry point to a random function). See issue #3758 for more details. Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild trunk/reactos/dll/directx/msdmo/msdmo.rbuild trunk/reactos/dll/directx/qedit/qedit.rbuild trunk/reactos/dll/nls/normaliz/normaliz.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ksproxy" type="win32dll" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true"> +<module name="ksproxy" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true"> <importlibrary definition="ksproxy.spec.def" /> <include base="ksproxy">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>ksproxy.rc</file> <file>ksproxy.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/directx/msdmo/msdmo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rb… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="msdmo" type="win32dll" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true"> +<module name="msdmo" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true"> <importlibrary definition="msdmo.spec.def" /> <include base="msdmo">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>msdmo.rc</file> <file>msdmo.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> +<module name="qedit" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> <importlibrary definition="qedit.spec.def" /> <include base="qedit">.</include> <define name="WINVER">0x600</define> @@ -13,4 +13,4 @@ <file>qedit.rc</file> <file>qedit.spec</file> </module> -</group> +</group> Modified: trunk/reactos/dll/nls/normaliz/normaliz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz/normaliz.… ============================================================================== --- trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/nls/normaliz/normaliz.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="normaliz" type="win32dll"> +<module name="normaliz" type="win32dll" entrypoint="0"> <library>kernel32</library> <importlibrary definition="normaliz.def" /> <file>dummy.c</file> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,4 +1,4 @@ -<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> +<module name="beepmidi" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll" unicode="yes"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> <library>ntdll</library> Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.rbui… ============================================================================== --- trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mmdrv/mmdrv.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,4 +1,4 @@ -<module name="mmdrv" type="win32dll" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> +<module name="mmdrv" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MMDRV}" installbase="system32" installname="mmdrv.dll" unicode="yes"> <importlibrary definition="mmdrv.spec.def" /> <include base="mmdrv">.</include> <define name="NDEBUG" /> Modified: trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rasapi3… ============================================================================== --- trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rasapi32/rasapi32.rbuild [iso-8859-1] Mon Oct 6 05:36:33 2008 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="rasapi32" type="win32dll" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true"> +<module name="rasapi32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_RASAPI32}" installbase="system32" installname="rasapi32.dll" allowwarnings="true"> <importlibrary definition="rasapi32.spec.def" /> <include base="rasapi32">.</include> <include base="ReactOS">include/reactos/wine</include>

1 0

[fireball] 36661: Dmitry Gorbachev - lfn_get() reads past the end of name[]. Though harmless, it produces 'array subscript is above array bounds' compiler warning (treated as error). See issue #3762 for more details.
by fireball＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: fireball Date: Mon Oct 6 05:19:55 2008 New Revision: 36661 URL: http://svn.reactos.org/svn/reactos?rev=36661&view=rev Log: Dmitry Gorbachev - lfn_get() reads past the end of name[]. Though harmless, it produces 'array subscript is above array bounds' compiler warning (treated as error). See issue #3762 for more details. Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c Modified: trunk/reactos/lib/fslib/vfatlib/check/lfn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/lf… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/check/lfn.c [iso-8859-1] Mon Oct 6 05:19:55 2008 @@ -410,8 +410,12 @@ } } - for (sum = 0, i = 0; i < 11; i++) + for (sum = 0, i = 0; i < 8; i++) sum = (((sum&1) << 7) | ((sum&0xfe) >> 1)) + de->name[i]; + + for (i = 0; i < 3; i++) + sum = (((sum&1) << 7) | ((sum&0xfe) >> 1)) + de->ext[i]; + if (sum != lfn_checksum) { /* checksum doesn't match, long name doesn't apply to this alias */ /* Causes: 1) alias renamed */

1 0

[fireball] 36660: Dmitry Gorbachev - Fix 'overflow in implicit constant conversion' warnings (treated as errors). See issue #3759 for more details.
by fireball＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: fireball Date: Mon Oct 6 05:12:26 2008 New Revision: 36660 URL: http://svn.reactos.org/svn/reactos?rev=36660&view=rev Log: Dmitry Gorbachev - Fix 'overflow in implicit constant conversion' warnings (treated as errors). See issue #3759 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Mon Oct 6 05:12:26 2008 @@ -44,7 +44,7 @@ #define endp_dir( enDP ) \ ( DEFAULT_ENDP( enDP )\ ? 0L\ - : ( ( enDP )->pusb_endp_desc->bEndpointAddress & USB_DIR_IN ) ) + : ( ( enDP )->pusb_endp_desc->bEndpointAddress & USB_DIR_IN ) ? 1 : 0 ) #define dev_set_state( pdEV, staTE ) \ ( pdEV->flags = ( ( pdEV )->flags & ( ~USB_DEV_STATE_MASK ) ) | ( staTE ) ) @@ -2010,7 +2010,7 @@ pipe_content->trans_type = USB_ENDPOINT_XFER_INT; // bit 0-1 pipe_content->speed_high = (pdev->flags & USB_DEV_FLAG_HIGH_SPEED) ? 1 : 0; // bit 5 pipe_content->speed_low = (pdev->flags & USB_DEV_FLAG_LOW_SPEED) ? 1 : 0; // bit 6 - pipe_content->trans_dir = endp_dir(purb->pendp) == USB_DIR_IN ? 1 : 0; // bit 7 + pipe_content->trans_dir = endp_dir(purb->pendp); // bit 7 pipe_content->dev_addr = pdev->dev_addr; // bit 8-14 pipe_content->endp_addr = endp_num(purb->pendp); // bit 15-18 pipe_content->data_toggle = 1; // bit 19 @@ -2216,7 +2216,7 @@ pipe_content->trans_type = USB_ENDPOINT_XFER_ISOC; // bit 0-1 pipe_content->speed_high = (pdev->flags & USB_DEV_FLAG_HIGH_SPEED) ? 1 : 0; // bit 5 pipe_content->speed_low = 0; // bit 6 - pipe_content->trans_dir = endp_dir(purb->pendp) == USB_DIR_IN ? 1 : 0; // bit 7 + pipe_content->trans_dir = endp_dir(purb->pendp); // bit 7 pipe_content->dev_addr = pdev->dev_addr; // bit 8-14 pipe_content->endp_addr = endp_num(purb->pendp); // bit 15-18 pipe_content->data_toggle = 0; // bit 19

1 0

[cgutman] 36659: - Add NDIS_OBJECT_HEADER and NDIS_GENERIC_OBJECT (NDIS 6.0)
by cgutman＠svn.reactos.org 06 Oct '08

06 Oct '08

Author: cgutman Date: Sun Oct 5 20:40:07 2008 New Revision: 36659 URL: http://svn.reactos.org/svn/reactos?rev=36659&view=rev Log: - Add NDIS_OBJECT_HEADER and NDIS_GENERIC_OBJECT (NDIS 6.0) Modified: branches/aicom-network-fixes/include/ddk/ndis.h Modified: branches/aicom-network-fixes/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/include/ddk… ============================================================================== --- branches/aicom-network-fixes/include/ddk/ndis.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/include/ddk/ndis.h [iso-8859-1] Sun Oct 5 20:40:07 2008 @@ -841,6 +841,19 @@ typedef struct _NDIS_PACKET_EXTENSION { PVOID NdisPacketInfo[MaxPerPacketInfo]; } NDIS_PACKET_EXTENSION, *PNDIS_PACKET_EXTENSION; + +typedef struct _NDIS_OBJECT_HEADER { + UCHAR Type; + UCHAR Revision; + USHORT Size; +} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; + +typedef struct _NDIS_GENERIC_OBJECT { + NDIS_OBJECT_HEADER Header; + PVOID Caller; + PVOID CallersCaller; + PDRIVER_OBJECT DriverObject; +} NDIS_GENERIC_OBJECT, *PNDIS_GENERIC_OBJECT; /* * PNDIS_PACKET

1 0

[gedmurphy] 36658: Remove the address and command windows from the bottom of the file browser. They're buggy and they're not too pretty
by gedmurphy＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: gedmurphy Date: Sun Oct 5 16:21:04 2008 New Revision: 36658 URL: http://svn.reactos.org/svn/reactos?rev=36658&view=rev Log: Remove the address and command windows from the bottom of the file browser. They're buggy and they're not too pretty Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp trunk/reactos/base/shell/explorer/shell/mainframe.h Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Sun Oct 5 16:21:04 2008 @@ -190,22 +190,6 @@ WindowCanvas canvas(hwnd); RECT rect = {0, 0, 0, 0}; DrawText(canvas, TEXT("My"), -1, &rect, DT_SINGLELINE|DT_NOPREFIX|DT_CALCRECT); - HFONT hfont = GetStockFont(DEFAULT_GUI_FONT); - - _haddressedit = CreateWindow(TEXT("EDIT"), NULL, WS_CHILD|WS_VISIBLE, 0, 0, 0, rect.bottom, - hwnd, (HMENU)IDW_ADDRESSBAR, g_Globals._hInstance, 0); - SetWindowFont(_haddressedit, hfont, FALSE); - new EditController(_haddressedit); - - _hcommandedit = CreateWindow(TEXT("EDIT"), TEXT("> "), WS_CHILD|WS_VISIBLE, 0, 0, 0, rect.bottom, - hwnd, (HMENU)IDW_COMMANDBAR, g_Globals._hInstance, 0); - SetWindowFont(_hcommandedit, hfont, FALSE); - new EditController(_hcommandedit); - - /* CreateStatusWindow does not accept WS_BORDER - _hstatusbar = CreateWindowEx(WS_EX_NOPARENTNOTIFY, STATUSCLASSNAME, 0, - WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_BORDER|CCS_NODIVIDER, 0,0,0,0, - hwnd, (HMENU)IDW_STATUSBAR, g_Globals._hInstance, 0);*/ _hstatusbar = CreateStatusWindow(WS_CHILD|WS_VISIBLE, 0, hwnd, IDW_STATUSBAR); CheckMenuItem(_menu_info._hMenuView, ID_VIEW_STATUSBAR, MF_BYCOMMAND|MF_CHECKED); @@ -336,10 +320,6 @@ SendMessage(_hstatusbar, SB_SETTEXT, 0, lparam); break; - case PM_URL_CHANGED: - SetWindowText(_haddressedit, (LPCTSTR)lparam); - break; - default: return false; } @@ -419,59 +399,12 @@ launch_file(_hwnd, TEXT("http://www.sky.franken.de/explorer/"), SW_SHOW); break; - case IDW_ADDRESSBAR: - if (code == 1) { - TCHAR url[BUFFER_LEN]; - - if (GetWindowText(_haddressedit, url, BUFFER_LEN)) - go_to(url, false); - } - break; - - case IDW_COMMANDBAR: - if (code == 1) - ExecuteCommandbar(NULL); - break; - default: return 1; // no command handlers in Window::Command() } return 0; } - - -void MainFrameBase::ExecuteCommandbar(LPCTSTR dir) -{ - TCHAR cmd[BUFFER_LEN]; - - if (GetWindowText(_hcommandedit, cmd, BUFFER_LEN)) { - CONTEXT("ExecuteCommandbar - ShellExecute()"); - - // remove command prompt from 'cmd' string - LPCTSTR p = cmd; - - if (*p == '>') - ++p; - - while(*p == ' ') - ++p; - - if (dir) { - // remove "file://" from directory URL - if (!_tcsnicmp(dir, TEXT("file://"), 7)) - dir += 7; - } - - ///@todo use SHGetFileInfo() with SHGFI_EXETYPE flag to determine EXE type and open console window - - HINSTANCE hinst = ShellExecute(_hwnd, NULL, p, NULL, dir, SW_SHOWNORMAL); - - if ((int)hinst <= 32) - display_error(_hwnd, GetLastError()); - } -} - int MainFrameBase::Notify(int id, NMHDR* pnmh) { @@ -555,15 +488,6 @@ SendMessage(_hstatusbar, SB_SETPARTS, 2, (LPARAM)&parts); ClientRect rt(_hstatusbar); rect.bottom -= rt.bottom; - } - - if (IsWindowVisible(_haddressedit) || IsWindowVisible(_hcommandedit)) { - ClientRect rt(_haddressedit); - rect.bottom -= rt.bottom; - - int mid = (rect.right-rect.left) / 2; ///@todo use split bar - SetWindowPos(_haddressedit, 0, 0, rect.bottom, mid, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - SetWindowPos(_hcommandedit, 0, mid+1, rect.bottom, rect.right-(mid+1), rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); } if (IsWindowVisible(_hsidebar)) { @@ -1172,20 +1096,6 @@ MainFrameBase::Create(ExplorerCmd()); break; - case IDW_COMMANDBAR: - if (code == 1) { - TCHAR url[BUFFER_LEN]; - LPCTSTR dir; - - if (GetWindowText(_haddressedit, url, BUFFER_LEN)) - dir = url; - else - dir = NULL; - - ExecuteCommandbar(dir); - } - break; - ///@todo There are even more menu items! default: @@ -1258,15 +1168,6 @@ SendMessage(_hstatusbar, SB_SETPARTS, 2, (LPARAM)&parts); ClientRect rt(_hstatusbar); rect.bottom -= rt.bottom; - } - - if (IsWindowVisible(_haddressedit) || IsWindowVisible(_hcommandedit)) { - ClientRect rt(_haddressedit); - rect.bottom -= rt.bottom; - - int mid = (rect.right-rect.left) / 2; ///@todo use split bar - SetWindowPos(_haddressedit, 0, 0, rect.bottom, mid, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - SetWindowPos(_hcommandedit, 0, mid+1, rect.bottom, rect.right-(mid+1), rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); } if (IsWindowVisible(_hsidebar)) { @@ -1559,11 +1460,6 @@ MainFrameBase::Create(ExplorerCmd(_url, true)); break; - case IDW_COMMANDBAR: - if (code == 1) - ExecuteCommandbar(_url); - break; - default: return super::Command(id, code); } @@ -1600,15 +1496,6 @@ rect.bottom -= rt.bottom; } - if (IsWindowVisible(_haddressedit) || IsWindowVisible(_hcommandedit)) { - ClientRect rt(_haddressedit); - rect.bottom -= rt.bottom; - - int mid = (rect.right-rect.left) / 2; ///@todo use split bar - SetWindowPos(_haddressedit, 0, 0, rect.bottom, mid, rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - SetWindowPos(_hcommandedit, 0, mid+1, rect.bottom, rect.right-(mid+1), rt.bottom, SWP_NOACTIVATE|SWP_NOZORDER); - } - if (IsWindowVisible(_hsidebar)) { WindowRect rt(_hsidebar); rect.left += rt.right-rt.left; @@ -1698,28 +1585,6 @@ // set size of new created shell view windows resize_children(); - - TCHAR path[MAX_PATH]; - - if (entry->get_path(path, COUNTOF(path))) { - String url; - - if (path[0] == ':') - url.printf(TEXT("shell://%s"), path); - else - url.printf(TEXT("file://%s"), path); - - set_url(url); - } -} - -void SDIMainFrame::set_url(LPCTSTR url) -{ - if (_url != url) { - _url = url; - - SetWindowText(_haddressedit, url); //SendMessage(_hwndFrame, PM_URL_CHANGED, 0, (LPARAM)url); - } } void SDIMainFrame::jump_to(LPCTSTR path, int mode) Modified: trunk/reactos/base/shell/explorer/shell/mainframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.h [iso-8859-1] Sun Oct 5 16:21:04 2008 @@ -53,9 +53,6 @@ WindowHandle _htoolbar; WindowHandle _hstatusbar; - WindowHandle _haddressedit; - WindowHandle _hcommandedit; - WindowHandle _hsidebar; HIMAGELIST _himl; @@ -88,8 +85,6 @@ void FillBookmarks(); virtual bool go_to(LPCTSTR url, bool new_window); - - void ExecuteCommandbar(LPCTSTR dir); }; @@ -181,6 +176,4 @@ // interface BrowserCallback virtual void entry_selected(Entry* entry); - - void set_url(LPCTSTR url); };

1 0

[gedmurphy] 36657: Set the start button as the owner of the root start menu. Fix the position of the root start menu
by gedmurphy＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: gedmurphy Date: Sun Oct 5 08:33:41 2008 New Revision: 36657 URL: http://svn.reactos.org/svn/reactos?rev=36657&view=rev Log: Set the start button as the owner of the root start menu. Fix the position of the root start menu Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp trunk/reactos/base/shell/explorer/taskbar/startmenu.h Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun Oct 5 08:33:41 2008 @@ -169,7 +169,8 @@ RegisterHotkeys(); // prepare Startmenu, but hide it for now - _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwnd, STARTMENUROOT_ICON_SIZE)); + _startMenuRoot = GET_WINDOW(StartMenuRoot, StartMenuRoot::Create(_hwndStartButton, STARTMENUROOT_ICON_SIZE)); + _startMenuRoot->_hwndParent = _hwndStartButton; return 0; } Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.cpp [iso-8859-1] Sun Oct 5 08:33:41 2008 @@ -1606,8 +1606,6 @@ #ifndef _LIGHT_STARTMENU rect.top += STARTMENU_LINE_HEIGHT(icon_size); #endif - - AdjustWindowRectEx(&rect, WS_POPUP|WS_THICKFRAME|WS_CLIPCHILDREN|WS_VISIBLE, FALSE, 0); } HWND StartMenuRoot::Create(HWND hwndOwner, int icon_size) @@ -1639,7 +1637,7 @@ // recalculate start menu root position RECT rect; - CalculateStartPos(GetParent(hwnd), rect, _icon_size); + CalculateStartPos(_hwndParent, rect, _icon_size); SetWindowPos(hwnd, 0, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, 0); Modified: trunk/reactos/base/shell/explorer/taskbar/startmenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/startmenu.h [iso-8859-1] Sun Oct 5 08:33:41 2008 @@ -366,7 +366,7 @@ typedef StartMenuHandler super; StartMenuRoot(HWND hwnd, const StartMenuRootCreateInfo& info); - + HWND _hwndParent; static HWND Create(HWND hwndDesktopBar, int icon_size); void TrackStartmenu();

1 0

[cgutman] 36656: - Don't link to the putty installer since it is broken currently
by cgutman＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: cgutman Date: Sun Oct 5 07:45:32 2008 New Revision: 36656 URL: http://svn.reactos.org/svn/reactos?rev=36656&view=rev Log: - Don't link to the putty installer since it is broken currently Modified: branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_7/rosapps/applic… ============================================================================== --- branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_7/rosapps/applications/downloader/downloader.xml [iso-8859-1] Sun Oct 5 07:45:32 2008 @@ -74,7 +74,7 @@ <licence>MIT</licence> <version>0.60</version> <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location> + <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe</location> </application> </category> <category name="Office" icon="2">

1 0

[jimtabor] 36655: - Move DC_UpdateXforms out of the switch in SetMapMode. It does not effect anything.
by jimtabor＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: jimtabor Date: Sun Oct 5 07:23:46 2008 New Revision: 36655 URL: http://svn.reactos.org/svn/reactos?rev=36655&view=rev Log: - Move DC_UpdateXforms out of the switch in SetMapMode. It does not effect anything. Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Sun Oct 5 07:23:46 2008 @@ -715,9 +715,8 @@ default: Dc_Attr->iMapMode = PrevMapMode; PrevMapMode = 0; - + } DC_UpdateXforms(dc); - } return PrevMapMode; }

1 0

[sginsberg] 36654: - Implement ExEnterCriticalRegionAndAcquireResourceShared and ExEnterCriticalRegionAndAcquireSharedWaitForExclusive - Add missing prototypes to the NDK
by sginsberg＠svn.reactos.org 05 Oct '08

05 Oct '08

Author: sginsberg Date: Sun Oct 5 07:21:55 2008 New Revision: 36654 URL: http://svn.reactos.org/svn/reactos?rev=36654&view=rev Log: - Implement ExEnterCriticalRegionAndAcquireResourceShared and ExEnterCriticalRegionAndAcquireSharedWaitForExclusive - Add missing prototypes to the NDK Modified: branches/nwin32/include/ndk/exfuncs.h branches/nwin32/ntoskrnl/ex/resource.c (contents, props changed) branches/nwin32/ntoskrnl/ntoskrnl_i386.def Modified: branches/nwin32/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/nwin32/include/ndk/exfuncs.h?re… ============================================================================== --- branches/nwin32/include/ndk/exfuncs.h [iso-8859-1] (original) +++ branches/nwin32/include/ndk/exfuncs.h [iso-8859-1] Sun Oct 5 07:21:55 2008 @@ -111,6 +111,34 @@ IN PEX_ENUM_HANDLE_CALLBACK EnumHandleProcedure, IN OUT PVOID Context, OUT PHANDLE Handle OPTIONAL +); + +// +// Resource Functions +// + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceExclusive( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared( + IN PERESOURCE Resource +); + +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive( + IN PERESOURCE Resource +); + +VOID +FASTCALL +ExReleaseResourceAndLeaveCriticalRegion( + IN PERESOURCE Resource ); #endif Modified: branches/nwin32/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/branches/nwin32/ntoskrnl/ex/resource.c?r… ============================================================================== --- branches/nwin32/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ branches/nwin32/ntoskrnl/ex/resource.c [iso-8859-1] Sun Oct 5 07:21:55 2008 @@ -2179,10 +2179,10 @@ /*++ * @name ExEnterCriticalRegionAndAcquireResourceExclusive - * @implemented NT5.1 - * - * The ExEnterCriticalRegionAndAcquireResourceExclusive enters a critical - * region and then exclusively acquires a resource. + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireResourceExclusive routine + * enters a critical region and then exclusively acquires a resource. * * @param Resource * Pointer to the resource to acquire. @@ -2207,11 +2207,71 @@ } /*++ + * @name ExEnterCriticalRegionAndAcquireResourceShared + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireResourceShared routine + * enters a critical region and then acquires a resource shared. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireResourceSharedLite. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireResourceShared(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireResourceSharedLite(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + +/*++ + * @name ExEnterCriticalRegionAndAcquireSharedWaitForExclusive + * @implemented NT5.2 + * + * The ExEnterCriticalRegionAndAcquireSharedWaitForExclusive routine + * enters a critical region and then acquires a resource shared if + * shared access can be granted and there are no exclusive waiters. + * It then acquires the resource exclusively. + * + * @param Resource + * Pointer to the resource to acquire. + * + * @return Pointer to the Win32K thread pointer of the current thread. + * + * @remarks See ExAcquireSharedWaitForExclusive. + * + *--*/ +PVOID +NTAPI +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive(IN PERESOURCE Resource) +{ + /* Enter critical region */ + KeEnterCriticalRegion(); + + /* Acquire the resource */ + ExAcquireSharedWaitForExclusive(Resource, TRUE); + + /* Return the Win32 Thread */ + return KeGetCurrentThread()->Win32Thread; +} + +/*++ * @name ExReleaseResourceAndLeaveCriticalRegion - * @implemented NT5.1 - * - * The ExReleaseResourceAndLeaveCriticalRegion release a resource and - * then leaves a critical region. + * @implemented NT5.2 + * + * The ExReleaseResourceAndLeaveCriticalRegion routine releases a resource + * and then leaves a critical region. * * @param Resource * Pointer to the resource to release. Propchange: branches/nwin32/ntoskrnl/ex/resource.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: branches/nwin32/ntoskrnl/ntoskrnl_i386.def URL: http://svn.reactos.org/svn/reactos/branches/nwin32/ntoskrnl/ntoskrnl_i386.d… ============================================================================== --- branches/nwin32/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] (original) +++ branches/nwin32/ntoskrnl/ntoskrnl_i386.def [iso-8859-1] Sun Oct 5 07:21:55 2008 @@ -83,8 +83,8 @@ ExDisableResourceBoostLite@4 @ExEnterCriticalRegionAndAcquireFastMutexUnsafe@4 ExEnterCriticalRegionAndAcquireResourceExclusive@4 -;ExEnterCriticalRegionAndAcquireResourceShared -;ExEnterCriticalRegionAndAcquireSharedWaitForExclusive +ExEnterCriticalRegionAndAcquireResourceShared@4 +ExEnterCriticalRegionAndAcquireSharedWaitForExclusive@4 ExEnumHandleTable@16 ExEventObjectType=_ExEventObjectType ExExtendZone@12

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