Ros-diffs September 2024

ros-diffs@reactos.org

23 participants
118 discussions

[reactos] 02/02: [ELF] Remove remnant elf-powerpc.h header Addendum to 6ef6fabfc5271b9fb89cd9bdc2038588d55b3ea4, e372f2b19b6325ce2eaefb750ff375cfbc4fdaba and c020a0ca28900ce0e3055f0b92bf6ae3273f3d58. It was forgotten to be removed in those commits.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5d44157452beeff3e13c8… commit 5d44157452beeff3e13c84aea21d4f365908d64b Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sun Sep 8 21:35:13 2024 +0200 Commit: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> CommitDate: Sun Sep 8 21:50:24 2024 +0200 [ELF] Remove remnant elf-powerpc.h header Addendum to 6ef6fabfc5271b9fb89cd9bdc2038588d55b3ea4, e372f2b19b6325ce2eaefb750ff375cfbc4fdaba and c020a0ca28900ce0e3055f0b92bf6ae3273f3d58. It was forgotten to be removed in those commits. --- sdk/include/reactos/elf/elf-powerpc.h | 158 ---------------------------------- 1 file changed, 158 deletions(-) diff --git a/sdk/include/reactos/elf/elf-powerpc.h b/sdk/include/reactos/elf/elf-powerpc.h deleted file mode 100644 index 6365df86fdf..00000000000 --- a/sdk/include/reactos/elf/elf-powerpc.h +++ /dev/null @@ -1,158 +0,0 @@ -/*- - * Copyright (c) 1996-1997 John D. Polstra. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: src/sys/powerpc/include/elf.h,v 1.16 2004/08/02 19:12:17 dfr Exp $ - */ - -#ifndef _MACHINE_ELF_H_ -#define _MACHINE_ELF_H_ 1 - -/* - * ELF definitions for the powerpc architecture. - */ - -#ifdef _REACTOS_ELF_MACHINE_IS_TARGET - -#ifndef __ELF_WORD_SIZE -#define __ELF_WORD_SIZE 32 /* Used by <elf/generic.h> */ -#endif - -#include <elf/generic.h> - -#define ELF_ARCH EM_386 - -#define ELF_MACHINE_OK(x) ((x) == EM_386 || (x) == EM_486) - -/* - * Auxiliary vector entries for passing information to the interpreter. - * - * The powerpc supplement to the SVR4 ABI specification names this "auxv_t", - * but POSIX lays claim to all symbols ending with "_t". - */ - -typedef struct { /* Auxiliary vector entry on initial stack */ - int a_type; /* Entry type. */ - union { - long a_val; /* Integer value. */ - void *a_ptr; /* Address. */ - void (*a_fcn)(void); /* Function pointer (not used). */ - } a_un; -} Elf32_Auxinfo; - -#if __ELF_WORD_SIZE == 64 -/* Fake for amd64 loader support */ -typedef struct { - int fake; -} Elf64_Auxinfo; -#endif - -__ElfType(Auxinfo); - -/* Values for a_type. */ -#define AT_NULL 0 /* Terminates the vector. */ -#define AT_IGNORE 1 /* Ignored entry. */ -#define AT_EXECFD 2 /* File descriptor of program to load. */ -#define AT_PHDR 3 /* Program header of program already loaded. */ -#define AT_PHENT 4 /* Size of each program header entry. */ -#define AT_PHNUM 5 /* Number of program header entries. */ -#define AT_PAGESZ 6 /* Page size in bytes. */ -#define AT_BASE 7 /* Interpreter's base address. */ -#define AT_FLAGS 8 /* Flags (unused for powerpc). */ -#define AT_ENTRY 9 /* Where interpreter should transfer control. */ - -/* - * The following non-standard values are used for passing information - * from John Polstra's testbed program to the dynamic linker. These - * are expected to go away soon. - * - * Unfortunately, these overlap the Linux non-standard values, so they - * must not be used in the same context. - */ -#define AT_BRK 10 /* Starting point for sbrk and brk. */ -#define AT_DEBUG 11 /* Debugging level. */ - -/* - * The following non-standard values are used in Linux ELF binaries. - */ -#define AT_NOTELF 10 /* Program is not ELF ?? */ -#define AT_UID 11 /* Real uid. */ -#define AT_EUID 12 /* Effective uid. */ -#define AT_GID 13 /* Real gid. */ -#define AT_EGID 14 /* Effective gid. */ - -#define AT_COUNT 15 /* Count of defined aux entry types. */ - -/* Define "machine" characteristics */ -#define ELF_TARG_CLASS ELFCLASS32 -#define ELF_TARG_DATA ELFDATA2LSB -#define ELF_TARG_MACH EM_386 -#define ELF_TARG_VER 1 - -#endif /* _REACTOS_ELF_MACHINE_IS_TARGET */ - -/* - * Relocation types. - */ - -#define R_PPC_NONE 0 -#define R_PPC_ADDR32 1 -#define R_PPC_ADDR24 2 -#define R_PPC_ADDR16 3 -#define R_PPC_ADDR16_LO 4 -#define R_PPC_ADDR16_HI 5 -#define R_PPC_ADDR16_HA 6 -#define R_PPC_ADDR14 7 -#define R_PPC_ADDR14_BRTAKEN 8 -#define R_PPC_ADDR14_BRNTAKEN 9 -#define R_PPC_REL24 10 -#define R_PPC_REL14 11 -#define R_PPC_REL14_BRTAKEN 12 -#define R_PPC_REL14_BRNTAKEN 13 -#define R_PPC_GOT16 14 -#define R_PPC_GOT16_LO 15 -#define R_PPC_GOT16_HI 16 -#define R_PPC_GOT16_HA 17 -#define R_PPC_PLTREL24 18 -#define R_PPC_COPY 19 -#define R_PPC_GLOB_DAT 20 -#define R_PPC_JMP_SLOT 21 -#define R_PPC_RELATIVE 22 -#define R_PPC_LOCAL24PC 23 -#define R_PPC_UADDR32 24 -#define R_PPC_UADDR16 25 -#define R_PPC_REL32 26 -#define R_PPC_PLT32 27 -#define R_PPC_PLTREL32 28 -#define R_PPC_PLT16_LO 29 -#define R_PPC_PLT16_HI 30 -#define R_PPC_PLT16_HA 31 -#define R_PPC_SDAREL16 32 -#define R_PPC_SECTOFF 33 -#define R_PPC_SECTOFF_LO 34 -#define R_PPC_SECTOFF_HI 35 -#define R_PPC_SECTOFF_HA 36 -#define R_PPC_COUNT 37 - -#endif /* !_MACHINE_ELF_H_ */

3 months, 2 weeks

[reactos] 01/02: [NDK] Remove remnant PowerPC headers Remove remaining ketypes.h and mmtypes.h public headers for PowerPC architecture. Addendum to 6ef6fabfc5271b9fb89cd9bdc2038588d55b3ea4 and e372f2b19b6325ce2eaefb750ff375cfbc4fdaba. These headers were forgotten to be removed in those previous commits.

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c020a0ca28900ce0e3055… commit c020a0ca28900ce0e3055f0b92bf6ae3273f3d58 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Sun Sep 8 20:59:55 2024 +0200 Commit: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> CommitDate: Sun Sep 8 20:59:55 2024 +0200 [NDK] Remove remnant PowerPC headers Remove remaining ketypes.h and mmtypes.h public headers for PowerPC architecture. Addendum to 6ef6fabfc5271b9fb89cd9bdc2038588d55b3ea4 and e372f2b19b6325ce2eaefb750ff375cfbc4fdaba. These headers were forgotten to be removed in those previous commits. --- sdk/include/ndk/powerpc/ketypes.h | 661 -------------------------------------- sdk/include/ndk/powerpc/mmtypes.h | 63 ---- 2 files changed, 724 deletions(-) diff --git a/sdk/include/ndk/powerpc/ketypes.h b/sdk/include/ndk/powerpc/ketypes.h deleted file mode 100644 index 16554a6c5e7..00000000000 --- a/sdk/include/ndk/powerpc/ketypes.h +++ /dev/null @@ -1,661 +0,0 @@ -/*++ NDK Version: 0095 - -Copyright (c) Alex Ionescu. All rights reserved. - -Header Name: - - ketypes.h (PPC) - -Abstract: - - PowerPC Type definitions for the Kernel services. - -Author: - - Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 - ---*/ - -#ifndef _POWERPC_KETYPES_H -#define _POWERPC_KETYPES_H - -// -// Dependencies -// - -// -// IPI Types -// -#define IPI_APC 1 -#define IPI_DPC 2 -#define IPI_FREEZE 3 -#define IPI_PACKET_READY 4 -#define IPI_SYNCH_REQUEST 10 -#define MAXIMUM_VECTOR 0x100 - -// -// Static Kernel-Mode Address start (use MM_KSEG0_BASE for actual) -// -#define KSEG0_BASE 0x80000000 - -// -// PRCB Flags -// -#define PRCB_MINOR_VERSION 1 -#define PRCB_MAJOR_VERSION 1 -#define PRCB_BUILD_DEBUG 1 -#define PRCB_BUILD_UNIPROCESSOR 2 - -#ifndef ROUND_UP -#define ROUND_UP(x,y) (((x) + ((y)-1)) & ~((y)-1)) -#endif - -typedef double DOUBLE; - -typedef struct _FX_SAVE_AREA { - ULONG Fr[32]; -} FX_SAVE_AREA, *PFX_SAVE_AREA; - -typedef struct _FXSAVE_FORMAT -{ - ULONG Xer,Fpscr; -} FXSAVE_FORMAT, *PFXSAVE_FORMAT; - -typedef struct _LDT_ENTRY { - USHORT LimitLow; - USHORT BaseLow; - union - { - struct - { - UCHAR BaseMid; - UCHAR Flags1; - UCHAR Flags2; - UCHAR BaseHi; - } Bytes; - struct - { - ULONG BaseMid : 8; - ULONG Type : 5; - ULONG Dpl : 2; - ULONG Pres : 1; - ULONG LimitHi : 4; - ULONG Sys : 1; - ULONG Reserved_0 : 1; - ULONG Default_Big : 1; - ULONG Granularity : 1; - ULONG BaseHi : 8; - } Bits; - } HighWord; -} LDT_ENTRY; - -#ifndef CONFIG_SMP -#define SYNCH_LEVEL DISPATCH_LEVEL -#else -#define SYNCH_LEVEL (IPI_LEVEL - 1) -#endif - -// -// Trap Frame Definition -// -typedef struct _KTRAP_FRAME -{ - PVOID TrapFrame; - UCHAR OldIrql; - UCHAR PreviousMode; - UCHAR SavedApcStateIndex; - UCHAR SavedKernelApcDisable; - UCHAR ExceptionRecord[ROUND_UP(sizeof(EXCEPTION_RECORD), sizeof(ULONGLONG))]; - ULONG FILL2; - ULONG Gpr0; - ULONG Gpr1; - ULONG Gpr2; - ULONG Gpr3; - ULONG Gpr4; - ULONG Gpr5; - ULONG Gpr6; - ULONG Gpr7; - ULONG Gpr8; - ULONG Gpr9; - ULONG Gpr10; - ULONG Gpr11; - ULONG Gpr12; - DOUBLE Fpr0; - DOUBLE Fpr1; - DOUBLE Fpr2; - DOUBLE Fpr3; - DOUBLE Fpr4; - DOUBLE Fpr5; - DOUBLE Fpr6; - DOUBLE Fpr7; - DOUBLE Fpr8; - DOUBLE Fpr9; - DOUBLE Fpr10; - DOUBLE Fpr11; - DOUBLE Fpr12; - DOUBLE Fpr13; - DOUBLE Fpscr; - ULONG Cr; - ULONG Xer; - ULONG Msr; - ULONG Iar; - ULONG Lr; - ULONG Ctr; - ULONG Dr0; - ULONG Dr1; - ULONG Dr2; - ULONG Dr3; - ULONG Dr4; - ULONG Dr5; - ULONG Dr6; - ULONG Dr7; -} KTRAP_FRAME, *PKTRAP_FRAME; - -// -// GDT Entry Definition -// -typedef struct _KGDTENTRY -{ - USHORT LimitLow; - USHORT BaseLow; - union - { - struct - { - UCHAR BaseMid; - UCHAR Flags1; - UCHAR Flags2; - UCHAR BaseHi; - } Bytes; - struct - { - ULONG BaseMid:8; - ULONG Type:5; - ULONG Dpl:2; - ULONG Pres:1; - ULONG LimitHi:4; - ULONG Sys:1; - ULONG Reserved_0:1; - ULONG Default_Big:1; - ULONG Granularity:1; - ULONG BaseHi:8; - } Bits; - } HighWord; -} KGDTENTRY, *PKGDTENTRY; - -// -// IDT Entry Definition -// -typedef struct _KIDTENTRY -{ - USHORT Offset; - USHORT Selector; - USHORT Access; - USHORT ExtendedOffset; -} KIDTENTRY, *PKIDTENTRY; - -typedef struct _DESCRIPTOR -{ - USHORT Pad; - USHORT Limit; - ULONG Base; -} KDESCRIPTOR, *PKDESCRIPTOR; - -// -// Special Registers Structure (outside of CONTEXT) -// -typedef struct _KSPECIAL_REGISTERS -{ - ULONG KernelDr0; - ULONG KernelDr1; - ULONG KernelDr2; - ULONG KernelDr3; - ULONG KernelDr4; - ULONG KernelDr5; - ULONG KernelDr6; - ULONG KernelDr7; - ULONG Sprg0; - ULONG Sprg1; - ULONG Sr0; - ULONG Sr1; - ULONG Sr2; - ULONG Sr3; - ULONG Sr4; - ULONG Sr5; - ULONG Sr6; - ULONG Sr7; - ULONG Sr8; - ULONG Sr9; - ULONG Sr10; - ULONG Sr11; - ULONG Sr12; - ULONG Sr13; - ULONG Sr14; - ULONG Sr15; - ULONG DBAT0L; - ULONG DBAT0U; - ULONG DBAT1L; - ULONG DBAT1U; - ULONG DBAT2L; - ULONG DBAT2U; - ULONG DBAT3L; - ULONG DBAT3U; - ULONG IBAT0L; - ULONG IBAT0U; - ULONG IBAT1L; - ULONG IBAT1U; - ULONG IBAT2L; - ULONG IBAT2U; - ULONG IBAT3L; - ULONG IBAT3U; - ULONG Sdr1; - ULONG Reserved[9]; -} KSPECIAL_REGISTERS, *PKSPECIAL_REGISTERS; - -// -// Processor State Data -// -#pragma pack(push,4) -typedef struct _KPROCESSOR_STATE -{ - CONTEXT ContextFrame; - KSPECIAL_REGISTERS SpecialRegisters; -} KPROCESSOR_STATE, *PKPROCESSOR_STATE; - -// -// Processor Region Control Block -// -typedef struct _KPRCB -{ - USHORT MinorVersion; - USHORT MajorVersion; - struct _KTHREAD *CurrentThread; - struct _KTHREAD *NextThread; - struct _KTHREAD *IdleThread; - UCHAR Number; - UCHAR Reserved; - USHORT BuildType; - KAFFINITY SetMember; - UCHAR CpuType; - UCHAR CpuID; - USHORT CpuStep; - KPROCESSOR_STATE ProcessorState; - ULONG KernelReserved[16]; - ULONG HalReserved[16]; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG CFlushSize; - UCHAR PrcbPad0[88]; -#else - UCHAR PrcbPad0[92]; -#endif - KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; - struct _KTHREAD *NpxThread; - ULONG InterruptCount; - ULONG KernelTime; - ULONG UserTime; - ULONG DpcTime; - ULONG DebugDpcTime; - ULONG InterruptTime; - ULONG AdjustDpcThreshold; - ULONG PageColor; - UCHAR SkipTick; - UCHAR DebuggerSavedIRQL; -#if (NTDDI_VERSION >= NTDDI_WS03) - UCHAR NodeColor; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - UCHAR PollSlot; -#else - UCHAR Spare1; -#endif - ULONG NodeShiftedColor; -#else - UCHAR Spare1[6]; -#endif - struct _KNODE *ParentNode; - ULONG MultiThreadProcessorSet; - struct _KPRCB *MultiThreadSetMaster; -#if (NTDDI_VERSION >= NTDDI_WS03) - ULONG SecondaryColorMask; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG DpcTimeLimit; -#else - LONG Sleeping; -#endif -#else - ULONG ThreadStartCount[2]; -#endif - ULONG CcFastReadNoWait; - ULONG CcFastReadWait; - ULONG CcFastReadNotPossible; - ULONG CcCopyReadNoWait; - ULONG CcCopyReadWait; - ULONG CcCopyReadNoWaitMiss; -#if (NTDDI_VERSION < NTDDI_LONGHORN) - ULONG KeAlignmentFixupCount; -#endif - ULONG SpareCounter0; -#if (NTDDI_VERSION < NTDDI_LONGHORN) - ULONG KeDcacheFlushCount; - ULONG KeExceptionDispatchCount; - ULONG KeFirstLevelTbFills; - ULONG KeFloatingEmulationCount; - ULONG KeIcacheFlushCount; - ULONG KeSecondLevelTbFills; - ULONG KeSystemCalls; -#endif - volatile ULONG IoReadOperationCount; - volatile ULONG IoWriteOperationCount; - volatile ULONG IoOtherOperationCount; - LARGE_INTEGER IoReadTransferCount; - LARGE_INTEGER IoWriteTransferCount; - LARGE_INTEGER IoOtherTransferCount; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG CcFastMdlReadNoWait; - ULONG CcFastMdlReadWait; - ULONG CcFastMdlReadNotPossible; - ULONG CcMapDataNoWait; - ULONG CcMapDataWait; - ULONG CcPinMappedDataCount; - ULONG CcPinReadNoWait; - ULONG CcPinReadWait; - ULONG CcMdlReadNoWait; - ULONG CcMdlReadWait; - ULONG CcLazyWriteHotSpots; - ULONG CcLazyWriteIos; - ULONG CcLazyWritePages; - ULONG CcDataFlushes; - ULONG CcDataPages; - ULONG CcLostDelayedWrites; - ULONG CcFastReadResourceMiss; - ULONG CcCopyReadWaitMiss; - ULONG CcFastMdlReadResourceMiss; - ULONG CcMapDataNoWaitMiss; - ULONG CcMapDataWaitMiss; - ULONG CcPinReadNoWaitMiss; - ULONG CcPinReadWaitMiss; - ULONG CcMdlReadNoWaitMiss; - ULONG CcMdlReadWaitMiss; - ULONG CcReadAheadIos; - ULONG KeAlignmentFixupCount; - ULONG KeExceptionDispatchCount; - ULONG KeSystemCalls; - ULONG PrcbPad1[3]; -#else - ULONG SpareCounter1[8]; -#endif - PP_LOOKASIDE_LIST PPLookasideList[16]; - PP_LOOKASIDE_LIST PPNPagedLookasideList[32]; - PP_LOOKASIDE_LIST PPPagedLookasideList[32]; - volatile ULONG PacketBarrier; - volatile ULONG ReverseStall; - PVOID IpiFrame; - UCHAR PrcbPad2[52]; - volatile PVOID CurrentPacket[3]; - volatile ULONG TargetSet; - volatile PKIPI_WORKER WorkerRoutine; - volatile ULONG IpiFrozen; - UCHAR PrcbPad3[40]; - volatile ULONG RequestSummary; - volatile struct _KPRCB *SignalDone; - UCHAR PrcbPad4[56]; - struct _KDPC_DATA DpcData[2]; - PVOID DpcStack; - ULONG MaximumDpcQueueDepth; - ULONG DpcRequestRate; - ULONG MinimumDpcRate; - volatile UCHAR DpcInterruptRequested; - volatile UCHAR DpcThreadRequested; - volatile UCHAR DpcRoutineActive; - volatile UCHAR DpcThreadActive; - ULONG PrcbLock; - ULONG DpcLastCount; - volatile ULONG TimerHand; - volatile ULONG TimerRequest; - PVOID DpcThread; - KEVENT DpcEvent; - UCHAR ThreadDpcEnable; - volatile BOOLEAN QuantumEnd; - UCHAR PrcbPad50; - volatile UCHAR IdleSchedule; - LONG DpcSetEventRequest; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - LONG Sleeping; - ULONG PeriodicCount; - ULONG PeriodicBias; - UCHAR PrcbPad5[6]; -#else - UCHAR PrcbPad5[18]; -#endif - LONG TickOffset; - KDPC CallDpc; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - LONG ClockKeepAlive; - UCHAR ClockCheckSlot; - UCHAR ClockPollCycle; - UCHAR PrcbPad6[2]; - LONG DpcWatchdogPeriod; - LONG DpcWatchDogCount; - LONG ThreadWatchdogPeriod; - LONG ThreadWatchDogCount; - ULONG PrcbPad70[2]; -#else - ULONG PrcbPad7[8]; -#endif - LIST_ENTRY WaitListHead; - ULONG ReadySummary; - ULONG QueueIndex; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - SINGLE_LIST_ENTRY DeferredReadyListHead; - ULONGLONG StartCycles; - ULONGLONG CycleTime; - ULONGLONG PrcbPad71[3]; - LIST_ENTRY DispatcherReadyListHead[32]; -#else - LIST_ENTRY DispatcherReadyListHead[32]; - SINGLE_LIST_ENTRY DeferredReadyListHead; - ULONG PrcbPad72[11]; -#endif - PVOID ChainedInterruptList; - LONG LookasideIrpFloat; - volatile LONG MmPageFaultCount; - volatile LONG MmCopyOnWriteCount; - volatile LONG MmTransitionCount; - volatile LONG MmCacheTransitionCount; - volatile LONG MmDemandZeroCount; - volatile LONG MmPageReadCount; - volatile LONG MmPageReadIoCount; - volatile LONG MmCacheReadCount; - volatile LONG MmCacheIoCount; - volatile LONG MmDirtyPagesWriteCount; - volatile LONG MmDirtyWriteIoCount; - volatile LONG MmMappedPagesWriteCount; - volatile LONG MmMappedWriteIoCount; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - ULONG CachedCommit; - ULONG CachedResidentAvailable; - PVOID HyperPte; - UCHAR CpuVendor; - UCHAR PrcbPad9[3]; -#else - ULONG SpareFields0[1]; -#endif - CHAR VendorString[13]; - UCHAR InitialApicId; - UCHAR LogicalProcessorsPerPhysicalProcessor; - ULONG MHz; - ULONG FeatureBits; - LARGE_INTEGER UpdateSignature; - volatile LARGE_INTEGER IsrTime; - LARGE_INTEGER SpareField1; - FX_SAVE_AREA NpxSaveArea; - PROCESSOR_POWER_STATE PowerState; -#if (NTDDI_VERSION >= NTDDI_LONGHORN) - KDPC DpcWatchdogDoc; - KTIMER DpcWatchdogTimer; - PVOID WheaInfo; - PVOID EtwSupport; - SLIST_HEADER InterruptObjectPool; - LARGE_INTEGER HyperCallPagePhysical; - LARGE_INTEGER HyperCallPageVirtual; - PVOID RateControl; - CACHE_DESCRIPTOR Cache[5]; - ULONG CacheCount; - ULONG CacheProcessorMask[5]; - UCHAR LogicalProcessorsPerCore; - UCHAR PrcbPad8[3]; - ULONG PackageProcessorSet; - ULONG CoreProcessorSet; -#endif -} KPRCB, *PKPRCB; - -// -// Processor Control Region -// -typedef struct _KIPCR -{ - USHORT MinorVersion; - USHORT MajorVersion; - PKINTERRUPT_ROUTINE InterruptRoutine[MAXIMUM_VECTOR]; - ULONG PcrPage2; - ULONG Kseg0Top; - ULONG Spare7[30]; - ULONG FirstLevelDcacheSize; - ULONG FirstLevelDcacheFillSize; - ULONG FirstLevelIcacheSize; - ULONG FirstLevelIcacheFillSize; - ULONG SecondLevelDcacheSize; - ULONG SecondLevelDcacheFillSize; - ULONG SecondLevelIcacheSize; - ULONG SecondLevelIcacheFillSize; - struct _KPRCB *PrcbData; - PVOID Teb; - ULONG DcacheAlignment; - ULONG DcacheFillSize; - ULONG IcacheAlignment; - ULONG IcacheFillSize; - ULONG ProcessorVersion; - ULONG ProcessorRevision; - ULONG ProfileInterval; - ULONG ProfileCount; - ULONG StallExecutionCount; - ULONG StallScaleFactor; - ULONG Spare; - union - { - ULONG CachePolicy; - struct - { - UCHAR IcacheMode; - UCHAR DcacheMode; - USHORT ModeSpare; - }; - }; - UCHAR IrqlMask[32]; - UCHAR IrqlTable[9]; - UCHAR CurrentIrql; - CCHAR Number; - KAFFINITY SetMember; - ULONG ReservedVectors; - struct _KTHREAD *CurrentThread; - ULONG AlignedCachePolicy; - union - { - ULONG SoftwareInterrupt; - struct - { - UCHAR ApcInterrupt; - UCHAR DispatchInterrupt; - UCHAR Spare4; - UCHAR Spare5; - }; - }; - KAFFINITY NotMember; - ULONG SystemReserved[16]; - ULONG HalReserved[16]; - ULONG FirstLevelActive; - ULONG SystemServiceDispatchStart; - ULONG SystemServiceDispatchEnd; - ULONG InterruptStack; - ULONG QuantumEnd; - PVOID InitialStack; - PVOID PanicStack; - ULONG BadVaddr; - PVOID StackLimit; - PVOID SavedStackLimit; - ULONG SavedV0; - ULONG SavedV1; - UCHAR DebugActive; - UCHAR Spare6[3]; - ULONG GprSave[6]; - ULONG SiR0; - ULONG SiR2; - ULONG SiR3; - ULONG SiR4; - ULONG SiR5; - ULONG Spare0; - ULONG Spare8; - ULONG PgDirRa; - ULONG OnInterruptStack; - ULONG SavedInitialStack; -} KIPCR, *PKIPCR; -#pragma pack(pop) - -// -// TSS Definition -// -typedef struct _KTSS { -} KTSS, *PKTSS; - -// -// PowerPC Exception Frame -// -typedef struct _KEXCEPTION_FRAME -{ - ULONG Fill1; - ULONG Gpr13; - ULONG Gpr14; - ULONG Gpr15; - ULONG Gpr16; - ULONG Gpr17; - ULONG Gpr18; - ULONG Gpr19; - ULONG Gpr20; - ULONG Gpr21; - ULONG Gpr22; - ULONG Gpr23; - ULONG Gpr24; - ULONG Gpr25; - ULONG Gpr26; - ULONG Gpr27; - ULONG Gpr28; - ULONG Gpr29; - ULONG Gpr30; - ULONG Gpr31; - DOUBLE Fpr14; - DOUBLE Fpr15; - DOUBLE Fpr16; - DOUBLE Fpr17; - DOUBLE Fpr18; - DOUBLE Fpr19; - DOUBLE Fpr20; - DOUBLE Fpr21; - DOUBLE Fpr22; - DOUBLE Fpr23; - DOUBLE Fpr24; - DOUBLE Fpr25; - DOUBLE Fpr26; - DOUBLE Fpr27; - DOUBLE Fpr28; - DOUBLE Fpr29; - DOUBLE Fpr30; - DOUBLE Fpr31; -} KEXCEPTION_FRAME, *PKEXCEPTION_FRAME; - -FORCEINLINE -struct _KPRCB * -KeGetCurrentPrcb(VOID) -{ - return (struct _KPRCB *)(ULONG_PTR)__readfsdword(FIELD_OFFSET(KIPCR, PrcbData)); -} - -#endif diff --git a/sdk/include/ndk/powerpc/mmtypes.h b/sdk/include/ndk/powerpc/mmtypes.h deleted file mode 100644 index 2dde39f5c27..00000000000 --- a/sdk/include/ndk/powerpc/mmtypes.h +++ /dev/null @@ -1,63 +0,0 @@ -/*++ NDK Version: 0095 - -Copyright (c) Alex Ionescu. All rights reserved. - -Header Name: - - mmtypes.h (PPC) - -Abstract: - - PowerPC Type definitions for the Memory Manager - -Author: - - Art Yerkes (ayerkes(a)speakeasy.net) 04-Dec-2005 - ---*/ - -#ifndef _POWERPC_MMTYPES_H -#define _POWERPC_MMTYPES_H - -// -// Dependencies -// - -// -// Page-related Macros -// -#define PAGE_SIZE 0x1000 -#define PAGE_SHIFT 12L - -typedef unsigned long long MMPTE_HARDWARE; -typedef unsigned long long MMPTE_SOFTWARE; -typedef unsigned long long MMPTE_PROTOTYPE; -typedef unsigned long long MMPTE_SUBSECTION; -typedef unsigned long long MMPTE_TRANSITION; -typedef unsigned long long MMPTE_LIST; - -// -// Page Table Entry Definition -// -typedef struct _HARDWARE_PTE_PPC -{ - ULONG Dirty:2; - ULONG Valid:1; - ULONG GuardedStorage:1; - ULONG MemoryCoherence:1; - ULONG CacheDisable:1; - ULONG WriteThrough:1; - ULONG Change:1; - ULONG Reference:1; - ULONG Write:1; - ULONG CopyOnWrite:1; - ULONG rsvd1:1; - ULONG PageFrameNumber:20; -} HARDWARE_PTE_PPC, *PHARDWARE_PTE_PPC; - -#ifndef HARDWARE_PTE -#define HARDWARE_PTE HARDWARE_PTE_PPC -#define PHARDWARE_PTE PHARDWARE_PTE_PPC -#endif - -#endif/*_POWERPC_MMTYPES_H*/

3 months, 2 weeks

[reactos] 02/02: [UXTHEME] DrawNCPreview: Do not draw the icon for inactive/active windows

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9dae161631d6aadf73b2d… commit 9dae161631d6aadf73b2dce67ee03067b23bde8b Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Sep 8 21:30:03 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Sep 8 21:34:23 2024 +0300 [UXTHEME] DrawNCPreview: Do not draw the icon for inactive/active windows This is how preview works in Windows. Addendum to 118869f69. CORE-5991 --- dll/win32/uxtheme/nonclient.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index 6f89ef4305f..e78a62ed4ac 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -1239,7 +1239,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, if (!RegisterClassExW(&DummyPreviewWindowClass)) return E_FAIL; - hwndDummy = CreateWindowExW(0, L"DummyPreviewWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VSCROLL, 30, 30, 300, 150, 0, 0, hDllInst, NULL); + hwndDummy = CreateWindowExW(WS_EX_DLGMODALFRAME, L"DummyPreviewWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VSCROLL, 30, 30, 300, 150, 0, 0, hDllInst, NULL); if (!hwndDummy) return E_FAIL; @@ -1295,14 +1295,11 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, SetWindowResourceText(hwndDummy, IDS_MESSAGEBOX); DWORD dwStyleNew = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_DLGFRAME; SetWindowLongPtr(hwndDummy, GWL_STYLE, dwStyleNew); - DWORD dwExStyleNew = WS_EX_DLGMODALFRAME; - SetWindowLongPtr(hwndDummy, GWL_EXSTYLE, dwExStyleNew); if (!GetWindowInfo(hwndDummy, &context.wi)) return E_FAIL; context.wi.dwStyle = WS_VISIBLE | dwStyleNew; - context.wi.dwExStyle = dwExStyleNew; INT msgBoxHCenter = rcAdjPreview.left + (previewWidth / 2); INT msgBoxVCenter = rcAdjPreview.top + (previewHeight / 2);

3 months, 2 weeks

[reactos] 01/02: [UXTHEME] Draw message box background properly in DrawNCPreview

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bda42114a70df4826266… commit 3bda42114a70df48262666cd92830e30e4508d91 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Sun Sep 8 21:18:38 2024 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Sun Sep 8 21:34:18 2024 +0300 [UXTHEME] Draw message box background properly in DrawNCPreview Addendum to 118869f69. CORE-19592 CORE-5991 --- dll/win32/uxtheme/nonclient.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dll/win32/uxtheme/nonclient.c b/dll/win32/uxtheme/nonclient.c index cc27e22eb0b..6f89ef4305f 100644 --- a/dll/win32/uxtheme/nonclient.c +++ b/dll/win32/uxtheme/nonclient.c @@ -1092,7 +1092,7 @@ DrawWindowForNCPreview( _In_ INT top, _In_ INT right, _In_ INT bottom, - _In_ BOOL drawClientAreaColor, + _In_ INT clientAreaColor, _Out_opt_ LPRECT prcClient) { if (!hDC) @@ -1172,12 +1172,9 @@ DrawWindowForNCPreview( OffsetRect(&rcClientNew, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); - if (drawClientAreaColor) - { - HBRUSH hbrWindow = GetThemeSysColorBrush(pcontext->theme, COLOR_WINDOW); - FillRect(hDC, &rcClientNew, hbrWindow); - DeleteObject(hbrWindow); - } + HBRUSH hbrWindow = GetThemeSysColorBrush(pcontext->theme, clientAreaColor); + FillRect(hDC, &rcClientNew, hbrWindow); + DeleteObject(hbrWindow); pcontext->wi.rcWindow = rcWindowPrev; pcontext->wi.rcClient = rcClientPrev; @@ -1272,7 +1269,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, /* Draw inactive preview window */ context.Active = FALSE; SetWindowResourceText(hwndDummy, IDS_INACTIVEWIN); - DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left, rcAdjPreview.top, rcAdjPreview.right - 17, rcAdjPreview.bottom - 20, TRUE, NULL); + DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left, rcAdjPreview.top, rcAdjPreview.right - 17, rcAdjPreview.bottom - 20, COLOR_WINDOW, NULL); /* Draw active preview window */ context.Active = TRUE; @@ -1280,7 +1277,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, DWORD textDrawFlags = DT_NOPREFIX | DT_SINGLELINE | DT_WORDBREAK; RECT rcWindowClient; - DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left + 10, rcAdjPreview.top + 22, rcAdjPreview.right, rcAdjPreview.bottom, TRUE, &rcWindowClient); + DrawWindowForNCPreview(hDC, &context, rcAdjPreview.left + 10, rcAdjPreview.top + 22, rcAdjPreview.right, rcAdjPreview.bottom, COLOR_WINDOW, &rcWindowClient); LOGFONTW lfText; HFONT textFont = NULL; if (SUCCEEDED(GetThemeSysFont(context.theme, TMT_MSGBOXFONT, &lfText))) @@ -1310,8 +1307,7 @@ HRESULT WINAPI DrawNCPreview(HDC hDC, INT msgBoxHCenter = rcAdjPreview.left + (previewWidth / 2); INT msgBoxVCenter = rcAdjPreview.top + (previewHeight / 2); - DrawWindowForNCPreview(hDC, &context, msgBoxHCenter - NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_X, msgBoxHCenter + NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_Y, FALSE, &rcWindowClient); - DrawThemeBackground(context.theme, hDC, WP_DIALOG, 0, &rcWindowClient, NULL); + DrawWindowForNCPreview(hDC, &context, msgBoxHCenter - NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_X, msgBoxHCenter + NC_PREVIEW_MSGBOX_HALF_WIDTH, msgBoxVCenter + NC_PREVIEW_MSGBOX_OFFSET_Y, COLOR_BTNFACE, &rcWindowClient); /* Draw preview dialog button */ HTHEME hBtnTheme = OpenThemeDataFromFile(hThemeFile, hwndDummy, L"BUTTON", OTD_NONCLIENT);

3 months, 2 weeks

[reactos] 01/01: Revert "[SHELL32] Show Product version on About dialog bmp (#3621)" (#7327)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c1e642fdb57cb5f7cbc4a… commit c1e642fdb57cb5f7cbc4a83dcb4a9e18a2bd62c6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 7 22:34:19 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Sep 8 14:55:47 2024 +0200 Revert "[SHELL32] Show Product version on About dialog bmp (#3621)" (#7327) This reverts commit 2636cff09fdb70bfe63c52ea9d2d24dbfc1e337f by Cătălin Gabriel Drăghiță (@jeffbox12) as well as any subsequent changes. This was agreed upon by the original author on our official Mattermost chat (chat.reactos.org) The reactos.bmp banners are again generated from the file: dll/win32/msgina/resources/svg/reactos.svg --- dll/win32/msgina/resources/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/msgina/resources/svg/rosbanner.svg | 1788 -------------------- dll/win32/shell32/bitmap_res.rc | 6 +- dll/win32/shell32/res/bitmaps/reactos.bmp | Bin 89334 -> 89334 bytes dll/win32/shell32/res/bitmaps/reactosserver.bmp | Bin 89334 -> 0 bytes .../shell32/res/bitmaps/reactosworkstation.bmp | Bin 89334 -> 0 bytes dll/win32/shell32/shresdef.h | 2 - dll/win32/shell32/wine/shell32_main.c | 12 +- dll/win32/syssetup/resources/reactos.bmp | Bin 89334 -> 89334 bytes 9 files changed, 3 insertions(+), 1805 deletions(-) diff --git a/dll/win32/msgina/resources/reactos.bmp b/dll/win32/msgina/resources/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/msgina/resources/reactos.bmp and b/dll/win32/msgina/resources/reactos.bmp differ diff --git a/dll/win32/msgina/resources/svg/rosbanner.svg b/dll/win32/msgina/resources/svg/rosbanner.svg deleted file mode 100644 index 9b410f5ef61..00000000000 --- a/dll/win32/msgina/resources/svg/rosbanner.svg +++ /dev/null @@ -1,1788 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:xlink="http://www.w3.org/1999/xlink" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="413" - height="72" - viewBox="0 0 109.27291 19.050001" - version="1.1" - id="svg8" - inkscape:export-filename="reactos.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" - inkscape:version="1.0.2-2 (e86c870879, 2021-01-15)" - sodipodi:docname="rosbanner.svg"> - <defs - id="defs2"> - <clipPath - id="clipPath5851"> - <path - inkscape:connector-curvature="0" - d="m 49.8125,31.83884 c -3.255639,0.0909 -5.959696,1.08533 -7.8125,3.0625 -1.852812,1.97712 -2.651641,4.74531 -2.53125,8 0.120391,3.25469 1.159967,6.99107 2.96875,11.03125 3.617567,8.08035 10.384054,17.29707 19.4375,25.78125 9.053319,8.48356 18.670786,14.63275 26.96875,17.71875 4.148982,1.543 7.963087,2.3409 11.21875,2.25 3.25566,-0.091 5.9597,-1.0853 7.8125,-3.0625 1.85283,-1.9772 2.65165,-4.7453 2.53125,-8 -0.1204,-3.25471 -1.12869,-6.99108 -2.9375,-11.03125 -3.61762,-8.08034 [...] - id="path5853" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5827"> - <path - inkscape:connector-curvature="0" - d="m 92.4375,31.83884 c -3.255663,-0.0909 -7.069767,0.70705 -11.21875,2.25 -8.297966,3.08589 -17.946678,9.23495 -27,17.71875 -9.053446,8.48418 -15.788683,17.70088 -19.40625,25.78125 -1.808783,4.04018 -2.848359,7.77655 -2.96875,11.03125 -0.120391,3.2547 0.678439,6.0229 2.53125,8 1.852812,1.9772 4.556857,2.9716 7.8125,3.0625 3.255643,0.091 7.069798,-0.707 11.21875,-2.25 8.297904,-3.086 17.946639,-9.23515 27,-17.71875 9.053456,-8.48414 15.81988,-17.70092 19.4375,-25.78125 1.80881,- [...] - id="path5829" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5835"> - <path - inkscape:connector-curvature="0" - d="m 96.40625,35.74509 c -3.255662,-0.0909 -7.069767,0.70705 -11.21875,2.25 -8.297965,3.08589 -17.946677,9.23494 -27,17.71875 -9.053446,8.48418 -15.788683,17.70089 -19.40625,25.78125 -1.808783,4.04018 -2.848359,7.77655 -2.96875,11.0312 -0.120391,3.2547 0.678438,6.0229 2.53125,8 1.852812,1.9772 4.556859,2.9717 7.8125,3.0626 3.255641,0.091 7.0698,-0.7071 11.21875,-2.25 8.2979,-3.086 17.946628,-9.2352 27,-17.7188 9.053457,-8.48415 15.81988,-17.70092 19.4375,-25.78125 1.80881,-4.040 [...] - id="path5837" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5859"> - <path - inkscape:connector-curvature="0" - d="m 45.84375,35.74509 c -3.25564,0.0909 -5.959689,1.08533 -7.8125,3.0625 -1.852812,1.97712 -2.651641,4.74531 -2.53125,8 0.120391,3.25469 1.159967,6.99108 2.96875,11.03125 3.617567,8.08035 10.384055,17.29708 19.4375,25.78125 9.053321,8.4836 18.670786,14.6328 26.96875,17.7188 4.148982,1.5429 7.963087,2.3408 11.21875,2.25 3.255663,-0.091 5.99095,-1.0854 7.84375,-3.0626 1.85283,-1.9771 2.6204,-4.7452 2.5,-8 C 106.3171,89.27164 105.30881,85.53526 103.5,81.49509 99.882381,73.41475 93 [...] - id="path5861" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5851-8"> - <path - inkscape:connector-curvature="0" - d="m 49.8125,31.83884 c -3.255639,0.0909 -5.959696,1.08533 -7.8125,3.0625 -1.852812,1.97712 -2.651641,4.74531 -2.53125,8 0.120391,3.25469 1.159967,6.99107 2.96875,11.03125 3.617567,8.08035 10.384054,17.29707 19.4375,25.78125 9.053319,8.48356 18.670786,14.63275 26.96875,17.71875 4.148982,1.543 7.963087,2.3409 11.21875,2.25 3.25566,-0.091 5.9597,-1.0853 7.8125,-3.0625 1.85283,-1.9772 2.65165,-4.7453 2.53125,-8 -0.1204,-3.25471 -1.12869,-6.99108 -2.9375,-11.03125 -3.61762,-8.08034 [...] - id="path5853-8" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5827-4"> - <path - inkscape:connector-curvature="0" - d="m 92.4375,31.83884 c -3.255663,-0.0909 -7.069767,0.70705 -11.21875,2.25 -8.297966,3.08589 -17.946678,9.23495 -27,17.71875 -9.053446,8.48418 -15.788683,17.70088 -19.40625,25.78125 -1.808783,4.04018 -2.848359,7.77655 -2.96875,11.03125 -0.120391,3.2547 0.678439,6.0229 2.53125,8 1.852812,1.9772 4.556857,2.9716 7.8125,3.0625 3.255643,0.091 7.069798,-0.707 11.21875,-2.25 8.297904,-3.086 17.946639,-9.23515 27,-17.71875 9.053456,-8.48414 15.81988,-17.70092 19.4375,-25.78125 1.80881,- [...] - id="path5829-7" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5835-0"> - <path - inkscape:connector-curvature="0" - d="m 96.40625,35.74509 c -3.255662,-0.0909 -7.069767,0.70705 -11.21875,2.25 -8.297965,3.08589 -17.946677,9.23494 -27,17.71875 -9.053446,8.48418 -15.788683,17.70089 -19.40625,25.78125 -1.808783,4.04018 -2.848359,7.77655 -2.96875,11.0312 -0.120391,3.2547 0.678438,6.0229 2.53125,8 1.852812,1.9772 4.556859,2.9717 7.8125,3.0626 3.255641,0.091 7.0698,-0.7071 11.21875,-2.25 8.2979,-3.086 17.946628,-9.2352 27,-17.7188 9.053457,-8.48415 15.81988,-17.70092 19.4375,-25.78125 1.80881,-4.040 [...] - id="path5837-9" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <clipPath - id="clipPath5859-0"> - <path - inkscape:connector-curvature="0" - d="m 45.84375,35.74509 c -3.25564,0.0909 -5.959689,1.08533 -7.8125,3.0625 -1.852812,1.97712 -2.651641,4.74531 -2.53125,8 0.120391,3.25469 1.159967,6.99108 2.96875,11.03125 3.617567,8.08035 10.384055,17.29708 19.4375,25.78125 9.053321,8.4836 18.670786,14.6328 26.96875,17.7188 4.148982,1.5429 7.963087,2.3408 11.21875,2.25 3.255663,-0.091 5.99095,-1.0854 7.84375,-3.0626 1.85283,-1.9771 2.6204,-4.7452 2.5,-8 C 106.3171,89.27164 105.30881,85.53526 103.5,81.49509 99.882381,73.41475 93 [...] - id="path5861-1" - style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;stro [...] - </clipPath> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient2677" - id="radialGradient14872" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7004643,0,0,0.70172288,3.2822064,-360.85789)" - cx="385.866" - cy="775.88397" - r="161.42599" /> - <radialGradient - id="radialGradient2677" - gradientUnits="userSpaceOnUse" - cy="775.88397" - cx="385.866" - gradientTransform="matrix(1,0,0,1.098684,0,-76.56746)" - r="161.42599"> - <stop - stop-color="#000" - offset="0" - id="stop14005" /> - <stop - stop-color="#000" - stop-opacity="0" - offset="1" - id="stop14007" /> - </radialGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient2679" - id="radialGradient14874" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-1.2414154,0.7906519,0.7046472,1.1063777,14.821787,-990.03377)" - cx="292.94199" - cy="835.15997" - r="49.305698" /> - <radialGradient - id="radialGradient2679" - gradientUnits="userSpaceOnUse" - cy="835.15997" - cx="292.94199" - gradientTransform="matrix(-1.2414154,0.7906519,0.7046472,1.1063777,17.23768,-980.81675)" - r="49.305698"> - <stop - stop-color="#FFF" - offset="0" - id="stop14010" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop14012" /> - </radialGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2681" - id="linearGradient14876" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.7446541,0,0,0.7446541,-5.6199996,-8.4660712)" - x1="582.23602" - y1="205.392" - x2="491.327" - y2="352.73199" /> - <linearGradient - id="linearGradient2681" - y2="352.73199" - gradientUnits="userSpaceOnUse" - x2="491.327" - gradientTransform="matrix(0.7446541,0,0,0.7446541,-3.2041063,0.7509507)" - y1="205.392" - x1="582.23602"> - <stop - stop-color="#FFF" - offset="0" - id="stop14015" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop14017" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14878" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3787858,0.00173938,0.12713595,0.36922244,147.20389,110.6843)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <linearGradient - id="linearGradient17671"> - <stop - stop-color="#FFF" - stop-opacity="0.41618496" - offset="0" - id="stop13946" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop13948" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14880" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3787858,0.00173938,0.12713595,0.36922244,141.4887,109.2555)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14882" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3787858,0.00173938,0.12713595,0.36922244,150.77585,106.39791)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14884" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,167.40497,226.16506)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14886" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5942012,0,0,0.61070665,29.605037,25.356377)" - cx="393.616" - cy="249.494" - r="129.84599" /> - <linearGradient - id="linearGradient4522"> - <stop - stop-color="#FFF" - offset="0" - id="stop13941" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop13943" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14888" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.6391732,-0.3071802,0.1899467,0.3952362,-40.272704,246.60339)" - cx="401.10001" - cy="268.32599" - r="212.48199" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3800" - id="radialGradient14890" - gradientUnits="userSpaceOnUse" - cx="389.16699" - cy="118.281" - r="11.6067" /> - <linearGradient - id="linearGradient3800"> - <stop - stop-color="#466886" - offset="0" - id="stop13936" /> - <stop - stop-color="#617689" - stop-opacity="0" - offset="1" - id="stop13938" /> - </linearGradient> - <filter - id="filter4546" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.58082045" - id="feGaussianBlur13969" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3800" - id="radialGradient14892" - gradientUnits="userSpaceOnUse" - cx="389.16699" - cy="118.281" - r="11.6067" /> - <filter - id="filter4640" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.11651621" - id="feGaussianBlur14084" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3800" - id="radialGradient14894" - gradientUnits="userSpaceOnUse" - cx="389.16699" - cy="118.281" - r="11.6067" /> - <filter - id="filter536" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.58082045" - id="feGaussianBlur534" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14896" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.833046)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <linearGradient - id="linearGradient7995"> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0" - id="stop13918" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0.851163" - id="stop13920" /> - <stop - stop-color="#FFF" - offset="0.851163" - id="stop13922" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0.962791" - id="stop13924" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop13926" /> - </linearGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14898" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.5942012,0,0,0.61070665,38.177777,39.644317)" - cx="393.616" - cy="249.494" - r="129.84599" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14900" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.8330458)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14902" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.4814128,0,0,0.46765832,67.570747,82.120772)" - cx="393.616" - cy="249.494" - r="129.84599" /> - <filter - id="filter4557" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.9633802" - id="feGaussianBlur14056" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14904" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2829792,-0.3386568,0.3379392,0.2127455,169.16347,340.25847)" - cx="541.81702" - cy="120.328" - r="74.100403" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14906" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2682217,-0.350461,0.34673721,0.19808256,178.60121,337.34552)" - cx="541.81702" - cy="120.328" - r="74.100403" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14908" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.4405956,-0.02532604,0.07605714,0.39201881,109.20395,147.1329)" - cx="541.81702" - cy="120.328" - r="74.100403" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14910" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.4240849,-0.160985,0.30844982,0.1940274,78.398423,231.60039)" - cx="541.81702" - cy="120.328" - r="74.100403" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14912" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2725526,-0.05896195,0.04871855,0.26899548,241.21373,101.67214)" - cx="393.616" - cy="249.494" - r="129.84599" /> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient3569" - id="radialGradient14914" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.12557693,1.1068625,-1.9052998,0.21616207,2037.7024,-465.53692)" - cx="392.07401" - cy="1040.22" - r="161.42599" /> - <radialGradient - id="radialGradient3569" - gradientUnits="userSpaceOnUse" - cy="1040.22" - cx="392.07401" - gradientTransform="matrix(1.0896219,1.2704115,-1.9939809,2.0570205,1844.3831,-1657.6391)" - r="161.42599"> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0" - id="stop14044" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0.930233" - id="stop14046" /> - <stop - stop-color="#FFF" - offset="1" - id="stop14048" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop14050" /> - </radialGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14916" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,157.40345,216.87796)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3477" - height="1.6959413" - width="1.9205891" - y="-0.34797066" - x="-0.46029457" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="49.010201" - id="feGaussianBlur13981" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14918" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.833046)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <filter - id="filter4565" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.9805913" - id="feGaussianBlur14062" /> - </filter> - <filter - id="filter4561" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.9841362" - id="feGaussianBlur14059" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14920" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.833046)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14922" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2470079,-0.1209477,0.13188103,0.26453007,181.38309,188.23573)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,130.97087,208.30525)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14926" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,132.39966,209.01966)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14928" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,137.40042,210.44847)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14930" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,138.11484,210.44847)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14932" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,138.82922,211.16283)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14934" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,146.68756,211.16283)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14936" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,146.68756,211.16283)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14938" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,151.68827,206.16207)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14940" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,134.54288,221.87873)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14942" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.3368278,-0.1594348,0.179837,0.34870689,146.68756,226.87948)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter4553" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="5.1794966" - id="feGaussianBlur14053" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14944" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2559465,6.9275158e-4,0.08590625,0.1470517,191.34259,114.22522)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14946" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2559465,6.9275158e-4,0.08590625,0.1470517,187.05624,110.65324)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14948" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2559465,6.9275158e-4,0.08590625,0.1470517,194.91453,119.22599)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14962" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3597" - height="1.4965283" - width="1.3348944" - y="-0.24826413" - x="-0.16744719" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5116686" - id="feGaussianBlur14002" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14950" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3553" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13993" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14952" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3561" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13999" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14954" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3541" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13984" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14956" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3557" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13996" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3549" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13990" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14960" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.108068,0,-5.950834)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <filter - id="filter3545" - height="1.213006" - width="1.1931673" - y="-0.10650298" - x="-0.096583642" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="4.5608848" - id="feGaussianBlur13987" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient2759" - id="radialGradient14964" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.4652465,0,0,0.4650091,127.42299,-365.17762)" - cx="346.733" - cy="1147.53" - r="254.041" /> - <radialGradient - id="radialGradient2759" - gradientUnits="userSpaceOnUse" - cy="1147.53" - cx="346.733" - gradientTransform="matrix(0.4652465,0,0,0.4650091,129.83888,-355.9606)" - r="254.041"> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0" - id="stop14026" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0.95" - id="stop14028" /> - <stop - stop-color="#FFF" - offset="0.97" - id="stop14030" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="0.991163" - id="stop14032" /> - <stop - stop-color="#FFF" - stop-opacity="0" - offset="1" - id="stop14034" /> - </radialGradient> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14966" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.8330458)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4583" - id="radialGradient14968" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.9523714,0,11.88305)" - spreadMethod="reflect" - cx="393.616" - cy="249.494" - r="123.491" /> - <linearGradient - id="linearGradient4583"> - <stop - stop-color="#e5f4ff" - offset="0" - id="stop13929" /> - <stop - stop-color="#e5f4ff" - offset="0.232558" - id="stop13931" /> - <stop - stop-color="#254863" - stop-opacity="0" - offset="1" - id="stop13933" /> - </linearGradient> - <filter - id="filter4779" - height="1.194832" - width="1.2056783" - y="-0.097415976" - x="-0.1028392" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="12.155829" - id="feGaussianBlur14077" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4583" - id="radialGradient14970" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.9523714,0,11.88305)" - spreadMethod="reflect" - cx="393.616" - cy="249.494" - r="123.491" /> - <filter - id="filter4775" - height="1.2794765" - width="1.2952752" - y="-0.13973826" - x="-0.14763759" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="17.444351" - id="feGaussianBlur14074" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient4589" - id="radialGradient14972" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9752836,-0.1739102,0.1452743,1.218352,-31.791146,3.8357559)" - spreadMethod="reflect" - cx="397.698" - cy="258.39999" - r="123.491" /> - <radialGradient - id="radialGradient4589" - spreadMethod="reflect" - gradientUnits="userSpaceOnUse" - cy="258.39999" - cx="397.698" - gradientTransform="matrix(0.9752836,-0.1739102,0.1452743,1.218352,-31.791146,3.8357559)" - r="123.491"> - <stop - stop-color="#e5f4ff" - offset="0" - id="stop14065" /> - <stop - stop-color="#e5f4ff" - stop-opacity="0" - offset="1" - id="stop14067" /> - </radialGradient> - <filter - id="filter4771" - height="1.3357642" - width="1.3744004" - y="-0.1678821" - x="-0.18720019" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="21.617094" - id="feGaussianBlur14071" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#radialGradient2765" - id="radialGradient14974" - gradientUnits="userSpaceOnUse" - cx="389.16699" - cy="118.281" - r="11.6067" /> - <radialGradient - id="radialGradient2765" - gradientUnits="userSpaceOnUse" - cy="118.281" - cx="389.16699" - r="11.6067"> - <stop - stop-color="#000" - offset="0" - id="stop14037" /> - <stop - stop-color="#000" - stop-opacity="0" - offset="1" - id="stop14039" /> - </radialGradient> - <filter - id="filter867" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.58082045" - id="feGaussianBlur865" /> - </filter> - <filter - id="filter5237" - height="1.3687129" - width="1.4370892" - y="-0.18435644" - x="-0.21854459" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="2.2711229" - id="feGaussianBlur13975" /> - </filter> - <filter - id="filter7267" - height="1.5740881" - width="1.6214931" - y="-0.28704402" - x="-0.31074658" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="3.3946442" - id="feGaussianBlur13978" /> - </filter> - <filter - id="filter10578" - height="1.3723973" - width="1.672163" - y="-0.18619864" - x="-0.33608148" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="2.7377865" - id="feGaussianBlur14087" /> - </filter> - <filter - id="filter877" - height="1.5740881" - width="1.6214931" - y="-0.28704402" - x="-0.31074658" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="3.3946442" - id="feGaussianBlur875" /> - </filter> - <filter - id="filter881" - height="1.5740881" - width="1.6214931" - y="-0.28704402" - x="-0.31074658" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="3.3946442" - id="feGaussianBlur879" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14976" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,1.0094295,2.4158933,11.986507)" - cx="439.41699" - cy="130.496" - r="50.388302" /> - <filter - id="filter4518" - height="1.3981317" - width="1.4018859" - y="-0.19906585" - x="-0.20094295" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="10.125173" - id="feGaussianBlur13966" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14978" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1,0,0,0.905759,0,23.51251)" - cx="393.616" - cy="249.494" - r="129.84599" /> - <filter - id="filter4666" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="6.3816907" - id="feGaussianBlur13972" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient17671" - id="radialGradient14980" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2439121,0.09045625,0.01157343,0.22207954,199.65928,35.986694)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14982" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2589117,0.0253009,0.06779441,0.21179523,180.2601,67.008377)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3800" - id="radialGradient14984" - gradientUnits="userSpaceOnUse" - cx="389.16699" - cy="118.281" - r="11.6067" /> - <filter - id="filter924" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.58082045" - id="feGaussianBlur922" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14986" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2589117,0.0253009,0.06779441,0.21179523,179.2956,73.975334)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient3800" - id="radialGradient14988" - gradientUnits="userSpaceOnUse" - cx="383.15201" - cy="119.385" - r="11.6067" /> - <filter - id="filter4636" - color-interpolation-filters="sRGB"> - <feGaussianBlur - stdDeviation="0.20104886" - id="feGaussianBlur14081" /> - </filter> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient7995" - id="radialGradient14990" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.9676712,0.01034974,-0.01036928,0.9694982,8.8365607,-6.8330458)" - cx="291.29099" - cy="176.998" - r="136.812" /> - <radialGradient - inkscape:collect="always" - xlink:href="#linearGradient4522" - id="radialGradient14992" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.2589117,0.0253009,0.06779441,0.21179523,205.2956,91.97533)" - spreadMethod="reflect" - cx="567.65002" - cy="55.065498" - r="38.5858" /> - </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4142136" - inkscape:cx="193.30341" - inkscape:cy="-34.29022" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:document-rotation="0" - showgrid="false" - units="px" - inkscape:window-width="1920" - inkscape:window-height="1017" - inkscape:window-x="-8" - inkscape:window-y="-8" - inkscape:window-maximized="1"> - <inkscape:grid - type="xygrid" - id="grid180" /> - </sodipodi:namedview> - <metadata - id="metadata5"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer2" - inkscape:label="Background Workstation" - style="display:inline"> - <image - width="109.24213" - height="19.044634" - preserveAspectRatio="none" - style="image-rendering:auto" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZ0AAABICAYAAAAtWyiKAAAABHNCSVQICAgIfAhkiAAAIABJREFU eJzVfWl6HDkPHsBqSfZ8uUiOk2vk9ElmbEm9FPKDBLEQXKpatufjM2N1cQFRXPACJMjC//m//jfB HwrU/GgexuUGD708TQ5qsuRnivigljtfvqHX0smkKU4NeY04GeTSzETvR53sOgGxX7fi/5cHWqkp ztEtZzoLoenXsO8HtIP8uvWom2/0csFYc+WaOsJ+kToQfAEAgD2IA0BDx9Lsj4wozQ82ymOL/Lsf HE+B8JAZlfs0R4y4LQGHLa0z9oRWTe48OD57PGHAD+a3QU5VPARk0M9b9ax/aXoEbroj1+rLY21d XzciAiBKNKKikbMjIEBCuLRs/76AsDS/F8OAEPrks5U2hA4HX/p5is+FHnhV0NUD6X [...] - id="image176" - x="9.000717e-06" - y="0.00075239962" /> - </g> - <g - inkscape:groupmode="layer" - id="g216" - inkscape:label="Background Server" - style="display:none;mix-blend-mode:normal"> - <image - width="109.27292" - height="19.049999" - preserveAspectRatio="none" - style="image-rendering:auto" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAZ0AAABICAYAAAAtWyiKAAAABHNCSVQICAgIfAhkiAAAGs1JREFU eJztXdtSK7kOdUKyYX/k/P8PzIYAgZyHKWWEWLrZcl84oyoqSbcty25bS0vubg5//fXXra0st1u/ CZG6VhntXPZ4lf5RvT1t9Ngyan+l9Npyu93a4XD4Vr/iGh8OB1dfz7zsOUfHuE0kn5+f6TYygsYW jfmo3mr9awhdH267vGboGlrnUXl+jMZKq6e1FymPvh8Oh3Yye7CALDE59joJlxDPIXqTfG1ZArw9 kfMrAjizRNpSGXBlBDky0tsL6to6Hg0alhILTOT5qD5rfXIQi5TT2pDlLGDRgGZToLNVQJgZje1J ttyHGbaNsJwMQPc6/F4GZJXnTqlqTGesnwjgzBTPeXt1K21A146LdT21gMBjN5Yg5i [...] - id="image1347" - x="-0.030783236" - y="-0.004612972" - inkscape:export-filename=".\reactos.png" - inkscape:export-xdpi="96" - inkscape:export-ydpi="96" /> - </g> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="Logo Flat" - style="display:none"> - <g - style="fill:#ffffff;fill-opacity:1" - id="layer1-2" - transform="matrix(0.03621285,-2.8986198e-5,2.8986198e-5,0.03643691,-0.34875272,-9.5267738)"> - <g - style="fill:#ffffff;fill-opacity:1" - id="g5951" - transform="matrix(4.7811132,0,0,4.7811132,-80.056681,-4146.679)"> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="rect5844" - clip-path="url(#clipPath5851-8)" - transform="translate(0,910.62991)" - d="m 30.90625,30.78125 v 74.28125 h 80.625 V 30.78125 Z m 70,6.90625 c 1.65415,0.468885 3.03874,1.278331 4.125,2.4375 4.53076,4.834816 2.50248,14.697373 -4.25,25.59375 0.0794,0.891468 0.125,1.806031 0.125,2.71875 0,3.994823 -0.77287,7.795485 -2.1875,11.28125 v -2.5 c 0.873252,-2.77007 1.34375,-5.722186 1.34375,-8.78125 0,-0.502872 -0.0374,-1.003316 -0.0625,-1.5 -1.924954,2.972465 -4.175511,6.006582 -6.75,9.03125 H 81.53125 c 14.084231,-14.069184 21.8079,-29.622248 19.375,-38.2 [...] - inkscape:connector-curvature="0" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="path4850" - transform="translate(0,910.62991)" - d="m 70.875,39.21875 c -11.274354,0 -21.070517,6.395096 -25.9375,15.75 -0.0042,0.0081 0.0042,0.02317 0,0.03125 0.07754,0.153219 0.170333,0.314865 0.25,0.46875 0.189002,0.364736 0.392934,0.725451 0.59375,1.09375 0.385013,0.706117 0.791088,1.407542 1.21875,2.125 0.516928,0.867214 1.047412,1.74494 1.625,2.625 0.154507,0.235419 0.309984,0.482596 0.46875,0.71875 0.504797,0.750853 1.04663,1.49337 1.59375,2.25 0.597456,0.8257 1.197122,1.63927 1.84375,2.46875 0.558756,0.717849 1.15552 [...] - inkscape:connector-curvature="0" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="rect5820" - clip-path="url(#clipPath5827-4)" - transform="translate(0,910.62991)" - d="m 30.90625,30.78125 v 74.28125 h 80.625 V 30.78125 Z M 41.375,37.6875 c -2.574058,9.154336 6.161768,26.020861 21.8125,40.6875 15.281157,14.319459 32.235311,21.93527 41.375,19.34375 -0.39394,1.402094 -1.05856,2.65164 -2,3.65625 -7.088395,7.5642 -27.453878,-0.0271 -45.5,-16.9375 -6.340271,-5.941601 -11.529171,-12.245336 -15.3125,-18.25 -0.05634,0.740037 -0.09375,1.495693 -0.09375,2.25 0,3.059064 0.47232,6.01118 1.34375,8.78125 v 2.4375 c -1.401864,-3.469359 -2.1875,-7.247022 [...] - inkscape:connector-curvature="0" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="path5823" - clip-path="url(#clipPath5835-0)" - transform="translate(0,910.62991)" - d="m 30.90625,30.78125 v 74.28125 h 80.625 V 30.78125 Z M 41.375,37.6875 c -2.574058,9.154336 6.161768,26.020861 21.8125,40.6875 15.281157,14.319459 32.235311,21.93527 41.375,19.34375 -0.39394,1.402094 -1.05856,2.65164 -2,3.65625 -7.088395,7.5642 -27.453878,-0.0271 -45.5,-16.9375 -6.340271,-5.941601 -11.529171,-12.245336 -15.3125,-18.25 -0.05634,0.740037 -0.09375,1.495693 -0.09375,2.25 0,3.059064 0.47232,6.01118 1.34375,8.78125 v 2.4375 c -1.401864,-3.469359 -2.1875,-7.247022 [...] - inkscape:connector-curvature="0" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke:none" - id="path5847" - clip-path="url(#clipPath5859-0)" - transform="translate(0,910.62991)" - d="m 30.90625,30.78125 v 74.28125 h 80.625 V 30.78125 Z m 70,6.90625 c 1.65415,0.468885 3.03874,1.278331 4.125,2.4375 4.53076,4.834816 2.50248,14.697373 -4.25,25.59375 0.0794,0.891468 0.125,1.806031 0.125,2.71875 0,3.994823 -0.77287,7.795485 -2.1875,11.28125 v -2.5 c 0.873252,-2.77007 1.34375,-5.722186 1.34375,-8.78125 0,-0.502872 -0.0374,-1.003316 -0.0625,-1.5 -1.924954,2.972465 -4.175511,6.006582 -6.75,9.03125 H 81.53125 c 14.084231,-14.069184 21.8079,-29.622248 19.375,-38.2 [...] - inkscape:connector-curvature="0" /> - </g> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer1" - inkscape:label="Logo Normal" - style="display:inline"> - <g - id="g14791" - transform="matrix(0.04635833,0,0,0.04635833,-4.1501759,2.3272777)"> - <g - id="g14711"> - <g - id="g14632"> - <g - id="g14554"> - <path - style="opacity:0.3;fill:url(#radialGradient14872);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14101" - d="m 386.64071,183.59775 c 0,62.56097 -50.62472,113.27685 -113.07315,113.27685 -62.44877,0 -113.07315,-50.71569 -113.07315,-113.27685 0,-62.56098 50.62473,-113.276856 113.07315,-113.276856 62.44878,0 113.07315,50.715686 113.07315,113.276856 z" /> - <path - style="fill:#244762;fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14103" - d="m 401.94096,167.78741 c 0,62.56097 -50.62472,113.27685 -113.07315,113.27685 -62.44877,0 -113.07315,-50.71569 -113.07315,-113.27685 0,-62.56098 50.62473,-113.276856 113.07315,-113.276856 62.44878,0 113.07315,50.715686 113.07315,113.276856 z" /> - <path - style="fill:url(#radialGradient14874);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14105" - d="m 177.43211,148.56198 c -2.648,15.347 -2.047,30.515 1.257,44.795 0.632,2.734 1.358,5.434 2.187,8.098 0.003,0.007 -0.002,0.017 0,0.024 0.275,0.882 0.565,1.755 0.861,2.629 0.583,1.72 1.199,3.411 1.862,5.096 0.013,0.033 0.034,0.061 0.047,0.093 0.009,0.023 0.014,0.047 0.023,0.07 0.647,1.639 1.326,3.283 2.048,4.887 0.021,0.047 0.048,0.093 0.069,0.14 0.353,0.78 0.701,1.555 1.071,2.327 0.027,0.056 0.066,0.106 0.093,0.163 0.374,0.777 0.749,1.558 1.14,2.327 0.191,0.374 0.387,0.7 [...] - <path - style="fill:url(#linearGradient14876);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14107" - d="m 401.94111,167.78698 c 0.273,21.378 -6.183,42.928 -18.113,61.405 -5.965,9.239 -13.299,17.709 -21.844,25.005 -21.015,-0.527 -35.043,-9.597 -36.802,-14.473 27.237,-25.009 47.426,-57.083 40.464,-67.826 4.648,-12.087 12.152,-24.235 18.157,-33.398 l 9.536,-14.552 c 5.954,13.673 8.652,29.467 8.602,43.839 z" /> - <path - style="fill:url(#radialGradient14878);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14109" - d="m 383.83829,132.07019 c 2.70931,7.86826 -1.63804,14.2167 -9.71011,14.17964 -8.07204,-0.0371 -16.81209,-6.44561 -19.5214,-14.31387 -2.70931,-7.86825 1.63803,-14.21669 9.71011,-14.17963 8.07204,0.0371 16.81209,6.44561 19.5214,14.31386 z" /> - <path - style="fill:url(#radialGradient14880);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14111" - d="m 378.1231,130.64139 c 2.70931,7.86826 -1.63804,14.2167 -9.71011,14.17964 -8.07204,-0.0371 -16.81209,-6.44561 -19.5214,-14.31387 -2.70931,-7.86825 1.63803,-14.21669 9.71011,-14.17963 8.07204,0.0371 16.81209,6.44561 19.5214,14.31386 z" /> - <path - style="fill:url(#radialGradient14882);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14113" - d="m 387.41025,127.7838 c 2.70931,7.86826 -1.63804,14.2167 -9.71011,14.17964 -8.07204,-0.0371 -16.81209,-6.44561 -19.5214,-14.31387 -2.70931,-7.86825 1.63803,-14.21669 9.71011,-14.17963 8.07204,0.0371 16.81209,6.44561 19.5214,14.31386 z" /> - <path - style="fill:url(#radialGradient14884);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14115" - d="m 381.50493,148.71167 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14886);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14117" - d="m 340.64679,177.72406 c 0,43.79486 -34.54324,79.29769 -77.15465,79.29769 -42.61124,0 -77.15465,-35.50276 -77.15465,-79.29769 0,-43.79487 34.54323,-79.297694 77.15465,-79.297694 42.61123,0 77.15465,35.502754 77.15465,79.297694 z" /> - <path - style="fill:url(#radialGradient14888);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14119" - d="m 285.61311,123.99298 c -34.911,0.444 -71.534,8.966 -90.647,27.066 -28.154,17.044 -22.137,53.377 8.32,90.792 24.531,28.479 60.278,41.31 89.816,39.023 35.291,-0.61 64.172,-19.448 78.914,-36.353 28.279,-28.418 34.913,-66.031 1.746,-93.022 -20.566,-17.153 -53.638,-28.31 -88.149,-27.506 z" /> - <path - style="opacity:0.54;fill:url(#radialGradient14890);fill-rule:nonzero;filter:url(#filter4546)" - inkscape:connector-curvature="0" - id="path14121" - transform="matrix(0.9084705,0,0,0.8208641,-13.151197,139.00274)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="opacity:0.54;fill:url(#radialGradient14892);fill-rule:nonzero;filter:url(#filter4640)" - inkscape:connector-curvature="0" - id="path14123" - transform="matrix(1.6462774,0,0,1.3808083,-293.20685,67.795565)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="opacity:0.44086;fill:url(#radialGradient14894);fill-rule:nonzero;filter:url(#filter4546)" - inkscape:connector-curvature="0" - id="path14125" - transform="matrix(0.6707658,0,0,0.7085892,44.960235,176.18764)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="fill:url(#radialGradient14896);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14127" - d="m 193.18911,69.848678 c -12.513,12.2709 -22.692,26.9313 -29.793,43.252302 -3.55,8.161 -6.331,16.737 -8.25,25.636 -0.479,2.225 -0.905,4.471 -1.276,6.735 l 23.406,3.871 c 0.306,-1.871 0.658,-3.727 1.055,-5.566 1.586,-7.355 3.886,-14.443 6.821,-21.187 5.871,-13.489 14.286,-25.606002 24.631,-35.748202" /> - <path - style="fill:url(#radialGradient14898);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14129" - d="m 349.21953,192.012 c 0,43.79486 -34.54324,79.29769 -77.15465,79.29769 -42.61124,0 -77.15465,-35.50276 -77.15465,-79.29769 0,-43.79487 34.54323,-79.29769 77.15465,-79.29769 42.61123,0 77.15465,35.50275 77.15465,79.29769 z" /> - <path - style="fill:url(#radialGradient14900);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14131" - d="m 384.56111,265.71398 c -25.027,24.542 -59.392,39.526 -97.152,39.122 -37.76,-0.404 -71.797,-16.12 -96.293,-41.191 l 16.954,-16.635 c 20.251,20.722 48.387,33.712 79.593,34.046 31.207,0.334 59.607,-12.051 80.288,-32.335" /> - <path - style="fill:url(#radialGradient14902);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14133" - d="m 319.57205,198.79874 c 0,33.53662 -27.9864,60.72347 -62.50952,60.72347 -34.52298,0 -62.50953,-27.1868 -62.50953,-60.72347 0,-33.53661 27.9864,-60.72346 62.50953,-60.72346 34.52298,0 62.50952,27.1868 62.50952,60.72346 z" /> - <path - style="fill:#fefefe;fill-rule:evenodd;filter:url(#filter4557)" - inkscape:connector-curvature="0" - id="path14135" - transform="matrix(0.5254279,0,0,0.5254279,94.180977,-38.736991)" - d="m 206.094,151.844 c -4.551,-0.115 -9.198,-0.093 -14.094,0.031 -25.13,0.358 -45.045,7.174 -59.562,22.781 -14.184,15.249 -20.164,36.308 -19.313,60.375 0.851,24.06 8.372,51.394 21.531,80.657 26.319,58.525 75.331,124.869 141.188,186.437 65.848,61.56 133.996,105.077 193.094,126.75 29.548,10.836 56.842,16.236 80.687,15.437 23.849,-0.798 44.435,-7.93 59.25,-22.374 19.085,-18.609 24.481,-47.922 18.875,-81.938 -5.58,-33.861 -19.179,-66.817 -42.594,-108 -4.512,11.409 -6.162,17.84 [...] - <path - style="fill:url(#radialGradient14904);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14137" - d="m 384.11875,157.27325 c 13.83,8.7065 15.65335,26.99978 4.07257,40.85914 -11.58081,13.85939 -32.18032,18.03657 -46.01032,9.33006 -13.82999,-8.7065 -15.65335,-26.99977 -4.07257,-40.85913 11.58078,-13.85936 32.18032,-18.03658 46.01032,-9.33007 z" /> - <path - style="fill:url(#radialGradient14906);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14139" - d="m 385.52574,145.32553 c 14.19005,8.10643 16.79488,26.30486 5.81804,40.6473 -10.97686,14.34248 -31.37866,19.39773 -45.56871,11.2913 -14.19006,-8.10644 -16.79489,-26.30487 -5.81805,-40.64731 10.97684,-14.34244 31.37866,-19.39773 45.56872,-11.29129 z" /> - <path - style="fill:url(#radialGradient14908);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14141" - d="m 389.72608,178.70503 c 3.11261,16.04319 -8.98128,29.88899 -27.01244,30.92544 -18.0312,1.03646 -35.17157,-11.12892 -38.28418,-27.1721 -3.1126,-16.04318 8.98129,-29.88898 27.01245,-30.92543 18.03115,-1.03646 35.17157,11.12891 38.28417,27.17209 z" /> - <path - style="fill:url(#radialGradient14910);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14143" - d="m 376.7147,155.79394 c 12.62316,7.94048 8.78687,19.71834 -8.5686,26.30657 -17.3555,6.58824 -41.65796,5.49201 -54.28112,-2.44847 -12.62316,-7.94047 -8.78687,-19.71833 8.56859,-26.30656 17.35546,-6.58824 41.65797,-5.49202 54.28113,2.44846 z" /> - <path - style="fill:url(#radialGradient14912);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14145" - d="m 396.03965,137.92057 c 3.49369,19.29015 -9.51865,38.35562 -29.06397,42.5839 -19.54524,4.22827 -38.22206,-7.98178 -41.71576,-27.27195 -3.4937,-19.29015 9.51864,-38.35562 29.06396,-42.58391 19.54524,-4.22827 38.22207,7.98178 41.71577,27.27196 z" /> - <path - style="fill:url(#radialGradient14914);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14147" - d="m 366.93829,205.48242 c -37.43468,50.08487 -95.8923,90.40593 -145.88704,53.03861 -49.9953,-37.36775 -60.18908,-108.34361 -22.7544,-158.42848 37.43468,-50.084871 108.39209,-60.406301 158.38739,-23.038558 49.99473,37.367318 47.68873,78.343558 10.25405,128.428428 z" /> - <path - style="fill:url(#radialGradient14916);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14149" - d="m 371.50341,139.42457 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="opacity:0.243728;fill:#ffffff;fill-rule:nonzero;filter:url(#filter3477)" - inkscape:connector-curvature="0" - id="path14151" - transform="matrix(0.103755,-0.1361663,0.1102656,0.08322799,142.63279,147.27052)" - d="m 517.107,249.494 c 0,64.9536 -55.2886,117.609 -123.491,117.609 -68.202,0 -123.491,-52.6553 -123.491,-117.609 0,-64.9536 55.2886,-117.609 123.491,-117.609 68.202,0 123.491,52.6553 123.491,117.609 z" /> - <path - style="fill:url(#radialGradient14918);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14153" - d="m 386.63411,71.917678 c 12.247,12.5358 22.11,27.4103 28.86,43.880302 3.375,8.234 5.972,16.867 7.7,25.806 0.432,2.235 0.81,4.489 1.132,6.76 l -23.514,3.37 c -0.266,-1.877 -0.578,-3.74 -0.935,-5.587 -1.428,-7.388 -3.574,-14.523 -6.363,-21.329 -5.578,-13.611 -13.728,-25.905002 -23.85,-36.266102" /> - <path - style="fill:#ffffff;fill-rule:evenodd;filter:url(#filter4565)" - inkscape:connector-curvature="0" - id="path14155" - transform="matrix(0.5254279,0,0,0.5254279,94.180977,-38.736991)" - d="m 549.219,152.562 c -45.924,-0.368 -76.818,14.551 -116.813,32.25 6.99,2.161 9.936,4.095 14.865,7.143 37.78,-15.319 58.387,-22.339 88.01,-24.986 29.69,-2.653 54.059,1.909 66.563,17.5 20.711,25.825 18.925,69.324 -5.438,123.625 -24.362,54.3 -70.909,118.596 -136.718,184.344 -10.032,10.022 -20.968,19.001 -31.75,27.968 -1.089,0.887 -1.769,2.197 -1.844,3.594 -0.075,1.397 0.421,2.784 1.437,3.812 0.761,0.775 1.444,1.445 2,2.094 1.759,2.076 4.901,2.356 7,0.625 h 0.031 c 10.758,-8 [...] - <path - style="fill:#5f5f5f;fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14157" - d="m 178.15611,190.99998 c -0.067,-0.085 -0.172,-0.132 -0.281,-0.125 -0.087,0.011 -0.165,0.056 -0.219,0.125 -0.011,0.01 -0.021,0.02 -0.031,0.031 -12.93,20.669 -21.381,40.553 -24.344,57.719 -2.962,17.166 -0.436,31.651 8.719,41.469 10.058,10.786 27.201,13.749 48.156,10.187 20.955,-3.561 45.756,-13.644 71.25,-29.031 0.086,-0.048 0.138,-0.122 0.156,-0.219 0.018,-0.096 10e-4,-0.205 -0.062,-0.281 -0.018,-0.024 -0.039,-0.045 -0.063,-0.062 -0.547,-0.347 -0.788,-0.765 -1.406,-1.219 [...] - <path - style="fill:#ffffff;fill-rule:evenodd;filter:url(#filter4561)" - inkscape:connector-curvature="0" - id="path14159" - transform="matrix(0.5254279,0,0,0.5254279,94.180977,-38.736991)" - d="m 522.062,122.875 c -62.128,-0.544 -104.066,27.998 -155.325,53.966 11.806,-1.283 15.132,-1.338 21.042,1.561 48.559,-23.414 69.324,-32.201 104.783,-38.027 35.121,-5.771 64.809,1.252 77.813,15.344 11.105,12.034 16.205,29.149 15.375,50.75 -0.83,21.594 -7.739,47.393 -20.219,75.375 C 540.572,337.808 493.404,402.468 430,461.594 418.137,472.656 406.148,483.12 394.094,493 c -1.313,1.062 -2.136,2.659 -2.219,4.406 -0.083,1.747 0.575,3.414 1.813,4.625 0.744,0.734 1.406,1.401 1.968 [...] - <path - style="fill:#5f5f5f;fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14161" - d="m 372.37511,23.374978 c -33.123,-0.2902 -61.637,15.1597 -89.125,30.9688 -0.11,0.0704 -0.152,0.1874 -0.156,0.3125 1.69,-0.0855 3.384,-0.1461 5.093,-0.1563 24.512,-14.6947 47.928,-24.1436 67.594,-27.375 19.836,-3.2592 36.988,0.3617 45.219,9.2813 6.716,7.2781 9.662,17.5267 9.187,29.875 -0.474,12.3483 -4.374,26.7847 -11.312,42.343702 -13.876,31.118 -39.925,66.752 -74.875,99.344 -6.539,6.097 -13.136,11.865 -19.781,17.312 -0.091,0.07 -0.151,0.167 -0.157,0.282 -0.006,0.114 0.0 [...] - <path - style="fill:url(#radialGradient14920);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14163" - d="m 177.27611,149.34298 c -0.306,1.871 -0.567,3.758 -0.78,5.659 -0.427,3.802 -0.667,7.662 -0.708,11.57 -0.335,31.262 12.031,59.717 32.282,80.438 l -16.954,16.635 c -24.496,-25.072 -39.45,-59.499 -39.046,-97.327 0.051,-4.728 0.34,-9.399 0.857,-13.999 0.258,-2.3 0.573,-4.583 0.943,-6.847" /> - <path - style="fill:url(#radialGradient14922);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14165" - d="m 338.39027,129.47937 c 2.81043,5.63722 0.82157,12.29652 -4.44226,14.87397 -5.26382,2.57743 -11.80931,0.097 -14.61974,-5.54025 -2.81043,-5.63722 -0.82157,-12.29652 4.44226,-14.87397 5.26382,-2.57743 11.80931,-0.097 14.61974,5.54025 z" /> - <path - style="fill:url(#radialGradient14924);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14167" - d="m 345.07083,130.85186 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14926);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14169" - d="m 346.49962,131.56627 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14928);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14171" - d="m 351.50038,132.99508 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14930);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14173" - d="m 352.2148,132.99508 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14932);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14175" - d="m 352.92918,133.70944 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14934);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14177" - d="m 360.78752,133.70944 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14936);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14179" - d="m 360.78752,133.70944 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14938);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14181" - d="m 365.78823,128.70868 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14940);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14183" - d="m 348.64284,144.42534 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:url(#radialGradient14942);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14185" - d="m 360.78752,149.42609 c 3.83238,7.43106 1.12032,16.20944 -6.05762,19.60706 -7.1779,3.3976 -16.10354,0.12784 -19.93592,-7.30322 -3.83239,-7.43106 -1.12032,-16.20944 6.05761,-19.60706 7.1779,-3.3976 16.10354,-0.12784 19.93593,7.30322 z" /> - <path - style="fill:#5f5f5f;fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14187" - d="m 195.15611,38.968778 c -1.318,-0.0187 -2.626,-0.0021 -3.937,0.0312 -13.205,0.1852 -23.462,3.6045 -30.719,11.4063 -7.04,7.5688 -9.631,18.0981 -9.188,30.6562 0.444,12.5585 4.393,27.137502 11.469,42.875502 14.153,31.474 40.758,67.525 76.531,100.968 35.773,33.444 72.766,57.04 104.532,68.688 15.883,5.824 30.479,8.667 42.937,8.25 12.458,-0.418 23.289,-4.099 30.688,-11.313 9.412,-9.176 11.842,-23.929 8.875,-41.906 -2.967,-17.977 -11.825,-39.18 -25.969,-61.375 -0.016,-0.025 -0 [...] - <path - style="fill:#ffffff;fill-rule:evenodd;filter:url(#filter4553)" - inkscape:connector-curvature="0" - id="path14189" - transform="matrix(0.5044108,0,0,0.5044108,102.60339,-30.983744)" - d="m 215,111.75 c -26.659,0.124 -47.616,7.22 -62.875,23.625 -14.689,15.792 -20.986,37.703 -20.187,62.813 0.798,25.1 8.491,53.677 22.062,84.281 27.143,61.208 77.97,130.624 146.562,194.75 68.581,64.115 140.561,109.966 202.75,132.719 31.095,11.376 59.749,17.005 84.563,16 24.824,-1.006 46.047,-8.852 60.719,-24.626 22.216,-23.884 26.001,-60.305 15,-102.312 -5.5,-21 -14.66,-43.613 -27.282,-67.281 -6.312,-11.838 -13.501,-23.892 -21.5,-36.188 -3.998,-6.147 -8.211,-12.352 -12.624,- [...] - <path - style="fill:url(#radialGradient14944);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14191" - d="m 351.23705,122.74267 c 1.83069,3.13372 -1.10682,5.66214 -6.56114,5.64738 -5.4543,-0.0148 -11.35997,-2.56712 -13.19066,-5.70084 -1.83069,-3.13372 1.10681,-5.66214 6.56114,-5.64738 5.45429,0.0148 11.35997,2.56712 13.19066,5.70084 z" /> - <path - style="fill:#5f5f5f;fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14193" - d="m 207.15611,23.156278 c -13.468,0.0627 -23.865,3.5001 -31.219,11.4062 -7.028,7.5564 -10.121,18.1054 -9.718,30.7188 0.402,12.6133 4.798,27.2767 11.812,43.093702 14.029,31.634 40.507,67.867 76.281,101.313 35.775,33.444 73.318,57.308 105.438,69.062 16.06,5.877 30.765,8.723 43.219,8.219 12.453,-0.504 23.659,-4.382 30.687,-11.938 10.696,-11.498 11.748,-29.279 6.125,-50.75 -5.623,-21.471 -18.933,-46.644 -39,-72.937 -0.009,-0.011 -0.02,-0.021 -0.031,-0.031 0.239,1.64 0.426,3.3 [...] - <path - style="fill:url(#radialGradient14946);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14195" - d="m 346.9507,119.17069 c 1.83069,3.13372 -1.10682,5.66214 -6.56114,5.64738 -5.4543,-0.0148 -11.35997,-2.56712 -13.19066,-5.70084 -1.83069,-3.13372 1.10681,-5.66214 6.56114,-5.64738 5.45429,0.0148 11.35997,2.56712 13.19066,5.70084 z" /> - <path - style="fill:url(#radialGradient14948);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14197" - d="m 354.80899,127.74344 c 1.83069,3.13372 -1.10682,5.66214 -6.56114,5.64738 -5.4543,-0.0148 -11.35997,-2.56712 -13.19066,-5.70084 -1.83069,-3.13372 1.10681,-5.66214 6.56114,-5.64738 5.45429,0.0148 11.35997,2.56712 13.19066,5.70084 z" /> - <g - style="fill:url(#radialGradient14962);fill-rule:nonzero;filter:url(#filter3597)" - id="g14199" - transform="matrix(0.7446541,0,0,0.7446541,-5.6199996,-8.4660712)"> - <path - style="opacity:0.5;fill:url(#radialGradient14950);filter:url(#filter3553)" - inkscape:connector-curvature="0" - id="path14201" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,261.76396,156.22963)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - <path - style="opacity:0.5;fill:url(#radialGradient14952);filter:url(#filter3561)" - inkscape:connector-curvature="0" - id="path14203" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,259.36548,160.06718)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - <path - style="opacity:0.5;fill:url(#radialGradient14954);filter:url(#filter3541)" - inkscape:connector-curvature="0" - id="path14205" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,248.81246,154.31096)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - <path - style="opacity:0.5;fill:url(#radialGradient14956);filter:url(#filter3557)" - inkscape:connector-curvature="0" - id="path14207" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,242.09691,146.63608)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - <path - style="opacity:0.5;fill:url(#radialGradient14958);filter:url(#filter3549)" - inkscape:connector-curvature="0" - id="path14209" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,251.6906,151.43289)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - <path - style="opacity:0.5;fill:url(#radialGradient14960);filter:url(#filter3545)" - inkscape:connector-curvature="0" - id="path14211" - transform="matrix(0.3437119,9.3029973e-4,0.1041127,0.1782169,267.9997,167.74206)" - d="m 606.236,55.0655 c 0,23.6133 -17.2754,42.7557 -38.5858,42.7557 -21.3103,0 -38.5858,-19.1424 -38.5858,-42.7557 0,-23.6133 17.2754,-42.7557 38.5858,-42.7557 21.3103,0 38.5858,19.1424 38.5858,42.7557 z" /> - </g> - <path - style="fill:url(#radialGradient14964);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14213" - d="m 337.04611,118.73998 c -0.107,-0.11 -0.213,-0.225 -0.32,-0.334 z" /> - <path - inkscape:connector-curvature="0" - id="path14215" - d="m 424.31211,148.37498 -22.468,3.188 c -0.295,0.467 -0.576,0.937 -0.875,1.406 0.191,1.47 0.365,2.95 0.5,4.437 0.345,3.811 0.51,7.686 0.468,11.594 -0.334,31.263 -13.318,59.435 -34,79.719 l 16.625,17 c 25.027,-24.542 40.721,-58.641 41.125,-96.469 0.051,-4.728 -0.144,-9.421 -0.562,-14.031 -0.209,-2.306 -0.491,-4.573 -0.813,-6.844 z" - style="color:#000000;fill:url(#radialGradient14966);fill-rule:evenodd;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> - <path - style="fill:url(#radialGradient14968);fill-rule:nonzero;filter:url(#filter4779)" - inkscape:connector-curvature="0" - id="path14251" - transform="matrix(0.2659517,-0.135874,0.1166617,0.2234081,111.7068,88.78124)" - d="m 517.107,249.494 c 0,64.9536 -55.2886,117.609 -123.491,117.609 -68.202,0 -123.491,-52.6553 -123.491,-117.609 0,-64.9536 55.2886,-117.609 123.491,-117.609 68.202,0 123.491,52.6553 123.491,117.609 z" /> - <path - style="fill:url(#radialGradient14970);fill-rule:nonzero;filter:url(#filter4775)" - inkscape:connector-curvature="0" - id="path14253" - transform="matrix(0.1851454,-0.09477304,0.08121552,0.155829,146.47583,83.308669)" - d="m 517.107,249.494 c 0,64.9536 -55.2886,117.609 -123.491,117.609 -68.202,0 -123.491,-52.6553 -123.491,-117.609 0,-64.9536 55.2886,-117.609 123.491,-117.609 68.202,0 123.491,52.6553 123.491,117.609 z" /> - <path - style="fill:url(#radialGradient14972);fill-rule:nonzero;filter:url(#filter4771)" - inkscape:connector-curvature="0" - id="path14255" - transform="matrix(0.1179718,-0.1725887,0.1434543,0.06711177,157.94973,134.92193)" - d="m 517.107,249.494 c 0,64.9536 -55.2886,117.609 -123.491,117.609 -68.202,0 -123.491,-52.6553 -123.491,-117.609 0,-64.9536 55.2886,-117.609 123.491,-117.609 68.202,0 123.491,52.6553 123.491,117.609 z" /> - <path - style="opacity:0.2;fill:url(#radialGradient14974);fill-rule:nonzero;filter:url(#filter4546)" - inkscape:connector-curvature="0" - id="path14257" - transform="matrix(1.1169813,0,0,1.0293749,-155.07347,-38.075782)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="opacity:0.1;fill:#ffffff;fill-rule:nonzero;filter:url(#filter5237)" - inkscape:connector-curvature="0" - id="path14259" - transform="matrix(0.618684,-0.4144155,0.4144155,0.618684,-97.499035,153.53333)" - d="m 299.727,293.747 c 0,7.54143 -3.82096,13.655 -8.53436,13.655 -4.71339,0 -8.53436,-6.11354 -8.53436,-13.655 0,-7.54143 3.82097,-13.655 8.53436,-13.655 3.51268,0 6.66658,3.44365 7.94709,8.67719" /> - <path - style="fill:#d9dfe4;fill-rule:nonzero;filter:url(#filter7267)" - inkscape:connector-curvature="0" - id="path14261" - transform="matrix(0.5373899,-0.3110615,0.3599617,0.464386,1.1219564,209.6636)" - d="m 299.727,293.747 c 0,7.54143 -3.82096,13.655 -8.53436,13.655 -4.71339,0 -8.53436,-6.11354 -8.53436,-13.655 0,-7.54143 3.82097,-13.655 8.53436,-13.655 3.51268,0 6.66658,3.44365 7.94709,8.67719" /> - <path - style="fill:#a3b1be;fill-rule:nonzero;filter:url(#filter10578)" - inkscape:connector-curvature="0" - id="path14263" - transform="matrix(-0.4164211,0.3397726,-0.2799645,-0.3389628,483.78347,268.5947)" - d="m 299.962,293.747 c 0,7.54143 -3.92637,13.655 -8.76979,13.655 -4.84342,0 -8.76979,-6.11354 -8.76979,-13.655 0,-7.54143 3.92637,-13.655 8.76979,-13.655 3.60958,0 6.85048,3.44365 8.16632,8.67719" /> - <path - style="fill:#e1e6ea;fill-rule:nonzero;filter:url(#filter7267)" - inkscape:connector-curvature="0" - id="path14265" - transform="matrix(0.3951251,-0.2077075,0.2646681,0.3100882,111.76492,195.53372)" - d="m 299.727,293.747 c 0,7.54143 -3.82096,13.655 -8.53436,13.655 -4.71339,0 -8.53436,-6.11354 -8.53436,-13.655 0,-7.54143 3.82097,-13.655 8.53436,-13.655 3.51268,0 6.66658,3.44365 7.94709,8.67719" /> - <path - style="fill:#a2b1be;fill-rule:nonzero;filter:url(#filter7267)" - inkscape:connector-curvature="0" - id="path14267" - transform="matrix(0.3857728,-0.1685415,0.2584035,0.2516172,133.20022,215.58925)" - d="m 299.727,293.747 c 0,7.54143 -3.82096,13.655 -8.53436,13.655 -4.71339,0 -8.53436,-6.11354 -8.53436,-13.655 0,-7.54143 3.82097,-13.655 8.53436,-13.655 3.51268,0 6.66658,3.44365 7.94709,8.67719" /> - <path - style="opacity:0.360896;fill:url(#radialGradient14976);fill-rule:nonzero;filter:url(#filter4518)" - inkscape:connector-curvature="0" - id="path14269" - transform="matrix(0.7446541,0,0,0.7446541,-2.6413836,-8.4660712)" - d="m 413.041,92.8733 c -11.659,0.38 -20.677,5.4231 -21.531,12.8747 -0.732,6.383 4.742,12.87 13.343,17 -7.268,9.529 -10.746,21.619 -8.687,34 4.122,24.793 28.842,41.439 55.187,37.157 26.345,-4.283 44.404,-27.895 40.282,-52.688 -3.771,-22.677 -24.783,-38.516 -48.5,-37.781 -4.656,-4.8142 -12.477,-8.6761 -21.657,-10.0627 -2.903,-0.4386 -5.747,-0.5877 -8.437,-0.5 z" /> - <path - style="fill:url(#radialGradient14978);fill-rule:nonzero;filter:url(#filter4666)" - inkscape:connector-curvature="0" - id="path14271" - transform="matrix(0.2183368,0.1682831,-0.1130197,0.1827096,290.88285,-0.4171712)" - d="m 523.462,249.494 c 0,64.9536 -58.1339,117.609 -129.846,117.609 -71.7118,0 -129.846,-52.6553 -129.846,-117.609 0,-64.9536 58.1339,-117.609 129.846,-117.609 71.7118,0 129.846,52.6553 129.846,117.609 z" /> - <path - style="fill:url(#radialGradient14980);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14273" - d="m 348.16487,103.05345 c 0.24663,4.73259 -3.76711,7.00645 -8.96498,5.0788 -5.19784,-1.92765 -9.61148,-7.32686 -9.85811,-12.05945 -0.24663,-4.73259 3.76711,-7.006451 8.96497,-5.078792 5.19784,1.927649 9.61148,7.326856 9.85812,12.059442 z" /> - <path - style="opacity:0.2;fill:url(#radialGradient14982);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14275" - d="m 340.95483,94.009307 c 1.44472,4.513427 -1.8569,7.735203 -7.37441,7.196033 -5.51749,-0.53917 -11.1615,-4.635117 -12.60622,-9.148544 -1.44472,-4.513427 1.8569,-7.735207 7.37441,-7.196035 5.51749,0.53917 11.1615,4.635119 12.60622,9.148546 z" /> - <path - style="opacity:0.44086;fill:url(#radialGradient14984);fill-rule:nonzero;filter:url(#filter4546)" - inkscape:connector-curvature="0" - id="path14277" - transform="matrix(0.6707658,0,0,0.7085892,116.43563,138.72595)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="opacity:0.2;fill:url(#radialGradient14986);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14279" - d="m 339.99033,100.97626 c 1.44472,4.51343 -1.8569,7.73521 -7.37441,7.19604 -5.51749,-0.53917 -11.1615,-4.63512 -12.60622,-9.148547 -1.44472,-4.513427 1.8569,-7.735207 7.37441,-7.196035 5.51749,0.53917 11.1615,4.635119 12.60622,9.148542 z" /> - <path - style="opacity:0.54;fill:url(#radialGradient14988);fill-rule:nonzero;filter:url(#filter4636)" - inkscape:connector-curvature="0" - id="path14281" - transform="matrix(0.902831,-0.73413,0.3898079,0.5286978,-47.462528,449.16085)" - d="m 400.774,118.281 c 0,6.41022 -5.19651,11.6067 -11.6067,11.6067 -6.41022,0 -11.6067,-5.19651 -11.6067,-11.6067 0,-6.41022 5.19651,-11.6067 11.6067,-11.6067 4.77724,0 9.06654,2.9271 10.808,7.37561" /> - <path - style="fill:url(#radialGradient14990);fill-rule:evenodd" - inkscape:connector-curvature="0" - id="path14283" - d="m 386.63411,71.917678 c -24.496,-25.0716 -58.533,-40.7872 -96.293,-41.1911 -37.76,-0.4039 -72.125,14.5802 -97.152,39.1221 l 16.594,16.9931 c 20.689,-20.2841 49.097,-32.6691 80.303,-32.3353 31.207,0.3338 59.335,13.3235 79.578,34.0454" /> - <path - style="opacity:0.2;fill:url(#radialGradient14992);fill-rule:nonzero" - inkscape:connector-curvature="0" - id="path14285" - d="m 365.99033,118.97626 c 1.44472,4.51343 -1.8569,7.73521 -7.37441,7.19603 -5.51749,-0.53916 -11.1615,-4.63511 -12.60622,-9.14854 -1.44472,-4.51343 1.8569,-7.73521 7.37441,-7.19604 5.51749,0.53917 11.1615,4.63512 12.60622,9.14855 z" /> - </g> - </g> - </g> - </g> - </g> - <g - inkscape:groupmode="layer" - id="layer4" - inkscape:label="ReactOS Text"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:14.1111px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" - x="17.330208" - y="14.618228" - id="text185"><tspan - sodipodi:role="line" - id="tspan183" - x="17.330208" - y="14.618228" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12.7px;font-family:'AvantGarde Bk BT';-inkscape-font-specification:'AvantGarde Bk BT';fill:#ffffff;stroke-width:0.264583">ReactOS</tspan></text> - </g> - <g - inkscape:groupmode="layer" - id="layer7" - inkscape:label="Copyright Text" - style="display:inline"> - <text - xml:space="preserve" - style="font-size:2.11667px;line-height:1.25;font-family:sans-serif;display:inline;fill:#ffffff;stroke-width:0.264583" - x="48.681915" - y="18.210854" - id="text198"><tspan - sodipodi:role="line" - id="tspan196" - x="48.681915" - y="18.210854" - style="font-size:2.11667px;fill:#ffffff;stroke-width:0.264583">Copyright © 1996 - 2024 ReactOS Team & Contributors</tspan></text> - </g> - <g - inkscape:groupmode="layer" - id="layer5" - inkscape:label="Workstation Text" - style="display:none"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583" - x="74.901154" - y="5.8208332" - id="text190"><tspan - sodipodi:role="line" - id="tspan188" - x="74.901154" - y="5.8208332" - style="font-size:5.64444px;fill:#ffffff;stroke-width:0.264583">Workstation</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" - x="123.42812" - y="6.3499999" - id="text194"><tspan - sodipodi:role="line" - id="tspan192" - x="123.42812" - y="6.3499999" - style="stroke-width:0.264583" /></text> - </g> - <g - inkscape:groupmode="layer" - id="g212" - inkscape:label="Server Text" - style="display:none"> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:5.64444px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583" - x="89.494064" - y="5.8208332" - id="text202"><tspan - sodipodi:role="line" - id="tspan200" - x="89.494064" - y="5.8208332" - style="font-size:5.64444px;fill:#ffffff;stroke-width:0.264583">Server</tspan></text> - <text - xml:space="preserve" - style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583" - x="123.42812" - y="6.3499999" - id="text206"><tspan - sodipodi:role="line" - id="tspan204" - x="123.42812" - y="6.3499999" - style="stroke-width:0.264583" /></text> - </g> -</svg> diff --git a/dll/win32/shell32/bitmap_res.rc b/dll/win32/shell32/bitmap_res.rc index 417239c77a7..4014180e00e 100644 --- a/dll/win32/shell32/bitmap_res.rc +++ b/dll/win32/shell32/bitmap_res.rc @@ -1,7 +1,5 @@ -IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" -IDB_REACTOS_WORKSTATION BITMAP "res/bitmaps/reactosworkstation.bmp" -IDB_REACTOS_SERVER BITMAP "res/bitmaps/reactosserver.bmp" -IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" +IDB_REACTOS BITMAP "res/bitmaps/reactos.bmp" +IDB_LINEBAR BITMAP "res/bitmaps/line.bmp" IDB_DLG_BG BITMAP "res/bitmaps/dlg_bg.bmp" IDB_REACTOS_FLAG BITMAP "res/bitmaps/reactos_flag.bmp" diff --git a/dll/win32/shell32/res/bitmaps/reactos.bmp b/dll/win32/shell32/res/bitmaps/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/shell32/res/bitmaps/reactos.bmp and b/dll/win32/shell32/res/bitmaps/reactos.bmp differ diff --git a/dll/win32/shell32/res/bitmaps/reactosserver.bmp b/dll/win32/shell32/res/bitmaps/reactosserver.bmp deleted file mode 100644 index ac446d9957e..00000000000 Binary files a/dll/win32/shell32/res/bitmaps/reactosserver.bmp and /dev/null differ diff --git a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp b/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp deleted file mode 100644 index 5fde0f3e778..00000000000 Binary files a/dll/win32/shell32/res/bitmaps/reactosworkstation.bmp and /dev/null differ diff --git a/dll/win32/shell32/shresdef.h b/dll/win32/shell32/shresdef.h index ca9a02e7cf6..6721e625e5d 100644 --- a/dll/win32/shell32/shresdef.h +++ b/dll/win32/shell32/shresdef.h @@ -28,8 +28,6 @@ /* Bitmaps */ #define IDB_REACTOS 131 -#define IDB_REACTOS_WORKSTATION 400 -#define IDB_REACTOS_SERVER 401 #define IDB_LINEBAR 138 #define IDB_SHELL_IEXPLORE_LG 204 #define IDB_SHELL_IEXPLORE_LG_HOT 205 diff --git a/dll/win32/shell32/wine/shell32_main.c b/dll/win32/shell32/wine/shell32_main.c index 6f50815036b..e6dc9810c79 100644 --- a/dll/win32/shell32/wine/shell32_main.c +++ b/dll/win32/shell32/wine/shell32_main.c @@ -45,7 +45,6 @@ #include <reactos/version.h> #include <reactos/buildno.h> -#include <versionhelpers.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); const char * const SHELL_Authors[] = { "Copyright 1993-"COPYRIGHT_YEAR" WINE team", "Copyright 1998-"COPYRIGHT_YEAR" ReactOS Team", 0 }; @@ -1085,16 +1084,7 @@ static INT_PTR CALLBACK AboutDlgProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM WCHAR szAuthorsText[20]; // Preload the ROS bitmap - if (IsWindowsServer()) - { - // Load Server Bitmap - hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_SERVER), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - } - else - { - // Load Workstation Bitmap - hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS_WORKSTATION), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); - } + hLogoBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_REACTOS), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); hLineBmp = (HBITMAP)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDB_LINEBAR), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hLogoBmp && hLineBmp) diff --git a/dll/win32/syssetup/resources/reactos.bmp b/dll/win32/syssetup/resources/reactos.bmp index 7eb8a6b3d9e..2ec7eeb1772 100644 Binary files a/dll/win32/syssetup/resources/reactos.bmp and b/dll/win32/syssetup/resources/reactos.bmp differ

3 months, 2 weeks

[reactos] 01/01: [NOTEPAD] Display error code if no error string is available (#7319)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9afe73de48eba8df3694… commit d9afe73de48eba8df369418fb1c87b714facb61d Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Sep 8 13:47:32 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 8 13:47:32 2024 +0200 [NOTEPAD] Display error code if no error string is available (#7319) --- base/applications/notepad/dialog.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 6f61df4b899..7185e4a0148 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -49,6 +49,7 @@ VOID ShowLastError(VOID) { LPTSTR lpMsgBuf = NULL; TCHAR szTitle[MAX_STRING_LEN]; + TCHAR szFallback[42], *pszMessage = szFallback; LoadString(Globals.hInstance, STRING_ERROR, szTitle, _countof(szTitle)); @@ -60,7 +61,12 @@ VOID ShowLastError(VOID) 0, NULL); - MessageBox(Globals.hMainWnd, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR); + if (lpMsgBuf) + pszMessage = lpMsgBuf; + else + wsprintfW(szFallback, L"%d", error); + + MessageBox(Globals.hMainWnd, pszMessage, szTitle, MB_OK | MB_ICONERROR); LocalFree(lpMsgBuf); } }

3 months, 2 weeks

[reactos] 01/01: [NOTEPAD] Don't handle main window accelerators in Find dialog (#7320)

by Whindmar Saksit

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=da26ec346593e38149e6a… commit da26ec346593e38149e6aa17fcefe653fc891e6c Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Sun Sep 8 13:45:51 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 8 13:45:51 2024 +0200 [NOTEPAD] Don't handle main window accelerators in Find dialog (#7320) --- base/applications/notepad/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index 3668527a0d9..fa5580eb739 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -637,8 +637,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh while (GetMessage(&msg, NULL, 0, 0)) { - if (!TranslateAccelerator(Globals.hMainWnd, hAccel, &msg) && - !IsDialogMessage(Globals.hFindReplaceDlg, &msg)) + if ((!Globals.hFindReplaceDlg || !IsDialogMessage(Globals.hFindReplaceDlg, &msg)) && + !TranslateAccelerator(Globals.hMainWnd, hAccel, &msg)) { TranslateMessage(&msg); DispatchMessage(&msg);

3 months, 2 weeks

[reactos] 01/01: [SHELL32] Revise "Desktop" icon (#7312)

by Splitwirez

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa740aa81ba215f92392… commit 3fa740aa81ba215f9239297933961d918e80178e Author: Splitwirez <34009058+Splitwirez(a)users.noreply.github.com> AuthorDate: Sun Sep 8 04:10:05 2024 -0700 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 8 13:10:05 2024 +0200 [SHELL32] Revise "Desktop" icon (#7312) Makes the "Desktop" icon look a bit more than the thing from Windows 7. Both: bottom-most right-most within the taskbar, and also used within the comdlg32 file-open-dialog. * Update desktop icon (35) in shell32 * Fix SVGs --- dll/win32/shell32/res/icons/35.ico | Bin 25214 -> 15086 bytes dll/win32/shell32/res/icons/svg/35-desktop-16x.svg | 271 ++++++++++++++++++++ dll/win32/shell32/res/icons/svg/35-desktop-32x.svg | 285 +++++++++++++++++++++ dll/win32/shell32/res/icons/svg/35-desktop-48x.svg | 284 ++++++++++++++++++++ 4 files changed, 840 insertions(+) diff --git a/dll/win32/shell32/res/icons/35.ico b/dll/win32/shell32/res/icons/35.ico index adf5608a60b..3a5b7e0f46a 100644 Binary files a/dll/win32/shell32/res/icons/35.ico and b/dll/win32/shell32/res/icons/35.ico differ diff --git a/dll/win32/shell32/res/icons/svg/35-desktop-16x.svg b/dll/win32/shell32/res/icons/svg/35-desktop-16x.svg new file mode 100644 index 00000000000..0b9e6fabc20 --- /dev/null +++ b/dll/win32/shell32/res/icons/svg/35-desktop-16x.svg @@ -0,0 +1,271 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + inkscape:export-ydpi="96" + inkscape:export-xdpi="96" + inkscape:export-filename="35-desktop-16x.png" + width="16" + height="16" + id="svg11300" + sodipodi:version="0.32" + inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" + sodipodi:docname="35-desktop-16x.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs3"> + <linearGradient + inkscape:collect="always" + id="linearGradient5500" + x1="2" + y1="38" + x2="2" + y2="41" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5a5a5a;stop-opacity:1;" + offset="0" + id="stop5496" /> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="1" + id="stop5498" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : -8 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="48 : -8 : 1" + inkscape:persp3d-origin="24 : -16 : 1" + id="perspective75" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3844"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3846" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3848" /> + </linearGradient> + <linearGradient + id="linearGradient3832"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3834" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1;" + offset="1" + id="stop3836" /> + </linearGradient> + <linearGradient + id="linearGradient2402"> + <stop + style="stop-color:#d8d8d8;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2404" /> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2406" /> + </linearGradient> + <linearGradient + id="linearGradient2392"> + <stop + id="stop2394" + offset="0.0000000" + style="stop-color:#a0a0a0;stop-opacity:1.0000000;" /> + <stop + id="stop2396" + offset="1.0000000" + style="stop-color:#e7e7e7;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient10314"> + <stop + id="stop10316" + offset="0.0000000" + style="stop-color:#f3f3f3;stop-opacity:1.0000000;" /> + <stop + id="stop10318" + offset="1.0000000" + style="stop-color:#838383;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient1428"> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="0" + id="stop1430" /> + <stop + style="stop-color:#729fcf" + offset="1" + id="stop1432" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3844" + id="radialGradient3854" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.35514,0,28.29322)" + cx="35.1875" + cy="43.875" + fx="35.1875" + fy="43.875" + r="6.6875" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1428" + id="linearGradient1812" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.857967,0,0,0.83092,-0.713348,1.247197)" + x1="11.210244" + y1="3.1310341" + x2="11.210244" + y2="15.11003" /> + </defs> + <sodipodi:namedview + stroke="#204a87" + fill="#204a87" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.25490196" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="7.5" + inkscape:cy="7.5" + inkscape:current-layer="taskbar-layer" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:showpageshadow="false" + inkscape:window-width="872" + inkscape:window-height="688" + inkscape:window-x="189" + inkscape:window-y="160" + inkscape:pagecheckerboard="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + inkscape:snap-nodes="true" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title>Preferences Session</dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>session</rdf:li> + <rdf:li>restart</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="bg-layer" + inkscape:label="Background" + inkscape:groupmode="layer" + sodipodi:insensitive="true"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1812);fill-opacity:1;fill-rule:evenodd;stroke:#173764;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect1108" + width="15" + height="12" + x="0.5" + y="2.5" + rx="0.5" /> + <rect + y="3.5" + x="1.5" + height="10" + width="13" + id="rect2317" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.28655;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <g + inkscape:groupmode="layer" + id="taskbar-layer" + inkscape:label="Taskbar" + style="display:inline"> + <g + id="g968"> + <g + id="g6249" + transform="translate(-1,-26)"> + <rect + y="37" + x="2" + height="1" + width="14" + id="rect5054" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0e0e0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="fill:url(#linearGradient5500);fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect5360" + width="14" + height="2" + x="2" + y="38" + clip-path="none" /> + </g> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect6019" + width="1" + x="2" + y="12" + height="1" /> + </g> + </g> +</svg> diff --git a/dll/win32/shell32/res/icons/svg/35-desktop-32x.svg b/dll/win32/shell32/res/icons/svg/35-desktop-32x.svg new file mode 100644 index 00000000000..791bbc44d76 --- /dev/null +++ b/dll/win32/shell32/res/icons/svg/35-desktop-32x.svg @@ -0,0 +1,285 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + inkscape:export-ydpi="96" + inkscape:export-xdpi="96" + inkscape:export-filename="35-desktop-32x.png" + width="32" + height="32" + id="svg11300" + sodipodi:version="0.32" + inkscape:version="1.1.2 (0a00cf5, 2022-02-04)" + sodipodi:docname="35-desktop-32x.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs3"> + <linearGradient + inkscape:collect="always" + id="linearGradient5500" + x1="2" + y1="38" + x2="2" + y2="41" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-1,-14)"> + <stop + style="stop-color:#5a5a5a;stop-opacity:1;" + offset="0" + id="stop5496" /> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="1" + id="stop5498" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 8 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="48 : 8 : 1" + inkscape:persp3d-origin="24 : 0 : 1" + id="perspective75" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3844"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3846" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3848" /> + </linearGradient> + <linearGradient + id="linearGradient3832"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3834" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1;" + offset="1" + id="stop3836" /> + </linearGradient> + <linearGradient + id="linearGradient2402"> + <stop + style="stop-color:#d8d8d8;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2404" /> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2406" /> + </linearGradient> + <linearGradient + id="linearGradient2392"> + <stop + id="stop2394" + offset="0.0000000" + style="stop-color:#a0a0a0;stop-opacity:1.0000000;" /> + <stop + id="stop2396" + offset="1.0000000" + style="stop-color:#e7e7e7;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient10314"> + <stop + id="stop10316" + offset="0.0000000" + style="stop-color:#f3f3f3;stop-opacity:1.0000000;" /> + <stop + id="stop10318" + offset="1.0000000" + style="stop-color:#838383;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient1428"> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="0" + id="stop1430" /> + <stop + style="stop-color:#729fcf" + offset="1" + id="stop1432" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3844" + id="radialGradient3854" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.35514,0,28.29322)" + cx="35.1875" + cy="43.875" + fx="35.1875" + fy="43.875" + r="6.6875" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1428" + id="linearGradient1738" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.857967,0,0,0.83092,-0.713348,3.247197)" + x1="21.006275" + y1="4.6190629" + x2="21.006275" + y2="27.578806" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath1145"> + <rect + rx="1.36" + y="5" + x="1" + height="22" + width="29" + id="rect1147" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff00ff;fill-opacity:0.501961;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </clipPath> + </defs> + <sodipodi:namedview + stroke="#204a87" + fill="#204a87" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.25490196" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="16" + inkscape:current-layer="taskbar-layer" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:showpageshadow="false" + inkscape:window-width="872" + inkscape:window-height="688" + inkscape:window-x="189" + inkscape:window-y="160" + inkscape:pagecheckerboard="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + inkscape:snap-nodes="true" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title>Preferences Session</dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>session</rdf:li> + <rdf:li>restart</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="bg-layer" + inkscape:label="Background" + inkscape:groupmode="layer"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1738);fill-opacity:1;fill-rule:evenodd;stroke:#173764;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect1022" + width="30" + height="23" + x="0.5" + y="4.5" + rx="1.8561548" + ry="1.8561562" /> + <rect + rx="0.84399998" + y="5.5" + x="1.5" + height="21" + width="28" + id="rect2317" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.28655;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <g + inkscape:groupmode="layer" + id="taskbar-layer" + inkscape:label="Taskbar" + style="display:inline"> + <g + id="g968" + clip-path="url(#clipPath1145)"> + <g + id="g2356"> + <rect + y="23" + x="1" + height="1" + width="29" + id="rect5054" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0e0e0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="fill:url(#linearGradient5500);fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect5360" + width="29" + height="3" + x="1" + y="24" + clip-path="none" /> + </g> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect6019" + width="2" + x="2" + y="24" + height="2" /> + </g> + </g> +</svg> diff --git a/dll/win32/shell32/res/icons/svg/35-desktop-48x.svg b/dll/win32/shell32/res/icons/svg/35-desktop-48x.svg new file mode 100644 index 00000000000..c3c7d3a82dc --- /dev/null +++ b/dll/win32/shell32/res/icons/svg/35-desktop-48x.svg @@ -0,0 +1,284 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + inkscape:export-ydpi="96" + inkscape:export-xdpi="96" + inkscape:export-filename="35-desktop-48x.png" + width="48px" + height="48px" + id="svg11300" + sodipodi:version="0.32" + inkscape:version="1.1.2 (0a00cf5, 2022-02-04)" + sodipodi:docname="35-desktop-48x.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs3"> + <linearGradient + inkscape:collect="always" + id="linearGradient5500" + x1="2" + y1="38" + x2="2" + y2="41" + gradientUnits="userSpaceOnUse"> + <stop + style="stop-color:#5a5a5a;stop-opacity:1;" + offset="0" + id="stop5496" /> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="1" + id="stop5498" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 24 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="48 : 24 : 1" + inkscape:persp3d-origin="24 : 16 : 1" + id="perspective75" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3844"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3846" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3848" /> + </linearGradient> + <linearGradient + id="linearGradient3832"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3834" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1;" + offset="1" + id="stop3836" /> + </linearGradient> + <linearGradient + id="linearGradient2402"> + <stop + style="stop-color:#d8d8d8;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2404" /> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2406" /> + </linearGradient> + <linearGradient + id="linearGradient2392"> + <stop + id="stop2394" + offset="0.0000000" + style="stop-color:#a0a0a0;stop-opacity:1.0000000;" /> + <stop + id="stop2396" + offset="1.0000000" + style="stop-color:#e7e7e7;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient10314"> + <stop + id="stop10316" + offset="0.0000000" + style="stop-color:#f3f3f3;stop-opacity:1.0000000;" /> + <stop + id="stop10318" + offset="1.0000000" + style="stop-color:#838383;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient1428"> + <stop + style="stop-color:#3465a4;stop-opacity:1;" + offset="0" + id="stop1430" /> + <stop + style="stop-color:#729fcf" + offset="1" + id="stop1432" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3844" + id="radialGradient3854" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.355140,1.780868e-14,28.29322)" + cx="35.1875" + cy="43.875" + fx="35.1875" + fy="43.875" + r="6.6875" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient1428" + id="linearGradient1812" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.857967,0,0,0.83092,0.286652,4.247197)" + x1="30.802307" + y1="6.3776422" + x2="30.802307" + y2="42.314632" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath1228"> + <rect + rx="1.36" + y="6" + x="2" + height="35" + width="44" + id="rect1230" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ff00ff;fill-opacity:0.501961;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </clipPath> + </defs> + <sodipodi:namedview + stroke="#204a87" + fill="#204a87" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.25490196" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="13.958333" + inkscape:cx="24" + inkscape:cy="24" + inkscape:current-layer="taskbar-layer" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:showpageshadow="false" + inkscape:window-width="872" + inkscape:window-height="688" + inkscape:window-x="189" + inkscape:window-y="160" + inkscape:pagecheckerboard="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + inkscape:snap-nodes="true" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title>Preferences Session</dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>session</rdf:li> + <rdf:li>restart</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="bg-layer" + inkscape:label="Background" + inkscape:groupmode="layer"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1812);fill-opacity:1;fill-rule:evenodd;stroke:#173764;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect1426" + width="45" + height="36" + x="1.5" + y="5.5" + rx="1.8561548" + ry="1.8561562" /> + <rect + rx="0.84399998" + y="6.5" + x="2.5" + height="34" + width="43" + id="rect2317" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.28655;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <g + inkscape:groupmode="layer" + id="taskbar-layer" + inkscape:label="Taskbar" + style="display:inline"> + <g + id="g968" + clip-path="url(#clipPath1228)"> + <g + id="g6249"> + <rect + y="37" + x="2" + height="1" + width="44" + id="rect5054" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0e0e0f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + style="fill:url(#linearGradient5500);fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect5360" + width="44" + height="3" + x="2" + y="38" + clip-path="none" /> + </g> + <rect + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-opacity:1" + id="rect6019" + width="2" + x="3" + y="38" + height="2" /> + </g> + </g> +</svg>

3 months, 2 weeks

[reactos] 01/01: [COMDLG32] ChooseColor: Apply DarkShadow44's suggestions (#6971)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8bba3c43333679e828f40… commit 8bba3c43333679e828f400f8a2d1ee70db171aa9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 8 16:59:28 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 8 16:59:28 2024 +0900 [COMDLG32] ChooseColor: Apply DarkShadow44's suggestions (#6971) Co-authored-by: Fabian Maurer <dark.shadow4(a)web.de> Based on @DarkShadow44's merge request to WineHQ. JIRA issue: CORE-19402 Merge Request: https://gitlab.winehq.org/wine/wine/-/merge_requests/5756 Proposed changes Extend CC_CheckDigitsInEdit's parameters and set infoPtr->updating to TRUE when updating. Call CC_PaintLumBar function in CC_WMCommand function. --- dll/win32/comdlg32/colordlg.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dll/win32/comdlg32/colordlg.c b/dll/win32/comdlg32/colordlg.c index 299c740e752..b64ee6ad138 100644 --- a/dll/win32/comdlg32/colordlg.c +++ b/dll/win32/comdlg32/colordlg.c @@ -396,7 +396,11 @@ static BOOL CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam ) /*********************************************************************** * CC_CheckDigitsInEdit [internal] */ +#ifdef __REACTOS__ +static int CC_CheckDigitsInEdit( CCPRIV *infoPtr, HWND hwnd, int maxval ) +#else static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) +#endif { int i, k, m, result, value; long editpos; @@ -430,7 +434,13 @@ static int CC_CheckDigitsInEdit( HWND hwnd, int maxval ) if (result) { editpos = SendMessageA(hwnd, EM_GETSEL, 0, 0); +#ifdef __REACTOS__ + infoPtr->updating = TRUE; +#endif SetWindowTextA(hwnd, buffer ); +#ifdef __REACTOS__ + infoPtr->updating = FALSE; +#endif SendMessageA(hwnd, EM_SETSEL, 0, editpos); } return value; @@ -984,7 +994,11 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti case IDC_COLOR_EDIT_B: if (notifyCode == EN_UPDATE && !lpp->updating) { +#ifdef __REACTOS__ + i = CC_CheckDigitsInEdit(lpp, hwndCtl, 255); +#else i = CC_CheckDigitsInEdit(hwndCtl, 255); +#endif r = GetRValue(lpp->lpcc->rgbResult); g = GetGValue(lpp->lpcc->rgbResult); b= GetBValue(lpp->lpcc->rgbResult); @@ -1005,6 +1019,9 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti CC_EditSetHSL(lpp); CC_PaintCross(lpp); CC_PaintTriangle(lpp); +#ifdef __REACTOS__ + CC_PaintLumBar(lpp); +#endif } } break; @@ -1014,7 +1031,11 @@ static LRESULT CC_WMCommand(CCPRIV *lpp, WPARAM wParam, LPARAM lParam, WORD noti case IDC_COLOR_EDIT_L: if (notifyCode == EN_UPDATE && !lpp->updating) { +#ifdef __REACTOS__ + i = CC_CheckDigitsInEdit(lpp, hwndCtl , LOWORD(wParam) == IDC_COLOR_EDIT_H ? 239 : 240); +#else i = CC_CheckDigitsInEdit(hwndCtl , LOWORD(wParam) == IDC_COLOR_EDIT_H ? 239 : 240); +#endif xx = 0; switch (LOWORD(wParam)) {

3 months, 2 weeks

[reactos] 01/01: [NTOS:MM] Increase x64 system view and session view size

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78e94a50839b806f3ea7a… commit 78e94a50839b806f3ea7ae6aa2980c7118237011 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Sep 6 16:40:53 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sun Sep 8 10:33:55 2024 +0300 [NTOS:MM] Increase x64 system view and session view size We have plenty of address space and the desktop heap has grown, so we need some more space. --- ntoskrnl/include/internal/amd64/mm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/include/internal/amd64/mm.h b/ntoskrnl/include/internal/amd64/mm.h index a335728b3b9..62b4e246e9a 100644 --- a/ntoskrnl/include/internal/amd64/mm.h +++ b/ntoskrnl/include/internal/amd64/mm.h @@ -58,8 +58,8 @@ #define MI_MIN_INIT_PAGED_POOLSIZE (32 * _1MB) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128ULL * 1024 * 1024 * 1024) -#define MI_SYSTEM_VIEW_SIZE (104 * _1MB) -#define MI_SESSION_VIEW_SIZE (104 * _1MB) +#define MI_SYSTEM_VIEW_SIZE (512 * _1MB) +#define MI_SESSION_VIEW_SIZE (512 * _1MB) #define MI_SESSION_POOL_SIZE (64 * _1MB) #define MI_SESSION_IMAGE_SIZE (16 * _1MB) #define MI_SESSION_WORKING_SET_SIZE (16 * _1MB)

3 months, 2 weeks

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2024