Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[gadamopoulos] 66723: [UXTHEME] - Call DrawCaption in user32 when we get WM_NCUAHDRAWCAPTION and there is no active theme. - Should finally fix CORE-9016.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 15 13:39:15 2015 New Revision: 66723 URL: http://svn.reactos.org/svn/reactos?rev=66723&view=rev Log: [UXTHEME] - Call DrawCaption in user32 when we get WM_NCUAHDRAWCAPTION and there is no active theme. - Should finally fix CORE-9016. Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Sun Mar 15 13:39:15 2015 @@ -186,6 +186,12 @@ { if(!IsAppThemed()) { + if (Msg == WM_NCUAHDRAWCAPTION) + { + user32ApiHook.DrawCaption(hWnd, NULL, NULL, 0); + return 0; + } + return user32ApiHook.DefWindowProcW(hWnd, Msg, wParam, @@ -204,6 +210,12 @@ { if(!IsAppThemed()) { + if (Msg == WM_NCUAHDRAWCAPTION) + { + user32ApiHook.DrawCaption(hWnd, NULL, NULL, 0); + return 0; + } + return user32ApiHook.DefWindowProcA(hWnd, Msg, wParam,

9 years, 9 months

[gadamopoulos] 66722: [USER32] - Implement RealUserDrawCaption and pass it to uxtheme in order to paint the classic caption when needed. CORE-9016

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sun Mar 15 13:37:13 2015 New Revision: 66722 URL: http://svn.reactos.org/svn/reactos?rev=66722&view=rev Log: [USER32] - Implement RealUserDrawCaption and pass it to uxtheme in order to paint the classic caption when needed. CORE-9016 Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/win32ss/user/user32/misc/usrapihk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/u… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/usrapihk.c [iso-8859-1] Sun Mar 15 13:37:13 2015 @@ -28,6 +28,7 @@ BOOL WINAPI RealSystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI RealSystemParametersInfoW(UINT,UINT,PVOID,UINT); DWORD WINAPI GetRealWindowOwner(HWND); +LRESULT WINAPI RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags); /* GLOBALS *******************************************************************/ @@ -154,7 +155,7 @@ puah->SystemParametersInfoW = (FARPROC)RealSystemParametersInfoW; puah->ForceResetUserApiHook = (FARPROC)ForceResetUserApiHook; puah->DrawFrameControl = (FARPROC)RealDrawFrameControl; - puah->DrawCaption = (FARPROC)NtUserDrawCaption; + puah->DrawCaption = (FARPROC)RealUserDrawCaption; puah->MDIRedrawFrame = (FARPROC)RealMDIRedrawFrame; puah->GetRealWindowOwner = (FARPROC)GetRealWindowOwner; } Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Sun Mar 15 13:37:13 2015 @@ -398,6 +398,16 @@ return TRUE; } +/* + RealUserDrawCaption: This function is passed through RegisterUserApiHook to uxtheme + to call it when the classic caption is needed to be drawn. + */ +LRESULT WINAPI +RealUserDrawCaption(HWND hWnd, HDC hDC, LPCRECT lpRc, UINT uFlags) +{ + return DefWndNCPaint(hWnd, HRGN_WINDOW, -1); +} + static void UserPaintCaption(HWND hwnd) { @@ -411,6 +421,11 @@ */ if(gpsi->dwSRVIFlags & SRVINFO_APIHOOK) { + /* + * This will cause uxtheme to either paint the themed caption or call + * RealUserDrawCaption in order to draw the classic caption when themes + * are disabled but the themes service is enabled + */ SendMessage(hwnd, WM_NCUAHDRAWCAPTION,0,0); } else

9 years, 9 months

[tkreuzer] 66721: [PSDK] Add winternl.h, which is compatible with the native one. Do not use this header. USE NDK! (Thanks Hermes!) It's only there for SDK compatibility and to make sure nobody wil...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 15 00:10:26 2015 New Revision: 66721 URL: http://svn.reactos.org/svn/reactos?rev=66721&view=rev Log: [PSDK] Add winternl.h, which is compatible with the native one. Do not use this header. USE NDK! (Thanks Hermes!) It's only there for SDK compatibility and to make sure nobody will think it's missing and add it to make use of it. And to make sure, nobody will use this header, it will #error if you include it from a reactos module. Added: trunk/reactos/include/psdk/winternl.h (with props) Added: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h (added) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Sun Mar 15 00:10:26 2015 @@ -0,0 +1,707 @@ +/* + * winternl.h + * + * Windows NT internal data structures and functions + * + * Note: This header exists only for compatibility with the native SDK. + * It's definitions are incomplete and potentially unsuitable. + * ReactOS modules should not make use of it! + * + * USE NDK INSTEAD! + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once + +#ifdef __REACTOS__ +#error "Do not use this header, use NDK!" +#endif + +#ifndef _WINTERNL_ +#define _WINTERNL_ + +//#include <winapifamily.h> +#include <windef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef _Return_type_success_(return >= 0) LONG NTSTATUS; + +#ifndef NT_SUCCESS +#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0) +#endif + +#ifndef NT_INFORMATION +#define NT_INFORMATION(Status) ((((ULONG)(Status)) >> 30) == 1) +#endif + +#ifndef NT_WARNING +#define NT_WARNING(Status) ((((ULONG)(Status)) >> 30) == 2) +#endif + +#ifndef NT_ERROR +#define NT_ERROR(Status) ((((ULONG)(Status)) >> 30) == 3) +#endif + +typedef CONST char *PCSZ; + +typedef struct _STRING +{ + USHORT Length; + USHORT MaximumLength; + PCHAR Buffer; +} STRING, *PSTRING; +typedef STRING ANSI_STRING; +typedef PSTRING PANSI_STRING; +typedef PSTRING PCANSI_STRING; // yes, thats the definition from MS! +typedef STRING OEM_STRING; +typedef PSTRING POEM_STRING; +typedef const STRING *PCOEM_STRING; + +typedef struct _UNICODE_STRING +{ + USHORT Length; + USHORT MaximumLength; + PWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; +typedef const UNICODE_STRING *PCUNICODE_STRING; + +typedef struct _RTL_USER_PROCESS_PARAMETERS +{ + BYTE Reserved1[16]; + PVOID Reserved2[10]; + UNICODE_STRING ImagePathName; + UNICODE_STRING CommandLine; +} RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; + +typedef struct _PEB_LDR_DATA +{ + BYTE Reserved1[8]; + PVOID Reserved2[3]; + LIST_ENTRY InMemoryOrderModuleList; +} PEB_LDR_DATA, *PPEB_LDR_DATA; + +typedef struct _LDR_DATA_TABLE_ENTRY +{ + PVOID Reserved1[2]; + LIST_ENTRY InMemoryOrderLinks; + PVOID Reserved2[2]; + PVOID DllBase; + PVOID Reserved3[2]; + UNICODE_STRING FullDllName; + BYTE Reserved4[8]; + PVOID Reserved5[3]; + union { + ULONG CheckSum; + PVOID Reserved6; + } DUMMYUNIONNAME; + ULONG TimeDateStamp; +} LDR_DATA_TABLE_ENTRY, *PLDR_DATA_TABLE_ENTRY; + +typedef +VOID +(NTAPI *PPS_POST_PROCESS_INIT_ROUTINE)( + VOID); + +typedef struct _PEB +{ + BYTE Reserved1[2]; + BYTE BeingDebugged; + BYTE Reserved2[1]; + PVOID Reserved3[2]; + PPEB_LDR_DATA Ldr; + PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + PVOID Reserved4[3]; + PVOID AtlThunkSListPtr; + PVOID Reserved5; + ULONG Reserved6; + PVOID Reserved7; + ULONG Reserved8; + ULONG AtlThunkSListPtr32; + PVOID Reserved9[45]; + BYTE Reserved10[96]; + PPS_POST_PROCESS_INIT_ROUTINE PostProcessInitRoutine; + BYTE Reserved11[128]; + PVOID Reserved12[1]; + ULONG SessionId; +} PEB, *PPEB; + +typedef struct _TEB +{ + PVOID Reserved1[12]; + PPEB ProcessEnvironmentBlock; + PVOID Reserved2[399]; + BYTE Reserved3[1952]; + PVOID TlsSlots[64]; + BYTE Reserved4[8]; + PVOID Reserved5[26]; + PVOID ReservedForOle; + PVOID Reserved6[4]; + PVOID TlsExpansionSlots; +} TEB, *PTEB; + +typedef enum _FILE_INFORMATION_CLASS +{ + FileDirectoryInformation = 1 +} FILE_INFORMATION_CLASS; + +#define INTERNAL_TS_ACTIVE_CONSOLE_ID (*((volatile ULONG*)0x7ffe02d8)) +#define LOGONID_CURRENT ((ULONG)-1) +#define SERVERNAME_CURRENT ((HANDLE)NULL) + +/* Flags for NtCreateFile and NtOpenFile */ +#define FILE_DIRECTORY_FILE 0x00000001 +#define FILE_WRITE_THROUGH 0x00000002 +#define FILE_SEQUENTIAL_ONLY 0x00000004 +#define FILE_NO_INTERMEDIATE_BUFFERING 0x00000008 +#define FILE_SYNCHRONOUS_IO_ALERT 0x00000010 +#define FILE_SYNCHRONOUS_IO_NONALERT 0x00000020 +#define FILE_NON_DIRECTORY_FILE 0x00000040 +#define FILE_CREATE_TREE_CONNECTION 0x00000080 +#define FILE_COMPLETE_IF_OPLOCKED 0x00000100 +#define FILE_NO_EA_KNOWLEDGE 0x00000200 +#define FILE_OPEN_REMOTE_INSTANCE 0x00000400 +#define FILE_RANDOM_ACCESS 0x00000800 +#define FILE_DELETE_ON_CLOSE 0x00001000 +#define FILE_OPEN_BY_FILE_ID 0x00002000 +#define FILE_OPEN_FOR_BACKUP_INTENT 0x00004000 +#define FILE_NO_COMPRESSION 0x00008000 +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define FILE_OPEN_REQUIRING_OPLOCK 0x00010000 +#endif +#define FILE_RESERVE_OPFILTER 0x00100000 +#define FILE_OPEN_REPARSE_POINT 0x00200000 +#define FILE_OPEN_NO_RECALL 0x00400000 +#define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 + +/* Status for NtCreateFile or NtOpenFile */ +#define FILE_SUPERSEDED 0x00000000 +#define FILE_OPENED 0x00000001 +#define FILE_CREATED 0x00000002 +#define FILE_OVERWRITTEN 0x00000003 +#define FILE_EXISTS 0x00000004 +#define FILE_DOES_NOT_EXIST 0x00000005 + +#define FILE_VALID_OPTION_FLAGS 0x00ffffff +#define FILE_VALID_PIPE_OPTION_FLAGS 0x00000032 +#define FILE_VALID_MAILSLOT_OPTION_FLAGS 0x00000032 +#define FILE_VALID_SET_FLAGS 0x00000036 + +/* Disposition for NtCreateFile */ +#define FILE_SUPERSEDE 0x00000000 +#define FILE_OPEN 0x00000001 +#define FILE_CREATE 0x00000002 +#define FILE_OPEN_IF 0x00000003 +#define FILE_OVERWRITE 0x00000004 +#define FILE_OVERWRITE_IF 0x00000005 +#define FILE_MAXIMUM_DISPOSITION 0x00000005 + +typedef struct _OBJECT_ATTRIBUTES +{ + ULONG Length; + HANDLE RootDirectory; + PUNICODE_STRING ObjectName; + ULONG Attributes; + PVOID SecurityDescriptor; + PVOID SecurityQualityOfService; +} OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; + +#define OBJ_INHERIT 0x00000002L +#define OBJ_PERMANENT 0x00000010L +#define OBJ_EXCLUSIVE 0x00000020L +#define OBJ_CASE_INSENSITIVE 0x00000040L +#define OBJ_OPENIF 0x00000080L +#define OBJ_OPENLINK 0x00000100L +#define OBJ_KERNEL_HANDLE 0x00000200L +#define OBJ_FORCE_ACCESS_CHECK 0x00000400L +#define OBJ_VALID_ATTRIBUTES 0x000007F2L + +#ifndef InitializeObjectAttributes +#define InitializeObjectAttributes(p, n, a, r, s) \ +{ \ + (p)->Length = sizeof(OBJECT_ATTRIBUTES); \ + (p)->RootDirectory = r; \ + (p)->Attributes = a; \ + (p)->ObjectName = n; \ + (p)->SecurityDescriptor = s; \ + (p)->SecurityQualityOfService = NULL; \ +} +#endif + +typedef struct _IO_STATUS_BLOCK { + union { + NTSTATUS Status; + PVOID Pointer; + } DUMMYUNIONNAME; + + ULONG_PTR Information; +} IO_STATUS_BLOCK, *PIO_STATUS_BLOCK; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtCreateFile( + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_opt_ PLARGE_INTEGER AllocationSize, + _In_ ULONG FileAttributes, + _In_ ULONG ShareAccess, + _In_ ULONG CreateDisposition, + _In_ ULONG CreateOptions, + _In_reads_bytes_opt_(EaLength) PVOID EaBuffer, + _In_ ULONG EaLength); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtOpenFile( + _Out_ PHANDLE FileHandle, + _In_ ACCESS_MASK DesiredAccess, + _In_ POBJECT_ATTRIBUTES ObjectAttributes, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG ShareAccess, + _In_ ULONG OpenOptions); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtClose( + _In_ HANDLE Handle); + +typedef +VOID +(NTAPI *PIO_APC_ROUTINE)( + _In_ PVOID ApcContext, + _In_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG Reserved); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtDeviceIoControlFile( + _In_ HANDLE FileHandle, + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG IoControlCode, + _In_reads_bytes_opt_(InputBufferLength) PVOID InputBuffer, + _In_ ULONG InputBufferLength, + _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer, + _In_ ULONG OutputBufferLength); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtWaitForSingleObject( + _In_ HANDLE Object, + _In_ BOOLEAN Alertable, + _In_opt_ PLARGE_INTEGER Timeout); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtRenameKey( + _In_ HANDLE KeyHandle, + _In_ PUNICODE_STRING NewName); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtNotifyChangeMultipleKeys( + _In_ HANDLE MasterKeyHandle, + _In_opt_ ULONG Count, + _In_reads_opt_(Count) OBJECT_ATTRIBUTES SubordinateObjects[], + _In_opt_ HANDLE Event, + _In_opt_ PIO_APC_ROUTINE ApcRoutine, + _In_opt_ PVOID ApcContext, + _Out_ PIO_STATUS_BLOCK IoStatusBlock, + _In_ ULONG CompletionFilter, + _In_ BOOLEAN WatchTree, + _Out_writes_bytes_opt_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, + _In_ BOOLEAN Asynchronous); + +typedef struct _KEY_VALUE_ENTRY +{ + PUNICODE_STRING ValueName; + ULONG DataLength; + ULONG DataOffset; + ULONG Type; +} KEY_VALUE_ENTRY, *PKEY_VALUE_ENTRY; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryMultipleValueKey( + _In_ HANDLE KeyHandle, + _Inout_updates_(EntryCount) PKEY_VALUE_ENTRY ValueEntries, + _In_ ULONG EntryCount, + _Out_writes_bytes_(*BufferLength) PVOID ValueBuffer, + _Inout_ PULONG BufferLength, + _Out_opt_ PULONG RequiredBufferLength); + +typedef enum _KEY_SET_INFORMATION_CLASS +{ + KeyWriteTimeInformation, + KeyWow64FlagsInformation, + KeyControlFlagsInformation, + KeySetVirtualizationInformation, + KeySetDebugInformation, + KeySetHandleTagsInformation, + MaxKeySetInfoClass +} KEY_SET_INFORMATION_CLASS; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtSetInformationKey( + _In_ HANDLE KeyHandle, + _In_ _Strict_type_match_ + KEY_SET_INFORMATION_CLASS KeySetInformationClass, + _In_reads_bytes_(KeySetInformationLength) PVOID KeySetInformation, + _In_ ULONG KeySetInformationLength); + +typedef enum _PROCESSINFOCLASS +{ + ProcessBasicInformation = 0, + ProcessDebugPort = 7, + ProcessWow64Information = 26, + ProcessImageFileName = 27, + ProcessBreakOnTermination = 29 +} PROCESSINFOCLASS; + +typedef struct _PROCESS_BASIC_INFORMATION +{ + PVOID Reserved1; + PPEB PebBaseAddress; + PVOID Reserved2[2]; + ULONG_PTR UniqueProcessId; + PVOID Reserved3; +} PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryInformationProcess( + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength); + +typedef enum _THREADINFOCLASS +{ + ThreadIsIoPending = 16 +} THREADINFOCLASS; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryInformationThread( + _In_ HANDLE ThreadHandle, + _In_ THREADINFOCLASS ThreadInformationClass, + _Out_ PVOID ThreadInformation, + _In_ ULONG ThreadInformationLength, + _Out_opt_ PULONG ReturnLength); + +typedef enum _OBJECT_INFORMATION_CLASS +{ + ObjectBasicInformation = 0, + ObjectTypeInformation = 2 +} OBJECT_INFORMATION_CLASS; + +typedef struct _PUBLIC_OBJECT_BASIC_INFORMATION +{ + ULONG Attributes; + ACCESS_MASK GrantedAccess; + ULONG HandleCount; + ULONG PointerCount; + ULONG Reserved[10]; +} PUBLIC_OBJECT_BASIC_INFORMATION, *PPUBLIC_OBJECT_BASIC_INFORMATION; + +typedef struct __PUBLIC_OBJECT_TYPE_INFORMATION +{ + UNICODE_STRING TypeName; + ULONG Reserved [22]; +} PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION; + +_IRQL_requires_max_(PASSIVE_LEVEL) +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQueryObject( + _In_opt_ HANDLE Handle, + _In_ OBJECT_INFORMATION_CLASS ObjectInformationClass, + _Out_writes_bytes_opt_(ObjectInformationLength) PVOID ObjectInformation, + _In_ ULONG ObjectInformationLength, + _Out_opt_ PULONG ReturnLength); + +typedef enum _SYSTEM_INFORMATION_CLASS +{ + SystemBasicInformation = 0, + SystemPerformanceInformation = 2, + SystemTimeOfDayInformation = 3, + SystemProcessInformation = 5, + SystemProcessorPerformanceInformation = 8, + SystemInterruptInformation = 23, + SystemExceptionInformation = 33, + SystemRegistryQuotaInformation = 37, + SystemLookasideInformation = 45, + SystemPolicyInformation = 134, +} SYSTEM_INFORMATION_CLASS; + +typedef struct _SYSTEM_BASIC_INFORMATION +{ + BYTE Reserved1[24]; + PVOID Reserved2[4]; + CCHAR NumberOfProcessors; +} SYSTEM_BASIC_INFORMATION, *PSYSTEM_BASIC_INFORMATION; + +typedef struct _SYSTEM_PERFORMANCE_INFORMATION +{ + BYTE Reserved1[312]; +} SYSTEM_PERFORMANCE_INFORMATION, *PSYSTEM_PERFORMANCE_INFORMATION; + +typedef struct _SYSTEM_TIMEOFDAY_INFORMATION +{ + BYTE Reserved1[48]; +} SYSTEM_TIMEOFDAY_INFORMATION, *PSYSTEM_TIMEOFDAY_INFORMATION; + +typedef struct _SYSTEM_PROCESS_INFORMATION +{ + ULONG NextEntryOffset; + BYTE Reserved1[52]; + PVOID Reserved2[3]; + HANDLE UniqueProcessId; + PVOID Reserved3; + ULONG HandleCount; + BYTE Reserved4[4]; + PVOID Reserved5[11]; + SIZE_T PeakPagefileUsage; + SIZE_T PrivatePageCount; + LARGE_INTEGER Reserved6[6]; +} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION; + +typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION +{ + LARGE_INTEGER IdleTime; + LARGE_INTEGER KernelTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER Reserved1[2]; + ULONG Reserved2; +} SYSTEM_PROCESSOR_PERFORMANCE_INFORMATION, *PSYSTEM_PROCESSOR_PERFORMANCE_INFORMATION; + +typedef struct _SYSTEM_INTERRUPT_INFORMATION +{ + BYTE Reserved1[24]; +} SYSTEM_INTERRUPT_INFORMATION, *PSYSTEM_INTERRUPT_INFORMATION; + +typedef struct _SYSTEM_EXCEPTION_INFORMATION +{ + BYTE Reserved1[16]; +} SYSTEM_EXCEPTION_INFORMATION, *PSYSTEM_EXCEPTION_INFORMATION; + +typedef struct _SYSTEM_REGISTRY_QUOTA_INFORMATION +{ + ULONG RegistryQuotaAllowed; + ULONG RegistryQuotaUsed; + PVOID Reserved1; +} SYSTEM_REGISTRY_QUOTA_INFORMATION, *PSYSTEM_REGISTRY_QUOTA_INFORMATION; + +typedef struct _SYSTEM_LOOKASIDE_INFORMATION +{ + BYTE Reserved1[32]; +} SYSTEM_LOOKASIDE_INFORMATION, *PSYSTEM_LOOKASIDE_INFORMATION; + +typedef struct _SYSTEM_POLICY_INFORMATION +{ + PVOID Reserved1[2]; + ULONG Reserved2[3]; +} SYSTEM_POLICY_INFORMATION, *PSYSTEM_POLICY_INFORMATION; + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQuerySystemInformation( + _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, + _Out_ PVOID SystemInformation, + _In_ ULONG InformationLength, + _Out_opt_ PULONG ResultLength); + +typedef enum _WINSTATIONINFOCLASS +{ + WinStationInformation = 8 +} WINSTATIONINFOCLASS; + +typedef struct _WINSTATIONINFORMATIONW +{ + BYTE Reserved2[70]; + ULONG LogonId; + BYTE Reserved3[1140]; +} WINSTATIONINFORMATIONW, * PWINSTATIONINFORMATIONW; + +typedef +BOOLEAN +(WINAPI * PWINSTATIONQUERYINFORMATIONW)( + HANDLE, + ULONG, + WINSTATIONINFOCLASS, + PVOID, + ULONG, + PULONG); + +__kernel_entry +NTSYSCALLAPI +NTSTATUS +NTAPI +NtQuerySystemTime( + _Out_ PLARGE_INTEGER SystemTime); + +#define RtlMoveMemory(Dest,Source,Length) memmove((Dest),(Source),(Length)) +#define RtlFillMemory(Dest,Length,Fill) memset((Dest),(Fill),(Length)) +#define RtlZeroMemory(Dest,Length) RtlFillMemory((Dest),(Length),0) + +VOID +NTAPI +RtlInitString( + PSTRING DestinationString, + PCSZ SourceString); + +VOID +NTAPI +RtlInitAnsiString( + PANSI_STRING DestinationString, + PCSZ SourceString); + +VOID +NTAPI +RtlInitUnicodeString( + PUNICODE_STRING DestinationString, + PCWSTR SourceString); + +VOID +NTAPI +RtlFreeAnsiString( + PANSI_STRING AnsiString); + +VOID +NTAPI +RtlFreeOemString( + POEM_STRING OemString); + +VOID +NTAPI +RtlFreeUnicodeString( + PUNICODE_STRING UnicodeString); + +NTSTATUS +NTAPI +RtlAnsiStringToUnicodeString( + PUNICODE_STRING DestinationString, + PCANSI_STRING SourceString, + BOOLEAN AllocateDestinationString); + +NTSTATUS +NTAPI +RtlUnicodeStringToAnsiString( + PANSI_STRING DestinationString, + PCUNICODE_STRING SourceString, + BOOLEAN AllocateDestinationString); + +NTSTATUS +NTAPI +RtlUnicodeStringToOemString( + POEM_STRING DestinationString, + PCUNICODE_STRING SourceString, + BOOLEAN AllocateDestinationString); + +NTSTATUS +NTAPI +RtlUnicodeToMultiByteSize( + _Out_ PULONG BytesInMultiByteString, + _In_reads_bytes_(BytesInUnicodeString) PWCH UnicodeString, + _In_ ULONG BytesInUnicodeString); + +NTSTATUS +NTAPI +RtlCharToInteger( + PCSZ String, + ULONG Base, + PULONG Value); + +BOOLEAN +NTAPI +RtlIsNameLegalDOS8Dot3( + _In_ PUNICODE_STRING Name, + _Inout_opt_ POEM_STRING OemName, + _Inout_opt_ PBOOLEAN NameContainsSpaces); + +NTSTATUS +NTAPI +RtlLocalTimeToSystemTime( + IN PLARGE_INTEGER LocalTime, + _Out_ PLARGE_INTEGER SystemTime); + +BOOLEAN +NTAPI +RtlTimeToSecondsSince1970( + PLARGE_INTEGER Time, + PULONG ElapsedSeconds); + +_When_(Status < 0, _Out_range_(>, 0)) +_When_(Status >= 0, _Out_range_(==, 0)) +ULONG +NTAPI +RtlNtStatusToDosError( + _In_ NTSTATUS Status); + +NTSTATUS +NTAPI +RtlConvertSidToUnicodeString( + PUNICODE_STRING UnicodeString, + PSID Sid, + BOOLEAN AllocateDestinationString); + +ULONG +NTAPI +RtlUniform( + PULONG Seed); + + +#ifdef __cplusplus +} +#endif + +#endif /* _WINTERNL_ */ Propchange: trunk/reactos/include/psdk/winternl.h ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[tkreuzer] 66720: [DDK/PSDK/NDK/XDK] - Improve annotations for some functions - Sync winnt.h with XDK

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Mar 15 00:05:50 2015 New Revision: 66720 URL: http://svn.reactos.org/svn/reactos?rev=66720&view=rev Log: [DDK/PSDK/NDK/XDK] - Improve annotations for some functions - Sync winnt.h with XDK Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ndk/cmfuncs.h trunk/reactos/include/ndk/exfuncs.h trunk/reactos/include/ndk/obfuncs.h trunk/reactos/include/ndk/psfuncs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/psfuncs.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=66… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -4706,15 +4706,16 @@ _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_opt_ PCLIENT_ID ClientId); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation OPTIONAL, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL); + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength); #if (NTDDI_VERSION >= NTDDI_WIN2K) Modified: trunk/reactos/include/ndk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/cmfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/cmfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -176,20 +176,22 @@ _In_ BOOLEAN WatchSubtree ); +__kernel_entry +NTSYSCALLAPI NTSTATUS NTAPI NtNotifyChangeMultipleKeys( _In_ HANDLE MasterKeyHandle, - _In_ ULONG Count, - _In_ POBJECT_ATTRIBUTES SlaveObjects, - _In_ HANDLE Event, + _In_opt_ ULONG Count, + _In_reads_opt_(Count) OBJECT_ATTRIBUTES SubordinateObjects[], + _In_opt_ HANDLE Event, _In_opt_ PIO_APC_ROUTINE ApcRoutine, _In_opt_ PVOID ApcContext, _Out_ PIO_STATUS_BLOCK IoStatusBlock, _In_ ULONG CompletionFilter, _In_ BOOLEAN WatchTree, - _Out_bytecap_(Length) PVOID Buffer, - _In_ ULONG Length, + _Out_writes_bytes_opt_(BufferSize) PVOID Buffer, + _In_ ULONG BufferSize, _In_ BOOLEAN Asynchronous ); @@ -222,16 +224,17 @@ _Out_ PULONG ResultLength ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryMultipleValueKey( _In_ HANDLE KeyHandle, - _Inout_ PKEY_VALUE_ENTRY ValueList, - _In_ ULONG NumberOfValues, - _Out_bytecap_(*Length) PVOID Buffer, - _Inout_ PULONG Length, - _Out_ PULONG ReturnLength + _Inout_updates_(EntryCount) PKEY_VALUE_ENTRY ValueEntries, + _In_ ULONG EntryCount, + _Out_writes_bytes_(*BufferLength) PVOID ValueBuffer, + _Inout_ PULONG BufferLength, + _Out_opt_ PULONG RequiredBufferLength ); NTSTATUS @@ -270,7 +273,7 @@ NTAPI NtRenameKey( _In_ HANDLE KeyHandle, - _In_ PUNICODE_STRING ReplacementName + _In_ PUNICODE_STRING NewName ); NTSYSCALLAPI @@ -317,14 +320,16 @@ _In_ HANDLE FileHandle ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtSetInformationKey( _In_ HANDLE KeyHandle, - _In_ KEY_SET_INFORMATION_CLASS KeyInformationClass, - _In_ PVOID KeyInformation, - _In_ ULONG KeyInformationLength + _In_ _Strict_type_match_ + KEY_SET_INFORMATION_CLASS KeySetInformationClass, + _In_reads_bytes_(KeySetInformationLength) PVOID KeySetInformation, + _In_ ULONG KeySetInformationLength ); NTSYSCALLAPI Modified: trunk/reactos/include/ndk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/exfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -401,13 +401,14 @@ _Inout_ PULONG Attributes ); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQuerySystemInformation( _In_ SYSTEM_INFORMATION_CLASS SystemInformationClass, _Out_ PVOID SystemInformation, - _In_ ULONG Length, + _In_ ULONG InformationLength, _Out_opt_ PULONG ResultLength ); Modified: trunk/reactos/include/ndk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/obfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/obfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -373,7 +373,7 @@ NtWaitForSingleObject( _In_ HANDLE Object, _In_ BOOLEAN Alertable, - _In_opt_ PLARGE_INTEGER Time + _In_opt_ PLARGE_INTEGER Timeout ); NTSYSAPI Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -507,6 +507,7 @@ ); #ifndef _NTDDK_ +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI @@ -515,7 +516,7 @@ _In_ PROCESSINFOCLASS ProcessInformationClass, _Out_ PVOID ProcessInformation, _In_ ULONG ProcessInformationLength, - _Out_opt_ PULONG ReturnLength OPTIONAL + _Out_opt_ PULONG ReturnLength ); #endif Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -4323,6 +4323,9 @@ RtlQueryDepthSList( _In_ PSLIST_HEADER ListHead); +#ifndef _RTL_RUN_ONCE_DEF +#define _RTL_RUN_ONCE_DEF + #define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL #define RTL_RUN_ONCE_ASYNC 0x00000002UL #define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL @@ -4343,6 +4346,8 @@ PRTL_RUN_ONCE, DWORD, PVOID); + +#endif #define RTL_CONDITION_VARIABLE_INIT {0} #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1 Modified: trunk/reactos/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/psfuncs.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -41,15 +41,16 @@ _In_ POBJECT_ATTRIBUTES ObjectAttributes, _In_opt_ PCLIENT_ID ClientId); +__kernel_entry NTSYSCALLAPI NTSTATUS NTAPI NtQueryInformationProcess( - IN HANDLE ProcessHandle, - IN PROCESSINFOCLASS ProcessInformationClass, - OUT PVOID ProcessInformation OPTIONAL, - IN ULONG ProcessInformationLength, - OUT PULONG ReturnLength OPTIONAL); + _In_ HANDLE ProcessHandle, + _In_ PROCESSINFOCLASS ProcessInformationClass, + _Out_ PVOID ProcessInformation, + _In_ ULONG ProcessInformationLength, + _Out_opt_ PULONG ReturnLength); $endif (_NTDDK_) $if (_NTIFS_) Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sun Mar 15 00:05:50 2015 @@ -672,6 +672,8 @@ #define PF_RDTSC_INSTRUCTION_AVAILABLE 8 #define PF_PAE_ENABLED 9 #define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_NX_ENABLED 12 + /* also in ddk/ntifs.h */ #define FILE_ACTION_ADDED 0x00000001 #define FILE_ACTION_REMOVED 0x00000002 @@ -4351,6 +4353,7 @@ PCWSTR lpAssemblyManifestPath; PCWSTR lpAssemblyPolicyPath; PCWSTR lpAssemblyDirectoryName; + DWORD ulFileCount; } ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION, *PACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION; typedef const ACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION *PCACTIVATION_CONTEXT_ASSEMBLY_DETAILED_INFORMATION;

9 years, 9 months

[dquintana] 66719: [NTOBJSHEX] * Implement loading the hardcoded list of root keys. * Add support for root keys to the registry PIDL structure. * Add support for root-key PIDLs in the registry fold...

by dquintana＠svn.reactos.org

Author: dquintana Date: Sun Mar 15 00:00:13 2015 New Revision: 66719 URL: http://svn.reactos.org/svn/reactos?rev=66719&view=rev Log: [NTOBJSHEX] * Implement loading the hardcoded list of root keys. * Add support for root keys to the registry PIDL structure. * Add support for root-key PIDLs in the registry folder. * Implement loading root keys when no path is specified. * Expose the registry folder as a namespace extension to My Computer. * Make the namespace extension folder names load from resources. * Add icons for registry keys and values. CORE-9244 #resolve #comment Basic registry browsing should now be functional. Any other issues (including editing capability), would go in followup issues. Added: trunk/reactos/dll/shellext/ntobjshex/resources/7.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/8.ico (with props) trunk/reactos/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs (with props) Modified: trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h trunk/reactos/dll/shellext/ntobjshex/resource.h trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs Modified: trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/lang/en-US.rc [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -2,5 +2,6 @@ STRINGTABLE BEGIN - IDS_NAME "NT Object Namespace" + IDS_NTOBJFLD_NAME "NT Object Namespace" + IDS_REGISTRY_NAME "System Registry" END Modified: trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/lan… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -3,5 +3,6 @@ STRINGTABLE BEGIN - IDS_NAME "SpaÈiu de nume Obiect NT" + IDS_NTOBJFLD_NAME "SpaÈiu de nume Obiect NT" + IDS_REGISTRY_NAME "System Registry" END Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjns.cpp [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -107,6 +107,11 @@ *piIndex = -IDI_NTOBJECTPORT; *pwFlags = flags; return S_OK; + case KEY_OBJECT: + GetModuleFileNameW(g_hInstance, szIconFile, cchMax); + *piIndex = -IDI_REGISTRYKEY; + *pwFlags = flags; + return S_OK; default: GetModuleFileNameW(g_hInstance, szIconFile, cchMax); *piIndex = -IDI_NTOBJECTITEM; @@ -624,7 +629,7 @@ if (info->objectType == KEY_OBJECT) { - hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, IID_PPV_ARG(IShellFolder, &psfChild)); + hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, (HKEY)NULL, IID_PPV_ARG(IShellFolder, &psfChild)); } else { Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.cpp [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -14,6 +14,7 @@ BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_NtObjectFolder, CNtObjectFolder) + OBJECT_ENTRY(CLSID_RegistryFolder, CRegistryFolder) END_OBJECT_MAP() HINSTANCE g_hInstance; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjshex.rc [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -12,8 +12,11 @@ IDI_NTOBJECTITEM ICON "resources/4.ico" IDI_NTOBJECTDEVICE ICON "resources/5.ico" IDI_NTOBJECTPORT ICON "resources/6.ico" +IDI_REGISTRYKEY ICON "resources/7.ico" +IDI_REGISTRYVALUE ICON "resources/8.ico" IDR_NTOBJECTFOLDER REGISTRY "resources/rgs/ntobjectfolder.rgs" +IDR_REGISTRYFOLDER REGISTRY "resources/rgs/regfolder.rgs" /* UTF-8 */ #pragma code_page(65001) Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.cpp [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -417,6 +417,62 @@ return S_OK; } +HRESULT EnumerateRootKeys(HDPA hdpa, UINT * hdpaCount) +{ + *hdpaCount = 0; + + static struct { + HKEY key; + PCWSTR keyName; + } rootKeys [] = { + { HKEY_CLASSES_ROOT, L"HKEY_CLASSES_ROOT" }, + { HKEY_CURRENT_USER, L"HKEY_CURRENT_USER" }, + { HKEY_LOCAL_MACHINE, L"HKEY_LOCAL_MACHINE" }, + { HKEY_USERS, L"HKEY_USERS" }, + { HKEY_CURRENT_CONFIG, L"HKEY_CURRENT_CONFIG" } + }; + + for (UINT i = 0; i < _countof(rootKeys); i++) + { + PCWSTR name = rootKeys[i].keyName; + DWORD cchName = wcslen(rootKeys[i].keyName); + + REG_ENTRY_TYPE otype = REG_ENTRY_ROOT; + + DWORD entryBufferLength = FIELD_OFFSET(RegPidlEntry, entryName) + sizeof(WCHAR) + cchName * sizeof(WCHAR); + + RegPidlEntry* entry = (RegPidlEntry*) CoTaskMemAlloc(entryBufferLength); + if (!entry) + return E_OUTOFMEMORY; + + memset(entry, 0, entryBufferLength); + + entry->cb = FIELD_OFFSET(NtPidlEntry, entryName); + entry->magic = REGISTRY_PIDL_MAGIC; + entry->entryType = otype; + entry->rootKey = rootKeys[i].key; + + if (cchName > 0) + { + entry->entryNameLength = cchName * sizeof(WCHAR); + StringCbCopyNW(entry->entryName, entryBufferLength, name, entry->entryNameLength); + entry->cb += entry->entryNameLength + sizeof(WCHAR); + } + else + { + entry->entryNameLength = 0; + entry->entryName[0] = 0; + entry->cb += sizeof(WCHAR); + } + + DPA_AppendPtr(hdpa, entry); + (*hdpaCount)++; + + } + + return S_OK; +} + HRESULT ReadRegistryValue(HKEY root, PCWSTR path, PCWSTR valueName, PVOID * valueData, PDWORD valueLength) { HKEY hkey; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjutil.h [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -72,6 +72,7 @@ // REGISTRY browser enum REG_ENTRY_TYPE { + REG_ENTRY_ROOT, REG_ENTRY_KEY, REG_ENTRY_VALUE, REG_ENTRY_VALUE_WITH_CONTENT @@ -88,10 +89,16 @@ USHORT entryNameLength; - // For Value entries, this contains the value contents, if it's resonably small. - // For Key entries, this contains the custom class name - DWORD contentType; - USHORT contentsLength; + union { + struct { + // For Value entries, this contains the value contents, if it's resonably small. + // For Key entries, this contains the custom class name + DWORD contentType; + USHORT contentsLength; + }; + + HKEY rootKey; + }; WCHAR entryName[ANYSIZE_ARRAY]; @@ -102,5 +109,6 @@ HRESULT EnumerateNtDirectory(HDPA hdpa, PCWSTR path, UINT * hdpaCount); HRESULT EnumerateRegistryKey(HDPA hdpa, PCWSTR path, HKEY root, UINT * hdpaCount); +HRESULT EnumerateRootKeys(HDPA hdpa, UINT * hdpaCount); HRESULT ReadRegistryValue(HKEY root, PCWSTR path, PCWSTR valueName, PVOID * valueData, PDWORD valueLength); Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -86,6 +86,7 @@ switch (entry->entryType) { case REG_ENTRY_KEY: + case REG_ENTRY_ROOT: GetModuleFileNameW(g_hInstance, szIconFile, cchMax); *piIndex = -IDI_REGISTRYKEY; *pwFlags = flags; @@ -126,6 +127,7 @@ { private: PWSTR m_ntPath; + HKEY m_hRoot; HDPA m_hDpa; UINT m_hDpaCount; @@ -146,6 +148,7 @@ public: CRegistryPidlManager() : m_ntPath(NULL), + m_hRoot(NULL), m_hDpa(NULL), m_hDpaCount(0) { @@ -156,18 +159,28 @@ DPA_DestroyCallback(m_hDpa, s_DpaDeleteCallback, this); } - HRESULT Initialize(PWSTR ntPath) + HRESULT Initialize(PWSTR ntPath, HKEY hRoot) { m_ntPath = ntPath; + m_hRoot = hRoot; m_hDpa = DPA_Create(10); if (!m_hDpa) return E_OUTOFMEMORY; - HRESULT hr = EnumerateRegistryKey(m_hDpa, m_ntPath, NULL, &m_hDpaCount); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (wcslen(m_ntPath) == 0 && m_hRoot == NULL) + { + HRESULT hr = EnumerateRootKeys(m_hDpa, &m_hDpaCount); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + else + { + HRESULT hr = EnumerateRegistryKey(m_hDpa, m_ntPath, m_hRoot, &m_hDpaCount); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } return S_OK; } @@ -346,7 +359,8 @@ ULONG mask = inMask ? *inMask : 0xFFFFFFFF; ULONG flags = 0; - if (entry->entryType == REG_ENTRY_KEY) + if ((entry->entryType == REG_ENTRY_KEY) || + (entry->entryType == REG_ENTRY_ROOT)) flags |= SFGAO_FOLDER | SFGAO_HASSUBFOLDER | SFGAO_BROWSABLE; return flags & mask; @@ -359,7 +373,8 @@ if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - return (entry->entryType == REG_ENTRY_KEY); + return (entry->entryType == REG_ENTRY_KEY) || + (entry->entryType == REG_ENTRY_ROOT); } HRESULT FormatValueData(DWORD contentType, PVOID td, DWORD contentsLength, PCWSTR * strContents) @@ -430,7 +445,14 @@ DWORD valueLength; HRESULT hr = ReadRegistryValue(NULL, m_ntPath, info->entryName, &valueData, &valueLength); if (FAILED_UNEXPECTEDLY(hr)) - return hr; + { + PCWSTR strEmpty = L"(Error reading value)"; + DWORD bufferLength = (wcslen(strEmpty) + 1) * sizeof(WCHAR); + PWSTR strValue = (PWSTR) CoTaskMemAlloc(bufferLength); + StringCbCopyW(strValue, bufferLength, strEmpty); + *strContents = strValue; + return S_OK; + } if (valueLength > 0) { @@ -522,6 +544,7 @@ switch (tinfo->entryType) { case REG_ENTRY_KEY: + case REG_ENTRY_ROOT: flagsOk = (m_Flags & SHCONTF_FOLDERS) != 0; break; default: @@ -651,19 +674,26 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - WCHAR path[MAX_PATH]; - - StringCbCopyW(path, _countof(path), m_NtPath); - - PathAppendW(path, info->entryName); - LPITEMIDLIST first = ILCloneFirst(pidl); LPCITEMIDLIST rest = ILGetNext(pidl); LPITEMIDLIST fullPidl = ILCombine(m_shellPidl, first); CComPtr<IShellFolder> psfChild; - hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, IID_PPV_ARG(IShellFolder, &psfChild)); + if (wcslen(m_NtPath) == 0 && m_hRoot == NULL) + { + hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, L"", info->rootKey, IID_PPV_ARG(IShellFolder, &psfChild)); + } + else + { + WCHAR path[MAX_PATH]; + + StringCbCopyW(path, _countof(path), m_NtPath); + + PathAppendW(path, info->entryName); + + hr = ShellObjectCreatorInit<CRegistryFolder>(fullPidl, path, m_hRoot, IID_PPV_ARG(IShellFolder, &psfChild)); + } ILFree(fullPidl); ILFree(first); @@ -928,8 +958,9 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl) { m_shellPidl = ILClone(pidl); - - PCWSTR ntPath = L"\\REGISTRY"; + m_hRoot = NULL; + + PCWSTR ntPath = L""; if (!m_PidlManager) { @@ -938,19 +969,20 @@ StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); } - return m_PidlManager->Initialize(m_NtPath); + return m_PidlManager->Initialize(m_NtPath, m_hRoot); } // Internal -HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath) +HRESULT STDMETHODCALLTYPE CRegistryFolder::Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot) { m_shellPidl = ILClone(pidl); + m_hRoot = hRoot; if (!m_PidlManager) m_PidlManager = new CRegistryPidlManager(); StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - return m_PidlManager->Initialize(m_NtPath); + return m_PidlManager->Initialize(m_NtPath, m_hRoot); } // IPersistFolder2 @@ -1039,6 +1071,11 @@ } else if (pscid->pid == PID_STG_STORAGETYPE) { + if (info->entryType == REG_ENTRY_ROOT) + { + return MakeVariantString(pv, L"Key"); + } + if (info->entryType == REG_ENTRY_KEY) { if (info->contentsLength > 0) @@ -1108,6 +1145,11 @@ case REGISTRY_COLUMN_TYPE: psd->fmt = LVCFMT_LEFT; + + if (info->entryType == REG_ENTRY_ROOT) + { + return MakeStrRetFromString(L"Key", &(psd->str)); + } if (info->entryType == REG_ENTRY_KEY) { Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -21,6 +21,7 @@ { CRegistryPidlManager * m_PidlManager; + HKEY m_hRoot; WCHAR m_NtPath[MAX_PATH]; LPITEMIDLIST m_shellPidl; @@ -136,11 +137,11 @@ virtual HRESULT STDMETHODCALLTYPE MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam); // Internal - HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath); + HRESULT STDMETHODCALLTYPE Initialize(LPCITEMIDLIST pidl, PCWSTR ntPath, HKEY hRoot); static HRESULT CALLBACK DefCtxMenuCallback(IShellFolder *, HWND, IDataObject *, UINT, WPARAM, LPARAM); - DECLARE_REGISTRY_RESOURCEID(IDR_NTOBJECTFOLDER) + DECLARE_REGISTRY_RESOURCEID(IDR_REGISTRYFOLDER) DECLARE_NOT_AGGREGATABLE(CRegistryFolder) DECLARE_PROTECT_FINAL_CONSTRUCT() Modified: trunk/reactos/dll/shellext/ntobjshex/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/resource.h [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -1,15 +1,16 @@ #pragma once -#define IDI_NTOBJECTFOLDER 1 -#define IDI_NTOBJECTDIR 2 -#define IDI_NTOBJECTDIROPEN 3 -#define IDI_NTOBJECTITEM 4 -#define IDI_NTOBJECTDEVICE 5 -#define IDI_NTOBJECTPORT 6 +#define IDI_NTOBJECTFOLDER 1 +#define IDI_NTOBJECTDIR 2 +#define IDI_NTOBJECTDIROPEN 3 +#define IDI_NTOBJECTITEM 4 +#define IDI_NTOBJECTDEVICE 5 +#define IDI_NTOBJECTPORT 6 +#define IDI_REGISTRYKEY 7 +#define IDI_REGISTRYVALUE 8 -#define IDI_REGISTRYKEY 32 -#define IDI_REGISTRYVALUE 33 +#define IDS_NTOBJFLD_NAME 101 +#define IDS_REGISTRY_NAME 102 -#define IDS_NAME 101 - -#define IDR_NTOBJECTFOLDER 1001 +#define IDR_NTOBJECTFOLDER 1001 +#define IDR_REGISTRYFOLDER 1002 Added: trunk/reactos/dll/shellext/ntobjshex/resources/7.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/7.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/shellext/ntobjshex/resources/8.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/8.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -7,7 +7,7 @@ NTObjShEx.NTDirectory = s 'NT Namespace Directory Class' { CLSID = s '{845B0FB2-66E0-416B-8F91-314E23F7C12D}' - CurVer = s 'WMIFldr.CWMIFldr.1' + CurVer = s 'NTObjShEx.NTDirectory.1' } NoRemove CLSID { @@ -20,6 +20,7 @@ val ThreadingModel = s 'Both' } val InfoTip = s 'Allows browsing of the NT Object Namespace' + val LocalizedString = s '@%MODULE%,-101' DefaultIcon = s '%MODULE%,0' ShellFolder { @@ -45,7 +46,7 @@ { NoRemove NameSpace { - ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace Extension' + ForceRemove {845B0FB2-66E0-416B-8F91-314E23F7C12D} = s 'NT Object Namespace' { } } Added: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/res… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs (added) +++ trunk/reactos/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs [iso-8859-1] Sun Mar 15 00:00:13 2015 @@ -0,0 +1,59 @@ +HKCR +{ + NTObjShEx.RegFolder.1 = s 'Registry Folder Class' + { + CLSID = s '{1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6}' + } + NTObjShEx.RegFolder = s 'Registry Folder Class' + { + CLSID = s '{1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6}' + CurVer = s 'NTObjShEx.RegFolder.1' + } + NoRemove CLSID + { + ForceRemove {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} = s 'System Registry Namespace Extension' + { + ProgID = s 'NTObjShEx.RegFolder.1' + VersionIndependentProgID = s 'NTObjShEx.RegFolder' + InprocServer32 = s '%MODULE%' + { + val ThreadingModel = s 'Both' + } + val InfoTip = s 'Allows browsing of the System Registry' + val LocalizedString = s '@%MODULE%,-102' + DefaultIcon = s '%MODULE%,-7' + ShellFolder + { + val Attributes = d '0xA8000000' + val BrowserFlags = d '0x22' + } + } + } +} +HKLM +{ + NoRemove Software + { + NoRemove Microsoft + { + NoRemove Windows + { + NoRemove CurrentVersion + { + NoRemove Explorer + { + NoRemove MyComputer + { + NoRemove NameSpace + { + ForceRemove {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} = s 'System Registry' + { + } + } + } + } + } + } + } + } +} Propchange: trunk/reactos/dll/shellext/ntobjshex/resources/rgs/regfolder.rgs ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[tkreuzer] 66718: [QUARTZ_WINETEST] Add missing dxsdk dependency

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 23:58:45 2015 New Revision: 66718 URL: http://svn.reactos.org/svn/reactos?rev=66718&view=rev Log: [QUARTZ_WINETEST] Add missing dxsdk dependency Modified: trunk/rostests/winetests/quartz/CMakeLists.txt Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:58:45 2015 @@ -15,7 +15,7 @@ add_idl_headers(quartz_test_idlheader fil_data.idl) add_executable(quartz_winetest ${SOURCE}) target_link_libraries(quartz_winetest uuid) -add_dependencies(quartz_winetest quartz_test_idlheader) +add_dependencies(quartz_winetest dxsdk quartz_test_idlheader) set_module_type(quartz_winetest win32cui) add_importlibs(quartz_winetest ole32 oleaut32 advapi32 msvcrt kernel32)

9 years, 9 months

[tkreuzer] 66717: [GDI32] Make sure winternl.h is included from the wine folder

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 23:35:27 2015 New Revision: 66717 URL: http://svn.reactos.org/svn/reactos?rev=66717&view=rev Log: [GDI32] Make sure winternl.h is included from the wine folder Modified: trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c Modified: trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/wine/met… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/wine/metafile.c [iso-8859-1] Sat Mar 14 23:35:27 2015 @@ -57,7 +57,7 @@ #include "winreg.h" #include "winnls.h" -#include "winternl.h" +#include "wine/winternl.h" #include "gdi_private.h" #include "wine/debug.h"

9 years, 9 months

[tkreuzer] 66716: [DLLS] Make sure include/reactos/wine is included BEFORE PSDK headers. (I didn't tackle all DLLs, only those that (will) need it)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 23:34:31 2015 New Revision: 66716 URL: http://svn.reactos.org/svn/reactos?rev=66716&view=rev Log: [DLLS] Make sure include/reactos/wine is included BEFORE PSDK headers. (I didn't tackle all DLLs, only those that (will) need it) Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt trunk/reactos/dll/win32/comdlg32/CMakeLists.txt trunk/reactos/dll/win32/dbghelp/CMakeLists.txt trunk/reactos/dll/win32/imagehlp/CMakeLists.txt trunk/reactos/dll/win32/mapi32/CMakeLists.txt trunk/reactos/dll/win32/msctf/CMakeLists.txt trunk/reactos/dll/win32/mstask/CMakeLists.txt trunk/reactos/dll/win32/msvfw32/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/shlwapi/CMakeLists.txt trunk/reactos/dll/win32/twain_32/CMakeLists.txt trunk/reactos/dll/win32/usp10/CMakeLists.txt trunk/reactos/dll/win32/version/CMakeLists.txt trunk/reactos/dll/win32/wbemprox/CMakeLists.txt trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt trunk/reactos/dll/win32/winmm/CMakeLists.txt trunk/reactos/dll/win32/winscard/CMakeLists.txt trunk/reactos/dll/win32/wintrust/CMakeLists.txt Modified: trunk/reactos/dll/win32/advpack/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advpack/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advpack/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(advpack.dll advpack.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -3,7 +3,7 @@ -D__WINESRC__ -D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(comdlg32.dll comdlg32.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dbghelp/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -39,7 +39,7 @@ endif() include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine + BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib) spec2def(dbghelp.dll dbghelp.spec ADD_IMPORTLIB) Modified: trunk/reactos/dll/win32/imagehlp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imagehlp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imagehlp/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D_IMAGEHLP_SOURCE_) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(imagehlp.dll imagehlp.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/mapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mapi32/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mapi32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(mapi32.dll mapi32.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/msctf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msctf/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msctf/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(msctf.dll msctf.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/mstask/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mstask/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/mstask/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mstask/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) generate_idl_iids(mstask_local.idl) spec2def(mstask.dll mstask.spec) Modified: trunk/reactos/dll/win32/msvfw32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvfw32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvfw32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) add_definitions(-D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(msvfw32.dll msvfw32.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -10,7 +10,7 @@ -DPROXY_CLSID=CLSID_PSFactoryBuffer -DWINE_REGISTER_DLL) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(ole32.dll ole32.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -11,7 +11,7 @@ -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_CLSID=CLSID_PSFactoryBuffer) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(oleaut32.dll oleaut32.spec ADD_IMPORTLIB) add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(rpcrt4.dll rpcrt4.spec ADD_IMPORTLIB) add_rpc_files(client epm.idl) Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -5,7 +5,7 @@ -D__WINESRC__ -D_SHLWAPI_) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(shlwapi.dll shlwapi.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/twain_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/twain_32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/twain_32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(twain_32.dll twain_32.spec) Modified: trunk/reactos/dll/win32/usp10/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/usp10/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,5 +1,5 @@ -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) add_definitions(-D__WINESRC__) spec2def(usp10.dll usp10.spec ADD_IMPORTLIB) Modified: trunk/reactos/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/version/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/version/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(version.dll version.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/wbemprox/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -3,7 +3,7 @@ add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wbemprox.dll wbemprox.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/windowscodecs/CM… ============================================================================== --- trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/windowscodecs/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -9,7 +9,7 @@ add_definitions(-D_WIN32_WINNT=0x600) include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine + BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg ${REACTOS_SOURCE_DIR}/include/reactos/libs/zlib ${REACTOS_SOURCE_DIR}/include/reactos/libs/libpng Modified: trunk/reactos/dll/win32/winmm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D_WINE) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(winmm.dll winmm.spec ADD_IMPORTLIB) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/winscard/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winscard/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/winscard/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winscard/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(winscard.dll winscard.spec) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:34:31 2015 @@ -1,6 +1,6 @@ add_definitions(-D__WINESRC__) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) list(APPEND SOURCE

9 years, 9 months

[tkreuzer] 66715: [WINETESTS] Make sure include/reactos/wine is included BEFORE PSDK headers.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 23:33:29 2015 New Revision: 66715 URL: http://svn.reactos.org/svn/reactos?rev=66715&view=rev Log: [WINETESTS] Make sure include/reactos/wine is included BEFORE PSDK headers. Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt trunk/rostests/winetests/kernel32/CMakeLists.txt trunk/rostests/winetests/ntdll/CMakeLists.txt trunk/rostests/winetests/quartz/CMakeLists.txt trunk/rostests/winetests/ws2_32/CMakeLists.txt Modified: trunk/rostests/winetests/advapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/advapi32/CMakeL… ============================================================================== --- trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/advapi32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:33:29 2015 @@ -1,3 +1,5 @@ + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) list(APPEND SOURCE cred.c Modified: trunk/rostests/winetests/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/kernel32/CMakeL… ============================================================================== --- trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/kernel32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:33:29 2015 @@ -1,3 +1,5 @@ + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) Modified: trunk/rostests/winetests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/CMakeList… ============================================================================== --- trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:33:29 2015 @@ -1,3 +1,5 @@ + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) Modified: trunk/rostests/winetests/quartz/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/quartz/CMakeLis… ============================================================================== --- trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/quartz/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:33:29 2015 @@ -1,3 +1,5 @@ + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) list(APPEND SOURCE avisplitter.c Modified: trunk/rostests/winetests/ws2_32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/CMakeLis… ============================================================================== --- trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/ws2_32/CMakeLists.txt [iso-8859-1] Sat Mar 14 23:33:29 2015 @@ -1,3 +1,5 @@ + +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine) add_executable(ws2_32_winetest protocol.c sock.c testlist.c) set_module_type(ws2_32_winetest win32cui)

9 years, 9 months

[tkreuzer] 66714: [ROSAPPS] Fix GCC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 23:32:00 2015 New Revision: 66714 URL: http://svn.reactos.org/svn/reactos?rev=66714&view=rev Log: [ROSAPPS] Fix GCC warnings Modified: trunk/rosapps/applications/sysutils/kill/kill.c trunk/rosapps/applications/winfile/winefile.c trunk/rosapps/drivers/green/screen.c Modified: trunk/rosapps/applications/sysutils/kill/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/kill… ============================================================================== --- trunk/rosapps/applications/sysutils/kill/kill.c [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/kill/kill.c [iso-8859-1] Sat Mar 14 23:32:00 2015 @@ -66,6 +66,7 @@ int main(int argc, char *argv[]) { char tail; + DBG_UNREFERENCED_LOCAL_VARIABLE(tail); if (argc < 2) { Modified: trunk/rosapps/applications/winfile/winefile.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winef… ============================================================================== --- trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/winefile.c [iso-8859-1] Sat Mar 14 23:32:00 2015 @@ -2056,8 +2056,8 @@ switch(nmsg) { case WM_CLOSE: if (Globals.saveSettings) - save_registry_settings(); - + save_registry_settings(); + DestroyWindow(hwnd); /* clear handle variables */ @@ -4278,7 +4278,7 @@ WS_CHILD|WS_CLIPCHILDREN|WS_VSCROLL|WS_HSCROLL|WS_VISIBLE|WS_BORDER, 0, 0, 0, 0, Globals.hMainWnd, 0, Globals.hInstance, &ccs); - + CheckMenuItem(Globals.hMenuOptions, ID_VIEW_DRIVE_BAR, MF_BYCOMMAND|MF_CHECKED); CheckMenuItem(Globals.hMenuOptions, ID_VIEW_SAVESETTINGS, MF_BYCOMMAND); @@ -4313,7 +4313,7 @@ #ifndef __WINE__ /* Shell Namespace as default: */ - child = alloc_child_window(path, get_path_pidl(path,Globals.hMainWnd), Globals.hMainWnd); + child = alloc_child_window(path, get_path_pidl((LPWSTR)path,Globals.hMainWnd), Globals.hMainWnd); #else child = alloc_child_window(path, NULL, Globals.hMainWnd); #endif Modified: trunk/rosapps/drivers/green/screen.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/drivers/green/screen.c?rev… ============================================================================== --- trunk/rosapps/drivers/green/screen.c [iso-8859-1] (original) +++ trunk/rosapps/drivers/green/screen.c [iso-8859-1] Sat Mar 14 23:32:00 2015 @@ -276,6 +276,8 @@ ULONG Columns, Rows; ULONG CursorX, CursorY; ULONG i, j; + DBG_UNREFERENCED_LOCAL_VARIABLE(VideoMemory); + DBG_UNREFERENCED_LOCAL_VARIABLE(VideoMemorySize); DPRINT("ScreenWrite() called\n");

9 years, 9 months

← Newer
1
...
26
27
28
29
30
31
32
...
50
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 March 2015