Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[cwittich] 62222: [ws2_32_new] always return "WinSock 2.0" as windows does (verified on windows 8) fix a typo
by cwittich＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: cwittich Date: Sun Feb 16 21:20:51 2014 New Revision: 62222 URL: http://svn.reactos.org/svn/reactos?rev=62222&view=rev Log: [ws2_32_new] always return "WinSock 2.0" as windows does (verified on windows 8) fix a typo Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c trunk/reactos/dll/win32/ws2_32_new/src/startup.c Modified: trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/d… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/dllmain.c [iso-8859-1] Sun Feb 16 21:20:51 2014 @@ -44,13 +44,13 @@ /* TLS Allocation */ if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) - { - GlobalTlsIndex = TlsAlloc(); - if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) - { - return FALSE; - } - } + { + GlobalTlsIndex = TlsAlloc(); + if (GlobalTlsIndex == TLS_OUT_OF_INDEXES) + { + return FALSE; + } + } /* Initialize some critical sections */ WsCreateStartupSynchronization(); Modified: trunk/reactos/dll/win32/ws2_32_new/src/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/s… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/startup.c [iso-8859-1] Sun Feb 16 21:20:51 2014 @@ -165,7 +165,7 @@ /* We support Winsock 2.2 */ lpWSAData->wHighVersion = MAKEWORD(2,2); - lstrcpy(lpWSAData->szDescription, "WinSock 2.2"); + lstrcpy(lpWSAData->szDescription, "WinSock 2.0"); lstrcpy(lpWSAData->szSystemStatus, "Running"); /* @@ -183,7 +183,7 @@ lpWSAData->iMaxUdpDg = 0; } - /* Enter the startup syncronization lock */ + /* Enter the startup synchronization lock */ WsStartupLock(); /* Now setup all our objects */

1 0

[akhaldi] 62221: [CMAKE] * Correctly sort the ntdll folder.
by akhaldi＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: akhaldi Date: Sun Feb 16 21:06:31 2014 New Revision: 62221 URL: http://svn.reactos.org/svn/reactos?rev=62221&view=rev Log: [CMAKE] * Correctly sort the ntdll folder. Modified: trunk/reactos/dll/CMakeLists.txt Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=622… ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Sun Feb 16 21:06:31 2014 @@ -3,7 +3,7 @@ add_subdirectory(cpl) add_subdirectory(directx) add_subdirectory(keyboard) +add_subdirectory(ntdll) add_subdirectory(opengl) -add_subdirectory(ntdll) add_subdirectory(shellext) add_subdirectory(win32)

1 0

[tkreuzer] 62220: [FDC] Silence some debug prints
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 16:23:18 2014 New Revision: 62220 URL: http://svn.reactos.org/svn/reactos?rev=62220&view=rev Log: [FDC] Silence some debug prints Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] Sun Feb 16 16:23:18 2014 @@ -30,7 +30,7 @@ PDEVICE_OBJECT Fdo = NULL; NTSTATUS Status; - DPRINT1("FdcAddDevice()\n"); + DPRINT("FdcAddDevice()\n"); ASSERT(DriverObject); ASSERT(Pdo); @@ -87,7 +87,7 @@ FdcCreate(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcCreate()\n"); + DPRINT("FdcCreate()\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -104,7 +104,7 @@ FdcClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcClose()\n"); + DPRINT("FdcClose()\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -123,7 +123,7 @@ { PCOMMON_DEVICE_EXTENSION Common = DeviceObject->DeviceExtension; - DPRINT1("FdcPnP()\n"); + DPRINT("FdcPnP()\n"); if (Common->IsFDO) { return FdcFdoPnp(DeviceObject, @@ -143,7 +143,7 @@ FdcPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT1("FdcPower()\n"); + DPRINT("FdcPower()\n"); return STATUS_UNSUCCESSFUL; } @@ -153,7 +153,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DPRINT1("FDC: DriverEntry()\n"); + DPRINT("FDC: DriverEntry()\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = FdcCreate; DriverObject->MajorFunction[IRP_MJ_CLOSE] = FdcClose;

1 0

[tkreuzer] 62219: [BASEADDRESSES] Partly revert 62119 to see whether that fixes the hybrid builder
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 14:57:36 2014 New Revision: 62219 URL: http://svn.reactos.org/svn/reactos?rev=62219&view=rev Log: [BASEADDRESSES] Partly revert 62119 to see whether that fixes the hybrid builder Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Sun Feb 16 14:57:36 2014 @@ -1,9 +1,9 @@ set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x7c800000) # matches w2k3 FRE/CHK @ 0x7c800000 -set(baseaddress_user32 0x77e20000) # not relocatable, avoid conflicts with win -set(baseaddress_gdi32 0x77d80000) -set(baseaddress_advapi32 0x77c80000) -set(baseaddress_msvcrt 0x77b80000) +set(baseaddress_kernel32 0x77d80000) +set(baseaddress_msvcrt 0x77cd0000) +set(baseaddress_advapi32 0x77c20000) +set(baseaddress_gdi32 0x77bb0000) +set(baseaddress_user32 0x77a20000) set(baseaddress_dhcpcsvc 0x779d0000) set(baseaddress_dnsapi 0x77980000) set(baseaddress_icmp 0x77950000)

1 0

[tkreuzer] 62218: [TDI] Add stubs for TdiRegisterPnPHandlers and TdiDeregisterPnPHandlers
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 13:59:16 2014 New Revision: 62218 URL: http://svn.reactos.org/svn/reactos?rev=62218&view=rev Log: [TDI] Add stubs for TdiRegisterPnPHandlers and TdiDeregisterPnPHandlers Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec trunk/reactos/drivers/network/tdi/tdi/handler.c Modified: trunk/reactos/drivers/network/tdi/misc/tdi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/misc/t… ============================================================================== --- trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/misc/tdi.spec [iso-8859-1] Sun Feb 16 13:59:16 2014 @@ -27,6 +27,7 @@ @ stdcall TdiDeregisterDeviceObject(ptr) @ stdcall TdiDeregisterNetAddress(ptr) @ stdcall TdiDeregisterNotificationHandler(ptr) + @ stdcall TdiDeregisterPnPHandlers(ptr) @ stdcall TdiInitialize() @ stdcall TdiMapBuffer(ptr) @ stdcall TdiMapUserRequest(ptr ptr ptr) @@ -35,5 +36,6 @@ @ stdcall TdiRegisterDeviceObject(long long) @ stdcall TdiRegisterNetAddress(long ptr ptr ptr) @ stdcall TdiRegisterNotificationHandler(long long long) + @ stdcall TdiRegisterPnPHandlers(ptr long ptr) @ stdcall TdiReturnChainedReceives(ptr long) @ stdcall TdiUnmapBuffer(ptr) Modified: trunk/reactos/drivers/network/tdi/tdi/handler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tdi/tdi/ha… ============================================================================== --- trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tdi/tdi/handler.c [iso-8859-1] Sun Feb 16 13:59:16 2014 @@ -3,6 +3,9 @@ */ #include "precomp.h" + +#define NDEBUG +#include <debug.h> /* * ClientEventChainedReceiveDatagram @@ -24,6 +27,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -45,6 +49,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -66,6 +71,7 @@ IN PVOID TsduDescriptor ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -89,6 +95,7 @@ OUT PIRP * AcceptIrp ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -110,6 +117,7 @@ IN ULONG DisconnectFlags ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -126,6 +134,7 @@ IN NTSTATUS Status ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -151,6 +160,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -173,6 +183,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -195,6 +206,7 @@ OUT PIRP * IoRequestPacket ) { + UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } @@ -212,7 +224,28 @@ IN ULONG BytesAvailable ) { - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +TdiRegisterPnPHandlers( + _In_ PTDI_CLIENT_INTERFACE_INFO ClientInterfaceInfo, + _In_ ULONG InterfaceInfoSize, + _Out_ HANDLE *BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +TdiDeregisterPnPHandlers( + _In_ HANDLE BindingHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */

1 0

[tkreuzer] 62217: [NTOSKRNL] Improve MiRemoveMappedPtes to be able to unmap session mapped views.
by tkreuzer＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: tkreuzer Date: Sun Feb 16 13:56:36 2014 New Revision: 62217 URL: http://svn.reactos.org/svn/reactos?rev=62217&view=rev Log: [NTOSKRNL] Improve MiRemoveMappedPtes to be able to unmap session mapped views. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Feb 16 13:56:36 2014 @@ -2118,12 +2118,14 @@ IN PCONTROL_AREA ControlArea, IN PMMSUPPORT Ws) { - PMMPTE PointerPte;//, FirstPte; + PMMPTE PointerPte, ProtoPte;//, FirstPte; PMMPDE PointerPde, SystemMapPde; PMMPFN Pfn1, Pfn2; MMPTE PteContents; KIRQL OldIrql; DPRINT("Removing mapped view at: 0x%p\n", BaseAddress); + + ASSERT(Ws == NULL); /* Get the PTE and loop each one */ PointerPte = MiAddressToPte(BaseAddress); @@ -2175,8 +2177,15 @@ /* Windows ASSERT */ ASSERT((PteContents.u.Long == 0) || (PteContents.u.Soft.Prototype == 1)); - /* But not handled in ARM3 */ - ASSERT(PteContents.u.Soft.Prototype == 0); + /* Check if this is a prototype pointer PTE */ + if (PteContents.u.Soft.Prototype == 1) + { + /* Get the prototype PTE */ + ProtoPte = MiProtoPteToPte(&PteContents); + + /* We don't support anything else atm */ + ASSERT(ProtoPte->u.Long == 0); + } } /* Make the PTE into a zero PTE */

1 0

[ekohl] 62216: [INF] Fix broken string. I hate this Crimmson Editor "feature".
by ekohl＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: ekohl Date: Sun Feb 16 12:53:56 2014 New Revision: 62216 URL: http://svn.reactos.org/svn/reactos?rev=62216&view=rev Log: [INF] Fix broken string. I hate this Crimmson Editor "feature". Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 62215: [INF] Make the type of the strings in the Parameters section Windows XP compatible. This fixes the kernel32 environ winetest.
by ekohl＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: ekohl Date: Sun Feb 16 12:49:07 2014 New Revision: 62215 URL: http://svn.reactos.org/svn/reactos?rev=62215&view=rev Log: [INF] Make the type of the strings in the Parameters section Windows XP compatible. This fixes the kernel32 environ winetest. Modified: trunk/reactos/media/inf/nettcpip.inf Modified: trunk/reactos/media/inf/nettcpip.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/nettcpip.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[dquintana] 62214: [RSHELL] * CMenuBand: Bring the style closer to a menu.
by dquintana＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: dquintana Date: Sun Feb 16 12:48:41 2014 New Revision: 62214 URL: http://svn.reactos.org/svn/reactos?rev=62214&view=rev Log: [RSHELL] * CMenuBand: Bring the style closer to a menu. Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.cpp [iso-8859-1] Sun Feb 16 12:48:41 2014 @@ -823,9 +823,9 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags) { LONG tbStyles = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | - TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | TBSTYLE_CUSTOMERASE | + TBSTYLE_TOOLTIPS | TBSTYLE_TRANSPARENT | TBSTYLE_REGISTERDROP | TBSTYLE_LIST | TBSTYLE_FLAT | CCS_NODIVIDER | CCS_NOPARENTALIGN | CCS_NORESIZE | CCS_TOP; - LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER; + LONG tbExStyles = TBSTYLE_EX_DOUBLEBUFFER | TBSTYLE_EX_DRAWDDARROWS; if (dwFlags & SMINIT_VERTICAL) { @@ -949,7 +949,7 @@ MENUITEMINFOW info; TBBUTTON tbb = { 0 }; tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = BTNS_AUTOSIZE; + tbb.fsStyle = 0; info.cbSize = sizeof(info); info.fMask = MIIM_FTYPE | MIIM_ID; @@ -1002,7 +1002,7 @@ PWSTR MenuString; tbb.fsState = TBSTATE_ENABLED; - tbb.fsStyle = BTNS_DROPDOWN | BTNS_AUTOSIZE; + tbb.fsStyle = 0; IEnumIDList * eidl; m_shellFolder->EnumObjects(m_hwnd, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, &eidl); @@ -1283,18 +1283,28 @@ int sy = max(prc->bottom - prc->top, sizeStaticY.cy + sizeShlFldY.cy); - if (hwndShlFld) SetWindowPos(hwndShlFld, NULL, - prc->left, - prc->top, - prc->right - prc->left, - sizeShlFldY.cy, - 0); - if (hwndStatic) SetWindowPos(hwndStatic, hwndShlFld, - prc->left, - prc->top + sizeShlFldY.cy, - prc->right - prc->left, - sy - sizeShlFldY.cy, - 0); + if (hwndShlFld) + { + SetWindowPos(hwndShlFld, NULL, + prc->left, + prc->top, + prc->right - prc->left, + sizeShlFldY.cy, + 0); + DWORD btnSize = SendMessage(hwndShlFld, TB_GETBUTTONSIZE, 0, 0); + SendMessage(hwndShlFld, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); + } + if (hwndStatic) + { + SetWindowPos(hwndStatic, hwndShlFld, + prc->left, + prc->top + sizeShlFldY.cy, + prc->right - prc->left, + sy - sizeShlFldY.cy, + 0); + DWORD btnSize = SendMessage(hwndStatic, TB_GETBUTTONSIZE, 0, 0); + SendMessage(hwndStatic, TB_SETBUTTONSIZE, 0, MAKELPARAM(prc->right - prc->left, HIWORD(btnSize))); + } return S_OK; } @@ -1604,14 +1614,81 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - UNIMPLEMENTED; - return S_OK; + *theResult = 0; + if (uMsg == WM_NOTIFY) + { + NMHDR * hdr = (LPNMHDR) lParam; + NMTBCUSTOMDRAW * cdraw; + switch (hdr->code) + { + case NM_CUSTOMDRAW: + cdraw = (LPNMTBCUSTOMDRAW) hdr; + switch (cdraw->nmcd.dwDrawStage) + { + case CDDS_PREPAINT: + *theResult = CDRF_NOTIFYITEMDRAW; + return S_OK; + + case CDDS_ITEMPREPAINT: + + cdraw->clrBtnFace = GetSysColor(COLOR_MENU); + cdraw->clrBtnHighlight = GetSysColor(COLOR_MENUHILIGHT); + + cdraw->clrText = GetSysColor(COLOR_MENUTEXT); + cdraw->clrTextHighlight = GetSysColor(COLOR_HIGHLIGHTTEXT); + cdraw->clrHighlightHotTrack = GetSysColor(COLOR_HIGHLIGHTTEXT); + + RECT rc = cdraw->nmcd.rc; + HDC hdc = cdraw->nmcd.hdc; + + HBRUSH bgBrush = GetSysColorBrush(COLOR_MENU); + HBRUSH hotBrush = GetSysColorBrush(COLOR_MENUHILIGHT); + + switch (cdraw->nmcd.uItemState) + { + case CDIS_HOT: + case CDIS_FOCUS: + FillRect(hdc, &rc, hotBrush); + break; + default: + FillRect(hdc, &rc, bgBrush); + break; + } + + *theResult = TBCDRF_NOBACKGROUND | TBCDRF_NOEDGES | TBCDRF_NOETCHEDEFFECT | TBCDRF_HILITEHOTTRACK; + return S_OK; + } + return S_OK; + } + return S_OK; + + } + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) { - UNIMPLEMENTED; - return S_OK; + HWND hwndStatic = NULL; + HWND hwndShlFld = NULL; + HRESULT hr; + + if (m_staticToolbar != NULL) + hr = m_staticToolbar->GetWindow(&hwndStatic); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndStatic) + return S_OK; + + if (m_SFToolbar != NULL) + hr = m_SFToolbar->GetWindow(&hwndShlFld); + if (FAILED(hr)) + return hr; + + if (hWnd == hwndShlFld) + return S_OK; + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::GetSubMenu(THIS)

1 0

[dquintana] 62213: [RSHELL] * CMenuDeskBar: Improve code style, and implement some more methods.
by dquintana＠svn.reactos.org 16 Feb '14

16 Feb '14

Author: dquintana Date: Sun Feb 16 12:48:29 2014 New Revision: 62213 URL: http://svn.reactos.org/svn/reactos?rev=62213&view=rev Log: [RSHELL] * CMenuDeskBar: Improve code style, and implement some more methods. Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp Modified: branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Sun Feb 16 12:48:29 2014 @@ -123,37 +123,30 @@ virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) + DECLARE_PROTECT_FINAL_CONSTRUCT() + +#if !WRAP_LOG + DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) + + BEGIN_MSG_MAP(CMenuDeskBar) + MESSAGE_HANDLER(WM_SIZE, OnSize) + MESSAGE_HANDLER(WM_NOTIFY, OnNotify) + MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) + MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) + MESSAGE_HANDLER(WM_PAINT, OnPaint) + END_MSG_MAP() + // message handlers LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnActivate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) - DECLARE_PROTECT_FINAL_CONSTRUCT() - -#if !WRAP_LOG - DECLARE_WND_CLASS_EX(_T("BaseBar"), 0, COLOR_3DFACE) #endif - - BEGIN_MSG_MAP(CMenuDeskBar) - MESSAGE_HANDLER(WM_SIZE, OnSize) - /*MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) - MESSAGE_HANDLER(WM_LBUTTONUP, OnLButtonUp) - MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove) - MESSAGE_HANDLER(WM_CANCELMODE, OnCancelMode) - MESSAGE_HANDLER(WM_CAPTURECHANGED, OnCaptureChanged) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) */ - MESSAGE_HANDLER(WM_ACTIVATE, OnActivate) - MESSAGE_HANDLER(WM_PAINT, OnPaint) - END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) COM_INTERFACE_ENTRY_IID(IID_IMenuPopup, IMenuPopup) @@ -512,8 +505,13 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnFocusChangeIS(IUnknown *punkObj, BOOL fSetFocus) { - // forward to owner - return E_NOTIMPL; + CComPtr<IInputObjectSite> ios; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObjectSite, &ios)); + if (FAILED(hr)) + return hr; + + return ios->OnFocusChangeIS(punkObj, fSetFocus); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, @@ -546,42 +544,43 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { - CComPtr<IServiceProvider> serviceProvider; - HRESULT hResult; - if (m_Site == NULL) return E_FAIL; - hResult = m_Site->QueryInterface(IID_IServiceProvider, reinterpret_cast<void **>(&serviceProvider)); - if (FAILED(hResult)) - return hResult; - // called for SID_STopLevelBrowser, IID_IBrowserService to find top level browser - // called for SID_IWebBrowserApp, IID_IConnectionPointContainer - // connection point called for DIID_DWebBrowserEvents2 to establish connection - return serviceProvider->QueryService(guidService, riid, ppvObject); + + return IUnknown_QueryService(m_Site, guidService, riid, ppvObject); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::UIActivateIO(BOOL fActivate, LPMSG lpMsg) { - // forward to contained bar - return S_OK; + return IUnknown_UIActivateIO(m_Client, fActivate, lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::HasFocusIO() { - // forward to contained bar - return S_OK; + CComPtr<IInputObject> io; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); + if (FAILED(hr)) + return hr; + + return io->HasFocusIO(); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::TranslateAcceleratorIO(LPMSG lpMsg) { - // forward to contained bar - return S_OK; + CComPtr<IInputObject> io; + + HRESULT hr = m_Client->QueryInterface(IID_PPV_ARG(IInputObject, &io)); + if (FAILED(hr)) + return hr; + + return io->TranslateAcceleratorIO(lpMsg); } HRESULT STDMETHODCALLTYPE CMenuDeskBar::SetClient(IUnknown *punkClient) { - CComPtr<IDeskBarClient> pDeskBandClient; - HRESULT hResult; + CComPtr<IDeskBarClient> pDeskBandClient; + HRESULT hResult; m_Client.Release(); @@ -708,43 +707,7 @@ return result; } -LRESULT CMenuDeskBar::OnLButtonDown(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - SetCapture(); - m_Tracking = true; - m_LastLocation.x = LOWORD(lParam); - m_LastLocation.y = HIWORD(lParam); - return 0; -} - -LRESULT CMenuDeskBar::OnLButtonUp(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - ReleaseCapture(); - m_Tracking = false; - return 0; -} - -LRESULT CMenuDeskBar::OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - POINT newLocation; - //int delta; - - if (m_Tracking) - { - newLocation.x = (short) LOWORD(lParam); - newLocation.y = (short) HIWORD(lParam); - m_LastLocation = newLocation; - } - return 0; -} - LRESULT CMenuDeskBar::OnCancelMode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - m_Tracking = false; - return 0; -} - -LRESULT CMenuDeskBar::OnCaptureChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { m_Tracking = false; return 0;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
47
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 February 2014