- Ros-dev - ReactOS.org

Re: [ros-dev] [ros-diffs] [hbelusca] 74619: [USETUP]: filesup module: - Add a NtPathToDiskPartComponents helper, that takes in input a fully qualified NT path to a file on hard disk, e.g.: \Device\Harddisk1\Partition2\foo\b...

by Thomas Faber

On 2017-05-22 01:45, hbelusca(a)svn.reactos.org wrote: > +BOOLEAN > +NtPathToDiskPartComponents( > + IN PCWSTR NtPath, > + OUT PULONG pDiskNumber, > + OUT PULONG pPartNumber, > + OUT PCWSTR* PathComponent OPTIONAL) > +{ > + ULONG DiskNumber, PartNumber; > + PCWSTR Path; > + > + *pDiskNumber = 0; > + *pPartNumber = 0; > + if (PathComponent) *PathComponent = NULL; > + > + Path = NtPath; > + > + if (_wcsnicmp(Path, L"\\Device\\Harddisk", 16) != 0) > + { > + /* The NT path doesn't start with the prefix string, thus it cannot be a hard disk device path */ > + DPRINT1("'%S' : Not a possible hard disk device.\n", NtPath); > + return FALSE; > + } > + > + Path += 16; Avoiding these magic numbers would be nice. Options include: * static string à la static const WCHAR DeviceHarddiskPath[] = L"\\Device\\Harddisk"; _wcsnicmp(Path, DeviceHarddiskPath, ARRAYSIZE(DeviceHarddiskPath) - 1) * simply using wcslen(L"\\Device\\Harddisk") (which should get optimized) * making a "starts with" function * using RtlPrefixUnicodeString > @@ -593,6 +705,31 @@ > { > DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); > return Status; > + } > + > + if (FileSize) > + { > + /* Query the file size */ > + FILE_STANDARD_INFORMATION FileInfo; > + Status = NtQueryInformationFile(*FileHandle, > + &IoStatusBlock, > + &FileInfo, > + sizeof(FileInfo), > + FileStandardInformation); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT("NtQueryInformationFile() failed (Status %lx)\n", Status); > + NtClose(*FileHandle); > + *FileHandle = NULL; > + return Status; > + } > + > + if (FileInfo.EndOfFile.HighPart != 0) > + DPRINT1("WARNING!! The file %wZ is too large!\n", Name); Did you mean &Name?

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74618: [USETUP]: Move all the code that retrieves the version resources from PE executable, out of osdetect.c, and place it in its own module inside the setuplib. Remove also some commen...

by Thomas Faber

On 2017-05-22 01:41, hbelusca(a)svn.reactos.org wrote: > +static PCVS_VERSION_INFO_STRUCT32 > +VersionInfo32_FindChild( > + IN PCVS_VERSION_INFO_STRUCT32 info, > + IN PCWSTR szKey, > + IN UINT cbKey) > +{ > + PCVS_VERSION_INFO_STRUCT32 child = VersionInfo32_Children(info); > + > + while ((ULONG_PTR)child < (ULONG_PTR)info + info->wLength) > + { > + if (!_wcsnicmp(child->szKey, szKey, cbKey) && !child->szKey[cbKey]) You're using cbKey in two places that need a character count here. > + return child; > + > + if (child->wLength == 0) return NULL; > + child = VersionInfo32_Next(child); > + } > + > + return NULL; > +}

8 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74617: [USETUP]: PartList module: Add a couple of disk/partition getters: GetDiskByBiosNumber, GetDiskByNumber, GetDiskBySCSI, GetDiskBySignature, GetPartition, GetDiskOrPartition. They ...

by Thomas Faber

On 2017-05-22 01:36, hbelusca(a)svn.reactos.org wrote: > --- branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] (original) > +++ branches/setup_improvements/base/setup/lib/partlist.c [iso-8859-1] Sun May 21 23:36:13 2017 > @@ -1333,8 +1348,204 @@ > RtlFreeHeap(ProcessHeap, 0, List); > } > > +PDISKENTRY > +GetDiskByBiosNumber( > + IN PPARTLIST List, > + IN ULONG BiosDiskNumber) > +{ > + PDISKENTRY DiskEntry; > + PLIST_ENTRY Entry; > + > + /* Check for empty disks */ > + if (IsListEmpty(&List->DiskListHead)) > + return NULL; These empty list checks look superfluous.

8 years, 1 month

1
0
0 0

A surprising epic win: Wolfram Mathematica on ReactOS

by Hermès BÉLUSCA-MAÏTO

Hi all, I was pleasantly surprised to notice that the symbolic computation program « Wolfram Mathematica », in its version 8.0.4 (later versions are for Vista+ only), actually works quite pretty well on ReactOS (as of r74550): see the screen-capture at http://i.imgur.com/KegyW79.png . This software is broadly used in many scientific, engineering, mathematical, and computing fields. This is for example used intensively in theoretical physics (in high-energy physics, statistical physics etc.) due to the existence of numerous packages that have been developed for it. The only problem of this software resides in its price On the screen-capture I demonstrate an infinitesimal portion of what Mathematica can do: for the non-connoisseurs :) the picture shows the computation of the integral (area under the curve) of the 1-dimensional Gaussian function over the whole real axis (the result is square-root of pi), and then I plot in 3 dimensions the map of a 2-D Gaussian function, where on the horizontal plane there are the x and y axes, and the vertical axis is the z axis. The 3-D graph can be rotated, zoomed-in and out with the mouse, it can be edited, etc The software also proposes an extensive and interactive help documentation. Finally I show the fancy text-mode only interface of Mathematica, that nobody actually uses (it is only used when computing stuff in batch-mode). There are almost no graphical glitches. Few font problems can be seen (see the about-box, and the minus signs on the graph replaced by boxes). There are few keyboard shortcut problems such as pressing (on French keyboards) AltGr-5 to enter [ doesnt work, but anyways Enjoy! Best, Hermès

8 years, 1 month

2
1
0 0

Re: [ros-dev] About the recent USETUP improvements in the branch

by Robert Naumann

I'd say it should stay as fallback solution. Am 21.05.2017 18:27 schrieb "Colin Finck" <colin(a)reactos.org>: Hey Hermès, Great work on the setup components! I especially like the library that paves the way for a feature-rich graphical installer :) Am 18.05.2017 um 20:02 schrieb Hermès BÉLUSCA-MAÏTO: > P.S.: Using a 8x8 font for the installer quickly hurts the eyes (and it > has been like that since ages). It would be great to use a more readable > resolution / font size… Oh yes, I'm all for a good looking installer with nicely readable texts in all languages. Which brings us to the GUI installer and to the question what we would still need the text-mode installer for when the GUI one is perfect? - Colin _______________________________________________ Ros-dev mailing list Ros-dev(a)reactos.org http://www.reactos.org/mailman/listinfo/ros-dev

8 years, 1 month

2
1
0 0

About the recent USETUP improvements in the branch

by Hermès BÉLUSCA-MAÏTO

Hi all, Im writing a short mail to explain the recent USETUP improvements Im doing in the https://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/ branch. The aim is three-fold: - To improve multi-OSes / bootloaders detection and solve https://jira.reactos.org/browse/CORE-4870 , https://jira.reactos.org/browse/CORE-12672 , https://jira.reactos.org/browse/CORE-13188 , https://jira.reactos.org/browse/CORE-13226 in a consistent & reliable way, and possibly having a look at https://jira.reactos.org/browse/CORE-13205 and https://jira.reactos.org/browse/CORE-10898 (low priority for me at the moment). - A bit related to the previous point, have the possibility to automatically detect existing installations of ReactOS (and of Windows) to allow simple upgrade. For this latter part I have code that almost works: it browses all the available partitions on all the disks, and for each, attempts to see whether either freeldr or ntldr is installed, and if so, open their respective configuration files, browse the latter, and from that, deduce the candidate NT installations. On the following screenshot : http://i.imgur.com/Nq67J1o.png , a Windows installation actually exists on partition(1) but is not listed because it happens to be on an NTFS partition. Then there is a ReactOS installation on a FAT partition(2), and finally a Windows installation on another FAT partition(4) (all on the same disk). The installation detector has respectively parsed freeldr.ini, and boot.ini, to deduce the installations, and have removed installations having the same disk and partition numbers and SystemRoot (otherwise you would have seen many ReactOS (xxx) entries). - To facilitate the future implementation of the 1st-stage GUI setup by someone, all the code that can be made common between USETUP and this future GUI setup, is placed into a library. At the time of writing, this concerns the so-called generic lists functionality as well as the partition lists & some file-system-related routines. It will certainly grow up later. Cheers, Hermès P.S.: Using a 8x8 font for the installer quickly hurts the eyes (and it has been like that since ages). It would be great to use a more readable resolution / font size

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [gedmurphy] 74590: [FLTMGR] - Add a rather messy header that I've been slowly building as I'm starting to understand the internals. - Mostly taken from the MS PDBs and info gained from OSR and Alex...

by Alex Ionescu

Hey Ged, The full internal internal filter manager header was published by microsoft in the "minwin" folder of the TH1 and TH2 WDK+SDK. Same place where Timo and Thomas have been using "ntosp.h" from. Best regards, Alex Ionescu On Fri, May 19, 2017 at 2:42 AM, <gedmurphy(a)svn.reactos.org> wrote: > Author: gedmurphy > Date: Fri May 19 09:42:00 2017 > New Revision: 74590 > > URL: http://svn.reactos.org/svn/reactos?rev=74590&view=rev > Log: > [FLTMGR] > - Add a rather messy header that I've been slowly building as I'm starting > to understand the internals. > - Mostly taken from the MS PDBs and info gained from OSR and Alex Carp's > blog. (https://fsfilters.blogspot.co.uk) > > Added: > trunk/reactos/drivers/filters/fltmgr/fltmgrint.h (with props) > > Added: trunk/reactos/drivers/filters/fltmgr/fltmgrint.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ > filters/fltmgr/fltmgrint.h?rev=74590 > ============================================================ > ================== > --- trunk/reactos/drivers/filters/fltmgr/fltmgrint.h (added) > +++ trunk/reactos/drivers/filters/fltmgr/fltmgrint.h [iso-8859-1] Fri > May 19 09:42:00 2017 > @@ -0,0 +1,284 @@ > +#ifndef _FLTMGR_INTERNAL_H > +#define _FLTMGR_INTERNAL_H > + > + > +#define MAX_CONTEXT_TYPES 6 > + > + > +typedef enum _FLT_OBJECT_FLAGS > +{ > + FLT_OBFL_DRAINING = 1, > + FLT_OBFL_ZOMBIED = 2, > + FLT_OBFL_TYPE_INSTANCE = 0x1000000, > + FLT_OBFL_TYPE_FILTER = 0x2000000, > + FLT_OBFL_TYPE_VOLUME = 0x4000000 > + > +} FLT_OBJECT_FLAGS, *PFLT_OBJECT_FLAGS; > + > +typedef enum _FLT_FILTER_FLAGS > +{ > + FLTFL_MANDATORY_UNLOAD_IN_PROGRESS = 1, > + FLTFL_FILTERING_INITIATED = 2 > + > +} FLT_FILTER_FLAGS, *PFLT_FILTER_FLAGS; > + > +typedef struct _FLT_OBJECT // size = 0x14 > +{ > + volatile FLT_OBJECT_FLAGS Flags; > + ULONG PointerCount; > + EX_RUNDOWN_REF RundownRef; > + LIST_ENTRY PrimaryLink; > + > +} FLT_OBJECT, *PFLT_OBJECT; > + > +typedef struct _ALLOCATE_CONTEXT_HEADER > +{ > + PFLT_FILTER Filter; > + PFLT_CONTEXT_CLEANUP_CALLBACK ContextCleanupCallback; > + struct _ALLOCATE_CONTEXT_HEADER *Next; > + FLT_CONTEXT_TYPE ContextType; > + char Flags; > + char AllocationType; > + > +} ALLOCATE_CONTEXT_HEADER, *PALLOCATE_CONTEXT_HEADER; > + > +typedef struct _FLT_RESOURCE_LIST_HEAD > +{ > + ERESOURCE rLock; > + LIST_ENTRY rList; > + ULONG rCount; > + > +} FLT_RESOURCE_LIST_HEAD, *PFLT_RESOURCE_LIST_HEAD; > + > +typedef struct _FLT_MUTEX_LIST_HEAD > +{ > + FAST_MUTEX mLock; > + LIST_ENTRY mList; > + ULONG mCount; > + > +} FLT_MUTEX_LIST_HEAD, *PFLT_MUTEX_LIST_HEAD; > + > +typedef struct _FLT_FILTER // size = 0x120 > +{ > + FLT_OBJECT Base; > + PVOID Frame; //FLTP_FRAME > + UNICODE_STRING Name; > + UNICODE_STRING DefaultAltitude; > + FLT_FILTER_FLAGS Flags; > + PDRIVER_OBJECT DriverObject; > + FLT_RESOURCE_LIST_HEAD InstanceList; > + PVOID VerifierExtension; > + PFLT_FILTER_UNLOAD_CALLBACK FilterUnload; > + PFLT_INSTANCE_SETUP_CALLBACK InstanceSetup; > + PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK InstanceQueryTeardown; > + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownStart; > + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownComplete; > + PALLOCATE_CONTEXT_HEADER SupportedContextsListHead; > + PALLOCATE_CONTEXT_HEADER SupportedContexts[MAX_CONTEXT_TYPES]; > + PVOID PreVolumeMount; > + PVOID PostVolumeMount; > + PFLT_GENERATE_FILE_NAME GenerateFileName; > + PFLT_NORMALIZE_NAME_COMPONENT NormalizeNameComponent; > + PFLT_NORMALIZE_CONTEXT_CLEANUP NormalizeContextCleanup; > + PFLT_OPERATION_REGISTRATION Operations; > + PFLT_FILTER_UNLOAD_CALLBACK OldDriverUnload; > + FLT_MUTEX_LIST_HEAD ActiveOpens; > + FLT_MUTEX_LIST_HEAD ConnectionList; > + FLT_MUTEX_LIST_HEAD PortList; > + EX_PUSH_LOCK PortLock; > + > +} FLT_FILTER, *PFLT_FILTER; > + > +typedef enum _FLT_yINSTANCE_FLAGS > +{ > + INSFL_CAN_BE_DETACHED = 0x01, > + INSFL_DELETING = 0x02, > + INSFL_INITING = 0x04 > + > +} FLT_INSTANCE_FLAGS, *PFLT_INSTANCE_FLAGS; > + > +typedef struct _FLT_TYPE > +{ > + USHORT Signature; > + USHORT Size; > + > +} FLT_TYPE, *PFLT_TYPE; > + > +typedef struct _FLT_INSTANCE // size = 0x144 (324) > +{ > + FLT_OBJECT Base; > + ULONG OperationRundownRef; > + PVOID Volume; //PFLT_VOLUME > + PFLT_FILTER Filter; > + FLT_INSTANCE_FLAGS Flags; > + UNICODE_STRING Altitude; > + UNICODE_STRING Name; > + LIST_ENTRY FilterLink; > + ERESOURCE ContextLock; > + PVOID Context; //PCONTEXT_NODE > + PVOID TrackCompletionNodes; //PRACK_COMPLETION_NODES > + PVOID CallbackNodes[50]; //PCALLBACK_NODE > + > +} FLT_INSTANCE, *PFLT_INSTANCE; > + > +// http://fsfilters.blogspot.co.uk/2010/02/filter-manager- > concepts-part-1.html > +typedef struct _FLTP_FRAME > +{ > + FLT_TYPE Type; > + LIST_ENTRY Links; > + unsigned int FrameID; > + ERESOURCE AltitudeLock; > + UNICODE_STRING AltitudeIntervalLow; > + UNICODE_STRING AltitudeIntervalHigh; > + char LargeIrpCtrlStackSize; > + char SmallIrpCtrlStackSize; > + FLT_RESOURCE_LIST_HEAD RegisteredFilters; > + FLT_RESOURCE_LIST_HEAD AttachedVolumes; > + LIST_ENTRY MountingVolumes; > + FLT_MUTEX_LIST_HEAD AttachedFileSystems; > + FLT_MUTEX_LIST_HEAD ZombiedFltObjectContexts; > + ERESOURCE FilterUnloadLock; > + FAST_MUTEX DeviceObjectAttachLock; > + //FLT_PRCB *Prcb; > + void *PrcbPoolToFree; > + void *LookasidePoolToFree; > + //FLTP_IRPCTRL_STACK_PROFILER IrpCtrlStackProfiler; > + NPAGED_LOOKASIDE_LIST SmallIrpCtrlLookasideList; > + NPAGED_LOOKASIDE_LIST LargeIrpCtrlLookasideList; > + //STATIC_IRP_CONTROL GlobalSIC; > + > +} FLTP_FRAME, *PFLTP_FRAME; > + > + > +// http://fsfilters.blogspot.co.uk/2010/02/filter-manager- > concepts-part-6.html > +typedef struct _STREAM_LIST_CTRL // size = 0xC8 (200) > +{ > + FLT_TYPE Type; > + FSRTL_PER_STREAM_CONTEXT ContextCtrl; > + LIST_ENTRY VolumeLink; > + //STREAM_LIST_CTRL_FLAGS Flags; > + int UseCount; > + ERESOURCE ContextLock; > + //CONTEXT_LIST_CTRL StreamContexts; > + //CONTEXT_LIST_CTRL StreamHandleContexts; > + ERESOURCE NameCacheLock; > + LARGE_INTEGER LastRenameCompleted; > + //NAME_CACHE_LIST_CTRL NormalizedNameCache; > + // NAME_CACHE_LIST_CTRL ShortNameCache; > + // NAME_CACHE_LIST_CTRL OpenedNameCache; > + int AllNameContextsTemporary; > + > +} STREAM_LIST_CTRL, *PSTREAM_LIST_CTRL; > + > + > +typedef struct _FLT_SERVER_PORT_OBJECT > +{ > + LIST_ENTRY FilterLink; > + PFLT_CONNECT_NOTIFY ConnectNotify; > + PFLT_DISCONNECT_NOTIFY DisconnectNotify; > + PFLT_MESSAGE_NOTIFY MessageNotify; > + PFLT_FILTER Filter; > + PVOID Cookie; > + ULONG Flags; > + LONG NumberOfConnections; > + LONG MaxConnections; > + > +} FLT_SERVER_PORT_OBJECT, *PFLT_SERVER_PORT_OBJECT; > + > + > +typedef struct _FLT_PORT_OBJECT > +{ > + LIST_ENTRY FilterLink; > + PFLT_SERVER_PORT_OBJECT ServerPort; > + PVOID Cookie; > + EX_RUNDOWN_REF MsgNotifRundownRef; > + FAST_MUTEX Lock; > + PVOID MsgQ; // FLT_MESSAGE_WAITER_QUEUE MsgQ; > + ULONGLONG MessageId; > + KEVENT DisconnectEvent; > + BOOLEAN Disconnected; > + > +} FLT_PORT_OBJECT, *PFLT_PORT_OBJECT; > + > + > + > + > + > +VOID > +FltpExInitializeRundownProtection( > + _Out_ PEX_RUNDOWN_REF RundownRef > +); > + > +BOOLEAN > +FltpExAcquireRundownProtection( > + _Inout_ PEX_RUNDOWN_REF RundownRef > +); > + > +BOOLEAN > +FltpExReleaseRundownProtection( > + _Inout_ PEX_RUNDOWN_REF RundownRef > +); > + > +NTSTATUS > +NTAPI > +FltpObjectRundownWait( > + _Inout_ PEX_RUNDOWN_REF RundownRef > +); > + > +BOOLEAN > +FltpExRundownCompleted( > + _Inout_ PEX_RUNDOWN_REF RundownRef > +); > + > + > +NTSTATUS > +FltpGetBaseDeviceObjectName( > + _In_ PDEVICE_OBJECT DeviceObject, > + _Inout_ PUNICODE_STRING ObjectName > +); > + > +NTSTATUS > +FltpGetObjectName( > + _In_ PVOID Object, > + _Inout_ PUNICODE_STRING ObjectName > +); > + > +ULONG > +FltpObjectPointerReference( > + _In_ PFLT_OBJECT Object > +); > + > +VOID > +FltpObjectPointerDereference( > + _In_ PFLT_OBJECT Object > +); > + > +NTSTATUS > +FltpReallocateUnicodeString( > + _In_ PUNICODE_STRING String, > + _In_ SIZE_T NewLength, > + _In_ BOOLEAN CopyExisting > +); > + > +VOID > +FltpFreeUnicodeString( > + _In_ PUNICODE_STRING String > +); > + > + > + > +NTSTATUS > +FltpDeviceControlHandler( > + _In_ PDEVICE_OBJECT DeviceObject, > + _Inout_ PIRP Irp > +); > + > +NTSTATUS > +FltpDispatchHandler( > + _In_ PDEVICE_OBJECT DeviceObject, > + _Inout_ PIRP Irp > +); > + > + > + > +#endif /* _FLTMGR_INTERNAL_H */ > > Propchange: trunk/reactos/drivers/filters/fltmgr/fltmgrint.h > ------------------------------------------------------------ > ------------------ > svn:eol-style = native > > >

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [phater] 74577: [MSTSC] Fix BSOD when we can't acquire context from CryptoAPI. CORE-13263 #resolve

by Ged Murphy

Fixing a bugcheck from usermode??? I'm guessing you mean avoid a bugcheck, and the real crash still needs investigating and fixing? -----Original Message----- From: Ros-diffs [mailto:ros-diffs-bounces@reactos.org] On Behalf Of phater(a)svn.reactos.org Sent: 18 May 2017 09:48 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [phater] 74577: [MSTSC] Fix BSOD when we can't acquire context from CryptoAPI. CORE-13263 #resolve Author: phater Date: Thu May 18 08:47:30 2017 New Revision: 74577 URL: http://svn.reactos.org/svn/reactos?rev=74577&view=rev Log: [MSTSC] Fix BSOD when we can't acquire context from CryptoAPI. CORE-13263 #resolve

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74550: [USETUP]: Continue implementing the NT OS installation detector. What remains to be done here, besides cleaning up the code from temporary comments and DPRINTs (and fixing potenti...

by Thomas Faber

Hi again, some comments inline. On 2017-05-15 03:59, hbelusca(a)svn.reactos.org wrote: > --- branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] (original) > +++ branches/setup_improvements/base/setup/usetup/osdetect.c [iso-8859-1] Mon May 15 01:59:28 2017 > @@ -19,6 +19,9 @@ > /* GLOBALS ******************************************************************/ > > extern PPARTLIST PartitionList; > + > +/* Language-independent Vendor strings */ > +static const PCWSTR KnownVendors[] = { L"ReactOS", L"Microsoft" }; > > > /* VERSION RESOURCE API ******************************************************/ > @@ -361,36 +364,331 @@ > > #endif > > + > +/*** > +*wchar_t *wcsstr(string1, string2) - search for string2 in string1 > +* (wide strings) Copypasta? > +* > +*Purpose: > +* finds the first occurrence of string2 in string1 (wide strings) > +* > +*Entry: > +* wchar_t *string1 - string to search in > +* wchar_t *string2 - string to search for > +* > +*Exit: > +* returns a pointer to the first occurrence of string2 in > +* string1, or NULL if string2 does not occur in string1 > +* > +*Uses: > +* > +*Exceptions: > +* > +*******************************************************************************/ > +PWSTR FindSubStrI(PCWSTR str, PCWSTR strSearch) > +{ > + PWSTR cp = (PWSTR)str; > + PWSTR s1, s2; > + > + if (!*strSearch) > + return (PWSTR)str; > + > + while (*cp) > + { > + s1 = cp; > + s2 = (PWSTR)strSearch; > + > + while (*s1 && *s2 && (towupper(*s1) == towupper(*s2))) > + ++s1, ++s2; > + > + if (!*s2) > + return cp; > + > + ++cp; > + } > + > + return NULL; > +} > + > static BOOLEAN > -IsRecognizedOS( > +CheckForValidPEAndVendor( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName OPTIONAL, > + IN PCWSTR FileName, // OPTIONAL > + IN PCWSTR VendorName // Better would be OUT PCWSTR*, and the function returning NTSTATUS ? > + ) > +{ > + BOOLEAN Success = FALSE; > + NTSTATUS Status; > + HANDLE FileHandle, SectionHandle; > + // SIZE_T ViewSize; > + PVOID ViewBase; > + PVOID VersionBuffer = NULL; // Read-only > + PVOID pvData = NULL; > + UINT BufLen = 0; > + > + Status = OpenAndMapFile(RootDirectory, PathName, FileName, > + &FileHandle, &SectionHandle, &ViewBase); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to open and map file %wZ, Status 0x%08lx\n", &FileName, Status); > + return FALSE; // Status; > + } > + > + /* Make sure it's a valid PE file */ > + if (!RtlImageNtHeader(ViewBase)) > + { > + DPRINT1("File %wZ does not seem to be a valid PE, bail out\n", &FileName); > + Status = STATUS_INVALID_IMAGE_FORMAT; > + goto UnmapFile; > + } > + > + /* > + * Search for a valid executable version and vendor. > + * NOTE: The module is loaded as a data file, it should be marked as such. > + */ > + Status = NtGetVersionResource((PVOID)((ULONG_PTR)ViewBase | 1), &VersionBuffer, NULL); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to get version resource for file %wZ, Status 0x%08lx\n", &FileName, Status); > + goto UnmapFile; > + } > + > + Status = NtVerQueryValue(VersionBuffer, L"\\VarFileInfo\\Translation", &pvData, &BufLen); > + if (NT_SUCCESS(Status)) > + { > + USHORT wCodePage = 0, wLangID = 0; > + WCHAR FileInfo[MAX_PATH]; > + UNICODE_STRING Vendor; > + > + wCodePage = LOWORD(*(ULONG*)pvData); > + wLangID = HIWORD(*(ULONG*)pvData); > + > + StringCchPrintfW(FileInfo, ARRAYSIZE(FileInfo), > + L"StringFileInfo\\%04X%04X\\CompanyName", > + wCodePage, wLangID); > + > + Status = NtVerQueryValue(VersionBuffer, FileInfo, &pvData, &BufLen); > + if (NT_SUCCESS(Status) && pvData) > + { > + /* BufLen includes the NULL terminator count */ > + RtlInitEmptyUnicodeString(&Vendor, pvData, BufLen * sizeof(WCHAR)); > + Vendor.Length = Vendor.MaximumLength - sizeof(UNICODE_NULL); > + > + DPRINT1("Found version vendor: \"%wZ\" for file %wZ\n", &Vendor, &FileName); > + > + Success = !!FindSubStrI(pvData, VendorName); > + } > + else > + { > + DPRINT1("No version vendor found for file %wZ\n", &FileName); > + } > + } > + > +UnmapFile: > + /* Finally, unmap and close the file */ > + UnMapFile(SectionHandle, ViewBase); > + NtClose(FileHandle); This seems clumsy. If there's a single function to open and map the file, why isn't there one function to unmap and close? > + > + return Success; > +} > + > +static BOOLEAN > +IsValidNTOSInstallation( > + IN HANDLE PartitionHandle, > + IN PCWSTR SystemRoot) > +{ > + BOOLEAN Success = FALSE; > + USHORT i; > + WCHAR PathBuffer[MAX_PATH]; > + > + // DoesPathExist(PartitionHandle, SystemRoot, L"System32\\"); etc... > + > + /* Check for the existence of \SystemRoot\System32 */ > + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\"); > + if (!DoesPathExist(PartitionHandle, PathBuffer)) > + { > + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); You know there's DPRINT for exactly this purpose, right? > + return FALSE; > + } > + > + /* Check for the existence of \SystemRoot\System32\drivers */ > + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\drivers\\"); > + if (!DoesPathExist(PartitionHandle, PathBuffer)) > + { > + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); > + return FALSE; > + } > + > + /* Check for the existence of \SystemRoot\System32\config */ > + StringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), L"%s%s", SystemRoot, L"System32\\config\\"); > + if (!DoesPathExist(PartitionHandle, PathBuffer)) > + { > + // DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &FileName, Status); > + return FALSE; > + } > + > +#if 0 > + /* > + * Check for the existence of SYSTEM and SOFTWARE hives in \SystemRoot\System32\config > + * (but we don't check here whether they are actually valid). > + */ > + if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SYSTEM")) > + { > + // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); > + return FALSE; > + } > + if (!DoesFileExist(PartitionHandle, SystemRoot, L"System32\\config\\SOFTWARE")) > + { > + // DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &FileName, Status); > + return FALSE; > + } > +#endif > + > + for (i = 0; i < ARRAYSIZE(KnownVendors); ++i) > + { > + /* Check for the existence of \SystemRoot\System32\ntoskrnl.exe and verify its version */ > + Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntoskrnl.exe", KnownVendors[i]); > + > + /* OPTIONAL: Check for the existence of \SystemRoot\System32\ntkrnlpa.exe */ > + > + /* Check for the existence of \SystemRoot\System32\ntdll.dll */ > + Success = CheckForValidPEAndVendor(PartitionHandle, SystemRoot, L"System32\\ntdll.dll", KnownVendors[i]); > + > + /* We have found a correct vendor combination */ > + if (Success) > + break; > + } > + > + return Success; > +} > + > +typedef struct _NTOS_INSTALLATION > +{ > + LIST_ENTRY ListEntry; > + ULONG DiskNumber; > + ULONG PartitionNumber; > +// Vendor???? > + WCHAR SystemRoot[MAX_PATH]; > +/**/WCHAR InstallationName[MAX_PATH];/**/ > +} NTOS_INSTALLATION, *PNTOS_INSTALLATION; > + > +static VOID > +ListNTOSInstalls( > + IN PGENERIC_LIST List) > +{ > + PGENERIC_LIST_ENTRY Entry; > + PNTOS_INSTALLATION NtOsInstall; > + ULONG NtOsInstallsCount = GetNumberOfListEntries(List); > + > + DPRINT1("There %s %d installation%s detected:\n", > + NtOsInstallsCount >= 2 ? "are" : "is", > + NtOsInstallsCount, > + NtOsInstallsCount >= 2 ? "s" : ""); > + > + Entry = GetFirstListEntry(List); > + while (Entry) > + { > + NtOsInstall = (PNTOS_INSTALLATION)GetListEntryUserData(Entry); Casts from PVOID to other pointer types are unnecessary. Thanks, Thomas

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74550: [USETUP]: Continue implementing the NT OS installation detector. What remains to be done here, besides cleaning up the code from temporary comments and DPRINTs (and fixing potenti...

by Thomas Faber

On 2017-05-15 03:59, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Mon May 15 01:59:28 2017 > New Revision: 74550 > > URL: http://svn.reactos.org/svn/reactos?rev=74550&view=rev > Log: > [USETUP]: Continue implementing the NT OS installation detector. > What remains to be done here, besides cleaning up the code from temporary comments and DPRINTs (and fixing potential bugs), is to actually parse the NTOS loader configuration files (freeldr.ini in ROS' case, or boot.ini in Win2k3's case, etc...) to retrieve the actual installation paths. So far these are currently hardcoded for testing purposes only. > Note that I try to distinguish between ROS and Windows installations by checking at the company name vendor of the ntoskrnl.exe & ntdll.dll files, in order to allow the upgrade of ROS installations only. > Suggestions are always welcome. We should totally allow "upgrading" Windows installations with ROS. We're obviously better ;)

8 years, 1 month

2
1
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 74552: [UXTHEME] -ThemeDrawCaptionText: Try to avoid a heap allocation when getting the window caption.

by Thomas Faber

Hi, comments inline. On 2017-05-15 18:05, gadamopoulos(a)svn.reactos.org wrote: > --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Mon May 15 16:05:14 2017 > @@ -100,16 +100,7 @@ > return hIcon; > } > > -WCHAR *UserGetWindowCaption(HWND hwnd) > -{ > - INT len = 512; > - WCHAR *text; > - text = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); > - if (text) InternalGetWindowText(hwnd, text, len); > - return text; > -} > - > -HRESULT WINAPI ThemeDrawCaptionText(PDRAW_CONTEXT pcontext, RECT* pRect, int iPartId, int iStateId, LPCWSTR pszText) > +HRESULT WINAPI ThemeDrawCaptionText(PDRAW_CONTEXT pcontext, RECT* pRect, int iPartId, int iStateId) > { > HRESULT hr; > HFONT hFont = NULL; > @@ -117,6 +108,25 @@ > LOGFONTW logfont; > COLORREF textColor; > COLORREF oldTextColor; > + > + WCHAR buffer[50]; > + WCHAR *pszText = buffer; > + INT len; > + > + len = InternalGetWindowText(pcontext->hWnd, NULL, 0); > + if (!len) > + return S_OK; > + > + len++; /* From now on this is the size of the buffer so include the null */ > + > + if (len > 50) _countof(buffer), or ARRAYSIZE, or whatever people use these days. > + { > + pszText = (WCHAR*)HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); Unnecessary cast. > + if (!pszText) > + return E_FAIL; Ewwww. Worst error code. Thanks. -Thomas

8 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74549: [USETUP]: Add & modify some file utility functions that are going to be used in the next commit. - ConcatPaths that concatenates paths (or a path and a file name); - OpenAndMapFil...

by Thomas Faber

Basic source control rule: please don't change things and move them around at the same time. Unless your goal is to make sure noone reviews your changes, of course. Thanks. -Thomas On 2017-05-15 03:52, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Mon May 15 01:52:34 2017 > New Revision: 74549 > > URL: http://svn.reactos.org/svn/reactos?rev=74549&view=rev > Log: > [USETUP]: Add & modify some file utility functions that are going to be used in the next commit. > - ConcatPaths that concatenates paths (or a path and a file name); > - OpenAndMapFile (resp. UnMapFile), whose purpose is to open a file and map it in memory (resp. unmap it from memory). > - Add extra optional parameters to DoesPathExist and DoesFileExist: an optional "RootDirectory" handle and, for DoesFileExist only, an optional PathName. > > Modified: > branches/setup_improvements/base/setup/usetup/filesup.c > branches/setup_improvements/base/setup/usetup/filesup.h > > Modified: branches/setup_improvements/base/setup/usetup/filesup.c > URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… > ============================================================================== > --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) > +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Mon May 15 01:52:34 2017 > @@ -93,59 +93,6 @@ > return Status; > } > > - > -static > -BOOLEAN > -DoesPathExist( > - PWSTR PathName) > -{ > - OBJECT_ATTRIBUTES ObjectAttributes; > - IO_STATUS_BLOCK IoStatusBlock; > - UNICODE_STRING Name; > - HANDLE FileHandle; > - NTSTATUS Status; > - > - RtlInitUnicodeString(&Name, PathName); > - > - InitializeObjectAttributes(&ObjectAttributes, > - &Name, > - OBJ_CASE_INSENSITIVE, > - NULL, > - NULL); > - > - Status = NtOpenFile(&FileHandle, > - GENERIC_READ | SYNCHRONIZE, > - &ObjectAttributes, > - &IoStatusBlock, > - 0, > - FILE_SYNCHRONOUS_IO_NONALERT); > - if (NT_SUCCESS(Status)) > - NtClose(FileHandle); > - > - return NT_SUCCESS(Status); > -} > - > - > -BOOLEAN > -IsValidPath( > - PWCHAR InstallDir, > - ULONG Length) > -{ > - UINT i; > - > - // TODO: Add check for 8.3 too. > - > - /* Check for whitespaces */ > - for (i = 0; i < Length; i++) > - { > - if (isspace(InstallDir[i])) > - return FALSE; > - } > - > - return TRUE; > -} > - > - > NTSTATUS > SetupCreateDirectory( > PWCHAR PathName) > @@ -183,7 +130,7 @@ > *Ptr = 0; > > DPRINT("PathBuffer: %S\n", PathBuffer); > - if (!DoesPathExist(PathBuffer)) > + if (!DoesPathExist(NULL, PathBuffer)) > { > DPRINT("Create: %S\n", PathBuffer); > Status = SetupCreateSingleDirectory(PathBuffer); > @@ -197,7 +144,7 @@ > Ptr++; > } > > - if (!DoesPathExist(PathBuffer)) > + if (!DoesPathExist(NULL, PathBuffer)) > { > DPRINT("Create: %S\n", PathBuffer); > Status = SetupCreateSingleDirectory(PathBuffer); > @@ -212,7 +159,6 @@ > > return Status; > } > - > > NTSTATUS > SetupCopyFile( > @@ -233,7 +179,6 @@ > SIZE_T SourceSectionSize = 0; > LARGE_INTEGER ByteOffset; > > -#ifdef __REACTOS__ > RtlInitUnicodeString(&FileName, > SourceFileName); > > @@ -254,20 +199,6 @@ > DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); > goto done; > } > -#else > - FileHandleSource = CreateFileW(SourceFileName, > - GENERIC_READ, > - FILE_SHARE_READ, > - NULL, > - OPEN_EXISTING, > - 0, > - NULL); > - if (FileHandleSource == INVALID_HANDLE_VALUE) > - { > - Status = STATUS_UNSUCCESSFUL; > - goto done; > - } > -#endif > > Status = NtQueryInformationFile(FileHandleSource, > &IoStatusBlock, > @@ -484,44 +415,254 @@ > } > #endif > > + > +BOOLEAN > +IsValidPath( > + IN PWCHAR InstallDir, > + IN ULONG Length) > +{ > + UINT i; > + > + // TODO: Add check for 8.3 too. > + > + /* Check for whitespaces */ > + for (i = 0; i < Length; i++) > + { > + if (isspace(InstallDir[i])) > + return FALSE; > + } > + > + return TRUE; > +} > + > +HRESULT > +ConcatPaths( > + IN OUT PWSTR PathElem1, > + IN SIZE_T cchPathSize, > + IN PCWSTR PathElem2 OPTIONAL) > +{ > + HRESULT hr; > + SIZE_T cchPathLen; > + > + if (!PathElem2) > + return S_OK; > + if (cchPathSize <= 1) > + return S_OK; > + > + cchPathLen = min(cchPathSize, wcslen(PathElem1)); > + > + if (PathElem2[0] != L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] != L'\\') > + { > + /* PathElem2 does not start with '\' and PathElem1 does not end with '\' */ > + hr = StringCchCatW(PathElem1, cchPathSize, L"\\"); > + if (FAILED(hr)) > + return hr; > + } > + else if (PathElem2[0] == L'\\' && cchPathLen > 0 && PathElem1[cchPathLen-1] == L'\\') > + { > + /* PathElem2 starts with '\' and PathElem1 ends with '\' */ > + while (*PathElem2 == L'\\') > + ++PathElem2; // Skip any backslash > + } > + hr = StringCchCatW(PathElem1, cchPathSize, PathElem2); > + return hr; > +} > + > +// > +// NOTE: It may be possible to merge both DoesPathExist and DoesFileExist... > +// > +BOOLEAN > +DoesPathExist( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName) > +{ > + NTSTATUS Status; > + HANDLE FileHandle; > + OBJECT_ATTRIBUTES ObjectAttributes; > + IO_STATUS_BLOCK IoStatusBlock; > + UNICODE_STRING Name; > + > + RtlInitUnicodeString(&Name, PathName); > + > + InitializeObjectAttributes(&ObjectAttributes, > + &Name, > + OBJ_CASE_INSENSITIVE, > + RootDirectory, > + NULL); > + > + Status = NtOpenFile(&FileHandle, > + FILE_LIST_DIRECTORY | SYNCHRONIZE, > + &ObjectAttributes, > + &IoStatusBlock, > + FILE_SHARE_READ | FILE_SHARE_WRITE, > + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); > + if (NT_SUCCESS(Status)) > + NtClose(FileHandle); > + else > + DPRINT1("Failed to open directory %wZ, Status 0x%08lx\n", &Name, Status); > + > + return NT_SUCCESS(Status); > +} > + > BOOLEAN > DoesFileExist( > - PWSTR PathName, > - PWSTR FileName) > -{ > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName OPTIONAL, > + IN PCWSTR FileName) > +{ > + NTSTATUS Status; > + HANDLE FileHandle; > OBJECT_ATTRIBUTES ObjectAttributes; > IO_STATUS_BLOCK IoStatusBlock; > UNICODE_STRING Name; > WCHAR FullName[MAX_PATH]; > - HANDLE FileHandle; > - NTSTATUS Status; > - > - wcscpy(FullName, PathName); > - if (FileName != NULL) > - { > - if (FileName[0] != L'\\') > - wcscat(FullName, L"\\"); > - wcscat(FullName, FileName); > - } > + > + if (PathName) > + StringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); > + else > + FullName[0] = UNICODE_NULL; > + > + if (FileName) > + ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); > > RtlInitUnicodeString(&Name, FullName); > > InitializeObjectAttributes(&ObjectAttributes, > &Name, > OBJ_CASE_INSENSITIVE, > - NULL, > + RootDirectory, > NULL); > > Status = NtOpenFile(&FileHandle, > GENERIC_READ | SYNCHRONIZE, > &ObjectAttributes, > &IoStatusBlock, > - 0, > - FILE_SYNCHRONOUS_IO_NONALERT); > + FILE_SHARE_READ | FILE_SHARE_WRITE, > + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); > if (NT_SUCCESS(Status)) > NtClose(FileHandle); > + else > + DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); > > return NT_SUCCESS(Status); > } > > +NTSTATUS > +OpenAndMapFile( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName OPTIONAL, > + IN PCWSTR FileName, // OPTIONAL > + OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL > + OUT PHANDLE SectionHandle, > + OUT PVOID* BaseAddress) > +{ > + NTSTATUS Status; > + OBJECT_ATTRIBUTES ObjectAttributes; > + IO_STATUS_BLOCK IoStatusBlock; > + SIZE_T ViewSize; > + PVOID ViewBase; > + UNICODE_STRING Name; > + WCHAR FullName[MAX_PATH]; > + > + if (PathName) > + StringCchCopyW(FullName, ARRAYSIZE(FullName), PathName); > + else > + FullName[0] = UNICODE_NULL; > + > + if (FileName) > + ConcatPaths(FullName, ARRAYSIZE(FullName), FileName); > + > + RtlInitUnicodeString(&Name, FullName); > + > + InitializeObjectAttributes(&ObjectAttributes, > + &Name, > + OBJ_CASE_INSENSITIVE, > + RootDirectory, > + NULL); > + > + *FileHandle = NULL; > + *SectionHandle = NULL; > + > + Status = NtOpenFile(FileHandle, > + GENERIC_READ | SYNCHRONIZE, > + &ObjectAttributes, > + &IoStatusBlock, > + FILE_SHARE_READ, > + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to open file %wZ, Status 0x%08lx\n", &Name, Status); > + return Status; > + } > + > + /* Map the file in memory */ > + > + /* Create the section */ > + Status = NtCreateSection(SectionHandle, > + SECTION_MAP_READ, > + NULL, > + NULL, > + PAGE_READONLY, > + SEC_COMMIT /* | SEC_IMAGE (_NO_EXECUTE) */, > + *FileHandle); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to create a memory section for file %wZ, Status 0x%08lx\n", &Name, Status); > + NtClose(*FileHandle); > + *FileHandle = NULL; > + return Status; > + } > + > + /* Map the section */ > + ViewSize = 0; > + ViewBase = NULL; > + Status = NtMapViewOfSection(*SectionHandle, > + NtCurrentProcess(), > + &ViewBase, > + 0, 0, > + NULL, > + &ViewSize, > + ViewShare, > + 0, > + PAGE_READONLY); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("Failed to map a view for file %wZ, Status 0x%08lx\n", &Name, Status); > + NtClose(*SectionHandle); > + *SectionHandle = NULL; > + NtClose(*FileHandle); > + *FileHandle = NULL; > + return Status; > + } > + > + *BaseAddress = ViewBase; > + return STATUS_SUCCESS; > +} > + > +BOOLEAN > +UnMapFile( > + IN HANDLE SectionHandle, > + IN PVOID BaseAddress) > +{ > + NTSTATUS Status; > + BOOLEAN Success = TRUE; > + > + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("UnMapFile: NtUnmapViewOfSection(0x%p) failed with Status 0x%08lx\n", > + BaseAddress, Status); > + Success = FALSE; > + } > + Status = NtClose(SectionHandle); > + if (!NT_SUCCESS(Status)) > + { > + DPRINT1("UnMapFile: NtClose(0x%p) failed with Status 0x%08lx\n", > + SectionHandle, Status); > + Success = FALSE; > + } > + > + return Success; > +} > + > /* EOF */ > > Modified: branches/setup_improvements/base/setup/usetup/filesup.h > URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/u… > ============================================================================== > --- branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] (original) > +++ branches/setup_improvements/base/setup/usetup/filesup.h [iso-8859-1] Mon May 15 01:52:34 2017 > @@ -41,14 +41,41 @@ > PWCHAR SourceFileName, > PWCHAR DestinationFileName); > > -BOOLEAN > -DoesFileExist( > - PWSTR PathName, > - PWSTR FileName); > > BOOLEAN > IsValidPath( > - PWCHAR InstallDir, > - ULONG Length); > + IN PWCHAR InstallDir, > + IN ULONG Length); > + > +HRESULT > +ConcatPaths( > + IN OUT PWSTR PathElem1, > + IN SIZE_T cchPathSize, > + IN PCWSTR PathElem2 OPTIONAL); > + > +BOOLEAN > +DoesPathExist( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName); > + > +BOOLEAN > +DoesFileExist( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName OPTIONAL, > + IN PCWSTR FileName); > + > +NTSTATUS > +OpenAndMapFile( > + IN HANDLE RootDirectory OPTIONAL, > + IN PCWSTR PathName OPTIONAL, > + IN PCWSTR FileName, // OPTIONAL > + OUT PHANDLE FileHandle, // IN OUT PHANDLE OPTIONAL > + OUT PHANDLE SectionHandle, > + OUT PVOID* BaseAddress); > + > +BOOLEAN > +UnMapFile( > + IN HANDLE SectionHandle, > + IN PVOID BaseAddress); > > /* EOF */ > >

8 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [ion] 74546: BL Library now works 100% in paging, protected mode. A picture is worth a thousand commits: http://i.imgur.com/Zx2nQ6x.jpg [BOOTLIB]: Add support for protocol open/close/lookup while p...

by Alex Ionescu

The logo is just a temporary hack to prove stuff works. It will be removed at some point, so I don't think bin2c'ing is worth it... Best regards, Alex Ionescu On Mon, May 15, 2017 at 5:51 AM, Hermès BÉLUSCA-MAÏTO <hermes.belusca(a)sfr.fr > wrote: > What about using standard PE resources? Is it doable even in the EFI > applications? > Hermès > > -----Message d'origine----- > De : Ros-dev [mailto:ros-dev-bounces@reactos.org] De la part de Thomas > Faber > Envoyé : lundi 15 mai 2017 12:04 > À : Alex Ionescu > Cc : ros-dev(a)reactos.org > Objet : Re: [ros-dev] [ros-diffs] [ion] 74546: BL Library now works 100% > in paging, protected mode. A picture is worth a thousand commits: > http://i.imgur.com/Zx2nQ6x.jpg [BOOTLIB]: Add support for protocol > open/close/lookup while p... > > We have a bin2c tool that would make including the boot logo much nicer. > You'll want to use something like the attached patch, and add the bmp file > as app/rosload/logo.bmp. Then just include "logo.h" > instead of the g_Logo array in rosload.c. > > > On 2017-05-15 03:38, ion(a)svn.reactos.org wrote: > > Author: ion > > Date: Mon May 15 01:38:49 2017 > > New Revision: 74546 > > > > URL: http://svn.reactos.org/svn/reactos?rev=74546&view=rev > > Log: > > BL Library now works 100% in paging, protected mode. A picture is > > worth a thousand commits: http://i.imgur.com/Zx2nQ6x.jpg > > [BOOTLIB]: Add support for protocol open/close/lookup while paging and > protected mode is enabled. > > [BOOTLIB]: Implement support for dozens of UEFI functions while under > protected mode. > > [BOOTLIB]: Fix bugs in existing UEFI functions which were switching to > _protected_ mode instead of _real mode_ before making the UEFI call. > > [BOOTLIB]: Free dynamic descriptor in MmMdFreeDescriptor. > > [BOOTLIB]: Implement BlHtDelete. > > [BOOTLIB]: Implement re-initialize-all path in DsppInitialize. > > [BOOTLIB]: Fix small bug in BlDisplayInvalidateOemBitmap > > [BOOTLIB]: Fix bigger bug in BlDisplayGetOemBitmap :) > > > > Modified: > > trunk/reactos/boot/environ/app/rosload/rosload.c > > trunk/reactos/boot/environ/include/bl.h > > trunk/reactos/boot/environ/lib/firmware/efi/firmware.c > > trunk/reactos/boot/environ/lib/io/device.c > > trunk/reactos/boot/environ/lib/io/display/display.c > > trunk/reactos/boot/environ/lib/io/display/efi/gop.c > > trunk/reactos/boot/environ/lib/misc/util.c > > trunk/reactos/boot/environ/lib/mm/descriptor.c > > trunk/reactos/boot/environ/lib/platform/time.c > > > > [This mail would be too long, it was shortened to contain the URLs > > only.] > > > > Modified: trunk/reactos/boot/environ/app/rosload/rosload.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/rosl > > oad/rosload.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/include/bl.h > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/ > > bl.h?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firm > > ware/efi/firmware.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/io/device.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/d > > evice.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/io/display/display.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/d > > isplay/display.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/io/display/efi/gop.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/d > > isplay/efi/gop.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/misc/util.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc > > /util.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/d > > escriptor.c?rev=74546&r1=74545&r2=74546&view=diff > > > > Modified: trunk/reactos/boot/environ/lib/platform/time.c > > URL: > > http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/plat > > form/time.c?rev=74546&r1=74545&r2=74546&view=diff > > > > > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

8 years, 1 month

1
0
0 0

Re: [ros-dev] [ros-diffs] [ion] 74546: BL Library now works 100% in paging, protected mode. A picture is worth a thousand commits: http://i.imgur.com/Zx2nQ6x.jpg [BOOTLIB]: Add support for protocol open/close/lookup while p...

by Thomas Faber

We have a bin2c tool that would make including the boot logo much nicer. You'll want to use something like the attached patch, and add the bmp file as app/rosload/logo.bmp. Then just include "logo.h" instead of the g_Logo array in rosload.c. On 2017-05-15 03:38, ion(a)svn.reactos.org wrote: > Author: ion > Date: Mon May 15 01:38:49 2017 > New Revision: 74546 > > URL: http://svn.reactos.org/svn/reactos?rev=74546&view=rev > Log: > BL Library now works 100% in paging, protected mode. A picture is worth a thousand commits: http://i.imgur.com/Zx2nQ6x.jpg > [BOOTLIB]: Add support for protocol open/close/lookup while paging and protected mode is enabled. > [BOOTLIB]: Implement support for dozens of UEFI functions while under protected mode. > [BOOTLIB]: Fix bugs in existing UEFI functions which were switching to _protected_ mode instead of _real mode_ before making the UEFI call. > [BOOTLIB]: Free dynamic descriptor in MmMdFreeDescriptor. > [BOOTLIB]: Implement BlHtDelete. > [BOOTLIB]: Implement re-initialize-all path in DsppInitialize. > [BOOTLIB]: Fix small bug in BlDisplayInvalidateOemBitmap > [BOOTLIB]: Fix bigger bug in BlDisplayGetOemBitmap :) > > Modified: > trunk/reactos/boot/environ/app/rosload/rosload.c > trunk/reactos/boot/environ/include/bl.h > trunk/reactos/boot/environ/lib/firmware/efi/firmware.c > trunk/reactos/boot/environ/lib/io/device.c > trunk/reactos/boot/environ/lib/io/display/display.c > trunk/reactos/boot/environ/lib/io/display/efi/gop.c > trunk/reactos/boot/environ/lib/misc/util.c > trunk/reactos/boot/environ/lib/mm/descriptor.c > trunk/reactos/boot/environ/lib/platform/time.c > > [This mail would be too long, it was shortened to contain the URLs only.] > > Modified: trunk/reactos/boot/environ/app/rosload/rosload.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/app/rosload/r… > > Modified: trunk/reactos/boot/environ/include/bl.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/include/bl.h?… > > Modified: trunk/reactos/boot/environ/lib/firmware/efi/firmware.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/firmware/… > > Modified: trunk/reactos/boot/environ/lib/io/device.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/device… > > Modified: trunk/reactos/boot/environ/lib/io/display/display.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… > > Modified: trunk/reactos/boot/environ/lib/io/display/efi/gop.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/io/displa… > > Modified: trunk/reactos/boot/environ/lib/misc/util.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/misc/util… > > Modified: trunk/reactos/boot/environ/lib/mm/descriptor.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/mm/descri… > > Modified: trunk/reactos/boot/environ/lib/platform/time.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/environ/lib/platform/… > >

8 years, 1 month

4
3
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74528: Code simplifications.

by Thomas Faber

On 2017-05-13 18:13, hbelusca(a)svn.reactos.org wrote: > --- branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] (original) > +++ branches/setup_improvements/base/setup/usetup/filesup.c [iso-8859-1] Sat May 13 16:13:49 2017 > @@ -524,14 +523,10 @@ > &IoStatusBlock, > 0, > FILE_SYNCHRONOUS_IO_NONALERT); > - if (!NT_SUCCESS(Status)) > - { > - return FALSE; > - } > > NtClose(FileHandle); > > - return TRUE; > + return NT_SUCCESS(Status); > } Not an improvement. You're now closing an uninitialized handle on failure.

8 years, 1 month

3
2
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 69160: [EFISYS]: Add 'bcd_hive' as a dependency. [FATTEN]: Fix help message. Functions with no parameters are void. Remove an hardcoded array size.

by Thomas Faber

Hey Hermès, I'm fixing how the BCD hive is generated and this just showed up in an svn blame for me. Can you explain why this bcd_hive dependency is needed? I don't see the command depending on the hive file. Thanks, Thomas On 2015-09-09 21:48, hbelusca(a)svn.reactos.org wrote: > Author: hbelusca > Date: Wed Sep 9 19:48:15 2015 > New Revision: 69160 > > URL: http://svn.reactos.org/svn/reactos?rev=69160&view=rev > Log: > [EFISYS]: Add 'bcd_hive' as a dependency. > [FATTEN]: Fix help message. Functions with no parameters are void. Remove an hardcoded array size. > > Modified: > trunk/reactos/boot/CMakeLists.txt > trunk/reactos/tools/fatten/fatten.c > > Modified: trunk/reactos/boot/CMakeLists.txt > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/CMakeLists.txt?rev=69… > ============================================================================== > --- trunk/reactos/boot/CMakeLists.txt [iso-8859-1] (original) > +++ trunk/reactos/boot/CMakeLists.txt [iso-8859-1] Wed Sep 9 19:48:15 2015 > @@ -17,7 +17,7 @@ > > add_custom_target(efisys > COMMAND native-fatten ${CMAKE_CURRENT_BINARY_DIR}/efisys.bin -format 2880 EFIBOOT -boot ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/fat.bin -mkdir EFI -mkdir EFI/BOOT -add $<TARGET_FILE:bootmgfw> EFI/BOOT/boot${EFI_PLATFORM_ID}.efi -add ${CMAKE_BINARY_DIR}/boot/bootdata/BCD EFI/BOOT/BCD > - DEPENDS native-fatten bootmgfw fat > + DEPENDS native-fatten fat bootmgfw bcd_hive > VERBATIM) > > ##bootcd >

8 years, 1 month

2
1
0 0

Re: [ros-dev] Microsoft switched to Git

by Alex Ionescu

Sounds like a bug in their migration/etc tool. MS has history going back to 1984 and migrated everything to Git with zero problems. At some point you should apply Ionescu's Razor: "Hmmm, a company of 150,000 developers and the most complicated and oldest series of repositories in the world, was able to move to Git, including while employing people who have been there for 30 years and used to other, older systems.... but 30 open source developers can't make that change because X". It follows from this that X is bullshit. On the polluting history, again, just read commits that have [FOOBAR] in them, and ignore others. Write a post-commit hook to rewrite/squash them. Best regards, Alex Ionescu On Thu, Feb 16, 2017 at 9:41 AM, Zachary Gorden <drakekaizer666(a)gmail.com> wrote: > The project that I worked with using git has history going back to 1988. > They certainly didn't start with git, nor did they necessarily start with > any revision control at the beginning, but after they migrated to it they > discovered the history problem. > > On Thu, Feb 16, 2017 at 10:42 AM, Colin Finck <colin(a)reactos.org> wrote: >> >> Am 16.02.2017 um 14:40 schrieb Alex Ionescu: >> > That being said, that type of "dirty history" only happens if you >> > heavily work with branches. That's not how reactos developers work -- we >> > don't open PRs and separate branches for every checkin. >> > >> > These ALL sound like manufactured problems or poor/strange use of git. >> >> That merge hell is easily reproducible using my default Git setup: >> >> 1) Change something in your clone of master and do a "git commit". >> 2) Let someone else change something in his clone of master and let him >> "git commit" and "git push" it. >> 3) Try to "git push" your commit, won't work because of the commit of >> the other person. >> 4) Do a "git pull" to fix the problem in 3) -> Bam! Git will do an >> automatic merge of both masters and pollute your history. >> >> You see, not a single extra branch is involved and yet we get two >> parallel streams of history. >> >> Rafal's mentioned "pull.rebase" option sounds promising, but can we >> enforce that somehow? >> >> >> - Colin >> >> _______________________________________________ >> Ros-dev mailing list >> Ros-dev(a)reactos.org >> http://www.reactos.org/mailman/listinfo/ros-dev > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev >

8 years, 1 month

3
2
0 0

Re: [ros-dev] [ros-diffs] [hbelusca] 74493: [NTOS]: Capture the counted BaseDllName unicode string into a local NULL-terminated buffer before calling wcsrchr on it (actually I think it would be better to create & use a simi...

by Thomas Faber

On 2017-05-07 20:15, hbelusca(a)svn.reactos.org wrote: > --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) > +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun May 7 18:15:12 2017 > @@ -884,7 +884,7 @@ > PDEVICE_NODE DeviceNode; > PDRIVER_OBJECT DriverObject; > NTSTATUS Status; > - PWCHAR FileNameWithoutPath; > + PWCHAR Buffer, FileNameWithoutPath; > PWSTR FileExtension; > PUNICODE_STRING ModuleName = &BootLdrEntry->BaseDllName; > PLDR_DATA_TABLE_ENTRY LdrEntry; > @@ -898,13 +898,19 @@ > IopDisplayLoadingMessage(ModuleName); > InbvIndicateProgress(); > > + Buffer = ExAllocatePool(PagedPool, ModuleName->Length + sizeof(UNICODE_NULL)); > + ASSERT(Buffer); Please don't call ExAllocatePool. And please check for allocation failure. An assert is not acceptable.

8 years, 1 month

2
2
0 0

Community Changelogs - Spread them!

by Can Tasan

Hello, folks! As most of you already know, ReactOS Community Changelogs are a community based effort to describe development progress better, directly to end-user. This increases both developers' and users' morale. Adress: https://reactos.org/wiki/Community_Changelogs All infastructure work on Wiki are complete, this means that the Changelogs can be announced now. Would you consider doing this when announcing ReactOS 0.4.5? Finally, I want to send my big thanks to anyone who helped! Comments and suggestions are always welcome! With my best regards! Can Taşan

8 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 74457: [UXTHEME] -Use GdiDrawStream in UXTHEME_DrawImageGlyph and UXTHEME_DrawImageBackground.

by Giannis Adamopoulos

Hi, are you sure that 1 means original and 9 means nine grid? I kept fields that I don't know what are for as ... unknown. Peter Hater <7element(a)mail.bg> wrote on Wed, May 3rd, 2017, 8:23 PM: > Hi, > > Why not use constant for 0x44727753 and rename unknown1 and unknown2 to srcImageType and dstImageType (or something similar) and use defines for these types also 1 = OriginalImage, 9 = NineGridImage (or similar). > This will make code a little bit less magical :) IMHO > > BR, > Peter > > > On May 3, 2017, at 14:13, gadamopoulos(a)svn.reactos.org wrote: > > > > Author: gadamopoulos > > Date: Wed May 3 11:13:23 2017 > > New Revision: 74457 > > > > URL: http://svn.reactos.org/svn/reactos?rev=74457&view=rev > > Log: > > [UXTHEME] -Use GdiDrawStream in UXTHEME_DrawImageGlyph and UXTHEME_DrawImageBackground. > > > > Modified: > > trunk/reactos/dll/win32/uxtheme/draw.c > > trunk/reactos/dll/win32/uxtheme/uxthemep.h > > > > Modified: trunk/reactos/dll/win32/uxtheme/draw.c > > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… > > ============================================================================== > > --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) > > +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed May 3 11:13:23 2017 > > @@ -269,163 +269,6 @@ > > return S_OK; > > } > > > > -/*********************************************************************** > > - * UXTHEME_StretchBlt > > - * > > - * Pseudo TransparentBlt/StretchBlt > > - */ > > -static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginDst, int nWidthDst, int nHeightDst, > > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, > > - INT transparent, COLORREF transcolor) > > -{ > > - static const BLENDFUNCTION blendFunc = > > - { > > - AC_SRC_OVER, /* BlendOp */ > > - 0, /* BlendFlag */ > > - 255, /* SourceConstantAlpha */ > > - AC_SRC_ALPHA /* AlphaFormat */ > > - }; > > - > > - BOOL ret = TRUE; > > - int old_stretch_mode; > > - POINT old_brush_org; > > - > > - old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); > > - SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); > > - > > - if (transparent == ALPHABLEND_BINARY) { > > - /* Ensure we don't pass any negative values to TransparentBlt */ > > - ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), > > - hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), > > - transcolor); > > - } else if ((transparent == ALPHABLEND_NONE) || > > - !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > > - blendFunc)) > > - { > > - ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > > - SRCCOPY); > > - } > > - > > - SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); > > - SetStretchBltMode(hdcDst, old_stretch_mode); > > - > > - return ret; > > -} > > - > > -/*********************************************************************** > > - * UXTHEME_Blt > > - * > > - * Simplify sending same width/height for both source and dest > > - */ > > -static inline BOOL UXTHEME_Blt(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, > > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, > > - INT transparent, COLORREF transcolor) > > -{ > > - return UXTHEME_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, > > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthDest, nHeightDest, > > - transparent, transcolor); > > -} > > - > > -/*********************************************************************** > > - * UXTHEME_SizedBlt > > - * > > - * Stretches or tiles, depending on sizingtype. > > - */ > > -static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDst, > > - int nWidthDst, int nHeightDst, > > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, > > - int nWidthSrc, int nHeightSrc, > > - int sizingtype, > > - INT transparent, COLORREF transcolor) > > -{ > > - if (sizingtype == ST_TILE) > > - { > > - HDC hdcTemp; > > - BOOL result = FALSE; > > - > > - if (!nWidthSrc || !nHeightSrc) return TRUE; > > - > > - /* For destination width/height less than or equal to source > > - width/height, do not bother with memory bitmap optimization */ > > - if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) > > - { > > - int bltWidth = min (nWidthDst, nWidthSrc); > > - int bltHeight = min (nHeightDst, nHeightSrc); > > - > > - return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, > > - hdcSrc, nXOriginSrc, nYOriginSrc, > > - transparent, transcolor); > > - } > > - > > - /* Create a DC with a bitmap consisting of a tiling of the source > > - bitmap, with standard GDI functions. This is faster than an > > - iteration with UXTHEME_Blt(). */ > > - hdcTemp = CreateCompatibleDC(hdcSrc); > > - if (hdcTemp != 0) > > - { > > - HBITMAP bitmapTemp; > > - HBITMAP bitmapOrig; > > - int nWidthTemp, nHeightTemp; > > - int xOfs, xRemaining; > > - int yOfs, yRemaining; > > - int growSize; > > - > > - /* Calculate temp dimensions of integer multiples of source dimensions */ > > - nWidthTemp = ((nWidthDst + nWidthSrc - 1) / nWidthSrc) * nWidthSrc; > > - nHeightTemp = ((nHeightDst + nHeightSrc - 1) / nHeightSrc) * nHeightSrc; > > - bitmapTemp = CreateCompatibleBitmap(hdcSrc, nWidthTemp, nHeightTemp); > > - bitmapOrig = SelectObject(hdcTemp, bitmapTemp); > > - > > - /* Initial copy of bitmap */ > > - BitBlt(hdcTemp, 0, 0, nWidthSrc, nHeightSrc, hdcSrc, nXOriginSrc, nYOriginSrc, SRCCOPY); > > - > > - /* Extend bitmap in the X direction. Growth of width is exponential */ > > - xOfs = nWidthSrc; > > - xRemaining = nWidthTemp - nWidthSrc; > > - growSize = nWidthSrc; > > - while (xRemaining > 0) > > - { > > - growSize = min(growSize, xRemaining); > > - BitBlt(hdcTemp, xOfs, 0, growSize, nHeightSrc, hdcTemp, 0, 0, SRCCOPY); > > - xOfs += growSize; > > - xRemaining -= growSize; > > - growSize *= 2; > > - } > > - > > - /* Extend bitmap in the Y direction. Growth of height is exponential */ > > - yOfs = nHeightSrc; > > - yRemaining = nHeightTemp - nHeightSrc; > > - growSize = nHeightSrc; > > - while (yRemaining > 0) > > - { > > - growSize = min(growSize, yRemaining); > > - BitBlt(hdcTemp, 0, yOfs, nWidthTemp, growSize, hdcTemp, 0, 0, SRCCOPY); > > - yOfs += growSize; > > - yRemaining -= growSize; > > - growSize *= 2; > > - } > > - > > - /* Use temporary hdc for source */ > > - result = UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > > - hdcTemp, 0, 0, > > - transparent, transcolor); > > - > > - SelectObject(hdcTemp, bitmapOrig); > > - DeleteObject(bitmapTemp); > > - } > > - DeleteDC(hdcTemp); > > - return result; > > - } > > - else > > - { > > - return UXTHEME_StretchBlt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > > - transparent, transcolor); > > - } > > -} > > - > > /* Get transparency parameters passed to UXTHEME_StretchBlt() - the parameters > > * depend on whether the image has full alpha or whether it is > > * color-transparent or just opaque. */ > > @@ -468,8 +311,6 @@ > > { > > HRESULT hr; > > HBITMAP bmpSrc = NULL; > > - HDC hdcSrc = NULL; > > - HGDIOBJ oldSrc = NULL; > > RECT rcSrc; > > INT transparent = 0; > > COLORREF transparentcolor; > > @@ -477,18 +318,13 @@ > > int halign = HA_CENTER; > > POINT dstSize; > > POINT srcSize; > > - POINT topleft; > > BOOL hasAlpha; > > + RECT rcDst; > > + GDI_DRAW_STREAM DrawStream; > > > > hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, > > &bmpSrc, &rcSrc, &hasAlpha); > > if(FAILED(hr)) return hr; > > - hdcSrc = CreateCompatibleDC(hdc); > > - if(!hdcSrc) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - return hr; > > - } > > - oldSrc = SelectObject(hdcSrc, bmpSrc); > > > > dstSize.x = pRect->right-pRect->left; > > dstSize.y = pRect->bottom-pRect->top; > > @@ -500,22 +336,37 @@ > > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); > > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); > > > > - topleft.x = pRect->left; > > - topleft.y = pRect->top; > > - if(halign == HA_CENTER) topleft.x += (dstSize.x/2)-(srcSize.x/2); > > - else if(halign == HA_RIGHT) topleft.x += dstSize.x-srcSize.x; > > - if(valign == VA_CENTER) topleft.y += (dstSize.y/2)-(srcSize.y/2); > > - else if(valign == VA_BOTTOM) topleft.y += dstSize.y-srcSize.y; > > - > > - if(!UXTHEME_Blt(hdc, topleft.x, topleft.y, srcSize.x, srcSize.y, > > - hdcSrc, rcSrc.left, rcSrc.top, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - } > > - > > - SelectObject(hdcSrc, oldSrc); > > - DeleteDC(hdcSrc); > > - return hr; > > + rcDst = *pRect; > > + if(halign == HA_CENTER) rcDst.left += (dstSize.x/2)-(srcSize.x/2); > > + else if(halign == HA_RIGHT) rcDst.left += dstSize.x-srcSize.x; > > + if(valign == VA_CENTER) rcDst.top += (dstSize.y/2)-(srcSize.y/2); > > + else if(valign == VA_BOTTOM) rcDst.top += dstSize.y-srcSize.y; > > + > > + rcDst.right = rcDst.left + srcSize.x; > > + rcDst.bottom = rcDst.top + srcSize.y; > > + > > + DrawStream.signature = 0x44727753; > > + DrawStream.reserved = 0; > > + DrawStream.unknown1 = 1; > > + DrawStream.unknown2 = 9; > > + DrawStream.hDC = hdc; > > + DrawStream.hImage = bmpSrc; > > + DrawStream.crTransparent = transparentcolor; > > + DrawStream.rcSrc = rcSrc; > > + DrawStream.rcDest = rcDst; > > + DrawStream.leftSizingMargin = 0; > > + DrawStream.rightSizingMargin = 0; > > + DrawStream.topSizingMargin = 0; > > + DrawStream.bottomSizingMargin = 0; > > + DrawStream.drawOption = DS_TRUESIZE; > > + > > + if (transparent == ALPHABLEND_FULL) > > + DrawStream.drawOption |= DS_TRANSPARENTALPHA; > > + else if (transparent == ALPHABLEND_BINARY) > > + DrawStream.drawOption |= DS_TRANSPARENTCLR; > > + > > + GdiDrawStream(hdc, sizeof(DrawStream), &DrawStream); > > + return HRESULT_FROM_WIN32(GetLastError()); > > } > > > > /*********************************************************************** > > @@ -655,40 +506,33 @@ > > const DTBGOPTS *pOptions) > > { > > HRESULT hr = S_OK; > > - HBITMAP bmpSrc, bmpSrcResized = NULL; > > - HGDIOBJ oldSrc; > > - HDC hdcSrc, hdcOrigSrc = NULL; > > + HBITMAP bmpSrc; > > RECT rcSrc; > > RECT rcDst; > > POINT dstSize; > > - POINT srcSize; > > POINT drawSize; > > int sizingtype = ST_STRETCH; > > INT transparent; > > COLORREF transparentcolor = 0; > > BOOL hasAlpha; > > - > > - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, > > - &bmpSrc, &rcSrc, &hasAlpha); > > - if(FAILED(hr)) return hr; > > - hdcSrc = CreateCompatibleDC(hdc); > > - if(!hdcSrc) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > + MARGINS sm; > > + GDI_DRAW_STREAM DrawStream; > > + > > + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha); > > + if(FAILED(hr)) > > return hr; > > - } > > - oldSrc = SelectObject(hdcSrc, bmpSrc); > > + get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, &transparentcolor, FALSE); > > > > rcDst = *pRect; > > - > > - get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, > > - &transparentcolor, FALSE); > > - > > dstSize.x = rcDst.right-rcDst.left; > > dstSize.y = rcDst.bottom-rcDst.top; > > - srcSize.x = rcSrc.right-rcSrc.left; > > - srcSize.y = rcSrc.bottom-rcSrc.top; > > - > > + > > + GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); > > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); > > + > > + /*FIXME: Is this ever used? */ > > + /*GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly);*/ > > + > > if(sizingtype == ST_TRUESIZE) { > > int valign = VA_CENTER, halign = HA_CENTER; > > > > @@ -706,161 +550,36 @@ > > rcDst.top = rcDst.bottom - drawSize.y; > > rcDst.right = rcDst.left + drawSize.x; > > rcDst.bottom = rcDst.top + drawSize.y; > > - if(!UXTHEME_StretchBlt(hdc, rcDst.left, rcDst.top, drawSize.x, drawSize.y, > > - hdcSrc, rcSrc.left, rcSrc.top, srcSize.x, srcSize.y, > > - transparent, transparentcolor)) > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - } > > - else { > > - HDC hdcDst = NULL; > > - MARGINS sm; > > - POINT org; > > - > > - dstSize.x = abs(dstSize.x); > > - dstSize.y = abs(dstSize.y); > > - > > - GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); > > - > > - /* Resize source image if destination smaller than margins */ > > -#ifndef __REACTOS__ > > - /* Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators > > - FIXME: Revisit this when the bug is fixed. CORE-9636 and Wine Bug #38538 */ > > - if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { > > - if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { > > - sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); > > - sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; > > - srcSize.y = dstSize.y; > > - } > > - > > - if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { > > - sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); > > - sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; > > - srcSize.x = dstSize.x; > > - } > > - > > - hdcOrigSrc = hdcSrc; > > - hdcSrc = CreateCompatibleDC(NULL); > > - bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); > > - SelectObject(hdcSrc, bmpSrcResized); > > - > > - UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, > > - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); > > - > > - rcSrc.left = 0; > > - rcSrc.top = 0; > > - rcSrc.right = srcSize.x; > > - rcSrc.bottom = srcSize.y; > > - } > > -#endif /* __REACTOS__ */ > > - > > - hdcDst = hdc; > > - OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); > > - > > - /* Upper left corner */ > > - if(!UXTHEME_Blt(hdcDst, 0, 0, sm.cxLeftWidth, sm.cyTopHeight, > > - hdcSrc, rcSrc.left, rcSrc.top, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - /* Upper right corner */ > > - if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, 0, > > - sm.cxRightWidth, sm.cyTopHeight, > > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - /* Lower left corner */ > > - if(!UXTHEME_Blt (hdcDst, 0, dstSize.y-sm.cyBottomHeight, > > - sm.cxLeftWidth, sm.cyBottomHeight, > > - hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - /* Lower right corner */ > > - if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight, > > - sm.cxRightWidth, sm.cyBottomHeight, > > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - > > - if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { > > - int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); > > - int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); > > - int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); > > - int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); > > - > > - if(destCenterWidth > 0) { > > - /* Center top */ > > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, > > - destCenterWidth, sm.cyTopHeight, > > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, > > - srcCenterWidth, sm.cyTopHeight, > > - sizingtype, transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - /* Center bottom */ > > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, > > - destCenterWidth, sm.cyBottomHeight, > > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, > > - srcCenterWidth, sm.cyBottomHeight, > > - sizingtype, transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - } > > - if(destCenterHeight > 0) { > > - /* Left center */ > > - if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, > > - sm.cxLeftWidth, destCenterHeight, > > - hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, > > - sm.cxLeftWidth, srcCenterHeight, > > - sizingtype, > > - transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - /* Right center */ > > - if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, > > - sm.cxRightWidth, destCenterHeight, > > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, > > - sm.cxRightWidth, srcCenterHeight, > > - sizingtype, transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - } > > - if(destCenterHeight > 0 && destCenterWidth > 0) { > > - BOOL borderonly = FALSE; > > - GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); > > - if(!borderonly) { > > - /* Center */ > > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, > > - destCenterWidth, destCenterHeight, > > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, > > - srcCenterWidth, srcCenterHeight, > > - sizingtype, transparent, transparentcolor)) { > > - hr = HRESULT_FROM_WIN32(GetLastError()); > > - goto draw_error; > > - } > > - } > > - } > > - } > > - > > -draw_error: > > - SetViewportOrgEx (hdcDst, org.x, org.y, NULL); > > - } > > - SelectObject(hdcSrc, oldSrc); > > - DeleteDC(hdcSrc); > > - if (bmpSrcResized) DeleteObject(bmpSrcResized); > > - if (hdcOrigSrc) DeleteDC(hdcOrigSrc); > > - *pRect = rcDst; > > - return hr; > > + *pRect = rcDst; > > + } > > + > > + DrawStream.signature = 0x44727753; > > + DrawStream.reserved = 0; > > + DrawStream.unknown1 = 1; > > + DrawStream.unknown2 = 9; > > + DrawStream.hDC = hdc; > > + DrawStream.hImage = bmpSrc; > > + DrawStream.crTransparent = transparentcolor; > > + DrawStream.rcSrc = rcSrc; > > + DrawStream.rcDest = rcDst; > > + DrawStream.leftSizingMargin = sm.cxLeftWidth; > > + DrawStream.rightSizingMargin = sm.cxRightWidth; > > + DrawStream.topSizingMargin = sm.cyTopHeight; > > + DrawStream.bottomSizingMargin = sm.cyBottomHeight; > > + DrawStream.drawOption = 0; > > + > > + if (transparent == ALPHABLEND_FULL) > > + DrawStream.drawOption |= DS_TRANSPARENTALPHA; > > + else if (transparent == ALPHABLEND_BINARY) > > + DrawStream.drawOption |= DS_TRANSPARENTCLR; > > + > > + if (sizingtype == ST_TILE) > > + DrawStream.drawOption |= DS_TILE; > > + else if (sizingtype == ST_TRUESIZE) > > + DrawStream.drawOption |= DS_TRUESIZE; > > + > > + GdiDrawStream(hdc, sizeof(DrawStream), &DrawStream); > > + return HRESULT_FROM_WIN32(GetLastError()); > > } > > > > /*********************************************************************** > > @@ -1050,7 +769,9 @@ > > /* This should never happen, and hence I don't know what to return */ > > hr = E_FAIL; > > } > > +#if 0 > > if(SUCCEEDED(hr)) > > +#endif > > { > > RECT rcGlyph = *pRect; > > MARGINS margin; > > > > Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h > > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… > > ============================================================================== > > --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) > > +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Wed May 3 11:13:23 2017 > > @@ -14,6 +14,7 @@ > > #include <winnls.h> > > #include <windowsx.h> > > #include <undocuser.h> > > +#include <undocgdi.h> > > #include <uxtheme.h> > > #include <uxundoc.h> > > #include <vfwmsgs.h> > > > > > > > > > _______________________________________________ > Ros-dev mailing list > Ros-dev(a)reactos.org > http://www.reactos.org/mailman/listinfo/ros-dev

8 years, 2 months

2
1
0 0

ReactOS is the MOST VOTED project in the "Best IT Community" category in the #OpenAwards

by victor martinez

Congrats Community! You did it!! Thanks to your votes casted, ReactOS is finalist in the "Best IT Community" category. Even more! ReactOS was the MOST VOTED project in such category! https://a.cstmapp.com/p/18092?fromgroup=1 ReactOS: 229 votes 2nd. KeepCoding: 190 votes As you may know, ReactOS was also trying to be finalist as the "Best Innovative project". We were literally just ONE vote away to be one of the five finalists. 202 casted, 203 needed. https://a.cstmapp.com/entries/18085/sort:votes/direction:desc So even if we weren't finalist it in this category I want to thank in name of the ReactOS project all your help, votes, and support to make it possible. Our strategy of waiting until last minute helped us to overtake and surprise really big and amazing projects as the Drupal Association, Geo developers or gvSig, but also projects supported/created by well stablished companies and public governments. Thanks Community! We'll keep you updated! More info soon as a blogpost! Víctor Martinez Calvo ReactOS PR & Product strategy coordinator

8 years, 2 months

1
0
0 0

Re: [ros-dev] [ros-diffs] [gadamopoulos] 74457: [UXTHEME] -Use GdiDrawStream in UXTHEME_DrawImageGlyph and UXTHEME_DrawImageBackground.

by Peter Hater

Hi, Why not use constant for 0x44727753 and rename unknown1 and unknown2 to srcImageType and dstImageType (or something similar) and use defines for these types also 1 = OriginalImage, 9 = NineGridImage (or similar). This will make code a little bit less magical :) IMHO BR, Peter > On May 3, 2017, at 14:13, gadamopoulos(a)svn.reactos.org wrote: > > Author: gadamopoulos > Date: Wed May 3 11:13:23 2017 > New Revision: 74457 > > URL: http://svn.reactos.org/svn/reactos?rev=74457&view=rev > Log: > [UXTHEME] -Use GdiDrawStream in UXTHEME_DrawImageGlyph and UXTHEME_DrawImageBackground. > > Modified: > trunk/reactos/dll/win32/uxtheme/draw.c > trunk/reactos/dll/win32/uxtheme/uxthemep.h > > Modified: trunk/reactos/dll/win32/uxtheme/draw.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… > ============================================================================== > --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Wed May 3 11:13:23 2017 > @@ -269,163 +269,6 @@ > return S_OK; > } > > -/*********************************************************************** > - * UXTHEME_StretchBlt > - * > - * Pseudo TransparentBlt/StretchBlt > - */ > -static inline BOOL UXTHEME_StretchBlt(HDC hdcDst, int nXOriginDst, int nYOriginDst, int nWidthDst, int nHeightDst, > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, > - INT transparent, COLORREF transcolor) > -{ > - static const BLENDFUNCTION blendFunc = > - { > - AC_SRC_OVER, /* BlendOp */ > - 0, /* BlendFlag */ > - 255, /* SourceConstantAlpha */ > - AC_SRC_ALPHA /* AlphaFormat */ > - }; > - > - BOOL ret = TRUE; > - int old_stretch_mode; > - POINT old_brush_org; > - > - old_stretch_mode = SetStretchBltMode(hdcDst, HALFTONE); > - SetBrushOrgEx(hdcDst, nXOriginDst, nYOriginDst, &old_brush_org); > - > - if (transparent == ALPHABLEND_BINARY) { > - /* Ensure we don't pass any negative values to TransparentBlt */ > - ret = TransparentBlt(hdcDst, nXOriginDst, nYOriginDst, abs(nWidthDst), abs(nHeightDst), > - hdcSrc, nXOriginSrc, nYOriginSrc, abs(nWidthSrc), abs(nHeightSrc), > - transcolor); > - } else if ((transparent == ALPHABLEND_NONE) || > - !AlphaBlend(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > - blendFunc)) > - { > - ret = StretchBlt(hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > - SRCCOPY); > - } > - > - SetBrushOrgEx(hdcDst, old_brush_org.x, old_brush_org.y, NULL); > - SetStretchBltMode(hdcDst, old_stretch_mode); > - > - return ret; > -} > - > -/*********************************************************************** > - * UXTHEME_Blt > - * > - * Simplify sending same width/height for both source and dest > - */ > -static inline BOOL UXTHEME_Blt(HDC hdcDest, int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, > - INT transparent, COLORREF transcolor) > -{ > - return UXTHEME_StretchBlt(hdcDest, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthDest, nHeightDest, > - transparent, transcolor); > -} > - > -/*********************************************************************** > - * UXTHEME_SizedBlt > - * > - * Stretches or tiles, depending on sizingtype. > - */ > -static inline BOOL UXTHEME_SizedBlt (HDC hdcDst, int nXOriginDst, int nYOriginDst, > - int nWidthDst, int nHeightDst, > - HDC hdcSrc, int nXOriginSrc, int nYOriginSrc, > - int nWidthSrc, int nHeightSrc, > - int sizingtype, > - INT transparent, COLORREF transcolor) > -{ > - if (sizingtype == ST_TILE) > - { > - HDC hdcTemp; > - BOOL result = FALSE; > - > - if (!nWidthSrc || !nHeightSrc) return TRUE; > - > - /* For destination width/height less than or equal to source > - width/height, do not bother with memory bitmap optimization */ > - if (nWidthSrc >= nWidthDst && nHeightSrc >= nHeightDst) > - { > - int bltWidth = min (nWidthDst, nWidthSrc); > - int bltHeight = min (nHeightDst, nHeightSrc); > - > - return UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, bltWidth, bltHeight, > - hdcSrc, nXOriginSrc, nYOriginSrc, > - transparent, transcolor); > - } > - > - /* Create a DC with a bitmap consisting of a tiling of the source > - bitmap, with standard GDI functions. This is faster than an > - iteration with UXTHEME_Blt(). */ > - hdcTemp = CreateCompatibleDC(hdcSrc); > - if (hdcTemp != 0) > - { > - HBITMAP bitmapTemp; > - HBITMAP bitmapOrig; > - int nWidthTemp, nHeightTemp; > - int xOfs, xRemaining; > - int yOfs, yRemaining; > - int growSize; > - > - /* Calculate temp dimensions of integer multiples of source dimensions */ > - nWidthTemp = ((nWidthDst + nWidthSrc - 1) / nWidthSrc) * nWidthSrc; > - nHeightTemp = ((nHeightDst + nHeightSrc - 1) / nHeightSrc) * nHeightSrc; > - bitmapTemp = CreateCompatibleBitmap(hdcSrc, nWidthTemp, nHeightTemp); > - bitmapOrig = SelectObject(hdcTemp, bitmapTemp); > - > - /* Initial copy of bitmap */ > - BitBlt(hdcTemp, 0, 0, nWidthSrc, nHeightSrc, hdcSrc, nXOriginSrc, nYOriginSrc, SRCCOPY); > - > - /* Extend bitmap in the X direction. Growth of width is exponential */ > - xOfs = nWidthSrc; > - xRemaining = nWidthTemp - nWidthSrc; > - growSize = nWidthSrc; > - while (xRemaining > 0) > - { > - growSize = min(growSize, xRemaining); > - BitBlt(hdcTemp, xOfs, 0, growSize, nHeightSrc, hdcTemp, 0, 0, SRCCOPY); > - xOfs += growSize; > - xRemaining -= growSize; > - growSize *= 2; > - } > - > - /* Extend bitmap in the Y direction. Growth of height is exponential */ > - yOfs = nHeightSrc; > - yRemaining = nHeightTemp - nHeightSrc; > - growSize = nHeightSrc; > - while (yRemaining > 0) > - { > - growSize = min(growSize, yRemaining); > - BitBlt(hdcTemp, 0, yOfs, nWidthTemp, growSize, hdcTemp, 0, 0, SRCCOPY); > - yOfs += growSize; > - yRemaining -= growSize; > - growSize *= 2; > - } > - > - /* Use temporary hdc for source */ > - result = UXTHEME_Blt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > - hdcTemp, 0, 0, > - transparent, transcolor); > - > - SelectObject(hdcTemp, bitmapOrig); > - DeleteObject(bitmapTemp); > - } > - DeleteDC(hdcTemp); > - return result; > - } > - else > - { > - return UXTHEME_StretchBlt (hdcDst, nXOriginDst, nYOriginDst, nWidthDst, nHeightDst, > - hdcSrc, nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, > - transparent, transcolor); > - } > -} > - > /* Get transparency parameters passed to UXTHEME_StretchBlt() - the parameters > * depend on whether the image has full alpha or whether it is > * color-transparent or just opaque. */ > @@ -468,8 +311,6 @@ > { > HRESULT hr; > HBITMAP bmpSrc = NULL; > - HDC hdcSrc = NULL; > - HGDIOBJ oldSrc = NULL; > RECT rcSrc; > INT transparent = 0; > COLORREF transparentcolor; > @@ -477,18 +318,13 @@ > int halign = HA_CENTER; > POINT dstSize; > POINT srcSize; > - POINT topleft; > BOOL hasAlpha; > + RECT rcDst; > + GDI_DRAW_STREAM DrawStream; > > hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, TRUE, > &bmpSrc, &rcSrc, &hasAlpha); > if(FAILED(hr)) return hr; > - hdcSrc = CreateCompatibleDC(hdc); > - if(!hdcSrc) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - return hr; > - } > - oldSrc = SelectObject(hdcSrc, bmpSrc); > > dstSize.x = pRect->right-pRect->left; > dstSize.y = pRect->bottom-pRect->top; > @@ -500,22 +336,37 @@ > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_HALIGN, &halign); > > - topleft.x = pRect->left; > - topleft.y = pRect->top; > - if(halign == HA_CENTER) topleft.x += (dstSize.x/2)-(srcSize.x/2); > - else if(halign == HA_RIGHT) topleft.x += dstSize.x-srcSize.x; > - if(valign == VA_CENTER) topleft.y += (dstSize.y/2)-(srcSize.y/2); > - else if(valign == VA_BOTTOM) topleft.y += dstSize.y-srcSize.y; > - > - if(!UXTHEME_Blt(hdc, topleft.x, topleft.y, srcSize.x, srcSize.y, > - hdcSrc, rcSrc.left, rcSrc.top, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - } > - > - SelectObject(hdcSrc, oldSrc); > - DeleteDC(hdcSrc); > - return hr; > + rcDst = *pRect; > + if(halign == HA_CENTER) rcDst.left += (dstSize.x/2)-(srcSize.x/2); > + else if(halign == HA_RIGHT) rcDst.left += dstSize.x-srcSize.x; > + if(valign == VA_CENTER) rcDst.top += (dstSize.y/2)-(srcSize.y/2); > + else if(valign == VA_BOTTOM) rcDst.top += dstSize.y-srcSize.y; > + > + rcDst.right = rcDst.left + srcSize.x; > + rcDst.bottom = rcDst.top + srcSize.y; > + > + DrawStream.signature = 0x44727753; > + DrawStream.reserved = 0; > + DrawStream.unknown1 = 1; > + DrawStream.unknown2 = 9; > + DrawStream.hDC = hdc; > + DrawStream.hImage = bmpSrc; > + DrawStream.crTransparent = transparentcolor; > + DrawStream.rcSrc = rcSrc; > + DrawStream.rcDest = rcDst; > + DrawStream.leftSizingMargin = 0; > + DrawStream.rightSizingMargin = 0; > + DrawStream.topSizingMargin = 0; > + DrawStream.bottomSizingMargin = 0; > + DrawStream.drawOption = DS_TRUESIZE; > + > + if (transparent == ALPHABLEND_FULL) > + DrawStream.drawOption |= DS_TRANSPARENTALPHA; > + else if (transparent == ALPHABLEND_BINARY) > + DrawStream.drawOption |= DS_TRANSPARENTCLR; > + > + GdiDrawStream(hdc, sizeof(DrawStream), &DrawStream); > + return HRESULT_FROM_WIN32(GetLastError()); > } > > /*********************************************************************** > @@ -655,40 +506,33 @@ > const DTBGOPTS *pOptions) > { > HRESULT hr = S_OK; > - HBITMAP bmpSrc, bmpSrcResized = NULL; > - HGDIOBJ oldSrc; > - HDC hdcSrc, hdcOrigSrc = NULL; > + HBITMAP bmpSrc; > RECT rcSrc; > RECT rcDst; > POINT dstSize; > - POINT srcSize; > POINT drawSize; > int sizingtype = ST_STRETCH; > INT transparent; > COLORREF transparentcolor = 0; > BOOL hasAlpha; > - > - hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, > - &bmpSrc, &rcSrc, &hasAlpha); > - if(FAILED(hr)) return hr; > - hdcSrc = CreateCompatibleDC(hdc); > - if(!hdcSrc) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > + MARGINS sm; > + GDI_DRAW_STREAM DrawStream; > + > + hr = UXTHEME_LoadImage(hTheme, hdc, iPartId, iStateId, pRect, FALSE, &bmpSrc, &rcSrc, &hasAlpha); > + if(FAILED(hr)) > return hr; > - } > - oldSrc = SelectObject(hdcSrc, bmpSrc); > + get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, &transparentcolor, FALSE); > > rcDst = *pRect; > - > - get_transparency (hTheme, iPartId, iStateId, hasAlpha, &transparent, > - &transparentcolor, FALSE); > - > dstSize.x = rcDst.right-rcDst.left; > dstSize.y = rcDst.bottom-rcDst.top; > - srcSize.x = rcSrc.right-rcSrc.left; > - srcSize.y = rcSrc.bottom-rcSrc.top; > - > + > + GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); > GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_SIZINGTYPE, &sizingtype); > + > + /*FIXME: Is this ever used? */ > + /*GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly);*/ > + > if(sizingtype == ST_TRUESIZE) { > int valign = VA_CENTER, halign = HA_CENTER; > > @@ -706,161 +550,36 @@ > rcDst.top = rcDst.bottom - drawSize.y; > rcDst.right = rcDst.left + drawSize.x; > rcDst.bottom = rcDst.top + drawSize.y; > - if(!UXTHEME_StretchBlt(hdc, rcDst.left, rcDst.top, drawSize.x, drawSize.y, > - hdcSrc, rcSrc.left, rcSrc.top, srcSize.x, srcSize.y, > - transparent, transparentcolor)) > - hr = HRESULT_FROM_WIN32(GetLastError()); > - } > - else { > - HDC hdcDst = NULL; > - MARGINS sm; > - POINT org; > - > - dstSize.x = abs(dstSize.x); > - dstSize.y = abs(dstSize.y); > - > - GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_SIZINGMARGINS, NULL, &sm); > - > - /* Resize source image if destination smaller than margins */ > -#ifndef __REACTOS__ > - /* Revert Wine Commit 2b650fa as it breaks themed Explorer Toolbar Separators > - FIXME: Revisit this when the bug is fixed. CORE-9636 and Wine Bug #38538 */ > - if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y || sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { > - if (sm.cyTopHeight + sm.cyBottomHeight > dstSize.y) { > - sm.cyTopHeight = MulDiv(sm.cyTopHeight, dstSize.y, srcSize.y); > - sm.cyBottomHeight = dstSize.y - sm.cyTopHeight; > - srcSize.y = dstSize.y; > - } > - > - if (sm.cxLeftWidth + sm.cxRightWidth > dstSize.x) { > - sm.cxLeftWidth = MulDiv(sm.cxLeftWidth, dstSize.x, srcSize.x); > - sm.cxRightWidth = dstSize.x - sm.cxLeftWidth; > - srcSize.x = dstSize.x; > - } > - > - hdcOrigSrc = hdcSrc; > - hdcSrc = CreateCompatibleDC(NULL); > - bmpSrcResized = CreateBitmap(srcSize.x, srcSize.y, 1, 32, NULL); > - SelectObject(hdcSrc, bmpSrcResized); > - > - UXTHEME_StretchBlt(hdcSrc, 0, 0, srcSize.x, srcSize.y, hdcOrigSrc, rcSrc.left, rcSrc.top, > - rcSrc.right - rcSrc.left, rcSrc.bottom - rcSrc.top, transparent, transparentcolor); > - > - rcSrc.left = 0; > - rcSrc.top = 0; > - rcSrc.right = srcSize.x; > - rcSrc.bottom = srcSize.y; > - } > -#endif /* __REACTOS__ */ > - > - hdcDst = hdc; > - OffsetViewportOrgEx(hdcDst, rcDst.left, rcDst.top, &org); > - > - /* Upper left corner */ > - if(!UXTHEME_Blt(hdcDst, 0, 0, sm.cxLeftWidth, sm.cyTopHeight, > - hdcSrc, rcSrc.left, rcSrc.top, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - /* Upper right corner */ > - if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, 0, > - sm.cxRightWidth, sm.cyTopHeight, > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - /* Lower left corner */ > - if(!UXTHEME_Blt (hdcDst, 0, dstSize.y-sm.cyBottomHeight, > - sm.cxLeftWidth, sm.cyBottomHeight, > - hdcSrc, rcSrc.left, rcSrc.bottom-sm.cyBottomHeight, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - /* Lower right corner */ > - if(!UXTHEME_Blt (hdcDst, dstSize.x-sm.cxRightWidth, dstSize.y-sm.cyBottomHeight, > - sm.cxRightWidth, sm.cyBottomHeight, > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.bottom-sm.cyBottomHeight, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - > - if ((sizingtype == ST_STRETCH) || (sizingtype == ST_TILE)) { > - int destCenterWidth = dstSize.x - (sm.cxLeftWidth + sm.cxRightWidth); > - int srcCenterWidth = srcSize.x - (sm.cxLeftWidth + sm.cxRightWidth); > - int destCenterHeight = dstSize.y - (sm.cyTopHeight + sm.cyBottomHeight); > - int srcCenterHeight = srcSize.y - (sm.cyTopHeight + sm.cyBottomHeight); > - > - if(destCenterWidth > 0) { > - /* Center top */ > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, 0, > - destCenterWidth, sm.cyTopHeight, > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top, > - srcCenterWidth, sm.cyTopHeight, > - sizingtype, transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - /* Center bottom */ > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, dstSize.y-sm.cyBottomHeight, > - destCenterWidth, sm.cyBottomHeight, > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.bottom-sm.cyBottomHeight, > - srcCenterWidth, sm.cyBottomHeight, > - sizingtype, transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - } > - if(destCenterHeight > 0) { > - /* Left center */ > - if(!UXTHEME_SizedBlt (hdcDst, 0, sm.cyTopHeight, > - sm.cxLeftWidth, destCenterHeight, > - hdcSrc, rcSrc.left, rcSrc.top+sm.cyTopHeight, > - sm.cxLeftWidth, srcCenterHeight, > - sizingtype, > - transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - /* Right center */ > - if(!UXTHEME_SizedBlt (hdcDst, dstSize.x-sm.cxRightWidth, sm.cyTopHeight, > - sm.cxRightWidth, destCenterHeight, > - hdcSrc, rcSrc.right-sm.cxRightWidth, rcSrc.top+sm.cyTopHeight, > - sm.cxRightWidth, srcCenterHeight, > - sizingtype, transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - } > - if(destCenterHeight > 0 && destCenterWidth > 0) { > - BOOL borderonly = FALSE; > - GetThemeBool(hTheme, iPartId, iStateId, TMT_BORDERONLY, &borderonly); > - if(!borderonly) { > - /* Center */ > - if(!UXTHEME_SizedBlt (hdcDst, sm.cxLeftWidth, sm.cyTopHeight, > - destCenterWidth, destCenterHeight, > - hdcSrc, rcSrc.left+sm.cxLeftWidth, rcSrc.top+sm.cyTopHeight, > - srcCenterWidth, srcCenterHeight, > - sizingtype, transparent, transparentcolor)) { > - hr = HRESULT_FROM_WIN32(GetLastError()); > - goto draw_error; > - } > - } > - } > - } > - > -draw_error: > - SetViewportOrgEx (hdcDst, org.x, org.y, NULL); > - } > - SelectObject(hdcSrc, oldSrc); > - DeleteDC(hdcSrc); > - if (bmpSrcResized) DeleteObject(bmpSrcResized); > - if (hdcOrigSrc) DeleteDC(hdcOrigSrc); > - *pRect = rcDst; > - return hr; > + *pRect = rcDst; > + } > + > + DrawStream.signature = 0x44727753; > + DrawStream.reserved = 0; > + DrawStream.unknown1 = 1; > + DrawStream.unknown2 = 9; > + DrawStream.hDC = hdc; > + DrawStream.hImage = bmpSrc; > + DrawStream.crTransparent = transparentcolor; > + DrawStream.rcSrc = rcSrc; > + DrawStream.rcDest = rcDst; > + DrawStream.leftSizingMargin = sm.cxLeftWidth; > + DrawStream.rightSizingMargin = sm.cxRightWidth; > + DrawStream.topSizingMargin = sm.cyTopHeight; > + DrawStream.bottomSizingMargin = sm.cyBottomHeight; > + DrawStream.drawOption = 0; > + > + if (transparent == ALPHABLEND_FULL) > + DrawStream.drawOption |= DS_TRANSPARENTALPHA; > + else if (transparent == ALPHABLEND_BINARY) > + DrawStream.drawOption |= DS_TRANSPARENTCLR; > + > + if (sizingtype == ST_TILE) > + DrawStream.drawOption |= DS_TILE; > + else if (sizingtype == ST_TRUESIZE) > + DrawStream.drawOption |= DS_TRUESIZE; > + > + GdiDrawStream(hdc, sizeof(DrawStream), &DrawStream); > + return HRESULT_FROM_WIN32(GetLastError()); > } > > /*********************************************************************** > @@ -1050,7 +769,9 @@ > /* This should never happen, and hence I don't know what to return */ > hr = E_FAIL; > } > +#if 0 > if(SUCCEEDED(hr)) > +#endif > { > RECT rcGlyph = *pRect; > MARGINS margin; > > Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… > ============================================================================== > --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) > +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Wed May 3 11:13:23 2017 > @@ -14,6 +14,7 @@ > #include <winnls.h> > #include <windowsx.h> > #include <undocuser.h> > +#include <undocgdi.h> > #include <uxtheme.h> > #include <uxundoc.h> > #include <vfwmsgs.h> > > >

8 years, 2 months

2
2
0 0

OpenAwards: Last 24 hours to cast votes for ReactOS!

by victor martinez

Hi guys! We made it! But we need your help to be in the top 5! Just 24 hours to do it! ReactOS has been selected as one of the most important projects in two different categories in the OpenAwards, an international opensource event based in Madrid. The 5 most voted will be widely announced, PRed, and finally one of them will be selected as a winner. The exposure is a need for us, you know that, so please help us by casting a vote. Takes just a second. Categories are: - Best Opensource Community: https://a.cstmapp.com/p/18092?fromgroup=1# <https://a.cstmapp.com/p/18092?fromgroup=1#> - Most innovative project: https://a.cstmapp.com/p/18085?fromgroup=1 Instructions: - Find ReactOS in each link. - Click in the button which says "Votar" (Vote) next to it. - It asks for a Name, Surname, an a valid email. Please confirm the vote!. - Done. I'm sure we can push ReactOS to the top! Let's surprise them with our voting boost!

8 years, 2 months

2
1
0 0

New ideas added to GSoC Ideas list

by Colin Finck

Hi all! Daniel and me collected some additional ideas for GSoC today, which I've added to our Wiki Ideas list: https://reactos.org/wiki/Google_Summer_of_Code_2017_Ideas In particular: * Fundamental WiFi components * USBXHCI driver for supporting USB 3.x controllers * Bluetooth Stack * WebKit-based MSHTML implementation I'm open for comments and suggestions! We can still add ideas until March 20, so let's give students a large pool to draw from. Cheers, Colin

8 years, 2 months

7
16
0 0

Status Meeting (April 2017)

by Aleksey Bragin

Hello, Let me invite you to the monthly status meeting taking place 27th of April, 19:00 UTC. We do it either in #reactos-meeting on Freenode, or on a very own standalone IRC server. In that case your participation passwords and server address will be emailed to you shortly before the meeting starts, and they are going to be different once again as they are not stored in any database. And everyone is fine with that. Please send agenda proposals to me before the meeting so we don't waste time trying to setup the agenda directly during the meeting. Regards, Aleksey Bragin

8 years, 2 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev