Ros-diffs March 2020

ros-diffs@reactos.org

25 participants
156 discussions

[reactos] 01/01: [USER32] Fix crash in Edit control. CORE-16727

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b596a2cc31c6597ae5063… commit b596a2cc31c6597ae50633d48c0c9ce37cf37e70 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Mar 6 20:02:03 2020 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 6 20:02:03 2020 +0100 [USER32] Fix crash in Edit control. CORE-16727 The #ifdef prevents setting the variable, es, to NULL, which lead to an illegal access. This didn't match dll/comctl32/edit.c . Patch by 'I_Kill_Bugs' contributor. --- win32ss/user/user32/controls/edit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c index 790c8c32bbb..1eccfbf1684 100644 --- a/win32ss/user/user32/controls/edit.c +++ b/win32ss/user/user32/controls/edit.c @@ -5009,9 +5009,8 @@ LRESULT WINAPI EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP result = EDIT_WM_NCDestroy(es); #ifdef __REACTOS__ NtUserSetWindowFNID(hwnd, FNID_DESTROY); -#else - es = NULL; #endif + es = NULL; break; case WM_GETDLGCODE:

4 years, 9 months

[reactos] 01/01: [HALX86] Move PC/AT hardware definitions to a separate file (#2406)

by Dmitry Borisov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18ae48ce517cea3e28075… commit 18ae48ce517cea3e280751b267f4bb296713ef96 Author: Dmitry Borisov <di.sean(a)protonmail.com> AuthorDate: Sat Mar 7 00:54:16 2020 +0600 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 6 19:54:16 2020 +0100 [HALX86] Move PC/AT hardware definitions to a separate file (#2406) This makes it easier for other ports. --- hal/halx86/include/hal.h | 1 + hal/halx86/include/halhw.h | 376 +++++++++++++++++++++++++++++++++++++++++++++ hal/halx86/include/halp.h | 368 -------------------------------------------- 3 files changed, 377 insertions(+), 368 deletions(-) diff --git a/hal/halx86/include/hal.h b/hal/halx86/include/hal.h index a64e9ceb7dd..7f632f3de04 100644 --- a/hal/halx86/include/hal.h +++ b/hal/halx86/include/hal.h @@ -59,6 +59,7 @@ #include "bus.h" #include "halirq.h" #include "haldma.h" +#include "halhw.h" #include "halp.h" #include "mps.h" #include "halacpi.h" diff --git a/hal/halx86/include/halhw.h b/hal/halx86/include/halhw.h new file mode 100644 index 00000000000..6da13728a4f --- /dev/null +++ b/hal/halx86/include/halhw.h @@ -0,0 +1,376 @@ +/* + * PROJECT: ReactOS Hardware Abstraction Layer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: PC/AT hardware header file + * COPYRIGHT: ... + */ + +#pragma once + +/* CMOS Registers and Ports */ +#define CMOS_CONTROL_PORT (PUCHAR)0x70 +#define CMOS_DATA_PORT (PUCHAR)0x71 +#define RTC_REGISTER_A 0x0A +#define RTC_REG_A_UIP 0x80 +#define RTC_REGISTER_B 0x0B +#define RTC_REG_B_PI 0x40 +#define RTC_REGISTER_C 0x0C +#define RTC_REG_C_IRQ 0x80 +#define RTC_REGISTER_D 0x0D +#define RTC_REGISTER_CENTURY 0x32 + +// +// BIOS Interrupts +// +#define VIDEO_SERVICES 0x10 + +// +// Operations for INT 10h (in AH) +// +#define SET_VIDEO_MODE 0x00 + +// +// Video Modes for INT10h AH=00 (in AL) +// +#define GRAPHICS_MODE_12 0x12 /* 80x30 8x16 640x480 16/256K */ + +#if defined(SARCH_XBOX) +// +// For some unknown reason the PIT of the Xbox is fixed at 1.125000 MHz, +// which is ~5.7% lower than on the PC. +// +#define PIT_FREQUENCY 1125000 +#else +// +// Commonly stated as being 1.19318MHz +// +// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) +// p. 471 +// +// However, the true value is closer to 1.19318181[...]81MHz since this is 1/3rd +// of the NTSC color subcarrier frequency which runs at 3.57954545[...]45MHz. +// +// Note that Windows uses 1.193167MHz which seems to have no basis. However, if +// one takes the NTSC color subcarrier frequency as being 3.579545 (trimming the +// infinite series) and divides it by three, one obtains 1.19318167. +// +// It may be that the original NT HAL source code introduced a typo and turned +// 119318167 into 1193167 by ommitting the "18". This is very plausible as the +// number is quite long. +// +#define PIT_FREQUENCY 1193182 +#endif + +// +// These ports are controlled by the i8254 Programmable Interrupt Timer (PIT) +// +#define TIMER_CHANNEL0_DATA_PORT 0x40 +#define TIMER_CHANNEL1_DATA_PORT 0x41 +#define TIMER_CHANNEL2_DATA_PORT 0x42 +#define TIMER_CONTROL_PORT 0x43 + +// +// Mode 0 - Interrupt On Terminal Count +// Mode 1 - Hardware Re-triggerable One-Shot +// Mode 2 - Rate Generator +// Mode 3 - Square Wave Generator +// Mode 4 - Software Triggered Strobe +// Mode 5 - Hardware Triggered Strobe +// +typedef enum _TIMER_OPERATING_MODES +{ + PitOperatingMode0, + PitOperatingMode1, + PitOperatingMode2, + PitOperatingMode3, + PitOperatingMode4, + PitOperatingMode5, + PitOperatingMode2Reserved, + PitOperatingMode5Reserved +} TIMER_OPERATING_MODES; + +typedef enum _TIMER_ACCESS_MODES +{ + PitAccessModeCounterLatch, + PitAccessModeLow, + PitAccessModeHigh, + PitAccessModeLowHigh +} TIMER_ACCESS_MODES; + +typedef enum _TIMER_CHANNELS +{ + PitChannel0, + PitChannel1, + PitChannel2, + PitReadBack +} TIMER_CHANNELS; + +typedef union _TIMER_CONTROL_PORT_REGISTER +{ + struct + { + UCHAR BcdMode:1; + UCHAR OperatingMode:3; + UCHAR AccessMode:2; + UCHAR Channel:2; + }; + UCHAR Bits; +} TIMER_CONTROL_PORT_REGISTER, *PTIMER_CONTROL_PORT_REGISTER; + +// +// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) +// P. 400 +// +// This port is controled by the i8255 Programmable Peripheral Interface (PPI) +// +#define SYSTEM_CONTROL_PORT_A 0x92 +#define SYSTEM_CONTROL_PORT_B 0x61 +typedef union _SYSTEM_CONTROL_PORT_B_REGISTER +{ + struct + { + UCHAR Timer2GateToSpeaker:1; + UCHAR SpeakerDataEnable:1; + UCHAR ParityCheckEnable:1; + UCHAR ChannelCheckEnable:1; + UCHAR RefreshRequest:1; + UCHAR Timer2Output:1; + UCHAR ChannelCheck:1; + UCHAR ParityCheck:1; + }; + UCHAR Bits; +} SYSTEM_CONTROL_PORT_B_REGISTER, *PSYSTEM_CONTROL_PORT_B_REGISTER; + +// +// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) +// P. 396, 397 +// +// These ports are controlled by the i8259 Programmable Interrupt Controller (PIC) +// +#define PIC1_CONTROL_PORT 0x20 +#define PIC1_DATA_PORT 0x21 +#define PIC2_CONTROL_PORT 0xA0 +#define PIC2_DATA_PORT 0xA1 + +// +// Definitions for ICW/OCW Bits +// +typedef enum _I8259_ICW1_OPERATING_MODE +{ + Cascade, + Single +} I8259_ICW1_OPERATING_MODE; + +typedef enum _I8259_ICW1_INTERRUPT_MODE +{ + EdgeTriggered, + LevelTriggered +} I8259_ICW1_INTERRUPT_MODE; + +typedef enum _I8259_ICW1_INTERVAL +{ + Interval8, + Interval4 +} I8259_ICW1_INTERVAL; + +typedef enum _I8259_ICW4_SYSTEM_MODE +{ + Mcs8085Mode, + New8086Mode +} I8259_ICW4_SYSTEM_MODE; + +typedef enum _I8259_ICW4_EOI_MODE +{ + NormalEoi, + AutomaticEoi +} I8259_ICW4_EOI_MODE; + +typedef enum _I8259_ICW4_BUFFERED_MODE +{ + NonBuffered, + NonBuffered2, + BufferedSlave, + BufferedMaster +} I8259_ICW4_BUFFERED_MODE; + +typedef enum _I8259_READ_REQUEST +{ + InvalidRequest, + InvalidRequest2, + ReadIdr, + ReadIsr +} I8259_READ_REQUEST; + +typedef enum _I8259_EOI_MODE +{ + RotateAutoEoiClear, + NonSpecificEoi, + InvalidEoiMode, + SpecificEoi, + RotateAutoEoiSet, + RotateNonSpecific, + SetPriority, + RotateSpecific +} I8259_EOI_MODE; + +// +// Definitions for ICW Registers +// +typedef union _I8259_ICW1 +{ + struct + { + UCHAR NeedIcw4:1; + UCHAR OperatingMode:1; + UCHAR Interval:1; + UCHAR InterruptMode:1; + UCHAR Init:1; + UCHAR InterruptVectorAddress:3; + }; + UCHAR Bits; +} I8259_ICW1, *PI8259_ICW1; + +typedef union _I8259_ICW2 +{ + struct + { + UCHAR Sbz:3; + UCHAR InterruptVector:5; + }; + UCHAR Bits; +} I8259_ICW2, *PI8259_ICW2; + +typedef union _I8259_ICW3 +{ + union + { + struct + { + UCHAR SlaveIrq0:1; + UCHAR SlaveIrq1:1; + UCHAR SlaveIrq2:1; + UCHAR SlaveIrq3:1; + UCHAR SlaveIrq4:1; + UCHAR SlaveIrq5:1; + UCHAR SlaveIrq6:1; + UCHAR SlaveIrq7:1; + }; + struct + { + UCHAR SlaveId:3; + UCHAR Reserved:5; + }; + }; + UCHAR Bits; +} I8259_ICW3, *PI8259_ICW3; + +typedef union _I8259_ICW4 +{ + struct + { + UCHAR SystemMode:1; + UCHAR EoiMode:1; + UCHAR BufferedMode:2; + UCHAR SpecialFullyNestedMode:1; + UCHAR Reserved:3; + }; + UCHAR Bits; +} I8259_ICW4, *PI8259_ICW4; + +typedef union _I8259_OCW2 +{ + struct + { + UCHAR IrqNumber:3; + UCHAR Sbz:2; + UCHAR EoiMode:3; + }; + UCHAR Bits; +} I8259_OCW2, *PI8259_OCW2; + +typedef union _I8259_OCW3 +{ + struct + { + UCHAR ReadRequest:2; + UCHAR PollCommand:1; + UCHAR Sbo:1; + UCHAR Sbz:1; + UCHAR SpecialMaskMode:2; + UCHAR Reserved:1; + }; + UCHAR Bits; +} I8259_OCW3, *PI8259_OCW3; + +typedef union _I8259_ISR +{ + union + { + struct + { + UCHAR Irq0:1; + UCHAR Irq1:1; + UCHAR Irq2:1; + UCHAR Irq3:1; + UCHAR Irq4:1; + UCHAR Irq5:1; + UCHAR Irq6:1; + UCHAR Irq7:1; + }; + }; + UCHAR Bits; +} I8259_ISR, *PI8259_ISR; + +typedef I8259_ISR I8259_IDR, *PI8259_IDR; + +// +// See EISA System Architecture 2nd Edition (Tom Shanley, Don Anderson, John Swindle) +// P. 34, 35 +// +// These ports are controlled by the i8259A Programmable Interrupt Controller (PIC) +// +#define EISA_ELCR_MASTER 0x4D0 +#define EISA_ELCR_SLAVE 0x4D1 + +typedef union _EISA_ELCR +{ + struct + { + struct + { + UCHAR Irq0Level:1; + UCHAR Irq1Level:1; + UCHAR Irq2Level:1; + UCHAR Irq3Level:1; + UCHAR Irq4Level:1; + UCHAR Irq5Level:1; + UCHAR Irq6Level:1; + UCHAR Irq7Level:1; + } Master; + struct + { + UCHAR Irq8Level:1; + UCHAR Irq9Level:1; + UCHAR Irq10Level:1; + UCHAR Irq11Level:1; + UCHAR Irq12Level:1; + UCHAR Irq13Level:1; + UCHAR Irq14Level:1; + UCHAR Irq15Level:1; + } Slave; + }; + USHORT Bits; +} EISA_ELCR, *PEISA_ELCR; + +typedef struct _PIC_MASK +{ + union + { + struct + { + UCHAR Master; + UCHAR Slave; + }; + USHORT Both; + }; +} PIC_MASK, *PPIC_MASK; diff --git a/hal/halx86/include/halp.h b/hal/halx86/include/halp.h index 0ef52df2a93..52b275e40df 100644 --- a/hal/halx86/include/halp.h +++ b/hal/halx86/include/halp.h @@ -46,18 +46,6 @@ VOID #define HAL_PROFILING_INTERVAL 0 #define HAL_PROFILING_MULTIPLIER 1 -/* CMOS Registers and Ports */ -#define CMOS_CONTROL_PORT (PUCHAR)0x70 -#define CMOS_DATA_PORT (PUCHAR)0x71 -#define RTC_REGISTER_A 0x0A -#define RTC_REG_A_UIP 0x80 -#define RTC_REGISTER_B 0x0B -#define RTC_REG_B_PI 0x40 -#define RTC_REGISTER_C 0x0C -#define RTC_REG_C_IRQ 0x80 -#define RTC_REGISTER_D 0x0D -#define RTC_REGISTER_CENTURY 0x32 - /* Usage flags */ #define IDT_REGISTERED 0x01 #define IDT_LATCHED 0x02 @@ -71,362 +59,6 @@ VOID #define INT_BCD(int) \ (UCHAR)(((int / 10) << 4) + (int % 10)) -// -// BIOS Interrupts -// -#define VIDEO_SERVICES 0x10 - -// -// Operations for INT 10h (in AH) -// -#define SET_VIDEO_MODE 0x00 - -// -// Video Modes for INT10h AH=00 (in AL) -// -#define GRAPHICS_MODE_12 0x12 /* 80x30 8x16 640x480 16/256K */ - -#if defined(SARCH_XBOX) -// -// For some unknown reason the PIT of the Xbox is fixed at 1.125000 MHz, -// which is ~5.7% lower than on the PC. -// -#define PIT_FREQUENCY 1125000 -#else -// -// Commonly stated as being 1.19318MHz -// -// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) -// p. 471 -// -// However, the true value is closer to 1.19318181[...]81MHz since this is 1/3rd -// of the NTSC color subcarrier frequency which runs at 3.57954545[...]45MHz. -// -// Note that Windows uses 1.193167MHz which seems to have no basis. However, if -// one takes the NTSC color subcarrier frequency as being 3.579545 (trimming the -// infinite series) and divides it by three, one obtains 1.19318167. -// -// It may be that the original NT HAL source code introduced a typo and turned -// 119318167 into 1193167 by ommitting the "18". This is very plausible as the -// number is quite long. -// -#define PIT_FREQUENCY 1193182 -#endif - -// -// These ports are controlled by the i8254 Programmable Interrupt Timer (PIT) -// -#define TIMER_CHANNEL0_DATA_PORT 0x40 -#define TIMER_CHANNEL1_DATA_PORT 0x41 -#define TIMER_CHANNEL2_DATA_PORT 0x42 -#define TIMER_CONTROL_PORT 0x43 - -// -// Mode 0 - Interrupt On Terminal Count -// Mode 1 - Hardware Re-triggerable One-Shot -// Mode 2 - Rate Generator -// Mode 3 - Square Wave Generator -// Mode 4 - Software Triggered Strobe -// Mode 5 - Hardware Triggered Strobe -// -typedef enum _TIMER_OPERATING_MODES -{ - PitOperatingMode0, - PitOperatingMode1, - PitOperatingMode2, - PitOperatingMode3, - PitOperatingMode4, - PitOperatingMode5, - PitOperatingMode2Reserved, - PitOperatingMode5Reserved -} TIMER_OPERATING_MODES; - -typedef enum _TIMER_ACCESS_MODES -{ - PitAccessModeCounterLatch, - PitAccessModeLow, - PitAccessModeHigh, - PitAccessModeLowHigh -} TIMER_ACCESS_MODES; - -typedef enum _TIMER_CHANNELS -{ - PitChannel0, - PitChannel1, - PitChannel2, - PitReadBack -} TIMER_CHANNELS; - -typedef union _TIMER_CONTROL_PORT_REGISTER -{ - struct - { - UCHAR BcdMode:1; - UCHAR OperatingMode:3; - UCHAR AccessMode:2; - UCHAR Channel:2; - }; - UCHAR Bits; -} TIMER_CONTROL_PORT_REGISTER, *PTIMER_CONTROL_PORT_REGISTER; - -// -// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) -// P. 400 -// -// This port is controled by the i8255 Programmable Peripheral Interface (PPI) -// -#define SYSTEM_CONTROL_PORT_A 0x92 -#define SYSTEM_CONTROL_PORT_B 0x61 -typedef union _SYSTEM_CONTROL_PORT_B_REGISTER -{ - struct - { - UCHAR Timer2GateToSpeaker:1; - UCHAR SpeakerDataEnable:1; - UCHAR ParityCheckEnable:1; - UCHAR ChannelCheckEnable:1; - UCHAR RefreshRequest:1; - UCHAR Timer2Output:1; - UCHAR ChannelCheck:1; - UCHAR ParityCheck:1; - }; - UCHAR Bits; -} SYSTEM_CONTROL_PORT_B_REGISTER, *PSYSTEM_CONTROL_PORT_B_REGISTER; - -// -// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) -// P. 396, 397 -// -// These ports are controlled by the i8259 Programmable Interrupt Controller (PIC) -// -#define PIC1_CONTROL_PORT 0x20 -#define PIC1_DATA_PORT 0x21 -#define PIC2_CONTROL_PORT 0xA0 -#define PIC2_DATA_PORT 0xA1 - -// -// Definitions for ICW/OCW Bits -// -typedef enum _I8259_ICW1_OPERATING_MODE -{ - Cascade, - Single -} I8259_ICW1_OPERATING_MODE; - -typedef enum _I8259_ICW1_INTERRUPT_MODE -{ - EdgeTriggered, - LevelTriggered -} I8259_ICW1_INTERRUPT_MODE; - -typedef enum _I8259_ICW1_INTERVAL -{ - Interval8, - Interval4 -} I8259_ICW1_INTERVAL; - -typedef enum _I8259_ICW4_SYSTEM_MODE -{ - Mcs8085Mode, - New8086Mode -} I8259_ICW4_SYSTEM_MODE; - -typedef enum _I8259_ICW4_EOI_MODE -{ - NormalEoi, - AutomaticEoi -} I8259_ICW4_EOI_MODE; - -typedef enum _I8259_ICW4_BUFFERED_MODE -{ - NonBuffered, - NonBuffered2, - BufferedSlave, - BufferedMaster -} I8259_ICW4_BUFFERED_MODE; - -typedef enum _I8259_READ_REQUEST -{ - InvalidRequest, - InvalidRequest2, - ReadIdr, - ReadIsr -} I8259_READ_REQUEST; - -typedef enum _I8259_EOI_MODE -{ - RotateAutoEoiClear, - NonSpecificEoi, - InvalidEoiMode, - SpecificEoi, - RotateAutoEoiSet, - RotateNonSpecific, - SetPriority, - RotateSpecific -} I8259_EOI_MODE; - -// -// Definitions for ICW Registers -// -typedef union _I8259_ICW1 -{ - struct - { - UCHAR NeedIcw4:1; - UCHAR OperatingMode:1; - UCHAR Interval:1; - UCHAR InterruptMode:1; - UCHAR Init:1; - UCHAR InterruptVectorAddress:3; - }; - UCHAR Bits; -} I8259_ICW1, *PI8259_ICW1; - -typedef union _I8259_ICW2 -{ - struct - { - UCHAR Sbz:3; - UCHAR InterruptVector:5; - }; - UCHAR Bits; -} I8259_ICW2, *PI8259_ICW2; - -typedef union _I8259_ICW3 -{ - union - { - struct - { - UCHAR SlaveIrq0:1; - UCHAR SlaveIrq1:1; - UCHAR SlaveIrq2:1; - UCHAR SlaveIrq3:1; - UCHAR SlaveIrq4:1; - UCHAR SlaveIrq5:1; - UCHAR SlaveIrq6:1; - UCHAR SlaveIrq7:1; - }; - struct - { - UCHAR SlaveId:3; - UCHAR Reserved:5; - }; - }; - UCHAR Bits; -} I8259_ICW3, *PI8259_ICW3; - -typedef union _I8259_ICW4 -{ - struct - { - UCHAR SystemMode:1; - UCHAR EoiMode:1; - UCHAR BufferedMode:2; - UCHAR SpecialFullyNestedMode:1; - UCHAR Reserved:3; - }; - UCHAR Bits; -} I8259_ICW4, *PI8259_ICW4; - -typedef union _I8259_OCW2 -{ - struct - { - UCHAR IrqNumber:3; - UCHAR Sbz:2; - UCHAR EoiMode:3; - }; - UCHAR Bits; -} I8259_OCW2, *PI8259_OCW2; - -typedef union _I8259_OCW3 -{ - struct - { - UCHAR ReadRequest:2; - UCHAR PollCommand:1; - UCHAR Sbo:1; - UCHAR Sbz:1; - UCHAR SpecialMaskMode:2; - UCHAR Reserved:1; - }; - UCHAR Bits; -} I8259_OCW3, *PI8259_OCW3; - -typedef union _I8259_ISR -{ - union - { - struct - { - UCHAR Irq0:1; - UCHAR Irq1:1; - UCHAR Irq2:1; - UCHAR Irq3:1; - UCHAR Irq4:1; - UCHAR Irq5:1; - UCHAR Irq6:1; - UCHAR Irq7:1; - }; - }; - UCHAR Bits; -} I8259_ISR, *PI8259_ISR; - -typedef I8259_ISR I8259_IDR, *PI8259_IDR; - -// -// See EISA System Architecture 2nd Edition (Tom Shanley, Don Anderson, John Swindle) -// P. 34, 35 -// -// These ports are controlled by the i8259A Programmable Interrupt Controller (PIC) -// -#define EISA_ELCR_MASTER 0x4D0 -#define EISA_ELCR_SLAVE 0x4D1 - -typedef union _EISA_ELCR -{ - struct - { - struct - { - UCHAR Irq0Level:1; - UCHAR Irq1Level:1; - UCHAR Irq2Level:1; - UCHAR Irq3Level:1; - UCHAR Irq4Level:1; - UCHAR Irq5Level:1; - UCHAR Irq6Level:1; - UCHAR Irq7Level:1; - } Master; - struct - { - UCHAR Irq8Level:1; - UCHAR Irq9Level:1; - UCHAR Irq10Level:1; - UCHAR Irq11Level:1; - UCHAR Irq12Level:1; - UCHAR Irq13Level:1; - UCHAR Irq14Level:1; - UCHAR Irq15Level:1; - } Slave; - }; - USHORT Bits; -} EISA_ELCR, *PEISA_ELCR; - -typedef struct _PIC_MASK -{ - union - { - struct - { - UCHAR Master; - UCHAR Slave; - }; - USHORT Both; - }; -} PIC_MASK, *PPIC_MASK; - typedef BOOLEAN (NTAPI *PHAL_DISMISS_INTERRUPT)(

4 years, 9 months

[reactos] 01/01: [TRANSLATION] Update PT translation (#2342)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6515e2b75d0ac4a45518… commit a6515e2b75d0ac4a455187f2fe7a1f49c1596c9b Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Fri Mar 6 18:40:03 2020 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 6 19:40:03 2020 +0100 [TRANSLATION] Update PT translation (#2342) Update Portuguese translation for cryptui, ieframe and mpr DLLs. Co-authored-by: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> --- dll/win32/browseui/lang/pt-PT.rc | 14 +++---- dll/win32/cryptui/lang/cryptui_Pt.rc | 62 ++++++++++++++-------------- dll/win32/ieframe/ieframe.rc | 3 ++ dll/win32/ieframe/lang/pt-PT.rc | 78 ++++++++++++++++++++++++++++++++++++ dll/win32/mpr/lang/mpr_Pt.rc | 8 ++-- 5 files changed, 123 insertions(+), 42 deletions(-) diff --git a/dll/win32/browseui/lang/pt-PT.rc b/dll/win32/browseui/lang/pt-PT.rc index 9f4fbc19e33..66257415a8b 100644 --- a/dll/win32/browseui/lang/pt-PT.rc +++ b/dll/win32/browseui/lang/pt-PT.rc @@ -138,21 +138,21 @@ IDD_SEARCH_DLG DIALOGEX 0, 0, 260, 85 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_DLGFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Search by any or all of the criteria below.", IDC_SEARCH_LABEL, 4, 2, 120, 20 + LTEXT "Procurar por um dos seguintes critérios.", IDC_SEARCH_LABEL, 4, 2, 120, 20 - LTEXT "All or part &of the file name:", -1, 10, 25, 500, 10 + LTEXT "A totalidade &ou parte do nome de ficheiro:", -1, 10, 25, 500, 10 EDITTEXT IDC_SEARCH_FILENAME, 10, 35, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "A &word or phrase in the file:", -1, 10, 50, 500, 10 + LTEXT "&Uma palavra ou frase no ficheiro:", -1, 10, 50, 500, 10 EDITTEXT IDC_SEARCH_QUERY, 10, 60, 100, 12, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - LTEXT "&Look in:", -1, 10, 75, 500, 10 + LTEXT "&Procurar em:", -1, 10, 75, 500, 10 CONTROL "", IDC_SEARCH_COMBOBOX, WC_COMBOBOXEXW, WS_CHILD | WS_VISIBLE | WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 10, 85, 200, 200 - DEFPUSHBUTTON "Sea&rch", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Stop", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Pro&curar", IDC_SEARCH_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "Pa&rar", IDC_SEARCH_STOP_BUTTON, 80, 110, 40, 15, WS_GROUP | WS_TABSTOP - AUTOCHECKBOX "Search Hidden Files and Folders", + AUTOCHECKBOX "Procurar em pastas e ficheiros ocultos", IDC_SEARCH_HIDDEN, 4, 130, 130, 8, WS_VISIBLE | WS_GROUP | WS_TABSTOP CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER | PBS_MARQUEE, 10, 155, 200, 8 diff --git a/dll/win32/cryptui/lang/cryptui_Pt.rc b/dll/win32/cryptui/lang/cryptui_Pt.rc index a135c60affa..faefdaf420e 100644 --- a/dll/win32/cryptui/lang/cryptui_Pt.rc +++ b/dll/win32/cryptui/lang/cryptui_Pt.rc @@ -127,23 +127,23 @@ STRINGTABLE IDS_PURPOSE_CTL_USAGE_SIGNING "Permite que assine digitalmente uma lista de certificados confiáveis" IDS_PURPOSE_EFS "Permite que os dados em disco sejam cifrados" IDS_PURPOSE_EFS_RECOVERY "Recuperação de Ficheiros" - IDS_PURPOSE_WHQL "Windows Hardware Driver Verification" - IDS_PURPOSE_NT5 "Windows System Component Verification" - IDS_PURPOSE_OEM_WHQL "OEM Windows System Component Verification" - IDS_PURPOSE_EMBEDDED_NT "Embedded Windows System Component Verification" - IDS_PURPOSE_ROOT_LIST_SIGNER "Root List Signer" - IDS_PURPOSE_QUALIFIED_SUBORDINATION "Qualified Subordination" - IDS_PURPOSE_KEY_RECOVERY "Key Recovery" - IDS_PURPOSE_DOCUMENT_SIGNING "Document Signing" - IDS_PURPOSE_LIFETIME_SIGNING "Lifetime Signing" - IDS_PURPOSE_DRM "Digital Rights" - IDS_PURPOSE_LICENSES "Key Pack Licenses" - IDS_PURPOSE_LICENSE_SERVER "License Server Verification" - IDS_PURPOSE_ENROLLMENT_AGENT "Certificate Request Agent" - IDS_PURPOSE_SMARTCARD_LOGON "Smart Card Logon" - IDS_PURPOSE_CA_EXCHANGE "Private Key Archival" - IDS_PURPOSE_KEY_RECOVERY_AGENT "Key Recovery Agent" - IDS_PURPOSE_DS_EMAIL_REPLICATION "Directory Service Email Replication" + IDS_PURPOSE_WHQL "Verificação do controlador de hardware do Windows" + IDS_PURPOSE_NT5 "Verificação de componentes do sistema Windows" + IDS_PURPOSE_OEM_WHQL "Verificação de componente do sistema Windows OEM" + IDS_PURPOSE_EMBEDDED_NT "Verificação de componente do sistema Windows incorporado" + IDS_PURPOSE_ROOT_LIST_SIGNER "Signatário da lista raiz" + IDS_PURPOSE_QUALIFIED_SUBORDINATION "Subordinação Qualificada" + IDS_PURPOSE_KEY_RECOVERY "Recuperação da chave" + IDS_PURPOSE_DOCUMENT_SIGNING "Assinatura do documento" + IDS_PURPOSE_LIFETIME_SIGNING "Assinatura vitalícia" + IDS_PURPOSE_DRM "Direitos digitais" + IDS_PURPOSE_LICENSES "Licenças do pacote de chaves" + IDS_PURPOSE_LICENSE_SERVER "Verificação do servidor de licenças" + IDS_PURPOSE_ENROLLMENT_AGENT "Agente de solicitação de certificado" + IDS_PURPOSE_SMARTCARD_LOGON "Início de sessão com cartão inteligente" + IDS_PURPOSE_CA_EXCHANGE "Arquivamento de chave privada" + IDS_PURPOSE_KEY_RECOVERY_AGENT "Agente de recuperação de chave" + IDS_PURPOSE_DS_EMAIL_REPLICATION "Serviço de Diretório Replicação de Email" IDS_EXPORT_WIZARD "Assistente de Exportação de Certificados" IDS_EXPORT_FORMAT_TITLE "Formato de Exportação" IDS_EXPORT_FORMAT_SUBTITLE "Escolha o formato em que o conteúdo será guardado." @@ -171,11 +171,11 @@ STRINGTABLE IDS_EXPORT_PASSWORD_MISMATCH "As palavras chave não coincidem." IDS_EXPORT_PRIVATE_KEY_UNAVAILABLE "Nota: A chave privada para este certificado não conseguiu ser aberta." IDS_EXPORT_PRIVATE_KEY_NON_EXPORTABLE "Nota: A chave privada para este certificado não é exportável." - IDS_INTENDED_USE_COLUMN "Intended Use" - IDS_LOCATION_COLUMN "Location" - IDS_SELECT_CERT_TITLE "Select Certificate" - IDS_SELECT_CERT "Select a certificate" - IDS_NO_IMPL "Not yet implemented" + IDS_INTENDED_USE_COLUMN "Uso pretendido" + IDS_LOCATION_COLUMN "Localização" + IDS_SELECT_CERT_TITLE "Seleccionar certificado" + IDS_SELECT_CERT "Seleccione um certificado" + IDS_NO_IMPL "Ainda não implementado" } IDD_GENERAL DIALOGEX 0, 0, 255, 236 @@ -204,8 +204,8 @@ BEGIN CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 - PUSHBUTTON "&Editar Propriedades...", IDC_EDITPROPERTIES,53,216,95,14 - PUSHBUTTON "&Copiar para Ficheiro...", IDC_EXPORT,152,216,95,14 + PUSHBUTTON "&Editar propriedades...", IDC_EDITPROPERTIES,53,216,95,14 + PUSHBUTTON "&Copiar para ficheiro...", IDC_EXPORT,152,216,95,14 END IDD_HIERARCHY DIALOGEX 0, 0, 255, 236 @@ -285,7 +285,7 @@ CAPTION "Assistente de Importação de Certificados" STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Benvindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE, 115,7,195,30 + LTEXT "Bem-vindo ao Assistente de Importação de Certificados", IDC_IMPORT_TITLE, 115,7,195,30 LTEXT "Um certificado pode ser usado para identificá-lo ou ao computador do qual está a comunicar. Também pode ser usado para autenticação e para assinar mensagens. Conjuntos de certificados são colecções de certificados, listas de revogação de certificados e listas de certificados confiáveis.", -1, 115,40,195,120 END @@ -313,7 +313,7 @@ CAPTION "Assistente de Importação de Certificados" STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "O Wine pode automaticamente seleccionar o conjunto de certificados ou você pode especificar a localização para os certificados.", + LTEXT "O ""Wine"" pode automaticamente seleccionar o conjunto de certificados ou pode especificar a localização para os certificados.", -1, 21,1,220,25 AUTORADIOBUTTON "&Seleccionar conjunto de certificados automaticamente", IDC_IMPORT_AUTO_STORE, 31,28,220,12, BS_AUTORADIOBUTTON|WS_TABSTOP @@ -403,7 +403,7 @@ CAPTION "Assistente de Exportação de Certificados" STYLE DS_SHELLFONT | WS_VISIBLE | DS_MODALFRAME FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Password:", -1, 21,1,195,10 + LTEXT "Palavra-passe:", -1, 21,1,195,10 EDITTEXT IDC_EXPORT_PASSWORD, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP LTEXT "&Confirmar palavra-passe:", -1, 21,35,195,10 EDITTEXT IDC_EXPORT_PASSWORD_CONFIRM, 21,45,208,14, ES_AUTOHSCROLL|WS_TABSTOP @@ -460,13 +460,13 @@ BEGIN END IDD_SELECT_CERT DIALOG 0,0,278,157 -CAPTION "Select Certificate" +CAPTION "Selecção de Certificado" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Select a certificate you want to use", IDC_SELECT_DISPLAY_STRING, 7,7,264,26 + LTEXT "Seleccione o certificado que deseja usar", IDC_SELECT_DISPLAY_STRING, 7,7,264,26 CONTROL "", IDC_SELECT_CERTS, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 7,40,264,89 PUSHBUTTON "OK", IDOK, 91,136,51,14, BS_DEFPUSHBUTTON - PUSHBUTTON "Cancel", IDCANCEL, 149,136,51,14 - PUSHBUTTON "&View Certificate", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED + PUSHBUTTON "Cancelar", IDCANCEL, 149,136,51,14 + PUSHBUTTON "&Ver Certificado", IDC_SELECT_VIEW_CERT, 207,136,65,14, WS_DISABLED END diff --git a/dll/win32/ieframe/ieframe.rc b/dll/win32/ieframe/ieframe.rc index 3f3797eeb0f..a7dffa86755 100644 --- a/dll/win32/ieframe/ieframe.rc +++ b/dll/win32/ieframe/ieframe.rc @@ -53,6 +53,9 @@ #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif +#ifdef LANGUAGE_PT_PT + #include "lang/pt-PT.rc" +#endif #ifdef LANGUAGE_RO_RO #include "lang/ro-RO.rc" #endif diff --git a/dll/win32/ieframe/lang/pt-PT.rc b/dll/win32/ieframe/lang/pt-PT.rc new file mode 100644 index 00000000000..65c7e3de8b5 --- /dev/null +++ b/dll/win32/ieframe/lang/pt-PT.rc @@ -0,0 +1,78 @@ +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Ficheiro" + { + POPUP "&Novo" + { + MENUITEM "&Janela", ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Abrir...", ID_BROWSE_OPEN + MENUITEM "&Guardar...", ID_BROWSE_SAVE + MENUITEM "Guardar &como...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Imprimir &Format...", ID_BROWSE_PRINT_FORMAT + MENUITEM "&Imprimir...", ID_BROWSE_PRINT + MENUITEM "&Visualizar impressão", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Propriedades", ID_BROWSE_PROPERTIES + MENUITEM "&Fechar", ID_BROWSE_QUIT + } + POPUP "&Visualizar" + { + POPUP "&Ferramentas" + { + MENUITEM "Barra &Standard", ID_BROWSE_BAR_STD + MENUITEM "Barra de &Endereços", ID_BROWSE_BAR_ADDR + } + } + POPUP "F&avoritos" + { + MENUITEM "&Adicionar aos favoritos...", ID_BROWSE_ADDFAV + MENUITEM SEPARATOR + } + POPUP "&Ajuda" + { + MENUITEM "&Acerca do Internet Explorer", ID_BROWSE_ABOUT + } +} + +STRINGTABLE +{ + IDS_TB_BACK "Retroceder" + IDS_TB_FORWARD "Avançar" + IDS_TB_STOP "Parar" + IDS_TB_REFRESH "Actualizar" + IDS_TB_HOME "Home" + IDS_TB_PRINT "Imprimir..." +} + +STRINGTABLE +{ + IDS_ADDRESS "Endereço" +} + +STRINGTABLE +{ + IDS_FINDINGRESOURCE "Procurar por %s" + IDS_BEGINDOWNLOADDATA "Iniciar carregamento de %s" + IDS_ENDDOWNLOADDATA "A carregar %s" + IDS_SENDINGREQUEST "Perguntar por %s" +} + + +IDD_BROWSE_OPEN DIALOGEX 10, 10, 200, 70 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION +CAPTION "Abrir URL" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Especifique o endereço que deseja abrir no Internet Explorer",-1, 35,5,160,25 + LTEXT "Abrir:", -1, 5, 32, 30, 15 +#ifdef __REACTOS__ + ICON IDC_PAGEICO, IDC_PAGEICO, 2, 5, 21, 20, SS_ICON +#endif + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 160, 13 + DEFPUSHBUTTON "&OK", IDOK, 90, 50, 50, 14 + PUSHBUTTON "&Cancelar", IDCANCEL, 145, 50, 50, 14 +} diff --git a/dll/win32/mpr/lang/mpr_Pt.rc b/dll/win32/mpr/lang/mpr_Pt.rc index 2ec18085827..477b94304b3 100644 --- a/dll/win32/mpr/lang/mpr_Pt.rc +++ b/dll/win32/mpr/lang/mpr_Pt.rc @@ -55,19 +55,19 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE IDD_PROXYDLG DIALOGEX 36, 24, 228, 145 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Indique a senha da rede" +CAPTION "Indique a palavra-passe da rede" FONT 8, "MS Shell Dlg" { - LTEXT "Por favor, indique o nome de utilizador e a senha:", IDC_EXPLAIN, 6, 6, 150, 18 + LTEXT "Por favor, indique o nome de utilizador e a palavra-passe:", IDC_EXPLAIN, 6, 6, 150, 18 LTEXT "Proxy", -1, 6, 26, 60, 10 /* LTEXT "Realm", -1, 6, 46, 60, 10 */ LTEXT "Utilizador", -1, 6, 66, 60, 10 - LTEXT "Senha", -1, 6, 86, 60, 10 + LTEXT "Palavra-passe", -1, 6, 86, 60, 10 LTEXT "", IDC_PROXY, 70, 26, 150, 14, 0 LTEXT "", IDC_REALM, 70, 46, 150, 14, 0 EDITTEXT IDC_USERNAME, 70, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP EDITTEXT IDC_PASSWORD, 70, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Gravar esta senha (Inseguro)", IDC_SAVEPASSWORD, + CHECKBOX "&Gravar esta palavra-passe (Inseguro)", IDC_SAVEPASSWORD, 70, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 114, 126, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 170, 126, 50, 14, WS_GROUP | WS_TABSTOP

4 years, 9 months

[reactos] 01/01: [DSOUND_NEW][DDRAW] CMake fixes (#2389)

by Adam Słaboń

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86785b2c2a53a8b562db8… commit 86785b2c2a53a8b562db8238f887aed61e227d5f Author: Adam Słaboń <asaillen456esx(a)gmail.com> AuthorDate: Fri Mar 6 19:09:28 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 6 19:09:28 2020 +0100 [DSOUND_NEW][DDRAW] CMake fixes (#2389) * Create export tables for native ddraw and dsound_new. * Include native ddraw version resource in build process. CORE-16228 --- dll/directx/ddraw/CMakeLists.txt | 6 +++++- dll/directx/dsound_new/CMakeLists.txt | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dll/directx/ddraw/CMakeLists.txt b/dll/directx/ddraw/CMakeLists.txt index e86062f1673..598b9059259 100644 --- a/dll/directx/ddraw/CMakeLists.txt +++ b/dll/directx/ddraw/CMakeLists.txt @@ -39,7 +39,11 @@ list(APPEND SOURCE Vtable/DirectDrawSurface4_Vtable.c Vtable/DirectDrawSurface7_Vtable.c) -add_library(ddraw MODULE ${SOURCE}) +add_library(ddraw MODULE + ${SOURCE} + ddraw.rc + ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def) + set_module_type(ddraw win32dll) target_link_libraries(ddraw uuid dxguid ${PSEH_LIB}) add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll) diff --git a/dll/directx/dsound_new/CMakeLists.txt b/dll/directx/dsound_new/CMakeLists.txt index a9445d14cac..eaff7964f1a 100644 --- a/dll/directx/dsound_new/CMakeLists.txt +++ b/dll/directx/dsound_new/CMakeLists.txt @@ -21,7 +21,8 @@ list(APPEND SOURCE add_library(dsound MODULE ${SOURCE} - version.rc) + version.rc + ${CMAKE_CURRENT_BINARY_DIR}/dsound.def) set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid)

4 years, 9 months

[reactos] 02/02: [PSDK][XDK] Move 2 aliases to psdk/winbase.h from xdk/winnt_old.h

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7790abb02842a0602136… commit e7790abb02842a06021368645e2484033059feed Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Feb 28 13:14:36 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 6 18:26:01 2020 +0100 [PSDK][XDK] Move 2 aliases to psdk/winbase.h from xdk/winnt_old.h --- sdk/include/psdk/winbase.h | 2 ++ sdk/include/xdk/winnt_old.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index cfc2f494dcf..9128d36d752 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -780,7 +780,9 @@ typedef struct _DEBUG_EVENT { } DEBUG_EVENT,*LPDEBUG_EVENT; #ifndef MIDL_PASS +typedef PCONTEXT LPCONTEXT; typedef PEXCEPTION_RECORD LPEXCEPTION_RECORD; +typedef PEXCEPTION_POINTERS LPEXCEPTION_POINTERS; #endif typedef struct _OVERLAPPED { diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index 500cea982d3..e935859d952 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -2097,7 +2097,7 @@ typedef struct _CONTEXT #else #error "undefined processor type" #endif -typedef CONTEXT *PCONTEXT,*LPCONTEXT; +typedef CONTEXT *PCONTEXT; #define EXCEPTION_MAXIMUM_PARAMETERS 15 #define EXCEPTION_NONCONTINUABLE 0x01 @@ -2145,7 +2145,7 @@ typedef struct _EXCEPTION_RECORD64 { typedef struct _EXCEPTION_POINTERS { PEXCEPTION_RECORD ExceptionRecord; PCONTEXT ContextRecord; -} EXCEPTION_POINTERS,*PEXCEPTION_POINTERS, *LPEXCEPTION_POINTERS; +} EXCEPTION_POINTERS, *PEXCEPTION_POINTERS; typedef struct _SECURITY_ATTRIBUTES { DWORD nLength;

4 years, 9 months

[reactos] 01/02: [PSDK] winbase.h: Add missing LPEXCEPTION_RECORD

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e82175ba48412bd29ac4… commit 2e82175ba48412bd29ac43d9d616cb8f8a1068e4 Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Fri Feb 28 13:14:36 2020 +0100 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 6 18:26:01 2020 +0100 [PSDK] winbase.h: Add missing LPEXCEPTION_RECORD ROSTESTS-251 --- sdk/include/psdk/winbase.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 7c45b151c87..cfc2f494dcf 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -779,6 +779,10 @@ typedef struct _DEBUG_EVENT { } u; } DEBUG_EVENT,*LPDEBUG_EVENT; +#ifndef MIDL_PASS +typedef PEXCEPTION_RECORD LPEXCEPTION_RECORD; +#endif + typedef struct _OVERLAPPED { ULONG_PTR Internal; ULONG_PTR InternalHigh;

4 years, 9 months

[reactos] 01/01: [KERNEL32_WINETEST] Fix COMMCONFIG.wcProviderData values (#2410)

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20f403966652c15911d96… commit 20f403966652c15911d9614bbf804113d6e9d10c Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Mar 6 18:24:22 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Mar 6 18:24:22 2020 +0100 [KERNEL32_WINETEST] Fix COMMCONFIG.wcProviderData values (#2410) Import test part of https://source.winehq.org/git/wine.git/commit/a59d6387b6734cf0acb187e9c178d… ROSTESTS-251 --- modules/rostests/winetests/kernel32/generated.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/rostests/winetests/kernel32/generated.c b/modules/rostests/winetests/kernel32/generated.c index 3a1007094b4..45b95922e11 100644 --- a/modules/rostests/winetests/kernel32/generated.c +++ b/modules/rostests/winetests/kernel32/generated.c @@ -546,8 +546,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) } @@ -2403,8 +2403,8 @@ static void test_pack_COMMCONFIG(void) TEST_FIELD_SIZE (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_ALIGN (COMMCONFIG, dwProviderSize, 4) TEST_FIELD_OFFSET(COMMCONFIG, dwProviderSize, 44) - TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 4) - TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 4) + TEST_FIELD_SIZE (COMMCONFIG, wcProviderData, 2) + TEST_FIELD_ALIGN (COMMCONFIG, wcProviderData, 2) TEST_FIELD_OFFSET(COMMCONFIG, wcProviderData, 48) }

4 years, 9 months

[reactos] 01/01: [SETUPAPI] Implement StopDevice()

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35cb8f13931bb41dc51b3… commit 35cb8f13931bb41dc51b38fb3370145f119fdb5d Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Wed Mar 4 23:43:30 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Thu Mar 5 22:47:15 2020 +0100 [SETUPAPI] Implement StopDevice() --- dll/win32/setupapi/cfgmgr.c | 2 +- dll/win32/setupapi/devinst.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dll/win32/setupapi/cfgmgr.c b/dll/win32/setupapi/cfgmgr.c index d1a46745b8b..859b0e45b58 100644 --- a/dll/win32/setupapi/cfgmgr.c +++ b/dll/win32/setupapi/cfgmgr.c @@ -1796,7 +1796,7 @@ CM_Disable_DevNode_Ex( LPWSTR lpDevInst; CONFIGRET ret; - FIXME("CM_Disable_DevNode_Ex(%p %lx %p)\n", + TRACE("CM_Disable_DevNode_Ex(%p %lx %p)\n", dnDevInst, ulFlags, hMachine); if (!pSetupIsUserAdmin()) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index 14a9a5faa10..de4080bcf20 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -5045,12 +5045,28 @@ ResetDevice( #endif } -static BOOL StopDevice( +static BOOL +StopDevice( IN HDEVINFO DeviceInfoSet, IN PSP_DEVINFO_DATA DeviceInfoData) { +#ifndef __WINESRC__ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *deviceInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + CONFIGRET cr; + + cr = CM_Disable_DevNode_Ex(deviceInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; +#else FIXME("Stub: StopDevice(%p %p)\n", DeviceInfoSet, DeviceInfoData); return TRUE; +#endif } /***********************************************************************

4 years, 9 months

[reactos] 01/01: [NTUSER] Fix ShellHook notifications when creating/activating windows (#2396)

by JoachimHenze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=848d7ec63356d00ff965e… commit 848d7ec63356d00ff965ed71bb4385ba68771d39 Author: JoachimHenze <33393466+JoachimHenze(a)users.noreply.github.com> AuthorDate: Thu Mar 5 15:39:23 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 5 15:39:23 2020 +0100 [NTUSER] Fix ShellHook notifications when creating/activating windows (#2396) --- win32ss/user/ntuser/focus.c | 4 ++-- win32ss/user/ntuser/winpos.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index cc9ac5f8f5e..3c5ee19ed87 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -52,7 +52,6 @@ VOID FASTCALL UpdateShellHook(PWND Window) { if ( Window->spwndParent == UserGetDesktopWindow() && - Window->spwndOwner == NULL && (!(Window->ExStyle & WS_EX_TOOLWINDOW) || (Window->ExStyle & WS_EX_APPWINDOW))) { @@ -511,7 +510,8 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, (Window->style & WS_MINIMIZE) != 0), (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); - UpdateShellHook(Window); + if (Window->style & WS_VISIBLE) + UpdateShellHook(Window); Window->state &= ~WNDS_NONCPAINT; diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 6467c2cad86..b5927d183c2 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1913,6 +1913,8 @@ co_WinPosSetWindowPos( (Window->ExStyle & WS_EX_APPWINDOW))) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + if (!(WinPos.flags & SWP_NOACTIVATE)) + UpdateShellHook(Window); } }

4 years, 9 months

[reactos] 01/01: [CPL][TIMEDATE] Romanian & Italian translation update (#2404)

by Hermès BÉLUSCA - MAÏTO

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4699bc67f47c33e65f2b… commit d4699bc67f47c33e65f2b3e9c09e352a05068a2d Author: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 5 00:21:31 2020 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Mar 5 00:21:31 2020 +0100 [CPL][TIMEDATE] Romanian & Italian translation update (#2404) --- dll/cpl/timedate/lang/it-IT.rc | 4 ++-- dll/cpl/timedate/lang/ro-RO.rc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/cpl/timedate/lang/it-IT.rc b/dll/cpl/timedate/lang/it-IT.rc index 7df5e6a2bcc..226e743dd70 100644 --- a/dll/cpl/timedate/lang/it-IT.rc +++ b/dll/cpl/timedate/lang/it-IT.rc @@ -54,6 +54,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Prossima sincronizzazione: %s alle %s" IDS_INETTIMESYNCING "Sincronizzazione ora con %s" IDS_INETTIMEERROR "E' stato rilevato un errore mentre ReactOS si stava sincronizzando con %s" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Si prega di inserire un nome del server NTP per poter sincronizzare l'ora" + IDS_INETTIMEWELCOME "Seleziona un server NTP dalla lista oppure inserisci il nome del server NTP per sincronizzare l'ora del PC" END diff --git a/dll/cpl/timedate/lang/ro-RO.rc b/dll/cpl/timedate/lang/ro-RO.rc index 9589fb56d2b..e86f650fda8 100644 --- a/dll/cpl/timedate/lang/ro-RO.rc +++ b/dll/cpl/timedate/lang/ro-RO.rc @@ -56,6 +56,6 @@ BEGIN IDS_INETTIMENEXTSYNC "Următoarea sincronizare: %s la %s" IDS_INETTIMESYNCING "Așteptați sincronizarea cu %s" IDS_INETTIMEERROR "A survenit o eroare la sincronizarea cu %s" - IDS_INETTIMESUCFILL "Please type a NTP server name in order to synchronize the time" - IDS_INETTIMEWELCOME "Select a NTP server from the list or type a NTP server name to synchronize the computer's time" + IDS_INETTIMESUCFILL "Scrie numele serverului NTP pentru a sincroniza timpul" + IDS_INETTIMEWELCOME "Selectați un server NTP din lista de sus sau scrie numele serverului NTP pentru a sincroniza timpul calculatorului" END

4 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2020