Ros-diffs February 2014

ros-diffs@reactos.org

17 participants
464 discussions

[tkreuzer] 62272: [AfD] In AfdBindSocket, open a usermode handle and return that to the caller, instead of returning the kernel mode handle.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 21:41:33 2014 New Revision: 62272 URL: http://svn.reactos.org/svn/reactos?rev=62272&view=rev Log: [AfD] In AfdBindSocket, open a usermode handle and return that to the caller, instead of returning the kernel mode handle. Modified: trunk/reactos/drivers/network/afd/afd/bind.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Thu Feb 20 21:41:33 2014 @@ -77,6 +77,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_BIND_DATA BindReq; + HANDLE UserHandle; UNREFERENCED_PARAMETER(DeviceObject); @@ -99,9 +100,20 @@ AFD_DbgPrint(MID_TRACE,("FCB->Flags %x\n", FCB->Flags)); if (NT_SUCCESS(Status)) - FCB->State = SOCKET_STATE_BOUND; + { + UserHandle = NULL; + Status = ObOpenObjectByPointer(FCB->AddressFile.Object, + 0, + NULL, + MAXIMUM_ALLOWED, + IoFileObjectType, + Irp->RequestorMode, + &UserHandle); + if (NT_SUCCESS(Status)) + FCB->State = SOCKET_STATE_BOUND; + } /* MSAFD relies on us returning the address file handle in the IOSB */ return UnlockAndMaybeComplete( FCB, Status, Irp, - (ULONG_PTR)FCB->AddressFile.Handle ); + (ULONG_PTR)UserHandle); }

10 years, 10 months

[tkreuzer] 62271: [HOST_TOOLS] Move pecoff.h from the tools roto dir to the include/host

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 21:20:47 2014 New Revision: 62271 URL: http://svn.reactos.org/svn/reactos?rev=62271&view=rev Log: [HOST_TOOLS] Move pecoff.h from the tools roto dir to the include/host Added: trunk/reactos/include/host/pecoff.h - copied unchanged from r62218, trunk/reactos/tools/pecoff.h Removed: trunk/reactos/tools/pecoff.h Modified: trunk/reactos/tools/obj2bin/obj2bin.c trunk/reactos/tools/rsym/rsym.h Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Thu Feb 20 21:20:47 2014 @@ -2,7 +2,7 @@ #include <stdlib.h> #include <string.h> #include <typedefs.h> -#include "../pecoff.h" +#include <pecoff.h> static void Removed: trunk/reactos/tools/pecoff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pecoff.h?rev=62270 ============================================================================== --- trunk/reactos/tools/pecoff.h [iso-8859-1] (original) +++ trunk/reactos/tools/pecoff.h (removed) @@ -1,250 +0,0 @@ -#pragma once - -#define IMAGE_NT_OPTIONAL_HDR32_MAGIC 0x010b -#define IMAGE_NT_OPTIONAL_HDR64_MAGIC 0x020b - -#define IMAGE_DOS_MAGIC 0x5a4d -#define IMAGE_PE_MAGIC 0x00004550 -#define IMAGE_SIZEOF_SHORT_NAME 8 - -#define IMAGE_FILE_LINE_NUMS_STRIPPED 0x0004 -#define IMAGE_FILE_LOCAL_SYMS_STRIPPED 0x0008 -#define IMAGE_FILE_DEBUG_STRIPPED 0x0200 - -#define IMAGE_FILE_MACHINE_I386 0x14c -#define IMAGE_FILE_MACHINE_AMD64 0x8664 -#define IMAGE_FILE_MACHINE_IA64 0x0200 - -#define IMAGE_DIRECTORY_ENTRY_BASERELOC 5 - -#define IMAGE_SCN_TYPE_NOLOAD 0x00000002 -#define IMAGE_SCN_TYPE_NO_PAD 0x00000008 -#define IMAGE_SCN_CNT_CODE 0x00000020 -#define IMAGE_SCN_CNT_INITIALIZED_DATA 0x00000040 -#define IMAGE_SCN_CNT_UNINITIALIZED_DATA 0x00000080 -#define IMAGE_SCN_LNK_OTHER 0x00000100 -#define IMAGE_SCN_LNK_INFO 0x00000200 -#define IMAGE_SCN_LNK_REMOVE 0x00000800 -#define IMAGE_SCN_NO_DEFER_SPEC_EXC 0x00004000 -#define IMAGE_SCN_GPREL 0x00008000 -#define IMAGE_SCN_MEM_PURGEABLE 0x00020000 -#define IMAGE_SCN_MEM_LOCKED 0x00040000 -#define IMAGE_SCN_MEM_PRELOAD 0x00080000 -#define IMAGE_SCN_LNK_NRELOC_OVFL 0x01000000 -#define IMAGE_SCN_MEM_DISCARDABLE 0x02000000 -#define IMAGE_SCN_MEM_NOT_CACHED 0x04000000 -#define IMAGE_SCN_MEM_NOT_PAGED 0x08000000 -#define IMAGE_SCN_MEM_SHARED 0x10000000 -#define IMAGE_SCN_MEM_EXECUTE 0x20000000 -#define IMAGE_SCN_MEM_READ 0x40000000 -#define IMAGE_SCN_MEM_WRITE 0x80000000 - -#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 - -#define IMAGE_REL_I386_ABSOLUTE 0x0001 -#define IMAGE_REL_I386_DIR32 0x0006 - -#pragma pack(push,2) -typedef struct _IMAGE_DOS_HEADER { - WORD e_magic; - WORD e_cblp; - WORD e_cp; - WORD e_crlc; - WORD e_cparhdr; - WORD e_minalloc; - WORD e_maxalloc; - WORD e_ss; - WORD e_sp; - WORD e_csum; - WORD e_ip; - WORD e_cs; - WORD e_lfarlc; - WORD e_ovno; - WORD e_res[4]; - WORD e_oemid; - WORD e_oeminfo; - WORD e_res2[10]; - LONG e_lfanew; -} IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER; -#pragma pack(pop) - -#pragma pack(push,4) -typedef struct _IMAGE_FILE_HEADER { - WORD Machine; - WORD NumberOfSections; - DWORD TimeDateStamp; - DWORD PointerToSymbolTable; - DWORD NumberOfSymbols; - WORD SizeOfOptionalHeader; - WORD Characteristics; -} IMAGE_FILE_HEADER, *PIMAGE_FILE_HEADER; -#pragma pack(pop) - -typedef struct _IMAGE_DATA_DIRECTORY { - DWORD VirtualAddress; - DWORD Size; -} IMAGE_DATA_DIRECTORY,*PIMAGE_DATA_DIRECTORY; - -typedef struct _IMAGE_OPTIONAL_HEADER32 { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - DWORD BaseOfData; - DWORD ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Win32VersionValue; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - DWORD SizeOfStackReserve; - DWORD SizeOfStackCommit; - DWORD SizeOfHeapReserve; - DWORD SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER32,*PIMAGE_OPTIONAL_HEADER32; - -typedef struct _IMAGE_OPTIONAL_HEADER64 { - WORD Magic; - BYTE MajorLinkerVersion; - BYTE MinorLinkerVersion; - DWORD SizeOfCode; - DWORD SizeOfInitializedData; - DWORD SizeOfUninitializedData; - DWORD AddressOfEntryPoint; - DWORD BaseOfCode; - ULONGLONG ImageBase; - DWORD SectionAlignment; - DWORD FileAlignment; - WORD MajorOperatingSystemVersion; - WORD MinorOperatingSystemVersion; - WORD MajorImageVersion; - WORD MinorImageVersion; - WORD MajorSubsystemVersion; - WORD MinorSubsystemVersion; - DWORD Win32VersionValue; - DWORD SizeOfImage; - DWORD SizeOfHeaders; - DWORD CheckSum; - WORD Subsystem; - WORD DllCharacteristics; - ULONGLONG SizeOfStackReserve; - ULONGLONG SizeOfStackCommit; - ULONGLONG SizeOfHeapReserve; - ULONGLONG SizeOfHeapCommit; - DWORD LoaderFlags; - DWORD NumberOfRvaAndSizes; - IMAGE_DATA_DIRECTORY DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES]; -} IMAGE_OPTIONAL_HEADER64,*PIMAGE_OPTIONAL_HEADER64; - -#ifdef _TARGET_PE64 -typedef IMAGE_OPTIONAL_HEADER64 IMAGE_OPTIONAL_HEADER; -typedef PIMAGE_OPTIONAL_HEADER64 PIMAGE_OPTIONAL_HEADER; -#else -typedef IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER; -typedef PIMAGE_OPTIONAL_HEADER32 PIMAGE_OPTIONAL_HEADER; -#endif - -typedef struct _IMAGE_NT_HEADERS32 -{ - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS32, *PIMAGE_NT_HEADERS32; - -typedef struct _IMAGE_NT_HEADERS64 -{ - DWORD Signature; - IMAGE_FILE_HEADER FileHeader; - IMAGE_OPTIONAL_HEADER32 OptionalHeader; -} IMAGE_NT_HEADERS64, *PIMAGE_NT_HEADERS64; - -#ifdef _TARGET_PE64 -typedef IMAGE_NT_HEADERS64 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS; -#else -typedef IMAGE_NT_HEADERS32 IMAGE_NT_HEADERS; -typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS; -#endif - -typedef struct _IMAGE_SECTION_HEADER { - BYTE Name[IMAGE_SIZEOF_SHORT_NAME]; - union { - DWORD PhysicalAddress; - DWORD VirtualSize; - } Misc; - DWORD VirtualAddress; - DWORD SizeOfRawData; - DWORD PointerToRawData; - DWORD PointerToRelocations; - DWORD PointerToLinenumbers; - WORD NumberOfRelocations; - WORD NumberOfLinenumbers; - DWORD Characteristics; -} IMAGE_SECTION_HEADER,*PIMAGE_SECTION_HEADER; - -#pragma pack(push,4) -typedef struct _IMAGE_BASE_RELOCATION { - DWORD VirtualAddress; - DWORD SizeOfBlock; - WORD TypeOffset[1]; -} IMAGE_BASE_RELOCATION,*PIMAGE_BASE_RELOCATION; -#pragma pack(pop) - -#ifndef UNALIGNED -#define UNALIGNED -#endif - -#pragma pack(push,2) -typedef struct _IMAGE_RELOCATION { - union { - DWORD VirtualAddress; - DWORD RelocCount; - }; - DWORD SymbolTableIndex; - WORD Type; -} IMAGE_RELOCATION; -typedef struct _IMAGE_RELOCATION UNALIGNED *PIMAGE_RELOCATION; -#pragma pack(pop) - -#pragma pack(push,2) -typedef struct _IMAGE_SYMBOL { - union { - BYTE ShortName[8]; - struct { - DWORD Short; - DWORD Long; - } Name; - DWORD LongName[2]; - } N; - DWORD Value; - SHORT SectionNumber; - WORD Type; - BYTE StorageClass; - BYTE NumberOfAuxSymbols; -} IMAGE_SYMBOL; -typedef struct _IMAGE_SYMBOL UNALIGNED *PIMAGE_SYMBOL; -#pragma pack(pop) - -#define IMAGE_DOS_SIGNATURE 0x5A4D -#define IMAGE_OS2_SIGNATURE 0x454E -#define IMAGE_OS2_SIGNATURE_LE 0x454C -#define IMAGE_VXD_SIGNATURE 0x454C -#define IMAGE_NT_SIGNATURE 0x00004550 - -#define IMAGE_FIRST_SECTION(h) ((PIMAGE_SECTION_HEADER) ((ULONG_PTR)h+FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader)+((PIMAGE_NT_HEADERS)(h))->FileHeader.SizeOfOptionalHeader)) Modified: trunk/reactos/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym.h?rev=6227… ============================================================================== --- trunk/reactos/tools/rsym/rsym.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym.h [iso-8859-1] Thu Feb 20 21:20:47 2014 @@ -2,7 +2,7 @@ #pragma once #include <typedefs.h> -#include "../pecoff.h" +#include <pecoff.h> typedef struct { USHORT f_magic; /* magic number */

10 years, 10 months

[tkreuzer] 62270: [NTDLL_APITEST] Add a few more tests for NtAllocateVirtualMemory

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 21:19:16 2014 New Revision: 62270 URL: http://svn.reactos.org/svn/reactos?rev=62270&view=rev Log: [NTDLL_APITEST] Add a few more tests for NtAllocateVirtualMemory Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Thu Feb 20 21:19:16 2014 @@ -248,7 +248,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); ok(BaseAddress == UlongToPtr(0x50000000), "Got back wrong base address: %p", BaseAddress); ok(Size == 0x3000, "Got back wrong size: 0x%Ix", Size); @@ -261,7 +261,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); /* Commit memory */ BaseAddress = UlongToPtr(0x50002000); @@ -272,11 +272,24 @@ &Size, MEM_COMMIT, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); ok(BaseAddress == UlongToPtr(0x50002000), "Got back wrong base address: %p", BaseAddress); ok(Size == 0x1000, "Got back wrong size: 0x%Ix", Size); - /* Commit memory */ + /* Commit the same address again with a different protection */ + BaseAddress = UlongToPtr(0x50002000); + Size = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + ok(BaseAddress == UlongToPtr(0x50002000), "Got back wrong base address: %p", BaseAddress); + ok(Size == 0x1000, "Got back wrong size: 0x%Ix", Size); + + /* Commit memory at a too high address */ BaseAddress = UlongToPtr(0x50003000); Size = 0x1000; Status = NtAllocateVirtualMemory(NtCurrentProcess(), @@ -285,31 +298,37 @@ &Size, MEM_COMMIT, PAGE_NOACCESS); - ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + + /* Decommit the memory, even those pages that were not committed */ + BaseAddress = UlongToPtr(0x50000000); + Size = 0x3000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_DECOMMIT); + ok_ntstatus(Status, STATUS_SUCCESS); /* Try to release memory in a different 64k region */ BaseAddress = UlongToPtr(0x50010000); Size = 0x1000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_MEMORY_NOT_ALLOCATED); /* Release the memory in the same 64k region at a different address */ BaseAddress = UlongToPtr(0x50008000); Size = 0x1000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_MEMORY_NOT_ALLOCATED); /* Release the memory at the correct address but with wrong size */ BaseAddress = UlongToPtr(0x50000000); Size = 0x4000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_UNABLE_TO_FREE_VM); /* Release the memory */ BaseAddress = UlongToPtr(0x50000000); Size = 0x3000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); /* Reserve and commit at once */ BaseAddress = UlongToPtr(0x50004080); @@ -320,7 +339,7 @@ &Size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); ok(BaseAddress == UlongToPtr(0x50000000), "Got back wrong base address: %p", BaseAddress); ok(Size == 0x6000, "Got back wrong size: 0x%Ix", Size); @@ -337,7 +356,7 @@ /* Release the memory */ Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); } @@ -358,7 +377,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -371,7 +390,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -379,7 +398,7 @@ BaseAddress = UlongToPtr(0x50000000); Size = 0x30000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_UNABLE_TO_FREE_VM); /* Reserve the part in the middle */ BaseAddress = UlongToPtr(0x50010000); @@ -390,7 +409,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); /* Try to commit memory covering 2 allocations */ BaseAddress = UlongToPtr(0x50004000); @@ -401,7 +420,7 @@ &Size, MEM_COMMIT, PAGE_NOACCESS); - ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail!\n"); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); /* Commit a page */ BaseAddress = UlongToPtr(0x50000000); @@ -412,7 +431,7 @@ &Size, MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); /* Commit another page */ BaseAddress = UlongToPtr(0x50002000); @@ -423,7 +442,7 @@ &Size, MEM_COMMIT, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); _SEH2_TRY { @@ -444,7 +463,7 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - ok(Status = STATUS_ACCESS_VIOLATION, "Should get an exception!\n"); + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); /* Allocate 3 pages, on top of the previous 2 */ BaseAddress = UlongToPtr(0x50000000); @@ -455,7 +474,7 @@ &Size, MEM_COMMIT, PAGE_READONLY); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); _SEH2_TRY { @@ -466,28 +485,28 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END; - ok(Status = STATUS_ACCESS_VIOLATION, "Should get an exception!\n"); + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); /* Try to free the whole region at once */ BaseAddress = UlongToPtr(0x50000000); Size = 0x30000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(!NT_SUCCESS(Status), "NtFreeVirtualMemory should fail!\n"); - - BaseAddress = UlongToPtr(0x50000000); - Size = 0x10000; - Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_UNABLE_TO_FREE_VM); + + BaseAddress = UlongToPtr(0x50000000); + Size = 0x10000; + Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); + ok_ntstatus(Status, STATUS_SUCCESS); BaseAddress = UlongToPtr(0x50010000); Size = 0x10000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); BaseAddress = UlongToPtr(0x50020000); Size = 0x10000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); /* Reserve 3 full 64k region */ BaseAddress = UlongToPtr(0x50000000); @@ -498,7 +517,7 @@ &Size, MEM_RESERVE, PAGE_NOACCESS); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -506,7 +525,7 @@ BaseAddress = UlongToPtr(0x50010000); Size = 0x10000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &Size, MEM_RELEASE); - ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed!\n"); + ok_ntstatus(Status, STATUS_SUCCESS); } @@ -517,9 +536,32 @@ PVOID Mem1, Mem2; SIZE_T Size1, Size2; ULONG i; + NTSTATUS Status; CheckAlignment(); CheckAdjacentVADs(); + + /* Reserve memory below 0x10000 */ + Mem1 = UlongToPtr(0xf000); + Size1 = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Mem1, + 0, + &Size1, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_2); + + /* Reserve memory at 0x10000 */ + Mem1 = UlongToPtr(0x10000); + Size1 = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &Mem1, + 0, + &Size1, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); Size1 = 32; Mem1 = Allocate(Size1);

10 years, 10 months

[tkreuzer] 62269: [DLLEXPORT_TEST] Add a test that checks the ability to link to function and data exports with cdecl, stdcall and c++ mangled names, including forwarders. It just prints "done". Fe...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 20:29:51 2014 New Revision: 62269 URL: http://svn.reactos.org/svn/reactos?rev=62269&view=rev Log: [DLLEXPORT_TEST] Add a test that checks the ability to link to function and data exports with cdecl, stdcall and c++ mangled names, including forwarders. It just prints "done". Feel free to convert it into a proper rostests, if you think it's required. Added: trunk/rostests/tests/dllexport/ (with props) trunk/rostests/tests/dllexport/CMakeLists.txt (with props) trunk/rostests/tests/dllexport/dllexport_test.c (with props) trunk/rostests/tests/dllexport/dllexport_test_dll1.c (with props) trunk/rostests/tests/dllexport/dllexport_test_dll1.spec (with props) trunk/rostests/tests/dllexport/dllexport_test_dll2.c (with props) trunk/rostests/tests/dllexport/dllexport_test_dll2.spec (with props) Modified: trunk/rostests/tests/CMakeLists.txt Modified: trunk/rostests/tests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/tests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/tests/CMakeLists.txt [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -2,3 +2,4 @@ if (NOT MSVC) add_subdirectory(pseh2) endif() +add_subdirectory(dllexport) Propchange: trunk/rostests/tests/dllexport/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Feb 20 20:29:51 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/tests/dllexport/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/tests/dllexport/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/tests/dllexport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/CMakeList… ============================================================================== --- trunk/rostests/tests/dllexport/CMakeLists.txt (added) +++ trunk/rostests/tests/dllexport/CMakeLists.txt [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,21 @@ + +spec2def(dllexport_test_dll1.dll dllexport_test_dll1.spec ADD_IMPORTLIB) +spec2def(dllexport_test_dll2.dll dllexport_test_dll2.spec ADD_IMPORTLIB) + +add_library(dllexport_test_dll1 SHARED + dllexport_test_dll1.c + ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll1.def) +set_module_type(dllexport_test_dll1 win32dll ENTRYPOINT 0) +add_importlibs(dllexport_test_dll1 dllexport_test_dll2) + +add_library(dllexport_test_dll2 SHARED + dllexport_test_dll2.c + ${CMAKE_CURRENT_BINARY_DIR}/dllexport_test_dll2.def) +set_module_type(dllexport_test_dll2 win32dll ENTRYPOINT 0) + + +add_executable(dllexport_test + dllexport_test.c) + +set_module_type(dllexport_test win32cui) +add_importlibs(dllexport_test dllexport_test_dll1 msvcrt kernel32 ntdll) Propchange: trunk/rostests/tests/dllexport/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/dllexport/dllexport_test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test.c (added) +++ trunk/rostests/tests/dllexport/dllexport_test.c [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,89 @@ + +#include <stdio.h> + +#ifdef __GNUC__ +#endif + +__declspec(dllimport) int __cdecl CdeclFunc0(void); +__declspec(dllimport) int __cdecl CdeclFunc1(char* a1); +__declspec(dllimport) int __cdecl CdeclFunc2(char* a1); +__declspec(dllimport) int __cdecl CdeclFunc3(char* a1); + +__declspec(dllimport) int __stdcall StdcallFunc0(void); +__declspec(dllimport) int __stdcall StdcallFunc1(char* a1); +__declspec(dllimport) int __stdcall StdcallFunc2(char* a1); +__declspec(dllimport) int __stdcall StdcallFunc3(char* a1); +__declspec(dllimport) int __stdcall StdcallFunc4(char* a1); +__declspec(dllimport) int __stdcall StdcallFunc5(char* a1); + +__declspec(dllimport) int __stdcall DecoratedStdcallFunc1(char* a1); +__declspec(dllimport) int __stdcall DecoratedStdcallFunc2(char* a1); +__declspec(dllimport) int __stdcall DecoratedStdcallFunc3(char* a1); +__declspec(dllimport) int __stdcall DecoratedStdcallFunc4(char* a1); +__declspec(dllimport) int __stdcall DecoratedStdcallFunc5(char* a1); + +__declspec(dllimport) int __fastcall FastcallFunc0(void); +__declspec(dllimport) int __fastcall FastcallFunc1(char* a1); +__declspec(dllimport) int __fastcall FastcallFunc2(char* a1); +__declspec(dllimport) int __fastcall FastcallFunc3(char* a1); +__declspec(dllimport) int __fastcall FastcallFunc4(char* a1); +__declspec(dllimport) int __fastcall FastcallFunc5(char* a1); + +__declspec(dllimport) int __fastcall DecoratedFastcallFunc1(char* a1); +__declspec(dllimport) int __fastcall DecoratedFastcallFunc2(char* a1); +__declspec(dllimport) int __fastcall DecoratedFastcallFunc3(char* a1); +__declspec(dllimport) int __fastcall DecoratedFastcallFunc4(char* a1); +__declspec(dllimport) int __fastcall DecoratedFastcallFunc5(char* a1); + +__declspec(dllimport) extern int DataItem1; +__declspec(dllimport) extern int DataItem2; +__declspec(dllimport) extern int DataItem3; + +#define ok_int(a, b) \ + if ((a) != (b)) { printf("wrong result in line %d, expected 0x%x, got 0x%x\n", __LINE__, (b), (a)); } + +int main(int argc, char *argv[]) +{ + char* str = "defaultstring"; + + if (argc > 2) + str = argv[1]; + + ok_int(CdeclFunc0(), 0); + ok_int(CdeclFunc1(str), 1); + ok_int(CdeclFunc2(str), 1); + ok_int(CdeclFunc3(str), 0x10001); + + ok_int(StdcallFunc0(), 0x10); + ok_int(StdcallFunc1(str), 0x11); + ok_int(StdcallFunc2(str), 0x11); + ok_int(StdcallFunc3(str), 0x10011); + ok_int(StdcallFunc4(str), 0x21); + ok_int(StdcallFunc5(str), 0x10021); + + ok_int(DecoratedStdcallFunc1(str), 0x21); + ok_int(DecoratedStdcallFunc2(str), 0x11); + //ok_int(DecoratedStdcallFunc3(str), 11); + ok_int(DecoratedStdcallFunc4(str), 0x21); + ok_int(DecoratedStdcallFunc5(str), 0x10021); + + ok_int(FastcallFunc0(), 0x30); + ok_int(FastcallFunc1(str), 0x31); + ok_int(FastcallFunc2(str), 0x31); + ok_int(FastcallFunc3(str), 0x10031); + ok_int(FastcallFunc4(str), 0x42); + ok_int(FastcallFunc5(str), 0x10041); + ok_int(DecoratedFastcallFunc1(str), 0x42); + ok_int(DecoratedFastcallFunc2(str), 0x31); + //ok_int(DecoratedFastcallFunc3(str), 11); + ok_int(DecoratedFastcallFunc4(str), 0x42); + ok_int(DecoratedFastcallFunc5(str), 0x10041); + + ok_int(DataItem1, 0x51); + ok_int(DataItem2, 0x51); + ok_int(DataItem3, 0x10051); + + printf("done.\n"); + + return 0; +} Propchange: trunk/rostests/tests/dllexport/dllexport_test.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/dllexport/dllexport_test_dll1.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll1.c (added) +++ trunk/rostests/tests/dllexport/dllexport_test_dll1.c [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,49 @@ + +int __cdecl CdeclFunc0(void) +{ + return 0x0; +} + +int __cdecl CdeclFunc1(char *p1) +{ + return 0x1; +} + +int __stdcall StdcallFunc0(void) +{ + return 0x10; +} + +int __stdcall StdcallFunc1(char *p1) +{ + return 0x11; +} + +int __stdcall DecoratedStdcallFunc1(char *p1) +{ + return 0x21; +} + +int __fastcall FastcallFunc0(void) +{ + return 0x30; +} + +int __fastcall FastcallFunc1(char *p1) +{ + return 0x31; +} + +int __fastcall DecoratedFastcallFunc1(char *p1) +{ + return 0x42; +} + +int __stdcall ExportByOrdinal1(char *p1) +{ + return 0x11; +} + +int DataItem1 = 0x51; +int DataItem2 = 0x52; + Propchange: trunk/rostests/tests/dllexport/dllexport_test_dll1.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/dllexport/dllexport_test_dll1.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll1.spec (added) +++ trunk/rostests/tests/dllexport/dllexport_test_dll1.spec [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,55 @@ + +# Normal export of a cdecl function + @ cdecl CdeclFunc0() + @ cdecl CdeclFunc1(ptr) + +# Redirected cdecl function + @ cdecl CdeclFunc2() CdeclFunc1 + @ cdecl CdeclFunc3() dllexport_test_dll2.CdeclFunc1 + +# Normal export of a stdcall function + @ stdcall StdcallFunc0() + @ stdcall StdcallFunc1(ptr) + +# Decorated export of a stdcall function + @ stdcall _StdcallFunc1@4(ptr) + @ stdcall _DecoratedStdcallFunc1@4(ptr) + +# Redirected stdcall function + @ stdcall StdcallFunc2(ptr) StdcallFunc1 + @ stdcall StdcallFunc3(ptr) dllexport_test_dll2.StdcallFunc1 + @ stdcall StdcallFunc4(ptr) _DecoratedStdcallFunc1@4 + @ stdcall StdcallFunc5(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 + @ stdcall _DecoratedStdcallFunc2@4(ptr) StdcallFunc1 +; @ stdcall _DecoratedStdcallFunc3@4(ptr) dllexport_test_dll2.StdcallFunc1 # This doesn't work with MSVC! + @ stdcall _DecoratedStdcallFunc4@4(ptr) _DecoratedStdcallFunc1@4 + @ stdcall _DecoratedStdcallFunc5@4(ptr) dllexport_test_dll2._DecoratedStdcallFunc1@4 + +# Normal export of a fastcall function + @ fastcall FastcallFunc0() + @ fastcall FastcallFunc1(ptr) + +# Decorated export of a fastcall function + @ fastcall @DecoratedFastcallFunc1@4(ptr) + +# Redirected fastcall function + @ fastcall FastcallFunc2(ptr) FastcallFunc1 + @ fastcall FastcallFunc3(ptr) dllexport_test_dll2.FastcallFunc1 + @ fastcall FastcallFunc4(ptr) @DecoratedFastcallFunc1@4 + @ fastcall FastcallFunc5(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 + + @ fastcall @DecoratedFastcallFunc2@4(ptr) FastcallFunc1 +; @ fastcall @DecoratedFastcallFunc3@4(ptr) dllexport_test_dll2.FastcallFunc1 # This doesn't work with MSVC! + @ fastcall @DecoratedFastcallFunc4@4(ptr) @DecoratedFastcallFunc1@4 + @ fastcall @DecoratedFastcallFunc5@4(ptr) dllexport_test_dll2.@DecoratedFastcallFunc1@4 + +# Normal export of data + @ extern DataItem1 + +# Redirected data + @ extern DataItem2 DataItem1 + @ extern DataItem3 dllexport_test_dll2.DataItem1 + +# other stuff + 123 stdcall @(ptr) ExportByOrdinal1 + 218 stdcall -noname ExportByOrdinal1(ptr) Propchange: trunk/rostests/tests/dllexport/dllexport_test_dll1.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/dllexport/dllexport_test_dll2.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll2.c (added) +++ trunk/rostests/tests/dllexport/dllexport_test_dll2.c [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,45 @@ + +int __cdecl CdeclFunc0(void) +{ + return 0x10000; +} + +int __cdecl CdeclFunc1(char *p1) +{ + return 0x10001; +} + +int __stdcall StdcallFunc0(void) +{ + return 0x10010; +} + +int __stdcall StdcallFunc1(char *p1) +{ + return 0x10011; +} + +int __stdcall DecoratedStdcallFunc1(char *p1) +{ + return 0x10021; +} + +int __fastcall FastcallFunc0(void) +{ + return 0x10030; +} + +int __fastcall FastcallFunc1(char *p1) +{ + return 0x10031; +} + +int __fastcall DecoratedFastcallFunc1(char *p1) +{ + return 0x10041; +} + +int DataItem1 = 0x10051; +int DataItem2 = 0x10052; + + Propchange: trunk/rostests/tests/dllexport/dllexport_test_dll2.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/tests/dllexport/dllexport_test_dll2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dllexport/dllexport… ============================================================================== --- trunk/rostests/tests/dllexport/dllexport_test_dll2.spec (added) +++ trunk/rostests/tests/dllexport/dllexport_test_dll2.spec [iso-8859-1] Thu Feb 20 20:29:51 2014 @@ -0,0 +1,23 @@ + +# Normal export of a cdecl function + @ cdecl CdeclFunc0() + @ cdecl CdeclFunc1(ptr) + +# Normal export of a stdcall function + @ stdcall StdcallFunc0() + @ stdcall StdcallFunc1(ptr) + +# Decorated export of a stdcall function + @ stdcall _DecoratedStdcallFunc1@4(ptr) + +# Normal export of a fastcall function + @ fastcall FastcallFunc0() + @ fastcall FastcallFunc1(ptr) + +# Decorated export of a fastcall function + @ fastcall @DecoratedFastcallFunc1@4(ptr) + +# Normal export of data + @ extern DataItem1 + @ extern DataItem2 + Propchange: trunk/rostests/tests/dllexport/dllexport_test_dll2.spec ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 10 months

[tkreuzer] 62268: [PSEH2_TEST] Add another test for non-volatile values. Note that PSEH does NOT work like real SEH here, but this is expected and can not be fixed without special compiler support....

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Feb 20 20:20:26 2014 New Revision: 62268 URL: http://svn.reactos.org/svn/reactos?rev=62268&view=rev Log: [PSEH2_TEST] Add another test for non-volatile values. Note that PSEH does NOT work like real SEH here, but this is expected and can not be fixed without special compiler support. Do NEVER DO this kind of stuff inside SEH blocks! Use volatile variables in this case. Modified: trunk/rostests/tests/pseh2/psehtest.c Modified: trunk/rostests/tests/pseh2/psehtest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/pseh2/psehtest.c?re… ============================================================================== --- trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] (original) +++ trunk/rostests/tests/pseh2/psehtest.c [iso-8859-1] Thu Feb 20 20:20:26 2014 @@ -2437,6 +2437,54 @@ _SEH2_END; return (val == 3) || (val == 4) || (val == 5); +} + +DEFINE_TEST(test_unvolatile_3) +{ + int register val1 = 0, val2 = 0; + + _SEH2_TRY + { + val1 = 1; + + _SEH2_TRY + { + val2 = 1; + *((char*)0xc0000000) = 0; + val2 = 2; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + val2 |= 4; + } + _SEH2_END; + + val1 = 2; + *((int*)0xc0000000) = 1; + val1 = 3; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + val1 = val1 * val2; + } + _SEH2_END; + + /* The expected case */ + if ((val1 == 10) && (val2 == 5)) + return TRUE; + + /* The compiler can optimize away "val1 = 1" and "val1 = 2" and + only use the last "val1 = 3", in this case val1 is still 0 + when the outer exception handler kicks in */ + if ((val1 == 0) && (val2 == 5)) + return TRUE; + + /* Same as above, but this time val2 optimized away */ + if (((val1 == 8) && (val2 == 4)) || + ((val1 == 0) && (val2 == 4))) + return TRUE; + + return FALSE; } DEFINE_TEST(test_finally_goto) @@ -2765,6 +2813,7 @@ USE_TEST(test_unvolatile), USE_TEST(test_unvolatile_2), + USE_TEST(test_unvolatile_3), USE_TEST(test_finally_goto), USE_TEST(test_nested_exception), USE_TEST(test_PSEH3_bug),

10 years, 10 months

[hbelusca] 62267: [KERNEL32] Revert r62264. Reason: all APIs set the last error when a CSR* call doesn't return STATUS_SUCCESS. If some winetests fail because of this, this is because we do not cor...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu Feb 20 20:17:53 2014 New Revision: 62267 URL: http://svn.reactos.org/svn/reactos?rev=62267&view=rev Log: [KERNEL32] Revert r62264. Reason: all APIs set the last error when a CSR* call doesn't return STATUS_SUCCESS. If some winetests fail because of this, this is because we do not correctly do what's needed here (normally the TRUE or FALSE value is returned by the console server, and is not retrieved by a success or failure of a CSR call contrary to what's done here). Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Feb 20 20:17:53 2014 @@ -796,6 +796,7 @@ sizeof(CONSOLE_VERIFYHANDLE)); if (!NT_SUCCESS(Status)) { + BaseSetLastNTError(Status); return FALSE; }

10 years, 10 months

[tfaber] 62266: [CRT] - Force the use of memory operands in bit test intrinsics. Bit offsets above 31 (or 63) can't behave correctly with registers (the constant case is fine because it ensures low...

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 20 19:28:27 2014 New Revision: 62266 URL: http://svn.reactos.org/svn/reactos?rev=62266&view=rev Log: [CRT] - Force the use of memory operands in bit test intrinsics. Bit offsets above 31 (or 63) can't behave correctly with registers (the constant case is fine because it ensures low offsets). Thanks to Timo Kreuzer and Alex Radocea. Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Thu Feb 20 19:28:27 2014 @@ -1032,7 +1032,7 @@ if(__builtin_constant_p(b)) __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 32))), [b] "Ir" (b % 32)); else - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); + __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "m" (*a), [b] "r" (b)); return retval; } @@ -1045,7 +1045,7 @@ if(__builtin_constant_p(b)) __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*(a + (b / 64))), [b] "Ir" (b % 64)); else - __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "mr" (*a), [b] "r" (b)); + __asm__("bt %[b], %[a]; setb %b[retval]" : [retval] "=q" (retval) : [a] "m" (*a), [b] "r" (b)); return retval; } @@ -1058,7 +1058,7 @@ if(__builtin_constant_p(b)) __asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32)); else - __asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b)); + __asm__("btc %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); return retval; } @@ -1070,7 +1070,7 @@ if(__builtin_constant_p(b)) __asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32)); else - __asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b)); + __asm__("btr %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); return retval; } @@ -1082,7 +1082,7 @@ if(__builtin_constant_p(b)) __asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+mr" (*(a + (b / 32))), [retval] "=q" (retval) : [b] "Ir" (b % 32)); else - __asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+mr" (*a), [retval] "=q" (retval) : [b] "r" (b)); + __asm__("bts %[b], %[a]; setb %b[retval]" : [a] "+m" (*a), [retval] "=q" (retval) : [b] "r" (b)); return retval; }

10 years, 10 months

[tfaber] 62265: [KMTESTS] - Disable Example test since it has intentional failures. Dedicated to Christoph

by tfaber＠svn.reactos.org

Author: tfaber Date: Thu Feb 20 19:26:24 2014 New Revision: 62265 URL: http://svn.reactos.org/svn/reactos?rev=62265&view=rev Log: [KMTESTS] - Disable Example test since it has intentional failures. Dedicated to Christoph Modified: trunk/rostests/kmtests/kmtest/testlist.c Modified: trunk/rostests/kmtests/kmtest/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/testlist.c… ============================================================================== --- trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/testlist.c [iso-8859-1] Thu Feb 20 19:26:24 2014 @@ -21,7 +21,7 @@ /* tests with a leading '-' will not be listed */ const KMT_TEST TestList[] = { - { "Example", Test_Example }, + { "-Example", Test_Example }, { "FindFile", Test_FindFile }, { "IoDeviceObject", Test_IoDeviceObject }, { "RtlAvlTree", Test_RtlAvlTree },

10 years, 10 months

[cwittich] 62264: [kernel32] don't set LastError in VerifyConsoleIoHandle

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Feb 20 19:15:54 2014 New Revision: 62264 URL: http://svn.reactos.org/svn/reactos?rev=62264&view=rev Log: [kernel32] don't set LastError in VerifyConsoleIoHandle Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c Modified: trunk/reactos/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu Feb 20 19:15:54 2014 @@ -796,7 +796,6 @@ sizeof(CONSOLE_VERIFYHANDLE)); if (!NT_SUCCESS(Status)) { - BaseSetLastNTError(Status); return FALSE; }

10 years, 10 months

[dquintana] 62263: [RSHELL] * Improve the layout of the class definitions to make the important details easier to find. * Rename private (non-COM) class methods to more appropriate names, including...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu Feb 20 16:18:49 2014 New Revision: 62263 URL: http://svn.reactos.org/svn/reactos?rev=62263&view=rev Log: [RSHELL] * Improve the layout of the class definitions to make the important details easier to find. * Rename private (non-COM) class methods to more appropriate names, including a prefix. * CMenuBand: Make one submenu close before showing another one. This may not be happening in the same exact way windows does it. CORE-7881 Modified: branches/shell-experiments/base/shell/rshell/CMenuBand.cpp branches/shell-experiments/base/shell/rshell/CMenuDeskBar.cpp branches/shell-experiments/base/shell/rshell/CMenuSite.cpp branches/shell-experiments/base/shell/rshell/precomp.h 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] Thu Feb 20 16:18:49 2014 @@ -21,9 +21,9 @@ #include <windowsx.h> #include <shlwapi_undoc.h> +#define TBSTYLE_EX_VERTICAL 4 + WINE_DEFAULT_DEBUG_CHANNEL(CMenuBand); - -#define TBSTYLE_EX_VERTICAL 4 #define TIMERID_HOTTRACK 1 #define SUBCLASS_ID_MENUBAND 1 @@ -35,47 +35,49 @@ class CMenuToolbarBase { +protected: + CMenuBand * m_menuBand; + HWND m_hwnd; + DWORD m_dwMenuFlags; + INT m_hotItem; + WNDPROC m_SubclassOld; + +private: + static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + public: CMenuToolbarBase(CMenuBand *menuBand); virtual ~CMenuToolbarBase() {} + HRESULT IsWindowOwner(HWND hwnd); HRESULT CreateToolbar(HWND hwndParent, DWORD dwFlags); HRESULT GetWindow(HWND *phwnd); HRESULT ShowWindow(BOOL fShow); HRESULT Close(); - BOOL IsWindowOwner(HWND hwnd) { return m_hwnd && m_hwnd == hwnd; } - virtual HRESULT FillToolbar() = 0; virtual HRESULT PopupItem(UINT uItem) = 0; virtual HRESULT HasSubMenu(UINT uItem) = 0; + virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT OnContextMenu(NMMOUSE * rclick) = 0; - - HRESULT OnHotItemChange(const NMTBHOTITEM * hot); HRESULT PopupSubMenu(UINT index, IShellMenu* childShellMenu); HRESULT PopupSubMenu(UINT index, HMENU menu); HRESULT DoContextMenu(IContextMenu* contextMenu); - HRESULT ChildTrack(DWORD dwSelectType); - - static LRESULT CALLBACK s_SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + HRESULT ChangeHotItem(DWORD changeType); + HRESULT OnHotItemChange(const NMTBHOTITEM * hot); + protected: - - static const UINT WM_USER_SHOWPOPUPMENU = WM_USER + 1; - LRESULT CALLBACK SubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - - CMenuBand *m_menuBand; - HWND m_hwnd; - DWORD m_dwMenuFlags; - INT m_hotItem; - WNDPROC m_SubclassOld; }; -class CMenuStaticToolbar : public CMenuToolbarBase -{ +class CMenuStaticToolbar : + public CMenuToolbarBase +{ +private: + HMENU m_hmenu; + public: CMenuStaticToolbar(CMenuBand *menuBand); virtual ~CMenuStaticToolbar() {} @@ -89,12 +91,16 @@ virtual HRESULT OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult); virtual HRESULT OnContextMenu(NMMOUSE * rclick); +}; + +class CMenuSFToolbar : + public CMenuToolbarBase +{ private: - HMENU m_hmenu; -}; - -class CMenuSFToolbar : public CMenuToolbarBase -{ + IShellFolder * m_shellFolder; + LPCITEMIDLIST m_idList; + HKEY m_hKey; + public: CMenuSFToolbar(CMenuBand *menuBand); virtual ~CMenuSFToolbar(); @@ -109,11 +115,7 @@ virtual HRESULT OnContextMenu(NMMOUSE * rclick); private: - LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex); - - IShellFolder * m_shellFolder; - LPCITEMIDLIST m_idList; - HKEY m_hKey; + LPITEMIDLIST GetPidlFromId(UINT uItem, INT* pIndex = NULL); }; class CMenuBand : @@ -131,127 +133,31 @@ public IWinEventHandler, public IShellMenuAcc { +private: + CMenuFocusManager * m_focusManager; + CMenuStaticToolbar * m_staticToolbar; + CMenuSFToolbar * m_SFToolbar; + + CComPtr<IOleWindow> m_site; + CComPtr<IShellMenuCallback> m_psmc; + CComPtr<IMenuPopup> m_childMenu; + + UINT m_uId; + UINT m_uIdAncestor; + DWORD m_dwFlags; + PVOID m_UserData; + HMENU m_hmenu; + HWND m_menuOwner; + + BOOL m_useBigIcons; + HWND m_topLevelWindow; + + CMenuToolbarBase * m_hotBar; + INT m_hotItem; + public: CMenuBand(); ~CMenuBand(); - -private: - IOleWindow *m_site; - IShellMenuCallback *m_psmc; - - CMenuStaticToolbar *m_staticToolbar; - CMenuSFToolbar *m_SFToolbar; - - UINT m_uId; - UINT m_uIdAncestor; - DWORD m_dwFlags; - PVOID m_UserData; - HMENU m_hmenu; - HWND m_menuOwner; - - BOOL m_useBigIcons; - - HWND m_topLevelWindow; - - CMenuFocusManager * m_focusManager; - - CMenuToolbarBase * m_hotBar; - INT m_hotItem; - -public: - - // *** IDeskBand methods *** - virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); - - // *** IDockingWindow methods *** - virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); - virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); - virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); - - // *** IInputObject methods *** - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); - - // *** IPersistStream methods *** - virtual HRESULT STDMETHODCALLTYPE IsDirty(); - virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); - virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); - virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); - - // *** IPersist methods *** - virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - // *** IMenuPopup methods *** - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); - - // *** IDeskBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); - - // *** IMenuBand methods *** - virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); - virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); - - // *** IShellMenu methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); - virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); - virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); - virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); - virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); - virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); - - // *** IWinEventHandler methods *** - virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); - virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); - - // *** IShellMenu2 methods *** - virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); - virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); - virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); - virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); - virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); - - // *** IShellMenuAcc methods *** - virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); - virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); - virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); - virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); - virtual HRESULT STDMETHODCALLTYPE GetState(THIS); - virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); - virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); - - HRESULT CallCBWithId(UINT Id, UINT uMsg, WPARAM wParam, LPARAM lParam); - HRESULT CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam); - HRESULT TrackPopup(HMENU popup, INT x, INT y); - HRESULT GetTopLevelWindow(HWND*topLevel); - HRESULT OnHotItemChanged(CMenuToolbarBase * tb, INT id); - HRESULT ChildTrack(DWORD reason); - - BOOL UseBigIcons() { - return m_useBigIcons; - } DECLARE_NOT_AGGREGATABLE(CMenuBand) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -275,6 +181,101 @@ COM_INTERFACE_ENTRY_IID(IID_IShellMenuAcc, IShellMenuAcc) END_COM_MAP() + // *** IDeskBand methods *** + virtual HRESULT STDMETHODCALLTYPE GetBandInfo(DWORD dwBandID, DWORD dwViewMode, DESKBANDINFO *pdbi); + + // *** IDockingWindow methods *** + virtual HRESULT STDMETHODCALLTYPE ShowDW(BOOL fShow); + virtual HRESULT STDMETHODCALLTYPE CloseDW(DWORD dwReserved); + virtual HRESULT STDMETHODCALLTYPE ResizeBorderDW(LPCRECT prcBorder, IUnknown *punkToolbarSite, BOOL fReserved); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL fActivate, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IPersistStream methods *** + virtual HRESULT STDMETHODCALLTYPE IsDirty(); + virtual HRESULT STDMETHODCALLTYPE Load(IStream *pStm); + virtual HRESULT STDMETHODCALLTYPE Save(IStream *pStm, BOOL fClearDirty); + virtual HRESULT STDMETHODCALLTYPE GetSizeMax(ULARGE_INTEGER *pcbSize); + + // *** IPersist methods *** + virtual HRESULT STDMETHODCALLTYPE GetClassID(CLSID *pClassID); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(RECT *prc); + + // *** IMenuBand methods *** + virtual HRESULT STDMETHODCALLTYPE IsMenuMessage(MSG *pmsg); + virtual HRESULT STDMETHODCALLTYPE TranslateMenuMessage(MSG *pmsg, LRESULT *plRet); + + // *** IShellMenu methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(IShellMenuCallback *psmc, UINT uId, UINT uIdAncestor, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenuInfo(IShellMenuCallback **ppsmc, UINT *puId, UINT *puIdAncestor, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE SetShellFolder(IShellFolder *psf, LPCITEMIDLIST pidlFolder, HKEY hKey, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetShellFolder(DWORD *pdwFlags, LPITEMIDLIST *ppidl, REFIID riid, void **ppv); + virtual HRESULT STDMETHODCALLTYPE SetMenu(HMENU hmenu, HWND hwnd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetMenu(HMENU *phmenu, HWND *phwnd, DWORD *pdwFlags); + virtual HRESULT STDMETHODCALLTYPE InvalidateItem(LPSMDATA psmd, DWORD dwFlags); + virtual HRESULT STDMETHODCALLTYPE GetState(LPSMDATA psmd); + virtual HRESULT STDMETHODCALLTYPE SetMenuToolbar(IUnknown *punk, DWORD dwFlags); + + // *** IWinEventHandler methods *** + virtual HRESULT STDMETHODCALLTYPE OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *theResult); + virtual HRESULT STDMETHODCALLTYPE IsWindowOwner(HWND hWnd); + + // *** IShellMenu2 methods *** + virtual HRESULT STDMETHODCALLTYPE GetSubMenu(THIS); + virtual HRESULT STDMETHODCALLTYPE SetToolbar(THIS); + virtual HRESULT STDMETHODCALLTYPE SetMinWidth(THIS); + virtual HRESULT STDMETHODCALLTYPE SetNoBorder(THIS); + virtual HRESULT STDMETHODCALLTYPE SetTheme(THIS); + + // *** IShellMenuAcc methods *** + virtual HRESULT STDMETHODCALLTYPE GetTop(THIS); + virtual HRESULT STDMETHODCALLTYPE GetBottom(THIS); + virtual HRESULT STDMETHODCALLTYPE GetTracked(THIS); + virtual HRESULT STDMETHODCALLTYPE GetParentSite(THIS); + virtual HRESULT STDMETHODCALLTYPE GetState(THIS); + virtual HRESULT STDMETHODCALLTYPE DoDefaultAction(THIS); + virtual HRESULT STDMETHODCALLTYPE IsEmpty(THIS); + + 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 _GetTopLevelWindow(HWND*topLevel); + HRESULT _OnHotItemChanged(CMenuToolbarBase * tb, INT id); + HRESULT _MenuItemHotTrack(DWORD changeType); + HRESULT _OnPopupSubMenu(IMenuPopup * popup); + + BOOL UseBigIcons() + { + return m_useBigIcons; + } + private: HRESULT _CallCB(UINT uMsg, WPARAM wParam, LPARAM lParam, UINT id = 0, LPITEMIDLIST pidl = NULL); }; @@ -425,19 +426,19 @@ case VK_MENU: case VK_LMENU: case VK_RMENU: - m_currentBand->ChildTrack(MPOS_FULLCANCEL); + m_currentBand->_MenuItemHotTrack(MPOS_FULLCANCEL); break; case VK_LEFT: - m_currentBand->ChildTrack(MPOS_SELECTLEFT); + m_currentBand->_MenuItemHotTrack(MPOS_SELECTLEFT); break; case VK_RIGHT: - m_currentBand->ChildTrack(MPOS_SELECTRIGHT); + m_currentBand->_MenuItemHotTrack(MPOS_SELECTRIGHT); break; case VK_UP: - m_currentBand->ChildTrack(VK_UP); + m_currentBand->_MenuItemHotTrack(VK_UP); break; case VK_DOWN: - m_currentBand->ChildTrack(VK_DOWN); + m_currentBand->_MenuItemHotTrack(VK_DOWN); break; } break; @@ -488,7 +489,7 @@ } HWND newFocus; - hr = newBand->GetTopLevelWindow(&newFocus); + hr = newBand->_GetTopLevelWindow(&newFocus); if (FAILED(hr)) return hr; @@ -557,6 +558,11 @@ m_hwnd(NULL), m_dwMenuFlags(0) { +} + +HRESULT CMenuToolbarBase::IsWindowOwner(HWND hwnd) +{ + return (m_hwnd && m_hwnd == hwnd) ? S_OK : S_FALSE; } HRESULT CMenuToolbarBase::ShowWindow(BOOL fShow) @@ -670,6 +676,7 @@ case WM_TIMER: if (wParam == TIMERID_HOTTRACK) { + m_menuBand->_OnPopupSubMenu(NULL); PopupItem(m_hotItem); KillTimer(hWnd, TIMERID_HOTTRACK); } @@ -684,8 +691,8 @@ { KillTimer(m_hwnd, TIMERID_HOTTRACK); m_hotItem = -1; - m_menuBand->OnHotItemChanged(NULL, -1); - m_menuBand->ChildTrack(MPOS_CHILDTRACKING); + m_menuBand->_OnHotItemChanged(NULL, -1); + m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); } else if (m_hotItem != hot->idNew) { @@ -693,14 +700,12 @@ { DWORD elapsed = 0; SystemParametersInfo(SPI_GETMENUSHOWDELAY, 0, &elapsed, 0); - - SetTimer(m_hwnd, TIMERID_HOTTRACK, elapsed, NULL); } m_hotItem = hot->idNew; - m_menuBand->OnHotItemChanged(this, m_hotItem); - m_menuBand->ChildTrack(MPOS_CHILDTRACKING); + m_menuBand->_OnHotItemChanged(this, m_hotItem); + m_menuBand->_MenuItemHotTrack(MPOS_CHILDTRACKING); } return S_OK; } @@ -773,6 +778,8 @@ popup->Popup(&pt, &rcl, MPPF_TOP | MPPF_RIGHT); + m_menuBand->_OnPopupSubMenu(popup); + return S_OK; } @@ -789,7 +796,7 @@ HMENU popup = GetSubMenu(menu, index); - m_menuBand->TrackPopup(popup, b.x, b.y); + m_menuBand->_TrackSubMenuUsingTrackPopupMenu(popup, b.x, b.y); return S_OK; } @@ -826,12 +833,12 @@ HRESULT CMenuToolbarBase::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - m_menuBand->OnSelect(MPOS_EXECUTE); - return S_OK; -} - - -HRESULT CMenuToolbarBase::ChildTrack(DWORD dwSelectType) + theResult = 0; + return m_menuBand->_MenuItemHotTrack(MPOS_EXECUTE); +} + + +HRESULT CMenuToolbarBase::ChangeHotItem(DWORD dwSelectType) { int prev = SendMessage(m_hwnd, TB_GETHOTITEM, 0, 0); int index = -1; @@ -894,7 +901,7 @@ if (prev != index) { SendMessage(m_hwnd, TB_SETHOTITEM, index, 0); - return m_menuBand->OnHotItemChanged(this, m_hotItem); + return m_menuBand->_OnHotItemChanged(this, m_hotItem); } return S_OK; } @@ -914,7 +921,7 @@ if (prev != index) { SendMessage(m_hwnd, TB_SETHOTITEM, -1, 0); - m_menuBand->OnHotItemChanged(NULL, -1); + m_menuBand->_OnHotItemChanged(NULL, -1); } return S_FALSE; } @@ -997,7 +1004,7 @@ SMINFO * sminfo = new SMINFO(); sminfo->dwMask = SMIM_ICON | SMIM_FLAGS; - if (SUCCEEDED(m_menuBand->CallCBWithId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)))) + if (SUCCEEDED(m_menuBand->_CallCBWithItemId(info.wID, SMC_GETINFO, 0, reinterpret_cast<LPARAM>(sminfo)))) { tbb.iBitmap = sminfo->iIcon; tbb.dwData = reinterpret_cast<DWORD_PTR>(sminfo); @@ -1021,7 +1028,7 @@ HRESULT CMenuStaticToolbar::OnContextMenu(NMMOUSE * rclick) { CComPtr<IContextMenu> contextMenu; - HRESULT hr = m_menuBand->CallCBWithId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); + HRESULT hr = m_menuBand->_CallCBWithItemId(rclick->dwItemSpec, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IContextMenu), reinterpret_cast<LPARAM>(&contextMenu)); if (hr != S_OK) return hr; @@ -1030,7 +1037,7 @@ HRESULT CMenuStaticToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - HRESULT hr = m_menuBand->CallCBWithId(wParam, SMC_EXEC, 0, 0); + HRESULT hr = m_menuBand->_CallCBWithItemId(wParam, SMC_EXEC, 0, 0); if (FAILED(hr)) return hr; @@ -1045,7 +1052,7 @@ int index = SendMessage(m_hwnd, TB_GETBUTTONINFO, uItem, reinterpret_cast<LPARAM>(&info)); if (index < 0) return E_FAIL; - + TBBUTTON btn = { 0 }; SendMessage(m_hwnd, TB_GETBUTTON, index, reinterpret_cast<LPARAM>(&btn)); @@ -1060,7 +1067,7 @@ else { CComPtr<IShellMenu> shellMenu; - HRESULT hr = m_menuBand->CallCBWithId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu)); + HRESULT hr = m_menuBand->_CallCBWithItemId(uItem, SMC_GETOBJECT, reinterpret_cast<WPARAM>(&IID_IShellMenu), reinterpret_cast<LPARAM>(&shellMenu)); if (FAILED(hr)) return hr; @@ -1215,7 +1222,9 @@ HRESULT CMenuSFToolbar::OnCommand(WPARAM wParam, LPARAM lParam, LRESULT *theResult) { - return m_menuBand->CallCBWithPidl(GetPidlFromId(wParam, NULL), SMC_SFEXEC, 0, 0); + HRESULT hr = m_menuBand->_CallCBWithItemPidl(GetPidlFromId(wParam), SMC_SFEXEC, 0, 0); + + return CMenuToolbarBase::OnCommand(wParam, lParam, theResult); } HRESULT CMenuSFToolbar::PopupItem(UINT uItem) @@ -1227,7 +1236,7 @@ int index; CComPtr<IShellMenuCallback> psmc; CComPtr<IShellMenu> shellMenu; - + LPITEMIDLIST pidl = GetPidlFromId(uItem, &index); if (!pidl) @@ -1272,7 +1281,7 @@ { HRESULT hr; CComPtr<IShellItem> psi; - SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem, NULL), &psi); + SHCreateShellItem(NULL, m_shellFolder, GetPidlFromId(uItem), &psi); SFGAOF attrs; hr = psi->GetAttributes(SFGAO_FOLDER, &attrs); @@ -1289,7 +1298,8 @@ m_SFToolbar(NULL), m_useBigIcons(FALSE), m_hotBar(NULL), - m_hotItem(-1) + m_hotItem(-1), + m_childMenu(NULL) { m_focusManager = CMenuFocusManager::AcquireManager(); } @@ -1297,12 +1307,6 @@ CMenuBand::~CMenuBand() { CMenuFocusManager::ReleaseManager(m_focusManager); - - if (m_site) - m_site->Release(); - - if (m_psmc) - m_psmc->Release(); if (m_staticToolbar) delete m_staticToolbar; @@ -1317,9 +1321,6 @@ UINT uIdAncestor, DWORD dwFlags) { - if (m_psmc) - m_psmc->Release(); - m_psmc = psmc; m_uId = uId; m_uIdAncestor = uIdAncestor; @@ -1327,8 +1328,6 @@ if (m_psmc) { - m_psmc->AddRef(); - _CallCB(SMC_CREATE, 0, reinterpret_cast<LPARAM>(&m_UserData)); } @@ -1408,22 +1407,19 @@ HWND hwndParent; HRESULT hr; - if (m_site != NULL) - m_site->Release(); + m_site = NULL; if (pUnkSite == NULL) return S_OK; hwndParent = NULL; hr = pUnkSite->QueryInterface(IID_PPV_ARG(IOleWindow, &m_site)); - if (SUCCEEDED(hr)) - { - m_site->Release(); - - hr = m_site->GetWindow(&hwndParent); - if (FAILED(hr)) - return hr; - } + if (FAILED(hr)) + return hr; + + hr = m_site->GetWindow(&hwndParent); + if (FAILED(hr)) + return hr; if (!::IsWindow(hwndParent)) return E_FAIL; @@ -1765,7 +1761,7 @@ HRESULT STDMETHODCALLTYPE CMenuBand::QueryService(REFGUID guidService, REFIID riid, void **ppvObject) { if (IsEqualIID(guidService, SID_SMenuBandChild) || - IsEqualIID(guidService, SID_SMenuBandBottom) || + IsEqualIID(guidService, SID_SMenuBandBottom) || IsEqualIID(guidService, SID_SMenuBandBottomSelected)) return this->QueryInterface(riid, ppvObject); WARN("Unknown service requested %s\n", wine_dbgstr_guid(&guidService)); @@ -1780,7 +1776,19 @@ HRESULT STDMETHODCALLTYPE CMenuBand::OnSelect(DWORD dwSelectType) { - return S_OK; + if (dwSelectType != MPOS_CANCELLEVEL) + { + if (dwSelectType == MPOS_SELECTLEFT) + { + dwSelectType = MPOS_CANCELLEVEL; + } + CComPtr<IMenuPopup> pmp; + HRESULT hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr; + return pmp->OnSelect(dwSelectType); + } + return S_FALSE; } HRESULT STDMETHODCALLTYPE CMenuBand::SetSubMenu(IMenuPopup *pmp, BOOL fSet) @@ -1876,12 +1884,12 @@ { case WM_COMMAND: - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnCommand(wParam, lParam, theResult); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnCommand(wParam, lParam, theResult); } @@ -1898,12 +1906,12 @@ case TBN_HOTITEMCHANGE: hot = reinterpret_cast<LPNMTBHOTITEM>(hdr); - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnHotItemChange(hot); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnHotItemChange(hot); } @@ -1913,12 +1921,12 @@ case NM_RCLICK: rclick = reinterpret_cast<LPNMMOUSE>(hdr); - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) { return m_staticToolbar->OnContextMenu(rclick); } - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) { return m_SFToolbar->OnContextMenu(rclick); } @@ -1971,10 +1979,10 @@ HRESULT STDMETHODCALLTYPE CMenuBand::IsWindowOwner(HWND hWnd) { - if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd)) + if (m_staticToolbar && m_staticToolbar->IsWindowOwner(hWnd) == S_OK) return S_OK; - if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd)) + if (m_SFToolbar && m_SFToolbar->IsWindowOwner(hWnd) == S_OK) return S_OK; return S_FALSE; @@ -2052,12 +2060,12 @@ return S_OK; } -HRESULT CMenuBand::CallCBWithId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::_CallCBWithItemId(UINT id, UINT uMsg, WPARAM wParam, LPARAM lParam) { return _CallCB(uMsg, wParam, lParam, id); } -HRESULT CMenuBand::CallCBWithPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) +HRESULT CMenuBand::_CallCBWithItemPidl(LPITEMIDLIST pidl, UINT uMsg, WPARAM wParam, LPARAM lParam) { return _CallCB(uMsg, wParam, lParam, 0, pidl); } @@ -2091,80 +2099,81 @@ return hr; } -HRESULT CMenuBand::TrackPopup(HMENU popup, INT x, INT y) +HRESULT CMenuBand::_TrackSubMenuUsingTrackPopupMenu(HMENU popup, INT x, INT y) { ::TrackPopupMenu(popup, 0, x, y, 0, m_menuOwner, NULL); return S_OK; } -HRESULT CMenuBand::GetTopLevelWindow(HWND*topLevel) +HRESULT CMenuBand::_GetTopLevelWindow(HWND*topLevel) { *topLevel = m_topLevelWindow; return S_OK; } -HRESULT CMenuBand::OnHotItemChanged(CMenuToolbarBase * tb, INT id) +HRESULT CMenuBand::_OnHotItemChanged(CMenuToolbarBase * tb, INT id) { if (m_hotBar && m_hotBar != tb) - m_hotBar->ChildTrack(-1); + m_hotBar->ChangeHotItem(-1); m_hotBar = tb; m_hotItem = id; return S_OK; } -HRESULT CMenuBand::ChildTrack(DWORD dwSelectType) +HRESULT CMenuBand::_MenuItemHotTrack(DWORD changeType) { HRESULT hr; - if (dwSelectType == VK_DOWN) + + if (changeType == VK_DOWN) { if (m_SFToolbar && (m_hotBar == m_SFToolbar || m_hotBar == NULL)) { - hr = m_SFToolbar->ChildTrack(dwSelectType); + hr = m_SFToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_staticToolbar) - return m_staticToolbar->ChildTrack(VK_HOME); + return m_staticToolbar->ChangeHotItem(VK_HOME); else - return m_SFToolbar->ChildTrack(VK_HOME); + return m_SFToolbar->ChangeHotItem(VK_HOME); } return hr; } else if (m_staticToolbar && m_hotBar == m_staticToolbar) { - hr = m_staticToolbar->ChildTrack(dwSelectType); + hr = m_staticToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_SFToolbar) - return m_SFToolbar->ChildTrack(VK_HOME); + return m_SFToolbar->ChangeHotItem(VK_HOME); else - return m_staticToolbar->ChildTrack(VK_HOME); + return m_staticToolbar->ChangeHotItem(VK_HOME); } return hr; } } - else if (dwSelectType == VK_UP) + else if (changeType == VK_UP) { if (m_staticToolbar && (m_hotBar == m_staticToolbar || m_hotBar == NULL)) { - hr = m_staticToolbar->ChildTrack(dwSelectType); + hr = m_staticToolbar->ChangeHotItem(VK_DOWN); if (hr == S_FALSE) { if (m_SFToolbar) - return m_SFToolbar->ChildTrack(VK_END); + return m_SFToolbar->ChangeHotItem(VK_END); else - return m_staticToolbar->ChildTrack(VK_END); + return m_staticToolbar->ChangeHotItem(VK_END); } return hr; } else if (m_SFToolbar && m_hotBar == m_SFToolbar) { - hr = m_SFToolbar->ChildTrack(dwSelectType); + hr = m_SFToolbar->ChangeHotItem(VK_UP); if (hr == S_FALSE) { if (m_staticToolbar) - return m_staticToolbar->ChildTrack(VK_END); + return m_staticToolbar->ChangeHotItem(VK_END); else - return m_SFToolbar->ChildTrack(VK_END); + return m_SFToolbar->ChangeHotItem(VK_END); } return hr; } @@ -2175,7 +2184,24 @@ hr = IUnknown_QueryService(m_site, SID_SMenuPopup, IID_PPV_ARG(IMenuPopup, &pmp)); if (FAILED(hr)) return hr; - pmp->OnSelect(dwSelectType); - } - return S_OK; -} + pmp->OnSelect(changeType); + } + return S_OK; +} + + +HRESULT CMenuBand::_OnPopupSubMenu(IMenuPopup * popup) +{ + if (m_childMenu) + { + HRESULT hr = m_childMenu->OnSelect(MPOS_CANCELLEVEL); + if (FAILED(hr)) + return hr; + } + m_childMenu = popup; + if (m_childMenu) + { + return m_childMenu->SetSubMenu(this, TRUE); + } + return S_OK; +} 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] Thu Feb 20 16:18:49 2014 @@ -43,10 +43,6 @@ public IBanneredBar, public IInitializeObject { -public: - CMenuDeskBar(); - ~CMenuDeskBar(); - private: CComPtr<IUnknown> m_Site; CComPtr<IUnknown> m_Client; @@ -58,47 +54,8 @@ HBITMAP m_Banner; public: - // *** IMenuPopup methods *** - virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); - virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); - virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); - - // *** IOleWindow methods *** - virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); - virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); - - // *** IObjectWithSite methods *** - virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); - virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); - - // *** IBanneredBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon); - virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon); - virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap); - virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap); - - // *** IInitializeObject methods *** - virtual HRESULT STDMETHODCALLTYPE Initialize(THIS); - - // *** IOleCommandTarget methods *** - virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); - virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); - - // *** IServiceProvider methods *** - virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); - - // *** IInputObjectSite methods *** - virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus); - - // *** IInputObject methods *** - virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg); - virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS); - virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); - - // *** IDeskBar methods *** - virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); - virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); - virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + CMenuDeskBar(); + ~CMenuDeskBar(); DECLARE_NOT_AGGREGATABLE(CMenuDeskBar) DECLARE_PROTECT_FINAL_CONSTRUCT() @@ -106,10 +63,10 @@ DECLARE_WND_CLASS_EX(_T("BaseBar"), CS_SAVEBITS | CS_DROPSHADOW, COLOR_3DFACE) BEGIN_MSG_MAP(CMenuDeskBar) - MESSAGE_HANDLER(WM_SIZE, OnSize) - MESSAGE_HANDLER(WM_NOTIFY, OnNotify) - MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, OnWindowPosChanged) - MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_SIZE, _OnSize) + MESSAGE_HANDLER(WM_NOTIFY, _OnNotify) + MESSAGE_HANDLER(WM_WINDOWPOSCHANGED, _OnWindowPosChanged) + MESSAGE_HANDLER(WM_PAINT, _OnPaint) END_MSG_MAP() BEGIN_COM_MAP(CMenuDeskBar) @@ -125,13 +82,54 @@ COM_INTERFACE_ENTRY_IID(IID_IInitializeObject, IInitializeObject) END_COM_MAP() + // *** IMenuPopup methods *** + virtual HRESULT STDMETHODCALLTYPE Popup(POINTL *ppt, RECTL *prcExclude, MP_POPUPFLAGS dwFlags); + virtual HRESULT STDMETHODCALLTYPE OnSelect(DWORD dwSelectType); + virtual HRESULT STDMETHODCALLTYPE SetSubMenu(IMenuPopup *pmp, BOOL fSet); + + // *** IOleWindow methods *** + virtual HRESULT STDMETHODCALLTYPE GetWindow(HWND *phwnd); + virtual HRESULT STDMETHODCALLTYPE ContextSensitiveHelp(BOOL fEnterMode); + + // *** IObjectWithSite methods *** + virtual HRESULT STDMETHODCALLTYPE SetSite(IUnknown *pUnkSite); + virtual HRESULT STDMETHODCALLTYPE GetSite(REFIID riid, PVOID *ppvSite); + + // *** IBanneredBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetIconSize(DWORD iIcon); + virtual HRESULT STDMETHODCALLTYPE GetIconSize(DWORD* piIcon); + virtual HRESULT STDMETHODCALLTYPE SetBitmap(HBITMAP hBitmap); + virtual HRESULT STDMETHODCALLTYPE GetBitmap(HBITMAP* phBitmap); + + // *** IInitializeObject methods *** + virtual HRESULT STDMETHODCALLTYPE Initialize(THIS); + + // *** IOleCommandTarget methods *** + virtual HRESULT STDMETHODCALLTYPE QueryStatus(const GUID *pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText); + virtual HRESULT STDMETHODCALLTYPE Exec(const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut); + + // *** IServiceProvider methods *** + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject); + + // *** IInputObjectSite methods *** + virtual HRESULT STDMETHODCALLTYPE OnFocusChangeIS(LPUNKNOWN lpUnknown, BOOL bFocus); + + // *** IInputObject methods *** + virtual HRESULT STDMETHODCALLTYPE UIActivateIO(BOOL bActivating, LPMSG lpMsg); + virtual HRESULT STDMETHODCALLTYPE HasFocusIO(THIS); + virtual HRESULT STDMETHODCALLTYPE TranslateAcceleratorIO(LPMSG lpMsg); + + // *** IDeskBar methods *** + virtual HRESULT STDMETHODCALLTYPE SetClient(IUnknown *punkClient); + virtual HRESULT STDMETHODCALLTYPE GetClient(IUnknown **ppunkClient); + virtual HRESULT STDMETHODCALLTYPE OnPosRectChangeDB(LPRECT prc); + private: - // message handlers - LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); - LRESULT OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT _OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); }; extern "C" @@ -331,7 +329,7 @@ return m_Site->QueryInterface(riid, ppvSite); } -LRESULT CMenuDeskBar::OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { if (m_Client) { @@ -352,7 +350,7 @@ return 0; } -LRESULT CMenuDeskBar::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { CComPtr<IWinEventHandler> winEventHandler; LRESULT result; @@ -368,12 +366,12 @@ return result; } -LRESULT CMenuDeskBar::OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnWindowPosChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { return 0; } -LRESULT CMenuDeskBar::OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +LRESULT CMenuDeskBar::_OnPaint(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { bHandled = FALSE; @@ -432,6 +430,7 @@ if (FAILED(hr)) return hr; + // Windows calls this, but it appears to be unimplemented? hr = dbc->SetModeDBC(1); // Allow it to fail with E_NOTIMPL. @@ -481,7 +480,7 @@ // HACK: The bar needs to be notified of the size AFTER it is shown. // Quick & dirty way of getting it done. BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); UIActivateIO(TRUE, NULL); @@ -502,7 +501,7 @@ return hr; BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); return hr; } @@ -519,7 +518,7 @@ m_Banner = hBitmap; BOOL bHandled; - OnSize(WM_SIZE, 0, 0, bHandled); + _OnSize(WM_SIZE, 0, 0, bHandled); return S_OK; } @@ -534,6 +533,7 @@ HRESULT STDMETHODCALLTYPE CMenuDeskBar::OnSelect( DWORD dwSelectType) { + CComPtr<IMenuPopup> pmp; CComPtr<IDeskBarClient> dbc; HRESULT hr; @@ -542,6 +542,13 @@ case MPOS_EXECUTE: case MPOS_FULLCANCEL: case MPOS_CANCELLEVEL: + hr = IUnknown_QueryService(m_Client, SID_SMenuBandChild, IID_PPV_ARG(IMenuPopup, &pmp)); + if (FAILED(hr)) + return hr; + + hr = pmp->OnSelect(MPOS_CANCELLEVEL); + if (FAILED(hr)) + return hr; hr = m_Client->QueryInterface(IID_PPV_ARG(IDeskBarClient, &dbc)); if (FAILED(hr)) @@ -558,7 +565,6 @@ if (dwSelectType == MPOS_CANCELLEVEL) break; - dwSelectType = MPOS_CANCELLEVEL; case MPOS_SELECTLEFT: case MPOS_SELECTRIGHT: /*CComPtr<IMenuPopup> pmp; Modified: branches/shell-experiments/base/shell/rshell/CMenuSite.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuSite.cpp [iso-8859-1] Thu Feb 20 16:18:49 2014 @@ -24,23 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menusite); -#if 0 -bool _assert(bool cond, LPCSTR expr, LPCSTR file, DWORD line, LPCSTR func) -{ -#if DBG - if (!cond) - { - wine_dbg_printf("%s(%d): Assertion failed '%s', at %s", file, line, expr, func); - DebugBreak(); - } -#endif - return cond; -} -#define DBGASSERT(x) _assert(!!(x), #x, __FILE__, __LINE__, __FUNCSIG__) -#else -#define DBGASSERT(x) (!!(x)) -#endif - class CMenuSite : public CComObjectRootEx<CComMultiThreadModelNoCS>, public CWindowImpl<CMenuSite, CWindow, CControlWinTraits>, @@ -52,6 +35,7 @@ public IWinEventHandler, public IServiceProvider { +private: CComPtr<IUnknown> m_DeskBarSite; CComPtr<IUnknown> m_BandObject; CComPtr<IDeskBand> m_DeskBand; @@ -200,12 +184,19 @@ HRESULT STDMETHODCALLTYPE CMenuSite::AddBand(IUnknown * punk) { + HRESULT hr; + +#define TO_HRESULT(x) ((HRESULT)(S_OK+(x))) + if (SHIsSameObject(punk, m_BandObject)) - return S_OK + 0; - - IUnknown_SetSite(m_BandObject, NULL); - - BOOL result = m_hWndBand != NULL; + return TO_HRESULT(0); + + if (m_BandObject) + { + hr = IUnknown_SetSite(m_BandObject, NULL); + if (FAILED(hr)) + return hr; + } m_BandObject = NULL; m_DeskBand = NULL; @@ -213,19 +204,29 @@ m_hWndBand = NULL; if (!punk) - return result ? S_OK + 0 : E_FAIL; - - DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)))); - DBGASSERT(SUCCEEDED(punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)))); - - IUnknown_SetSite(punk, this->ToIUnknown()); - IUnknown_GetWindow(punk, &m_hWndBand); + return TO_HRESULT(0); + + hr = punk->QueryInterface(IID_PPV_ARG(IDeskBand, &m_DeskBand)); + if (FAILED(hr)) + return hr; + + hr = punk->QueryInterface(IID_PPV_ARG(IWinEventHandler, &m_WinEventHandler)); + if (FAILED(hr)) + return hr; + + hr = IUnknown_SetSite(punk, this->ToIUnknown()); + if (FAILED(hr)) + return hr; + + hr = IUnknown_GetWindow(punk, &m_hWndBand); + if (FAILED(hr)) + return hr; m_BandObject = punk; punk->AddRef(); - return S_OK + 0; + return TO_HRESULT(0); } HRESULT STDMETHODCALLTYPE CMenuSite::EnumBands(UINT uBand, DWORD* pdwBandID) @@ -245,7 +246,7 @@ HRESULT STDMETHODCALLTYPE CMenuSite::GetBandObject(DWORD dwBandID, REFIID riid, VOID **ppv) { - if (!DBGASSERT(dwBandID == 0) || m_BandObject == NULL) + if (dwBandID != 0 || m_BandObject == NULL) { *ppv = NULL; return E_NOINTERFACE; @@ -277,7 +278,8 @@ HRESULT STDMETHODCALLTYPE CMenuSite::GetWindow(HWND *phwnd) { - DBGASSERT(IsWindow()); + if (!IsWindow()) + return E_FAIL; *phwnd = m_hWnd; @@ -305,8 +307,8 @@ HRESULT STDMETHODCALLTYPE CMenuSite::QueryBand(DWORD dwBandID, IDeskBand **ppstb, DWORD *pdwState, LPWSTR pszName, int cchName) { - DBGASSERT(dwBandID == 0); - DBGASSERT(!IsBadWritePtr(ppstb, sizeof(*ppstb))); + if (dwBandID != 0) + return E_FAIL; if (!m_BandObject) { @@ -338,15 +340,17 @@ return IUnknown_QueryService(m_BandObject, guidService, riid, ppvObject); } - DBGASSERT(m_DeskBarSite); + if (!m_DeskBarSite) + return E_FAIL; return IUnknown_QueryService(m_DeskBarSite, guidService, riid, ppvObject); } HRESULT STDMETHODCALLTYPE CMenuSite::QueryStatus(const GUID * pguidCmdGroup, ULONG cCmds, OLECMD prgCmds [], OLECMDTEXT *pCmdText) { - if (!DBGASSERT(m_DeskBarSite)) - return E_FAIL; + if (!m_DeskBarSite) + return E_FAIL; + return IUnknown_QueryStatus(m_DeskBarSite, *pguidCmdGroup, cCmds, prgCmds, pCmdText); } @@ -382,7 +386,7 @@ m_DeskBand->CloseDW(0); } - IUnknown_SetSite(m_BandObject, NULL); + hr = IUnknown_SetSite(m_BandObject, NULL); m_BandObject = NULL; m_DeskBand = NULL; Modified: branches/shell-experiments/base/shell/rshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/precomp.h [iso-8859-1] Thu Feb 20 16:18:49 2014 @@ -3,9 +3,9 @@ #define USE_SYSTEM_MENUSITE 0 #define USE_SYSTEM_MENUBAND 0 -#define WRAP_MENUDESKBAR 0 -#define WRAP_MENUSITE 0 -#define WRAP_MENUBAND 0 +#define WRAP_MENUDESKBAR 1 +#define WRAP_MENUSITE 1 +#define WRAP_MENUBAND 1 #include <stdio.h> #include <tchar.h>

10 years, 10 months

← Newer
1
...
7
8
9
10
11
12
13
...
47
Older →

Jump to page:

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