Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 36894: - Notify umpnpmgr about logon after the shell has initialized - This makes it possible to progress if userinit crashes due to heavy debug output (due to timing issues in its communication with umpnpmgr), which would leave you stranded with no shell. Not really a hack, as it doesn't hide or fix the crash -- just limits it to a missing "Pending device installations" prompt in case there are any pending. Also, it appears to be done the same way on Windows.
by sginsberg＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sginsberg Date: Wed Oct 22 08:59:01 2008 New Revision: 36894 URL: http://svn.reactos.org/svn/reactos?rev=36894&view=rev Log: - Notify umpnpmgr about logon after the shell has initialized - This makes it possible to progress if userinit crashes due to heavy debug output (due to timing issues in its communication with umpnpmgr), which would leave you stranded with no shell. Not really a hack, as it doesn't hide or fix the crash -- just limits it to a missing "Pending device installations" prompt in case there are any pending. Also, it appears to be done the same way on Windows. Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/userinit/userinit.c [iso-8859-1] Wed Oct 22 08:59:01 2008 @@ -580,9 +580,9 @@ IN LPWSTR lpszCmdLine, IN int nCmdShow) { - NotifyLogon(); SetUserSettings(); StartShell(); + NotifyLogon(); return 0; }

1 0

[sginsberg] 36893: - Fix an assertion by casting to internal structures correctly
by sginsberg＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sginsberg Date: Wed Oct 22 08:24:01 2008 New Revision: 36893 URL: http://svn.reactos.org/svn/reactos?rev=36893&view=rev Log: - Fix an assertion by casting to internal structures correctly Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Wed Oct 22 08:24:01 2008 @@ -86,8 +86,8 @@ KeSetSystemAffinityThread(1); /* Make sure there's space for two IOPMs, then copy & clear the current */ - //ASSERT(((PKGDTENTRY)&KeGetPcr()->GDT[KGDT_TSS / 8])->LimitLow >= - // (0x2000 + IOPM_OFFSET - 1)); + ASSERT(((PKIPCR)KeGetPcr())->GDT[KGDT_TSS / 8].LimitLow >= + (0x2000 + IOPM_OFFSET - 1)); RtlCopyMemory(Ki386IopmSaveArea, &Tss->IoMaps[0].IoMap, PAGE_SIZE * 2); RtlZeroMemory(&Tss->IoMaps[0].IoMap, PAGE_SIZE * 2);

1 0

[janderwald] 36892: - Convert the string using the WideCharToMultiByte function and fix passed parameters - Always zero-terminate the converted buffer - Remove querying NameServer / DhcpNameServer under Parameters key because it is not used and was not working - Initialize PrivateNSEnum CurrentName member - Make sure that only successfully converted NameServer get copied
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 06:37:33 2008 New Revision: 36892 URL: http://svn.reactos.org/svn/reactos?rev=36892&view=rev Log: - Convert the string using the WideCharToMultiByte function and fix passed parameters - Always zero-terminate the converted buffer - Remove querying NameServer / DhcpNameServer under Parameters key because it is not used and was not working - Initialize PrivateNSEnum CurrentName member - Make sure that only successfully converted NameServer get copied Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Wed Oct 22 06:37:33 2008 @@ -181,12 +181,18 @@ PWCHAR Server, PVOID _Data ) { PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data; - RtlUnicodeToMultiByteN((PCHAR)&Data->AddrString[Data->CurrentName], - sizeof(Data->AddrString[0]), - NULL, - Server, - wcslen(Server)); - Data->CurrentName++; + + if (WideCharToMultiByte(CP_ACP, 0, Server, -1, + Data->AddrString[Data->CurrentName].String, + 16, NULL, NULL)) + { + Data->AddrString[Data->CurrentName].String[15] = '\0'; + Data->CurrentName++; + } + else + { + Data->AddrString[Data->CurrentName].String[0] = '\0'; + } } static void CreateNameServerListEnumIfFunc( HKEY RegHandle, @@ -207,43 +213,19 @@ } PIPHLP_RES_INFO getResInfo() { - DWORD i, ServerCount, ExtraServer; - HKEY hKey; - LONG errCode; - PWCHAR Str; - IP_ADDR_STRING AddrString; + DWORD i, ServerCount; NAME_SERVER_LIST_PRIVATE PrivateNSEnum = { 0 }; PIPHLP_RES_INFO ResInfo; struct sockaddr_in *AddrList; ServerCount = CountNameServers( &PrivateNSEnum ); - - errCode = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\" - "Parameters", 0, KEY_READ, &hKey); - if (errCode != ERROR_SUCCESS) { - RegCloseKey( hKey ); - return NULL; - } - - Str = QueryRegistryValueString( hKey, L"NameServer" ); - - /* If NameServer is empty */ - if (!Str || *Str == L'\0') - { - /* Then use DhcpNameServer */ - Str = QueryRegistryValueString( hKey, L"DhcpNameServer" ); - } - - ExtraServer = Str ? 1 : 0; - - ServerCount += ExtraServer; PrivateNSEnum.NumServers = ServerCount; PrivateNSEnum.AddrString = (PIP_ADDRESS_STRING) RtlAllocateHeap( GetProcessHeap(), 0, ServerCount * sizeof(IP_ADDRESS_STRING) ); + PrivateNSEnum.CurrentName = 0; ResInfo = (PIPHLP_RES_INFO)RtlAllocateHeap @@ -253,7 +235,6 @@ if( !ResInfo ) { RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); - RegCloseKey( hKey ); return NULL; } @@ -264,30 +245,15 @@ MakeNameServerList( &PrivateNSEnum ); - if( ExtraServer ) { - ULONG ResultSize; - - for( ResultSize = 0; Str[ResultSize]; ResultSize++ ) - ((PCHAR)&AddrString)[ResultSize] = Str[ResultSize]; - - ((PCHAR)&AddrString)[ResultSize] = 0; - ResInfo->riAddressList[0].sin_family = AF_INET; - ResInfo->riAddressList[0].sin_addr.s_addr = - inet_addr( (PCHAR)&AddrString ); - ResInfo->riAddressList[0].sin_port = 0; - ConsumeRegValueString( Str ); - } - - for( i = ExtraServer; i < ServerCount; i++ ) { + for( i = 0; i < PrivateNSEnum.CurrentName; i++ ) { /* Hmm seems that dns servers are always AF_INET but ... */ ResInfo->riAddressList[i].sin_family = AF_INET; ResInfo->riAddressList[i].sin_addr.s_addr = - inet_addr( (PCHAR)&PrivateNSEnum.AddrString[i - ExtraServer] ); + inet_addr(PrivateNSEnum.AddrString[i].String ); ResInfo->riAddressList[i].sin_port = 0; } RtlFreeHeap( GetProcessHeap(), 0, PrivateNSEnum.AddrString ); - RegCloseKey( hKey ); return ResInfo; }

1 0

[sginsberg] 36891: - Fix some debug prints
by sginsberg＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sginsberg Date: Wed Oct 22 06:16:52 2008 New Revision: 36891 URL: http://svn.reactos.org/svn/reactos?rev=36891&view=rev Log: - Fix some debug prints Modified: trunk/reactos/subsystems/win32/csrss/video.c Modified: trunk/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/vid… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/video.c [iso-8859-1] Wed Oct 22 06:16:52 2008 @@ -68,8 +68,8 @@ if (BaseAddress != (PVOID)0xa0000) { - DPRINT1("Couldn't map physical memory at the right address " - "(was %x)\n", BaseAddress); + DPRINT1("Couldn't map physical memory at the right address (was %x)\n", + BaseAddress); return 0; } @@ -91,8 +91,8 @@ } if (BaseAddress != (PVOID)0x0) { - DPRINT1("Failed to allocate virtual memory at right address " - "(was %x)\n", BaseAddress); + DPRINT1("Failed to allocate virtual memory at right address (was %x)\n", + BaseAddress); return 0; } @@ -100,7 +100,7 @@ Status = NtVdmControl(VdmInitialize, IVTAndBda); if (!NT_SUCCESS(Status)) { - DbgPrint("NtVdmControl failed (status %x)\n", Status); + DPRINT1("NtVdmControl failed (status %x)\n", Status); return 0; }

1 0

[janderwald] 36890: - delete DhcpNameServer key when storing static Nameserver entries
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 04:21:33 2008 New Revision: 36890 URL: http://svn.reactos.org/svn/reactos?rev=36890&view=rev Log: - delete DhcpNameServer key when storing static Nameserver entries Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/tcpipcon… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c [iso-8859-1] Wed Oct 22 04:21:33 2008 @@ -3194,6 +3194,7 @@ if(pStr) { RegSetValueExW(hKey, L"NameServer", 0, REG_SZ, (LPBYTE)pStr, dwSize); + RegDeleteValueW(hKey, L"DhcpNameServer"); CoTaskMemFree(pStr); } }

1 0

[janderwald] 36889: - Query first for DhcpNameServer key value as this key is only present when DHCP is activated
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 04:13:15 2008 New Revision: 36889 URL: http://svn.reactos.org/svn/reactos?rev=36889&view=rev Log: - Query first for DhcpNameServer key value as this key is only present when DHCP is activated Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/resinfo… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c [iso-8859-1] Wed Oct 22 04:13:15 2008 @@ -124,10 +124,10 @@ void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ) { PWCHAR NameServerString = - QueryRegistryValueString(RegHandle, L"NameServer"); + QueryRegistryValueString(RegHandle, L"DhcpNameServer"); if (!NameServerString) - NameServerString = QueryRegistryValueString(RegHandle, L"DhcpNameServer"); + NameServerString = QueryRegistryValueString(RegHandle, L"NameServer"); if (NameServerString) { /* Now, count the non-empty comma separated */

1 0

[janderwald] 36888: - Delete old DhcpNameServer key when no nameservers could be obtained - Close registry key when done
by janderwald＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: janderwald Date: Wed Oct 22 04:00:33 2008 New Revision: 36888 URL: http://svn.reactos.org/svn/reactos?rev=36888&view=rev Log: - Delete old DhcpNameServer key when no nameservers could be obtained - Close registry key when done Modified: trunk/reactos/base/services/dhcp/dhclient.c Modified: trunk/reactos/base/services/dhcp/dhclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclien… ============================================================================== --- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Wed Oct 22 04:00:33 2008 @@ -451,9 +451,16 @@ } void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) { + CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; + HKEY RegKey; + + strcat(Buffer, Adapter->DhclientInfo.name); + if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_WRITE, &RegKey ) != ERROR_SUCCESS) + return; + + if( new_lease->options[DHO_DOMAIN_NAME_SERVERS].len ) { - CHAR Buffer[200] = "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; - HKEY RegKey; + struct iaddr nameserver; char *nsbuf; int i, addrs = @@ -462,13 +469,9 @@ /* XXX I'm setting addrs to 1 until we are ready up the chain */ addrs = 1; nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) ); - nsbuf[0] = 0; - strcat(Buffer, Adapter->DhclientInfo.name); - - if( nsbuf && !RegOpenKeyEx - ( HKEY_LOCAL_MACHINE, - Buffer, - 0, KEY_WRITE, &RegKey ) ) { + + if( nsbuf) { + nsbuf[0] = 0; for( i = 0; i < addrs; i++ ) { nameserver.len = sizeof(ULONG); memcpy( nameserver.iabuf, @@ -480,12 +483,17 @@ DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf)); - RegSetValueEx( RegKey, "DhcpNameServer", 0, REG_SZ, - (LPBYTE)nsbuf, strlen(nsbuf) + 1); + RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ, + (LPBYTE)nsbuf, strlen(nsbuf) + 1 ); + free( nsbuf ); } - // free(NULL) is defined to be OK too - free( nsbuf ); + + } else { + RegDeleteValueW( RegKey, L"DhcpNameServer" ); } + + RegCloseKey( RegKey ); + } void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {

1 0

[dreimer] 36887: Bug 3668: spanish inf files by Javier Remacha Bug 3678: Greek translation for some media.inf files by Apostolos Alexiadis Bug 3777: netcfgx and netshell translation update by Maciej Bialas
by dreimer＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: dreimer Date: Wed Oct 22 01:07:13 2008 New Revision: 36887 URL: http://svn.reactos.org/svn/reactos?rev=36887&view=rev Log: Bug 3668: spanish inf files by Javier Remacha Bug 3678: Greek translation for some media.inf files by Apostolos Alexiadis Bug 3777: netcfgx and netshell translation update by Maciej Bialas Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netshell/lang/pl-PL.rc trunk/reactos/media/inf/NET_NIC.inf trunk/reactos/media/inf/acpi.inf trunk/reactos/media/inf/cdrom.inf trunk/reactos/media/inf/cpu.inf trunk/reactos/media/inf/display.inf trunk/reactos/media/inf/fdc.inf trunk/reactos/media/inf/hdc.inf trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/machine.inf trunk/reactos/media/inf/msmouse.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/ports.inf trunk/reactos/media/inf/scsi.inf trunk/reactos/media/inf/usb.inf trunk/reactos/media/inf/usbport.inf trunk/reactos/media/inf/usbstor.inf Modified: trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc [iso-8859-1] Wed Oct 22 01:07:13 2008 @@ -48,22 +48,22 @@ IDD_TCPIP_ADVIP_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "IP Settings" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "IP addressen", -1, 5, 5, 240, 90 +CAPTION "Ustawienia protoko³u IP" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Adresy IP", -1, 5, 5, 240, 90 CONTROL "", IDC_IPLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 15, 210, 55 - PUSHBUTTON "Add...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP - GROUPBOX "Default gateways:", -1, 5, 100, 240, 90 + PUSHBUTTON "Dodaj...", IDC_IPADD, 60, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Edytuj...", IDC_IPMOD, 120, 75, 50, 14, WS_TABSTOP + PUSHBUTTON "Usuñ", IDC_IPDEL, 180, 75, 50, 14, WS_TABSTOP + GROUPBOX "Domylne bramy:", -1, 5, 100, 240, 90 CONTROL "", IDC_GWLIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 110, 210, 55 - PUSHBUTTON "Add...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Edit...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Dodaj...", IDC_GWADD, 60, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Edytuj...", IDC_GWMOD, 120, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "Usuñ", IDC_GWDEL, 180, 170, 50, 14, WS_TABSTOP GROUPBOX "", -1, 5, 200, 240, 30 - CHECKBOX "Automatic metric", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "Interface metric:", -1, 15, 215, 90, 12 + CHECKBOX "Metryka automatyczna", IDC_AUTOMETRIC, 9, 200, 90, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "Metryka interfejsu:", -1, 15, 215, 90, 12 EDITTEXT IDC_METRIC, 110, 212, 50, 12, WS_TABSTOP | ES_NUMBER END @@ -73,157 +73,157 @@ FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_DNSADDRLIST, 5, 15, 180, 60, LBS_NOTIFY - LTEXT "D&NS server addresses, in order of use:", -1, 5, 5, 180, 12 - PUSHBUTTON "Up", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP - LTEXT "The following three settings are applied to all connections with TCP/IP enabled. For resolution of unqualified names:", -1, 5, 90, 220, 24 - CONTROL "Append &primary and connection specific DNS suffixes", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 - CHECKBOX "Append parent suffi&xes of the primary DNS suffix", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CONTROL "Append t&hese DNS suffixes(in order):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 + LTEXT "Adresy serwerów D&NS wed³ug kolejnoci u¿ywania:", -1, 5, 5, 180, 12 + PUSHBUTTON "W górê", IDC_DNSADDRUP, 190, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "W dó³", IDC_DNSADDRDOWN, 190, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "&Dodaj...", IDC_DNSADDRADD, 30, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Edytuj...", IDC_DNSADDRMOD, 100, 70, 50, 14, WS_TABSTOP + PUSHBUTTON "&Usuñ", IDC_DNSADDRDEL, 170, 70, 50, 14, WS_TABSTOP + LTEXT "Trzy poni¿sze ustawienia dotycz¹ wszystkich po³¹czeñ o w³¹czonym protokole TCP/IP. W celu rozpoznawania nazw niekwalifikowanych:", -1, 5, 90, 220, 24 + CONTROL "D&o³¹cz sufiksy DNS: podstawowy i konkretnego po³¹czenia", IDC_PRIMSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 110, 160, 12 + CHECKBOX "Do³¹cz su&fiksy nadrzêdne podstawowego sufiksu DNS", IDC_TOPPRIMSUFFIX, 15, 125, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CONTROL "Do³¹&cz poni¿sze sufiksy DNS (w podanej kolejnoci):", IDC_SELSUFFIX, "BUTTON", BS_AUTORADIOBUTTON, 5, 140, 190, 12 LISTBOX IDC_DNSSUFFIXLIST, 5, 155, 180, 60, LBS_NOTIFY - PUSHBUTTON "Up", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP - PUSHBUTTON "Down", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "&Add...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "&Edit...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP - PUSHBUTTON "Remo&ve", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP - LTEXT "DNS &suffix for this connection:", -1, 5, 225, 110, 14 + PUSHBUTTON "W górê", IDC_DNSSUFFIXUP, 190, 170, 50, 14, WS_TABSTOP + PUSHBUTTON "W dó³", IDC_DNSSUFFIXDOWN, 190, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Dod&aj...", IDC_DNSSUFFIXADD, 30, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "Ed&ytuj...", IDC_DNSSUFFIXMOD, 100, 210, 50, 14, WS_TABSTOP + PUSHBUTTON "U&suñ", IDC_DNSSUFFIXDEL, 170, 210, 50, 14, WS_TABSTOP + LTEXT "Sufiks DNS dla &tego po³¹czenia:", -1, 5, 225, 110, 14 EDITTEXT IDC_SUFFIX, 120, 225, 100, 12, WS_TABSTOP - CHECKBOX "&Register this connection's addresses in DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - CHECKBOX "&Use this connection's DNS suffix in DNS registration", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Zarejestruj adresy tego po³¹czenia w DNS", IDC_REGSUFFIX, 15, 240, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "U¿y&j sufiksu DNS tego po³¹czenia do rejestracji w DNS", IDC_USESUFFIX, 15, 255, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP END IDD_TCPIP_ADVOPT_DLG DIALOGEX DISCARDABLE 0, 0, 247, 247 STYLE DS_SHELLFONT | WS_CHILD | WS_CAPTION -CAPTION "Options" +CAPTION "Opcje" FONT 8, "MS Shell Dlg" BEGIN LISTBOX IDC_OPTLIST, 5, 30, 230, 70 - LTEXT "&Optional settings", -1, 5, 15, 130, 12 - PUSHBUTTON "&Properties", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP - GROUPBOX "Description:", -1, 5, 120, 240, 70 + LTEXT "&Ustawienia opcjonalne", -1, 5, 15, 130, 12 + PUSHBUTTON "&W³aciwoci", IDC_OPTPROP, 160, 100, 70, 14, WS_TABSTOP + GROUPBOX "Opis:", -1, 5, 120, 240, 70 LTEXT "", IDC_OPTDESC, 15, 130, 220, 33 END IDD_TCPIPADDIP_DLG DIALOGEX DISCARDABLE 0, 0, 200, 70 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Address" +CAPTION "Adres TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "IP address:", -1, 5, 15, 70, 12 - LTEXT "Subnet mask:", -1, 5, 30, 70, 12 + LTEXT "Adres IP:", -1, 5, 15, 70, 12 + LTEXT "Maska podsieci:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPGW_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Gateway Address" +CAPTION "Adres bramy TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 100, 15, 80, 12 - LTEXT "Gateway:", -1, 5, 15, 70, 12 - CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP - LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED + LTEXT "Brama:", -1, 5, 15, 70, 12 + CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP + LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END IDD_TCPIPDNS_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP DNS Server" +CAPTION "Serwer DNS TCP/IP" FONT 8, "MS Shell Dlg" BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 - LTEXT "DNS server:", -1, 5, 10, 120, 12 + LTEXT "Serwer DNS:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIPSUFFIX_DLG DIALOGEX DISCARDABLE 0, 0, 200, 80 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Domain Suffix" +CAPTION "Sufiks domeny TCP/IP" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP - LTEXT "Domain suffix:", -1, 5, 10, 120, 12 + LTEXT "Sufiks domeny:", -1, 5, 10, 120, 12 PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END IDD_TCPIP_FILTER_DLG DIALOGEX DISCARDABLE 0, 0, 305, 220 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "TCP/IP Filtering" -FONT 8, "MS Shell Dlg" -BEGIN - CHECKBOX "Enable TCP/IP-Filtering (All adapters)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP +CAPTION "Filtrowanie TCP/IP" +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "W³¹cz filtrowanie TCP/IP (wszystkie karty)", IDC_USE_FILTER, 15, 5, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP GROUPBOX "", -1, 5, 30, 90, 150 - CONTROL "Permit All", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 - CONTROL "Permit Only", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 + CONTROL "Pozwalaj wszystkim", IDC_TCP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 30, 70, 12 + CONTROL "Pozwalaj tylko", IDC_TCP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 44, 70, 12 CONTROL "", IDC_TCP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 11, 62, 72, 75 - PUSHBUTTON "Add", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Dodaj", IDC_TCP_ADD, 15, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Usuñ", IDC_TCP_DEL, 15, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 105, 30, 90, 150 - CONTROL "Permit All", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 - CONTROL "Permit Only", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 + CONTROL "Pozwalaj wszystkim", IDC_UDP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 30, 70, 12 + CONTROL "Pozwalaj tylko", IDC_UDP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 115, 44, 70, 12 CONTROL "", IDC_UDP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 111, 62, 72, 75 - PUSHBUTTON "Add", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Dodaj", IDC_UDP_ADD, 115, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Usuñ", IDC_UDP_DEL, 115, 161, 50, 14, WS_TABSTOP GROUPBOX "", -1, 205, 30, 90, 150 - CONTROL "Permit All", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 - CONTROL "Permit Only", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 + CONTROL "Pozwalaj wszystkim", IDC_IP_ALLOW_ALL, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 30, 70, 12 + CONTROL "Pozwalaj tylko", IDC_IP_RESTRICT, "BUTTON", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 215, 44, 70, 12 CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 - PUSHBUTTON "Add", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP - PUSHBUTTON "Remove", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP + PUSHBUTTON "Dodaj", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP + PUSHBUTTON "Usuñ", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END IDD_TCPIP_PORT_DLG DIALOGEX DISCARDABLE 0, 0, 200, 60 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add Filter" +CAPTION "Dodaj filtr" FONT 8, "MS Shell Dlg" BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP + PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END STRINGTABLE BEGIN IDS_NET_CONNECT "Po³¹czenie sieciowe" - IDS_NO_IPADDR_SET "The adapter requires at least one IP address. Please enter one." - IDS_NO_SUBMASK_SET "You have entered an address that is missing its subnet mask. Please add a subnet mask." - IDS_TCPFILTERDESC "TCP/IP filtering allows you to control the type of TCP/IP network traffic that reaches your computer." - IDS_TCPFILTER "TCP/IP Filtering" - IDS_IPADDR "IP address" - IDS_SUBMASK "Subnet mask" - IDS_GATEWAY "Gateway" - IDS_METRIC "Metric" - IDS_DHCPACTIVE "DHCP Enabled" - IDS_AUTOMATIC "Automatic" - IDS_NOITEMSEL "You have not selected an item. Select one first." + IDS_NO_IPADDR_SET "Ta karta wymaga co najmniej jednego adresu IP. Wprowad adres IP." + IDS_NO_SUBMASK_SET "Wprowadzono adres, w którym brakuje maski podsieci. Wprowad maskê podsieci." + IDS_TCPFILTERDESC "Filtrowanie pakietów TCP/IP pozwala na kontrolowanie w sieci tego typu ruchu TCP/IP, który dociera do danego komputera." + IDS_TCPFILTER "Filtrowanie protoko³u TCP/IP" + IDS_IPADDR "Adres IP" + IDS_SUBMASK "Maska podsieci" + IDS_GATEWAY "Brama" + IDS_METRIC "Metryka" + IDS_DHCPACTIVE "DHCP w³¹czone" + IDS_AUTOMATIC "Automatyczna" + IDS_NOITEMSEL "Nie wybrano ¿adnego elementu. Najpierw wybierz element." IDS_TCPIP "ReactOS-TCP/IP" - IDS_ADD "Add" + IDS_ADD "Dodaj" IDS_MOD "OK" - IDS_TCP_PORTS "TCP Ports" - IDS_UDP_PORTS "UDP Ports" - IDS_IP_PROTO "IP protocols" - IDS_PORT_RANGE "Port numbers must be greater than 0 and less than 65536. Please enter a number within this range." - IDS_PROT_RANGE "Protocol numbers must be greater than 0 and less than 256. Please enter a number within this range." - IDS_DUP_NUMBER "The number you are trying to add is already in the list. Please enter a different number." - IDS_DISABLE_FILTER "Disabling this global TCP/IP setting will affect all adapters." - IDS_NO_SUFFIX "The current setting of search method requires at least one DNS suffix. Please enter one or change the setting." - IDS_DOMAIN_SUFFIX "Domain suffix is not a valid suffix." - IDS_DNS_SUFFIX "The DNS domain name ""%s"" is not a valid DNS name." - IDS_DUP_SUFFIX "The DNS suffix is already on the list." - IDS_DUP_IPADDR "The IP address is already on the list." - IDS_DUP_GW "The default gateway is already on the list." -END + IDS_TCP_PORTS "Porty TCP" + IDS_UDP_PORTS "Porty UDP" + IDS_IP_PROTO "Protoko³y IP" + IDS_PORT_RANGE "Numery portów musz¹ byæ wiêksze od 0 i mniejsze od 65536. Wprowad liczbê z tego zakresu." + IDS_PROT_RANGE "Numery protoko³ów musz¹ byæ wiêksze od 0 i mniejsze od 256. Wprowad liczbê z tego zakresu." + IDS_DUP_NUMBER "Podana liczba znajduje siê ju¿ na licie. Wprowad inn¹ liczbê." + IDS_DISABLE_FILTER "Wy³¹czenie tego globalnego ustawienia protoko³u TCP/IP bêdzie mia³o wp³yw na wszystkie karty." + IDS_NO_SUFFIX "Aktualne ustawienie przeszukiwania wymaga podania przynajmniej jednego sufiksu DNS. Wprowad sufiks DNS lub zmieñ ustawienia." + IDS_DOMAIN_SUFFIX "Podany sufiks domeny jest nieprawid³owy." + IDS_DNS_SUFFIX "Nazwa domeny DNS ""%s"" jest nieprawid³owa." + IDS_DUP_SUFFIX "Sufiks DNS znajduje siê ju¿ na licie." + IDS_DUP_IPADDR "Adres IP znajduje siê ju¿ na licie." + IDS_DUP_GW "Domylna brama znajduje siê ju¿ na licie." +END Modified: trunk/reactos/dll/win32/netshell/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/pl-PL.rc [iso-8859-1] Wed Oct 22 01:07:13 2008 @@ -21,7 +21,7 @@ IDD_STATUS DIALOGEX DISCARDABLE 0, 0, 200, 280 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Properties" +CAPTION "W³aciwoci" FONT 8, "MS Shell Dlg" BEGIN END @@ -60,7 +60,7 @@ LTEXT "Maska podsieci:", -1, 22, 48, 80, 8 LTEXT "Domylna brama:", -1, 22, 62, 80, 8 - RTEXT "N/A", IDC_DETAILSTYPE, 122, 20, 80, 8 + RTEXT "n/d", IDC_DETAILSTYPE, 122, 20, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSIP, 122, 34, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSSUBNET, 122, 48, 80, 8 RTEXT "000.000.000.000", IDC_DETAILSGATEWAY, 122, 62, 80, 8 @@ -97,8 +97,8 @@ IDS_FORMAT_KBIT "%u KBit/s" IDS_FORMAT_MBIT "%u MBit/s" IDS_FORMAT_GBIT "%u GBit/s" - IDS_DURATION_DAY "%d Day %s" - IDS_DURATION_DAYS "%d Days %s" + IDS_DURATION_DAY "%d Dzieñ %s" + IDS_DURATION_DAYS "%d Dni %s" IDS_ASSIGNED_DHCP "Przydzielony przez DHCP" IDS_ASSIGNED_MANUAL "Ustawiony rêcznie" END Modified: trunk/reactos/media/inf/NET_NIC.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/NET_NIC.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/acpi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/acpi.inf?rev=368… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cdrom.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cdrom.inf?rev=36… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/cpu.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/cpu.inf?rev=3688… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/display.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/display.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/fdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/fdc.inf?rev=3688… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=3688… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=3… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/ports.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/ports.inf?rev=36… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/scsi.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/scsi.inf?rev=368… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usb.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usb.inf?rev=3688… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/media/inf/usbstor.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbstor.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[sserapion] 36886: Revert last. (rtl straggler)
by sserapion＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: sserapion Date: Tue Oct 21 21:07:16 2008 New Revision: 36886 URL: http://svn.reactos.org/svn/reactos?rev=36886&view=rev Log: Revert last. (rtl straggler) Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Tue Oct 21 21:07:16 2008 @@ -12,7 +12,7 @@ <define name="_WIN32_WINNT">0x0502</define> <define name="_NTOSKRNL_" /> <define name="__NO_CTYPE_INLINES" /> - <library>rtl_umode</library> + <library>rtl</library> <library>ntdllsys</library> <library>libcntpr</library> <library>pseh</library> @@ -55,4 +55,4 @@ <file>ntdll.rc</file> </directory> </module> -</group> +</group>

1 0

[cgutman] 36885: - Merge aicom-network-fixes up to r36884
by cgutman＠svn.reactos.org 22 Oct '08

22 Oct '08

Author: cgutman Date: Tue Oct 21 20:31:00 2008 New Revision: 36885 URL: http://svn.reactos.org/svn/reactos?rev=36885&view=rev Log: - Merge aicom-network-fixes up to r36884 Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Tue Oct 21 20:31:00 2008 @@ -50,7 +50,7 @@ TI_DbgPrint(DEBUG_IRP, ("Leaving (IRP was already cancelled).\n")); - return IRPFinish(Irp, STATUS_CANCELLED); + return Irp->IoStatus.Status; } VOID DispDataRequestComplete( @@ -384,16 +384,20 @@ /* Get associated connection endpoint file object. Quit if none exists */ + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; if (!Connection) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Parameters = (PTDI_REQUEST_KERNEL)&IrpSp->Parameters; @@ -404,6 +408,14 @@ Parameters->ReturnConnectionInformation, DispDataRequestComplete, Irp ); + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, 0); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("TCP Connect returned %08x\n", Status)); @@ -523,18 +535,22 @@ /* Get associated connection endpoint file object. Quit if none exists */ + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; if (Connection == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Parameters = (PTDI_REQUEST_KERNEL)&IrpSp->Parameters; @@ -587,6 +603,14 @@ DispDataRequestComplete, Irp ); } + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, 0); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MID_TRACE,("Leaving %x\n", Status)); @@ -738,17 +762,21 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&(IrpSp->Parameters); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } if (TranContext->Handle.ConnectionContext == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } /* Initialize a receive request */ @@ -760,9 +788,6 @@ TI_DbgPrint(MID_TRACE,("TCPIP<<< Got an MDL: %x\n", Irp->MdlAddress)); if (NT_SUCCESS(Status)) { - /* Lock here so we're sure we've got the following 'mark pending' */ - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - Status = TCPReceiveData( TranContext->Handle.ConnectionContext, (PNDIS_BUFFER)Irp->MdlAddress, @@ -771,15 +796,15 @@ ReceiveInfo->ReceiveFlags, DispDataRequestComplete, Irp); - if (Status != STATUS_PENDING) - { - DispDataRequestComplete(Irp, Status, BytesReceived); - } else { - IoMarkIrpPending(Irp); - } - - TcpipRecursiveMutexLeave( &TCPLock ); - } + } + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, BytesReceived); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -809,11 +834,14 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); DgramInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&(IrpSp->Parameters); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_ADDRESS; + Status = STATUS_INVALID_CONNECTION; + goto done; } /* Initialize a receive request */ @@ -846,11 +874,15 @@ (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete, Irp, Irp); - if (Status != STATUS_PENDING) { - DispDataRequestComplete(Irp, Status, BytesReceived); - } else - IoMarkIrpPending(Irp); - } + } + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, BytesReceived); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -879,17 +911,21 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); SendInfo = (PTDI_REQUEST_KERNEL_SEND)&(IrpSp->Parameters); + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; if (TranContext == NULL) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } if (TranContext->Handle.ConnectionContext == NULL) { TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_CONNECTION; + Status = STATUS_INVALID_CONNECTION; + goto done; } Status = DispPrepareIrpForCancel( @@ -914,12 +950,15 @@ SendInfo->SendFlags, DispDataRequestComplete, Irp); - if (Status != STATUS_PENDING) - { - DispDataRequestComplete(Irp, Status, BytesSent); - } else - IoMarkIrpPending( Irp ); - } + } + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, BytesSent); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -947,7 +986,16 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); DgramInfo = (PTDI_REQUEST_KERNEL_SENDDG)&(IrpSp->Parameters); + + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); + TranContext = IrpSp->FileObject->FsContext; + if (TranContext == NULL) + { + TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); + Status = STATUS_INVALID_CONNECTION; + goto done; + } /* Initialize a send request */ Request.Handle.AddressHandle = TranContext->Handle.AddressHandle; @@ -984,12 +1032,15 @@ &Irp->IoStatus.Information); else Status = STATUS_UNSUCCESSFUL; - - if (Status != STATUS_PENDING) { - DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information); - } else - IoMarkIrpPending( Irp ); - } + } + +done: + if (Status != STATUS_PENDING) { + DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information); + } else + IoMarkIrpPending(Irp); + + TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving.\n"));

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