Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[janderwald] 36720: - Implement GetPerAdapterInfo - Fix multiple bugs in EnumNameServers implementation
by janderwald＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: janderwald Date: Sat Oct 11 14:12:14 2008 New Revision: 36720 URL: http://svn.reactos.org/svn/reactos?rev=36720&view=rev Log: - Implement GetPerAdapterInfo - Fix multiple bugs in EnumNameServers implementation Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h trunk/reactos/dll/win32/iphlpapi/registry.c trunk/reactos/dll/win32/iphlpapi/resinfo_reactos.c Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_main.c [iso-8859-1] Sat Oct 11 14:12:14 2008 @@ -50,6 +50,14 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); + +typedef struct _NAME_SERVER_LIST_CONTEXT { + ULONG uSizeAvailable; + ULONG uSizeRequired; + PIP_PER_ADAPTER_INFO pData; + UINT NumServers; + IP_ADDR_STRING *pLastAddr; +} NAME_SERVER_LIST_CONTEXT, *PNAME_SERVER_LIST_CONTEXT; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -1463,13 +1471,77 @@ * DWORD * */ +static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, + PWCHAR Server, + PVOID Data ) +{ + IP_ADDR_STRING *pNext; + PNAME_SERVER_LIST_CONTEXT Context = (PNAME_SERVER_LIST_CONTEXT)Data; + + + if (!Context->NumServers) + { + if (Context->uSizeAvailable >= Context->uSizeRequired) + { + WideCharToMultiByte(CP_ACP, 0, Server, -1, Context->pData->DnsServerList.IpAddress.String, 16, NULL, NULL); + Context->pData->DnsServerList.IpAddress.String[15] = '\0'; + Context->pLastAddr = &Context->pData->DnsServerList; + } + } + else + { + Context->uSizeRequired += sizeof(IP_ADDR_STRING); + if (Context->uSizeAvailable >= Context->uSizeRequired) + { + pNext = ((char*)Context->pLastAddr) + sizeof(IP_ADDR_STRING); + WideCharToMultiByte(CP_ACP, 0, Server, -1, pNext->IpAddress.String, 16, NULL, NULL); + pNext->IpAddress.String[15] = '\0'; + Context->pLastAddr->Next = pNext; + Context->pLastAddr = pNext; + pNext->Next = NULL; + } + } + Context->NumServers++; +} + DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { - TRACE("IfIndex %ld, pPerAdapterInfo %p, pOutBufLen %p\n", IfIndex, - pPerAdapterInfo, pOutBufLen); - FIXME(":stub\n"); - /* marking Win2K+ functions not supported */ - return ERROR_NOT_SUPPORTED; + HKEY hkey; + const char *ifName; + NAME_SERVER_LIST_CONTEXT Context; + WCHAR keyname[200] = L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\"; + + if (!pOutBufLen) + return ERROR_INVALID_PARAMETER; + + ifName = getInterfaceNameByIndex(IfIndex); + if (!ifName) + return ERROR_INVALID_PARAMETER; + + MultiByteToWideChar(CP_ACP, 0, ifName, -1, &keyname[62], sizeof(keyname) - (63 * sizeof(WCHAR))); + HeapFree(GetProcessHeap(), 0, (LPVOID)ifName); + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyname, 0, KEY_READ, &hkey) != ERROR_SUCCESS) + { + return ERROR_NOT_SUPPORTED; + } + Context.NumServers = 0; + Context.uSizeAvailable = *pOutBufLen; + Context.uSizeRequired = sizeof(IP_PER_ADAPTER_INFO); + Context.pData = pPerAdapterInfo; + + if (*pOutBufLen >= sizeof(IP_PER_ADAPTER_INFO)) + ZeroMemory(pPerAdapterInfo, sizeof(IP_PER_ADAPTER_INFO)); + + EnumNameServers(hkey, &keyname[62], &Context, CreateNameServerListEnumNamesFunc); + + if (Context.uSizeRequired > Context.uSizeAvailable) + { + *pOutBufLen = Context.uSizeRequired; + return ERROR_BUFFER_OVERFLOW; + } + + return NOERROR; } Modified: trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/iphlpap… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/iphlpapi_private.h [iso-8859-1] Sat Oct 11 14:12:14 2008 @@ -138,6 +138,11 @@ BOOL isInterface( TDIEntityID *if_maybe ); BOOL hasArp( HANDLE tcpFile, TDIEntityID *arp_maybe ); +typedef VOID (*EnumNameServersFunc)( PWCHAR Interface, + PWCHAR NameServer, + PVOID Data ); +void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ); + #include <w32api.h> /* This is here until we switch to version 2.5 of the mingw headers */ #if (__W32API_MAJOR_VERSION < 2 || __W32API_MINOR_VERSION < 5) Modified: trunk/reactos/dll/win32/iphlpapi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/iphlpapi/registr… ============================================================================== --- trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/iphlpapi/registry.c [iso-8859-1] Sat Oct 11 14:12:14 2008 @@ -73,7 +73,7 @@ &ReturnedSize ) != 0) { return 0; } else { - Name = malloc( ReturnedSize ); + Name = malloc( ReturnedSize); RegQueryValueExW( RegHandle, ValueName, NULL, NULL, (PVOID)Name, &ReturnedSize ); return Name; 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] Sat Oct 11 14:12:14 2008 @@ -82,9 +82,7 @@ ULONG UnicodeSize ); -typedef VOID (*EnumNameServersFunc)( PWCHAR Interface, - PWCHAR NameServer, - PVOID Data ); + typedef VOID (*EnumInterfacesFunc)( HKEY ChildKeyHandle, PWCHAR ChildKeyName, PVOID Data ); @@ -123,7 +121,7 @@ * EnumNameServers */ -static void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, +void EnumNameServers( HANDLE RegHandle, PWCHAR Interface, PVOID Data, EnumNameServersFunc cb ) { PWCHAR NameServerString = QueryRegistryValueString(RegHandle, L"NameServer"); @@ -135,10 +133,10 @@ if (NameServerString[ch] == ',') { if (ch - LastNameStart > 0) { /* Skip empty entries */ PWCHAR NameServer = - malloc(ch - LastNameStart + 1); + malloc(((ch - LastNameStart) + 1) * sizeof(WCHAR)); if (NameServer) { memcpy(NameServer,NameServerString + LastNameStart, - (ch - LastNameStart)); + (ch - LastNameStart) * sizeof(WCHAR)); NameServer[ch - LastNameStart] = 0; cb( Interface, NameServer, Data ); free(NameServer); @@ -174,7 +172,7 @@ CreateNameServerListEnumNamesFuncCount); } -static void CreateNameServerListEnumNamesFunc( PWCHAR Interface, +VOID CreateNameServerListEnumNamesFunc( PWCHAR Interface, PWCHAR Server, PVOID _Data ) { PNAME_SERVER_LIST_PRIVATE Data = (PNAME_SERVER_LIST_PRIVATE)_Data;

1 0

[pschweitzer] 36714: - Added "stub" for internal notification structure - Implemented FsRtlNotifyInitializeSync. It's not complete, not perfect. That's a WIP. See issue #2821 for more details.
by pschweitzer＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: pschweitzer Date: Sat Oct 11 06:29:49 2008 New Revision: 36714 URL: http://svn.reactos.org/svn/reactos?rev=36714&view=rev Log: - Added "stub" for internal notification structure - Implemented FsRtlNotifyInitializeSync. It's not complete, not perfect. That's a WIP. See issue #2821 for more details. Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c Modified: branches/pierre-fsd/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/ntoskrnl/fsrtl/notif… ============================================================================== --- branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ branches/pierre-fsd/ntoskrnl/fsrtl/notify.c [iso-8859-1] Sat Oct 11 06:29:49 2008 @@ -11,6 +11,20 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +typedef struct _INT_NOTIFY_SYNC +{ + ULONG Unknown0; + ULONG Unknown1; + ULONG Unknown2; + USHORT Unknown3; + USHORT Unknown4; + ULONG Unknown5; + LIST_ENTRY Unknown6; + ULONG Unknown7; + ULONG Unknown8; + ULONG Unknown9; +} INT_NOTIFY_SYNC, * PINT_NOTIFY_SYNC; /* PUBLIC FUNCTIONS **********************************************************/ @@ -352,23 +366,38 @@ /*++ * @name FsRtlNotifyInitializeSync - * @unimplemented - * - * FILLME - * - * @param NotifySync - * FILLME - * - * @return None - * - * @remarks None + * @implemented + * + * Allocates the internal structure associated with notifications. + * + * @param NotifySync + * Opaque pointer. It will receive the address of the allocated internal structure. + * + * @return None + * + * @remarks This function raise an exception in case of a failure. * *--*/ VOID NTAPI FsRtlNotifyInitializeSync(IN PNOTIFY_SYNC *NotifySync) { - KEBUGCHECK(0); + PINT_NOTIFY_SYNC IntNotifySync; + + *NotifySync = NULL; + + IntNotifySync = FsRtlAllocatePoolWithTag(NonPagedPool, sizeof(INT_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); + IntNotifySync->Unknown1 = 0; + IntNotifySync->Unknown2 = 0; + IntNotifySync->Unknown5 = 0; + IntNotifySync->Unknown0 = 1; + IntNotifySync->Unknown3 = 1; + IntNotifySync->Unknown4 = 4; + InitializeListHead(&(IntNotifySync->Unknown6)); + IntNotifySync->Unknown8 = 0; + IntNotifySync->Unknown9 = 0; + + *NotifySync = IntNotifySync; } /*++

2 1

[fireball] 36719: - Fix a memory leak in IopUnloadDriver. - Driver object temporary was not marked temporary, thus it wasn't really deleted after reference counter reached 0. Fix this (inspired by bug #3501). See issue #3501 for more details.
by fireball＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: fireball Date: Sat Oct 11 12:39:12 2008 New Revision: 36719 URL: http://svn.reactos.org/svn/reactos?rev=36719&view=rev Log: - Fix a memory leak in IopUnloadDriver. - Driver object temporary was not marked temporary, thus it wasn't really deleted after reference counter reached 0. Fix this (inspired by bug #3501). See issue #3501 for more details. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sat Oct 11 12:39:12 2008 @@ -1010,21 +1010,25 @@ /* * Find the driver object */ - - Status = ObReferenceObjectByName(&ObjectName, 0, 0, 0, IoDriverObjectType, - KernelMode, 0, (PVOID*)&DriverObject); + Status = ObReferenceObjectByName(&ObjectName, + 0, + 0, + 0, + IoDriverObjectType, + KernelMode, + 0, + (PVOID*)&DriverObject); + + /* + * Free the buffer for driver object name + */ + ExFreePool(ObjectName.Buffer); if (!NT_SUCCESS(Status)) { DPRINT1("Can't locate driver object for %wZ\n", &ObjectName); return Status; } - - /* - * Free the buffer for driver object name - */ - - ExFreePool(ObjectName.Buffer); /* * Get path of service... @@ -1097,9 +1101,14 @@ FALSE, NULL); } - /* Unload the driver */ + /* Mark the driver object temporary, so it could be deleted later */ + ObMakeTemporaryObject(DriverObject); + + /* Dereference it 2 times */ ObDereferenceObject(DriverObject); ObDereferenceObject(DriverObject); + + /* Unload the driver */ MmUnloadSystemImage(DriverObject->DriverSection); return STATUS_SUCCESS;

1 0

[fireball] 36718: Daniel Zimmerman <netzimme@aim.com> - Implement MmGetFileNameForAddress (with the good description written previously). Testcased with OllyDbg and Syser (with the patch from bug 3454) when try to attach to a process. See issue #3690 for more details.
by fireball＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: fireball Date: Sat Oct 11 10:16:28 2008 New Revision: 36718 URL: http://svn.reactos.org/svn/reactos?rev=36718&view=rev Log: Daniel Zimmerman <netzimme(a)aim.com> - Implement MmGetFileNameForAddress (with the good description written previously). Testcased with OllyDbg and Syser (with the patch from bug 3454) when try to attach to a process. See issue #3690 for more details. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat Oct 11 10:16:28 2008 @@ -150,18 +150,59 @@ MmGetFileNameForAddress(IN PVOID Address, OUT PUNICODE_STRING ModuleName) { - /* - * FIXME: TODO. - * Filip says to get the MM_AVL_TABLE from EPROCESS, - * then use the MmMarea routines to locate the Marea that - * corresponds to the address. Then make sure it's a section - * view type (MEMORY_AREA_SECTION_VIEW) and use the marea's - * per-type union to get the .u.SectionView.Section pointer to - * the SECTION_OBJECT. Then we can use MmGetFileNameForSection - * to get the full filename. - */ - RtlCreateUnicodeString(ModuleName, L"C:\\ReactOS\\system32\\ntdll.dll"); - return STATUS_SUCCESS; + PROS_SECTION_OBJECT Section; + PMEMORY_AREA MemoryArea; + PMM_AVL_TABLE AddressSpace; + POBJECT_NAME_INFORMATION ModuleNameInformation; + NTSTATUS Status = STATUS_ADDRESS_NOT_ASSOCIATED; + + /* Get the MM_AVL_TABLE from EPROCESS */ + if (Address >= MmSystemRangeStart) + { + AddressSpace = MmGetKernelAddressSpace(); + } + else + { + AddressSpace = &PsGetCurrentProcess()->VadRoot; + } + + /* Lock address space */ + MmLockAddressSpace(AddressSpace); + + /* Locate the memory area for the process by address */ + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, Address); + + /* Make sure it's a section view type */ + if ((MemoryArea != NULL) && (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW)) + { + /* Get the section pointer to the SECTION_OBJECT */ + Section = MemoryArea->Data.SectionData.Section; + + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + + /* Get the filename of the section */ + Status = MmGetFileNameForSection(Section,&ModuleNameInformation); + + if (NT_SUCCESS(Status)) + { + /* Init modulename */ + RtlCreateUnicodeString(ModuleName, + ModuleNameInformation->Name.Buffer); + + /* Free temp taged buffer from MmGetFileNameForSection() */ + ExFreePoolWithTag(ModuleNameInformation, TAG('M', 'm', ' ', ' ')); + DPRINT("Found ModuleName %S by address %p\n", + ModuleName->Buffer,Address); + } + } + else + { + /* Unlock address space */ + MmUnlockAddressSpace(AddressSpace); + } + + return Status; } /* Note: Mmsp prefix denotes "Memory Manager Section Private". */

1 0

[cfinck] 36717: Remove unneeded LOWER/strtolower calls. The fields are already declared as utf8_unicode_ci, so MySQL automatically compares case-insensitive by default.
by cfinck＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: cfinck Date: Sat Oct 11 09:28:31 2008 New Revision: 36717 URL: http://svn.reactos.org/svn/reactos?rev=36717&view=rev Log: Remove unneeded LOWER/strtolower calls. The fields are already declared as utf8_unicode_ci, so MySQL automatically compares case-insensitive by default. Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_register.php Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_register.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] Sat Oct 11 09:28:31 2008 @@ -61,7 +61,7 @@ // check if another account with the same username already exists $sql_exist_name = "SELECT user_name FROM users - WHERE REPLACE(user_name, '_', ' ') = LOWER(REPLACE('" . mysql_real_escape_string($_POST['username'])."', '_', ' ')) + WHERE REPLACE(user_name, '_', ' ') = REPLACE('" . mysql_real_escape_string($_POST['username'])."', '_', ' ') LIMIT 1;"; $query_exist_name = mysql_query($sql_exist_name); $result_exist_name = mysql_fetch_array($query_exist_name); @@ -73,7 +73,7 @@ // check if the username is equal to a protected name $sql_unsafe_name = "SELECT unsafe_name FROM user_unsafenames - WHERE unsafe_name = '".mysql_real_escape_string(strtolower($_POST['username']))."' + WHERE unsafe_name = '".mysql_real_escape_string($_POST['username'])."' LIMIT 1;"; $query_unsafe_name = mysql_query($sql_unsafe_name); $result_unsafe_name = mysql_fetch_array($query_unsafe_name);

1 0

[cfinck] 36716: The Wiki treats underscores and spaces in usernames as the same thing, so it can come to collisions if we have two usernames only differing in these aspects. Since we have lots of usernames with spaces and underscores nowadays, this is a compromise: - Check if a username only differing in underscores vs. spaces already exists before registering a similar username - Make sure the Wiki database only contains usernames with spaces
by cfinck＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: cfinck Date: Sat Oct 11 09:09:38 2008 New Revision: 36716 URL: http://svn.reactos.org/svn/reactos?rev=36716&view=rev Log: The Wiki treats underscores and spaces in usernames as the same thing, so it can come to collisions if we have two usernames only differing in these aspects. Since we have lots of usernames with spaces and underscores nowadays, this is a compromise: - Check if a username only differing in underscores vs. spaces already exists before registering a similar username - Make sure the Wiki database only contains usernames with spaces Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_wiki.php trunk/web/reactos.org/htdocs/roscms/logon/user_register.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_wiki.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_wiki.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_wiki.php [iso-8859-1] Sat Oct 11 09:09:38 2008 @@ -49,7 +49,7 @@ " WHERE m.map_roscms_userid = u.user_id " . " AND m.map_subsys_name = 'wiki' " . " AND p.user_id = m.map_subsys_userid " . - " AND (u.user_name != p.user_name OR " . + " AND (REPLACE(u.user_name, '_', ' ') != p.user_name OR " . " u.user_email != p.user_email OR " . " u.user_fullname != p.user_real_name) "; $query_set = mysql_query($query) or die("DB error (subsys_wiki #1)"); @@ -115,12 +115,13 @@ $roscms_user_fullname, $wiki_user_id) { + $wiki_sql_user_name = mysql_real_escape_string(str_replace("_", " ", $roscms_user_name)); + /* Make sure that the email address and/or user name are not already in use in wiki */ $query = "SELECT COUNT(*) AS inuse " . " FROM " . SUBSYS_WIKI_DBNAME . ".user " . - " WHERE (LOWER(user_name) = LOWER('" . - mysql_real_escape_string($roscms_user_name) . "') OR " . + " WHERE (LOWER(user_name) = LOWER('" . $wiki_sql_user_name . "') OR " . " LOWER(user_email) = LOWER('" . mysql_real_escape_string($roscms_user_email) . "')) " . " AND user_id <> $wiki_user_id "; @@ -137,7 +138,7 @@ /* Now, make sure that info in wiki matches info in roscms */ $query = "UPDATE " . SUBSYS_WIKI_DBNAME . ".user " . " SET user_name = '" . - mysql_real_escape_string($roscms_user_name) . "', " . + $wiki_sql_user_name . "', " . " user_email = '" . mysql_real_escape_string($roscms_user_email) . "', " . " user_real_name = '" . @@ -153,53 +154,17 @@ $roscms_user_email, $roscms_user_fullname) { - $default_options = "quickbar=1\n" . - "underline=1\n" . - "hover=1\n" . - "cols=80\n" . - "rows=25\n" . - "searchlimit=20\n" . - "contextlines=5\n" . - "contextchars=50\n" . - "skin=roscms\n" . - "math=1\n" . - "rcdays=7\n" . - "rclimit=50\n" . - "highlightbroken=1\n" . - "stubthreshold=0\n" . - "previewontop=1\n" . - "editsection=1\n" . - "editsectiononrightclick=0\n" . - "showtoc=1\n" . - "showtoolbar=1\n" . - "date=0\n" . - "searchNs-1=0\n" . - "searchNs0=1\n" . - "searchNs1=0\n" . - "searchNs2=0\n" . - "searchNs3=0\n" . - "searchNs4=0\n" . - "searchNs5=0\n" . - "searchNs6=0\n" . - "searchNs7=0\n" . - "searchNs8=0\n" . - "searchNs9=1\n" . - "searchNs10=0\n" . - "searchNs11=1\n" . - "rememberpassword=0\n"; - $query = "INSERT INTO " . SUBSYS_WIKI_DBNAME . ".user " . " (user_name, user_real_name, user_password, " . " user_newpassword, user_email, user_options, " . - " user_touched, user_token)" . - "VALUES ('" . mysql_real_escape_string($roscms_user_name) . "', " . + " user_touched)" . + "VALUES (REPLACE('" . mysql_real_escape_string($roscms_user_name) . "', '_', ' '), " . " '" . mysql_real_escape_string($roscms_user_fullname) . "', " . - " '*', " . - " '*', " . + " '', " . + " '', " . " '" . mysql_real_escape_string($roscms_user_email) . "', " . - " '$default_options', " . - " DATE_FORMAT(NOW(), '%Y%m%d%H%i%s'), " . - " '********************************')"; + " '', " . + " DATE_FORMAT(NOW(), '%Y%m%d%H%i%s'));"; mysql_query($query) or die("DB error (subsys_wiki #10)"); /* Finally, insert a row in the mapping table */ @@ -238,8 +203,8 @@ /* That failed. Let's try to match on user name then */ $query = "SELECT user_id " . " FROM " . SUBSYS_WIKI_DBNAME . ".user " . - " WHERE LOWER(user_name) = LOWER('" . - mysql_real_escape_string($roscms_user_name) . "')"; + " WHERE LOWER(user_name) = LOWER(REPLACE('" . + mysql_real_escape_string($roscms_user_name) . "', '_', ' '))"; $wiki_name_set = mysql_query($query) or die("DB error (subsys_wiki #6)"); if ($wiki_name_row = mysql_fetch_array($wiki_name_set)) @@ -362,7 +327,7 @@ " WHERE m.map_roscms_userid = u.user_id " . " AND m.map_subsys_name = 'wiki' " . " AND w.user_id = m.map_subsys_userid " . - " AND (u.user_name != w.user_name OR " . + " AND (REPLACE(u.user_name, '_', ' ') != w.user_name OR " . " u.user_email != w.user_email OR " . " u.user_fullname != w.user_real_name) "; $query_set = mysql_query($query) or die("DB error (subsys_wiki #12)"); Modified: trunk/web/reactos.org/htdocs/roscms/logon/user_register.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/logo… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/logon/user_register.php [iso-8859-1] Sat Oct 11 09:09:38 2008 @@ -59,9 +59,9 @@ <?php if (isset($_POST['registerpost']) && $_POST['username'] != "" && strlen($_POST['username']) >= $rdf_register_user_name_min) { // check if another account with the same username already exists - $sql_exist_name = "SELECT user_name + $sql_exist_name = "SELECT user_name FROM users - WHERE user_name = '".mysql_real_escape_string(strtolower($_POST['username']))."' + WHERE REPLACE(user_name, '_', ' ') = LOWER(REPLACE('" . mysql_real_escape_string($_POST['username'])."', '_', ' ')) LIMIT 1;"; $query_exist_name = mysql_query($sql_exist_name); $result_exist_name = mysql_fetch_array($query_exist_name);

1 0

[janderwald] 36715: - Replace IDOK with IDC_OK as this creates problems - Add NULL pointer checks - Misc bugfixes
by janderwald＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: janderwald Date: Sat Oct 11 07:38:03 2008 New Revision: 36715 URL: http://svn.reactos.org/svn/reactos?rev=36715&view=rev Log: - Replace IDOK with IDC_OK as this creates problems - Add NULL pointer checks - Misc bugfixes Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc trunk/reactos/dll/win32/netcfgx/lang/en-US.rc trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc trunk/reactos/dll/win32/netcfgx/lang/pl-PL.rc trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/netcfg_iface.c trunk/reactos/dll/win32/netcfgx/resource.h trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/inetcfgc… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/inetcfgcomp_iface.c [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -7,6 +7,7 @@ LONG ref; NetCfgComponentItem * pItem; INetCfgComponentPropertyUi * pProperty; + INetCfgComponentControl * pNCCC; INetCfg * pNCfg; }INetCfgComponentImpl; @@ -324,8 +325,7 @@ CreateNotificationObject( INetCfgComponentImpl * This, INetCfgComponent * iface, - IUnknown *pUnk, - INetCfgComponentPropertyUi ** pOut) + IUnknown *pUnk) { WCHAR szName[150]; HKEY hKey; @@ -419,7 +419,9 @@ INetCfgComponentPropertyUi_Release(pNCCPU); return hr; } - *pOut = pNCCPU; + This->pProperty = pNCCPU; + This->pNCCC = pNCCC; + return S_OK; } @@ -441,7 +443,7 @@ if (!This->pProperty) { - hr = CreateNotificationObject(This,iface, pUnk, &This->pProperty); + hr = CreateNotificationObject(This,iface, pUnk); if (FAILED(hr)) return hr; if (dwFlags == NCRP_QUERY_PROPERTY_UI) @@ -450,6 +452,7 @@ dwDefPages = 0; Pages = 0; + hr = INetCfgComponentPropertyUi_MergePropPages(This->pProperty, &dwDefPages, (BYTE**)&hppages, &Pages, hwndParent, NULL); if (FAILED(hr) || !Pages) { @@ -464,15 +467,18 @@ pinfo.pszCaption = This->pItem->szDisplayName; iResult = PropertySheetW(&pinfo); + CoTaskMemFree(hppages); if (iResult < 0) { - INetCfgComponentPropertyUi_CancelProperties(This->pProperty); + //FIXME + INetCfgComponentControl_CancelChanges(This->pNCCC); return E_ABORT; } else { - INetCfgComponentPropertyUi_ApplyProperties(This->pProperty); + //FIXME + INetCfgComponentControl_ApplyRegistryChanges(This->pNCCC); return S_OK; } } @@ -522,9 +528,6 @@ INetCfgComponent_Release((INetCfgComponent*)This); return S_OK; - - - return S_OK; } Modified: trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/bg-BG.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -118,7 +118,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -132,7 +132,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -143,7 +143,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -154,7 +154,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -182,7 +182,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -193,7 +193,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/cs-CZ.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -118,7 +118,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -132,7 +132,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -143,7 +143,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -154,7 +154,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -182,7 +182,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -193,7 +193,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/da-DK.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/de-DE.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP-Adresse:", -1, 5, 15, 70, 12 LTEXT "Subnetzmaske:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS-Server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domänensuffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 PUSHBUTTON "Hinzufügen...", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP PUSHBUTTON "Entfernen", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/el-GR.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/en-US.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/es-ES.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/fr-FR.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/hu-HU.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/id-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/id-ID.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/it-IT.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ja-JP.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/nl-NL.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/no-NO.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END 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] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ru-RU.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP àäðåñ:", -1, 5, 15, 70, 12 LTEXT "Ìàñêà ïîäñåòè:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Àâòîìàòè÷åñêàÿ ìåòðèêà", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Ìåòðèêà:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS ñåðâåð:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ CONTROL "", IDC_IP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 211, 62, 72, 75 PUSHBUTTON "Äîáàâèòü", IDC_IP_ADD, 215, 141, 50, 14, WS_TABSTOP PUSHBUTTON "Óäàëèòü", IDC_IP_DEL, 215, 161, 50, 14, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sk-SK.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -118,7 +118,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -132,7 +132,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -143,7 +143,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -154,7 +154,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -182,7 +182,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -193,7 +193,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -117,7 +117,7 @@ LTEXT "IP address:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "",IDC_SUBNETMASK,"SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -131,7 +131,7 @@ CHECKBOX "Automatic metric", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metric:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDOK, 50, 60, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END @@ -142,7 +142,7 @@ BEGIN CONTROL "",IDC_IPADDR,"SysIPAddress32",WS_TABSTOP, 5, 25, 80, 12 LTEXT "DNS server:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -153,7 +153,7 @@ BEGIN EDITTEXT IDC_SUFFIX, 5, 25, 190, 12, WS_TABSTOP LTEXT "Domain suffix:", -1, 5, 10, 120, 12 - PUSHBUTTON "", IDOK, 50, 50, 50, 14, WS_TABSTOP + PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -181,7 +181,7 @@ 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 "OK", IDOK, 150, 190, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 150, 190, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 210, 190, 50, 14, WS_TABSTOP END @@ -192,7 +192,7 @@ BEGIN EDITTEXT IDC_PORT_VAL, 5, 30, 70, 12, WS_TABSTOP | ES_NUMBER LTEXT "", IDC_PORT_DESC, 5, 15, 40, 12 - PUSHBUTTON "OK", IDOK, 120, 15, 50, 14, WS_TABSTOP + PUSHBUTTON "OK", IDC_OK, 120, 15, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/netcfg_iface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfg_i… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfg_iface.c [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -681,7 +681,4 @@ INetCfg_Release((INetCfg*)This); return S_OK; - - - return S_OK; -} +} Modified: trunk/reactos/dll/win32/netcfgx/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/resource… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/resource.h [iso-8859-1] Sat Oct 11 07:38:03 2008 @@ -39,6 +39,7 @@ #define IDC_METRIC 2009 #define IDC_METRICTXT 2010 #define IDC_USEMETRIC 2011 +#define IDC_OK 2012 #define IDC_DNSADDRLIST 3000 #define IDC_DNSADDRUP 3001 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] Sat Oct 11 07:38:03 2008 @@ -179,7 +179,7 @@ EndDialog(hwndDlg, FALSE); break; } - else if (LOWORD(wParam) == IDOK) + else if (LOWORD(wParam) == IDC_OK) { pPort = (TcpipPortSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER); Num = GetDlgItemInt(hwndDlg, IDC_PORT_VAL, NULL, TRUE); @@ -225,7 +225,7 @@ LPWSTR pCur; INT iItem; - if (!_wtoi(pData)) + if (!pData || !_wtoi(pData)) { SendDlgItemMessageW(hwndDlg, AllowButton, BM_SETCHECK, BST_CHECKED, 0); EnableWindow(GetDlgItem(hwndDlg, AddButton), FALSE); @@ -453,15 +453,18 @@ } switch(LOWORD(wParam)) { - case IDOK: + case IDC_OK: pContext = (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER); pFilter = StoreTcpipFilterSettings(hwndDlg); if (pFilter) { - CoTaskMemFree(pContext->pCurrentConfig->pFilter->szTCPAllowedPorts); - CoTaskMemFree(pContext->pCurrentConfig->pFilter->szUDPAllowedPorts); - CoTaskMemFree(pContext->pCurrentConfig->pFilter->szRawIPAllowedProtocols); - CoTaskMemFree(pContext->pCurrentConfig->pFilter); + if (pContext->pCurrentConfig->pFilter) + { + CoTaskMemFree(pContext->pCurrentConfig->pFilter->szTCPAllowedPorts); + CoTaskMemFree(pContext->pCurrentConfig->pFilter->szUDPAllowedPorts); + CoTaskMemFree(pContext->pCurrentConfig->pFilter->szRawIPAllowedProtocols); + CoTaskMemFree(pContext->pCurrentConfig->pFilter); + } pContext->pCurrentConfig->pFilter = pFilter; } EndDialog(hwndDlg, (INT_PTR)TRUE); @@ -722,9 +725,9 @@ if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); - } - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); + } + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE); SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0); } else @@ -732,7 +735,7 @@ if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); } SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pGwSettings->szIP); if (pGwSettings->Metric) @@ -774,7 +777,7 @@ EndDialog(hwndDlg, FALSE); break; } - else if (LOWORD(wParam) == IDOK) + else if (LOWORD(wParam) == IDC_OK) { if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4) { @@ -813,7 +816,7 @@ if (lpnmipa->hdr.idFrom == IDC_IPADDR) { if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4) - EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE); } } break; @@ -885,16 +888,16 @@ if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); - } - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); + } + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE); } else { if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); } SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pIpSettings->szIP); SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, WM_SETTEXT, 0, (LPARAM)pIpSettings->szMask); @@ -914,13 +917,13 @@ SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)MAKEIPADDRESS(255, 255, 0, 0)); else if (dwIpAddr <= MAKEIPADDRESS(223, 255, 255, 255)) SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)MAKEIPADDRESS(255, 255, 255, 0)); - EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE); } } } break; case WM_COMMAND: - if (LOWORD(wParam) == IDOK) + if (LOWORD(wParam) == IDC_OK) { pIpSettings = (TcpipIpSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_GETTEXT, 16, (LPARAM)pIpSettings->szIP); @@ -990,7 +993,7 @@ if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); } CoTaskMemFree(pSettings->Suffix); pSettings->Suffix = NULL; @@ -1000,7 +1003,7 @@ if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); } } SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pSettings); @@ -1011,7 +1014,7 @@ EndDialog(hwndDlg, FALSE); break; } - else if (LOWORD(wParam) == IDOK) + else if (LOWORD(wParam) == IDC_OK) { lLength = SendDlgItemMessageW(hwndDlg, IDC_SUFFIX, WM_GETTEXTLENGTH, 0, 0); if (lLength) @@ -1463,19 +1466,19 @@ if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); } SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pSettings->szIP); - EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE); } else { if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) { szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDOK, WM_SETTEXT, 0, (LPARAM)szBuffer); - } - EnableWindow(GetDlgItem(hwndDlg, IDOK), FALSE); + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); + } + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), FALSE); } return TRUE; case WM_COMMAND: @@ -1484,7 +1487,7 @@ EndDialog(hwndDlg, FALSE); break; } - else if (LOWORD(wParam) == IDOK) + else if (LOWORD(wParam) == IDC_OK) { pSettings = (TcpipDnsSettings*)GetWindowLongPtr(hwndDlg, DWLP_USER); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_GETTEXT, 16, (LPARAM)pSettings->szIP); @@ -1511,7 +1514,7 @@ if (lpnmipa->hdr.idFrom == IDC_IPADDR) { if (SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_GETADDRESS, 0, (LPARAM)&dwIpAddr) == 4) - EnableWindow(GetDlgItem(hwndDlg, IDOK), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_OK), TRUE); } } break; @@ -1544,7 +1547,8 @@ } SendDlgItemMessageW(hwndDlg, IDC_DNSADDRLIST, LB_SETCURSEL, 0, 0); - + if (!This->pCurrentConfig->pDNS) + return; if (This->pCurrentConfig->pDNS->RegisterAdapterName) SendDlgItemMessageW(hwndDlg, IDC_REGSUFFIX, BM_SETCHECK, BST_CHECKED, 0); @@ -1563,6 +1567,8 @@ if (!This->pCurrentConfig->pDNS->szSearchList || (wcslen(This->pCurrentConfig->pDNS->szSearchList) == 0)) { SendDlgItemMessageW(hwndDlg, IDC_PRIMSUFFIX, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_DNSSUFFIXADD), FALSE); + return; } @@ -2044,11 +2050,17 @@ { PROPSHEETHEADERW pinfo; HPROPSHEETPAGE hppages[3]; - + WCHAR szBuffer[100]; hppages[0] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVIP_DLG), TcpipAdvancedIpDlg, (LPARAM)This, NULL); hppages[1] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVDNS_DLG), TcpipAdvancedDnsDlg, (LPARAM)This, NULL); hppages[2] = InitializePropertySheetPage(MAKEINTRESOURCEW(IDD_TCPIP_ADVOPT_DLG), TcpipAdvancedOptDlg, (LPARAM)This, NULL); + + + if (LoadStringW(netcfgx_hInstance, IDS_TCPIP, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; + else + szBuffer[0] = L'\0'; ZeroMemory(&pinfo, sizeof(PROPSHEETHEADERW)); pinfo.dwSize = sizeof(PROPSHEETHEADERW); @@ -2056,6 +2068,7 @@ pinfo.u3.phpage = hppages; pinfo.nPages = 3; pinfo.hwndParent = hDlg; + pinfo.pszCaption = szBuffer; StoreTcpipBasicSettings(hwndDlg, This, FALSE); PropertySheetW(&pinfo); @@ -2303,9 +2316,9 @@ } else { + SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0); if (pCurSettings->Ns) { - SendDlgItemMessageW(hwndDlg, IDC_FIXEDDNS, BM_SETCHECK, BST_CHECKED, 0); SendDlgItemMessageW(hwndDlg, IDC_DNS1, IPM_SETADDRESS, 0, (LPARAM)pCurSettings->Ns->IpAddress); if (pCurSettings->Ns->Next) { @@ -2488,6 +2501,7 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_DNS1), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_DNS2), TRUE); } + break; case IDC_ADVANCED: LaunchAdvancedTcpipSettings(GetParent(hwndDlg), hwndDlg, (TcpipConfNotifyImpl*)GetWindowLongPtr(hwndDlg, DWLP_USER)); break; @@ -2603,7 +2617,6 @@ return S_OK; } -static HRESULT LoadDNSSettings( TcpipConfNotifyImpl * This) @@ -2659,7 +2672,6 @@ return S_OK; } -static LPWSTR LoadTcpFilterSettingsFromRegistry(HKEY hKey, LPCWSTR szName, LPDWORD Size) { @@ -2682,7 +2694,6 @@ return pData; } -static HRESULT LoadFilterSettings( TcpipConfNotifyImpl * This) @@ -2719,8 +2730,9 @@ swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pStr); CoTaskMemFree(pStr); if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_READ, &hKey) != ERROR_SUCCESS) - return E_FAIL; - + { + return S_OK; + } pFilter->szTCPAllowedPorts = LoadTcpFilterSettingsFromRegistry(hKey, L"TCPAllowedPorts", &pFilter->TCPSize); pFilter->szUDPAllowedPorts = LoadTcpFilterSettingsFromRegistry(hKey, L"UDPAllowedPorts", &pFilter->UDPSize); pFilter->szRawIPAllowedProtocols = LoadTcpFilterSettingsFromRegistry(hKey, L"RawIPAllowedProtocols", &pFilter->IPSize); @@ -2796,33 +2808,17 @@ return E_FAIL; } - if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) != ERROR_BUFFER_OVERFLOW) - return E_FAIL; - - pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength); - if (!pPerInfo) - { - CoTaskMemFree(pInfo); - return E_OUTOFMEMORY; - } - - if (GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength) != NOERROR) - { - CoTaskMemFree(pInfo); - CoTaskMemFree(pPerInfo); - return E_FAIL; - } - pCurSettings = CoTaskMemAlloc(sizeof(TcpipSettings)); if (!pCurSettings) { CoTaskMemFree(pInfo); - CoTaskMemFree(pPerInfo); return E_FAIL; } ZeroMemory(pCurSettings, sizeof(TcpipSettings)); This->pCurrentConfig = pCurSettings; + pCurSettings->DhcpEnabled = pCurrentAdapter->DhcpEnabled; + pCurSettings->Index = pCurrentAdapter->Index; if (!pCurrentAdapter->DhcpEnabled) { @@ -2830,14 +2826,23 @@ CopyIpAddrString(&pCurrentAdapter->GatewayList, &pCurSettings->Gw, METRIC, NULL); //FIXME } - if (!pPerInfo->AutoconfigActive) - { - CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns, IPADDR, NULL); - } - - pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive; - pCurSettings->DhcpEnabled = pCurrentAdapter->DhcpEnabled; - pCurSettings->Index = pCurrentAdapter->Index; + if (GetPerAdapterInfo(pCurrentAdapter->Index, NULL, &uLength) == ERROR_BUFFER_OVERFLOW) + { + pPerInfo = (PIP_PER_ADAPTER_INFO)CoTaskMemAlloc(uLength); + if (pPerInfo) + { + if (GetPerAdapterInfo(pCurrentAdapter->Index, pPerInfo, &uLength) == NOERROR) + { + if (!pPerInfo->AutoconfigActive) + { + CopyIpAddrString(&pPerInfo->DnsServerList, &pCurSettings->Ns, IPADDR, NULL); + } + pCurSettings->AutoconfigActive = pPerInfo->AutoconfigActive; + } + CoTaskMemFree(pInfo); + } + } + if (FAILED(LoadFilterSettings(This))) return E_FAIL; @@ -2846,7 +2851,6 @@ return E_FAIL; CoTaskMemFree(pInfo); - CoTaskMemFree(pPerInfo); return S_OK; } @@ -3088,15 +3092,19 @@ //MessageBoxW(NULL, L"INetCfgComponentControl_fnApplyRegistryChanges", NULL, MB_OK); - if (RegOpenKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->UseDomainNameDevolution, sizeof(DWORD)); - RegSetValueExW(hKey, L"SearchList", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szSearchList, + if (RegCreateKeyExW(hKey, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters", 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + if (This->pCurrentConfig->pDNS) + { + RegSetValueExW(hKey, L"UseDomainNameDevolution", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->UseDomainNameDevolution, sizeof(DWORD)); + RegSetValueExW(hKey, L"SearchList", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szSearchList, (wcslen(This->pCurrentConfig->pDNS->szSearchList)+1) * sizeof(WCHAR)); - - RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, + } + if (This->pCurrentConfig->pFilter) + { + RegSetValueExW(hKey, L"EnableSecurityFilters", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pFilter->EnableSecurityFilters, sizeof(DWORD)); - + } RegCloseKey(hKey); } @@ -3106,24 +3114,30 @@ swprintf(szBuffer, L"SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters\\Interfaces\\%s", pStr); CoTaskMemFree(pStr); - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, KEY_WRITE, &hKey) == ERROR_SUCCESS) - { - RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD)); - RegSetValueExW(hKey, L"RegistrationEnabled", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, sizeof(DWORD)); - RegSetValueExW(hKey, L"Domain", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szDomain, + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, szBuffer, 0, NULL, 0, KEY_WRITE, NULL, &hKey, NULL) == ERROR_SUCCESS) + { + if (This->pCurrentConfig->pDNS) + { + RegSetValueExW(hKey, L"RegisterAdapterName", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegisterAdapterName, sizeof(DWORD)); + RegSetValueExW(hKey, L"RegistrationEnabled", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->pDNS->RegistrationEnabled, sizeof(DWORD)); + RegSetValueExW(hKey, L"Domain", 0, REG_SZ, (LPBYTE)This->pCurrentConfig->pDNS->szDomain, (wcslen(This->pCurrentConfig->pDNS->szDomain)+1) * sizeof(WCHAR)); - - RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, + } + + if (This->pCurrentConfig->pFilter) + { + RegSetValueExW(hKey, L"TCPAllowedPorts", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szTCPAllowedPorts, This->pCurrentConfig->pFilter->TCPSize); - RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, + RegSetValueExW(hKey, L"UDPAllowedPorts", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szUDPAllowedPorts, This->pCurrentConfig->pFilter->UDPSize); - RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, + RegSetValueExW(hKey, L"RawIPAllowedProtocols", 0, REG_MULTI_SZ, (LPBYTE)This->pCurrentConfig->pFilter->szRawIPAllowedProtocols, This->pCurrentConfig->pFilter->IPSize); + } RegSetValueExW(hKey, L"EnableDHCP", 0, REG_DWORD, (LPBYTE)&This->pCurrentConfig->DhcpEnabled, sizeof(DWORD)); if (This->pCurrentConfig->DhcpEnabled)

1 0

[sginsberg] 36713: - ProbeForRead/Write Length argument is a SIZE_T, not a ULONG
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:42:44 2008 New Revision: 36713 URL: http://svn.reactos.org/svn/reactos?rev=36713&view=rev Log: - ProbeForRead/Write Length argument is a SIZE_T, not a ULONG Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ex/exintrin.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Oct 11 04:42:44 2008 @@ -7655,7 +7655,7 @@ NTAPI ProbeForRead( IN CONST VOID *Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment); NTKERNELAPI @@ -7663,7 +7663,7 @@ NTAPI ProbeForWrite( IN PVOID Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment); Modified: trunk/reactos/ntoskrnl/ex/exintrin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/exintrin.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/exintrin.c [iso-8859-1] Sat Oct 11 04:42:44 2008 @@ -100,7 +100,7 @@ VOID NTAPI ProbeForRead(IN CONST VOID *Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment) { PAGED_CODE(); @@ -136,7 +136,7 @@ VOID NTAPI ProbeForWrite(IN PVOID Address, - IN ULONG Length, + IN SIZE_T Length, IN ULONG Alignment) { ULONG_PTR Last, Current = (ULONG_PTR)Address;

1 0

[sginsberg] 36712: - Fix portable Ex/ExfInterlockedCompareExchange64 to compare Destination with the Comparand instead of...itself?
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:39:08 2008 New Revision: 36712 URL: http://svn.reactos.org/svn/reactos?rev=36712&view=rev Log: - Fix portable Ex/ExfInterlockedCompareExchange64 to compare Destination with the Comparand instead of...itself? Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c Modified: trunk/reactos/ntoskrnl/ex/fastinterlck.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/fastinterlck.c… ============================================================================== --- trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/fastinterlck.c [iso-8859-1] Sat Oct 11 04:39:08 2008 @@ -105,12 +105,12 @@ FASTCALL ExfInterlockedCompareExchange64(IN OUT LONGLONG volatile *Destination, IN PLONGLONG Exchange, - IN PLONGLONG Comperand) + IN PLONGLONG Comparand) { LONGLONG Result; Result = *Destination; - if (*Destination == Result) *Destination = *Exchange; + if (*Destination == *Comparand) *Destination = *Exchange; return Result; } @@ -306,7 +306,7 @@ KeAcquireSpinLock(Lock, &OldIrql); Result = *Destination; - if (*Destination == Result) *Destination = *Exchange; + if (*Destination == *Comparand) *Destination = *Exchange; KeReleaseSpinLock(Lock, OldIrql); return Result; }

1 0

[sginsberg] 36711: - ARM build fix -- add a non-atomic (but otherwise correct) _InterlockedCompareExchange64 intrinsic required since the RTL changes in 36166
by sginsberg＠svn.reactos.org 11 Oct '08

11 Oct '08

Author: sginsberg Date: Sat Oct 11 04:32:57 2008 New Revision: 36711 URL: http://svn.reactos.org/svn/reactos?rev=36711&view=rev Log: - ARM build fix -- add a non-atomic (but otherwise correct) _InterlockedCompareExchange64 intrinsic required since the RTL changes in 36166 Modified: trunk/reactos/include/psdk/intrin_arm.h Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/intrin_arm.h [iso-8859-1] Sat Oct 11 04:32:57 2008 @@ -54,6 +54,17 @@ return a; } +static __inline__ __attribute__((always_inline)) long long _InterlockedCompareExchange64(volatile long long * const dest, const long long exch, const long long comp) +{ + // + // FIXME + // + long long result; + result = *dest; + if (*dest == comp) *dest = exch; + return result; +} + static __inline__ __attribute__((always_inline)) void * _InterlockedCompareExchangePointer(void * volatile * const Destination, void * const Exchange, void * const Comperand) { return (void*)_InterlockedCompareExchange((volatile long* const)Destination, (const long)Exchange, (const long)Comperand);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008