Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 48215: [NETCFGX] - Create the DhcpEnabled value in the registry [TCPIP] - Apply the static IP address configuration data [DHCPCSVC] - Remove the static IP address code
by cgutman＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: cgutman Date: Fri Jul 23 22:30:27 2010 New Revision: 48215 URL: http://svn.reactos.org/svn/reactos?rev=48215&view=rev Log: [NETCFGX] - Create the DhcpEnabled value in the registry [TCPIP] - Apply the static IP address configuration data [DHCPCSVC] - Remove the static IP address code Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/ad… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/adapter.c [iso-8859-1] Fri Jul 23 22:30:27 2010 @@ -102,7 +102,8 @@ "SYSTEM\\CurrentControlSet\\Control\\Class\\" "{4D36E972-E325-11CE-BFC1-08002BE10318}"; PCHAR TargetKeyNameStart = - "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; + "SYSTEM\\CurrentControlSet\\Services\\"; + PCHAR TargetKeyNameEnd = "\\Parameters\\Tcpip"; PCHAR TargetKeyName = NULL; PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); @@ -124,10 +125,10 @@ !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) { TargetKeyName = (CHAR*) malloc( strlen( TargetKeyNameStart ) + - strlen( RootDevice ) + 1); + strlen( RootDevice ) + strlen( TargetKeyNameEnd ) + 1); if( !TargetKeyName ) goto cleanup; - sprintf( TargetKeyName, "%s%s", - TargetKeyNameStart, RootDevice ); + sprintf( TargetKeyName, "%s%s%s", + TargetKeyNameStart, RootDevice, TargetKeyNameEnd ); Error = RegCreateKeyExA( HKEY_LOCAL_MACHINE, TargetKeyName, 0, NULL, 0, KEY_READ, NULL, &OutKey, NULL ); break; } else { @@ -145,10 +146,8 @@ } BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) { - HKEY AdapterKey = NULL; - PCHAR IPAddress = NULL, Netmask = NULL, DefaultGateway = NULL; - NTSTATUS Status = STATUS_SUCCESS; - DWORD Error = ERROR_SUCCESS; + HKEY AdapterKey; + DWORD Error = ERROR_SUCCESS, DhcpEnabled; Adapter->DhclientState.config = &Adapter->DhclientConfig; strncpy(Adapter->DhclientInfo.name, (char*)Adapter->IfMib.bDescr, @@ -156,53 +155,31 @@ AdapterKey = FindAdapterKey( Adapter ); if( AdapterKey ) - IPAddress = RegReadString( AdapterKey, NULL, "IPAddress" ); - - if( IPAddress && strcmp( IPAddress, "0.0.0.0" ) ) { + { + Error = RegQueryValueEx(AdapterKey, "DhcpEnabled", NULL, NULL, (LPBYTE)&DhcpEnabled, NULL); + + if (Error != ERROR_SUCCESS) + DhcpEnabled = 1; + + CloseHandle(AdapterKey); + } + else + { + /* DHCP enabled by default */ + DhcpEnabled = 1; + } + + if( !DhcpEnabled ) { /* Non-automatic case */ - DH_DbgPrint - (MID_TRACE,("Adapter Name: [%s] (Bind Status %x) (static %s)\n", - Adapter->DhclientInfo.name, - Adapter->BindStatus, - IPAddress)); + DbgPrint("DHCPCSVC: Adapter Name: [%s] (static)\n", Adapter->DhclientInfo.name); Adapter->DhclientState.state = S_STATIC; - - Netmask = RegReadString( AdapterKey, NULL, "Subnetmask" ); - - Status = AddIPAddress( inet_addr( IPAddress ), - inet_addr( Netmask ? Netmask : "255.255.255.0" ), - Adapter->IfMib.dwIndex, - &Adapter->NteContext, - &Adapter->NteInstance ); - - DefaultGateway = RegReadString( AdapterKey, NULL, "DefaultGateway" ); - - if( DefaultGateway ) { - Adapter->RouterMib.dwForwardDest = 0; - Adapter->RouterMib.dwForwardMask = 0; - Adapter->RouterMib.dwForwardMetric1 = 1; - Adapter->RouterMib.dwForwardIfIndex = Adapter->IfMib.dwIndex; - Adapter->RouterMib.dwForwardNextHop = inet_addr(DefaultGateway); - Error = CreateIpForwardEntry( &Adapter->RouterMib ); - if( Error ) - warning("Failed to set default gateway %s: %ld\n", - DefaultGateway, Error); - } - - if( DefaultGateway ) free( DefaultGateway ); - if( Netmask ) free( Netmask ); } else { /* Automatic case */ - DH_DbgPrint - (MID_TRACE,("Adapter Name: [%s] (Bind Status %x) (dynamic)\n", - Adapter->DhclientInfo.name, - Adapter->BindStatus)); + DbgPrint("DHCPCSVC: Adapter Name: [%s] (dynamic)\n", Adapter->DhclientInfo.name); Adapter->DhclientInfo.client->state = S_INIT; } - - if( IPAddress ) free( IPAddress ); return TRUE; } @@ -350,7 +327,6 @@ ApiLock(); InsertTailList( &AdapterList, &Adapter->ListEntry ); - DbgPrint("DHCPCSVC: Discovered new adapter [%s]\n", Adapter->DhclientInfo.name); AdapterCount++; SetEvent(AdapterStateChangedEvent); ApiUnlock(); Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Fri Jul 23 22:30:27 2010 @@ -336,7 +336,7 @@ HKEY hNetworkKey = NULL; HKEY hLinkageKey = NULL; HKEY hConnectionKey = NULL; - DWORD dwShowIcon, dwLength; + DWORD dwShowIcon, dwLength, dwValue; /* Get Instance ID */ if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) @@ -417,6 +417,13 @@ goto cleanup; } rc = RegSetValueExW(hKey, L"SubnetMask", 0, REG_SZ, (const BYTE*)L"0.0.0.0", (wcslen(L"0.0.0.0") + 1) * sizeof(WCHAR)); + if (rc != ERROR_SUCCESS) + { + DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); + goto cleanup; + } + dwValue = 1; + rc = RegSetValueExW(hKey, L"DhcpEnabled", 0, REG_DWORD, (const BYTE*)&dwValue, sizeof(DWORD)); if (rc != ERROR_SUCCESS) { DPRINT("RegSetValueExW() failed with error 0x%lx\n", rc); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Fri Jul 23 22:30:27 2010 @@ -946,9 +946,17 @@ PIP_INTERFACE IF; NDIS_STATUS NdisStatus; LLIP_BIND_INFO BindInfo; - IP_ADDRESS DefaultMask; - ULONG Lookahead = LOOKAHEAD_SIZE; + IP_ADDRESS DefaultMask, Router; + ULONG Lookahead = LOOKAHEAD_SIZE, Unused; NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ParameterHandle; + PKEY_VALUE_PARTIAL_INFORMATION KeyValueInfo; + UNICODE_STRING IPAddress = RTL_CONSTANT_STRING(L"IPAddress"); + UNICODE_STRING Netmask = RTL_CONSTANT_STRING(L"SubnetMask"); + UNICODE_STRING Gateway = RTL_CONSTANT_STRING(L"DefaultGateway"); + UNICODE_STRING RegistryDataU; + ANSI_STRING RegistryDataA; TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); @@ -1001,10 +1009,105 @@ TI_DbgPrint(DEBUG_DATALINK,("Adapter Description: %wZ\n", &IF->Description)); + DbgPrint("Opening %wZ\n", RegistryPath); + + InitializeObjectAttributes(&ObjectAttributes, + RegistryPath, + OBJ_CASE_INSENSITIVE, + 0, + NULL); + AddrInitIPv4(&DefaultMask, 0); - IF->Unicast = DefaultMask; - IF->Netmask = DefaultMask; + Status = ZwOpenKey(&ParameterHandle, KEY_READ, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + IF->Unicast = DefaultMask; + IF->Netmask = DefaultMask; + } + else + { + KeyValueInfo = ExAllocatePool(PagedPool, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR)); + if (!KeyValueInfo) + { + ZwClose(ParameterHandle); + IPDestroyInterface(IF); + return FALSE; + } + + RegistryDataU.MaximumLength = 16 + sizeof(WCHAR); + RegistryDataU.Buffer = (PWCHAR)KeyValueInfo->Data; + + Status = ZwQueryValueKey(ParameterHandle, + &IPAddress, + KeyValuePartialInformation, + KeyValueInfo, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + &Unused); + if (NT_SUCCESS(Status)) + { + RegistryDataU.Length = KeyValueInfo->DataLength; + + RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + + AddrInitIPv4(&IF->Unicast, inet_addr(RegistryDataA.Buffer)); + + RtlFreeAnsiString(&RegistryDataA); + + } + else + { + IF->Unicast = DefaultMask; + } + + Status = ZwQueryValueKey(ParameterHandle, + &Netmask, + KeyValuePartialInformation, + KeyValueInfo, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + &Unused); + if (NT_SUCCESS(Status)) + { + RegistryDataU.Length = KeyValueInfo->DataLength; + + RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + + AddrInitIPv4(&IF->Netmask, inet_addr(RegistryDataA.Buffer)); + + RtlFreeAnsiString(&RegistryDataA); + } + else + { + IF->Netmask = DefaultMask; + } + + Status = ZwQueryValueKey(ParameterHandle, + &Gateway, + KeyValuePartialInformation, + KeyValueInfo, + sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 16 * sizeof(WCHAR), + &Unused); + if (NT_SUCCESS(Status)) + { + RegistryDataU.Length = KeyValueInfo->DataLength; + + RtlUnicodeStringToAnsiString(&RegistryDataA, + &RegistryDataU, + TRUE); + + AddrInitIPv4(&Router, inet_addr(RegistryDataA.Buffer)); + + RtlFreeAnsiString(&RegistryDataA); + + if (!AddrIsUnspecified(&Router)) RouterCreateRoute(&DefaultMask, &DefaultMask, &Router, IF, 1); + } + + ZwClose(ParameterHandle); + } IF->Broadcast.Type = IP_ADDRESS_V4; IF->Broadcast.Address.IPv4Address =

1 0

[tkreuzer] 48214: [NTOSKRNL] - Add amd64 definition of KiGetLinkedTrapFrame - Add KeZeroPages and KiServiceExit and KiServiceExit2 stubs - Add DemandZeroPde
by tkreuzer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: tkreuzer Date: Fri Jul 23 22:15:20 2010 New Revision: 48214 URL: http://svn.reactos.org/svn/reactos?rev=48214&view=rev Log: [NTOSKRNL] - Add amd64 definition of KiGetLinkedTrapFrame - Add KeZeroPages and KiServiceExit and KiServiceExit2 stubs - Add DemandZeroPde Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Jul 23 22:15:20 2010 @@ -95,6 +95,9 @@ #define KeGetTrapFramePc(TrapFrame) \ ((TrapFrame)->Rip) + +#define KiGetLinkedTrapFrame(x) \ + (PKTRAP_FRAME)((x)->Rdx) #define KeGetContextReturnRegister(Context) \ ((Context)->Rax) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Fri Jul 23 22:15:20 2010 @@ -11,6 +11,32 @@ #define NDEBUG #include <debug.h> + +VOID +FASTCALL +KeZeroPages(IN PVOID Address, + IN ULONG Size) +{ + /* Not using XMMI in this routine */ + RtlZeroMemory(Address, Size); +} + +VOID +FASTCALL +DECLSPEC_NORETURN +KiServiceExit(IN PKTRAP_FRAME TrapFrame, + IN NTSTATUS Status) +{ + UNIMPLEMENTED; +} + +VOID +FASTCALL +DECLSPEC_NORETURN +KiServiceExit2(IN PKTRAP_FRAME TrapFrame) +{ + UNIMPLEMENTED; +} BOOLEAN NTAPI Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/except.c [iso-8859-1] Fri Jul 23 22:15:20 2010 @@ -167,8 +167,6 @@ /* SYSTEM CALLS ***************************************************************/ -#ifndef _M_AMD64 - NTSTATUS NTAPI NtRaiseException(IN PEXCEPTION_RECORD ExceptionRecord, @@ -243,6 +241,5 @@ /* We don't actually make it here */ return Status; } -#endif /* EOF */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Fri Jul 23 22:15:20 2010 @@ -29,6 +29,7 @@ /* Template PTE and PDE for a kernel page */ MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +MMPDE DemandZeroPde = {.u.Long = (MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS)}; /* Sizes */ ///SIZE_T MmSessionSize = MI_SESSION_SIZE;

1 0

[cgutman] 48213: [DHCPCSVC] - Generate a link-local IP address if DHCP fails - Don't destroy the IP addresses in the registry
by cgutman＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: cgutman Date: Fri Jul 23 21:57:08 2010 New Revision: 48213 URL: http://svn.reactos.org/svn/reactos?rev=48213&view=rev Log: [DHCPCSVC] - Generate a link-local IP address if DHCP fails - Don't destroy the IP addresses in the registry Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h Modified: trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/dhcp/dh… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/dhcp/dhclient.c [iso-8859-1] Fri Jul 23 21:57:08 2010 @@ -574,8 +574,6 @@ strcat(Buffer, "."); } RegSetValueExA(hkey, "DhcpSubnetMask", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1); - RegSetValueExA(hkey, "IPAddress", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); - RegSetValueExA(hkey, "SubnetMask", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); dwEnableDHCP = 1; RegSetValueExA(hkey, "EnableDHCP", 0, REG_DWORD, (LPBYTE)&dwEnableDHCP, sizeof(DWORD)); } @@ -614,7 +612,6 @@ strcat(Buffer, "."); } RegSetValueExA(hkey, "DhcpDefaultGateway", 0, REG_SZ, (LPBYTE)Buffer, strlen(Buffer)+1); - RegSetValueExA(hkey, "DefaultGateway", 0, REG_SZ, (LPBYTE)"0.0.0.0", 8); } } @@ -1103,6 +1100,7 @@ state_panic(void *ipp) { struct interface_info *ip = ipp; + PDHCP_ADAPTER Adapter = AdapterFindInfo(ip); time_t cur_time; time(&cur_time); @@ -1113,7 +1111,19 @@ ip->client->state = S_INIT; add_timeout(cur_time + ip->client->config->retry_interval, state_init, ip); - /* XXX Take any failure actions necessary */ + + if (!Adapter->NteContext) + { + /* Generate an automatic private address */ + DbgPrint("DHCPCSVC: Failed to receive a response from a DHCP server. An automatic private address will be assigned.\n"); + + /* FIXME: The address generation code sucks */ + AddIPAddress(htonl(0xA9FE0000 | (rand() % 0xFFFF)), //169.254.X.X + htonl(0xFFFF0000), //255.255.0.0 + Adapter->IfMib.dwIndex, + &Adapter->NteContext, + &Adapter->NteInstance); + } } void Modified: trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dhcpcsvc/include… ============================================================================== --- trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dhcpcsvc/include/rosdhcp.h [iso-8859-1] Fri Jul 23 21:57:08 2010 @@ -18,9 +18,9 @@ #undef IGNORE #undef ACCEPT #undef PREFER -#define DHCP_DISCOVER_INTERVAL 15 -#define DHCP_REBOOT_TIMEOUT 300 -#define DHCP_PANIC_TIMEOUT DHCP_REBOOT_TIMEOUT * 3 +#define DHCP_DISCOVER_INTERVAL 5 +#define DHCP_REBOOT_TIMEOUT 10 +#define DHCP_PANIC_TIMEOUT 20 #define DHCP_BACKOFF_MAX 300 #define DHCP_DEFAULT_LEASE_TIME 43200 /* 12 hours */ #define _PATH_DHCLIENT_PID "\\systemroot\\system32\\drivers\\etc\\dhclient.pid"

1 0

[cgutman] 48212: [NDIS] - Verify that each adapter has been initialized before passing it to the protocol's BindAdapter function - Also verify that each adapter has not already been bound to the protocol - Miniport drivers can now function without a reboot (needed to use 3rd-party NIC drivers on the live CD)
by cgutman＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: cgutman Date: Fri Jul 23 16:34:35 2010 New Revision: 48212 URL: http://svn.reactos.org/svn/reactos?rev=48212&view=rev Log: [NDIS] - Verify that each adapter has been initialized before passing it to the protocol's BindAdapter function - Also verify that each adapter has not already been bound to the protocol - Miniport drivers can now function without a reboot (needed to use 3rd-party NIC drivers on the live CD) Modified: trunk/reactos/drivers/network/ndis/include/protocol.h trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c Modified: trunk/reactos/drivers/network/ndis/include/protocol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/protocol.h [iso-8859-1] Fri Jul 23 16:34:35 2010 @@ -71,6 +71,6 @@ VOID NTAPI -ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics); +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol); /* EOF */ Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Jul 23 16:34:35 2010 @@ -2064,7 +2064,7 @@ { ProtocolBinding = CONTAINING_RECORD(CurrentEntry, PROTOCOL_BINDING, ListEntry); - ndisBindMiniportsToProtocol(&NdisStatus, &ProtocolBinding->Chars); + ndisBindMiniportsToProtocol(&NdisStatus, ProtocolBinding); CurrentEntry = CurrentEntry->Flink; } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Jul 23 16:34:35 2010 @@ -865,9 +865,39 @@ *Status = NDIS_STATUS_SUCCESS; } +PADAPTER_BINDING +NTAPI +LocateAdapterBindingByName(IN PPROTOCOL_BINDING ProtocolBinding, IN PNDIS_STRING AdapterName) +{ + PLIST_ENTRY CurrentEntry; + PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; + + KeAcquireSpinLock(&ProtocolBinding->Lock, &OldIrql); + + CurrentEntry = ProtocolBinding->AdapterListHead.Flink; + + while (CurrentEntry != &ProtocolBinding->AdapterListHead) + { + AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, ProtocolListEntry); + + if (RtlCompareUnicodeString(AdapterName, &AdapterBinding->Adapter->NdisMiniportBlock.MiniportName, TRUE) == 0) + { + KeReleaseSpinLock(&ProtocolBinding->Lock, OldIrql); + return AdapterBinding; + } + + CurrentEntry = CurrentEntry->Flink; + } + + KeReleaseSpinLock(&ProtocolBinding->Lock, OldIrql); + + return NULL; +} + VOID NTAPI -ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics) +ndisBindMiniportsToProtocol(OUT PNDIS_STATUS Status, IN PPROTOCOL_BINDING Protocol) { /* * bind the protocol to all of its miniports @@ -883,6 +913,7 @@ WCHAR *DataPtr; HANDLE DriverKeyHandle = NULL; PKEY_VALUE_PARTIAL_INFORMATION KeyInformation = NULL; + PNDIS_PROTOCOL_CHARACTERISTICS ProtocolCharacteristics = &Protocol->Chars; RegistryPathStr = ExAllocatePoolWithTag(PagedPool, sizeof(SERVICES_KEY) + ProtocolCharacteristics->Name.Length + sizeof(LINKAGE_KEY), NDIS_TAG + __LINE__); if(!RegistryPathStr) @@ -952,6 +983,9 @@ } } + /* Assume success for now */ + *Status = NDIS_STATUS_SUCCESS; + for (DataPtr = (WCHAR *)KeyInformation->Data; *DataPtr != 0; DataPtr += wcslen(DataPtr) + 1) @@ -964,6 +998,20 @@ ULONG PathLength = 0; RtlInitUnicodeString(&DeviceName, DataPtr); /* we know this is 0-term */ + + /* Make sure the adapter has started */ + if (!MiniLocateDevice(&DeviceName)) + { + /* It wasn't in the global miniport list, so skip the bind entry */ + continue; + } + + /* Make sure this device isn't already bound to this protocol */ + if (LocateAdapterBindingByName(Protocol, &DeviceName)) + { + /* It was already in this protocol's bound adapter list, so skip the bind entry */ + continue; + } /* * RegistryPath should be: @@ -1011,7 +1059,6 @@ } } - *Status = NDIS_STATUS_SUCCESS; ExFreePool(KeyInformation); } @@ -1111,7 +1158,7 @@ *NdisProtocolHandle = Protocol; - ndisBindMiniportsToProtocol(Status, &Protocol->Chars); + ndisBindMiniportsToProtocol(Status, Protocol); /* Should we only send this if ndisBindMiniportsToProtocol succeeds? */ PnPEvent = ProSetupPnPEvent(NetEventBindsComplete, NULL, 0); @@ -1252,10 +1299,9 @@ NTAPI NdisReEnumerateProtocolBindings(IN NDIS_HANDLE NdisProtocolHandle) { - PPROTOCOL_BINDING Protocol = NdisProtocolHandle; NDIS_STATUS NdisStatus; - ndisBindMiniportsToProtocol(&NdisStatus, &Protocol->Chars); + ndisBindMiniportsToProtocol(&NdisStatus, NdisProtocolHandle); }

1 0

[akhaldi] 48211: [NDIS] - Guard several definitions against NDIS_SUPPORT_60_COMPATIBLE_API. - __GNU_EXTENSION -> __MINGW_EXTENSION conversions. - Group some related definitions. - Update NDIS_RW_LOCK. - Improve NDIS_TIMER_FUNCTION. - Add several missing Ndis* function declarations. - Guard several definitions against NDIS_LEGACY_DRIVER and NDIS_LEGACY_MINIPORT. - Convert some function declarations into macros.
by akhaldi＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: akhaldi Date: Fri Jul 23 15:51:54 2010 New Revision: 48211 URL: http://svn.reactos.org/svn/reactos?rev=48211&view=rev Log: [NDIS] - Guard several definitions against NDIS_SUPPORT_60_COMPATIBLE_API. - __GNU_EXTENSION -> __MINGW_EXTENSION conversions. - Group some related definitions. - Update NDIS_RW_LOCK. - Improve NDIS_TIMER_FUNCTION. - Add several missing Ndis* function declarations. - Guard several definitions against NDIS_LEGACY_DRIVER and NDIS_LEGACY_MINIPORT. - Convert some function declarations into macros. Modified: trunk/reactos/include/ddk/ndis.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=482…

1 0

[dreimer] 48210: Sync reg, xcopy, winhlp32, wordpad with Wine 1.2
by dreimer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: dreimer Date: Fri Jul 23 08:36:51 2010 New Revision: 48210 URL: http://svn.reactos.org/svn/reactos?rev=48210&view=rev Log: Sync reg, xcopy, winhlp32, wordpad with Wine 1.2 Added: trunk/reactos/base/applications/wordpad/Ro.rc (with props) trunk/reactos/base/applications/wordpad/olecallback.c (with props) Modified: trunk/reactos/base/applications/cmdutils/reg/Pt.rc trunk/reactos/base/applications/cmdutils/reg/Uk.rc trunk/reactos/base/applications/cmdutils/xcopy/It.rc trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/winhlp32/Bg.rc trunk/reactos/base/applications/winhlp32/Cs.rc trunk/reactos/base/applications/winhlp32/Da.rc trunk/reactos/base/applications/winhlp32/De.rc trunk/reactos/base/applications/winhlp32/En.rc trunk/reactos/base/applications/winhlp32/Es.rc trunk/reactos/base/applications/winhlp32/Fi.rc trunk/reactos/base/applications/winhlp32/Fr.rc trunk/reactos/base/applications/winhlp32/Hu.rc trunk/reactos/base/applications/winhlp32/It.rc trunk/reactos/base/applications/winhlp32/Ja.rc trunk/reactos/base/applications/winhlp32/Ko.rc trunk/reactos/base/applications/winhlp32/Lt.rc trunk/reactos/base/applications/winhlp32/Nl.rc trunk/reactos/base/applications/winhlp32/No.rc trunk/reactos/base/applications/winhlp32/Pl.rc trunk/reactos/base/applications/winhlp32/Pt.rc trunk/reactos/base/applications/winhlp32/Rm.rc trunk/reactos/base/applications/winhlp32/Ro.rc trunk/reactos/base/applications/winhlp32/Ru.rc trunk/reactos/base/applications/winhlp32/Si.rc trunk/reactos/base/applications/winhlp32/Sk.rc trunk/reactos/base/applications/winhlp32/Sv.rc trunk/reactos/base/applications/winhlp32/Tr.rc trunk/reactos/base/applications/winhlp32/Uk.rc trunk/reactos/base/applications/winhlp32/Zh.rc trunk/reactos/base/applications/wordpad/Da.rc trunk/reactos/base/applications/wordpad/De.rc trunk/reactos/base/applications/wordpad/En.rc trunk/reactos/base/applications/wordpad/Fr.rc trunk/reactos/base/applications/wordpad/Hu.rc trunk/reactos/base/applications/wordpad/It.rc trunk/reactos/base/applications/wordpad/Ja.rc trunk/reactos/base/applications/wordpad/Ko.rc trunk/reactos/base/applications/wordpad/Lt.rc trunk/reactos/base/applications/wordpad/Nl.rc trunk/reactos/base/applications/wordpad/No.rc trunk/reactos/base/applications/wordpad/Pl.rc trunk/reactos/base/applications/wordpad/Pt.rc trunk/reactos/base/applications/wordpad/Ru.rc trunk/reactos/base/applications/wordpad/Si.rc trunk/reactos/base/applications/wordpad/Sv.rc trunk/reactos/base/applications/wordpad/Tr.rc trunk/reactos/base/applications/wordpad/Uk.rc trunk/reactos/base/applications/wordpad/Zh.rc trunk/reactos/base/applications/wordpad/print.c trunk/reactos/base/applications/wordpad/registry.c trunk/reactos/base/applications/wordpad/rsrc.rc trunk/reactos/base/applications/wordpad/wordpad.c trunk/reactos/base/applications/wordpad/wordpad.h trunk/reactos/base/applications/wordpad/wordpad.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/reg/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/reg/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/winhlp32/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Fi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Rm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Sk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/winhlp32/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhlp32… Modified: trunk/reactos/base/applications/wordpad/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Added: trunk/reactos/base/applications/wordpad/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Added: trunk/reactos/base/applications/wordpad/olecallback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/wordpad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/wordpad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/applications/wordpad/wordpad.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/…

1 0

[dreimer] 48209: Sync Winefile with Wine 1.2
by dreimer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: dreimer Date: Fri Jul 23 08:34:57 2010 New Revision: 48209 URL: http://svn.reactos.org/svn/reactos?rev=48209&view=rev Log: Sync Winefile with Wine 1.2 Added: trunk/rosapps/applications/winfile/Ro.rc (with props) Modified: trunk/rosapps/applications/winfile/Cs.rc trunk/rosapps/applications/winfile/Da.rc trunk/rosapps/applications/winfile/De.rc trunk/rosapps/applications/winfile/En.rc trunk/rosapps/applications/winfile/Es.rc trunk/rosapps/applications/winfile/Fr.rc trunk/rosapps/applications/winfile/Hu.rc trunk/rosapps/applications/winfile/It.rc trunk/rosapps/applications/winfile/Ja.rc trunk/rosapps/applications/winfile/Ko.rc trunk/rosapps/applications/winfile/Lt.rc trunk/rosapps/applications/winfile/Nl.rc trunk/rosapps/applications/winfile/No.rc trunk/rosapps/applications/winfile/Pl.rc trunk/rosapps/applications/winfile/Pt.rc trunk/rosapps/applications/winfile/Ru.rc trunk/rosapps/applications/winfile/Si.rc trunk/rosapps/applications/winfile/Sv.rc trunk/rosapps/applications/winfile/Tr.rc trunk/rosapps/applications/winfile/Uk.rc trunk/rosapps/applications/winfile/Zh.rc trunk/rosapps/applications/winfile/rsrc.rc Modified: trunk/rosapps/applications/winfile/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Cs.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Cs.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -31,7 +31,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Soubor" { MENUITEM "&Otevøít\tEnter", ID_ACTIVATE @@ -150,7 +150,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Zvolte cíl" FONT 8, "MS Shell Dlg" Modified: trunk/rosapps/applications/winfile/Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Da.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Da.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -25,7 +25,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Fil" { MENUITEM "&Åben\tEnter", ID_ACTIVATE @@ -144,7 +144,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Vælg destination" FONT 8, "MS Shell Dlg" @@ -157,7 +157,7 @@ PUSHBUTTON "&Gennemse", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Efter filtype" FONT 8, "MS Sans Serif" @@ -179,7 +179,7 @@ PUSHBUTTON "Annuller",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Egenskaper for %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/De.rc… ============================================================================== --- trunk/rosapps/applications/winfile/De.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/De.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -29,7 +29,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Datei" { MENUITEM "Ã&ffnen\tEingabetaste", ID_ACTIVATE @@ -144,7 +144,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ziel auswÃ¤hlen" FONT 8, "MS Shell Dlg" @@ -157,7 +157,7 @@ PUSHBUTTON "&Durchsuchen", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Angaben auswÃ¤hlen" FONT 8, "MS Sans Serif" @@ -179,7 +179,7 @@ PUSHBUTTON "Abbrechen",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschaften fÃ¼r %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/En.rc… ============================================================================== --- trunk/rosapps/applications/winfile/En.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/En.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -27,7 +27,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&File" { MENUITEM "&Open\tEnter", ID_ACTIVATE @@ -146,7 +146,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select destination" FONT 8, "MS Shell Dlg" @@ -159,7 +159,7 @@ PUSHBUTTON "&Browse", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" FONT 8, "MS Sans Serif" @@ -181,7 +181,7 @@ PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Es.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Es.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -25,7 +25,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Archivo" { MENUITEM "&Abrir\tEnter", ID_ACTIVATE @@ -144,7 +144,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccione destino" FONT 8, "MS Shell Dlg" @@ -157,7 +157,7 @@ PUSHBUTTON "&Examinar", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Por tipo de archivo" FONT 8, "MS Sans Serif" @@ -179,7 +179,7 @@ PUSHBUTTON "Cancelar",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propiedades de %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Fr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Fr.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -32,7 +32,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Fichier" { MENUITEM "&Ouvrir\tEntrÃ©e", ID_ACTIVATE @@ -151,7 +151,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "SÃ©lectionner la destination" FONT 8, "MS Shell Dlg" @@ -164,7 +164,7 @@ PUSHBUTTON "&Parcourir...", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 100 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Par type de fichier" FONT 8, "MS Sans Serif" @@ -186,7 +186,7 @@ PUSHBUTTON "Annuler",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PropriÃ©tÃ©s de %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Hu.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Hu.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Hu.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Fájl" { MENUITEM "&Megynitás\tEnter", ID_ACTIVATE Modified: trunk/rosapps/applications/winfile/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/It.rc… ============================================================================== --- trunk/rosapps/applications/winfile/It.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/It.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -32,7 +32,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&File" { MENUITEM "&Apri\tInvio", ID_ACTIVATE @@ -151,7 +151,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleziona destinazione" FONT 8, "MS Shell Dlg" @@ -164,7 +164,7 @@ PUSHBUTTON "&Naviga", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Per tipo di file" FONT 8, "MS Sans Serif" @@ -186,7 +186,7 @@ PUSHBUTTON "Annulla",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "PropprietÃ di %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Ja.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ja.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ja.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -30,7 +30,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "ãã¡ã¤ã«(&F)" { MENUITEM "éã(&O)\tEnter", ID_ACTIVATE @@ -149,7 +149,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ç§»ååãé¸æ" FONT 9, "MS Shell Dlg" @@ -162,7 +162,7 @@ PUSHBUTTON "åç§(&B)", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "By File Type" FONT 9, "MS Shell Dlg" @@ -184,7 +184,7 @@ PUSHBUTTON "Cancel",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Properties for %s" FONT 9, "MS Shell Dlg" Modified: trunk/rosapps/applications/winfile/Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ko.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ko.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "ÆÄÀÏ(&F)" { MENUITEM "¿±â(&O)\tEnter", ID_ACTIVATE @@ -147,7 +147,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "¸ñÀûÁö ¼±ÅÃ" FONT 9, "MS Shell Dlg" @@ -160,7 +160,7 @@ PUSHBUTTON "Ã£±â(&B)", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÆÄÀÏ Å¸ÀÔÀ¸·Î" FONT 9, "MS Shell Dlg" @@ -182,7 +182,7 @@ PUSHBUTTON "Ãë¼Ò",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s ¼Ó¼º" FONT 9, "MS Shell Dlg" Modified: trunk/rosapps/applications/winfile/Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Lt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Lt.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Failas" { MENUITEM "&Atverti\tEnter", ID_ACTIVATE @@ -147,7 +147,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IÅ¡rinkite paskirtÄ¯" FONT 8, "MS Shell Dlg" @@ -160,7 +160,7 @@ PUSHBUTTON "&Parinkti", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Pagal failo tipÄ" FONT 8, "MS Sans Serif" @@ -182,7 +182,7 @@ PUSHBUTTON "Atsisakyti",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s savybÄs" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Nl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Nl.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -26,7 +26,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Bestand" { MENUITEM "&Openen\tEnter", ID_ACTIVATE @@ -145,7 +145,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecteer bestemming" FONT 8, "MS Shell Dlg" @@ -158,7 +158,7 @@ PUSHBUTTON "&Bladeren", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Per Bestandstype" FONT 8, "MS Sans Serif" @@ -180,7 +180,7 @@ PUSHBUTTON "Annuleren",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Eigenschappen voor %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/No.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/No.rc… ============================================================================== --- trunk/rosapps/applications/winfile/No.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/No.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -25,7 +25,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Fil" { MENUITEM "&Åpne\tEnter", ID_ACTIVATE @@ -144,7 +144,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Velg plasserings" FONT 8, "MS Shell Dlg" @@ -157,7 +157,7 @@ PUSHBUTTON "&Bla", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Etter filtype" FONT 8, "MS Sans Serif" @@ -179,7 +179,7 @@ PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Egenskaper for %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pl.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pl.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Plik" { MENUITEM "&Otwórz\tEnter", ID_ACTIVATE @@ -147,7 +147,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wybór celu" FONT 8, "MS Shell Dlg" @@ -160,7 +160,7 @@ PUSHBUTTON "&Przegl¹daj", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Wed³ug typu pliku" FONT 8, "MS Sans Serif" @@ -182,7 +182,7 @@ PUSHBUTTON "Anuluj",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "W³aciwoci: %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Pt.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Pt.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -29,7 +29,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Arquivo" { MENUITEM "A&brir\tEnter", ID_ACTIVATE @@ -150,7 +150,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Ficheiro" { MENUITEM "A&brir\tEnter", ID_ACTIVATE @@ -271,7 +271,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Selecionar destino" FONT 8, "MS Shell Dlg" @@ -286,7 +286,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Seleccionar destino" FONT 8, "MS Shell Dlg" @@ -302,7 +302,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Por tipo de arquivo" FONT 8, "MS Sans Serif" @@ -327,7 +327,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Por tipo de ficheiro" FONT 8, "MS Sans Serif" @@ -352,7 +352,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propriedades de %s" FONT 8, "MS Sans Serif" @@ -384,7 +384,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Propriedades de %s" FONT 8, "MS Sans Serif" Added: trunk/rosapps/applications/winfile/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ro.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ro.rc (added) +++ trunk/rosapps/applications/winfile/Ro.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -1,0 +1,249 @@ +/* + * WineFile + * + * Copyright 2000 Martin Fuchs + * Copyright 2002 Steven Edwards + * Copyright 2002 Alexandre Julliard + * Copyright 2010 Claudia CotunÄ + * Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +/* Menu */ + +IDM_WINEFILE MENU +{ + POPUP "&FiÈier" { + MENUITEM "Desc&hide\tEnter", ID_ACTIVATE + MENUITEM "&Mutare...\tF7", ID_FILE_MOVE + MENUITEM "&Copiere...\tF8", ID_FILE_COPY + MENUITEM "Ãn cl&ipboard...\tF9", 118 + MENUITEM "Èter&ge\tDel", ID_FILE_DELETE + MENUITEM "Rede&numire...", 109 + MENUITEM "ProprietÄÈ&i...\tAlt+Enter", ID_EDIT_PROPERTIES + MENUITEM SEPARATOR + MENUITEM "C&omprimare...", 119 + MENUITEM "Dec&omprimare...", 120 + MENUITEM SEPARATOR + MENUITEM "E&xecutare...", ID_RUN + MENUITEM "Im&primare...", 102 + MENUITEM "Asociere...", 103 + MENUITEM SEPARATOR + MENUITEM "Cr&eare director...", 111 + MENUITEM "CÄ&utare...", 104 + MENUITEM "&Selectare fiÈiere...", 116 + MENUITEM SEPARATOR +#ifndef _NO_EXTENSIONS + MENUITEM "Ãnc&hide\Alt+X", ID_FILE_EXIT +#else + MENUITEM "Ãnc&hide", ID_FILE_EXIT +#endif + } + + POPUP "&Disc" { + MENUITEM "&Copiere disc...", 201 + MENUITEM "E&tichetare disc...", 202 + MENUITEM SEPARATOR + MENUITEM "&Formatare disc...", ID_FORMAT_DISK +#ifdef _WIN95 + MENUITEM "Creare disc siste&m...", -1 /*TODO*/ +#endif + MENUITEM SEPARATOR + MENUITEM "Co&necteazÄ unitatea de reÈea", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&DeconecteazÄ unitatea de reÈea", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "Partajare ca...", 254 + MENUITEM "Elimina&re partajare...", 255 + MENUITEM SEPARATOR + MENUITEM "&Selectare unitate...", 251 + } + + POPUP "Di&rectoare" { + MENUITEM "&Nivelul urmÄtor\t+", 301 + MENUITEM "Extinde ar&borele\t*", 302 + MENUITEM "Extinde t&ot\tStrg+*", 303 + MENUITEM "RestrÃ¢n&ge arborele\t-", 304 + MENUITEM SEPARATOR + MENUITEM "&MarcheazÄ copiii", 505 + } + + POPUP "&Vizualizare" { + MENUITEM "Arbo&re Èi director", 413 + MENUITEM "Numai arbor&ele", 411 + MENUITEM "Numai direct&orul", 412 + MENUITEM SEPARATOR + MENUITEM "Sep&arÄ", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&Nume", ID_VIEW_NAME + MENUITEM "To&ate detaliile ", ID_VIEW_ALL_ATTRIBUTES, CHECKED + MENUITEM "Detalii &parÈiale...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&SorteazÄ dupÄ nume", ID_VIEW_SORT_NAME + MENUITEM "SorteazÄ dupÄ &tip", ID_VIEW_SORT_TYPE + MENUITEM "SorteazÄ dupÄ &mÄrime", ID_VIEW_SORT_SIZE + MENUITEM "SorteazÄ dupÄ &datÄ", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Filtrare dupÄ &...", ID_VIEW_FILTER + } + + POPUP "&OpÈiuni" { + MENUITEM "&Confirmare...", 501 + MENUITEM "&Font...", ID_SELECT_FONT + MENUITEM "Personalizare &barÄ de unelte...", 512 + MENUITEM SEPARATOR + MENUITEM "Bara de unel&te", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "Bara &de unitate", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "Bara de &stare", ID_VIEW_STATUSBAR, CHECKED +#ifndef _NO_EXTENSIONS + MENUITEM "Pe tot ecran&ul\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&MinimizeazÄ la execuÈie", 504 + MENUITEM "&SalveazÄ configuraÈia la Ã®nchidere", ID_VIEW_SAVESETTINGS + } + + POPUP "&Securitate" { + MENUITEM "&Acces...", 605 + MENUITEM "Ãnre&gistrare...", 606 + MENUITEM "Pr&oprietar...", 607 + } + + POPUP "&FereastrÄ" { + MENUITEM "&FereastrÄ nouÄ", ID_WINDOW_NEW + MENUITEM "CascadÄ\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "Mozaic &orizontal", ID_WINDOW_TILE_HORZ + MENUITEM "Mozaic &vertical\tCtrl+F4", ID_WINDOW_TILE_VERT +#ifndef _NO_EXTENSIONS + MENUITEM "AranjeazÄ automat", ID_WINDOW_AUTOSORT +#endif + MENUITEM "AranjeazÄ &simbolurile", ID_WINDOW_ARRANGE + MENUITEM "Actualiza&re\tF5", ID_REFRESH + } + + POPUP "A&jutor" { + MENUITEM "&Subiecte Ã®n ajutor...\tF1", ID_HELP + MENUITEM "&CÄutare Ã®n ajutor...\tF1", ID_HELP + MENUITEM "&Utilizare ajutor\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "Des&pre Winefile...", ID_ABOUT + } +} + +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Selectare destinaÈie" +FONT 8, "MS Shell Dlg" +{ + CONTROL "", 101, "Static", SS_SIMPLE|SS_NOPREFIX, 3, 6, 162, 10 + CONTROL "Ca&le:", -1, "Static", SS_LEFTNOWORDWRAP|WS_GROUP, 3, 18, 60, 10 + EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", 1, 158, 6, 47, 14 + PUSHBUTTON "AnuleazÄ", 2, 158, 23, 47, 14 + PUSHBUTTON "Navi&gare", 254, 158, 43, 47, 14 +} + +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "DupÄ tipul de fiÈier" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "&Nume:",-1,7,8,22,10 + EDITTEXT IDC_VIEW_PATTERN,31,7,63,12,ES_AUTOHSCROLL + GROUPBOX "Tip fiÈier",-1,7,23,87,56 + CONTROL "&Directoare",IDC_VIEW_TYPE_DIRECTORIES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,32,70,10 + CONTROL "&Programe",IDC_VIEW_TYPE_PROGRAMS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,43,70,10 + CONTROL "Docu&mente",IDC_VIEW_TYPE_DOCUMENTS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,54,70,10 + CONTROL "&Alte fiÈiere",IDC_VIEW_TYPE_OTHERS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,13,65,70,10 + CONTROL "AratÄ fiÈierele ascunse/de &sistem",IDC_VIEW_TYPE_HIDDEN, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,81,126,9 + DEFPUSHBUTTON "OK",IDOK,104,7,50,14 + PUSHBUTTON "AnuleazÄ",IDCANCEL,104,24,50,14 +END + +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "ProprietÄÈi pentru %s" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "OK",IDOK,191,7,50,14 + PUSHBUTTON "AnuleazÄ",IDCANCEL,191,29,50,14 + LTEXT "Nume &fiÈier:",-1,7,7,59,9 + EDITTEXT IDC_STATIC_PROP_FILENAME,71,7,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Calea com&pletÄ:",-1,7,18,59,9 + EDITTEXT IDC_STATIC_PROP_PATH,71,18,120,9, ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Ultima modificare:",-1,7,29,59,9 + EDITTEXT IDC_STATIC_PROP_LASTCHANGE,71,29,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Versiune:",-1,7,40,59,9 + EDITTEXT IDC_STATIC_PROP_VERSION,71,40,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Drep&t de autor:",-1,7,51,59,9 + EDITTEXT IDC_STATIC_PROP_COPYRIGHT,71,51,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + LTEXT "Dimensiune:",-1,7,62,59,9 + EDITTEXT IDC_STATIC_PROP_SIZE,71,62,120,9,ES_READONLY | NOT WS_BORDER | WS_TABSTOP + GROUPBOX "Atribute",-1,7,79,158,46 + CONTROL "Doar citi&re",IDC_CHECK_READONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,91,68,9 + CONTROL "Ascu&ns",IDC_CHECK_HIDDEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,91,68,9 + CONTROL "&ArhivÄ",IDC_CHECK_ARCHIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,68,9 + CONTROL "&Sistem",IDC_CHECK_SYSTEM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,101,68,9 + CONTROL "&Comprimat",IDC_CHECK_COMPRESSED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,17,111,68,9 + GROUPBOX "InformaÈii despre &versiune",-1,7,129,234,79 + LISTBOX IDC_LIST_PROP_VERSION_TYPES,13,139,107,63,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + EDITTEXT IDC_LIST_PROP_VERSION_VALUES,123,139,111,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + + +STRINGTABLE +{ + IDS_FONT_SEL_DLG_NAME "Se aplicÄ opÈiunile de font" + IDS_FONT_SEL_ERROR "Eroare la selectarea unui nou font." +} + +STRINGTABLE +{ + IDS_WINEFILE "Administrator Wine File" + IDS_ERROR "Eroare" + IDS_ROOT_FS "director rÄdÄcinÄ" + IDS_UNIXFS "director unix" + IDS_DESKTOP "Desktop" + IDS_SHELL "Shell" + IDS_TITLEFMT "%s - %s" + IDS_NO_IMPL "Neimplementat Ã®ncÄ" + IDS_WINE_FILE "Wine File" +} + +STRINGTABLE +{ + IDS_COL_NAME "Nume" + IDS_COL_SIZE "Dimensiune" + IDS_COL_CDATE "Ultima schimbare de stare (ctime)" + IDS_COL_ADATE "Ultima accesare" + IDS_COL_MDATE "Ultima modificare" + IDS_COL_IDX "Index/Inode" + IDS_COL_LINKS "LegÄturi" + IDS_COL_ATTR "Atribute" + IDS_COL_SEC "Securitate" + + IDS_FREE_SPACE_FMT "%s din %s liber" +} Propchange: trunk/rosapps/applications/winfile/Ro.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/applications/winfile/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Ru.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Ru.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Ð¤Ð°Ð¹Ð»" { MENUITEM "&ÐÑÐºÑÑÑÑ\tEnter", ID_ACTIVATE @@ -147,7 +147,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÑÐ±ÐµÑÐ¸ÑÐµ Ð¿ÑÑÑ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ" FONT 8, "MS Shell Dlg" @@ -160,7 +160,7 @@ PUSHBUTTON "&ÐÐ±Ð·Ð¾Ñ", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ¾ ÑÐ¸Ð¿Ñ ÑÐ°Ð¹Ð»Ð¾Ð²" FONT 8, "MS Sans Serif" @@ -182,7 +182,7 @@ PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð° %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Si.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Si.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Si.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -27,7 +27,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Datoteka" { MENUITEM "&Odpri\tEnter", ID_ACTIVATE @@ -146,7 +146,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Izbira ciljne poti" FONT 8, "MS Shell Dlg" @@ -159,7 +159,7 @@ PUSHBUTTON "&Brskaj", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Glede na vrsto datoteke" FONT 8, "MS Sans Serif" @@ -181,7 +181,7 @@ PUSHBUTTON "PrekliÄi",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Lastnosti %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Sv.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Sv.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Sv.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -28,7 +28,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Arkiv" { MENUITEM "&Öppna\tEnter", ID_ACTIVATE @@ -146,7 +146,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Välj mål" FONT 8, "MS Shell Dlg" @@ -159,7 +159,7 @@ PUSHBUTTON "&Bläddra", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Efter filtyp" FONT 8, "MS Sans Serif" @@ -181,7 +181,7 @@ PUSHBUTTON "Avbryt",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Egenskaper för %s" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Tr.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Tr.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -25,7 +25,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Dosya" { MENUITEM "&Aç\tEnter", ID_ACTIVATE @@ -144,7 +144,7 @@ } } -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Hedefi seç" FONT 8, "MS Shell Dlg" @@ -157,7 +157,7 @@ PUSHBUTTON "&Gözat", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Dosya Türüne Göre" FONT 8, "MS Sans Serif" @@ -179,7 +179,7 @@ PUSHBUTTON "Ýptal",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "%s Özellikleri" FONT 8, "MS Sans Serif" Modified: trunk/rosapps/applications/winfile/Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Uk.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Uk.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Uk.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -31,27 +31,27 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "&Ð¤Ð°Ð¹Ð»" { - MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸\tEnter", ID_ACTIVATE - MENUITEM "&ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸...\tF7", ID_FILE_MOVE - MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸...\tF8", ID_FILE_COPY - MENUITEM "Ð &Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÑÐ½Ñ...\tF9", 118 - MENUITEM "ÐÐ¸Ð´Ð°&Ð»Ð¸ÑÐ¸\tDel", ID_FILE_DELETE - MENUITEM "ÐÐµÑÐµ&Ð¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸...", 109 + MENUITEM "&ÐÑÐ´ÐºÑÐ¸ÑÐ¸\tEnter", ID_ACTIVATE + MENUITEM "&ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸...\tF7", ID_FILE_MOVE + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸...\tF8", ID_FILE_COPY + MENUITEM "Ð &Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÑÐ½Ñ...\tF9", 118 + MENUITEM "ÐÐ¸Ð´Ð°&Ð»Ð¸ÑÐ¸\tDel", ID_FILE_DELETE + MENUITEM "ÐÐµÑÐµ&Ð¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸...", 109 MENUITEM "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾Ñ&ÑÑ...\tAlt+Enter", ID_EDIT_PROPERTIES MENUITEM SEPARATOR - MENUITEM "ÐÐ°Ð¿Ð°Ðº&ÑÐ²Ð°ÑÐ¸...", 119 + MENUITEM "ÐÐ°Ð¿Ð°Ðº&ÑÐ²Ð°ÑÐ¸...", 119 MENUITEM "Ð &Ð¾Ð·Ð¿Ð°ÐºÑÐ²Ð°ÑÐ¸...", 120 MENUITEM SEPARATOR - MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸...", ID_RUN - MENUITEM "&ÐÑÑÐº...", 102 + MENUITEM "&ÐÐ°Ð¿ÑÑÑÐ¸ÑÐ¸...", ID_RUN + MENUITEM "&ÐÑÑÐº...", 102 MENUITEM "ÐÑÐ¾ÑÑÑÐ²Ð°ÑÐ¸...", 103 MENUITEM SEPARATOR - MENUITEM "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑ&Ñ...", 111 - MENUITEM "ÐÐ¾&ÑÑÐº...", 104 - MENUITEM "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸ &ÑÐ°Ð¹Ð»Ð¸...", 116 + MENUITEM "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑ&Ñ...", 111 + MENUITEM "ÐÐ¾&ÑÑÐº...", 104 + MENUITEM "ÐÐ¸Ð´ÑÐ»Ð¸ÑÐ¸ &ÑÐ°Ð¹Ð»Ð¸...", 116 MENUITEM SEPARATOR #ifndef _NO_EXTENSIONS MENUITEM "ÐÐ¸&ÑÑÐ´\tAlt+X", ID_FILE_EXIT @@ -61,96 +61,96 @@ } POPUP "&ÐÐ¸ÑÐº" { - MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", 201 - MENUITEM "&ÐÑÑÐºÐ° ÑÐ¾Ð¼Ñ...", 202 - MENUITEM SEPARATOR - MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", ID_FORMAT_DISK + MENUITEM "&ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", 201 + MENUITEM "&ÐÑÑÐºÐ° ÑÐ¾Ð¼Ñ...", 202 + MENUITEM SEPARATOR + MENUITEM "&Ð¤Ð¾ÑÐ¼Ð°ÑÑÐ²Ð°ÑÐ¸ Ð´Ð¸ÑÐº...", ID_FORMAT_DISK #ifdef _WIN95 MENUITEM "&Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐ¸ÑÑÐµÐ¼Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº...", -1 /*TODO*/ #endif MENUITEM SEPARATOR - MENUITEM "ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ &Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_CONNECT_NETWORK_DRIVE - MENUITEM "&ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_DISCONNECT_NETWORK_DRIVE - MENUITEM SEPARATOR - MENUITEM "ÐÑÐ¾Ð±Ð¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¼ ÑÐº...", 254 - MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¹ Ð´Ð¾ÑÑÑÐ¿...", 255 - MENUITEM SEPARATOR - MENUITEM "ÐÐ¸&Ð±ÑÐ°ÑÐ¸ Ð´Ð¸ÑÐº...", 251 + MENUITEM "&ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_CONNECT_NETWORK_DRIVE + MENUITEM "&ÐÑÐ´ÐºÐ»ÑÑÐ¸ÑÐ¸ Ð¼ÐµÑÐµÐ¶Ð½Ð¸Ð¹ Ð´Ð¸ÑÐº", ID_DISCONNECT_NETWORK_DRIVE + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ¾Ð±Ð¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¼ ÑÐº...", 254 + MENUITEM "&ÐÐ°ÐºÑÐ¸ÑÐ¸ ÑÐ¿ÑÐ»ÑÐ½Ð¸Ð¹ Ð´Ð¾ÑÑÑÐ¿...", 255 + MENUITEM SEPARATOR + MENUITEM "ÐÐ¸&Ð±ÑÐ°ÑÐ¸ Ð´Ð¸ÑÐº...", 251 } POPUP "ÐÐ¸&ÑÐµÐºÑÐ¾ÑÑÑ" { - MENUITEM "&ÐÐ°ÑÑÑÐ¿Ð½Ð¸Ð¹ ÑÑÐ²ÐµÐ½Ñ\t+", 301 - MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð´ÐµÑÐµÐ²Ð¾\t*", 302 - MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð²ÑÐµ\tStrg+*", 303 - MENUITEM "ÐÐ³Ð¾ÑÐ½ÑÑÐ¸ Ð´&ÐµÑÐµÐ²Ð¾\t-", 304 - MENUITEM SEPARATOR - MENUITEM "&Mark Children", 505 + MENUITEM "&ÐÐ°ÑÑÑÐ¿Ð½Ð¸Ð¹ ÑÑÐ²ÐµÐ½Ñ\t+", 301 + MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð´ÐµÑÐµÐ²Ð¾\t*", 302 + MENUITEM "Ð Ð¾Ð·Ð³Ð¾ÑÐ½ÑÑÐ¸ &Ð²ÑÐµ\tStrg+*", 303 + MENUITEM "ÐÐ³Ð¾ÑÐ½ÑÑÐ¸ Ð´&ÐµÑÐµÐ²Ð¾\t-", 304 + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ´Ð¼ÑÑÐ¸ÑÐ¸ &Ð³ÑÐ»ÐºÐ¸", 505 } POPUP "&ÐÐ¸Ð³Ð»ÑÐ´" { - MENUITEM "ÐÐµÑÐµ&Ð²Ð¾ Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ", 413 - MENUITEM "ÐÐ¸ÑÐµ Ð´&ÐµÑÐµÐ²Ð¾", 411 + MENUITEM "&ÐÐµÑÐµÐ²Ð¾ Ñ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ", 413 + MENUITEM "ÐÐ¸ÑÐµ Ð´&ÐµÑÐµÐ²Ð¾", 411 MENUITEM "ÐÐ¸ÑÐµ Ð´&Ð¸ÑÐµÐºÑÐ¾ÑÑÑ", 412 MENUITEM SEPARATOR - MENUITEM "Ð Ð¾Ð·&Ð±Ð¸ÑÐ¸", ID_VIEW_SPLIT - MENUITEM SEPARATOR - MENUITEM "&ÐÐ¼'Ñ", ID_VIEW_NAME + MENUITEM "Ð Ð¾Ð·&Ð±Ð¸ÑÐ¸", ID_VIEW_SPLIT + MENUITEM SEPARATOR + MENUITEM "&ÐÐ¼'Ñ", ID_VIEW_NAME MENUITEM "ÐÑÑ Ð´Ð°Ð½Ñ Ð¿ÑÐ¾ ÑÐ°Ð¹&Ð»", ID_VIEW_ALL_ATTRIBUTES, CHECKED - MENUITEM "&Ð§Ð°ÑÑÐºÐ¾Ð²Ñ Ð´Ð°Ð½Ñ...", ID_VIEW_SELECTED_ATTRIBUTES - MENUITEM SEPARATOR - MENUITEM "&Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¼'ÑÐ¼", ID_VIEW_SORT_NAME - MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &ÑÐ¸Ð¿Ð¾Ð¼", ID_VIEW_SORT_TYPE - MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¾&Ð·Ð¼ÑÑÐ¾Ð¼", ID_VIEW_SORT_SIZE - MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &Ð´Ð°ÑÐ¾Ñ", ID_VIEW_SORT_DATE - MENUITEM SEPARATOR - MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &...", ID_VIEW_FILTER + MENUITEM "&Ð§Ð°ÑÑÐºÐ¾Ð²Ñ Ð´Ð°Ð½Ñ...", ID_VIEW_SELECTED_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "&Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¼'ÑÐ¼", ID_VIEW_SORT_NAME + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &ÑÐ¸Ð¿Ð¾Ð¼", ID_VIEW_SORT_TYPE + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° ÑÐ¾&Ð·Ð¼ÑÑÐ¾Ð¼", ID_VIEW_SORT_SIZE + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° Ð´&Ð°ÑÐ¾Ñ", ID_VIEW_SORT_DATE + MENUITEM SEPARATOR + MENUITEM "Ð¡Ð¾ÑÑÑÐ²Ð°ÑÐ¸ Ð·Ð° &...", ID_VIEW_FILTER } POPUP "&ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" { - MENUITEM "&ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ...", 501 - MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_SELECT_FONT - MENUITEM "Customize Tool&bar...", 512 - MENUITEM SEPARATOR - MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR, CHECKED - MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð´Ð¸ÑÐºÑÐ²", ID_VIEW_DRIVE_BAR, CHECKED - MENUITEM "&Ð ÑÐ´Ð¾Ðº ÑÑÐ°Ð½Ñ", ID_VIEW_STATUSBAR, CHECKED + MENUITEM "&ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ...", 501 + MENUITEM "&Ð¨ÑÐ¸ÑÑ...", ID_SELECT_FONT + MENUITEM "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°ÑÐ¸ &Ð¿Ð°Ð½ÐµÐ»Ñ ÑÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÑÐ²...", 512 + MENUITEM SEPARATOR + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &ÑÐ½ÑÑÑÑÐ¼ÐµÐ½ÑÑÐ²", ID_VIEW_TOOL_BAR, CHECKED + MENUITEM "ÐÐ°Ð½ÐµÐ»Ñ &Ð´Ð¸ÑÐºÑÐ²", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "&Ð ÑÐ´Ð¾Ðº ÑÑÐ°Ð½Ñ", ID_VIEW_STATUSBAR, CHECKED #ifndef _NO_EXTENSIONS - MENUITEM "Ð&ÐµÑÑ ÐµÐºÑÐ°Ð½\tCtrl+Shift+S", ID_VIEW_FULLSCREEN -#endif - MENUITEM SEPARATOR - MENUITEM "&Minimize on run", 504 - MENUITEM "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑÐµÐ´ Ð²Ð¸ÑÐ¾Ð´Ð¾Ð¼", ID_VIEW_SAVESETTINGS + MENUITEM "Ð&ÐµÑÑ ÐµÐºÑÐ°Ð½\tCtrl+Shift+S", ID_VIEW_FULLSCREEN +#endif + MENUITEM SEPARATOR + MENUITEM "&ÐÑÐ½ÑÐ¼ÑÐ·ÑÐ²Ð°ÑÐ¸ Ð¿ÑÐ¸ Ð·Ð°Ð¿ÑÑÐºÑ", 504 + MENUITEM "&ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑÐµÐ´ Ð²Ð¸ÑÐ¾Ð´Ð¾Ð¼", ID_VIEW_SAVESETTINGS } POPUP "&ÐÐµÐ·Ð¿ÐµÐºÐ°" { - MENUITEM "&ÐÐ¾ÑÑÑÐ¿...", 605 - MENUITEM "&Logging...", 606 + MENUITEM "&ÐÐ¾ÑÑÑÐ¿...", 605 + MENUITEM "&ÐÑÐ¾ÑÐ¾ÐºÐ¾Ð»Ð¸...", 606 MENUITEM "&ÐÐ»Ð°ÑÐ½Ð¸Ðº...", 607 } POPUP "ÐÑ&ÐºÐ½Ð¾" { - MENUITEM "ÐÐ¾Ð²Ðµ &ÐÑÐºÐ½Ð¾", ID_WINDOW_NEW - MENUITEM "ÐÑÐºÐ½Ð° ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼\tCtrl+F5", ID_WINDOW_CASCADE - MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ - MENUITEM "Tile &Vertically\tCtrl+F4", ID_WINDOW_TILE_VERT + MENUITEM "ÐÐ¾Ð²Ðµ &ÐÑÐºÐ½Ð¾", ID_WINDOW_NEW + MENUITEM "ÐÑÐºÐ½Ð° ÐºÐ°ÑÐºÐ°Ð´Ð¾Ð¼\tCtrl+F5", ID_WINDOW_CASCADE + MENUITEM "ÐÑÐºÐ½Ð° &Ð·Ð²ÐµÑÑÑ Ð²Ð½Ð¸Ð·", ID_WINDOW_TILE_HORZ + MENUITEM "ÐÑÐºÐ½Ð° Ð·Ð»ÑÐ²Ð° &Ð½Ð°Ð¿ÑÐ°Ð²Ð¾\tCtrl+F4", ID_WINDOW_TILE_VERT #ifndef _NO_EXTENSIONS - MENUITEM "ÐÐ¿Ð¾ÑÑÐ´ÐºÑÐ²Ð°ÑÐ¸ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾", ID_WINDOW_AUTOSORT -#endif - MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE - MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸\tF5", ID_REFRESH + MENUITEM "ÐÐ¿Ð¾ÑÑÐ´ÐºÑÐ²Ð°ÑÐ¸ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¾", ID_WINDOW_AUTOSORT +#endif + MENUITEM "Ð Ð¾Ð·Ð¼ÑÑÑÐ¸ÑÐ¸ &Ð¡Ð¸Ð¼Ð²Ð¾Ð»Ð¸", ID_WINDOW_ARRANGE + MENUITEM "&ÐÐ½Ð¾Ð²Ð¸ÑÐ¸\tF5", ID_REFRESH } POPUP "ÐÐ¾Ð²ÑÐ´Ðº&Ð°" { MENUITEM "&Ð Ð¾Ð·Ð´ÑÐ»Ð¸ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸\tF1", ID_HELP - MENUITEM "ÐÐ¾&ÑÑÐº...\tF1", ID_HELP - MENUITEM "&ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¾Ñ\tF1", ID_HELP_USING - MENUITEM SEPARATOR - MENUITEM "&ÐÑÐ¾ Winefile...", ID_ABOUT - } -} - -IDD_SELECT_DESTINATION DIALOG FIXED IMPURE 15, 13, 210, 63 + MENUITEM "ÐÐ¾&ÑÑÐº...\tF1", ID_HELP + MENUITEM "&ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð´Ð¾Ð²ÑÐ´ÐºÐ¾Ñ\tF1", ID_HELP_USING + MENUITEM SEPARATOR + MENUITEM "&ÐÑÐ¾ Winefile...", ID_ABOUT + } +} + +IDD_SELECT_DESTINATION DIALOG 15, 13, 210, 63 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ¸Ð±ÐµÑÑÑÑ ÑÐ»ÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ" FONT 8, "MS Shell Dlg" @@ -163,7 +163,7 @@ PUSHBUTTON "&ÐÐ³Ð»ÑÐ´", 254, 158, 43, 47, 14 } -IDD_DIALOG_VIEW_TYPE DIALOG DISCARDABLE 15, 13, 161, 97 +IDD_DIALOG_VIEW_TYPE DIALOG 15, 13, 161, 97 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ° ÑÐ¸Ð¿Ð¾Ð¼ ÑÐ°Ð¹Ð»ÑÐ²" FONT 8, "MS Sans Serif" @@ -185,7 +185,7 @@ PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸",IDCANCEL,104,24,50,14 END -IDD_DIALOG_PROPERTIES DIALOG DISCARDABLE 0, 0, 248, 215 +IDD_DIALOG_PROPERTIES DIALOG 0, 0, 248, 215 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ Ð´Ð»Ñ %s" FONT 8, "MS Sans Serif" @@ -239,9 +239,9 @@ { IDS_COL_NAME "ÐÐ¼'Ñ" IDS_COL_SIZE "Ð Ð¾Ð·Ð¼ÑÑ" - IDS_COL_CDATE "CDate" - IDS_COL_ADATE "ADate" - IDS_COL_MDATE "MDate" + IDS_COL_CDATE "ÐÐ°ÑÐ° ÑÑÐ²Ð¾ÑÐµÐ½Ð½Ñ" + IDS_COL_ADATE "ÐÐ°ÑÐ° Ð¾ÑÑÐ°Ð½Ð½ÑÐ¾Ð³Ð¾ Ð´Ð¾ÑÑÑÐ¿Ñ" + IDS_COL_MDATE "ÐÐ°ÑÐ° Ð¾ÑÑÐ°Ð½Ð½ÑÐ¾Ñ Ð·Ð¼ÑÐ½Ð¸" IDS_COL_IDX "Index/Inode" IDS_COL_LINKS "ÐÐ¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ" IDS_COL_ATTR "ÐÑÑÐ¸Ð±ÑÑÐ¸" Modified: trunk/rosapps/applications/winfile/Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/Zh.rc… ============================================================================== --- trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/Zh.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -29,7 +29,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "æä»¶(&F)" { MENUITEM "æå¼(&O)\tEnter", ID_ACTIVATE @@ -152,7 +152,7 @@ /* Menu */ -IDM_WINEFILE MENU FIXED IMPURE +IDM_WINEFILE MENU { POPUP "æªæ¡(&F)" { MENUITEM "éå(&O)\tEnter", ID_ACTIVATE Modified: trunk/rosapps/applications/winfile/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/rsrc.… ============================================================================== --- trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/winfile/rsrc.rc [iso-8859-1] Fri Jul 23 08:34:57 2010 @@ -71,6 +71,7 @@ #include "Lt.rc" #include "Nl.rc" #include "Pt.rc" +#include "Ro.rc" #include "Ru.rc" #include "Si.rc" #include "Uk.rc"

1 0

[tkreuzer] 48208: - fix merge artifacts - reduce diff to trunk
by tkreuzer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: tkreuzer Date: Fri Jul 23 03:36:31 2010 New Revision: 48208 URL: http://svn.reactos.org/svn/reactos?rev=48208&view=rev Log: - fix merge artifacts - reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -211,7 +211,6 @@ @ stdcall CreateWaitableTimerExA(ptr str long long) @ stdcall CreateWaitableTimerExW(ptr wstr long long) @ stdcall CreateWaitableTimerW(ptr long wstr) -@ stdcall CreateWaitableTimerW(ptr long str) @ stdcall DeactivateActCtx(long ptr) @ stdcall DebugActiveProcess(long) @ stdcall DebugActiveProcessStop(long) Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infpriv.h [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -116,7 +116,7 @@ PULONG RequiredSize); extern INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - INT* IntegerValue); + PLONG IntegerValue); extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infros.h [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -50,7 +50,7 @@ PULONG RequiredSize); extern BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PINT IntegerValue); + PLONG IntegerValue); extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/newinflib/infrosget.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -84,7 +84,7 @@ BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - INT* IntegerValue) + PLONG IntegerValue) { return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue)); } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/locale/locale.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -1421,120 +1421,6 @@ /********************************************************************* - * __lc_collate_cp (MSVCRT.@) - * - * @unimplemented - */ -void __lc_collate_cp(int cp) -{ -FIXME("__lc_collate_cp - stub\n"); -return; -} - - -/********************************************************************* - * __lc_handle (MSVCRT.@) - * - * @unimplemented - */ -void __lc_handle(void) -{ -FIXME("__lc_handle - stub\n"); -return; -} - - -/********************************************************************* - * __lc_codepage (MSVCRT.@) - * - * @unimplemented - */ -void __lc_codepage(void) -{ -FIXME("__lc_codepage - stub\n"); -return; -} - - -/********************************************************************* - * _Gettnames (MSVCRT.@) - */ -void *_Gettnames(void) -{ - FIXME("(void), stub!\n"); - return NULL; -} - -/********************************************************************* - * __lconv_init (MSVCRT.@) - */ -void __lconv_init(void) -{ - char Char = (char) UCHAR_MAX; - - TRACE("__lconv_init()\n"); - - _lconv.int_frac_digits = Char; - _lconv.frac_digits = Char; - _lconv.p_sep_by_space = _lconv.n_sep_by_space = Char; - _lconv.p_cs_precedes = _lconv.n_cs_precedes = Char; - _lconv.p_sign_posn = _lconv.n_sign_posn = Char; -} - - -/********************************************************************* - * _Strftime (MSVCRT.@) - */ -const char* _Strftime(char *out, unsigned int len, const char *fmt, - const void *tm, void *foo) -{ - /* FIXME: */ - FIXME("(%p %d %s %p %p) stub\n", out, len, fmt, tm, foo); - return ""; -} - - -/********************************************************************* - * _Getdays (MSVCRT.@) - */ -const char* _Getdays(void) -{ - static const char *MSVCRT_days = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:" - "Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday"; - /* FIXME: Use locale */ - FIXME("(void) semi-stub\n"); - return MSVCRT_days; -} - -/********************************************************************* - * _Getmonths (MSVCRT.@) - */ -const char* _Getmonths(void) -{ - static const char *MSVCRT_months = ":Jan:January:Feb:February:Mar:March:Apr:" - "April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:" - "October:Nov:November:Dec:December"; - /* FIXME: Use locale */ - FIXME("(void) semi-stub\n"); - return MSVCRT_months; -} - -/********************************************************************* - * __crtLCMapStringA (MSVCRT.@) - */ -int __crtLCMapStringA( - LCID lcid, DWORD mapflags, const char* src, int srclen, char* dst, - int dstlen, unsigned int codepage, int xflag -) { - TRACE("(lcid %lx, flags %lx, %s(%d), %p(%d), %x, %d), partial stub!\n", - lcid,mapflags,src,srclen,dst,dstlen,codepage,xflag); - /* FIXME: A bit incorrect. But msvcrt itself just converts its - * arguments to wide strings and then calls LCMapStringW - */ - return LCMapStringA(lcid,mapflags,src,srclen,dst,dstlen); -} - -/********************************************************************* * __crtLCMapStringW (MSVCRT.@) */ int __crtLCMapStringW( @@ -1547,38 +1433,4 @@ return LCMapStringW(lcid,mapflags,src,srclen,dst,dstlen); } -int CDECL _getmbcp(void) -{ - return MSVCRT___lc_codepage; -} - -/********************************************************************* - * ___unguarded_readlc_active_add_func (MSVCRT.@) - */ -unsigned int * CDECL ___unguarded_readlc_active_add_func(void) -{ - return &__unguarded_readlc_active; -} - -/********************************************************************* - * ___setlc_active_func (MSVCRT.@) - */ -unsigned int CDECL ___setlc_active_func(void) -{ - return __setlc_active; -} - -/********************************************************************* - * __crtGetStringTypeW(MSVCRT.@) - * - * This function was accepting different number of arguments in older - * versions of msvcrt. - */ -BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, - wchar_t *buffer, int len, WORD *out) -{ - FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", - unk, type, buffer, len, out); - - return GetStringTypeW(type, buffer, len, out); -} + Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/securecrt/invalidp.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -1,3 +1,4 @@ +#if 0 #include <precomp.h> #include <errno.h> @@ -67,3 +68,4 @@ invalid_parameter_handler = handler; return old; } +#endif Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -24,6 +24,8 @@ #define MI_SYSTEM_CACHE_WS_START (PVOID)0xFFFFF78000001000ULL // CHECKME #define MI_LOWEST_VAD_ADDRESS (PVOID)0x000000007FF00000ULL + +#define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) @@ -47,6 +49,10 @@ #define MI_MIN_SECONDARY_COLORS 8 #define MI_SECONDARY_COLORS 64 #define MI_MAX_SECONDARY_COLORS 1024 + +#define MI_MIN_ALLOCATION_FRAGMENT (4 * _1KB) +#define MI_ALLOCATION_FRAGMENT (64 * _1KB) +#define MI_MAX_ALLOCATION_FRAGMENT (2 * _1MB) #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -9,9 +9,9 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#include "../mm/ARM3/miarm.h" #define NDEBUG #include <debug.h> +#include "../mm/ARM3/miarm.h" VOID NTAPI RtlpBreakWithStatusInstruction(VOID); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -96,26 +96,6 @@ return STATUS_UNSUCCESSFUL; } -NTSYSAPI -NTSTATUS -NTAPI -NtContinue( - IN PCONTEXT ThreadContext, IN BOOLEAN RaiseAlert) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -NTSYSAPI -NTSTATUS -NTAPI -NtRaiseException -(IN PEXCEPTION_RECORD ExceptionRecord, IN PCONTEXT ThreadContext, IN BOOLEAN HandleException ) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - NTSTATUS NTAPI NtSetLdtEntries Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -54,6 +54,7 @@ PMMPTE PointerPte; PVOID BaseAddress; MMPTE TempPte; + PMMPFN Pfn1 = NULL; MI_PFN_CACHE_ATTRIBUTE CacheAttribute; BOOLEAN IsIoMapping; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -69,17 +69,15 @@ #define PDE_COUNT 1024 #define PTE_COUNT 1024 #elif defined(_M_AMD64) -#define PD_COUNT (512 * 512) -#define PDE_COUNT 512 -#define PTE_COUNT 512 +#define PD_COUNT PPE_PER_PAGE +#define PDE_COUNT PDE_PER_PAGE +#define PTE_COUNT PTE_PER_PAGE #elif defined(_M_ARM) #define PD_COUNT 1 #define PDE_COUNT 4096 #define PTE_COUNT 256 #else -#define PD_COUNT PPE_PER_PAGE -#define PDE_COUNT PDE_PER_PAGE -#define PTE_COUNT PTE_PER_PAGE +#error unknown architecture #endif #ifdef _M_IX86 @@ -284,7 +282,6 @@ LIST_ENTRY ListHeads[POOL_LISTS_PER_PAGE]; } POOL_DESCRIPTOR, *PPOOL_DESCRIPTOR; -#ifndef _WIN64 typedef struct _POOL_HEADER { union @@ -322,32 +319,6 @@ }; }; } POOL_HEADER, *PPOOL_HEADER; -#else -typedef struct _POOL_HEADER -{ - union - { - struct - { - ULONG PreviousSize : 8; - ULONG PoolIndex : 8; - ULONG BlockSize : 8; - ULONG PoolType : 8; - }; - ULONG Ulong1; - }; - ULONG PoolTag; - union - { - PEPROCESS* ProcessBilled; - struct - { - USHORT AllocatorBackTraceIndex; - USHORT PoolTagHash; - }; - }; -} POOL_HEADER, *PPOOL_HEADER; -#endif C_ASSERT(sizeof(POOL_HEADER) == POOL_BLOCK_SIZE); C_ASSERT(POOL_BLOCK_SIZE == sizeof(LIST_ENTRY)); @@ -421,7 +392,7 @@ extern BOOLEAN MmMirroring; extern BOOLEAN MmMakeLowMemory; extern BOOLEAN MmEnforceWriteProtection; -extern BOOLEAN MmAllocationFragment; +extern SIZE_T MmAllocationFragment; extern ULONG MmConsumedPoolPercentage; extern ULONG MmVerifyDriverBufferType; extern ULONG MmVerifyDriverLevel; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -322,6 +322,7 @@ { KIRQL OldIrql = KeGetCurrentIrql(), LockIrql; PMMPTE PointerPte; + PMMPDE PointerPde; MMPTE TempPte; PETHREAD CurrentThread; PEPROCESS CurrentProcess; @@ -336,6 +337,7 @@ // Get the PTE and PDE // PointerPte = MiAddressToPte(Address); + PointerPde = MiAddressToPde(Address); // // Check for dispatch-level snafu @@ -364,7 +366,7 @@ // // Is the PDE valid? // - if (!MiIsPdeForAddressValid(Address)) + if (!PointerPde->u.Hard.Valid == 0) { // // Debug spew (eww!) @@ -379,7 +381,7 @@ // // Now we SHOULD be good // - if (!MiIsPdeForAddressValid(Address)) + if (PointerPde->u.Hard.Valid == 0) { // // FIXFIX: Do the S-LIST hack @@ -428,8 +430,7 @@ // // This might happen...not sure yet // - //DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); - DPRINT1("FAULT ON PAGE TABLES\n"); + DPRINT1("FAULT ON PAGE TABLES: %p %lx %lx!\n", Address, *PointerPte, *PointerPde); // // Map in the page table Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -64,8 +64,7 @@ // Now move to the first free system PTE cluster // PreviousPte = PointerPte; - PointerPte = MmSystemPtesStart[SystemPtePoolType] + - PointerPte->u.List.NextEntry; + PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; // // Loop each cluster @@ -153,8 +152,7 @@ // Go to the next cluster // PreviousPte = PointerPte; - PointerPte = MmSystemPtesStart[SystemPtePoolType] + - PointerPte->u.List.NextEntry; + PointerPte = MmSystemPteBase + PointerPte->u.List.NextEntry; ASSERT(PointerPte > PreviousPte); } @@ -216,7 +214,7 @@ // Zero PTEs // RtlZeroMemory(StartingPte, NumberOfPtes * sizeof(MMPTE)); - CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPtesStart[SystemPtePoolType]); + CurrentSize = (ULONG_PTR)(StartingPte - MmSystemPteBase); // // Acquire the system PTE lock @@ -237,8 +235,7 @@ // // Get the first real cluster of PTEs and check if it's ours // - PointerPte = MmSystemPtesStart[SystemPtePoolType] + - CurrentPte->u.List.NextEntry; + PointerPte = MmSystemPteBase + CurrentPte->u.List.NextEntry; if (CurrentSize < CurrentPte->u.List.NextEntry) { // @@ -398,7 +395,7 @@ StartingPte->u.List.NextEntry = ((ULONG)0xFFFFF); MmFirstFreeSystemPte[PoolType].u.Long = 0; MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - - MmSystemPtesStart[PoolType]; + MmSystemPteBase; // // The second entry stores the size of this PTE space Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -295,7 +295,7 @@ MxPfnAllocation = MxPfnSizeInBytes >> PAGE_SHIFT; /* Simply start at hardcoded address */ - MmPfnDatabase[1] = MI_PFN_DATABASE; + MmPfnDatabase = MI_PFN_DATABASE; /* Loop the memory descriptors */ for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; @@ -816,7 +816,7 @@ MiEvaluateMemoryDescriptors(LoaderBlock); /* Start PFN database at hardcoded address */ - MmPfnDatabase[1] = MI_PFN_DATABASE; + MmPfnDatabase = MI_PFN_DATABASE; /* Prepare PFN database mappings */ MiPreparePfnDatabse(LoaderBlock); @@ -851,7 +851,7 @@ MiBuildPhysicalMemoryBlock(LoaderBlock); /* Size up paged pool and build the shadow system page directory */ - MiBuildPagedPool(); + //MiBuildPagedPool(); // This is the old stuff: MmPagedPoolBase = (PVOID)((PCHAR)MmPagedPoolEnd + 1); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/section.c [iso-8859-1] Fri Jul 23 03:36:31 2010 @@ -48,7 +48,6 @@ #define NDEBUG #include <debug.h> #include <reactos/exeformat.h> -#include "ARM3/miarm.h" #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmCreatePhysicalMemorySection) @@ -72,7 +71,7 @@ POBJECT_TYPE MmSectionObjectType = NULL; -BOOLEAN MmAllocationFragment; +SIZE_T MmAllocationFragment; ULONG_PTR MmSubsectionBase;

1 0

[tkreuzer] 48207: [PSEH] Stub amd64 functions and remove leading underscores from symbols
by tkreuzer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: tkreuzer Date: Fri Jul 23 02:18:30 2010 New Revision: 48207 URL: http://svn.reactos.org/svn/reactos?rev=48207&view=rev Log: [PSEH] Stub amd64 functions and remove leading underscores from symbols Modified: trunk/reactos/lib/pseh/amd64/framebased.S Modified: trunk/reactos/lib/pseh/amd64/framebased.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/amd64/framebased.… ============================================================================== --- trunk/reactos/lib/pseh/amd64/framebased.S [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/amd64/framebased.S [iso-8859-1] Fri Jul 23 02:18:30 2010 @@ -1,73 +1,25 @@ -// Copyright (c) 2004/2005 KJK::Hyperion - -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to dos so, subject to the following conditions: - -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. - -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. .text .intel_syntax noprefix -.globl __SEHCleanHandlerEnvironment -__SEHCleanHandlerEnvironment: - cld +.globl _SEHCleanHandlerEnvironment +_SEHCleanHandlerEnvironment: ret -.globl __SEHCurrentRegistration -__SEHCurrentRegistration: - mov rax, [fs:0] +.globl _SEHCurrentRegistration +_SEHCurrentRegistration: ret -.globl __SEHRegisterFrame -__SEHRegisterFrame: - mov rcx, [rsp+4] - mov rax, [fs:0] - mov [rcx+0], eax - mov [fs:0], ecx +.globl _SEHRegisterFrame +_SEHRegisterFrame: ret -.globl __SEHUnregisterFrame -__SEHUnregisterFrame: - mov rcx, [fs:0] - mov rcx, [rcx+0] - mov [fs:0], rcx +.globl _SEHUnregisterFrame +_SEHUnregisterFrame: ret -.globl __SEHGlobalUnwind -__SEHGlobalUnwind: - -.extern __SEHRtlUnwind - -// RtlUnwind clobbers all the "don't clobber" registers, so we save them - push rbx - mov rbx, [rsp+8] - push rsi - push rdi - - push 0 // ReturnValue - push 0 // ExceptionRecord -// push .RestoreRegisters // TargetIp - push rbx // TargetFrame -// call [__SEHRtlUnwind] - -.RestoreRegisters: - pop rdi - pop rsi - pop rbx - +.globl _SEHGlobalUnwind +_SEHGlobalUnwind: ret // EOF

1 0

[tkreuzer] 48206: [PSEH] Add (non working) 64bit code
by tkreuzer＠svn.reactos.org 23 Jul '10

23 Jul '10

Author: tkreuzer Date: Fri Jul 23 01:36:44 2010 New Revision: 48206 URL: http://svn.reactos.org/svn/reactos?rev=48206&view=rev Log: [PSEH] Add (non working) 64bit code Added: trunk/reactos/lib/pseh/amd64/ (with props) trunk/reactos/lib/pseh/amd64/framebased.S (with props) Modified: trunk/reactos/lib/pseh/pseh.rbuild Propchange: trunk/reactos/lib/pseh/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Jul 23 01:36:44 2010 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/pseh/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/pseh/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/pseh/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/pseh/amd64/framebased.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/amd64/framebased.… ============================================================================== --- trunk/reactos/lib/pseh/amd64/framebased.S (added) +++ trunk/reactos/lib/pseh/amd64/framebased.S [iso-8859-1] Fri Jul 23 01:36:44 2010 @@ -1,0 +1,73 @@ +// Copyright (c) 2004/2005 KJK::Hyperion + +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to dos so, subject to the following conditions: + +// The above copyright notice and this permission notice shall be included in all +// copies or substantial portions of the Software. + +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. + +.text +.intel_syntax noprefix + +.globl __SEHCleanHandlerEnvironment +__SEHCleanHandlerEnvironment: + cld + ret + +.globl __SEHCurrentRegistration +__SEHCurrentRegistration: + mov rax, [fs:0] + ret + +.globl __SEHRegisterFrame +__SEHRegisterFrame: + mov rcx, [rsp+4] + mov rax, [fs:0] + mov [rcx+0], eax + mov [fs:0], ecx + ret + +.globl __SEHUnregisterFrame +__SEHUnregisterFrame: + mov rcx, [fs:0] + mov rcx, [rcx+0] + mov [fs:0], rcx + ret + +.globl __SEHGlobalUnwind +__SEHGlobalUnwind: + +.extern __SEHRtlUnwind + +// RtlUnwind clobbers all the "don't clobber" registers, so we save them + push rbx + mov rbx, [rsp+8] + push rsi + push rdi + + push 0 // ReturnValue + push 0 // ExceptionRecord +// push .RestoreRegisters // TargetIp + push rbx // TargetFrame +// call [__SEHRtlUnwind] + +.RestoreRegisters: + pop rdi + pop rsi + pop rbx + + ret + +// EOF Propchange: trunk/reactos/lib/pseh/amd64/framebased.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/pseh/pseh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/pseh/pseh.rbuild?rev=4… ============================================================================== --- trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/pseh/pseh.rbuild [iso-8859-1] Fri Jul 23 01:36:44 2010 @@ -16,5 +16,10 @@ <file>framebased.S</file> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>framebased.S</file> + </directory> + </if> <file>framebased.c</file> </module>

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