Ros-diffs

ros-diffs@reactos.org

81390 discussions

[rgampa] 75504: [USBXHCI] -minor changes to root hub functions. -Finally driver is generating multiple interrupts. -DPRINTS in common functions removed to reduce windbg outputs CORE-13344
by rgampa＠svn.reactos.org 08 Aug '17

08 Aug '17

Author: rgampa Date: Tue Aug 8 10:28:56 2017 New Revision: 75504 URL: http://svn.reactos.org/svn/reactos?rev=75504&view=rev Log: [USBXHCI] -minor changes to root hub functions. -Finally driver is generating multiple interrupts. -DPRINTS in common functions removed to reduce windbg outputs CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] Tue Aug 8 10:28:56 2017 @@ -199,7 +199,7 @@ } XHCI_CONFIGURE; C_ASSERT(sizeof(XHCI_CONFIGURE) == sizeof(ULONG)); -#define PORT_STATUS_MASK 0x4F01FFE5 // 0100 1111 0000 0001 1111 1111 1110 0101 // RW 1, RW1C/RW1S 0, RO 1 +#define PORT_STATUS_MASK 0x4F01FFE9 // 0100 1111 0000 0001 1111 1111 1110 1001 // RW 1, RW1C/RW1S 0, RO 1 typedef volatile union _XHCI_PORT_STATUS_CONTROL { struct { ULONG CurrentConnectStatus : 1; Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Tue Aug 8 10:28:56 2017 @@ -52,17 +52,18 @@ IN USHORT Port, IN PULONG PortStatus) { - DPRINT1("XHCI_RH_GetPortStatus: function initiated\n"); + //DPRINT1("XHCI_RH_GetPortStatus: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG PortStatusRegPointer; XHCI_PORT_STATUS_CONTROL PortStatusRegister; USBHUB_PORT_STATUS portstatus; XhciExtension = (PXHCI_EXTENSION)xhciExtension; + ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; //DPRINT("XHCI_RH_GetPortStatus: Port - %i\n", Port); - DPRINT("XHCI_RH_GetPortStatus: PortStatus Register, port - %p , %i\n", PortStatusRegister.AsULONG, Port); + //DPRINT("XHCI_RH_GetPortStatus: PortStatus Register, port - %p , %i\n", PortStatusRegister.AsULONG, Port); /* ULONG ConnectStatus : 1; // Current Connect Status ULONG EnableStatus : 1; // Port Enabled/Disabled @@ -153,7 +154,7 @@ XHCI_RH_GetHubStatus(IN PVOID xhciExtension, IN PULONG HubStatus) { - DPRINT1("XHCI_RH_GetHubStatus: function initiated\n"); + //DPRINT1("XHCI_RH_GetHubStatus: function initiated\n"); *HubStatus = 0; return 0; } @@ -184,10 +185,10 @@ PXHCI_EXTENSION XhciExtension; PULONG PortStatusRegPointer; XHCI_PORT_STATUS_CONTROL PortStatusRegister; - LARGE_INTEGER CurrentTime = {{0, 0}}; - LARGE_INTEGER LastTime = {{0, 0}}; - - XhciExtension = (PXHCI_EXTENSION)xhciExtension; + + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; @@ -196,27 +197,7 @@ WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); - KeQuerySystemTime(&CurrentTime); - CurrentTime.QuadPart += 100 * 10000; // 100 msec - while(TRUE) - { - KeQuerySystemTime(&LastTime); - - PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; - - if (PortStatusRegister.PortReset!= 1) - { - break; - } - - if (LastTime.QuadPart >= CurrentTime.QuadPart) - { - DPRINT1("XHCI_RH_SetFeaturePortReset: Software Reset failed!\n"); - return MP_STATUS_FAILURE; - } - } - - + return MP_STATUS_SUCCESS; } @@ -231,6 +212,7 @@ XHCI_PORT_STATUS_CONTROL PortStatusRegister; XhciExtension = (PXHCI_EXTENSION)xhciExtension; + ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; @@ -315,6 +297,7 @@ XHCI_PORT_STATUS_CONTROL PortStatusRegister; XhciExtension = (PXHCI_EXTENSION)xhciExtension; + ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; @@ -324,9 +307,8 @@ WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; - if (PortStatusRegister.ConnectStatusChange == 1){ - return MP_STATUS_FAILURE; - } + + ASSERT(PortStatusRegister.ConnectStatusChange == 0); return MP_STATUS_SUCCESS; } @@ -341,6 +323,7 @@ XHCI_PORT_STATUS_CONTROL PortStatusRegister; XhciExtension = (PXHCI_EXTENSION)xhciExtension; + ASSERT(Port != 0 && Port <= XhciExtension->NumberOfPorts); PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; @@ -351,9 +334,8 @@ WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; - if (PortStatusRegister.PortResetChange == 1){ - return MP_STATUS_FAILURE; - } + + ASSERT(PortStatusRegister.PortResetChange == 0); return MP_STATUS_SUCCESS; } @@ -379,7 +361,7 @@ NTAPI XHCI_RH_DisableIrq(IN PVOID xhciExtension) { - DPRINT1("XHCI_RH_DisableIrq: function initiated\n"); + //DPRINT1("XHCI_RH_DisableIrq: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; @@ -398,7 +380,7 @@ NTAPI XHCI_RH_EnableIrq(IN PVOID xhciExtension) { - DPRINT1("XHCI_RH_EnableIrq: function initiated\n"); + //DPRINT1("XHCI_RH_EnableIrq: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; XHCI_USB_COMMAND usbCommand; Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Tue Aug 8 10:28:56 2017 @@ -559,14 +559,14 @@ erstdp.DequeueERSTIndex =0; XHCI_Write64bitReg (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); - PXHCI_HC_RESOURCES HcResourcesVA; + /*PXHCI_HC_RESOURCES HcResourcesVA; XHCI_TRB eventtrb; HcResourcesVA = XhciExtension->HcResourcesVA; eventtrb = HcResourcesVA -> EventRing.firstSeg.XhciTrb[0]; DPRINT("XHCI_ControllerWorkTest: eventtrb word0 - %p\n", eventtrb.EventTRB.Word0); DPRINT("XHCI_ControllerWorkTest: eventtrb word1 - %p\n", eventtrb.EventTRB.Word1); DPRINT("XHCI_ControllerWorkTest: eventtrb word2 - %p\n", eventtrb.EventTRB.Word2); - DPRINT("XHCI_ControllerWorkTest: eventtrb word3 - %p\n", eventtrb.EventTRB.Word3); + DPRINT("XHCI_ControllerWorkTest: eventtrb word3 - %p\n", eventtrb.EventTRB.Word3);*/ return TRUE; } @@ -735,7 +735,7 @@ NTAPI XHCI_PollController(IN PVOID xhciExtension) { - DPRINT1("XHCI_PollController: function initiated\n"); + //DPRINT1("XHCI_PollController: function initiated\n"); PXHCI_EXTENSION XhciExtension; PULONG OperationalRegs; //ULONG Port;

1 0

[rgampa] 75503: [USBXHCI] -implemented roothub functions. CORE-13344
by rgampa＠svn.reactos.org 08 Aug '17

08 Aug '17

Author: rgampa Date: Tue Aug 8 09:43:52 2017 New Revision: 75503 URL: http://svn.reactos.org/svn/reactos?rev=75503&view=rev Log: [USBXHCI] -implemented roothub functions. CORE-13344 Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/hardware.h [iso-8859-1] Tue Aug 8 09:43:52 2017 @@ -15,7 +15,7 @@ #define XHCI_CRCR 6 #define XHCI_DCBAAP 12 #define XHCI_CONFIG 14 -#define XHCI_PORTSC 100 +#define XHCI_PORTSC 256 // runtime register offsets #define XHCI_IMAN 8 #define XHCI_IMOD 9 @@ -131,7 +131,7 @@ }; ULONG AsULONG; } XHCI_USB_COMMAND; - +C_ASSERT(sizeof(XHCI_USB_COMMAND)==sizeof(ULONG)); typedef volatile union _XHCI_USB_STATUS { struct { ULONG HCHalted : 1; @@ -149,7 +149,7 @@ }; ULONG AsULONG; } XHCI_USB_STATUS; - +C_ASSERT(sizeof(XHCI_USB_STATUS)==sizeof(ULONG)); typedef volatile union _XHCI_PAGE_SIZE { struct { ULONG PageSize : 16; @@ -197,7 +197,9 @@ }; ULONG AsULONG; } XHCI_CONFIGURE; - +C_ASSERT(sizeof(XHCI_CONFIGURE) == sizeof(ULONG)); + +#define PORT_STATUS_MASK 0x4F01FFE5 // 0100 1111 0000 0001 1111 1111 1110 0101 // RW 1, RW1C/RW1S 0, RO 1 typedef volatile union _XHCI_PORT_STATUS_CONTROL { struct { ULONG CurrentConnectStatus : 1; Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/roothub.c [iso-8859-1] Tue Aug 8 09:43:52 2017 @@ -61,7 +61,8 @@ XhciExtension = (PXHCI_EXTENSION)xhciExtension; PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; - + //DPRINT("XHCI_RH_GetPortStatus: Port - %i\n", Port); + DPRINT("XHCI_RH_GetPortStatus: PortStatus Register, port - %p , %i\n", PortStatusRegister.AsULONG, Port); /* ULONG ConnectStatus : 1; // Current Connect Status ULONG EnableStatus : 1; // Port Enabled/Disabled @@ -88,7 +89,7 @@ ULONG IndicatorControlChange : 1; ULONG Reserved4 : 3; */ - /* + /* register interface ULONG CurrentConnectStatus : 1; ULONG PortEnableDisable : 1; ULONG RsvdZ1 : 1; @@ -139,8 +140,9 @@ portstatus.UsbPortStatusChange.TestModeChange = 0;//PortStatusRegister.ConnectStatusChange; portstatus.UsbPortStatusChange.IndicatorControlChange =0;// PortStatusRegister.ConnectStatusChange; - DPRINT("XHCI_RH_GetPortStatus: PortStatus - %p\n", portstatus.AsULONG); - DPRINT("XHCI_RH_GetPortStatus: Port - %i\n", Port); + + //DPRINT("XHCI_RH_GetPortStatus: PortStatus - %p\n", portstatus.AsULONG); + *PortStatus = portstatus.AsULONG; return MP_STATUS_SUCCESS; @@ -179,7 +181,43 @@ IN USHORT Port) { DPRINT1("XHCI_RH_SetFeaturePortReset: function initiated\n"); - return 0; + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; + LARGE_INTEGER CurrentTime = {{0, 0}}; + LARGE_INTEGER LastTime = {{0, 0}}; + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + PortStatusRegister.AsULONG = PortStatusRegister.AsULONG & PORT_STATUS_MASK; + PortStatusRegister.PortReset = 1; + + WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); + + KeQuerySystemTime(&CurrentTime); + CurrentTime.QuadPart += 100 * 10000; // 100 msec + while(TRUE) + { + KeQuerySystemTime(&LastTime); + + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + if (PortStatusRegister.PortReset!= 1) + { + break; + } + + if (LastTime.QuadPart >= CurrentTime.QuadPart) + { + DPRINT1("XHCI_RH_SetFeaturePortReset: Software Reset failed!\n"); + return MP_STATUS_FAILURE; + } + } + + + return MP_STATUS_SUCCESS; } MPSTATUS @@ -187,8 +225,21 @@ XHCI_RH_SetFeaturePortPower(IN PVOID xhciExtension, IN USHORT Port) { - DPRINT1("XHCI_RH_SetFeaturePortPower: function initiated\n"); - return 0; + DPRINT1("XHCI_RH_SetFeaturePortPower: function initiated\n"); + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + PortStatusRegister.AsULONG = PortStatusRegister.AsULONG & PORT_STATUS_MASK; + PortStatusRegister.PortPower = 1; + + WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); + + return MP_STATUS_SUCCESS; } MPSTATUS NTAPI @@ -213,7 +264,7 @@ XHCI_RH_ClearFeaturePortEnable(IN PVOID xhciExtension, IN USHORT Port) { - DPRINT1("XHCI_RH_ClearFeaturePortEnable: function initiated\n"); + DPRINT1("XHCI_RH_ClearFeaturePortEnable: function initiated\n"); return 0; } @@ -259,7 +310,24 @@ IN USHORT Port) { DPRINT1("XHCI_RH_ClearFeaturePortConnectChange: function initiated\n"); - return 0; + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + PortStatusRegister.AsULONG = PortStatusRegister.AsULONG & PORT_STATUS_MASK; + PortStatusRegister.ConnectStatusChange = 1; + + WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); + + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + if (PortStatusRegister.ConnectStatusChange == 1){ + return MP_STATUS_FAILURE; + } + return MP_STATUS_SUCCESS; } MPSTATUS @@ -268,7 +336,25 @@ IN USHORT Port) { DPRINT1("XHCI_RH_ClearFeaturePortResetChange: function initiated\n"); - return 0; + PXHCI_EXTENSION XhciExtension; + PULONG PortStatusRegPointer; + XHCI_PORT_STATUS_CONTROL PortStatusRegister; + + XhciExtension = (PXHCI_EXTENSION)xhciExtension; + PortStatusRegPointer = (XhciExtension->OperationalRegs) + (XHCI_PORTSC + (Port - 1)*4); + + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + + PortStatusRegister.AsULONG = PortStatusRegister.AsULONG & PORT_STATUS_MASK; + PortStatusRegister.PortResetChange = 1; + + WRITE_REGISTER_ULONG(PortStatusRegPointer , PortStatusRegister.AsULONG ); + + PortStatusRegister.AsULONG = READ_REGISTER_ULONG(PortStatusRegPointer) ; + if (PortStatusRegister.PortResetChange == 1){ + return MP_STATUS_FAILURE; + } + return MP_STATUS_SUCCESS; } MPSTATUS Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.c [iso-8859-1] Tue Aug 8 09:43:52 2017 @@ -184,6 +184,7 @@ HcResourcesVA = (PXHCI_HC_RESOURCES)resourcesStartVA; ASSERT((ULONG_PTR)HcResourcesVA % PAGE_SIZE == 0); + XhciExtension->HcResourcesVA = HcResourcesVA; HcResourcesPA.QuadPart = (ULONG_PTR)resourcesStartPA; BaseIoAdress = XhciExtension->BaseIoAdress; OperationalRegs = XhciExtension->OperationalRegs; @@ -341,13 +342,8 @@ if (LastTime.QuadPart >= CurrentTime.QuadPart) { - if (Command.HCReset == 1) - { - DPRINT1("XHCI_InitializeHardware: Software Reset failed!\n"); - return 7; - } - - break; + DPRINT1("XHCI_InitializeHardware: Software Reset failed!\n"); + return 7; } } DPRINT("XHCI_InitializeHardware: Reset - OK\n"); @@ -360,6 +356,8 @@ Config.AsULONG = READ_REGISTER_ULONG(OperationalRegs + XHCI_CONFIG); ASSERT(Command.RunStop==0); //required before setting max device slots enabled. Config.MaxDeviceSlotsEnabled = 1; // max possible value is number of slots HCSPARAMS1 + Config.U3EntryEnable = 0; + Config.ConfigurationInfoEnable = 0; WRITE_REGISTER_ULONG(OperationalRegs + XHCI_CONFIG, Config.AsULONG); return MP_STATUS_SUCCESS; @@ -463,8 +461,8 @@ Command.RunStop =1; WRITE_REGISTER_ULONG (OperationalRegs + XHCI_USBCMD, Command.AsULONG ); - MPStatus = XHCI_ControllerWorkTest(XhciExtension,Resources->StartVA, Resources->StartPA ); - //DPRINT1("XHCI_StartController: UNIMPLEMENTED. FIXME\n"); + //MPStatus = XHCI_ControllerWorkTest(XhciExtension,Resources->StartVA, Resources->StartPA ); + return MP_STATUS_SUCCESS; } @@ -561,6 +559,14 @@ erstdp.DequeueERSTIndex =0; XHCI_Write64bitReg (RunTimeRegisterBase + XHCI_ERSTDP, erstdp.AsULONGLONG); + PXHCI_HC_RESOURCES HcResourcesVA; + XHCI_TRB eventtrb; + HcResourcesVA = XhciExtension->HcResourcesVA; + eventtrb = HcResourcesVA -> EventRing.firstSeg.XhciTrb[0]; + DPRINT("XHCI_ControllerWorkTest: eventtrb word0 - %p\n", eventtrb.EventTRB.Word0); + DPRINT("XHCI_ControllerWorkTest: eventtrb word1 - %p\n", eventtrb.EventTRB.Word1); + DPRINT("XHCI_ControllerWorkTest: eventtrb word2 - %p\n", eventtrb.EventTRB.Word2); + DPRINT("XHCI_ControllerWorkTest: eventtrb word3 - %p\n", eventtrb.EventTRB.Word3); return TRUE; } @@ -655,14 +661,14 @@ XHCI_CheckController(IN PVOID xhciExtension) { //RegPacket.UsbPortInvalidateController(xhciExtension, 2); - DPRINT1("XHCI_CheckController: function initiated\n"); + //DPRINT1("XHCI_CheckController: function initiated\n"); } ULONG NTAPI XHCI_Get32BitFrameNumber(IN PVOID xhciExtension) { - DPRINT1("XHCI_Get32BitFrameNumber: function initiated\n"); + //DPRINT1("XHCI_Get32BitFrameNumber: function initiated\n"); return 0; } Modified: branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/usbxhci/reactos/drive… ============================================================================== --- branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] (original) +++ branches/GSoC_2017/usbxhci/reactos/drivers/usb/usbxhci/usbxhci.h [iso-8859-1] Tue Aug 8 09:43:52 2017 @@ -203,6 +203,14 @@ PXHCI_SEGMENT dequeue_segment; ULONGLONG Padding; } XHCI_RING, *PXHCI_RING; +typedef struct _XHCI_HC_RESOURCES { + XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY DCBAA; + DECLSPEC_ALIGN(16) XHCI_RING EventRing ; + DECLSPEC_ALIGN(64) XHCI_RING CommandRing ; + XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; +} XHCI_HC_RESOURCES, *PXHCI_HC_RESOURCES; +C_ASSERT (FIELD_OFFSET(XHCI_HC_RESOURCES,EventRing)% 16 == 0); +C_ASSERT (FIELD_OFFSET(XHCI_HC_RESOURCES,CommandRing)% 64 == 0); typedef struct _XHCI_EXTENSION { ULONG Reserved; @@ -221,16 +229,10 @@ USHORT MaxScratchPadBuffers; PMDL ScratchPadArrayMDL; PMDL ScratchPadBufferMDL; + PXHCI_HC_RESOURCES HcResourcesVA; } XHCI_EXTENSION, *PXHCI_EXTENSION; -typedef struct _XHCI_HC_RESOURCES { - XHCI_DEVICE_CONTEXT_BASE_ADD_ARRAY DCBAA; - DECLSPEC_ALIGN(16) XHCI_RING EventRing ; - DECLSPEC_ALIGN(64) XHCI_RING CommandRing ; - XHCI_EVENT_RING_SEGMENT_TABLE EventRingSegTable; -} XHCI_HC_RESOURCES, *PXHCI_HC_RESOURCES; -C_ASSERT (FIELD_OFFSET(XHCI_HC_RESOURCES,EventRing)% 16 == 0); -C_ASSERT (FIELD_OFFSET(XHCI_HC_RESOURCES,CommandRing)% 64 == 0); + typedef struct _XHCI_ENDPOINT { ULONG Reserved; } XHCI_ENDPOINT, *PXHCI_ENDPOINT;

1 0

[gadamopoulos] 75502: [COMCTL32] -Fix a typo.
by gadamopoulos＠svn.reactos.org 07 Aug '17

07 Aug '17

Author: gadamopoulos Date: Mon Aug 7 11:08:26 2017 New Revision: 75502 URL: http://svn.reactos.org/svn/reactos?rev=75502&view=rev Log: [COMCTL32] -Fix a typo. Modified: trunk/reactos/dll/win32/comctl32/button.c Modified: trunk/reactos/dll/win32/comctl32/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/button.… ============================================================================== --- trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/button.c [iso-8859-1] Mon Aug 7 11:08:26 2017 @@ -410,7 +410,7 @@ { left = prc->left + pimlData->margin.left; top = prc->top + (prc->bottom - prc->top - ImageSize.cy) / 2; - prc->left += left + pimlData->margin.right + ImageSize.cx; + prc->left = left + pimlData->margin.right + ImageSize.cx; } else if (pimlData->uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT) {

1 0

[hbelusca] 75501: [SYSSETUP]: Fix a typo.
by hbelusca＠svn.reactos.org 07 Aug '17

07 Aug '17

Author: hbelusca Date: Mon Aug 7 11:03:02 2017 New Revision: 75501 URL: http://svn.reactos.org/svn/reactos?rev=75501&view=rev Log: [SYSSETUP]: Fix a typo. Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Mon Aug 7 11:03:02 2017 @@ -145,7 +145,7 @@ IDS_PROCESSTITLE "Enregistrement des composants" IDS_PROCESSSUBTITLE "Veuillez patienter..." IDS_THEMESELECTIONTITLE "Apparence" - IDS_THEMESELECTIONSUBTITLE "SÃ©lectionnez le thÃ¨me que vous prÃ©fÃ¨rez" + IDS_THEMESELECTIONSUBTITLE "SÃ©lectionnez le thÃ¨me que vous prÃ©fÃ©rez" END STRINGTABLE

1 0

[gadamopoulos] 75500: [SHELL32] -Restore some code I incorrectly removed in r75360. CORE-13564
by gadamopoulos＠svn.reactos.org 07 Aug '17

07 Aug '17

Author: gadamopoulos Date: Mon Aug 7 10:09:30 2017 New Revision: 75500 URL: http://svn.reactos.org/svn/reactos?rev=75500&view=rev Log: [SHELL32] -Restore some code I incorrectly removed in r75360. CORE-13564 Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp [iso-8859-1] Mon Aug 7 10:09:30 2017 @@ -85,6 +85,44 @@ // CComPtr fDesktopEnumerator; // CComPtr fCommonDesktopEnumerator; public: + + void AddItemsFromClassicStartMenuKey(HKEY hKeyRoot) + { + DWORD dwResult; + HKEY hkey; + DWORD j = 0, dwVal, Val, dwType, dwIID; + LONG r; + WCHAR iid[50]; + LPITEMIDLIST pidl; + + dwResult = RegOpenKeyExW(hKeyRoot, ClassicStartMenuW, 0, KEY_READ, &hkey); + if (dwResult != ERROR_SUCCESS) + return; + + while(1) + { + dwVal = sizeof(Val); + dwIID = sizeof(iid) / sizeof(WCHAR); + + r = RegEnumValueW(hkey, j++, iid, &dwIID, NULL, &dwType, (LPBYTE)&Val, &dwVal); + if (r != ERROR_SUCCESS) + break; + + if (Val == 0 && dwType == REG_DWORD) + { + pidl = _ILCreateGuidFromStrW(iid); + if (pidl != NULL) + { + if (!HasItemWithCLSID(pidl)) + AddToEnumList(pidl); + else + SHFree(pidl); + } + } + } + RegCloseKey(hkey); + } + HRESULT WINAPI Initialize(DWORD dwFlags,IEnumIDList * pRegEnumerator, IEnumIDList *pDesktopEnumerator, IEnumIDList *pCommonDesktopEnumerator) { BOOL ret = TRUE; @@ -112,6 +150,8 @@ SHFree(pidl); } } + AddItemsFromClassicStartMenuKey(HKEY_LOCAL_MACHINE); + AddItemsFromClassicStartMenuKey(HKEY_CURRENT_USER); } /* Enumerate the items in the two fs folders */

1 0

[rnaumann] 75499: [ACPPAGE][SYSSETUP] Update German translation
by rnaumann＠svn.reactos.org 06 Aug '17

06 Aug '17

Author: rnaumann Date: Sun Aug 6 20:38:49 2017 New Revision: 75499 URL: http://svn.reactos.org/svn/reactos?rev=75499&view=rev Log: [ACPPAGE][SYSSETUP] Update German translation Modified: trunk/reactos/dll/shellext/acppage/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/shellext/acppage/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/acppage/lang/… ============================================================================== --- trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/acppage/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:38:49 2017 @@ -5,7 +5,7 @@ CAPTION "KompatibilitÃ¤t" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Falls dieses Programm Probleme verursacht, wÃ¤hlen Sie einen KompatibilitÃ¤tsmodus, unter dem das Programm mÃ¶glicherweise korrekt funktioniert.\nPlease note that this is a work in progress.", -1, 7, 7, 210, 31 + LTEXT "Falls dieses Programm Probleme verursacht, wÃ¤hlen Sie einen KompatibilitÃ¤tsmodus, unter dem das Programm mÃ¶glicherweise korrekt funktioniert.\nBitte beachten Sie dass sich diese Funktion aktuell in Entwicklung befindet.", -1, 7, 7, 210, 31 GROUPBOX "KompatibilitÃ¤tsmodus", IDC_COMPATGROUP, 7, 41, 210, 49 CHECKBOX "Programm im KompatibilitÃ¤tsmodus ausfÃ¼hren fÃ¼r:", IDC_CHKRUNCOMPATIBILITY, 18, 57, 188, 10, BS_AUTOCHECKBOX | WS_TABSTOP COMBOBOX IDC_COMPATIBILITYMODE, 18, 70, 188, 85, CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED @@ -33,8 +33,8 @@ STRINGTABLE BEGIN - IDS_TABTITLE "Compatibility" - IDS_FAILED_NETWORK "Compatibility modes cannot be set on this program because it is on a network drive." - IDS_FAILED_PROTECTED "Compatibility modes cannot be set on this program because it is a part of ReactOS." - IDS_YOU_DID_NOT_ADD "You did not add the mode, do you want to add it now?" + IDS_TABTITLE "KompatibilitÃ¤t" + IDS_FAILED_NETWORK "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es sich auf einem Netzlaufwerk befindet." + IDS_FAILED_PROTECTED "KompatibilitÃ¤tsmodi kÃ¶nnen auf diesem Programm nicht angewendet werden, da es Teil von ReactOS ist." + IDS_YOU_DID_NOT_ADD "Sie haben den Modus nicht hinzugefÃ¼gt, mÃ¶chten Sie ihn jetzt hinzufÃ¼gen?" END Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:38:49 2017 @@ -88,8 +88,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Lautus Theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Klassisches Theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -144,8 +144,8 @@ IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit fÃ¼r Ihren Computer ein." IDS_PROCESSTITLE "Komponenten werden registriert" IDS_PROCESSSUBTITLE "Bitte warten..." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" + IDS_THEMESELECTIONTITLE "Erscheinungsbild" + IDS_THEMESELECTIONSUBTITLE "WÃ¤hlen Sie Ihr bevorzugtes Theme" END STRINGTABLE

1 0

[rnaumann] 75498: [CPL] Improve some German string translationd. This better matches the position of the applets in the control panel and avoids truncation of the icon captions. Patch by Joachim He...
by rnaumann＠svn.reactos.org 06 Aug '17

06 Aug '17

Author: rnaumann Date: Sun Aug 6 20:23:00 2017 New Revision: 75498 URL: http://svn.reactos.org/svn/reactos?rev=75498&view=rev Log: [CPL] Improve some German string translationd. This better matches the position of the applets in the control panel and avoids truncation of the icon captions. Patch by Joachim Henze. CORE-12099 #resolve #comment Committed all but "Ordneroptionen -> Ordner" in r75498 Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc trunk/reactos/dll/cpl/joy/lang/de-DE.rc trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc trunk/reactos/dll/cpl/telephon/lang/de-DE.rc trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/appwiz/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -67,7 +67,7 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Programme hinzufÃ¼gen/entfernen" + IDS_CPLSYSTEMNAME "Software" IDS_CPLSYSTEMDESCRIPTION "Installiert Programme und erstellt VerknÃ¼pfungen." IDS_CREATE_SHORTCUT "VerknÃ¼pfung erstellen" IDS_ERROR_NOT_FOUND "Die Datei %s konnte nicht gefunden werden." Modified: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -25,7 +25,7 @@ STRINGTABLE BEGIN - IDS_CPL_NAME "Internetoptionen" + IDS_CPL_NAME "Internet" IDS_CPL_INFO "Konfiguration des Wine Internet Browsers und dessen Einstellungen" IDS_SEC_SETTINGS "Sicherheitseinstellungen fÃ¼r Zone: " IDS_SEC_LEVEL0 "Benutzerdefiniert" Modified: trunk/reactos/dll/cpl/joy/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/de-DE.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -3,12 +3,12 @@ IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Spielcontroller" +CAPTION "Gamecontroller" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 - LTEXT "Ãber diese Einstellungen kÃ¶nnen an den PC angeschlossene Spielcontroller konfiguriert werden.", -1, 33, 7, 214, 20, NOT WS_GROUP - GROUPBOX "I&nstallierte Spielcontroller", -1, 7, 34, 238, 117 + LTEXT "Ãber diese Einstellungen kÃ¶nnen an den PC angeschlossene Gamecontroller konfiguriert werden.", -1, 33, 7, 214, 20, NOT WS_GROUP + GROUPBOX "I&nstallierte Gamecontroller", -1, 7, 34, 238, 117 CONTROL "List1", IDC_CONTROLLER_LIST, "SysListView32", WS_BORDER | WS_GROUP | WS_TABSTOP | 0x0000808D, 14, 44, 224, 80 PUSHBUTTON "&HinzufÃ¼gen...", IDC_ADD_BUTTON, 35, 129, 65, 14 PUSHBUTTON "&Entfernen", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED @@ -21,12 +21,12 @@ IDD_ADD DIALOGEX 0, 0, 265, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Spielcontroller hinzufÃ¼gen" +CAPTION "Gamecontroller hinzufÃ¼gen" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 8, 7, 20, 20 - LTEXT "WÃ¤hlen Sie einen Spielcontroller aus der Liste und klicken Sie auf OK. Wenn Ihr Spielcontroller nicht in der Liste erscheint, klicken Sie auf Benutzerdefiniert.", -1, 35, 7, 210, 33 - LTEXT "&Spielcontroller:", -1, 8, 45, 126, 8 + LTEXT "WÃ¤hlen Sie einen Gamecontroller aus der Liste und klicken Sie auf OK. Wenn Ihr Gamecontroller nicht in der Liste erscheint, klicken Sie auf Benutzerdefiniert.", -1, 35, 7, 210, 33 + LTEXT "Game&controller:", -1, 8, 45, 126, 8 LISTBOX IDC_GAME_CONTROLLERS_LIST, 7, 55, 251, 57, LBS_STANDARD | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_HSCROLL | WS_TABSTOP AUTOCHECKBOX "&Ruder und Pedale aktivieren", IDC_ENABLE_RUDDERS_CHECKBOX, 7, 114, 105, 10, WS_GROUP LTEXT "&Gameport:", -1, 7, 134, 38, 8, NOT WS_VISIBLE @@ -40,7 +40,7 @@ IDD_CUSTOM DIALOGEX 0, 0, 265, 183, 0 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Benutzerdefinierter Spielcontroller" +CAPTION "Benutzerdefinierter Gamecontroller" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Spezielle Eigenschaften", -1, 7, 7, 245, 52 @@ -77,8 +77,8 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Spielcontroller" - IDS_CPLSYSTEMDESCRIPTION "HinzufÃ¼gen, Entfernen und Konfigurieren von Spielcontrollerhardware wie Joysticks und Gamepads." + IDS_CPLSYSTEMNAME "Gamecontroller" + IDS_CPLSYSTEMDESCRIPTION "HinzufÃ¼gen, Entfernen und Konfigurieren von Gamecontrollerhardware wie Joysticks und Gamepads." IDS_CONTROLLER "Controller" IDS_STATUS "Status" END Modified: trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -105,7 +105,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME_1 "Energieoptionen" + IDS_CPLNAME_1 "Energie" IDS_CPLDESCRIPTION_1 "Konfiguriert die Energiespareinstellungen fÃ¼r den Computer." IDS_PROCENT "%i%%" IDS_SOUND "Klang" Modified: trunk/reactos/dll/cpl/telephon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/telephon/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -2,6 +2,6 @@ STRINGTABLE BEGIN - IDS_CPLSYSTEMNAME "Telefon- und Modemeinstellungen" + IDS_CPLSYSTEMNAME "Telefon und Modem" IDS_CPLSYSTEMDESCRIPTION "Konfiguriert WÃ¤hlregeln zum Telefonieren und Modemoptionen." END Modified: trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/lang/de-DE.… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/lang/de-DE.rc [iso-8859-1] Sun Aug 6 20:23:00 2017 @@ -201,7 +201,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME "Benutzerkonten" + IDS_CPLNAME "Benutzer" IDS_CPLDESCRIPTION "Verwaltet Benutzer und Gruppen" END

1 0

[ssawant] 75497: [STOBJECT] -Added new battery icons and hotplug icons, thanks to Pi_User5. -Modified resources for the same. -Modified CSysTray to support icon hiding feature. -Modified hotplug.cp...
by ssawant＠svn.reactos.org 06 Aug '17

06 Aug '17

Author: ssawant Date: Sun Aug 6 16:33:27 2017 New Revision: 75497 URL: http://svn.reactos.org/svn/reactos?rev=75497&view=rev Log: [STOBJECT] -Added new battery icons and hotplug icons, thanks to Pi_User5. -Modified resources for the same. -Modified CSysTray to support icon hiding feature. -Modified hotplug.cpp by adding experimental enumeration to test icon behavior. -Icon behavior successfully tested. -Added code to eject device, works fine. -Fixed a bug which didn't showed attached devices after reloading. (like after system restart or explorer restart.) -Now at least pen-drives are safely removable. (Still experimental though, use at your own risk ;P) -Tested in winxp vm, needs further testing. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/0.ico (with props) branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/1.ico (with props) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.h branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/hotplug.cpp branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/0.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/1.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/2.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/3.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/4.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/5.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging0.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging1.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging2.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging3.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging4.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/error.ico branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.cpp [iso-8859-1] Sun Aug 6 16:33:27 2017 @@ -4,6 +4,7 @@ * FILE: dll/shellext/stobject/csystray.cpp * PURPOSE: Systray shell service object implementation * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> +* Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #include "precomp.h" @@ -97,7 +98,7 @@ return S_FALSE; } -HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip) +HRESULT CSysTray::NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate) { NOTIFYICONDATA nim = { 0 }; @@ -108,8 +109,8 @@ nim.hIcon = hIcon; nim.uID = uId; nim.uCallbackMessage = uId; - nim.dwState = 0; - nim.dwStateMask = 0; + nim.dwState = dwstate; + nim.dwStateMask = NIS_HIDDEN; nim.hWnd = m_hWnd; nim.uVersion = NOTIFYICON_VERSION; if (szTip) Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/csystray.h [iso-8859-1] Sun Aug 6 16:33:27 2017 @@ -5,6 +5,7 @@ * PURPOSE: Systray shell service object * PROGRAMMERS: Robert Naumann * David Quintana <gigaherz(a)gmail.com> + * Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ #pragma once @@ -43,7 +44,7 @@ HRESULT ShutdownNetShell(); public: - HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip); + HRESULT NotifyIcon(INT code, UINT uId, HICON hIcon, LPCWSTR szTip, DWORD dwstate = 0); HWND GetHWnd() { return m_hWnd; } Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/hotplug.cpp URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/hotplug.cpp [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/hotplug.cpp [iso-8859-1] Sun Aug 6 16:33:27 2017 @@ -5,33 +5,87 @@ * PURPOSE: Removable devices notification icon handler * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official(a)hotmail.com> */ - +#include <windows.h> #include "precomp.h" #include <mmsystem.h> #include <mmddk.h> #include <atlstr.h> +#include <atlsimpcoll.h> +#include <dbt.h> +#include <setupapi.h> +#include <cfgmgr32.h> WINE_DEFAULT_DEBUG_CHANNEL(stobject); - +#define DISPLAY_NAME_LEN 40 + +//BOOL WINAPI UnregisterDeviceNotification(HDEVNOTIFY Handle); + +CSimpleArray<DEVINST> g_devList; +static HDEVNOTIFY g_hDevNotify = NULL; static HICON g_hIconHotplug = NULL; static LPWSTR g_strTooltip = L"Safely Remove Hardware and Eject Media"; static BOOL g_IsRunning = FALSE; +static BOOL g_IsRemoved = FALSE; + +// Enumerate the connected removable devices +// TODO: Require proper enumeration and filters. +HRESULT EnumHotpluggedDevices(CSimpleArray<DEVINST> &devList) +{ + devList.RemoveAll(); // Clear current devList + HDEVINFO hdev = SetupDiGetClassDevs(NULL, NULL, 0, DIGCF_ALLCLASSES | DIGCF_PRESENT); + if (INVALID_HANDLE_VALUE == hdev) + return E_HANDLE; + SP_DEVINFO_DATA did = { 0 }; + did.cbSize = sizeof(did); + + for (int idev = 0; SetupDiEnumDeviceInfo(hdev, idev, &did); idev++) + { + DWORD dwCapabilities = 0, dwSize = sizeof(dwCapabilities); + WCHAR dispName[DISPLAY_NAME_LEN]; + ULONG ulStatus = 0, ulPnum = 0, ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); + CONFIGRET cr = CM_Get_DevNode_Status(&ulStatus, &ulPnum, did.DevInst, 0); + if (cr != CR_SUCCESS) + continue; + cr = CM_Get_DevNode_Registry_Property(did.DevInst, CM_DRP_DEVICEDESC, NULL, dispName, &ulLength, 0); + if (cr != CR_SUCCESS) + continue; + cr = CM_Get_DevNode_Registry_Property(did.DevInst, CM_DRP_CAPABILITIES, NULL, &dwCapabilities, &dwSize, 0); + if (cr != CR_SUCCESS) + continue; + + if ((dwCapabilities & CM_DEVCAP_REMOVABLE) && (dwCapabilities & CM_DEVCAP_UNIQUEID)) + { + devList.Add(did.DevInst); + } + } + SetupDiDestroyDeviceInfoList(hdev); + + if (NO_ERROR != GetLastError() && ERROR_NO_MORE_ITEMS != GetLastError()) + { + return E_UNEXPECTED; + } + + return S_OK; +} HRESULT STDMETHODCALLTYPE Hotplug_Init(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Init\n"); - g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_EXTRACT)); + g_hIconHotplug = LoadIcon(g_hInstance, MAKEINTRESOURCE(IDI_HOTPLUG_OK)); g_IsRunning = TRUE; - - return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + EnumHotpluggedDevices(g_devList); + + return pSysTray->NotifyIcon(NIM_ADD, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); } HRESULT STDMETHODCALLTYPE Hotplug_Update(_In_ CSysTray * pSysTray) { TRACE("Hotplug_Update\n"); - //g_hIconHotplug = DynamicLoadIcon(g_hInstance); - - return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + + if(g_devList.GetSize()) + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip); + else + return pSysTray->NotifyIcon(NIM_MODIFY, ID_ICON_HOTPLUG, g_hIconHotplug, g_strTooltip, NIS_HIDDEN); } HRESULT STDMETHODCALLTYPE Hotplug_Shutdown(_In_ CSysTray * pSysTray) @@ -42,16 +96,26 @@ return pSysTray->NotifyIcon(NIM_DELETE, ID_ICON_HOTPLUG, NULL, NULL); } -static void _RunHotplug() -{ - ShellExecuteW(NULL, NULL, L"hotplug.cpl", NULL, NULL, SW_SHOWNORMAL); +static void _RunHotplug(CSysTray * pSysTray) +{ + ShellExecuteW(pSysTray->GetHWnd(), L"open", L"rundll32.exe shell32.dll,Control_RunDLL hotplug.dll", NULL, NULL, SW_SHOWNORMAL); } static void _ShowContextMenu(CSysTray * pSysTray) -{ - CString strOpen((LPCSTR)IDS_HOTPLUG_REMOVE_2); - HMENU hPopup = CreatePopupMenu(); - AppendMenuW(hPopup, MF_STRING, IDS_HOTPLUG_REMOVE_2, strOpen); +{ + HMENU hPopup = CreatePopupMenu(); + + for (UINT index = 0; index < g_devList.GetSize(); index++) + { + WCHAR dispName[DISPLAY_NAME_LEN], menuName[DISPLAY_NAME_LEN + 10]; + ULONG ulLength = DISPLAY_NAME_LEN * sizeof(WCHAR); + CONFIGRET cr = CM_Get_DevNode_Registry_Property(g_devList[index], CM_DRP_DEVICEDESC, NULL, dispName, &ulLength, 0); + if (cr != CR_SUCCESS) + StrCpyW(dispName, L"Unknown Device"); + + swprintf(menuName, L"Eject %wS", dispName); + AppendMenuW(hPopup, MF_STRING, index+1, menuName); + } SetForegroundWindow(pSysTray->GetHWnd()); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; @@ -60,23 +124,69 @@ DWORD id = TrackPopupMenuEx(hPopup, flags, pt.x, pt.y, - pSysTray->GetHWnd(), NULL); - - switch (id) - { - case IDS_HOTPLUG_REMOVE_2: - _RunHotplug(); - break; - } + pSysTray->GetHWnd(), NULL); + + if (id > 0) + { + id--; // since array indices starts from zero. + CONFIGRET cr = CM_Request_Device_Eject_Ex(g_devList[id], 0, 0, 0, 0, 0); + if (cr != CR_SUCCESS) + MessageBox(0, L"Device ejection failed!! Please try again after closing any open programs on device!", L"Safely Remove Hardware", MB_OKCANCEL | MB_ICONEXCLAMATION); + else + { + MessageBox(0, L"Device ejected successfully!! You can safely remove the device now!", L"Safely Remove Hardware", MB_OKCANCEL | MB_ICONINFORMATION); + g_devList.RemoveAt(id); + } + } + DestroyMenu(hPopup); } +static void _ShowContextMenuR(CSysTray * pSysTray) +{ + CString strMenu((LPWSTR)IDS_HOTPLUG_REMOVE_2); + HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_HOTPLUG_REMOVE_2, strMenu); + + SetForegroundWindow(pSysTray->GetHWnd()); + DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; + POINT pt; + GetCursorPos(&pt); + + DWORD id = TrackPopupMenuEx(hPopup, flags, + pt.x, pt.y, + pSysTray->GetHWnd(), NULL); + + if (id == IDS_HOTPLUG_REMOVE_2) + { + _RunHotplug(pSysTray); + } + + DestroyMenu(hPopup); +} + HRESULT STDMETHODCALLTYPE Hotplug_Message(_In_ CSysTray * pSysTray, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT &lResult) { - TRACE("Hotplug_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); + TRACE("Hotplug_Message uMsg=%d, wParam=%x, lParam=%x\n", uMsg, wParam, lParam); switch (uMsg) { + /*case WM_CREATE: + TRACE("Hotplug_Message: WM_CREATE\n"); + DEV_BROADCAST_DEVICEINTERFACE NotificationFilter; + + ZeroMemory(&NotificationFilter, sizeof(NotificationFilter)); + NotificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE); + NotificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + + g_hDevNotify = RegisterDeviceNotification(pSysTray->GetHWnd(), &NotificationFilter, DEVICE_NOTIFY_WINDOW_HANDLE | DEVICE_NOTIFY_ALL_INTERFACE_CLASSES); + if (g_hDevNotify != NULL) + { + lResult = true; + return S_OK; + } + return S_FALSE;*/ + case WM_USER + 220: TRACE("Hotplug_Message: WM_USER+220\n"); if (wParam == 1) @@ -106,18 +216,18 @@ break; case WM_LBUTTONUP: - MessageBox(0, L"Safely Remove Hardware", L"Test", MB_OKCANCEL | MB_ICONINFORMATION); + _ShowContextMenu(pSysTray); break; case WM_LBUTTONDBLCLK: - _RunHotplug(); + _RunHotplug(pSysTray); break; case WM_RBUTTONDOWN: break; case WM_RBUTTONUP: - _ShowContextMenu(pSysTray); + _ShowContextMenuR(pSysTray); break; case WM_RBUTTONDBLCLK: @@ -127,6 +237,25 @@ break; } return S_OK; + + case WM_DEVICECHANGE: + switch (wParam) + { + case DBT_DEVNODES_CHANGED: + HRESULT hr = EnumHotpluggedDevices(g_devList); + if (FAILED(hr)) + return hr; + } + + lResult = true; + return S_OK; + + /*case WM_CLOSE: + if (!UnregisterDeviceNotification(hDeviceNotify)) + { + return S_FALSE; + } + return S_OK;*/ default: TRACE("Hotplug_Message received for unknown ID %d, ignoring.\n"); Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resource.h [iso-8859-1] Sun Aug 6 16:33:27 2017 @@ -39,17 +39,20 @@ #define IDS_KEYS_MOUSE 331 #define IDS_KEYS_FILTER 332 -#define IDI_BATTCAP0 400 -#define IDI_BATTCAP1 401 -#define IDI_BATTCAP2 402 -#define IDI_BATTCAP3 403 -#define IDI_BATTCAP4 404 -#define IDI_BATTCAP5 405 -#define IDI_BATTCHA0 406 -#define IDI_BATTCHA1 407 -#define IDI_BATTCHA2 408 -#define IDI_BATTCHA3 409 -#define IDI_BATTCHA4 410 -#define IDI_BATTCAP_ERR 412 +#define IDI_BATTCAP0 400 +#define IDI_BATTCAP1 401 +#define IDI_BATTCAP2 402 +#define IDI_BATTCAP3 403 +#define IDI_BATTCAP4 404 +#define IDI_BATTCAP5 405 +#define IDI_BATTCHA0 406 +#define IDI_BATTCHA1 407 +#define IDI_BATTCHA2 408 +#define IDI_BATTCHA3 409 +#define IDI_BATTCHA4 410 +#define IDI_BATTCAP_ERR 412 + +#define IDI_HOTPLUG_ERR 420 +#define IDI_HOTPLUG_OK 421 #define IDR_SYSTRAY 11001 Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/0.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/1.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/2.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/3.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/4.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/5.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging0.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging1.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging2.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging3.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/charging4.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/battery/error.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary files - no diff available. Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/0.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/0.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/1.ico URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== Binary file - no diff available. Propchange: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/resources/hotplug/1.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2017/shellext/reactos/dll/… ============================================================================== --- branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] (original) +++ branches/GSoC_2017/shellext/reactos/dll/shellext/stobject/stobject.rc [iso-8859-1] Sun Aug 6 16:33:27 2017 @@ -25,6 +25,10 @@ IDI_BATTCHA4 ICON "resources/battery/charging4.ico" IDI_BATTCAP_ERR ICON "resources/battery/error.ico" + +IDI_HOTPLUG_ERR ICON "resources/hotplug/0.ico" +IDI_HOTPLUG_OK ICON "resources/hotplug/1.ico" + IDR_SYSTRAY REGISTRY "resources/rgs/systray.rgs"

1 0

[pschweitzer] 75496: [SYSSETUP] Translate r75495 in French. Thanks Giannis! :-)
by pschweitzer＠svn.reactos.org 06 Aug '17

06 Aug '17

Author: pschweitzer Date: Sun Aug 6 12:15:19 2017 New Revision: 75496 URL: http://svn.reactos.org/svn/reactos?rev=75496&view=rev Log: [SYSSETUP] Translate r75495 in French. Thanks Giannis! :-) Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Aug 6 12:15:19 2017 @@ -85,11 +85,11 @@ IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Setup" +CAPTION "Installation de ReactOS" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE - PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "ThÃ¨me Lautus", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "ThÃ¨me Classique", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -144,8 +144,8 @@ IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." IDS_PROCESSTITLE "Enregistrement des composants" IDS_PROCESSSUBTITLE "Veuillez patienter..." - IDS_THEMESELECTIONTITLE "Appearance" - IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" + IDS_THEMESELECTIONTITLE "Apparence" + IDS_THEMESELECTIONSUBTITLE "SÃ©lectionnez le thÃ¨me que vous prÃ©fÃ¨rez" END STRINGTABLE

1 0

[gadamopoulos] 75495: [SYSSETUP] -Implement a wizard page that lets the user select lautus as the default theme. If the user keeps pressing enter, the theme will not be applied.
by gadamopoulos＠svn.reactos.org 06 Aug '17

06 Aug '17

Author: gadamopoulos Date: Sun Aug 6 09:18:19 2017 New Revision: 75495 URL: http://svn.reactos.org/svn/reactos?rev=75495&view=rev Log: [SYSSETUP] -Implement a wizard page that lets the user select lautus as the default theme. If the user keeps pressing enter, the theme will not be applied. Added: trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp (with props) trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp (with props) Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/syssetup/lang/da-DK.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/el-GR.rc trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/es-ES.rc trunk/reactos/dll/win32/syssetup/lang/et-EE.rc trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc trunk/reactos/dll/win32/syssetup/lang/he-IL.rc trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc trunk/reactos/dll/win32/syssetup/lang/id-ID.rc trunk/reactos/dll/win32/syssetup/lang/it-IT.rc trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc trunk/reactos/dll/win32/syssetup/lang/th-TH.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc trunk/reactos/dll/win32/syssetup/resource.h trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Ð¡Ð°Ð¼Ð¾Ð¿ÑÐµÐ²ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ°ÑÐ¾Ð²Ð½Ð¸ÐºÐ° Ð·Ð° Ð·Ð¸Ð¼Ð½Ð¾ Ð¸ Ð»ÑÑÐ½Ð¾ Ð²ÑÐµÐ¼Ðµ", IDC_AUTODAYLIGHT, 53, 124, 220, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "ÐÐ°Ð´Ð°Ð¹ÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸ÑÐµ Ð´Ð°ÑÐ° Ð¸ Ð²ÑÐµÐ¼Ðµ." IDS_PROCESSTITLE "ÐÐ¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÑÑÑÐ°Ð²Ð½Ð¸ÑÐµ" IDS_PROCESSSUBTITLE "ÐÐ¾ÑÐ°ÐºÐ°Ð¹ÑÐµ..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -89,6 +89,15 @@ AUTOCHECKBOX "Automaticky nastavit hodiny pÅi pÅechodu na &letnÃ Äas a zpÄt", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS InstalÃ¡tor" @@ -141,6 +150,8 @@ IDS_DATETIMESUBTITLE "Nastavte sprÃ¡vnÃ½ Äas pro VÃ¡Å¡ poÄÃtaÄ." IDS_PROCESSTITLE "Registrace souÄÃ¡stÃ" IDS_PROCESSSUBTITLE "ProsÃm Äekejte..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/da… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/da-DK.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "&Uhr automatisch auf Sommer-/Winterzeit umstellen", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS-Installation" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Stellen Sie das korrekte Datum und die Uhrzeit fÃ¼r Ihren Computer ein." IDS_PROCESSTITLE "Komponenten werden registriert" IDS_PROCESSSUBTITLE "Bitte warten..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/el… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/el-GR.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "&ÎÏÏÏÎ¼Î±ÏÎ· ÏÏÎ¸Î¼Î¹ÏÎ· Î¼Îµ ÏÎ·Î½ Î±Î»Î»Î±Î³Î® Î¸ÎµÏÎ¹Î½Î®Ï ÏÏÎ±Ï", IDC_AUTODAYLIGHT, 53, 114, 190, 20 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÎÎ³ÎºÎ±ÏÎ¬ÏÏÎ±ÏÎ· ÏÎ¿Ï ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "ÎÏÎ¯ÏÏÎµ ÏÎ· ÏÏÏÏÎ® Î·Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± ÎºÎ±Î¹ ÏÏÎ± Î³Î¹Î± ÏÎ¿Î½ ÏÏÎ¿Î»Î¿Î³Î¹ÏÏÎ® ÏÎ±Ï." IDS_PROCESSTITLE "Î¤Î¯ÏÎ»Î¿Ï" IDS_PROCESSSUBTITLE "Î¥ÏÏÏÎ¹ÏÎ»Î¿Ï" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,9 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" + END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/es… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/es-ES.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -84,6 +84,15 @@ AUTOCHECKBOX "Ajustar el reloj automÃ¡ticamente durante el horario de verano", IDC_AUTODAYLIGHT, 53, 124, 230, 10 //201 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "InstalaciÃ³n de ReactOS" @@ -136,6 +145,8 @@ IDS_DATETIMESUBTITLE "Fije la fecha y hora correcta de su equipo." IDS_PROCESSTITLE "Registrando componentes" IDS_PROCESSSUBTITLE "Espere un momento..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/et… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/et-EE.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "SÃ¤ti &suveajale Ã¼leminekul kellaaeg automaatselt", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOSi paigaldamine" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Sisesta Ãµige kellaaeg ja kuupÃ¤ev." IDS_PROCESSTITLE "Komponentide registreerimine" IDS_PROCESSSUBTITLE "Palun oota..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fi… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fi-FI.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/fr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/fr-FR.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Ajuster automatiquement l'horloge pour l'heure &d'Ã©tÃ©", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Configurez la date et l'heure correcte pour votre ordinateur." IDS_PROCESSTITLE "Enregistrement des composants" IDS_PROCESSSUBTITLE "Veuillez patienter..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/he… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/he-IL.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "××ª×§× ×ª ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "×¨××©× ××¨×××××" IDS_PROCESSSUBTITLE "× × ××××ª××..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/hu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/hu-HU.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Automatikus Ã¡tÃ¡llÃ¡s a nyÃ¡ri idÃµszÃ¡mÃtÃ¡sra", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS TelepÃtÃµ" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "BeÃ¡llÃthatod a szÃ¡mÃtÃ³gÃ©p dÃ¡tumÃ¡t Ã©s Ã³rÃ¡jÃ¡t." IDS_PROCESSTITLE "Process page title" IDS_PROCESSSUBTITLE "Process page subtitle" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/id… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/id-ID.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Otomatis menyesuaikan waktu atas perubahan &daylight saving", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Setup ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Setel tanggal dan jam yang benar untuk komputer anda." IDS_PROCESSTITLE "Judul halaman proses" IDS_PROCESSSUBTITLE "Subjudul halaman proses" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/it… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/it-IT.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Cambia automaticamente con l'ora &legale", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installazione di ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Impostare la data e l'ora corrette per il proprio computer." IDS_PROCESSTITLE "Registrazione dei componenti" IDS_PROCESSSUBTITLE "Attendere prego..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ja… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ja-JP.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "èªåçã«ãµãã¼ã¿ã¤ã ã®èª¿æ´ããã(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS ã»ããã¢ãã" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "ã³ã³ãã¥ã¼ã¿ã®æ¥ä»ã¨æå»ãæ£ããè¨å®ãã¦ãã ããã" IDS_PROCESSTITLE "ã³ã³ãã¼ãã³ãã®ç»é²ä¸" IDS_PROCESSSUBTITLE "ãå¾ã¡ãã ãã..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/lt… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/lt-LT.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Juster klokken automatisk for &sommertid", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS installasjon" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Still inn dato og tid for din datamaskin." IDS_PROCESSTITLE "Bearbeid side tittel" IDS_PROCESSSUBTITLE "Bearbeider side undertittel" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Automatycznie ustaw zegar przy &zmianie czasu (DST)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalator ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Ustaw prawidÅowÄ datÄ i czas." IDS_PROCESSTITLE "Rejestracja skÅadnikÃ³w" IDS_PROCESSSUBTITLE "ProszÄ czekaÄ..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pt… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/pt-BR.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "Ajustar o relÃ³gio automaticamente para o horÃ¡rio de &verÃ£o", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "InstalaÃ§Ã£o do ReactOS" @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "Definir a data e a hora corretas para o seu computador." IDS_PROCESSTITLE "Registrando componentes" IDS_PROCESSSUBTITLE "Por favor aguarde..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -90,6 +90,15 @@ LTEXT "Fusul orar:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Aj&usteazÄ ora automat la schimbarea fusului orar", IDC_AUTODAYLIGHT, 53, 124, 201, 10 +END + +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -144,6 +153,8 @@ IDS_DATETIMESUBTITLE "Stabilire datÄ Èi orÄ corectÄ pentru calculator" IDS_PROCESSTITLE "Ãnregistrare componente" IDS_PROCESSSUBTITLE "AÈteptaÈiâ¦" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -85,6 +85,15 @@ AUTOCHECKBOX "ÐÐ²&ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð¿ÐµÑÐµÑÐ¾Ð´ Ð½Ð° Ð»ÐµÑÐ½ÐµÐµ Ð²ÑÐµÐ¼Ñ Ð¸ Ð¾Ð±ÑÐ°ÑÐ½Ð¾.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS" @@ -137,6 +146,8 @@ IDS_DATETIMESUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐµ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÑ Ð´Ð°ÑÑ Ð¸ Ð²ÑÐµÐ¼Ñ Ð½Ð° Ð²Ð°ÑÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ." IDS_PROCESSTITLE "ÐÑÐ¾ÑÐµÑÑ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸" IDS_PROCESSSUBTITLE "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° ReactOS Ð½Ð° Ð²Ð°Ñ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sk-SK.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -89,6 +89,15 @@ AUTOCHECKBOX "Automaticky posunÃºÅ¥ hodiny pri prechode na &letnÃ½ Äas a spÃ¤Å¥", IDC_AUTODAYLIGHT, 53, 124, 220, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "InÅ¡talÃ¡tor systÃ©mu ReactOS" @@ -141,6 +150,8 @@ IDS_DATETIMESUBTITLE "Nastavte sprÃ¡vny Äas pre VÃ¡Å¡ poÄÃtaÄ." IDS_PROCESSTITLE "RegistrÃ¡cia sÃºÄastÃ" IDS_PROCESSSUBTITLE "PoÄkajte, prosÃm ..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sq-AL.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Adaptohen automatikisht orÃ«n pÃ«r ditÃ«n me diell dhe ruaj ndryshimet", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "NdÃ«rto ReactOS" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Vendos datÃ«n e saktÃ« dhe orÃ«n pÃ«r kompjuterin tuaj." IDS_PROCESSTITLE "Regjistrimi Komponenteve" IDS_PROCESSSUBTITLE "Ju Lutem prisni..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/sv… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/sv-SE.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/th… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/th-TH.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -102,6 +102,15 @@ AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Setup" @@ -154,6 +163,8 @@ IDS_DATETIMESUBTITLE "Set the correct date and time for your computer." IDS_PROCESSTITLE "Registering Components" IDS_PROCESSSUBTITLE "Please wait..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -85,6 +85,15 @@ AUTOCHECKBOX "&GÃ¼n Ä±ÅÄ±ÄÄ± tutum deÄiÅiklikleri iÃ§in saati kendiliÄinden ayarla.", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Kur" @@ -137,6 +146,8 @@ IDS_DATETIMESUBTITLE "BilgisayarÄ±nÄ±z iÃ§in doÄru zamÃ¢nÄ± ayarlayÄ±nÄ±z." IDS_PROCESSTITLE "BileÅenler Kaydediliyor" IDS_PROCESSSUBTITLE "LÃ¼tfen bekleyiniz..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -89,6 +89,15 @@ LTEXT "Ð§Ð°ÑÐ¾Ð²Ð¸Ð¹ Ð¿Ð¾ÑÑ", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸&ÑÐ½Ðµ Ð¿ÐµÑÐµÐ²ÐµÐ´ÐµÐ½Ð½Ñ Ð³Ð¾Ð´Ð¸Ð½Ð½Ð¸ÐºÐ° Ð½Ð° Ð»ÑÑÐ½Ð¸Ð¹/Ð·Ð¸Ð¼Ð¾Ð²Ð¸Ð¹ ÑÐ°Ñ", IDC_AUTODAYLIGHT, 53, 124, 219, 10 +END + +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 @@ -143,6 +152,8 @@ IDS_DATETIMESUBTITLE "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ñ Ð´Ð°ÑÑ Ñ ÑÐ°Ñ Ð´Ð»Ñ ÐÐ°ÑÐ¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑÐ°." IDS_PROCESSTITLE "Ð ÐµÑÑÑÑÐ°ÑÑÑ ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÐµÐ½ÑÑÐ²" IDS_PROCESSSUBTITLE "ÐÐ°ÑÐµÐºÐ°Ð¹ÑÐµ, Ð±ÑÐ´Ñ Ð»Ð°ÑÐºÐ°..." + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-CN.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -83,6 +83,15 @@ AUTOCHECKBOX "å¤æ¶å¶èªå¨è°æ´æ¶é´(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS å®è£åå¯¼ " @@ -135,6 +144,8 @@ IDS_DATETIMESUBTITLE "ä¸ºæ¨çè®¡ç®æºéç½®æ£ç¡®çæ¥æåæ¶é´ã" IDS_PROCESSTITLE "æ£å¨å®è£" IDS_PROCESSSUBTITLE "æ£å¨å®æ ReactOS æåçå®è£" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/zh… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/zh-TW.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -85,6 +85,15 @@ AUTOCHECKBOX "å¤æå¶èªåèª¿æ´æé(&D)", IDC_AUTODAYLIGHT, 53, 124, 201, 10 END +IDD_THEMEPAGE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS Setup" +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Lautus theme", IDC_THEMEDSTYLE, 18,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE + PUSHBUTTON "Classic theme", IDC_CLASSICSTYLE, 175,12, 130,120, BS_AUTORADIOBUTTON|BS_PUSHLIKE +END + IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS å®è£å®å° " @@ -137,6 +146,8 @@ IDS_DATETIMESUBTITLE "ç²æ¨çè¨ç®æ©éç½®æ£ç¢ºçæ¥æåæéã" IDS_PROCESSTITLE "æ£å¨å®è£" IDS_PROCESSSUBTITLE "æ£å¨å®æ ReactOS æå¾çå®è£" + IDS_THEMESELECTIONTITLE "Appearance" + IDS_THEMESELECTIONSUBTITLE "Select the theme you prefer" END STRINGTABLE Modified: trunk/reactos/dll/win32/syssetup/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== --- trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/resource.h [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -20,6 +20,8 @@ #define IDB_WATERMARK 100 #define IDB_HEADER 101 +#define IDB_CLASSIC 102 +#define IDB_LAUTUS 103 #define IDI_ICON1 10 #define IDI_ICON2 11 @@ -66,6 +68,10 @@ #define IDC_FINISHTITLE 1071 #define IDC_RESTART_PROGRESS 1072 +#define IDD_THEMEPAGE 1080 +#define IDC_THEMEDSTYLE 1081 +#define IDC_CLASSICSTYLE 1082 + #define IDD_GPL 2100 #define IDC_GPL_TEXT 2101 @@ -89,6 +95,9 @@ #define IDS_PROCESSTITLE 3060 #define IDS_PROCESSSUBTITLE 3061 + +#define IDS_THEMESELECTIONTITLE 3070 +#define IDS_THEMESELECTIONSUBTITLE 3071 #define IDS_ACKPROJECTS 3100 Added: trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/thmclassic.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/resourc… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/syssetup/resources/thmlautus.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -15,6 +15,8 @@ /* Bitmaps */ IDB_WATERMARK BITMAP "resources/watermark.bmp" IDB_HEADER BITMAP "resources/header.bmp" +IDB_CLASSIC BITMAP "resources/thmclassic.bmp" +IDB_LAUTUS BITMAP "resources/thmlautus.bmp" IDI_ICON1 ICON "resources/1.ico" IDI_ICON2 ICON "resources/2.ico" Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sun Aug 6 09:18:19 2017 @@ -16,6 +16,8 @@ #include <time.h> #include <winnls.h> #include <windowsx.h> +#include <wincon.h> +#include <shlobj.h> #define NDEBUG #include <debug.h> @@ -704,7 +706,7 @@ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); if (pSetupData->UnattendSetup && WriteComputerSettings(pSetupData->ComputerName, hwndDlg)) { - SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_DATETIMEPAGE); + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, IDD_THEMEPAGE); return TRUE; } break; @@ -1604,6 +1606,89 @@ return FALSE; } + +static INT_PTR CALLBACK +ThemePageDlgProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PSETUPDATA SetupData; + + /* Retrieve pointer to the global setup data */ + SetupData = (PSETUPDATA)GetWindowLongPtr (hwndDlg, GWL_USERDATA); + + switch (uMsg) + { + case WM_INITDIALOG: + { + BUTTON_IMAGELIST imldata = {0, {0,10,0,10}, BUTTON_IMAGELIST_ALIGN_TOP}; + + /* Save pointer to the global setup data */ + SetupData = (PSETUPDATA)((LPPROPSHEETPAGE)lParam)->lParam; + SetWindowLongPtr(hwndDlg, GWL_USERDATA, (DWORD_PTR)SetupData); + + imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_CLASSIC), 0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION); + SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); + + imldata.himl = ImageList_LoadImage(hDllInstance, MAKEINTRESOURCE(IDB_LAUTUS), 0, 0, CLR_NONE , IMAGE_BITMAP, LR_CREATEDIBSECTION); + SendDlgItemMessage(hwndDlg, IDC_THEMEDSTYLE, BCM_SETIMAGELIST, 0, (LPARAM)&imldata); + + SendDlgItemMessage(hwndDlg, IDC_CLASSICSTYLE, BM_SETCHECK, BST_CHECKED, 0); + break; + } + case WM_COMMAND: + if (HIWORD(wParam) == BN_CLICKED) + { + switch (LOWORD(wParam)) + { + case IDC_THEMEDSTYLE: + { + WCHAR wszParams[1024]; + WCHAR wszTheme[MAX_PATH]; + WCHAR* format = L"desk.cpl desk,@Appearance /Action:ActivateMSTheme /file:\"%s\""; + + SHGetFolderPathAndSubDirW(0, CSIDL_RESOURCES, NULL, SHGFP_TYPE_DEFAULT, L"themes\\lautus\\lautus.msstyles", wszTheme); + swprintf(wszParams, format, wszTheme); + RunControlPanelApplet(hwndDlg, wszParams); + break; + } + case IDC_CLASSICSTYLE: + RunControlPanelApplet(hwndDlg, L"desk.cpl desk,@Appearance /Action:ActivateMSTheme"); + break; + } + } + case WM_NOTIFY: + switch (((LPNMHDR)lParam)->code) + { + case PSN_SETACTIVE: + /* Enable the Back and Next buttons */ + PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_BACK | PSWIZB_NEXT); + if (SetupData->UnattendSetup) + { + SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, SetupData->uFirstNetworkWizardPage); + return TRUE; + } + break; + + case PSN_WIZNEXT: + break; + + case PSN_WIZBACK: + SetupData->UnattendSetup = FALSE; + break; + + default: + break; + } + break; + + default: + break; + } + + return FALSE; +} static UINT CALLBACK RegistrationNotificationProc(PVOID Context, @@ -2406,6 +2491,25 @@ typedef DWORD(WINAPI *PFNREQUESTWIZARDPAGES)(PDWORD, HPROPSHEETPAGE *, PSETUPDATA); +BOOL ActivateComctl32v6ActCtx(ULONG_PTR *cookie, HANDLE* hActCtx) +{ + ACTCTXW ActCtx = {sizeof(ACTCTX), ACTCTX_FLAG_RESOURCE_NAME_VALID}; + WCHAR fileBuffer[MAX_PATH]; + + *hActCtx = INVALID_HANDLE_VALUE; + + if (!GetModuleFileName(hDllInstance, fileBuffer, MAX_PATH)) + return FALSE; + + ActCtx.lpSource = fileBuffer; + ActCtx.lpResourceName = ISOLATIONAWARE_MANIFEST_RESOURCE_ID; + *hActCtx = CreateActCtx(&ActCtx); + if (*hActCtx == INVALID_HANDLE_VALUE) + return FALSE; + + return ActivateActCtx(*hActCtx, cookie); +} + VOID InstallWizard(VOID) { @@ -2419,6 +2523,9 @@ HMODULE hNetShell = NULL; PFNREQUESTWIZARDPAGES pfn = NULL; DWORD dwPageCount = 8, dwNetworkPageCount = 0; + BOOL bActCtxActivated; + ULONG_PTR cookie; + HANDLE hActCtx; LogItem(L"BEGIN_SECTION", L"InstallWizard"); @@ -2435,6 +2542,11 @@ MB_ICONERROR | MB_OK); goto done; } + + /* Load and activate the act ctx for comctl32v6 now manually. + * Even if the exe of the process had a manifest, at the point of its launch + * the manifest of comctl32 wouldn't be installed so it wouldn't be loaded at all */ + bActCtxActivated = ActivateComctl32v6ActCtx(&cookie, &hActCtx); hNetShell = LoadLibraryW(L"netshell.dll"); if (hNetShell != NULL) @@ -2519,6 +2631,13 @@ psp.pszTemplate = MAKEINTRESOURCE(IDD_DATETIMEPAGE); phpage[nPages++] = CreatePropertySheetPage(&psp); + /* Create the theme selection page */ + psp.dwFlags = PSP_DEFAULT | PSP_USEHEADERTITLE | PSP_USEHEADERSUBTITLE; + psp.pszHeaderTitle = MAKEINTRESOURCE(IDS_THEMESELECTIONTITLE); + psp.pszHeaderSubTitle = MAKEINTRESOURCE(IDS_THEMESELECTIONSUBTITLE); + psp.pfnDlgProc = ThemePageDlgProc; + psp.pszTemplate = MAKEINTRESOURCE(IDD_THEMEPAGE); + phpage[nPages++] = CreatePropertySheetPage(&psp); pSetupData->uFirstNetworkWizardPage = IDD_PROCESSPAGE; pSetupData->uPostNetworkWizardPage = IDD_PROCESSPAGE; @@ -2582,6 +2701,12 @@ if (hNetShell != NULL) FreeLibrary(hNetShell); + if (bActCtxActivated) + { + DeactivateActCtx(0, cookie); + ReleaseActCtx(hActCtx); + } + if (pSetupData != NULL) { DeleteObject(pSetupData->hBoldFont);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs