Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 51944: [NTOSKRNL] - Implement IoInvalidateDeviceState
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 22:49:27 2011 New Revision: 51944 URL: http://svn.reactos.org/svn/reactos?rev=51944&view=rev Log: [NTOSKRNL] - Implement IoInvalidateDeviceState Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 22:49:27 2011 @@ -168,6 +168,20 @@ return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } +NTSTATUS +NTAPI +IopQueryStopDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_STOP_DEVICE; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + VOID NTAPI IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject) @@ -180,6 +194,21 @@ Stack.MinorFunction = IRP_MN_REMOVE_DEVICE; /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */ + IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + +VOID +NTAPI +IopSendStopDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_STOP_DEVICE; + + /* Drivers should never fail a IRP_MN_STOP_DEVICE request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); } @@ -298,12 +327,6 @@ HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE; UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; - - if (DeviceNode->Flags & (DNF_STARTED | DNF_START_REQUEST_PENDING)) - { - /* Nothing to do here */ - return STATUS_SUCCESS; - } Status = IopAssignDeviceResources(DeviceNode); if (!NT_SUCCESS(Status)) @@ -3551,13 +3574,93 @@ } /* - * @unimplemented + * @implemented */ VOID NTAPI IoInvalidateDeviceState(IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED; + PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject); + IO_STACK_LOCATION Stack; + ULONG PnPFlags; + NTSTATUS Status; + IO_STATUS_BLOCK IoStatusBlock; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_PNP_DEVICE_STATE; + + Status = IopSynchronousCall(PhysicalDeviceObject, &Stack, (PVOID*)&PnPFlags); + if (!NT_SUCCESS(Status)) + { + DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE failed with status 0x%x\n", Status); + return; + } + + if ((PnPFlags & PNP_DEVICE_REMOVED) || + ((PnPFlags & PNP_DEVICE_FAILED) && !(PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED))) + { + /* Surprise removal */ + + IopSendSurpriseRemoval(PhysicalDeviceObject); + + /* Tell the user-mode PnP manager that a device was removed */ + IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL, + &DeviceNode->InstancePath); + + IopSendRemoveDevice(PhysicalDeviceObject); + } + else if ((PnPFlags & PNP_DEVICE_FAILED) && (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED)) + { + /* Stop for resource rebalance */ + + if (NT_SUCCESS(IopQueryStopDevice(PhysicalDeviceObject))) + { + IopSendStopDevice(PhysicalDeviceObject); + } + } + + /* Resource rebalance */ + if (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED) + { + DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n"); + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_RESOURCES, + NULL); + if (NT_SUCCESS(Status) && IoStatusBlock.Information) + { + DeviceNode->BootResources = + (PCM_RESOURCE_LIST)IoStatusBlock.Information; + IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG); + } + else + { + DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status); + DeviceNode->BootResources = NULL; + } + + DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n"); + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_RESOURCE_REQUIREMENTS, + NULL); + if (NT_SUCCESS(Status)) + { + DeviceNode->ResourceRequirements = + (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information; + } + else + { + DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status); + DeviceNode->ResourceRequirements = NULL; + } + + /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */ + IopStartDevice(DeviceNode); + } } /**

1 0

[rharabien] 51943: [HAL] - Use ExFreePoolWithTag instead of ExFreePool - Add definitions of used tags
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 22:22:37 2011 New Revision: 51943 URL: http://svn.reactos.org/svn/reactos?rev=51943&view=rev Log: [HAL] - Use ExFreePoolWithTag instead of ExFreePool - Add definitions of used tags Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c trunk/reactos/hal/halx86/generic/legacy/bussupp.c trunk/reactos/hal/halx86/include/hal.h Modified: trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/bushndlr.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -36,7 +36,7 @@ /* Allocate the array */ Array = ExAllocatePoolWithTag(NonPagedPool, Size, - 'BusH'); + TAG_BUS_HANDLER); if (!Array) KeBugCheckEx(HAL_MEMORY_ALLOCATION, Size, 0, (ULONG_PTR)__FILE__, __LINE__); /* Initialize it */ @@ -263,7 +263,7 @@ /* Allocate the bus handler */ Bus = ExAllocatePoolWithTag(NonPagedPool, sizeof(HAL_BUS_HANDLER) + ExtraData, - 'HsuB'); + TAG_BUS_HANDLER); if (!Bus) return STATUS_INSUFFICIENT_RESOURCES; /* Return the handler */ @@ -404,11 +404,11 @@ //MmUnlockPagableImageSection(CodeHandle); /* Free all allocations */ - if (Bus) ExFreePool(Bus); - if (InterfaceArray) ExFreePool(InterfaceArray); - if (InterfaceBusNumberArray) ExFreePool(InterfaceBusNumberArray); - if (ConfigArray) ExFreePool(ConfigArray); - if (ConfigBusNumberArray) ExFreePool(ConfigBusNumberArray); + if (Bus) ExFreePoolWithTag(Bus, TAG_BUS_HANDLER); + if (InterfaceArray) ExFreePoolWithTag(InterfaceArray, TAG_BUS_HANDLER); + if (InterfaceBusNumberArray) ExFreePoolWithTag(InterfaceBusNumberArray, TAG_BUS_HANDLER); + if (ConfigArray) ExFreePoolWithTag(ConfigArray, TAG_BUS_HANDLER); + if (ConfigBusNumberArray) ExFreePoolWithTag(ConfigBusNumberArray, TAG_BUS_HANDLER); /* And we're done */ return Status; Modified: trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bus/pcibus.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -572,7 +572,7 @@ if (PciData.VendorID == PCI_INVALID_VENDORID) return STATUS_UNSUCCESSFUL; /* Allocate the supported range structure */ - *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), 'Hal '); + *Range = ExAllocatePoolWithTag(PagedPool, sizeof(SUPPORTED_RANGE), TAG_HAL); if (!*Range) return STATUS_INSUFFICIENT_RESOURCES; /* Set it up */ @@ -766,7 +766,7 @@ PagedPool, sizeof(CM_RESOURCE_LIST) + (ResourceCount - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), - ' laH'); + TAG_HAL); if (NULL == *AllocatedResources) return STATUS_NO_MEMORY; @@ -1015,7 +1015,7 @@ sizeof(PCI_REGISTRY_INFO_INTERNAL) + (KeyInformation.Values * sizeof(PCI_CARD_DESCRIPTOR)), - ' laH'); + TAG_HAL); if (PciRegistryInfo) { /* Get the first card descriptor entry */ @@ -1069,7 +1069,7 @@ /* Just allocate the basic structure then */ PciRegistryInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(PCI_REGISTRY_INFO_INTERNAL), - ' laH'); + TAG_HAL); if (!PciRegistryInfo) return NULL; } @@ -1119,7 +1119,7 @@ MaxPciBusNumber = PciRegistryInfo->NoBuses - 1; /* Free the info structure */ - ExFreePool(PciRegistryInfo); + ExFreePoolWithTag(PciRegistryInfo, TAG_HAL); } /* Initialize the PCI lock */ Modified: trunk/reactos/hal/halx86/generic/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/legacy/… ============================================================================== --- trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/legacy/bussupp.c [iso-8859-1] Thu May 26 22:22:37 2011 @@ -1096,7 +1096,7 @@ HalpGetNMICrashFlag(); /* Free the registry data */ - ExFreePool(PciRegistryInfo); + ExFreePoolWithTag(PciRegistryInfo, TAG_HAL); /* Tell PnP if this hard supports correct decoding */ HalpMarkChipsetDecode(ExtendedAddressDecoding); @@ -1256,7 +1256,7 @@ Handler = HalReferenceHandlerForBus(InterfaceType, BusNumber); if (!(Handler) || !(Handler->TranslateBusAddress)) { - DPRINT1("No translator!\n"); + DPRINT1("No translator Interface: %x, Bus: %x, Handler: %x!\n", InterfaceType, BusNumber, Handler); return FALSE; } Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Thu May 26 22:22:37 2011 @@ -45,6 +45,9 @@ #include "internal/i386/intrin_i.h" #endif +#define TAG_HAL ' laH' +#define TAG_BUS_HANDLER 'BusH' + /* Internal HAL Headers */ #include "apic.h" #include "bus.h"

1 0

[cgutman] 51942: [NTOSKRNL] - Implement the kernel backend of graceful device removal/ejection
by cgutman＠svn.reactos.org 26 May '11

26 May '11

Author: cgutman Date: Thu May 26 22:09:02 2011 New Revision: 51942 URL: http://svn.reactos.org/svn/reactos?rev=51942&view=rev Log: [NTOSKRNL] - Implement the kernel backend of graceful device removal/ejection Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Thu May 26 22:09:02 2011 @@ -125,6 +125,20 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +IopSendEject(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_EJECT; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + VOID NTAPI IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject) @@ -138,6 +152,20 @@ /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */ IopSynchronousCall(DeviceObject, &Stack, &Dummy); +} + +NTSTATUS +NTAPI +IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject) +{ + IO_STACK_LOCATION Stack; + PVOID Dummy; + + RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION)); + Stack.MajorFunction = IRP_MJ_PNP; + Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE; + + return IopSynchronousCall(DeviceObject, &Stack, &Dummy); } VOID @@ -3687,14 +3715,221 @@ return Status; } +NTSTATUS +NTAPI +IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject) +{ + PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject); + IO_STACK_LOCATION Stack; + IO_STATUS_BLOCK IoStatusBlock; + PDEVICE_RELATIONS DeviceRelations; + NTSTATUS Status; + ULONG i; + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &DeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS) + { + DPRINT1("Removal vetoed by failing the query remove request\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &DeviceNode->InstancePath); + + return STATUS_UNSUCCESSFUL; + } + + Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations; + + Status = IopInitiatePnpIrp(DeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); + return Status; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &RelationsDeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceRelations->Objects[i]) != STATUS_SUCCESS) + { + DPRINT1("Device removal vetoed by failing a dependent query remove request\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &RelationsDeviceNode->InstancePath); + + Status = STATUS_UNSUCCESSFUL; + + goto cleanup; + } + else + { + IopSendRemoveDevice(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL, + &RelationsDeviceNode->InstancePath); + + ObDereferenceObject(DeviceRelations->Objects[i]); + + DeviceRelations->Objects[i] = NULL; + } + } + + ExFreePool(DeviceRelations); + + DeviceRelations = NULL; + } + + Status = STATUS_SUCCESS; + +cleanup: + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + if (DeviceRelations->Objects[i]) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + } + } + + ExFreePool(DeviceRelations); + } + + return Status; +} + /* - * @unimplemented + * @implemented */ VOID NTAPI IoRequestDeviceEject(IN PDEVICE_OBJECT PhysicalDeviceObject) { - UNIMPLEMENTED; + PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject); + PDEVICE_RELATIONS DeviceRelations; + IO_STATUS_BLOCK IoStatusBlock; + IO_STACK_LOCATION Stack; + DEVICE_CAPABILITIES Capabilities; + NTSTATUS Status; + ULONG i; + + IopQueueTargetDeviceEvent(&GUID_DEVICE_KERNEL_INITIATED_EJECT, + &DeviceNode->InstancePath); + + if (IopQueryDeviceCapabilities(DeviceNode, &Capabilities) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations; + + Status = IopInitiatePnpIrp(PhysicalDeviceObject, + &IoStatusBlock, + IRP_MN_QUERY_DEVICE_RELATIONS, + &Stack); + if (!NT_SUCCESS(Status) || Status == STATUS_PENDING) + { + DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status); + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; + + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + PDEVICE_NODE RelationsDeviceNode = IopGetDeviceNode(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING, + &RelationsDeviceNode->InstancePath); + + if (IopQueryRemoveDevice(DeviceRelations->Objects[i]) != STATUS_SUCCESS) + { + DPRINT1("Device removal vetoed by failing a query remove request (ejection relations)\n"); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED, + &RelationsDeviceNode->InstancePath); + + goto cleanup; + } + else + { + IopSendRemoveDevice(DeviceRelations->Objects[i]); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL, + &RelationsDeviceNode->InstancePath); + + ObDereferenceObject(DeviceRelations->Objects[i]); + + DeviceRelations->Objects[i] = NULL; + } + } + + ExFreePool(DeviceRelations); + + DeviceRelations = NULL; + } + + if (IopPrepareDeviceForRemoval(PhysicalDeviceObject) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + return; + } + + if (Capabilities.EjectSupported) + { + if (IopSendEject(PhysicalDeviceObject) != STATUS_SUCCESS) + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + + return; + } + } + else + { + DeviceNode->Flags |= DNF_DISABLED; + } + +cleanup: + if (DeviceRelations) + { + for (i = 0; i < DeviceRelations->Count; i++) + { + if (DeviceRelations->Objects[i]) + { + ObDereferenceObject(DeviceRelations->Objects[i]); + } + } + + ExFreePool(DeviceRelations); + + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED, + &DeviceNode->InstancePath); + } + else + { + IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT, + &DeviceNode->InstancePath); + } } /*

1 0

[gedmurphy] 51941: [SHELL32_NEW] - Merge 51783 - The final revision to merge from the existing shell32 code. - The C++ shell32 module is now fully up to date and ready for testing.
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 22:04:22 2011 New Revision: 51941 URL: http://svn.reactos.org/svn/reactos?rev=51941&view=rev Log: [SHELL32_NEW] - Merge 51783 - The final revision to merge from the existing shell32 code. - The C++ shell32 module is now fully up to date and ready for testing. Added: branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt (with props) Added: branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt (added) +++ branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Thu May 26 22:04:22 2011 @@ -1,0 +1,106 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR}) + +generate_idl_iids(shobjidl_local.idl) + +spec2def(shell32.dll shell32.spec) + +list(APPEND SOURCE + authors.c + autocomplete.c + brsfolder.c + changenotify.c + classes.c + clipboard.c + control.c + dataobject.c + dde.c + debughlp.c + desktop.c + dialogs.c + dragdrophelper.c + enumidlist.c + extracticon.c + folders.c + iconcache.c + pidl.c + regsvr.c + shell32_main.c + shellitem.c + shelllink.c + shellole.c + shellord.c + shellpath.c + shellreg.c + shellstring.c + shfldr_desktop.c + shfldr_fs.c + shfldr_mycomp.c + shfldr_mydocuments.c + shfldr_printers.c + shfldr_admintools.c + shfldr_netplaces.c + shfldr_fonts.c + shfldr_cpanel.c + shfldr_recyclebin.c + shlexec.c + shlfileop.c + shlfolder.c + shlfsbind.c + shlmenu.c + shlview.c + shpolicy.c + shv_def_cmenu.c + startmenu.c + stubs.c + ros-systray.c + fprop.c + drive.c + she_ocmenu.c + shv_item_new.c + folder_options.c + shell32.rc + ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c + ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) + +add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + +add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) + +set_module_type(shell32 win32dll) + +target_link_libraries(shell32 + wine + uuid + recyclebin) + +add_importlibs(shell32 + advapi32 + gdi32 + user32 + comctl32 + comdlg32 + shlwapi + ole32 + version + devmgr + winspool + winmm + kernel32 + msvcrt + ntdll) + +add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all) +add_importlib_target(shell32.spec) Propchange: branches/shell32_new-bringup/dll/win32/shell32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 51940: [SHELL32_NEW] - Merge 51729 Implement SHGetImageList http://source.winehq.org/git/wine.git/commitdiff/9db87f13d3f0f9e07accc9b5e12dccd202b88156 Fixes explorer++ main window
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 22:01:05 2011 New Revision: 51940 URL: http://svn.reactos.org/svn/reactos?rev=51940&view=rev Log: [SHELL32_NEW] - Merge 51729 Implement SHGetImageList http://source.winehq.org/git/wine.git/commitdiff/9db87f13d3f0f9e07accc9b5e1… Fixes explorer++ main window Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shellord.cpp [iso-8859-1] Thu May 26 22:01:05 2011 @@ -50,6 +50,7 @@ #include "shlwapi.h" #include "commdlg.h" #include "recyclebin.h" +#include "commoncontrols.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); WINE_DECLARE_DEBUG_CHANNEL(pidl); @@ -2254,10 +2255,40 @@ { } +/************************************************************************* + * SHGetImageList (SHELL32.727) + * + * Returns a copy of a shell image list. + * + * NOTES + * Windows XP features 4 sizes of image list, and Vista 5. Wine currently + * only supports the traditional small and large image lists, so requests + * for the others will currently fail. + */ EXTERN_C HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { - FIXME("STUB: %i %s\n",iImageList,debugstr_guid(&riid)); - return E_NOINTERFACE; + HIMAGELIST hLarge, hSmall; + HIMAGELIST hNew; + HRESULT ret = E_FAIL; + + /* Wine currently only maintains large and small image lists */ + if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL) && (iImageList != SHIL_SYSSMALL)) + { + FIXME("Unsupported image list %i requested\n", iImageList); + return E_FAIL; + } + + Shell_GetImageLists(&hLarge, &hSmall); + hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); + + /* Get the interface for the new image list */ + if (hNew) + { + ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); + ImageList_Destroy(hNew); + } + + return ret; } /*************************************************************************

1 0

[gedmurphy] 51939: [SHELL32_NEW] Merge 51602, 51604, 51701, 51702
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 21:53:16 2011 New Revision: 51939 URL: http://svn.reactos.org/svn/reactos?rev=51939&view=rev Log: [SHELL32_NEW] Merge 51602, 51604, 51701, 51702 Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc branches/shell32_new-bringup/dll/win32/shell32/shell32.spec branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 26 21:53:16 2011 @@ -774,6 +774,6 @@ IDS_FILE_DETAILS "Detalles para el tipo de archivo '%s'" IDS_FILE_DETAILSADV "Los archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipos de archivos" + IDS_COLUMN_EXTENSION "Extensiones" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu May 26 21:53:16 2011 @@ -772,6 +772,6 @@ IDS_FILE_DETAILS "Dettagli per l'estensione '%s'" IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo '%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su Avanzate." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipi di file" + IDS_COLUMN_EXTENSION "Estensioni" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu May 26 21:53:16 2011 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * ReactOS shell32 fork translation updated by Caemyr - - * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010) + * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010, May 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -769,6 +769,6 @@ IDS_FILE_DETAILS "Szczegó³y dla rozszerzenia '%s'" IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' s¹ typu '%s'. Aby zmieniæ ustawienia, które dotycz¹ wszystkich plików '%s', kliknij przycisk Zaawansowane." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Typy plików" + IDS_COLUMN_EXTENSION "Rozszerzenia" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/shell32.spec URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shell32.spec [iso-8859-1] Thu May 26 21:53:16 2011 @@ -113,16 +113,16 @@ 113 stdcall Control_RunDLLA(ptr ptr str long) 114 stdcall Control_RunDLLAsUserW(ptr ptr wstr long) 115 stdcall Control_RunDLLW(ptr ptr wstr long) -116 stdcall DllCanUnloadNow() -117 stdcall DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) 118 stdcall DllGetVersion(ptr) 119 stdcall IsLFNDrive(ptr) IsLFNDriveAW -120 stdcall DllInstall(long wstr) +@ stdcall -private DllInstall(long wstr) 121 stdcall SHFlushClipboard() 122 stdcall -noname RunDLL_CallEntry16(long long long str long) # Fixme #name wrong? 123 stdcall -noname SHFreeUnusedLibraries() -124 stdcall DllRegisterServer() -125 stdcall DllUnregisterServer() +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() 126 stdcall -noname SHOutOfMemoryMessageBox(long long long) # Fixme 127 stdcall -noname SHWinHelp(long long long long) 128 stdcall -noname SHDllGetClassObject(ptr ptr ptr) DllGetClassObject @@ -316,7 +316,7 @@ 316 stdcall SHGetSpecialFolderLocation(long long ptr) 317 stdcall SHGetSpecialFolderPathA(long ptr long long) 318 stdcall SHGetSpecialFolderPathW(long ptr long long) -319 stdcall SHGetUnreadMailCountW(long wstr long ptr wstr long) +319 stdcall SHGetUnreadMailCountW (long wstr long ptr wstr long) 320 stdcall SHHelpShortcuts_RunDLL(long long long long) SHHelpShortcuts_RunDLLA 321 stdcall SHHelpShortcuts_RunDLLA(long long long long) 322 stdcall SHHelpShortcuts_RunDLLW(long long long long) @@ -332,7 +332,7 @@ 332 stdcall SHQueryRecycleBinA(str ptr) 333 stdcall SHQueryRecycleBinW(wstr ptr) 334 stdcall SHSetLocalizedName(wstr wstr long) -335 stdcall SHSetUnreadMailCountW(wstr long wstr) +335 stdcall SHSetUnreadMailCountW (wstr long wstr) 336 stdcall SHUpdateRecycleBinIcon() 337 stdcall SheChangeDirA(str) 338 stdcall SheChangeDirExA(str) Modified: branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shelllink.cpp [iso-8859-1] Thu May 26 21:53:16 2011 @@ -102,9 +102,13 @@ /* strdup on the process heap */ static LPWSTR __inline HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str) { + INT len; + LPWSTR p; + assert(str); - INT len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); - LPWSTR p = (LPWSTR)HeapAlloc( heap, flags, len*sizeof (WCHAR) ); + + len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + p = (LPWSTR)HeapAlloc( heap, flags, len*sizeof (WCHAR) ); if( !p ) return p; MultiByteToWideChar( CP_ACP, 0, str, -1, p, len );

1 0

[gedmurphy] 51938: [SHELL32_NEW] - Merge 51586, 51592, 51596
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 21:43:27 2011 New Revision: 51938 URL: http://svn.reactos.org/svn/reactos?rev=51938&view=rev Log: [SHELL32_NEW] - Merge 51586, 51592, 51596 Modified: branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc branches/shell32_new-bringup/dll/win32/shell32/shresdef.h Modified: branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/folder_options.cpp [iso-8859-1] Thu May 26 21:43:27 2011 @@ -398,7 +398,7 @@ { LPNMLISTVIEW lppl; LVITEMW lvItem; - WCHAR Buffer[200], FormatBuffer[100]; + WCHAR Buffer[255], FormatBuffer[255]; PFOLDER_FILE_TYPE_ENTRY pItem; OPENASINFO Info; @@ -450,6 +450,16 @@ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1]); /* update dialog */ SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, 0, (LPARAM)Buffer); + + if (!LoadStringW(shell32_hInstance, IDS_FILE_DETAILSADV, FormatBuffer, sizeof(FormatBuffer) / sizeof(WCHAR))) + { + /* use default english format string */ + wcscpy(FormatBuffer, L"Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."); + } + /* format buffer */ + swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1], &pItem->FileDescription[0], &pItem->FileDescription[0]); + /* update dialog */ + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, 0, (LPARAM)Buffer); } } break; Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -423,7 +423,7 @@ //ICON LTEXT "Èìå íà ïðèëîæåíèå", 14005, 100, 140, 40, 10 PUSHBUTTON "Ïðî&ìÿíà...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'.\nÇà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s'\nôàéëîâå, íàòèñíåòå Ðàçøèðåíè.", 14007, 12, 155, 160, 32 +LTEXT "", 14007, 12, 155, 160, 32 PUSHBUTTON "Ðàç&øèðåíè", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,8 +759,13 @@ IDS_COPY_OF "Ïðåçàïèñ íà" IDS_SHLEXEC_NOASSOC "Íÿìà ïðèëîæåíèå çà Óèíäîóñ, íàñòðîåíî äà îòâàðÿ òîçè âèä ôàéëîâå." -END - - - - + + IDS_FILE_DETAILS "Ïîäðîáíîñòè çà ðàçøèðåíèå '%s" + IDS_FILE_DETAILSADV "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'. Çà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s' ôàéëîâå, íàòèñíåòå Ðàçøèðåíè." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END + + + + Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -412,7 +412,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Zmìnit...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Soubory s pøíponou '%s' jsou typu '%s'. Kliknutím\nna tlaèítko Pokroèilé lze zmìnit nastavení pro vechny\nsoubory '%s'.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "&Pokroèilé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -745,4 +745,9 @@ IDS_COPY_OF "Kopie " IDS_SHLEXEC_NOASSOC "Pro otevøení tohoto souboru není nakonfigurován ádný program." -END + + IDS_FILE_DETAILS "Podrobnosti pro typ souborù '%s'" + IDS_FILE_DETAILSADV "Soubory s pøíponou '%s' jsou typu '%s'. Kliknutím na tlaèítko Pokroèilé lze zmìnit nastavení pro vechny soubory '%s'." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -413,7 +413,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -747,4 +747,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Anwendungsname", 14005, 100, 140, 40, 10 PUSHBUTTON "Än&dern...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "Um\ndie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 + LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,4 +762,9 @@ IDS_COPY_OF "Kopie von" IDS_SHLEXEC_NOASSOC "Es ist kein Programm mit diesem Dateityp verknüpft." -END + + IDS_FILE_DETAILS "Details zum Dateityp '%s'" + IDS_FILE_DETAILSADV "Um die Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert." + IDS_FILE_TYPES "Dateitypen" + IDS_COLUMN_EXTENSION "Erweiterungen" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,4 +759,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -435,7 +435,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -437,7 +437,7 @@ //ICON LTEXT "Aplicación", 14005, 100, 140, 40, 10 PUSHBUTTON "Cam&biar...", 14006, 230, 140, 50, 14, WS_TABSTOP -LTEXT "Archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas.", 14007, 12, 165, 220, 30 +LTEXT "", 14007, 12, 165, 220, 30 PUSHBUTTON "Opciones avanza&das", 14008, 190, 213, 90, 14, WS_TABSTOP END @@ -771,4 +771,9 @@ IDS_COPY_OF "Copia de" IDS_SHLEXEC_NOASSOC "No hay ningún programa configurado en ReactOS para abrir este tipo de archivo." -END + + IDS_FILE_DETAILS "Detalles para el tipo de archivo '%s'" + IDS_FILE_DETAILSADV "Los archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -428,7 +428,7 @@ //ICON LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 PUSHBUTTON "&Modifier...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Les fichiers avec l'extension '%s' sont de type '%s'. Pour\nmodifier les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,4 +762,9 @@ IDS_COPY_OF "Copie de" IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." -END + + IDS_FILE_DETAILS "Détails concernant l'extension '%s'" + IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramètres qui concernent tous les fichiers '%s', cliquez sur Avancé." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -129,7 +129,7 @@ LTEXT "Versione " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Questa versione di ReactOS è registrata da:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -435,7 +435,7 @@ //ICON LTEXT "Nome", 14005, 100, 140, 40, 10 PUSHBUTTON "&Cambia...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "I files con estensione '%s' sono di tipo '%s'.\nPer cambiare le impostazioni che influenzano tutti i file '%s', cliccare\nAvanzate.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vanzate", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,9 @@ IDS_COPY_OF "Copia di" IDS_SHLEXEC_NOASSOC "Non c'è un programma configurato per aprire questo tipo di file." -END + + IDS_FILE_DETAILS "Dettagli per l'estensione '%s'" + IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo '%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su Avanzate." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Av¼", 14005, 100, 140, 40, 10 PUSHBUTTON "ÏX(&C)...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B\n'%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ\nÚ×ÝèðNbNµÄ¾³¢B", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ú×Ýè(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -757,4 +757,10 @@ IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" IDS_COPY_OF "Rs[ `" -END + IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "g£q '%s' ÌÚ×" + IDS_FILE_DETAILSADV "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B '%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ Ú×ÝèðNbNµÄ¾³¢B" + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -425,7 +425,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Endre...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Filer med utvidelser '%s' er av typen '%s'. For å\nendre innstillingene som er av filen '%s', trykk på\navansert.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Av&ansert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til å åpne denne filtypen." -END + + IDS_FILE_DETAILS "Detailjer for '%s' utvidelser" + IDS_FILE_DETAILSADV "Filer med utvidelser '%s' er av typen '%s'. For å endre innstillingene som er av filen '%s', trykk på avansert." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -432,7 +432,7 @@ //ICON LTEXT "Nazwa Aplikacji", 14005, 100, 140, 40, 10 PUSHBUTTON "Z&mieñ", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Pliki z rozszerzeniem '%s' nale¿¹ do typu: '%s'. Aby\nzmieniæ ustawienia dotycz¹ce wszystkich plików '%s', wybierz\nZaawansowane.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Zaawa&nsowane", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -766,4 +766,9 @@ IDS_COPY_OF "Kopia" IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowany, by otwieraæ pliki tego typu." -END + + IDS_FILE_DETAILS "Szczegó³y dla rozszerzenia '%s'" + IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' s¹ typu '%s'. Aby zmieniæ ustawienia, które dotycz¹ wszystkich plików '%s', kliknij przycisk Zaawansowane." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -426,7 +426,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -760,4 +760,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Nici un program Windows nu este configurat sa deschida fi?iere de acest tip." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Appnome", 14005, 100, 140, 40, 10 PUSHBUTTON "&Mudar...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ficheiros com extensão '%s' são do tipo '%s'. Para\nmudar definições que afectam todos '%s' ficheiros, click\nAvançado.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,9 @@ IDS_COPY_OF "Cópia de" IDS_SHLEXEC_NOASSOC "Não existe um programa Windows configurado para abrir este tipo de ficheiro." -END + + IDS_FILE_DETAILS "Detalhes para '%s' extensão" + IDS_FILE_DETAILSADV "Ficheiros com extensão '%s' são do tipo '%s'. Para mudar definições que afectam todos '%s' ficheiros, click Avançado." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Nume ap.", 14005, 100, 140, 40, 10 PUSHBUTTON "&Schimbare", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "FiÈierele cu extensia '%s' sunt de tipul '%s'. \nPentru a schimbat setÄri care vor afecta\ntoate fiÈierele '%s', clic pe Avansat.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vansat", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -760,6 +760,11 @@ IDS_DEFAULT_CLUSTER_SIZE "MÄrime de alocare implicitÄ" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "Detalii pentru extensia '%s'" + IDS_FILE_DETAILSADV "FiÈierele cu extensia '%s' sunt de tipul '%s'. Pentru a schimbat setÄri care vor afecta toate fiÈierele '%s', clic pe Avansat." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" END #pragma code_page(default) Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Ïðèëîæåíèå:", 14005, 100, 142, 54, 10 PUSHBUTTON "&Èçìåíèòü...", 14006, 180, 140, 63, 14, WS_TABSTOP -LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå ""Äîïîëíèòåëüíî"".", 14007, 12, 155, 162, 36 +LTEXT "", 14007, 12, 155, 162, 36 PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 63, 14, WS_TABSTOP END @@ -757,4 +757,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Îïèñàíèå ðàñøèðåíèÿ '%s'" + IDS_FILE_DETAILSADV "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå 'Äîïîëíèòåëüíî'." + IDS_FILE_TYPES "Òèïû ôàéëîâ" + IDS_COLUMN_EXTENSION "Ðàñøèðåíèÿ" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -1,7 +1,7 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * NOTE : partially translated * TRANSLATED : 26-12-2007 - * LAST CHANGE: 31-05-2010 + * LAST CHANGE: 27-03-2011 */ /* @@ -336,7 +336,7 @@ LTEXT "Ktoré pouívate¾ské konto chcete poui k spusteniu tohto programu?", -1, 10, 20, 220, 20 CHECKBOX "Aktuálny pouívate¾ %s", 14000, 10, 45, 150, 10 LTEXT "Chráni poèítaè a údaje pred neoprávnenými aktivitami programu", -1, 25, 57, 200, 10, WS_DISABLED - CHECKBOX "This option can prevent computer viruses from harming your computer or personal data, but selecting it might cause the program to function improperly.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE + CHECKBOX "Táto monos môe zabráni poèítaèovým vírusom aby pokodili poèítaè alebo osobné údaje, ale jej zvolenie môe spôsobi, e program nebude správne fungova.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE CHECKBOX "Nasledujúci pouívate¾:", 14002, 10, 100, 90, 10 LTEXT "Meno pouívate¾a:", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP @@ -430,7 +430,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Zmeni...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -675,10 +675,10 @@ IDS_LOGOFF_PROMPT "Naozaj sa chcete odhlási?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Unable to display Run File dialog box (internal error)" - IDS_RUNDLG_BROWSE_ERROR "Unable to display Browse dialog box (internal error)" - IDS_RUNDLG_BROWSE_CAPTION "Browse" - IDS_RUNDLG_BROWSE_FILTER "Executable Files (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_RUNDLG_ERROR "Nemono zobrazi dialogové okno Spusti súbor (vnútorná chyba)" + IDS_RUNDLG_BROWSE_ERROR "Nemono zobrazi dialogové okno Preh¾adáva (vnútorná chyba)" + IDS_RUNDLG_BROWSE_CAPTION "Preh¾adáva" + IDS_RUNDLG_BROWSE_FILTER "Spustite¾né súbory (*.exe)\0*.exe\0Vetky súbory (*.*)\0*.*\0" /* shell folder path default values */ IDS_PROGRAMS "Ponuka tart\\Programy" @@ -729,10 +729,10 @@ IDS_RECYCLEBIN_DISKSPACE "Dostupné miesto" IDS_EMPTY_BITBUCKET "Vyprázdni Kô" IDS_PICK_ICON_TITLE "Choose Icon" - IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0All Files (*.*)\0*.*\0" - IDS_OPEN_WITH_FILTER "Spustite¾né súbory (*.exe)\0*.exe\0All Files (*.*)\0*.*\0" + IDS_PICK_ICON_FILTER "Súbory ikon (*.ico, *.icl, *.exe, *.dll)\0*.ico;*.icl;*.exe;*.dll\0Vetky súbory (*.*)\0*.*\0" + IDS_OPEN_WITH_FILTER "Spustite¾né súbory (*.exe)\0*.exe\0Vetky súbory (*.*)\0*.*\0" IDS_DIRECTORY "Prieèinok" - IDS_VIRTUAL_DRIVER "Virtual Device Driver" + IDS_VIRTUAL_DRIVER "Ovládaè virtuálneho zariadenia" IDS_BAT_FILE "Dávkový súbor systému ReactOS" IDS_CMD_FILE "Príkazový skript systému ReactOS" IDS_COM_FILE "DOS aplikácia" @@ -766,4 +766,9 @@ // There is no Windows program configured to open this type of file. IDS_SHLEXEC_NOASSOC "Neexistuje iadny program nakonfigurovaný tak, aby otváral tento typ súborov." // Na otváranie tohto typu súboru nie je nakonfigurovaný iadny program systému Windows. -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Noben Okenski program ni nastavljen, da bi odpiral ta tip datotek." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -437,7 +437,7 @@ //ICON LTEXT "Äîäàòîê", 14005, 100, 140, 40, 10 PUSHBUTTON "&Çì³íèòè...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'.\nÙîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü\níà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó ""Äîäàòêîâî"".", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 40 PUSHBUTTON "&Äîäàòêîâî", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -771,4 +771,9 @@ IDS_COPY_OF "Êîï³ÿ" IDS_SHLEXEC_NOASSOC "Íåìàº ïðîãðàìè Windows, ñêîíô³ãóðîâàíî¿ äëÿ â³äêðèòòÿ öüîãî òèïó ôàéë³â." -END + + IDS_FILE_DETAILS "Ïîäðîáèö³ äëÿ ðîçøèðåííÿ '%s'" + IDS_FILE_DETAILSADV "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'. Ùîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü íà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó 'Äîäàòêîâî'." + IDS_FILE_TYPES "Òèïè Ôàéë³â" + IDS_COLUMN_EXTENSION "Ðîçøèðåííÿ" +END Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -413,7 +413,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -746,5 +746,10 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END - + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +END + Modified: branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu May 26 21:43:27 2011 @@ -425,7 +425,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,6 +759,11 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" END #pragma code_page(default) Modified: branches/shell32_new-bringup/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shresdef.h [iso-8859-1] Thu May 26 21:43:27 2011 @@ -141,6 +141,7 @@ #define IDS_SHLEXEC_NOASSOC 173 #define IDS_FILE_TYPES 174 #define IDS_FILE_DETAILS 175 +#define IDS_FILE_DETAILSADV 176 #define IDS_RUNDLG_ERROR 180 #define IDS_RUNDLG_BROWSE_ERROR 181

1 0

[gedmurphy] 51937: [SHELL32_NEW] - Merge 51436, 51448 and 51526 - Properly support WM_SYSCOLORCHANGE in ShellView window. Changing system colors in ReactOS works perfectly now :)
by gedmurphy＠svn.reactos.org 26 May '11

26 May '11

Author: gedmurphy Date: Thu May 26 21:36:39 2011 New Revision: 51937 URL: http://svn.reactos.org/svn/reactos?rev=51937&view=rev Log: [SHELL32_NEW] - Merge 51436, 51448 and 51526 - Properly support WM_SYSCOLORCHANGE in ShellView window. Changing system colors in ReactOS works perfectly now :) Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp Modified: branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlexec.cpp [iso-8859-1] Thu May 26 21:36:39 2011 @@ -1429,8 +1429,10 @@ void do_error_dialog( UINT_PTR retval, HWND hwnd, WCHAR* filename) { WCHAR msg[2048]; - DWORD error_code = GetLastError(); DWORD_PTR msgArguments[3] = { (DWORD_PTR)filename, 0, 0 }; + DWORD error_code; + + error_code = GetLastError(); if (retval == SE_ERR_NOASSOC) LoadStringW(shell32_hInstance, IDS_SHLEXEC_NOASSOC, msg, sizeof(msg)/sizeof(WCHAR)); Modified: branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell32_new-bringup/dll/win32/s… ============================================================================== --- branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ branches/shell32_new-bringup/dll/win32/shell32/shlview.cpp [iso-8859-1] Thu May 26 21:36:39 2011 @@ -200,6 +200,7 @@ LRESULT OnGetDlgCode(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnDestroy(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); + LRESULT OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); LRESULT OnContextMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled); @@ -258,6 +259,7 @@ MESSAGE_HANDLER(WM_GETDLGCODE, OnGetDlgCode) MESSAGE_HANDLER(WM_DESTROY, OnDestroy) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground) + MESSAGE_HANDLER(WM_SYSCOLORCHANGE, OnSysColorChange) MESSAGE_HANDLER(CWM_GETISHELLBROWSER, OnGetShellBrowser) END_MSG_MAP() @@ -854,6 +856,12 @@ return 0; } +LRESULT CDefView::OnSysColorChange(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) +{ + /* Forward WM_SYSCOLORCHANGE to common controls */ + return SendMessageW(hWndList, uMsg, 0, 0); +} + LRESULT CDefView::OnGetShellBrowser(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandled) { return (LRESULT)pShellBrowser.p;

1 0

[rharabien] 51936: [WIN32K] - Remove unused ROS specific NtGdiSetDIBits syscall
by rharabien＠svn.reactos.org 26 May '11

26 May '11

Author: rharabien Date: Thu May 26 21:25:57 2011 New Revision: 51936 URL: http://svn.reactos.org/svn/reactos?rev=51936&view=rev Log: [WIN32K] - Remove unused ROS specific NtGdiSetDIBits syscall Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db trunk/reactos/subsystems/win32/win32k/w32ksvc.h Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h [iso-8859-1] Thu May 26 21:25:57 2011 @@ -111,19 +111,6 @@ LPPOINT Point ); -/* Use SetDIBitsToDevice in gdi32. */ -INT -APIENTRY -NtGdiSetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID * Bits, - CONST BITMAPINFO * bmi, - UINT ColorUse - ); - #endif /* WIN32K_NTGDI_BAD_INCLUDED */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu May 26 21:25:57 2011 @@ -319,71 +319,6 @@ GreDeleteObject(SourceBitmap); return result; -} - -// FIXME by Removing NtGdiSetDIBits!!! -// This is a victim of the Win32k Initialization BUG!!!!! -// Converts a DIB to a device-dependent bitmap -INT -APIENTRY -NtGdiSetDIBits( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - CONST VOID *Bits, - CONST BITMAPINFO *bmi, - UINT ColorUse) -{ - PDC Dc = NULL; - INT Ret; - NTSTATUS Status = STATUS_SUCCESS; - - if (!Bits) return 0; - - _SEH2_TRY - { - ProbeForRead(&bmi->bmiHeader.biSize, sizeof(DWORD), 1); - ProbeForRead(bmi, bmi->bmiHeader.biSize, 1); - ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, ColorUse), 1); - ProbeForRead(Bits, - DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, - ScanLines, - bmi->bmiHeader.biBitCount), - 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - return 0; - } - - /* Lock DC if asked to */ - if(ColorUse == DIB_PAL_COLORS) - { - Dc = DC_LockDc(hDC); - if (NULL == Dc) - { - EngSetLastError(ERROR_INVALID_HANDLE); - return 0; - } - if (Dc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(Dc); - return 0; - } - } - - Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); - - if(Dc) DC_UnlockDc(Dc); - - return Ret; } W32KAPI Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Thu May 26 21:25:57 2011 @@ -675,7 +675,6 @@ # # #ReactOS specific syscalls -NtGdiSetDIBits 7 NtGdiSetViewportOrgEx 4 NtGdiSetWindowOrgEx 4 NtGdiGetFontFamilyInfo 4 Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.h [iso-8859-1] Thu May 26 21:25:57 2011 @@ -675,7 +675,6 @@ // ReactOS, specific, syscalls) -SVC_(GdiSetDIBits, 7) SVC_(GdiSetViewportOrgEx, 4) SVC_(GdiSetWindowOrgEx, 4) SVC_(GdiGetFontFamilyInfo, 4)

1 0

[ekohl] 51935: [MSPORTS] - Try to read the PortName registry value and get the port number from the name. - Determine the port number for parallel ports the same way we determine the port number fo...
by ekohl＠svn.reactos.org 26 May '11

26 May '11

Author: ekohl Date: Thu May 26 21:20:06 2011 New Revision: 51935 URL: http://svn.reactos.org/svn/reactos?rev=51935&view=rev Log: [MSPORTS] - Try to read the PortName registry value and get the port number from the name. - Determine the port number for parallel ports the same way we determine the port number for serial ports, except for the use of the com port database. Modified: trunk/reactos/dll/win32/msports/classinst.c Modified: trunk/reactos/dll/win32/msports/classinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins… ============================================================================== --- trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msports/classinst.c [iso-8859-1] Thu May 26 21:20:06 2011 @@ -23,6 +23,9 @@ ParallelPort, SerialPort } PORT_TYPE; + +LPWSTR pszCom = L"COM"; +LPWSTR pszLpt = L"LPT"; BOOL @@ -243,10 +246,12 @@ { WCHAR szDeviceDescription[256]; WCHAR szFriendlyName[256]; - WCHAR szPortName[5]; - DWORD dwPortNumber; + WCHAR szPortName[8]; + DWORD dwPortNumber = 0; + DWORD dwSize; HCOMDB hComDB = HCOMDB_INVALID_HANDLE_VALUE; HKEY hKey; + LONG lError; TRACE("InstallSerialPort(%p, %p)\n", DeviceInfoSet, DeviceInfoData); @@ -254,9 +259,40 @@ /* Open the com port database */ ComDBOpen(&hComDB); + /* Try to read the 'PortName' value and determine the port number */ + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + NULL, + NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + dwSize = sizeof(szPortName); + lError = RegQueryValueEx(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)szPortName, + &dwSize); + if (lError == ERROR_SUCCESS) + { + if (_wcsnicmp(szPortName, pszCom, wcslen(pszCom)) == 0) + { + dwPortNumber = _wtoi(szPortName + wcslen(pszCom)); + TRACE("COM port number found: %lu\n", dwPortNumber); + } + } + + RegCloseKey(hKey); + } + /* Determine the port number from its resources ... */ - dwPortNumber = GetSerialPortNumber(DeviceInfoSet, - DeviceInfoData); + if (dwPortNumber == 0) + dwPortNumber = GetSerialPortNumber(DeviceInfoSet, + DeviceInfoData); + if (dwPortNumber != 0) { /* ... and claim the port number in the database */ @@ -273,7 +309,7 @@ } /* Build the name of the port device */ - swprintf(szPortName, L"COM%u", dwPortNumber); + swprintf(szPortName, L"%s%u", pszCom, dwPortNumber); /* Close the com port database */ if (hComDB != HCOMDB_INVALID_HANDLE_VALUE) @@ -346,23 +382,85 @@ { WCHAR szDeviceDescription[256]; WCHAR szFriendlyName[256]; - WCHAR szPortName[5]; - DWORD dwPortNumber; + WCHAR szPortName[8]; + DWORD dwPortNumber = 0; + DWORD dwSize; + LONG lError; + HKEY hKey; TRACE("InstallParallelPort(%p, %p)\n", DeviceInfoSet, DeviceInfoData); - dwPortNumber = GetParallelPortNumber(DeviceInfoSet, - DeviceInfoData); + /* Try to read the 'PortName' value and determine the port number */ + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + NULL, + NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + dwSize = sizeof(szPortName); + lError = RegQueryValueEx(hKey, + L"PortName", + NULL, + NULL, + (PBYTE)szPortName, + &dwSize); + if (lError == ERROR_SUCCESS) + { + if (_wcsnicmp(szPortName, pszLpt, wcslen(pszLpt)) == 0) + { + dwPortNumber = _wtoi(szPortName + wcslen(pszLpt)); + TRACE("LPT port number found: %lu\n", dwPortNumber); + } + } + + RegCloseKey(hKey); + } + + /* ... try to determine the port number from its resources */ + if (dwPortNumber == 0) + dwPortNumber = GetParallelPortNumber(DeviceInfoSet, + DeviceInfoData); + + if (dwPortNumber == 0) + { + /* FIXME */ + } + if (dwPortNumber != 0) { - swprintf(szPortName, L"LPT%u", dwPortNumber); + swprintf(szPortName, L"%s%u", pszLpt, dwPortNumber); } else { wcscpy(szPortName, L"LPTx"); } + if (dwPortNumber != 0) + { + /* Set the 'PortName' value */ + hKey = SetupDiCreateDevRegKeyW(DeviceInfoSet, + DeviceInfoData, + DICS_FLAG_GLOBAL, + 0, + DIREG_DEV, + NULL, + NULL); + if (hKey != INVALID_HANDLE_VALUE) + { + RegSetValueExW(hKey, + L"PortName", + 0, + REG_SZ, + (LPBYTE)szPortName, + (wcslen(szPortName) + 1) * sizeof(WCHAR)); + + RegCloseKey(hKey); + } + } /* Install the device */ if (!SetupDiInstallDevice(DeviceInfoSet, @@ -371,6 +469,7 @@ return GetLastError(); } + /* Get the device description... */ if (SetupDiGetDeviceRegistryPropertyW(DeviceInfoSet, DeviceInfoData, SPDRP_DEVICEDESC, @@ -379,6 +478,7 @@ 256 * sizeof(WCHAR), NULL)) { + /* ... and use it to build a new friendly name */ swprintf(szFriendlyName, L"%s (%s)", szDeviceDescription, @@ -386,8 +486,9 @@ } else { + /* ... or build a generic friendly name */ swprintf(szFriendlyName, - L"Serial Port (%s)", + L"Parallel Port (%s)", szPortName); }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs