Ros-diffs June 2019

ros-diffs@reactos.org

28 participants
288 discussions

[reactos] 01/01: [WIN32SS] Fix multiple scrollbar redraw issues

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1158c241941a13d8374f3… commit 1158c241941a13d8374f3f1b3016c672c824e7f0 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Jun 22 22:27:23 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Jun 22 22:27:23 2019 +0200 [WIN32SS] Fix multiple scrollbar redraw issues This fixes: - CORE-15911 "Scrollbars do not dissapear when Maximizing and not needed" - CORE-10617 "ListView corrupt scrollbar upon resizing the column-header" and will appease regression: - CORE-15429 "Uninitialized scrollbars in 'My Computer'" By applying clientFix.patch from CORE-15911 contributed by JIRA-user 'I_Kill_Bugs'. https://reactos.org/testman/compare.php?ids=66723,66729 Earlier I already committed this fix into 0.4.12-RC-9-g 5ac548544ff6b3d52c6591385d9029164e766d71 --- win32ss/user/ntuser/winpos.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index dba7738c3b3..e01c19c1c29 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1832,7 +1832,7 @@ co_WinPosSetWindowPos( } /* Calculate the non client area for resizes, as this is used in the copy region */ - if (!(WinPos.flags & SWP_NOSIZE)) + if ((WinPos.flags & (SWP_NOSIZE | SWP_FRAMECHANGED)) != SWP_NOSIZE) { VisBeforeJustClient = VIS_ComputeVisibleRegion(Window, TRUE, FALSE, (Window->style & WS_CLIPSIBLINGS) ? TRUE : FALSE); @@ -1973,12 +1973,16 @@ co_WinPosSetWindowPos( */ CopyRgn = IntSysCreateRectpRgn(0, 0, 0, 0); - if (WinPos.flags & SWP_NOSIZE) + if ((WinPos.flags & SWP_NOSIZE) && (WinPos.flags & SWP_NOCLIENTSIZE)) RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBefore, RGN_AND); else if (VisBeforeJustClient != NULL) { RgnType = IntGdiCombineRgn(CopyRgn, VisAfter, VisBeforeJustClient, RGN_AND); - REGION_Delete(VisBeforeJustClient); + } + + if (VisBeforeJustClient != NULL) + { + REGION_Delete(VisBeforeJustClient); } /* Now use in copying bits which are in the update region. */

5 years, 2 months

[reactos] 02/02: [NETCFGX] Start a network adapter device after the custom install steps have been completed.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89c936fdd691a3fcd5c45… commit 89c936fdd691a3fcd5c45e58d9ed02d43ad761a7 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 22 20:59:16 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 22 21:01:26 2019 +0200 [NETCFGX] Start a network adapter device after the custom install steps have been completed. This could probably fix CORE-16103 --- dll/win32/netcfgx/installer.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dll/win32/netcfgx/installer.c b/dll/win32/netcfgx/installer.c index ccde4019a98..a9eb0a710ba 100644 --- a/dll/win32/netcfgx/installer.c +++ b/dll/win32/netcfgx/installer.c @@ -99,6 +99,7 @@ InstallNetDevice( DWORD Characteristics, LPCWSTR BusType) { + SP_DEVINSTALL_PARAMS_W DeviceInstallParams; LPWSTR InstanceId = NULL; LPWSTR ComponentId = NULL; LPWSTR DeviceName = NULL; @@ -112,6 +113,28 @@ InstallNetDevice( WCHAR szBuffer[300]; PWSTR ptr; + DeviceInstallParams.cbSize = sizeof(DeviceInstallParams); + if (!SetupDiGetDeviceInstallParamsW(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams)) + { + rc = GetLastError(); + ERR("SetupDiGetDeviceInstallParamsW() failed (Error %lu)\n", rc); + goto cleanup; + } + + /* Do not start the adapter in the call to SetupDiInstallDevice */ + DeviceInstallParams.Flags |= DI_DONOTCALLCONFIGMG; + + if (!SetupDiSetDeviceInstallParamsW(DeviceInfoSet, + DeviceInfoData, + &DeviceInstallParams)) + { + rc = GetLastError(); + ERR("SetupDiSetDeviceInstallParamsW() failed (Error %lu)\n", rc); + goto cleanup; + } + /* Install the adapter */ if (!SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData)) { @@ -389,6 +412,14 @@ InstallNetDevice( goto cleanup; } + /* Start the device */ + if (!SetupDiRestartDevices(DeviceInfoSet, DeviceInfoData)) + { + rc = GetLastError(); + ERR("SetupDiRestartDevices() failed with error 0x%lx\n", rc); + goto cleanup; + } + rc = ERROR_SUCCESS; cleanup:

5 years, 2 months

[reactos] 01/02: [SETUPAPI] Implement SetupDiRestartDevices()

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8dc70d245461b5576ff17… commit 8dc70d245461b5576ff17995a3a064556c9926fe Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Jun 22 20:50:51 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Jun 22 21:01:25 2019 +0200 [SETUPAPI] Implement SetupDiRestartDevices() --- dll/win32/setupapi/devinst.c | 45 ++++++++++++++++++++++++++++++++++++++++ dll/win32/setupapi/setupapi.spec | 2 +- sdk/include/psdk/setupapi.h | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dll/win32/setupapi/devinst.c b/dll/win32/setupapi/devinst.c index e396b5ddfc4..14a9a5faa10 100644 --- a/dll/win32/setupapi/devinst.c +++ b/dll/win32/setupapi/devinst.c @@ -6090,3 +6090,48 @@ BOOL WINAPI SetupDiDeleteDevRegKey( RegCloseKey(RootKey); return ret; } + +/*********************************************************************** + * SetupDiRestartDevices (SETUPAPI.@) + */ +BOOL +WINAPI +SetupDiRestartDevices( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData) +{ + struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet; + struct DeviceInfo *devInfo; + CONFIGRET cr; + + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) + || !DeviceInfoData->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + devInfo = (struct DeviceInfo *)DeviceInfoData->Reserved; + + cr = CM_Enable_DevNode_Ex(devInfo->dnDevInst, 0, set->hMachine); + if (cr != CR_SUCCESS) + { + SetLastError(GetErrorCodeFromCrCode(cr)); + return FALSE; + } + + return TRUE; +} diff --git a/dll/win32/setupapi/setupapi.spec b/dll/win32/setupapi/setupapi.spec index bfe00fa1141..d6ad0e70bb0 100644 --- a/dll/win32/setupapi/setupapi.spec +++ b/dll/win32/setupapi/setupapi.spec @@ -369,7 +369,7 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stdcall SetupDiRemoveDeviceInterface(ptr ptr) -@ stub SetupDiRestartDevices +@ stdcall SetupDiRestartDevices(ptr ptr) @ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stdcall SetupDiSelectDevice(ptr ptr) @ stub SetupDiSelectOEMDrv diff --git a/sdk/include/psdk/setupapi.h b/sdk/include/psdk/setupapi.h index 2053267dad6..00fd1b9dd4f 100644 --- a/sdk/include/psdk/setupapi.h +++ b/sdk/include/psdk/setupapi.h @@ -1795,6 +1795,7 @@ WINSETUPAPI BOOL WINAPI SetupDiRegisterCoDeviceInstallers(_In_ HDEVINFO, _In_ PS WINSETUPAPI BOOL WINAPI SetupDiRegisterDeviceInfo(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA, _In_ DWORD, _In_opt_ PSP_DETSIG_CMPPROC, _In_opt_ PVOID, _Out_opt_ PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiRemoveDevice(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiRemoveDeviceInterface(_In_ HDEVINFO, _Inout_ PSP_DEVICE_INTERFACE_DATA); +WINSETUPAPI BOOL WINAPI SetupDiRestartDevices(_In_ HDEVINFO, _Inout_ PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiSelectBestCompatDrv(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiSelectDevice(_In_ HDEVINFO, _Inout_opt_ PSP_DEVINFO_DATA); WINSETUPAPI BOOL WINAPI SetupDiSelectOEMDrv(_In_opt_ HWND, _In_ HDEVINFO, _In_opt_ PSP_DEVINFO_DATA);

5 years, 2 months

[reactos] 01/01: [Win32SS] Complete Print Driver Callbacks

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c7705eb5de184804f858… commit 8c7705eb5de184804f858404463573ead88e848d Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Sat Jun 22 12:02:51 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Sat Jun 22 12:02:51 2019 -0500 [Win32SS] Complete Print Driver Callbacks This callback works. Haven't commit the rest yet. Still thinking about the data packets types and shapes. Using wordpad to test this. It works, loads and unloads due to incomplete driver support and no PDEV. It crashes in ComCtl32 while loading a text file. When this gets committed without a solution, the code will be commented out. --- win32ss/user/ntuser/callback.c | 17 +++++++------- win32ss/user/user32/misc/dllmain.c | 45 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/win32ss/user/ntuser/callback.c b/win32ss/user/ntuser/callback.c index 151a2f12af9..42d50002d33 100644 --- a/win32ss/user/ntuser/callback.c +++ b/win32ss/user/ntuser/callback.c @@ -1208,27 +1208,26 @@ co_IntSetupOBM(VOID) IntCbFreeMemory(Argument); } +// +// Called from Kernel GDI sides, no UserLeave/EnterCo required. +// LRESULT APIENTRY co_UserCBClientPrinterThunk( PVOID pkt, INT InSize, PVOID pvOutData, INT OutSize ) { - ULONG ResultLength; - PVOID ResultPointer; NTSTATUS Status; - UserLeaveCo(); Status = KeUserModeCallback(USER32_CALLBACK_UMPD, - 0, - 0, - &ResultPointer, - &ResultLength); + pkt, + InSize, + pvOutData, + (PULONG)&OutSize); - UserEnterCo(); - if (!NT_SUCCESS(Status)) { ERR("User UMPD callback failed!\n"); + return 1; } return 0; diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c index a7d0f098b49..6f43b9eeb6b 100644 --- a/win32ss/user/user32/misc/dllmain.c +++ b/win32ss/user/user32/misc/dllmain.c @@ -2,6 +2,23 @@ #include <ndk/cmfuncs.h> +#define MAX_USER_MODE_DRV_BUFFER 526 + +// +// UMPD Packet Header should match win32ss/include/ntumpd.h +// +typedef struct _UMPDPKTHEAD +{ + INT Size; + INT Index; + INT RetSize; + DWORD Reserved; + HUMPD humpd; + ULONG_PTR Buffer[]; +} UMPDPKTHEAD, *PUMPDPKTHEAD; + +INT WINAPI GdiPrinterThunk(PUMPDPKTHEAD,PVOID,INT); + WINE_DEFAULT_DEBUG_CHANNEL(user32); #define KEY_LENGTH 1024 @@ -667,6 +684,30 @@ NTSTATUS WINAPI User32CallLPKFromKernel(PVOID Arguments, ULONG ArgumentLength) NTSTATUS WINAPI User32CallUMPDFromKernel(PVOID Arguments, ULONG ArgumentLength) { - // = GdiPrinterThunk( , , ); - return ZwCallbackReturn(Arguments, ArgumentLength, STATUS_SUCCESS); + DWORD Buffer[MAX_USER_MODE_DRV_BUFFER]; + INT cbSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + PUMPDPKTHEAD pkt, pktOut = NULL; + + pkt = (PUMPDPKTHEAD)Arguments; + + if ( pkt->RetSize <= sizeof(Buffer) ) + { + pktOut = (PUMPDPKTHEAD)Buffer; + + if ( (GdiPrinterThunk( pkt, pktOut, pkt->RetSize ) == GDI_ERROR) ) + { + pktOut = NULL; + Status = STATUS_UNSUCCESSFUL; + } + else + { + cbSize = pkt->RetSize; + } + } + else + { + Status = STATUS_NO_MEMORY; + } + return ZwCallbackReturn( pktOut, cbSize, Status ); }

5 years, 2 months

[reactos] 01/01: [COMCTL32] Fix CORE-14619 (Checkbox buttons theming regression) (#1674)

by Andreas Maier

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=49165276f27f79bfab5c4… commit 49165276f27f79bfab5c48664865ef44cd40142e Author: Andreas Maier <staubim(a)quantentunnel.de> AuthorDate: Sat Jun 22 16:36:14 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 16:36:14 2019 +0200 [COMCTL32] Fix CORE-14619 (Checkbox buttons theming regression) (#1674) * [COMCTL32] Fix CORE-14619 (Checkbox buttons theming regression) Fix cb_states / rb_states lookup table. * [README.WINE] comctl32 is synced to WineStaging-3.3. See commit b3fb8555 . --- dll/win32/comctl32/button.c | 10 +++++----- media/doc/README.WINE | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/win32/comctl32/button.c b/dll/win32/comctl32/button.c index aacb96f7a29..1b345180870 100644 --- a/dll/win32/comctl32/button.c +++ b/dll/win32/comctl32/button.c @@ -1898,15 +1898,15 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu { static const int cb_states[3][5] = { - { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDNORMAL }, - { CBS_CHECKEDNORMAL, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDDISABLED, CBS_CHECKEDNORMAL }, - { CBS_MIXEDNORMAL, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDDISABLED, CBS_MIXEDNORMAL } + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } }; static const int rb_states[2][5] = { - { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDNORMAL }, - { RBS_CHECKEDNORMAL, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDDISABLED, RBS_CHECKEDNORMAL } + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } }; SIZE sz; diff --git a/media/doc/README.WINE b/media/doc/README.WINE index 0274793364e..ebd0f73d913 100644 --- a/media/doc/README.WINE +++ b/media/doc/README.WINE @@ -55,7 +55,7 @@ reactos/dll/win32/browseui # Out of sync reactos/dll/win32/cabinet # Synced to WineStaging-3.3 reactos/dll/win32/clusapi # Synced to WineStaging-3.3 reactos/dll/win32/comcat # Synced to WineStaging-3.3 -reactos/dll/win32/comctl32 # Synced to Wine-3.0 +reactos/dll/win32/comctl32 # Synced to WineStaging-3.3 reactos/dll/win32/comdlg32 # Synced to WineStaging-4.0 reactos/dll/win32/compstui # Synced to WineStaging-3.3 reactos/dll/win32/credui # Synced to WineStaging-4.0

5 years, 2 months

[reactos] 01/01: [FASTFAT][FLTMGR][NTOS] Do not explicitly call ObfDereferenceObject() (#1636)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42ce8519b6c46bc5143c6… commit 42ce8519b6c46bc5143c6ff23603fdf2650b649f Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Jun 22 16:20:58 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 16:20:58 2019 +0200 [FASTFAT][FLTMGR][NTOS] Do not explicitly call ObfDereferenceObject() (#1636) "Most code should not directly call the platform-specific ObfDereferenceObject() function but use the ObDereferenceObject() macro instead." CORE-16081 --- drivers/filesystems/fastfat/misc.c | 2 +- drivers/filters/fltmgr/Interface.c | 8 ++++---- drivers/filters/fltmgr/Messaging.c | 10 +++++----- ntoskrnl/fsrtl/oplock.c | 2 +- ntoskrnl/io/iomgr/rawfs.c | 2 +- ntoskrnl/ob/devicemap.c | 4 ++-- ntoskrnl/po/poshtdwn.c | 2 +- ntoskrnl/ps/job.c | 2 +- ntoskrnl/wmi/guidobj.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/filesystems/fastfat/misc.c b/drivers/filesystems/fastfat/misc.c index f3054633c58..4f7bf5b7d4b 100644 --- a/drivers/filesystems/fastfat/misc.c +++ b/drivers/filesystems/fastfat/misc.c @@ -582,7 +582,7 @@ VfatCheckForDismount( ExDeleteResourceLite(&DeviceExt->FatResource); /* Dismount our device if possible */ - ObfDereferenceObject(DeviceExt->StorageDevice); + ObDereferenceObject(DeviceExt->StorageDevice); IoDeleteDevice(DeviceExt->VolumeDevice); } diff --git a/drivers/filters/fltmgr/Interface.c b/drivers/filters/fltmgr/Interface.c index 1ed7e7986e4..b412adec1f0 100644 --- a/drivers/filters/fltmgr/Interface.c +++ b/drivers/filters/fltmgr/Interface.c @@ -2005,7 +2005,7 @@ FltpDetachFromFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject) NextDevice = IoGetLowerDeviceObject(AttachedDevice); /* Remove the reference we added */ - Count = ObfDereferenceObject(AttachedDevice); + Count = ObDereferenceObject(AttachedDevice); /* Bail if this is the last one */ if (NextDevice == NULL) return Count; @@ -2028,7 +2028,7 @@ FltpDetachFromFileSystemDevice(_In_ PDEVICE_OBJECT DeviceObject) IoDeleteDevice(AttachedDevice); /* Remove the reference we added so the delete can complete */ - return ObfDereferenceObject(AttachedDevice); + return ObDereferenceObject(AttachedDevice); } DRIVER_FS_NOTIFICATION FltpFsNotification; @@ -2143,7 +2143,7 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject, if (NT_SUCCESS(Status)) { FltpFsNotification(RawDeviceObject, TRUE); - ObfDereferenceObject(RawFileObject); + ObDereferenceObject(RawFileObject); } RtlInitUnicodeString(&ObjectName, L"\\Device\\RawCdRom"); @@ -2154,7 +2154,7 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject, if (NT_SUCCESS(Status)) { FltpFsNotification(RawDeviceObject, TRUE); - ObfDereferenceObject(RawFileObject); + ObDereferenceObject(RawFileObject); } /* We're done, clear the initializing flag */ diff --git a/drivers/filters/fltmgr/Messaging.c b/drivers/filters/fltmgr/Messaging.c index d30292a5a3e..f4ed276eb4d 100644 --- a/drivers/filters/fltmgr/Messaging.c +++ b/drivers/filters/fltmgr/Messaging.c @@ -369,7 +369,7 @@ NTAPI FltpClientPortDelete(PVOID Object) { PFLT_PORT_OBJECT PortObject = (PFLT_PORT_OBJECT)Object; - ObfDereferenceObject(PortObject->ServerPort); + ObDereferenceObject(PortObject->ServerPort); } @@ -447,14 +447,14 @@ Quit: if (ClientPortObjectType) { ObMakeTemporaryObject(ClientPortObjectType); - ObfDereferenceObject(ClientPortObjectType); + ObDereferenceObject(ClientPortObjectType); ClientPortObjectType = NULL; } if (ServerPortObjectType) { ObMakeTemporaryObject(ServerPortObjectType); - ObfDereferenceObject(ServerPortObjectType); + ObDereferenceObject(ServerPortObjectType); ServerPortObjectType = NULL; } } @@ -737,7 +737,7 @@ Quit: { if (ClientPortObject) { - ObfDereferenceObject(ClientPortObject); + ObDereferenceObject(ClientPortObject); } if (PortHandle) @@ -747,7 +747,7 @@ Quit: else if (ServerPortObject) { InterlockedDecrement(&ServerPortObject->NumberOfConnections); - ObfDereferenceObject(ServerPortObject); + ObDereferenceObject(ServerPortObject); } if (PortCCB) diff --git a/ntoskrnl/fsrtl/oplock.c b/ntoskrnl/fsrtl/oplock.c index f89adc465cd..f4c38d37d2c 100644 --- a/ntoskrnl/fsrtl/oplock.c +++ b/ntoskrnl/fsrtl/oplock.c @@ -454,7 +454,7 @@ FsRtlAcknowledgeOplockBreak(IN PINTERNAL_OPLOCK Oplock, /* If we dropped oplock, remove our extra ref */ if (Deref) { - ObfDereferenceObject(Oplock->FileObject); + ObDereferenceObject(Oplock->FileObject); } /* And unset FO: no oplock left or shared */ Oplock->FileObject = NULL; diff --git a/ntoskrnl/io/iomgr/rawfs.c b/ntoskrnl/io/iomgr/rawfs.c index de3a90f1b81..e653131f5a2 100644 --- a/ntoskrnl/io/iomgr/rawfs.c +++ b/ntoskrnl/io/iomgr/rawfs.c @@ -148,7 +148,7 @@ RawCheckForDismount(IN PVCB Vcb, } /* Dismount our device if possible */ - ObfDereferenceObject(Vcb->TargetDeviceObject); + ObDereferenceObject(Vcb->TargetDeviceObject); IoDeleteDevice((PDEVICE_OBJECT)CONTAINING_RECORD(Vcb, VOLUME_DEVICE_OBJECT, Vcb)); diff --git a/ntoskrnl/ob/devicemap.c b/ntoskrnl/ob/devicemap.c index 5d583e9388b..0c54f6995b8 100644 --- a/ntoskrnl/ob/devicemap.c +++ b/ntoskrnl/ob/devicemap.c @@ -130,7 +130,7 @@ ObSetDeviceMap(IN PEPROCESS Process, /* Release useless device map if required */ if (NewDeviceMap != NULL) { - ObfDereferenceObject(DirectoryObject); + ObDereferenceObject(DirectoryObject); ExFreePoolWithTag(NewDeviceMap, 'mDbO'); } @@ -235,7 +235,7 @@ ObSetDirectoryDeviceMap(OUT PDEVICE_MAP * DeviceMap, /* Release useless device map if required */ if (NewDeviceMap != NULL) { - ObfDereferenceObject(DirectoryObject); + ObDereferenceObject(DirectoryObject); ExFreePoolWithTag(NewDeviceMap, 'mDbO'); } diff --git a/ntoskrnl/po/poshtdwn.c b/ntoskrnl/po/poshtdwn.c index 8a33157fd0d..dd9bcc2dbb4 100644 --- a/ntoskrnl/po/poshtdwn.c +++ b/ntoskrnl/po/poshtdwn.c @@ -135,7 +135,7 @@ PopProcessShutDownLists(VOID) /* Wait for the thread to finish and dereference it */ KeWaitForSingleObject(ShutDownWaitEntry->Thread, 0, 0, 0, 0); - ObfDereferenceObject(ShutDownWaitEntry->Thread); + ObDereferenceObject(ShutDownWaitEntry->Thread); /* Finally free the entry */ ExFreePoolWithTag(ShutDownWaitEntry, 'LSoP'); diff --git a/ntoskrnl/ps/job.c b/ntoskrnl/ps/job.c index f37de8bbb07..cb7de5115d9 100644 --- a/ntoskrnl/ps/job.c +++ b/ntoskrnl/ps/job.c @@ -836,7 +836,7 @@ NtSetInformationJobObject ( } KeLeaveGuardedRegionThread(CurrentThread); - ObfDereferenceObject(Job); + ObDereferenceObject(Job); return Status; } diff --git a/ntoskrnl/wmi/guidobj.c b/ntoskrnl/wmi/guidobj.c index 06f350ab797..1a13d36a03c 100644 --- a/ntoskrnl/wmi/guidobj.c +++ b/ntoskrnl/wmi/guidobj.c @@ -247,7 +247,7 @@ WmipOpenGuidObject( if (!NT_SUCCESS(Status)) { DPRINT1("ObOpenObjectByPointer failed: 0x%lx\n", Status); - ObfDereferenceObject(GuidObject); + ObDereferenceObject(GuidObject); GuidObject = NULL; }

5 years, 2 months

[reactos] 03/03: [NEWDEV] Add Portuguese (neutral) translation.

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be820b9ca3e3c137727ba… commit be820b9ca3e3c137727ba0aa5b19e9c4eb59bb11 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Sat Jun 22 16:10:37 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 16:17:03 2019 +0200 [NEWDEV] Add Portuguese (neutral) translation. --- dll/win32/newdev/lang/pt-PT.rc | 101 +++++++++++++++++++++++++++++++++++++++++ dll/win32/newdev/newdev.rc | 3 ++ 2 files changed, 104 insertions(+) diff --git a/dll/win32/newdev/lang/pt-PT.rc b/dll/win32/newdev/lang/pt-PT.rc new file mode 100644 index 00000000000..c8e25060648 --- /dev/null +++ b/dll/win32/newdev/lang/pt-PT.rc @@ -0,0 +1,101 @@ +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 20-06-2019 zecarlos1957(a)hotmail.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_WELCOMEPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação de dispositivos" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Bem-vindo", IDC_WELCOMETITLE, 120, 8, 195, 16 + LTEXT "Este assistente auxilia-o a instalar um novo controlador de dispositivo para:", IDC_STATIC, 120, 21, 195, 16 + LTEXT "Clique em seguinte para continuar.", IDC_STATIC, 120, 169, 195, 16 + LTEXT "DISPOSITIVO DESCONHECIDO", IDC_DEVICE, 148, 36, 147, 17 + LTEXT "AVISO! INSTALAR UM DISPOSITIVO PODE CONGELAR O SEU COMPUTADOR, OU TORNA-LO INSTÁVEL!", IDC_STATIC, 120, 59, 195, 16 + CONTROL "Instalar o controlador automáticamente", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 + CONTROL "Instalar um controlador específico", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 +END + +IDD_NODRIVER DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Falha na instalação", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "O dispositivo não pôde ser instalado porque o controlador não foi encontrado.", IDC_STATIC, 120, 32, 195, 16 + LTEXT "Clique em 'Anterior' se tiver um disco do fabricante ou souber o caminho para o controlador.", IDC_STATIC, 120, 98, 195, 16 + CONTROL "Não mostrar mais esta caixa de diálogo", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 +END + +IDD_INSTALLFAILED DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Falha na instalação", IDC_FINISHTITLE, 120, 8, 195, 16 + LTEXT "O dispositivo não pôde ser instalado porque ocorreu um erro inesperado.", IDC_STATIC, 120, 32, 195, 16 + LTEXT "DISPOSITIVO DESCONHECIDO", IDC_DEVICE, 148, 53, 147, 17 +END + +IDD_CHSOURCE DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Pesquise nestes locais", IDC_RADIO_SEARCHHERE, "Button", BS_AUTORADIOBUTTON, 27, 11, 239, 12 + CONTROL "Escolha o driver manualmente", IDC_RADIO_CHOOSE, "Button", BS_AUTORADIOBUTTON, 27, 98, 171, 12 + CONTROL "Pesquisar mídia removível", IDC_CHECK_MEDIA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 33, 163, 12 + CONTROL "Incluir este caminho", IDC_CHECK_PATH, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 47, 54, 162, 12 + PUSHBUTTON "Procurar", IDC_BROWSE, 248, 70, 50, 14 + COMBOBOX IDC_COMBO_PATH, 61, 71, 176, 12, CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL +END + +IDD_SEARCHDRV DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "CONTROLADOR DESCONHECIDO", IDC_DEVICE, 51, 20, 169, 16 +END + +IDD_INSTALLDRV DIALOGEX 0, 0, 317, 143 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "DISPOSITIVO DESCONHECIDO", IDC_DEVICE, 51, 20, 169, 16 +END + +IDD_NEEDREBOOT DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalação concluída", IDC_FINISHTITLE, 120, 8, 195, 12 + LTEXT "Precisa reiniciar o computador para concluir a instalação do:", IDC_STATIC, 120, 32, 195, 16 + LTEXT "Clique em Concluir para fechar o assistente.", IDC_STATIC, 120, 174, 195, 12 + LTEXT "DISPOSITIVO DESCONHECIDO", IDC_DEVICE, 148, 53, 147, 17 +END + +IDD_FINISHPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instalação do dispositivo" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Instalação concluída", IDC_FINISHTITLE, 120, 8, 195, 12 + LTEXT "O assistente concluiu a instalação do controlador para:", IDC_STATIC, 120, 32, 195, 16 + LTEXT "Clique em Concluir para fechar o assistente.", IDC_STATIC, 120, 174, 195, 12 + LTEXT "DISPOSITIVO DESCONHECIDO", IDC_DEVICE, 148, 53, 147, 17 +END + +STRINGTABLE +BEGIN + IDS_INSTALLWIZARDTITLE "Assistente de novo hardware" + IDS_UPDATEWIZARDTITLE "Assistente para actualizar o controlador" + IDS_CHSOURCE_TITLE "Escolha as opções de pesquisa e instalação" + IDS_SEARCHDRV_TITLE "A procurar..." + IDS_INSTALLDRV_TITLE "A instalar..." +END diff --git a/dll/win32/newdev/newdev.rc b/dll/win32/newdev/newdev.rc index 958e481f111..14f780eb0a0 100644 --- a/dll/win32/newdev/newdev.rc +++ b/dll/win32/newdev/newdev.rc @@ -58,6 +58,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #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

5 years, 2 months

[reactos] 02/03: [NETID] Add Portuguese (neutral) translation.

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e6732586d148eb7d84b6… commit 0e6732586d148eb7d84b6552451a4f3486f581cb Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jun 20 20:27:19 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 16:16:58 2019 +0200 [NETID] Add Portuguese (neutral) translation. --- dll/win32/netid/lang/pt-PT.rc | 85 +++++++++++++++++++++++++++++++++++++++++++ dll/win32/netid/netid.rc | 3 ++ 2 files changed, 88 insertions(+) diff --git a/dll/win32/netid/lang/pt-PT.rc b/dll/win32/netid/lang/pt-PT.rc new file mode 100644 index 00000000000..2e0da4f4ae7 --- /dev/null +++ b/dll/win32/netid/lang/pt-PT.rc @@ -0,0 +1,85 @@ +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 22-06-2019 zecarlos1957(a)hotmail.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Nome do computador" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON + LTEXT "O ReactOS utiliza as seguintes informações para identificar o computador na rede.", IDC_STATIC, 40, 5, 204, 20 + LTEXT "Descrição do computador:", IDC_STATIC, 6, 40, 90, 9 + EDITTEXT IDC_COMPDESC, 98, 38, 146, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + LTEXT "Nome completo do computador:", IDC_STATIC, 6, 68, 85, 9 + EDITTEXT IDC_COMPUTERNAME, 98, 68, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Grupo de trabalho:", IDC_WORKGROUPDOMAIN, 6, 84, 64, 9 + EDITTEXT IDC_WORKGROUPDOMAIN_NAME, 98, 84, 144, 12, ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + LTEXT "Para utilizar o 'Assistente de identificação de rede' para escolher um domínio e criar uma conta de utilizador local, clique em ""ID de rede""", IDC_STATIC, 6, 113, 172, 24 + PUSHBUTTON "ID de rede", IDC_NETWORK_ID, 190, 114, 58, 15 + LTEXT "Para alterar o nome a este computador ou escolher um domínio, clique em Alterar.", IDC_STATIC, 6, 149, 170, 17 + PUSHBUTTON "&Alterar...", IDC_NETWORK_PROPERTY, 190, 149, 58, 15 + LTEXT "Nota: Somente administradores podem alterar a identificação deste computador.", IDC_STATIC, 2, 179, 200, 20 +END + +IDD_PROPPAGECOMPNAMECHENGE DIALOGEX 0, 0, 232, 222 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Alterar o nome do computador" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "(mensagem vai aqui)", 1017, 7, 5, 218, 30 + LTEXT "&Nome do computador:", -1, 7, 41, 219, 8 + EDITTEXT 1002, 7, 53, 218, 14, ES_AUTOHSCROLL | ES_OEMCONVERT + LTEXT "Nome completo do computador:", 1016, 7, 72, 218, 10 + EDITTEXT 1001, 7, 82, 219, 14, ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP + PUSHBUTTON "&Mais...", 1003, 150, 102, 75, 14 + GROUPBOX "Membro de", 1018, 7, 119, 219, 73 + AUTORADIOBUTTON "&Domínio:", 1008, 17, 132, 192, 10, WS_GROUP + AUTORADIOBUTTON "&Grupo de trabalho:", 1004, 17, 161, 191, 10 + EDITTEXT 116, 28, 144, 181, 14, ES_AUTOHSCROLL | WS_GROUP + PUSHBUTTON "&Procurar o meu domínio", 1010, 7, 203, 109, 14, NOT WS_VISIBLE | WS_DISABLED + EDITTEXT 1007, 28, 172, 181, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_OEMCONVERT + DEFPUSHBUTTON "OK", 1, 121, 203, 50, 14, WS_GROUP + PUSHBUTTON "Cancelar", 2, 176, 203, 50, 14 +END + +IDD_PROPPAGEDNSANDNETBIOS DIALOGEX 0, 0, 266, 125 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_CAPTION +CAPTION "Nome do computador, sufixo DNS e NetBIOS" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Sufixo DNS primário deste computador:", -1, 7, 5, 253, 8 + EDITTEXT 1011, 7, 17, 252, 14, ES_AUTOHSCROLL + AUTOCHECKBOX "&Alterar o sufixo DNS principal quando a associação ao domínio é alterada", 115, 11, 39, 250, 10 + LTEXT "Nome do computador &NetBIOS:", -1, 7, 57, 148, 8 + EDITTEXT 1013, 7, 69, 150, 14, ES_UPPERCASE | ES_AUTOHSCROLL | ES_READONLY + DEFPUSHBUTTON "OK", 1, 153, 104, 50, 14 + PUSHBUTTON "Cancelar", 2, 209, 104, 50, 14 + LTEXT "Este nome é usado para interoperabilidade com computadores e serviços mais antigos.", 13, 7, 88, 253, 8 +END + +STRINGTABLE +BEGIN + 1 "* Desconhecido *" + 2 "GRUPO DE TRABALHO" + 3 "Ocorreu o seguinte erro ao tentar ler as informações de participação no domínio:" + 4 "Alterar o nome do computador" + 5 "Grupo de trabalho:" + 6 "Domínio:" + 22 "Bem-vindo ao grupo de trabalho %1." + 23 "Bem-vindo ao domínio %1." + 24 "Tem de reiniciar o computador para que as alterações entrem em vigor." + 25 "Pode alterar o nome e a associação deste computador. Estas alterações podem afetar o acesso aos recursos da rede." + 1021 "Nota: Somente administradores podem alterar a identificação deste computador." + 1022 "Nota: A identificação do computador não pode ser alterada porque:" + 1030 "O novo nome do computador ""%s"" contém caracteres que não são permitidos. Caracteres que não são permitidos incluem ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' "" , . < > / e ?" + /* Windows allows using these characters, although it displays a warning message. + Forbidding the use of these characters means incompatibility with Windows. */ + 3210 "&Detalhes >>" + 3220 "<< &Detalhes" + 4000 "Informação" + 4001 "Não é possível definir um novo nome de computador!" +END diff --git a/dll/win32/netid/netid.rc b/dll/win32/netid/netid.rc index a75e7113695..204ecd05c5b 100644 --- a/dll/win32/netid/netid.rc +++ b/dll/win32/netid/netid.rc @@ -59,6 +59,9 @@ IDI_WARNINGICO ICON "res/102.ico" #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

5 years, 2 months

[reactos] 01/03: [NETCFGX] Add Portuguese (neutral) translation.

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=64a647a843dc5dc4ca01c… commit 64a647a843dc5dc4ca01c8290e62ee3e574c579b Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Thu Jun 20 19:01:17 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 16:11:55 2019 +0200 [NETCFGX] Add Portuguese (neutral) translation. --- dll/win32/netcfgx/lang/pt-PT.rc | 249 ++++++++++++++++++++++++++++++++++++++++ dll/win32/netcfgx/netcfgx.rc | 3 + 2 files changed, 252 insertions(+) diff --git a/dll/win32/netcfgx/lang/pt-PT.rc b/dll/win32/netcfgx/lang/pt-PT.rc new file mode 100644 index 00000000000..b077bfe94a0 --- /dev/null +++ b/dll/win32/netcfgx/lang/pt-PT.rc @@ -0,0 +1,249 @@ +/* Portuguese Language resource file + * + * Traduzido por: Jose Carlos Jesus 22-06-2019 zecarlos1957(a)hotmail.com + */ + +LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL + +IDD_TCPIP_BASIC_DLG DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Geral" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Pode obter as configurações de IP atribuídas automaticamente se a sua rede suportar esse recurso. Caso contrário, precisará solicitar ao administrador da rede as configurações de IP apropriadas.", -1, 9, 9, 235, 27 + CONTROL "Obter o endereço IP automaticamente", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 43, 210, 12 + GROUPBOX "", -1, 9, 61, 228, 70, BS_GROUPBOX + CONTROL "&Usar o endereço IP:", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON, 14, 59, 120, 12 + LTEXT "Endereço IP:", -1, 14, 75, 135, 8 + CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75 - 2, 85, 12 + LTEXT "Mascara Sub-rede:", -1, 14, 90, 135, 8 + CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 90 - 2, 85, 12 + LTEXT "Gateway padrão:", -1, 14, 105, 135, 8 + CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 105 - 2, 85, 12 + CONTROL "Obter o endereço DNS automaticamente", IDC_AUTODNS, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 139, 210, 12 + GROUPBOX "", -1, 9, 157, 228, 47, BS_GROUPBOX + CONTROL "&Usar o endereço DNS :", IDC_FIXEDDNS, "BUTTON", BS_AUTORADIOBUTTON, 14, 155, 152, 12 + LTEXT "Servidor DNS perferido:", -1, 14, 171, 135, 8 + CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 171 - 2, 85, 12 + LTEXT "Alternar servidor DNS:", -1, 14, 186, 135, 8 + CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 186 - 2, 85, 12 + PUSHBUTTON "&Avançado", IDC_ADVANCED, 186, 209, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_ALTCF_DLG DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Configuração alternativa" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Se este computador for usado em mais de uma rede, insira as configurações de IP alternativas abaixo.", -1, 9, 9, 220, 20 + CONTROL "IP privado &automático", IDC_USEDHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 40, 210, 12 + GROUPBOX "", -1, 9, 55, 228, 80, BS_GROUPBOX + CONTROL "&Config. do utilizador", IDC_NODHCP, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 14, 55, 70, 12 + LTEXT "Endereço &IP:", -1, 14, 75, 135, 8 + CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 144, 75, 85, 12 + LTEXT "Mascara S&ubnet:", -1, 14, 95, 135, 8 + CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 144, 95, 85, 12 + LTEXT "&Gateway padrão:", -1, 14, 115, 135, 8 + CONTROL "", IDC_DEFGATEWAY, "SysIPAddress32", WS_TABSTOP, 144, 115, 85, 12 + LTEXT "&Servidor DNS perferido:", -1, 14, 150, 135, 8 + CONTROL "", IDC_DNS1, "SysIPAddress32", WS_TABSTOP, 144, 150, 85, 12 + LTEXT "&Servidor DNS alternativo:", -1, 14, 165, 180, 8 + CONTROL "", IDC_DNS2, "SysIPAddress32", WS_TABSTOP, 144, 165, 85, 12 +END + +IDD_TCPIP_ADVIP_DLG DIALOGEX 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Definições de IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Endereço IP", -1, 5, 5, 240, 90 + CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 215, 55 + PUSHBUTTON "Adicionar", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Editar", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Remover", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "Gateway padrão:", -1, 5, 100, 240, 90 + CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 215, 55 + PUSHBUTTON "Adicionar", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Editar", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Remover", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 5, 200, 240, 30 + CHECKBOX "Métrica automática", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Interface métrica:", -1, 15, 215, 90, 12 + EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER +END + +IDD_TCPIP_ADVDNS_DLG DIALOGEX 0, 0, 247, 270 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "DNS" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_DNSADDRLIST, 5, 17, 180, 50, LBS_NOTIFY + LTEXT "Endereços do servidor &DNS, em uso:", -1, 5, 5, 180, 12 + PUSHBUTTON "A&cima", IDC_DNSADDRUP, 190, 25, 50, 14, WS_TABSTOP + PUSHBUTTON "A&baixo", IDC_DNSADDRDOWN, 190, 45, 50, 14, WS_TABSTOP + PUSHBUTTON "&Adicionar", IDC_DNSADDRADD, 15, 69, 50, 14, WS_TABSTOP + PUSHBUTTON "&Editar", IDC_DNSADDRMOD, 75, 69, 50, 14, WS_TABSTOP + PUSHBUTTON "&Remover", IDC_DNSADDRDEL, 135, 69, 50, 14, WS_TABSTOP + LTEXT "As três configurações seguintes, são aplicaveis a todas as ligações com o TCP / IP activo. Para resolução de nomes não qualificados:", -1, 5, 90, 220, 24 + CONTROL "Anexar sufixos DNS específicos e primários à ligação", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 220, 12 + CHECKBOX "Anexar sufixo pai ao sufixo DNS principal", IDC_TOPPRIMSUFFIX, 15, 125, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "Anexar estes sufixos DNS (pela ordem):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 220, 12 + LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 50, LBS_NOTIFY + PUSHBUTTON "Cima", IDC_DNSSUFFIXUP, 190, 163, 50, 14, WS_TABSTOP + PUSHBUTTON "baixo", IDC_DNSSUFFIXDOWN, 190, 180, 50, 14, WS_TABSTOP + PUSHBUTTON "&Adicionar", IDC_DNSSUFFIXADD, 15, 207, 50, 14, WS_TABSTOP + PUSHBUTTON "&Editar.", IDC_DNSSUFFIXMOD, 75, 207, 50, 14, WS_TABSTOP + PUSHBUTTON "Remo&ver", IDC_DNSSUFFIXDEL, 135, 207, 50, 14, WS_TABSTOP + LTEXT "DNS e &sufixo para esta ligação:", -1, 5, 228, 110, 14 + EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP + CHECKBOX "&Registe os endereços desta ligação no DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Use o sufixo DNS desta ligação no registo DNS", IDC_USESUFFIX, 15, 255, 220, 12, BS_AUTOCHECKBOX | WS_TABSTOP +END + +IDD_TCPIP_ADVOPT_DLG DIALOGEX 0, 0, 247, 247 +STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION +CAPTION "Opções" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_OPTLIST, 5, 30, 230, 70 + LTEXT "&Definições opcionais", -1, 5, 15, 130, 12 + PUSHBUTTON "&Proppriedades", IDC_OPTPROP, 165, 100, 70, 14, WS_TABSTOP + GROUPBOX "Descrição:", -1, 5, 120, 240, 70 + LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 +END + +IDD_TCPIPADDIP_DLG DIALOGEX 0, 0, 200, 70 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Endereço TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12 + LTEXT "Endereço IP:", -1, 5, 15, 70, 12 + LTEXT "Mascara Sub-rede:", -1, 5, 30, 70, 12 + CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 96, 30, 85, 12 + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPGW_DLG DIALOGEX 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Endereço TCP/IP Gateway" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 96, 15, 85, 12 + LTEXT "Gateway:", -1, 5, 15, 70, 12 + CHECKBOX "Métrica Automatica", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Métrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP +END + +IDD_TCPIPDNS_DLG DIALOGEX 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Servidor TCP/IP DNS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_IPADDR, "SysIPAddress32", WS_TABSTOP, 5, 25, 85, 12 + LTEXT "Servidor DNS:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIPSUFFIX_DLG DIALOGEX 0, 0, 200, 80 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Sufixo domínio TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP + LTEXT "Sufixo Domínio:", -1, 5, 10, 120, 12 + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_FILTER_DLG DIALOGEX 0, 0, 305, 220 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Filtros TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "Habilitar filtros TCP/IP (Todos os adaptadores)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "", -1, 5, 30, 90, 150 + CONTROL "Permitir todos", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "Permitir só", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 + PUSHBUTTON "Adicionar", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Remover", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 105, 30, 90, 150 + CONTROL "Permiirt todosl", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Permitir só", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 + PUSHBUTTON "Adicionar", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Removre", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + GROUPBOX "", -1, 205, 30, 90, 150 + CONTROL "Permitir todos", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Permitir só", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 + PUSHBUTTON "Adicionar", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Remover", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP +END + +IDD_TCPIP_PORT_DLG DIALOGEX 0, 0, 200, 60 +STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Adicionar Filtros" +FONT 8, "MS Shell Dlg" +BEGIN + EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP +END + +IDD_NET_PROPERTY_DLG DIALOGEX 0, 0, 252, 218 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Avançado" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "As seguintes propriedades estão disponíveis para este adaptador de rede. Clique na propriedade que deseja alterar à esquerda e, em seguida, seleccione o seu valor à direita.", -1, 7, 7, 218, 24, WS_GROUP + LTEXT "&Propriedade:", -1, 7, 37, 60, 8, WS_GROUP + LISTBOX IDC_PROPERTY_NAME, 7, 48, 124, 124, LBS_STANDARD | WS_TABSTOP + LTEXT "&Valor:", -1, 151, 37, 60, 8, WS_GROUP + EDITTEXT IDC_PROPERTY_VALUE_EDIT, 153, 48, 92, 14, ES_LEFT | ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + CONTROL "", IDC_PROPERTY_VALUE_UPDN, "msctls_updown32", UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_BORDER, 232, 48, 12, 12 + COMBOBOX IDC_PROPERTY_VALUE_LIST, 153, 48, 92, 64, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + AUTORADIOBUTTON "", IDC_PROPERTY_PRESENT, 141, 50, 8, 10, BS_TOP | WS_GROUP + AUTORADIOBUTTON "&Não presente", IDC_PROPERTY_NOT_PRESENT, 141, 68, 103, 10, BS_TOP +END + +STRINGTABLE +BEGIN + IDS_NET_CONNECT "Ligação de rede" + IDS_NO_IPADDR_SET "O adaptador requer pelo menos um endereço IP. Por favor, insira um." + IDS_NO_SUBMASK_SET "Inseriu um endereço sem máscara de sub-rede. Por favor, adicione uma máscara de sub-rede." + IDS_TCPFILTERDESC "A filtragem TCP / IP permite controlar o tipo de tráfego de rede TCP / IP que chega ao seu computador." + IDS_TCPFILTER "Filtros TCP/IP" + IDS_IPADDR "Endereço IP" + IDS_SUBMASK "Mascara de Sub-rede" + IDS_GATEWAY "Gateway" + IDS_METRIC "Métrica" + IDS_DHCPACTIVE "DHCP habilitado" + IDS_AUTOMATIC "Automatico" + IDS_NOITEMSEL "Você não seleccionou um item. Seleccione um primeiro." + IDS_TCPIP "ReactOS-TCP/IP" + IDS_ADD "Adicionar" + IDS_MOD "OK" + IDS_TCP_PORTS "Portas TCP" + IDS_UDP_PORTS "Portas UDP" + IDS_IP_PROTO "Protocolos IP" + IDS_PORT_RANGE "Os números de porta devem ser maiores que 0 e menores que 65536. Digite um número dentro desse intervalo." + IDS_PROT_RANGE "Os números de protocolo devem ser maiores que 0 e menores que 256. Digite um número dentro desse intervalo." + IDS_DUP_NUMBER "O número que está a adicionar já existe na lista. Por favor, insira um número diferente." + IDS_DISABLE_FILTER "Desactivar essa configuração TCP / IP global afectará todos os adaptadores." + IDS_NO_SUFFIX "A configuração actual do método de pesquisa requer pelo menos um sufixo DNS. Por favor, insira um ou altere a configuração." + IDS_DOMAIN_SUFFIX "O sufixo de domínio não é um sufixo válido." + IDS_DNS_SUFFIX "O nome de domínio DNS ""%s"" não é um nome DNS válido." + IDS_DUP_SUFFIX "O sufixo DNS já existe na lista." + IDS_DUP_IPADDR "O endereço IP já existe na lista." + IDS_DUP_GW "O gateway padrão já existe na lista." +END diff --git a/dll/win32/netcfgx/netcfgx.rc b/dll/win32/netcfgx/netcfgx.rc index 1d23c73a1a0..94a82144650 100644 --- a/dll/win32/netcfgx/netcfgx.rc +++ b/dll/win32/netcfgx/netcfgx.rc @@ -71,6 +71,9 @@ IDI_INTERNET ICON "res/internet.ico" #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

5 years, 2 months

[reactos] 01/01: [MAIN.CPL] Adjust the GROUPBOX control spacing for French resource (#1682)

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c9dc7302b8ed91bce829… commit 4c9dc7302b8ed91bce829cf7011cee3e69750fb2 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sat Jun 22 15:37:59 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Jun 22 15:37:59 2019 +0200 [MAIN.CPL] Adjust the GROUPBOX control spacing for French resource (#1682) CORE-12372 --- dll/cpl/main/lang/fr-FR.rc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/cpl/main/lang/fr-FR.rc b/dll/cpl/main/lang/fr-FR.rc index 4701b2aa5a9..057599fb801 100644 --- a/dll/cpl/main/lang/fr-FR.rc +++ b/dll/cpl/main/lang/fr-FR.rc @@ -55,10 +55,10 @@ BEGIN CHECKBOX "&Inverser les boutons gauche et droite", IDC_SWAP_MOUSE_BUTTONS, 10, 15, 140, 10 CONTROL "", IDC_IMAGE_SWAP_MOUSE, "Static", SS_ICON | SS_CENTERIMAGE | WS_VISIBLE, 165, 15, 65, 57, WS_EX_STATICEDGE LTEXT "Cochez cette case pour faire du bouton droit le bouton principal pour les fonctions telles que la sélection et le déplacement.", -1, 10, 30, 150, 30 - GROUPBOX "Vitesse du double-click ", -1, 5, 75, 230, 70 + GROUPBOX "Vitesse du double-click ", -1, 5, 77, 230, 70 LTEXT "Double-cliquer le dossier pour tester le paramètre. Si le dossier ne s'ouvre pas ou se ferme, essayez un réglage plus lent.", -1, 10, 85, 150, 30 - LTEXT "Vite&sse : Lente", -1, 10, 120, 90, 8 - LTEXT "Rapide", -1, 140, 120, 30, 8 + LTEXT "Vite&sse : Lente", -1, 10, 120, 90, 8 + LTEXT "Rapide", -1, 133, 120, 30, 8 CONTROL "", IDC_SLIDER_DOUBLE_CLICK_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 60, 120, 70, 17 CONTROL "", IDC_IMAGE_DOUBLE_CLICK_SPEED, "Static", SS_ICON | SS_NOTIFY | SS_CENTERIMAGE | WS_VISIBLE, 165, 85, 65, 57, WS_EX_STATICEDGE GROUPBOX "Verrouillage clic", -1, 5, 150, 230, 70

5 years, 2 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2019