Ros-diffs

ros-diffs@reactos.org

81390 discussions

[pschweitzer] 62454: [VGAFONTEDIT] - Fix CMake script (for PCH) [IMAGESOFT] - Fix CMake script (for PCH) [GREEN] - Add header guard - Fix CMake script (for PCH) This fixes rosapps build with RosBE ...
by pschweitzer＠svn.reactos.org 08 Mar '14

08 Mar '14

Author: pschweitzer Date: Sat Mar 8 08:47:03 2014 New Revision: 62454 URL: http://svn.reactos.org/svn/reactos?rev=62454&view=rev Log: [VGAFONTEDIT] - Fix CMake script (for PCH) [IMAGESOFT] - Fix CMake script (for PCH) [GREEN] - Add header guard - Fix CMake script (for PCH) This fixes rosapps build with RosBE 2.1.1 CORE-7716 Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt trunk/rosapps/applications/imagesoft/CMakeLists.txt trunk/rosapps/drivers/green/CMakeLists.txt trunk/rosapps/drivers/green/green.h Modified: trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/vgaf… ============================================================================== --- trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/vgafontedit/CMakeLists.txt [iso-8859-1] Sat Mar 8 08:47:03 2014 @@ -8,10 +8,10 @@ mainwnd.c misc.c opensave.c - vgafontedit.rc) + precomp.h) +add_executable(vgafontedit ${SOURCE} vgafontedit.rc) add_pch(vgafontedit precomp.h SOURCE) -add_executable(vgafontedit ${SOURCE}) set_module_type(vgafontedit win32gui UNICODE) add_importlibs(vgafontedit user32 gdi32 comdlg32 msvcrt kernel32) add_cd_file(TARGET vgafontedit DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/imagesoft/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/CMa… ============================================================================== --- trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/imagesoft/CMakeLists.txt [iso-8859-1] Sat Mar 8 08:47:03 2014 @@ -13,10 +13,11 @@ misc.c opensave.c tooldock.c - imagesoft.rc) + precomp.h + ) +add_executable(imagesoft ${SOURCE} imagesoft.rc) add_pch(imagesoft precomp.h SOURCE) -add_executable(imagesoft ${SOURCE}) set_module_type(imagesoft win32gui UNICODE) add_importlibs(imagesoft gdi32 user32 advapi32 version comctl32 shell32 comdlg32 msvcrt kernel32) add_cd_file(TARGET imagesoft DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/drivers/green/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/CMakeLists.t… ============================================================================== --- trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/CMakeLists.txt [iso-8859-1] Sat Mar 8 08:47:03 2014 @@ -8,9 +8,9 @@ pnp.c power.c screen.c - green.rc) + green.h) -add_library(green SHARED ${SOURCE}) +add_library(green SHARED ${SOURCE} green.rc) add_pch(green green.h SOURCE) set_module_type(green kernelmodedriver) add_importlibs(green ntoskrnl hal) Modified: trunk/rosapps/drivers/green/green.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/green.h?rev=… ============================================================================== --- trunk/rosapps/drivers/green/green.h [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/green.h [iso-8859-1] Sat Mar 8 08:47:03 2014 @@ -1,3 +1,6 @@ +#ifndef __GREEN_H__ +#define __GREEN_H__ + #include <ntddk.h> #include <ntifs.h> #include <ntndk.h> @@ -191,3 +194,5 @@ IN ULONG Flags, IN PCUNICODE_STRING SourceString, OUT PUNICODE_STRING DestinationString); + +#endif

1 0

[aandrejevic] 62453: [NTVDM] Set the base address to a high address, so that BaseVDM can allocate 16 MB at address 0.
by aandrejevic＠svn.reactos.org 08 Mar '14

08 Mar '14

Author: aandrejevic Date: Sat Mar 8 01:40:08 2014 New Revision: 62453 URL: http://svn.reactos.org/svn/reactos?rev=62453&view=rev Log: [NTVDM] Set the base address to a high address, so that BaseVDM can allocate 16 MB at address 0. Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Sat Mar 8 01:40:08 2014 @@ -39,3 +39,4 @@ target_link_libraries(ntvdm fast486) add_importlibs(ntvdm user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all) +set_image_base(ntvdm 0x0F000000)

1 0

[aandrejevic] 62452: [KERNEL32] Separate the buffers for the two CSR messages (CreateProcessMsg and CheckVdmMsg).
by aandrejevic＠svn.reactos.org 08 Mar '14

08 Mar '14

Author: aandrejevic Date: Sat Mar 8 01:17:45 2014 New Revision: 62452 URL: http://svn.reactos.org/svn/reactos?rev=62452&view=rev Log: [KERNEL32] Separate the buffers for the two CSR messages (CreateProcessMsg and CheckVdmMsg). Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Sat Mar 8 01:17:45 2014 @@ -2301,7 +2301,7 @@ BOOLEAN InJob, SaferNeeded, UseLargePages, HavePrivilege; BOOLEAN QuerySection, SkipSaferAndAppCompat; CONTEXT Context; - BASE_API_MESSAGE CsrMsg; + BASE_API_MESSAGE CsrMsg[2]; PBASE_CREATE_PROCESS CreateProcessMsg; PCSR_CAPTURE_BUFFER CaptureBuffer; PVOID BaseAddress, PrivilegeState, RealTimePrivilegeState; @@ -2431,8 +2431,8 @@ IsWowApp = FALSE; /* Set message structures */ - CreateProcessMsg = &CsrMsg.Data.CreateProcessRequest; - CheckVdmMsg = &CsrMsg.Data.CheckVDMRequest; + CreateProcessMsg = &CsrMsg[0].Data.CreateProcessRequest; + CheckVdmMsg = &CsrMsg[1].Data.CheckVDMRequest; /* Clear the more complex structures by zeroing out their entire memory */ RtlZeroMemory(&Context, sizeof(Context)); @@ -3205,7 +3205,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - &CsrMsg, + &CsrMsg[1], &VdmTask, dwCreationFlags, &StartupInfo, @@ -3342,7 +3342,7 @@ lpCommandLine, lpCurrentDirectory, &VdmAnsiEnv, - &CsrMsg, + &CsrMsg[1], &VdmTask, dwCreationFlags, &StartupInfo, @@ -4337,7 +4337,7 @@ } /* We are finally ready to call CSRSS to tell it about our new process! */ - CsrClientCallServer((PCSR_API_MESSAGE)&CsrMsg, + CsrClientCallServer((PCSR_API_MESSAGE)&CsrMsg[0], CaptureBuffer, CSR_CREATE_API_NUMBER(BASESRV_SERVERDLL_INDEX, BasepCreateProcess), @@ -4351,12 +4351,12 @@ } /* Check if CSRSS failed to accept ownership of the new Windows process */ - if (!NT_SUCCESS(CsrMsg.Status)) + if (!NT_SUCCESS(CsrMsg[0].Status)) { /* Terminate the process and enter failure path with the CSRSS status */ DPRINT1("Failed to tell csrss about new process\n"); - BaseSetLastNTError(CsrMsg.Status); - NtTerminateProcess(ProcessHandle, CsrMsg.Status); + BaseSetLastNTError(CsrMsg[0].Status); + NtTerminateProcess(ProcessHandle, CsrMsg[0].Status); Result = FALSE; goto Quickie; }

1 0

[aandrejevic] 62451: [BASESRV] - Move more constants to the global header. - Implement GetConsoleRecordBySessionId. - Implement BaseSrvUpdateVDMEntry. - Improve and fix bugs in the cleanup code.
by aandrejevic＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: aandrejevic Date: Fri Mar 7 23:46:43 2014 New Revision: 62451 URL: http://svn.reactos.org/svn/reactos?rev=62451&view=rev Log: [BASESRV] - Move more constants to the global header. - Implement GetConsoleRecordBySessionId. - Implement BaseSrvUpdateVDMEntry. - Improve and fix bugs in the cleanup code. Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h branches/ntvdm/include/reactos/subsys/win/vdm.h branches/ntvdm/subsystems/win/basesrv/vdm.c branches/ntvdm/subsystems/win/basesrv/vdm.h Modified: branches/ntvdm/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/include/vdm.h [iso-8859-1] Fri Mar 7 23:46:43 2014 @@ -7,23 +7,6 @@ */ #pragma once - -/* CONSTANTS ******************************************************************/ - -typedef enum _VDM_ENTRY_CODE -{ - VdmEntryUndo, - VdmEntryUpdateProcess, - VdmEntryUpdateControlCHandler -} VDM_ENTRY_CODE; - -// -// Undo States -// -#define VDM_UNDO_PARTIAL 0x01 -#define VDM_UNDO_FULL 0x02 -#define VDM_UNDO_REUSE 0x04 -#define VDM_UNDO_COMPLETED 0x08 /* FUNCTION PROTOTYPES ********************************************************/ Modified: branches/ntvdm/include/reactos/subsys/win/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/subsys/wi… ============================================================================== --- branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/subsys/win/vdm.h [iso-8859-1] Fri Mar 7 23:46:43 2014 @@ -11,6 +11,23 @@ #define _VDM_H #pragma once + +/* CONSTANTS ******************************************************************/ + +typedef enum _VDM_ENTRY_CODE +{ + VdmEntryUndo, + VdmEntryUpdateProcess, + VdmEntryUpdateControlCHandler +} VDM_ENTRY_CODE; + +// +// Undo States +// +#define VDM_UNDO_PARTIAL 0x01 +#define VDM_UNDO_FULL 0x02 +#define VDM_UNDO_REUSE 0x04 +#define VDM_UNDO_COMPLETED 0x08 // // Binary Types to share with VDM Modified: branches/ntvdm/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.c [iso-8859-1] Fri Mar 7 23:46:43 2014 @@ -34,6 +34,22 @@ { CurrentRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); if (CurrentRecord->ConsoleHandle == ConsoleHandle) break; + } + + *Record = CurrentRecord; + return CurrentRecord ? STATUS_SUCCESS : STATUS_NOT_FOUND; +} + +NTSTATUS NTAPI GetConsoleRecordBySessionId(ULONG TaskId, PVDM_CONSOLE_RECORD *Record) +{ + PLIST_ENTRY i; + PVDM_CONSOLE_RECORD CurrentRecord = NULL; + + /* Search for a record that has the same console handle */ + for (i = VDMConsoleListHead.Flink; i != &VDMConsoleListHead; i = i->Flink) + { + CurrentRecord = CONTAINING_RECORD(i, VDM_CONSOLE_RECORD, Entry); + if (CurrentRecord->SessionId == TaskId) break; } *Record = CurrentRecord; @@ -463,6 +479,9 @@ Status = BaseSrvCreatePairWaitHandles(&DosRecord->ServerEvent, &DosRecord->ClientEvent); if (!NT_SUCCESS(Status)) goto Cleanup; + /* Return the client event handle */ + CheckVdmRequest->WaitObjectForParent = DosRecord->ClientEvent; + /* Translate the input structure into a VDM command structure and set it in the DOS record */ if (!BaseSrvCopyCommand(CheckVdmRequest, DosRecord)) { @@ -487,7 +506,7 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; } Cleanup: @@ -497,6 +516,19 @@ /* Free the DOS record */ if (DosRecord != NULL) { + if (DosRecord->ServerEvent) NtClose(DosRecord->ServerEvent); + if (DosRecord->ClientEvent) + { + /* Close the remote handle */ + NtDuplicateObject(CsrGetClientThread()->Process->ProcessHandle, + DosRecord->ClientEvent, + NULL, + NULL, + 0, + 0, + DUPLICATE_CLOSE_SOURCE); + } + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); DosRecord = NULL; } @@ -517,8 +549,125 @@ CSR_API(BaseSrvUpdateVDMEntry) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PBASE_UPDATE_VDM_ENTRY UpdateVdmEntryRequest = &((PBASE_API_MESSAGE)ApiMessage)->Data.UpdateVDMEntryRequest; + PRTL_CRITICAL_SECTION CriticalSection = NULL; + PVDM_CONSOLE_RECORD ConsoleRecord = NULL; + PVDM_DOS_RECORD DosRecord = NULL; + + CriticalSection = (UpdateVdmEntryRequest->BinaryType != BINARY_TYPE_SEPARATE_WOW) + ? &DosCriticalSection + : &WowCriticalSection; + + /* Enter the critical section */ + RtlEnterCriticalSection(CriticalSection); + + /* Check if this is a DOS or WOW VDM */ + if (UpdateVdmEntryRequest->BinaryType != BINARY_TYPE_SEPARATE_WOW) + { + if (UpdateVdmEntryRequest->iTask != 0) + { + /* Get the console record using the task ID */ + Status = GetConsoleRecordBySessionId(UpdateVdmEntryRequest->iTask, + &ConsoleRecord); + } + else + { + /* Get the console record using the console handle */ + Status = BaseSrvGetConsoleRecord(UpdateVdmEntryRequest->ConsoleHandle, + &ConsoleRecord); + } + + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Get the primary DOS record */ + DosRecord = (PVDM_DOS_RECORD)CONTAINING_RECORD(ConsoleRecord->DosListHead.Flink, + VDM_DOS_RECORD, + Entry); + + switch (UpdateVdmEntryRequest->EntryIndex) + { + case VdmEntryUndo: + { + /* Close the server event handle, the client will close the client handle */ + NtClose(DosRecord->ServerEvent); + DosRecord->ServerEvent = DosRecord->ClientEvent = NULL; + + if (UpdateVdmEntryRequest->VDMCreationState & (VDM_UNDO_PARTIAL | VDM_UNDO_FULL)) + { + /* Remove the DOS record */ + if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo); + RemoveEntryList(&DosRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, DosRecord); + + /* + * Since this is an undo, if that was the only DOS record the VDM + * won't even start, so the console record should be removed too. + */ + if (ConsoleRecord->DosListHead.Flink == &ConsoleRecord->DosListHead) + { + RemoveEntryList(&ConsoleRecord->Entry); + RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord); + } + } + + /* It was successful */ + Status = STATUS_SUCCESS; + + break; + } + + case VdmEntryUpdateProcess: + { + /* Duplicate the VDM process handle */ + Status = NtDuplicateObject(CsrGetClientThread()->Process->ProcessHandle, + UpdateVdmEntryRequest->VDMProcessHandle, + NtCurrentProcess(), + &ConsoleRecord->ProcessHandle, + 0, + 0, + DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_SAME_ACCESS); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Create a pair of handles to one event object */ + Status = BaseSrvCreatePairWaitHandles(&DosRecord->ServerEvent, + &DosRecord->ClientEvent); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* Return the client event handle */ + UpdateVdmEntryRequest->WaitObjectForParent = DosRecord->ClientEvent; + + break; + } + + case VdmEntryUpdateControlCHandler: + { + // TODO: NOT IMPLEMENTED + DPRINT1("BaseSrvUpdateVDMEntry: VdmEntryUpdateControlCHandler not implemented!"); + Status = STATUS_NOT_IMPLEMENTED; + + break; + } + + default: + { + /* Invalid */ + Status = STATUS_INVALID_PARAMETER; + } + } + } + else + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; + } + +Cleanup: + /* Leave the critical section */ + RtlLeaveCriticalSection(CriticalSection); + + return Status; } CSR_API(BaseSrvGetNextVDMCommand) @@ -555,7 +704,12 @@ VDM_DOS_RECORD, Entry); + /* Set the event and close it */ + NtSetEvent(DosRecord->ServerEvent, NULL); + NtClose(DosRecord->ServerEvent); + /* Remove the DOS entry */ + if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo); RemoveEntryList(&DosRecord->Entry); RtlFreeHeap(BaseSrvHeap, 0, DosRecord); } @@ -576,7 +730,7 @@ { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + Status = STATUS_NOT_IMPLEMENTED; } Cleanup: @@ -639,6 +793,7 @@ GetVDMExitCodeRequest->ExitCode = DosRecord->ExitCode; /* Since this is a zombie task record, remove it */ + if (DosRecord->CommandInfo) BaseSrvFreeVDMInfo(DosRecord->CommandInfo); RemoveEntryList(&DosRecord->Entry); RtlFreeHeap(BaseSrvHeap, 0, DosRecord); Modified: branches/ntvdm/subsystems/win/basesrv/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/vd… ============================================================================== --- branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/win/basesrv/vdm.h [iso-8859-1] Fri Mar 7 23:46:43 2014 @@ -20,6 +20,7 @@ { LIST_ENTRY Entry; HANDLE ConsoleHandle; + HANDLE ProcessHandle; PCHAR CurrentDirs; ULONG CurDirsLength; ULONG SessionId;

1 0

[dquintana] 62450: [FILEBROWSER] * Svn glitched out when applying a patch
by dquintana＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: dquintana Date: Fri Mar 7 23:17:23 2014 New Revision: 62450 URL: http://svn.reactos.org/svn/reactos?rev=62450&view=rev Log: [FILEBROWSER] * Svn glitched out when applying a patch Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Fri Mar 7 23:17:23 2014 @@ -12,4 +12,4 @@ msvcrt kernel32) -add_cd_file(TARGET explorer DESTINATION reactos FOR all)add_cd_file(TARGET explorer DESTINATION reactos FOR all) +add_cd_file(TARGET explorer DESTINATION reactos FOR all)

1 0

[dquintana] 62449: [EXPLORER] * Rename the output to explorer_old [EXPLORER-NEW] * Rename the output to explorer * Launch a browseui window when explorer is run with an existing shell process. Shel...
by dquintana＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: dquintana Date: Fri Mar 7 22:39:49 2014 New Revision: 62449 URL: http://svn.reactos.org/svn/reactos?rev=62449&view=rev Log: [EXPLORER] * Rename the output to explorer_old [EXPLORER-NEW] * Rename the output to explorer * Launch a browseui window when explorer is run with an existing shell process. Shell-experiments will now be running the new shell by default. This allows me to test the shell classes under more accurate conditions, so I was using it locally for a while. I decided to commit because of two reasons: 1. It was making me temporarily revert some changes done to some files when I wanted to commit, and 2. It lets everyone see the results of the shell-experiments project without having to mess with the task manager. Keep in mind that, as the branch name implies, it STILL is an experiment. CORE-7586 Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt branches/shell-experiments/base/shell/explorer-new/explorer.c branches/shell-experiments/base/shell/explorer/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt branches/shell-experiments/base/shell/filebrowser/filebrowser.c branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/CMakeLists.txt Modified: branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -19,10 +19,10 @@ traywnd.c precomp.h) -add_executable(explorer_new ${SOURCE} explorer.rc) -target_link_libraries(explorer_new uuid) -set_module_type(explorer_new win32gui UNICODE) -add_importlibs(explorer_new +add_executable(explorer ${SOURCE} explorer.rc) +target_link_libraries(explorer uuid) +set_module_type(explorer win32gui UNICODE) +add_importlibs(explorer advapi32 gdi32 user32 @@ -37,5 +37,5 @@ msvcrt kernel32 ntdll) -add_pch(explorer_new precomp.h SOURCE) -add_cd_file(TARGET explorer_new DESTINATION reactos FOR all) +add_pch(explorer precomp.h SOURCE) +add_cd_file(TARGET explorer DESTINATION reactos FOR all) Modified: branches/shell-experiments/base/shell/explorer-new/explorer.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/explorer.c [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -381,6 +381,8 @@ HANDLE hShellDesktop = NULL; BOOL CreateShellDesktop = FALSE; + DbgPrint("Explorer starting... Commandline: %S\n", lpCmdLine); + if (RegOpenKey(HKEY_CURRENT_USER, TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"), &hkExplorer) != ERROR_SUCCESS) @@ -442,10 +444,109 @@ } else { + WCHAR root[MAX_PATH]; + HMODULE hBrowseui; + HRESULT hr; + LPSHELLFOLDER pDesktopFolder = NULL; + LPITEMIDLIST pidlRoot = NULL; + /* A shell is already loaded. Parse the command line arguments and unless we need to do something specific simply display the desktop in a separate explorer window */ /* FIXME */ + + /* Commandline switches: + * + * /n Open a new window, even if an existing one still exists. + * /e Start with the explorer sidebar shown. + * /root,<object> Open a window for the given object path. + * /select,<object> Open a window with the given object selected. + */ + + /* FIXME: Do it right */ + WCHAR* tmp = wcsstr(lpCmdLine,L"/root,"); + if (tmp) + { + WCHAR* tmp2; + + tmp += 6; // skip to beginning of path + tmp2 = wcschr(tmp, L','); + + if (tmp2) + { + wcsncpy(root, tmp, tmp2 - tmp); + } + else + { + wcscpy(root, tmp); + } + } + else + { + wcscpy(root, lpCmdLine); + } + + if (root[0] == L'"') + { + int len = wcslen(root) - 2; + wcsncpy(root, root + 1, len); + root[len] = 0; + } + + if (wcslen(root) > 0) + { + LPITEMIDLIST pidl; + ULONG chEaten; + ULONG dwAttributes; + + if (SUCCEEDED(SHGetDesktopFolder(&pDesktopFolder))) + { + hr = pDesktopFolder->lpVtbl->ParseDisplayName(pDesktopFolder, + NULL, + NULL, + root, + &chEaten, + &pidl, + &dwAttributes); + if (SUCCEEDED(hr)) + { + pidlRoot = pidl; + DbgPrint("Got PIDL for folder '%S'\n", root); + } + } + } + + if (!pidlRoot) + { + DbgPrint("No folder, getting PIDL for My Computer.\n", root); + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlRoot); + if (FAILED(hr)) + return 0; + } + + DbgPrint("Trying to open browser window... \n"); + + typedef HRESULT(WINAPI *SH_OPEN_NEW_FRAME)(LPITEMIDLIST pidl, IUnknown *paramC, long param10, long param14); + SH_OPEN_NEW_FRAME SHOpenNewFrame; + + hBrowseui = LoadLibraryW(L"browseui.dll"); + if (!hBrowseui) + { + DbgPrint("Browseui not found.. \n"); + return 0; + } + + SHOpenNewFrame = (SH_OPEN_NEW_FRAME) GetProcAddress(hBrowseui, (LPCSTR) 103); + + hr = SHOpenNewFrame(pidlRoot, (IUnknown*)pDesktopFolder, 0, 0); + if (FAILED(hr)) + return 0; + + /* FIXME: we should wait a bit here and see if a window was created. If not we should exit this process. */ + Sleep(1000); + ExitThread(0); + + return 0; } if (Tray != NULL) Modified: branches/shell-experiments/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -46,17 +46,17 @@ list(APPEND I386_SOURCE i386-stub-win32.c) endif() -add_executable(explorer +add_executable(explorer_old ${SOURCE} ${I386_SOURCE} services/startup.c explorer.rc) -target_link_libraries(explorer comsupp wine uuid) -set_module_type(explorer win32gui UNICODE) +target_link_libraries(explorer_old comsupp wine uuid) +set_module_type(explorer_old win32gui UNICODE) -add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) -add_pch(explorer precomp.h SOURCE) -add_dependencies(explorer psdk) -add_cd_file(TARGET explorer DESTINATION reactos FOR all) +add_importlibs(explorer_old advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll) +add_pch(explorer_old precomp.h SOURCE) +add_dependencies(explorer_old psdk) +add_cd_file(TARGET explorer_old DESTINATION reactos FOR all) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml DESTINATION reactos FOR all) Modified: branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -11,4 +11,5 @@ shell32 msvcrt kernel32) - + +add_cd_file(TARGET explorer DESTINATION reactos FOR all)add_cd_file(TARGET explorer DESTINATION reactos FOR all) Modified: branches/shell-experiments/base/shell/filebrowser/filebrowser.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/fi… ============================================================================== --- branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/filebrowser/filebrowser.c [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -33,7 +33,7 @@ { SH_OPEN_NEW_FRAME SHOpenNewFrame = (SH_OPEN_NEW_FRAME)GetProcAddress(hBrowseui, (LPCSTR)103); LPITEMIDLIST pidlDrives; - HRESULT hRet = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); + SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidlDrives); SHOpenNewFrame((LPITEMIDLIST)pidlDrives, NULL, 0, 0); } Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -47,7 +47,7 @@ add_custom_command(TARGET rshell POST_BUILD COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:rshell>" - "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" + "$<TARGET_FILE_DIR:explorer>/$<TARGET_FILE_NAME:rshell>" COMMENT "Copying to output directory") add_custom_command(TARGET rshell POST_BUILD @@ -55,3 +55,9 @@ "$<TARGET_FILE:rshell>" "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" COMMENT "Copying to output directory") + +add_custom_command(TARGET rshell POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying to output directory") Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:39:49 2014 @@ -65,3 +65,9 @@ "$<TARGET_FILE:browseui>" "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" COMMENT "Copying to output directory") + +add_custom_command(TARGET browseui POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:browseui>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" + COMMENT "Copying to output directory")

1 0

[dquintana] 62448: [BROWSEUI] * Load and use rshell for the menubar. * Properly forward WM_NOTIFY and WM_COMMAND messages to the toolbars. [RSHELL] * Improve behaviour of horizontal menubands. * Cl...
by dquintana＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: dquintana Date: Fri Mar 7 22:28:55 2014 New Revision: 62448 URL: http://svn.reactos.org/svn/reactos?rev=62448&view=rev Log: [BROWSEUI] * Load and use rshell for the menubar. * Properly forward WM_NOTIFY and WM_COMMAND messages to the toolbars. [RSHELL] * Improve behaviour of horizontal menubands. * Clicking on submenu items does not work yet. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuBand.h branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp branches/shell-experiments/base/shell/rshell/CMenuToolbars.h branches/shell-experiments/dll/win32/browseui/CMakeLists.txt branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp branches/shell-experiments/dll/win32/browseui/internettoolbar.h branches/shell-experiments/dll/win32/browseui/precomp.h branches/shell-experiments/media/fonts/Marlett.ttf Modified: branches/shell-experiments/base/shell/rshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -49,3 +49,9 @@ "$<TARGET_FILE:rshell>" "$<TARGET_FILE_DIR:explorer_new>/$<TARGET_FILE_NAME:rshell>" COMMENT "Copying to output directory") + +add_custom_command(TARGET rshell POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:rshell>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:rshell>" + COMMENT "Copying to output directory") 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] Fri Mar 7 22:28:55 2014 @@ -52,7 +52,10 @@ m_site(NULL), m_psmc(NULL), m_subMenuChild(NULL), + m_hmenu(NULL), + m_menuOwner(NULL), m_useBigIcons(FALSE), + m_topLevelWindow(NULL), m_hotBar(NULL), m_hotItem(-1) { @@ -123,7 +126,7 @@ m_staticToolbar = new CMenuStaticToolbar(this); } m_hmenu = hmenu; - m_menuOwner; + m_menuOwner = hwnd; HRESULT hr = m_staticToolbar->SetMenu(hmenu, hwnd, dwFlags); if (FAILED_UNEXPECTEDLY(hr)) @@ -203,7 +206,7 @@ } hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &m_subMenuParent)); - if (FAILED_UNEXPECTEDLY(hr)) + if (FAILED(hr) && hr != E_NOINTERFACE) return hr; CComPtr<IOleWindow> pTopLevelWindow; @@ -326,10 +329,13 @@ return hr; } - if (fShow) - hr = m_focusManager->PushMenu(this); - else - hr = m_focusManager->PopMenu(this); + if (m_dwFlags & SMINIT_VERTICAL) + { + if (fShow) + hr = m_focusManager->PushMenu(this); + else + hr = m_focusManager->PopMenu(this); + } return S_OK; } @@ -401,6 +407,8 @@ { return S_FALSE; } + + return S_FALSE; } UNIMPLEMENTED; @@ -610,9 +618,24 @@ return hr; } -HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y) -{ - ::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL); +HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude) +{ + HWND sendTo = m_menuOwner; + + // FIXME: use? + //TPMPARAMS params = { sizeof(TPMPARAMS), rcExclude }; + + if (sendTo) + { + ::TrackPopupMenuEx(popup, 0, x, y, sendTo, NULL); // &params); + } + else + { + GetWindow(&sendTo); + ::TrackPopupMenuEx(popup, TPM_RETURNCMD, x, y, sendTo, NULL); // &params); + // TODO: use the result somehow + } + return S_OK; } Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuBand.h [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -171,7 +171,7 @@ HRESULT _CallCBWithItemId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); HRESULT _CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); - HRESULT _TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y); + HRESULT _TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y, RECT& rcExclude); HRESULT _GetTopLevelWindow(HWND*topLevel); HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); HRESULT _MenuItemHotTrack(DWORD changeType); 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] Fri Mar 7 22:28:55 2014 @@ -417,7 +417,7 @@ { if (m_SubMenuChild) { - if (SHIsSameObject(pmp, m_SubMenuChild)) + if (pmp == m_SubMenuChild) { m_SubMenuChild = NULL; } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -67,6 +67,10 @@ hdr = reinterpret_cast<LPNMHDR>(lParam); switch (hdr->code) { + case TTN_GETDISPINFOA: + case TTN_GETDISPINFOW: + return S_OK; + case PGN_CALCSIZE: csize = reinterpret_cast<LPNMPGCALCSIZE>(hdr); @@ -99,7 +103,8 @@ switch (cdraw->nmcd.dwDrawStage) { case CDDS_PREPAINT: - *theResult = CDRF_NOTIFYITEMDRAW; + if (m_toolbarFlags & SMINIT_VERTICAL) + *theResult = CDRF_NOTIFYITEMDRAW; return S_OK; case CDDS_ITEMPREPAINT: @@ -160,6 +165,10 @@ return S_OK; } return S_OK; + case RBN_CHILDSIZE: + return S_OK; + default: + DbgPrint("WM_NOTIFY unknown code %d, %d\n", hdr->code, hdr->idFrom); } return S_OK; } @@ -214,6 +223,13 @@ HRESULT CMenuToolbarBase::UpdateImageLists() { + if ((m_toolbarFlags & (SMINIT_TOPLEVEL| SMINIT_VERTICAL)) == SMINIT_TOPLEVEL) // not vertical. + { + /* Hide the placeholders for the button images */ + SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); + return S_OK; + } + int shiml; if (m_menuBand->UseBigIcons()) { @@ -266,6 +282,8 @@ #endif } + m_toolbarFlags = dwFlags; + RECT rc; if (!::GetClientRect(hwndParent, &rc) || (rc.left == rc.right) || (rc.top == rc.bottom)) @@ -311,13 +329,6 @@ /* Identify the version of the used Common Controls DLL by sending the size of the TBBUTTON structure */ SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - //if (dwFlags & SMINIT_TOPLEVEL) - //{ - // /* Hide the placeholders for the button images */ - // SendMessageW(m_hwnd, TB_SETIMAGELIST, 0, 0); - //} - //else - SetWindowLongPtr(hwndToolbar, GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this)); m_SubclassOld = (WNDPROC) SetWindowLongPtr(hwndToolbar, GWLP_WNDPROC, reinterpret_cast<LONG_PTR>(CMenuToolbarBase::s_SubclassProc)); @@ -349,8 +360,11 @@ SetWindowPos(m_hwndToolbar, NULL, x, y, cx, m_idealSize.cy, 0); } SetWindowPos(m_hwnd, NULL, x, y, cx, cy, 0); - DWORD btnSize = SendMessage(m_hwndToolbar, TB_GETBUTTONSIZE, 0, 0); - SendMessage(m_hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(cx, HIWORD(btnSize))); + if (m_toolbarFlags & SMINIT_VERTICAL) + { + DWORD btnSize = SendMessage(m_hwndToolbar, TB_GETBUTTONSIZE, 0, 0); + SendMessage(m_hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(cx, HIWORD(btnSize))); + } return S_OK; } @@ -372,8 +386,16 @@ LRESULT CMenuToolbarBase::SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + LRESULT lr; + switch (uMsg) { + case WM_COMMAND: + OnWinEvent(hWnd, uMsg, wParam, lParam, &lr); + break; + case WM_NOTIFY: + OnWinEvent(hWnd, uMsg, wParam, lParam, &lr); + break; case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { @@ -402,9 +424,12 @@ } else if (m_hotItem != hot->idNew) { - DWORD elapsed = 0; - SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - SetTimer(m_hwndToolbar, TIMERID_HOTTRACK, elapsed, NULL); + if (m_toolbarFlags & SMINIT_VERTICAL) + { + DWORD elapsed = 0; + SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); + SetTimer(m_hwndToolbar, TIMERID_HOTTRACK, elapsed, NULL); + } m_hotItem = hot->idNew; m_menuBand->_OnHotItemChanged(this, m_hotItem); @@ -415,8 +440,18 @@ HRESULT CMenuToolbarBase::OnHotItemChanged(CMenuToolbarBase * toolbar, INT item) { + BOOL wasChecked = FALSE; + if (m_hotBar == this && !(m_toolbarFlags & SMINIT_VERTICAL)) + { + wasChecked = SendMessage(m_hwndToolbar, TB_ISBUTTONCHECKED, m_hotItem, 0); + SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, FALSE); + } m_hotBar = toolbar; m_hotItem = item; + if (wasChecked && m_hotBar == this && !(m_toolbarFlags & SMINIT_VERTICAL)) + { + SendMessage(m_hwndToolbar, TB_CHECKBUTTON, m_hotItem, TRUE); + } InvalidateDraw(); return S_OK; } @@ -436,18 +471,25 @@ HRESULT hr = 0; RECT rc = { 0 }; + RECT rcx = { 0 }; if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) return E_FAIL; + GetWindowRect(m_hwnd, &rcx); + POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; + POINT c = { rcx.left, rcx.top }; + POINT d = { rcx.right, rcx.bottom }; ClientToScreen(m_hwndToolbar, &a); ClientToScreen(m_hwndToolbar, &b); + ClientToScreen(m_hwnd, &c); + ClientToScreen(m_hwnd, &d); POINTL pt = { b.x - 3, a.y - 3 }; - RECTL rcl = { a.x, a.y, b.x, b.y }; // maybe-TODO: fetch client area of deskbar? + RECTL rcl = { c.x, c.y, d.x, d.y }; #if USE_SYSTEM_MENUSITE hr = CoCreateInstance(CLSID_MenuBandSite, @@ -499,20 +541,40 @@ return S_OK; } -HRESULT CMenuToolbarBase::PopupSubMenu(UINT index, HMENU menu) +HRESULT CMenuToolbarBase::PopupSubMenu(UINT uItem, UINT index, HMENU menu) { RECT rc = { 0 }; + RECT rcx = { 0 }; if (!SendMessage(m_hwndToolbar, TB_GETITEMRECT, index, reinterpret_cast<LPARAM>(&rc))) return E_FAIL; + GetWindowRect(m_hwnd, &rcx); + + POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - + POINT c = { rcx.left, rcx.top }; + POINT d = { rcx.right, rcx.bottom }; + + ClientToScreen(m_hwndToolbar, &a); ClientToScreen(m_hwndToolbar, &b); + ClientToScreen(m_hwnd, &c); + ClientToScreen(m_hwnd, &d); + + POINT pt = { a.x, b.y }; + RECT rcl = { c.x, c.y, d.x, d.y }; + + if (m_toolbarFlags & SMINIT_VERTICAL) + { + pt.x = b.x; + pt.y = a.y; + } HMENU popup = GetSubMenu(menu, index); - m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, b.x, b.y); + m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, pt.x, pt.y, rcl); + + SendMessage(m_hwndToolbar, TB_CHECKBUTTON, uItem, FALSE); return S_OK; } @@ -653,13 +715,16 @@ tbb.fsState = TBSTATE_ENABLED; #ifndef TBSTYLE_EX_VERTICAL - if (!last) + if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif tbb.fsStyle = 0; - if (hasSubMenu) + if (hasSubMenu && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsStyle |= BTNS_DROPDOWN; + + if (!(m_toolbarFlags & SMINIT_VERTICAL)) + tbb.fsStyle |= BTNS_AUTOSIZE | BTNS_CHECKGROUP; tbb.iString = (INT_PTR) caption; tbb.idCommand = commandId; @@ -667,8 +732,6 @@ tbb.iBitmap = iconId; tbb.dwData = buttonData; - DbgPrint("Trying to add a new button with id %d and caption '%S'...\n", commandId, caption); - if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) return HRESULT_FROM_WIN32(GetLastError()); @@ -681,14 +744,12 @@ tbb.fsState = TBSTATE_ENABLED; #ifndef TBSTYLE_EX_VERTICAL - if (!last) + if (!last && (m_toolbarFlags & SMINIT_VERTICAL)) tbb.fsState |= TBSTATE_WRAP; #endif tbb.fsStyle = BTNS_SEP; tbb.iBitmap = 0; - DbgPrint("Trying to add a new separator...\n"); - if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) return HRESULT_FROM_WIN32(GetLastError()); @@ -704,8 +765,6 @@ tbb.fsStyle = 0; tbb.iString = (INT_PTR) MenuString; tbb.iBitmap = -1; - - DbgPrint("Trying to add a new placeholder...\n"); if (!SendMessageW(m_hwndToolbar, TB_ADDBUTTONS, 1, reinterpret_cast<LPARAM>(&tbb))) return HRESULT_FROM_WIN32(GetLastError()); @@ -810,8 +869,6 @@ count++; - DbgPrint("Found item with fType=%x, cmdId=%d\n", info.fType, info.wID); - if (info.fType & MFT_SEPARATOR) { AddSeparator(last); @@ -839,8 +896,6 @@ } } - DbgPrint("Created toolbar with %d buttons.\n", count); - return S_OK; } @@ -876,7 +931,7 @@ if (nfo->dwFlags&SMIF_TRACKPOPUP) { - return PopupSubMenu(index, m_hmenu); + return PopupSubMenu(uItem, index, m_hmenu); } else { @@ -951,12 +1006,8 @@ // If no items were added, show the "empty" placeholder if (i == 0) { - DbgPrint("The toolbar is empty, adding placeholder.\n"); - return AddPlaceholder(); } - - DbgPrint("Created toolbar with %d buttons.\n", i); return hr; } Modified: branches/shell-experiments/base/shell/rshell/CMenuToolbars.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuToolbars.h [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -42,6 +42,8 @@ CMenuToolbarBase * m_popupBar; INT m_popupItem; + DWORD m_toolbarFlags; + private: static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -61,7 +63,7 @@ HRESULT OnPopupItemChanged(CMenuToolbarBase * toolbar, INT item); HRESULT PopupSubMenu(UINT itemId, UINT index, IShellMenu* childShellMenu); - HRESULT PopupSubMenu(UINT index, HMENU menu); + HRESULT PopupSubMenu(UINT itemId, UINT index, HMENU menu); HRESULT DoContextMenu(IContextMenu* contextMenu); HRESULT ChangeHotItem(DWORD changeType); Modified: branches/shell-experiments/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -59,3 +59,9 @@ add_pch(browseui precomp.h SOURCE) add_cd_file(TARGET browseui DESTINATION reactos/system32 FOR all) + +add_custom_command(TARGET browseui POST_BUILD + COMMAND "${CMAKE_COMMAND}" -E copy + "$<TARGET_FILE:browseui>" + "$<TARGET_FILE_DIR:filebrowser>/$<TARGET_FILE_NAME:browseui>" + COMMENT "Copying to output directory") Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -66,6 +66,8 @@ extern HRESULT CreateBrandBand(REFIID riid, void **ppv); extern HRESULT CreateBandProxy(REFIID riid, void **ppv); extern HRESULT CreateAddressBand(REFIID riid, void **ppv); + +typedef HRESULT(*PMENUBAND_CONSTRUCTOR)(REFIID riid, void **ppv); class CInternetToolbar; @@ -372,8 +374,23 @@ favoritesHMenu = GetSubMenu(parentHMenu, 3); if (favoritesHMenu == NULL) return E_FAIL; +#if 1 + HMODULE hrs = LoadLibrary(L"rshell.dll"); + + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); + if (func) + { + hResult = func(IID_PPV_ARG(IShellMenu, &newMenu)); + } + else + { + hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, + IID_IShellMenu, reinterpret_cast<void **>(&newMenu)); + } +#else hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_IShellMenu, reinterpret_cast<void **>(&newMenu)); +#endif if (FAILED(hResult)) return hResult; hResult = newMenu->Initialize(this, FCIDM_MENU_FAVORITES, -1, SMINIT_VERTICAL | SMINIT_CACHED); @@ -536,8 +553,35 @@ HWND ownerWindow; HRESULT hResult; +#if 1 + HMODULE hrs = LoadLibraryW(L"rshell.dll"); + + if (!hrs) + { + DbgPrint("Failed: %d\n", GetLastError()); + return E_FAIL; + } + + PMENUBAND_CONSTRUCTOR func = (PMENUBAND_CONSTRUCTOR) GetProcAddress(hrs, "CMenuBand_Constructor"); + if (func) + { + hResult = func(IID_PPV_ARG(IShellMenu, menuBar)); + } + else + { + DbgPrint("Failed: %d\n", GetLastError()); + hResult = E_FAIL; + } + + if (FAILED(hResult)) + { + hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, + IID_IShellMenu, reinterpret_cast<void **>(menuBar)); + } +#else hResult = CoCreateInstance(CLSID_MenuBand, NULL, CLSCTX_INPROC_SERVER, IID_IShellMenu, reinterpret_cast<void **>(menuBar)); +#endif if (FAILED(hResult)) return hResult; hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); @@ -1137,12 +1181,16 @@ CComPtr<IWinEventHandler> menuWinEventHandler; HRESULT hResult; - if (fMenuBar.p != NULL) + if (fMenuBar) { hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); - return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); - } - return E_FAIL; + if (menuWinEventHandler->IsWindowOwner(hWnd)) + { + return menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, theResult); + } + } + + return S_FALSE; } HRESULT STDMETHODCALLTYPE CInternetToolbar::IsWindowOwner(HWND hWnd) @@ -1410,20 +1458,6 @@ return 1; } -LRESULT CInternetToolbar::OnNavigateCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) -{ - CComPtr<IWinEventHandler> winEventHandler; - LRESULT theResult; - HRESULT hResult; - - hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&winEventHandler)); - hResult = winEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult); - if (SUCCEEDED(hResult)) - return theResult; - bHandled = FALSE; - return 0; -} - LRESULT CInternetToolbar::OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { HMENU contextMenuBar; @@ -1553,27 +1587,78 @@ return 0; } +LRESULT CInternetToolbar::OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + LRESULT theResult; + HRESULT hResult; + HWND target = (HWND) lParam; + + if (fMenuBar) + { + CComPtr<IWinEventHandler> menuWinEventHandler; + hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + if (SUCCEEDED(hResult)) + { + if (menuWinEventHandler->IsWindowOwner(target) == S_OK) + { + hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); + return FAILED(hResult) ? 0 : theResult; + } + } + } + + if (fNavigationBar) + { + CComPtr<IWinEventHandler> menuWinEventHandler; + hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + if (SUCCEEDED(hResult)) + { + if (menuWinEventHandler->IsWindowOwner(target) == S_OK) + { + hResult = menuWinEventHandler->OnWinEvent(target, uMsg, wParam, lParam, &theResult); + return FAILED(hResult) ? 0 : theResult; + } + } + } + + return 0; +} LRESULT CInternetToolbar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { - NMHDR *notifyHeader; - CComPtr<IWinEventHandler> menuWinEventHandler; - LRESULT theResult; - HRESULT hResult; - - notifyHeader = (NMHDR *)lParam; - if (fMenuBar.p != NULL && notifyHeader->hwndFrom == fMenuBandWindow) - { + NMHDR *notifyHeader; + LRESULT theResult; + HRESULT hResult; + + notifyHeader = (NMHDR *) lParam; + + if (fMenuBar) + { + CComPtr<IWinEventHandler> menuWinEventHandler; hResult = fMenuBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); - hResult = menuWinEventHandler->OnWinEvent(fMenuBandWindow, uMsg, wParam, lParam, &theResult); - return theResult; - } - if (fNavigationBar.p != NULL && notifyHeader->hwndFrom == fNavigationWindow) - { - hResult = fNavigationBar->QueryInterface( - IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); - hResult = menuWinEventHandler->OnWinEvent(m_hWnd, uMsg, wParam, lParam, &theResult); - return theResult; - } + if (SUCCEEDED(hResult)) + { + if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) + { + hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); + return FAILED(hResult) ? 0 : theResult; + } + } + } + + if (fNavigationBar) + { + CComPtr<IWinEventHandler> menuWinEventHandler; + hResult = fNavigationBar->QueryInterface(IID_IWinEventHandler, reinterpret_cast<void **>(&menuWinEventHandler)); + if (SUCCEEDED(hResult)) + { + if (menuWinEventHandler->IsWindowOwner(notifyHeader->hwndFrom) == S_OK) + { + hResult = menuWinEventHandler->OnWinEvent(notifyHeader->hwndFrom, uMsg, wParam, lParam, &theResult); + return FAILED(hResult) ? 0 : theResult; + } + } + } + return 0; } Modified: branches/shell-experiments/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/internettoolbar.h [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -196,6 +196,7 @@ LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnSetCursor(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnTipText(UINT idControl, NMHDR *pNMHDR, BOOL &bHandled); + LRESULT OnCommand(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); BEGIN_MSG_MAP(CInternetToolbar) @@ -208,7 +209,7 @@ NOTIFY_HANDLER(0, TBN_DROPDOWN, OnMenuDropDown) NOTIFY_HANDLER(0, TBN_QUERYINSERT, OnQueryInsert) NOTIFY_HANDLER(0, TBN_QUERYDELETE, OnQueryDelete) - MESSAGE_HANDLER(WM_COMMAND, OnNavigateCommand) + MESSAGE_HANDLER(WM_COMMAND, OnCommand) MESSAGE_HANDLER(WM_CONTEXTMENU, OnContextMenu) MESSAGE_HANDLER(WM_SIZE, OnSize) MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor) Modified: branches/shell-experiments/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/precomp.h [iso-8859-1] Fri Mar 7 22:28:55 2014 @@ -38,6 +38,43 @@ #include "commonbrowser.h" #include "globalfoldersettings.h" #include "regtreeoptions.h" +#include <stdio.h> + +static __inline ULONG +Win32DbgPrint(const char *filename, int line, const char *lpFormat, ...) +{ + char szMsg[512]; + char *szMsgStart; + const char *fname; + va_list vl; + ULONG uRet; + + fname = strrchr(filename, '\\'); + if (fname == NULL) + { + fname = strrchr(filename, '/'); + if (fname != NULL) + fname++; + } + else + fname++; + + if (fname == NULL) + fname = filename; + + szMsgStart = szMsg + sprintf(szMsg, "%s:%d: ", fname, line); + + va_start(vl, lpFormat); + uRet = (ULONG) vsprintf(szMsgStart, lpFormat, vl); + va_end(vl); + + OutputDebugStringA(szMsg); + + return uRet; +} + +#define DbgPrint(fmt, ...) \ + Win32DbgPrint(__FILE__, __LINE__, fmt, ##__VA_ARGS__) WINE_DEFAULT_DEBUG_CHANNEL(browseui); Modified: branches/shell-experiments/media/fonts/Marlett.ttf URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/media/fonts/M… ============================================================================== Binary files - no diff available.

1 0

[pschweitzer] 62447: [NOTSKRNL] Fix Frenchism, spotted by Christoph
by pschweitzer＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: pschweitzer Date: Fri Mar 7 21:51:11 2014 New Revision: 62447 URL: http://svn.reactos.org/svn/reactos?rev=62447&view=rev Log: [NOTSKRNL] Fix Frenchism, spotted by Christoph Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Fri Mar 7 21:51:11 2014 @@ -176,7 +176,7 @@ NotifyChange->Buffer = Buffer; } - /* If we don't have valide buffer, ensure everything is 0-ed out */ + /* If we have to notify immediately, ensure that any buffer is 0-ed out */ if (NotifyChange->Flags & NOTIFY_IMMEDIATELY) { NotifyChange->Buffer = 0;

1 0

[pschweitzer] 62446: [FASTFAT] Properly handle directories when notifying the kernel about creation. This makes the MS test application fully passing on ReactOS. You can find it at: http://msdn.mic...
by pschweitzer＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: pschweitzer Date: Fri Mar 7 20:30:29 2014 New Revision: 62446 URL: http://svn.reactos.org/svn/reactos?rev=62446&view=rev Log: [FASTFAT] Properly handle directories when notifying the kernel about creation. This makes the MS test application fully passing on ReactOS. You can find it at: http://msdn.microsoft.com/en-us/library/windows/desktop/aa365261%28v=vs.85%… CORE-2582 Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Mar 7 20:30:29 2014 @@ -762,7 +762,8 @@ pFcb->PathNameU.Length - pFcb->LongNameU.Length, NULL, NULL, - FILE_NOTIFY_CHANGE_FILE_NAME, + ((*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) ? + FILE_NOTIFY_CHANGE_DIR_NAME : FILE_NOTIFY_CHANGE_FILE_NAME), FILE_ACTION_ADDED, NULL); }

1 0

[pschweitzer] 62445: [FASTFAT] Add really limited support for file system notifications. In case of file creation, we report this. More cases are missing, such as: dir creation, attributes change, ...
by pschweitzer＠svn.reactos.org 07 Mar '14

07 Mar '14

Author: pschweitzer Date: Fri Mar 7 19:46:37 2014 New Revision: 62445 URL: http://svn.reactos.org/svn/reactos?rev=62445&view=rev Log: [FASTFAT] Add really limited support for file system notifications. In case of file creation, we report this. More cases are missing, such as: dir creation, attributes change, size change, last write change. See: http://msdn.microsoft.com/en-us/library/windows/desktop/aa364417%28v=vs.85%… as a reference CORE-2582 Modified: trunk/reactos/drivers/filesystems/fastfat/create.c Modified: trunk/reactos/drivers/filesystems/fastfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/create.c [iso-8859-1] Fri Mar 7 19:46:37 2014 @@ -754,6 +754,19 @@ &pFcb->FCBShareAccess); } + if (Irp->IoStatus.Information == FILE_CREATED) + { + FsRtlNotifyFullReportChange(DeviceExt->NotifySync, + &(DeviceExt->NotifyList), + (PSTRING)&pFcb->PathNameU, + pFcb->PathNameU.Length - pFcb->LongNameU.Length, + NULL, + NULL, + FILE_NOTIFY_CHANGE_FILE_NAME, + FILE_ACTION_ADDED, + NULL); + } + pFcb->OpenHandleCount++; /* FIXME : test write access if requested */

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