Ros-diffs July 2015

ros-diffs@reactos.org

13 participants
257 discussions

[ekohl] 68394: [NETCFGX] - Initialize the 'IP Address' and 'Gateway Address' edit dialogs properly. - OK pushbuttons are default pushbuttons.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 12 21:49:10 2015 New Revision: 68394 URL: http://svn.reactos.org/svn/reactos?rev=68394&view=rev Log: [NETCFGX] - Initialize the 'IP Address' and 'Gateway Address' edit dialogs properly. - OK pushbuttons are default pushbuttons. Modified: 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/he-IL.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/ro-RO.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/sq-AL.rc trunk/reactos/dll/win32/netcfgx/lang/sv-SE.rc trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc trunk/reactos/dll/win32/netcfgx/lang/uk-UA.rc trunk/reactos/dll/win32/netcfgx/lang/zh-CN.rc trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐ½Ð¸ Ð¼ÐµÑÐ½Ð¸ ÐµÐ´Ð¸Ð½Ð¸ÑÐ¸", 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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -122,7 +122,7 @@ LTEXT "IP adresa:", -1, 5, 15, 70, 12 LTEXT "Maska podsÃtÄ:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "OK", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Storno", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -136,7 +136,7 @@ CHECKBOX "AutomatickÃ¡ metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Storno", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "Automatische Metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Abbrechen", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,7 @@ LTEXT "DirecciÃ³n IP:", -1, 5, 15, 70, 12 LTEXT "MÃ¡scara de subred:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "MÃ©trica automÃ¡tica", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&MÃ©trica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancelar", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,7 @@ LTEXT "Adresse IP:", -1, 5, 15, 70, 12 LTEXT "Masque de sous-rÃ©seau:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "MÃ©trique automatique", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "MÃ©trique :", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "Ajouter", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/he-IL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "×××××", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "×××××", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,7 @@ LTEXT "Indirizzo IP:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "Metriche automatiche", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrica:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Annulla", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,7 @@ LTEXT "IP adresse:", -1, 5, 15, 70, 12 LTEXT "Subnet maske:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "Automatisk metrisk", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrisk:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Avbryt", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -123,7 +123,7 @@ LTEXT "Adres IP:", -1, 5, 15, 70, 12 LTEXT "Maska podsieci:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -137,7 +137,7 @@ CHECKBOX "Metryka automatyczna", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metryka:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Anuluj", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/ro-RO.rc [iso-8859-1] Sun Jul 12 21:49:10 2015 @@ -123,7 +123,7 @@ LTEXT "AdresÄ &IP:", -1, 5, 15, 70, 12 LTEXT "MascÄ de &subreÈea:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -137,7 +137,7 @@ CHECKBOX "MetricÄ stabilitÄ a&utomat", 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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "A&nuleazÄ", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,7 @@ LTEXT "Adresa IP:", -1, 5, 15, 70, 12 LTEXT "Maska podsiete:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,7 @@ CHECKBOX "AutomatickÃ¡ metrika", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrika:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/sq-AL.rc [iso-8859-1] Sun Jul 12 21:49:10 2015 @@ -121,7 +121,7 @@ LTEXT "Adresa IP:", -1, 5, 15, 70, 12 LTEXT "Subnet mask:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Anulo", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -135,7 +135,7 @@ CHECKBOX "Automatik metrik", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&Metrik:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Anulo", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Cancel", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc [iso-8859-1] Sun Jul 12 21:49:10 2015 @@ -118,7 +118,7 @@ LTEXT "IP Adresi:", -1, 5, 15, 70, 12 LTEXT "Alt AÄ Maskesi:", -1, 5, 30, 70, 12 CONTROL "", IDC_SUBNETMASK, "SysIPAddress32", WS_TABSTOP, 100, 30, 80, 12 - PUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Ä°ptal", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -132,7 +132,7 @@ CHECKBOX "KendiliÄinden ÃlÃ§Ã¼", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "&ÃlÃ§Ã¼:", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Ä°ptal", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -116,7 +116,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 "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -130,7 +130,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 "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 110, 60, 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] Sun Jul 12 21:49:10 2015 @@ -124,7 +124,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 "ç¡®å®", IDC_OK, 50, 50, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", IDC_OK, 50, 50, 50, 14, WS_TABSTOP PUSHBUTTON "åæ¶", IDCANCEL, 110, 50, 50, 14, WS_TABSTOP END @@ -138,7 +138,7 @@ CHECKBOX "èªå¨è·ç¹è®¡æ°", IDC_USEMETRIC, 15, 30, 190, 12, BS_AUTOCHECKBOX | WS_TABSTOP LTEXT "å¬å¶(&M):", IDC_METRICTXT, 5, 45, 45, 12, WS_DISABLED EDITTEXT IDC_METRIC, 100, 45, 50, 12, WS_TABSTOP | ES_NUMBER | WS_DISABLED - PUSHBUTTON "ç¡®å®", IDC_OK, 50, 60, 50, 14, WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", IDC_OK, 50, 60, 50, 14, WS_TABSTOP PUSHBUTTON "åæ¶", IDCANCEL, 110, 60, 50, 14, WS_TABSTOP END 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] Sun Jul 12 21:49:10 2015 @@ -123,6 +123,7 @@ VOID InsertColumnToListView(HWND hDlgCtrl, UINT ResId, UINT SubItem, UINT Size); INT_PTR StoreTcpipBasicSettings(HWND hwndDlg, TcpipConfNotifyImpl * This, BOOL bApply); HRESULT Initialize(TcpipConfNotifyImpl * This); +UINT GetIpAddressFromStringW(WCHAR *szBuffer); VOID DisplayError(UINT ResTxt, UINT ResTitle, UINT Type) @@ -755,41 +756,46 @@ case WM_INITDIALOG: pGwSettings = (TcpipGwSettings *)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)lParam); - if (pGwSettings->bAdd) - { - if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - 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 - { - if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) - { - szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); - } - SendDlgItemMessageW(hwndDlg, IDC_IPADDR, WM_SETTEXT, 0, (LPARAM)pGwSettings->szIP); - if (pGwSettings->Metric) - { - SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE); - EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE); - } - else - { - SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0); - EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE); - EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE); - } - } + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 0, MAKEIPRANGE(1, 223)); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 1, MAKEIPRANGE(0, 255)); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 2, MAKEIPRANGE(0, 255)); SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETRANGE, 3, MAKEIPRANGE(0, 255)); + + if (pGwSettings->bAdd) + { + if (LoadStringW(netcfgx_hInstance, IDS_ADD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + { + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; + 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 + { + if (LoadStringW(netcfgx_hInstance, IDS_MOD, szBuffer, sizeof(szBuffer)/sizeof(WCHAR))) + { + szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_OK, WM_SETTEXT, 0, (LPARAM)szBuffer); + } + + if (pGwSettings->szIP) + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pGwSettings->szIP)); + + if (pGwSettings->Metric) + { + SetDlgItemInt(hwndDlg, IDC_METRIC, pGwSettings->Metric, FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), TRUE); + EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), TRUE); + } + else + { + SendDlgItemMessageW(hwndDlg, IDC_USEMETRIC, BM_SETCHECK, BST_CHECKED, 0); + EnableWindow(GetDlgItem(hwndDlg, IDC_METRIC), FALSE); + EnableWindow(GetDlgItem(hwndDlg, IDC_METRICTXT), FALSE); + } + } return TRUE; case WM_COMMAND: if (LOWORD(wParam) == IDC_USEMETRIC) @@ -934,8 +940,12 @@ szBuffer[(sizeof(szBuffer)/sizeof(WCHAR))-1] = L'\0'; 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); + + if (pIpSettings->szIP) + SendDlgItemMessageW(hwndDlg, IDC_IPADDR, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pIpSettings->szIP)); + + if (pIpSettings->szMask) + SendDlgItemMessageW(hwndDlg, IDC_SUBNETMASK, IPM_SETADDRESS, 0, (LPARAM)GetIpAddressFromStringW(pIpSettings->szMask)); } return TRUE; case WM_NOTIFY:

9 years, 5 months

[tfaber] 68393: [NTDLL_APITEST] - Add test for SystemKernelDebuggerInformation, showing that it accepts an unaligned info pointer

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 12 17:52:42 2015 New Revision: 68393 URL: http://svn.reactos.org/svn/reactos?rev=68393&view=rev Log: [NTDLL_APITEST] - Add test for SystemKernelDebuggerInformation, showing that it accepts an unaligned info pointer Modified: trunk/rostests/apitests/ntdll/SystemInfo.c Modified: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo… ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Sun Jul 12 17:52:42 2015 @@ -269,6 +269,56 @@ ok(Status == STATUS_SUCCESS, "RtlAdjustPrivilege returned %lx\n", Status); } +static +void +Test_KernelDebugger(void) +{ + NTSTATUS Status; + ULONG ReturnLength; + ULONG Buffer[2]; + PSYSTEM_KERNEL_DEBUGGER_INFORMATION DebuggerInfo = (PVOID)Buffer; + + /* Query */ + ReturnLength = 0x55555555; + Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, NULL, 0, &ReturnLength); + ok(Status == STATUS_INFO_LENGTH_MISMATCH, "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == 0 || + ntv6(ReturnLength == sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)), "ReturnLength = %lu\n", ReturnLength); + + ReturnLength = 0x55555555; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, DebuggerInfo, sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION) - 1, &ReturnLength); + ok(Status == STATUS_INFO_LENGTH_MISMATCH, "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == 0 || + ntv6(ReturnLength == sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)), "ReturnLength = %lu\n", ReturnLength); + ok(Buffer[0] == 0x55555555, "Buffer[0] = %lx\n", Buffer[0]); + ok(Buffer[1] == 0x55555555, "Buffer[1] = %lx\n", Buffer[1]); + + ReturnLength = 0x55555555; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, (PUCHAR)DebuggerInfo + 1, sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION), &ReturnLength); + ok(Status == STATUS_SUCCESS, "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION), "ReturnLength = %lu\n", ReturnLength); + ok((Buffer[0] & 0x55fefe55) == 0x55000055, "Buffer[0] = %lx\n", Buffer[0]); + ok(Buffer[1] == 0x55555555, "Buffer[1] = %lx\n", Buffer[1]); + + ReturnLength = 0x55555555; + RtlFillMemory(Buffer, sizeof(Buffer), 0x55); + Status = NtQuerySystemInformation(SystemKernelDebuggerInformation, DebuggerInfo, sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION), &ReturnLength); + ok(Status == STATUS_SUCCESS, "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION), "ReturnLength = %lu\n", ReturnLength); + ok(DebuggerInfo->KernelDebuggerEnabled == FALSE || + DebuggerInfo->KernelDebuggerEnabled == TRUE, "KernelDebuggerEnabled = %u\n", DebuggerInfo->KernelDebuggerEnabled); + ok(DebuggerInfo->KernelDebuggerNotPresent == FALSE || + DebuggerInfo->KernelDebuggerNotPresent == TRUE, "KernelDebuggerNotPresent = %u\n", DebuggerInfo->KernelDebuggerNotPresent); + + /* Set - not supported */ + DebuggerInfo->KernelDebuggerEnabled = FALSE; + DebuggerInfo->KernelDebuggerNotPresent = TRUE; + Status = NtSetSystemInformation(SystemKernelDebuggerInformation, DebuggerInfo, sizeof(SYSTEM_KERNEL_DEBUGGER_INFORMATION)); + ok(Status == STATUS_INVALID_INFO_CLASS, "NtSetSystemInformation returned %lx\n", Status); +} + START_TEST(NtSystemInformation) { NTSTATUS Status; @@ -309,4 +359,5 @@ Test_Flags(); Test_TimeAdjustment(); + Test_KernelDebugger(); }

9 years, 5 months

[ekohl] 68392: [NETCFGX] Enable the 'Edit...' and 'Remove' buttons on the Advanced IP Settings dialog only if the 'IP addresses' and 'Dafault gateways' lists are not empty.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Jul 12 17:16:35 2015 New Revision: 68392 URL: http://svn.reactos.org/svn/reactos?rev=68392&view=rev Log: [NETCFGX] Enable the 'Edit...' and 'Remove' buttons on the Advanced IP Settings dialog only if the 'IP addresses' and 'Dafault gateways' lists are not empty. Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c trunk/reactos/dll/win32/netcfgx/precomp.h trunk/reactos/dll/win32/netcfgx/tcpipconf_notify.c Modified: trunk/reactos/dll/win32/netcfgx/netcfgx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/netcfgx.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/netcfgx.c [iso-8859-1] Sun Jul 12 17:16:35 2015 @@ -46,6 +46,7 @@ case DLL_PROCESS_ATTACH: netcfgx_hInstance = hinstDLL; DisableThreadLibraryCalls(netcfgx_hInstance); + InitCommonControls(); break; default: break; Modified: trunk/reactos/dll/win32/netcfgx/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/precomp.… ============================================================================== --- trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netcfgx/precomp.h [iso-8859-1] Sun Jul 12 17:16:35 2015 @@ -19,6 +19,7 @@ #include <setupapi.h> #include <netcfgn.h> #include <devguid.h> +#include <commctrl.h> #include "resource.h" 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] Sun Jul 12 17:16:35 2015 @@ -665,6 +665,31 @@ } } +static +VOID +EnableIpButtons( + HWND hwndDlg) +{ + BOOL bEnable; + + bEnable = (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_IPLIST)) != 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_IPMOD), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_IPDEL), bEnable); +} + +static +VOID +EnableGwButtons( + HWND hwndDlg) +{ + BOOL bEnable; + + bEnable = (ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_GWLIST)) != 0); + + EnableWindow(GetDlgItem(hwndDlg, IDC_GWMOD), bEnable); + EnableWindow(GetDlgItem(hwndDlg, IDC_GWDEL), bEnable); +} VOID InitializeTcpipAdvancedIpDlg( @@ -696,6 +721,7 @@ else { InsertIpAddressToListView(GetDlgItem(hwndDlg, IDC_IPLIST), This->pCurrentConfig->Ip, TRUE); + EnableIpButtons(hwndDlg); } InsertColumnToListView(GetDlgItem(hwndDlg, IDC_GWLIST), IDS_GATEWAY, 0, 100); @@ -703,6 +729,8 @@ InsertColumnToListView(GetDlgItem(hwndDlg, IDC_GWLIST), IDS_METRIC, 1, (rect.right - rect.left - 100)); InsertIpAddressToListView(GetDlgItem(hwndDlg, IDC_GWLIST), This->pCurrentConfig->Gw, FALSE); + EnableGwButtons(hwndDlg); + SendDlgItemMessageW(hwndDlg, IDC_METRIC, EM_LIMITTEXT, 4, 0); } @@ -1329,6 +1357,8 @@ li.pszText = Ip.szMask; SendDlgItemMessageW(hwndDlg, IDC_IPLIST, LVM_SETITEMW, 0, (LPARAM)&li); } + + EnableIpButtons(hwndDlg); } } else if (LOWORD(wParam) == IDC_IPMOD) @@ -1361,6 +1391,7 @@ else if (LOWORD(wParam) == IDC_IPDEL) { DeleteItemFromList(GetDlgItem(hwndDlg, IDC_IPLIST)); + EnableIpButtons(hwndDlg); break; } else if (LOWORD(wParam) == IDC_GWADD) @@ -1395,6 +1426,8 @@ } } } + + EnableGwButtons(hwndDlg); } break; } @@ -1443,6 +1476,7 @@ else if (LOWORD(wParam) == IDC_GWDEL) { DeleteItemFromList(GetDlgItem(hwndDlg, IDC_GWLIST)); + EnableGwButtons(hwndDlg); break; } }

9 years, 5 months

[tfaber] 68391: [NTDLL_APITEST] - Add some tests for NtQuerySystemInformation with invalid info class

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jul 12 08:53:40 2015 New Revision: 68391 URL: http://svn.reactos.org/svn/reactos?rev=68391&view=rev Log: [NTDLL_APITEST] - Add some tests for NtQuerySystemInformation with invalid info class Modified: trunk/rostests/apitests/ntdll/SystemInfo.c Modified: trunk/rostests/apitests/ntdll/SystemInfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/SystemInfo… ============================================================================== --- trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/SystemInfo.c [iso-8859-1] Sun Jul 12 08:53:40 2015 @@ -271,6 +271,42 @@ START_TEST(NtSystemInformation) { + NTSTATUS Status; + ULONG ReturnLength; + + Status = NtQuerySystemInformation(9999, NULL, 0, NULL); + ok(Status == STATUS_INVALID_INFO_CLASS, "NtQuerySystemInformation returned %lx\n", Status); + + Status = NtQuerySystemInformation(9999, NULL, 0, (PVOID)1); + ok(Status == STATUS_ACCESS_VIOLATION || + ntv6(Status == STATUS_INVALID_INFO_CLASS), "NtQuerySystemInformation returned %lx\n", Status); + + ReturnLength = 0x55555555; + Status = NtQuerySystemInformation(9999, NULL, 0, &ReturnLength); + ok(Status == STATUS_INVALID_INFO_CLASS, "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == 0 || + ntv6(ReturnLength == 0x55555555), "ReturnLength = %lu\n", ReturnLength); + + ReturnLength = 0x55555555; + Status = NtQuerySystemInformation(9999, NULL, 1, &ReturnLength); + ok(Status == STATUS_ACCESS_VIOLATION || + ntv6(Status == STATUS_INVALID_INFO_CLASS), "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == 0x55555555, "ReturnLength = %lu\n", ReturnLength); + + ReturnLength = 0x55555555; + Status = NtQuerySystemInformation(9999, (PVOID)1, 1, &ReturnLength); + ok(Status == STATUS_DATATYPE_MISALIGNMENT || + ntv6(Status == STATUS_INVALID_INFO_CLASS), "NtQuerySystemInformation returned %lx\n", Status); + ok(ReturnLength == 0x55555555, "ReturnLength = %lu\n", ReturnLength); + + Status = NtQuerySystemInformation(9999, NULL, 1, (PVOID)1); + ok(Status == STATUS_ACCESS_VIOLATION || + ntv6(Status == STATUS_INVALID_INFO_CLASS), "NtQuerySystemInformation returned %lx\n", Status); + + Status = NtQuerySystemInformation(9999, (PVOID)1, 1, (PVOID)1); + ok(Status == STATUS_DATATYPE_MISALIGNMENT || + ntv6(Status == STATUS_INVALID_INFO_CLASS), "NtQuerySystemInformation returned %lx\n", Status); + Test_Flags(); Test_TimeAdjustment(); }

9 years, 5 months

[cwittich] 68390: [NTOSKRNL] NtQuerySystemInformation: check for correct alignment

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 12 08:20:13 2015 New Revision: 68390 URL: http://svn.reactos.org/svn/reactos?rev=68390&view=rev Log: [NTOSKRNL] NtQuerySystemInformation: check for correct alignment Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Sun Jul 12 08:20:13 2015 @@ -2308,7 +2308,7 @@ { NTSTATUS (* Query) (PVOID,ULONG,PULONG); NTSTATUS (* Set) (PVOID,ULONG); - + ULONG Alignment; } QSSI_CALLS; // QS Query & Set @@ -2316,9 +2316,12 @@ // XS Set // XX unknown behaviour // -#define SI_QS(n) {QSI_USE(n),SSI_USE(n)} -#define SI_QX(n) {QSI_USE(n),NULL} -#define SI_XS(n) {NULL,SSI_USE(n)} +#define SI_QS(n) {QSI_USE(n),SSI_USE(n),TYPE_ALIGNMENT(ULONG)} +#define SI_QX(n) {QSI_USE(n),NULL,TYPE_ALIGNMENT(ULONG)} +#define SI_XS(n) {NULL,SSI_USE(n),TYPE_ALIGNMENT(ULONG)} +#define SI_QS_ALIGN(n,a) {QSI_USE(n),SSI_USE(n),a} +#define SI_QX_ALIGN(n,a) {QSI_USE(n),NULL,a} +#define SI_XS_ALIGN(n,a) {NULL,SSI_USE(n),a} #define SI_XX(n) {NULL,NULL} static @@ -2360,7 +2363,7 @@ SI_QX(SystemCrashDumpInformation), SI_QX(SystemExceptionInformation), SI_QX(SystemCrashDumpStateInformation), - SI_QX(SystemKernelDebuggerInformation), + SI_QX_ALIGN(SystemKernelDebuggerInformation, TYPE_ALIGNMENT(BOOLEAN)), SI_QX(SystemContextSwitchInformation), SI_QS(SystemRegistryQuotaInformation), SI_XS(SystemExtendServiceTableInformation), @@ -2411,17 +2414,6 @@ _SEH2_TRY { - if (PreviousMode != KernelMode) - { - /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ - ProbeForWrite(SystemInformation, Length, 1); - if (UnsafeResultLength != NULL) - ProbeForWriteUlong(UnsafeResultLength); - } - - if (UnsafeResultLength) - *UnsafeResultLength = 0; - /* * Check if the request is valid. */ @@ -2429,6 +2421,17 @@ { _SEH2_YIELD(return STATUS_INVALID_INFO_CLASS); } + + if (PreviousMode != KernelMode) + { + /* SystemKernelDebuggerInformation needs only BOOLEAN alignment */ + ProbeForWrite(SystemInformation, Length, CallQS[SystemInformationClass].Alignment); + if (UnsafeResultLength != NULL) + ProbeForWriteUlong(UnsafeResultLength); + } + + if (UnsafeResultLength) + *UnsafeResultLength = 0; if (NULL != CallQS [SystemInformationClass].Query) {

9 years, 5 months

[cwittich] 68389: [RTL] sync compression functions with wine

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jul 11 13:47:22 2015 New Revision: 68389 URL: http://svn.reactos.org/svn/reactos?rev=68389&view=rev Log: [RTL] sync compression functions with wine Modified: trunk/reactos/lib/rtl/compress.c Modified: trunk/reactos/lib/rtl/compress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/compress.c?rev=683… ============================================================================== --- trunk/reactos/lib/rtl/compress.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/compress.c [iso-8859-1] Sat Jul 11 13:47:22 2015 @@ -95,24 +95,21 @@ static NTSTATUS lznt1_decompress(UCHAR *dst, ULONG dst_size, UCHAR *src, ULONG src_size, ULONG offset, ULONG *final_size, UCHAR *workspace) { - UCHAR *src_cur, *src_end, *dst_cur, *dst_end, *ptr; + UCHAR *src_cur = src, *src_end = src + src_size; + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; ULONG chunk_size, block_size; WORD chunk_header; - - src_cur = src; - src_end = src + src_size; - dst_cur = dst; - dst_end = dst + dst_size; - - if (src_cur + sizeof(WCHAR) > src_end) + UCHAR *ptr; + + if (src_cur + sizeof(WORD) > src_end) return STATUS_BAD_COMPRESSION_BUFFER; /* skip over chunks which have a big distance (>= 0x1000) to the destination offset */ - while (offset >= 0x1000 && src_cur + sizeof(WCHAR) <= src_end) + while (offset >= 0x1000 && src_cur + sizeof(WORD) <= src_end) { /* read chunk header and extract size */ chunk_header = *(WORD *)src_cur; - src_cur += sizeof(WCHAR); + src_cur += sizeof(WORD); if (!chunk_header) goto out; chunk_size = (chunk_header & 0xFFF) + 1; @@ -125,11 +122,11 @@ } /* this chunk is can be included partially */ - if (offset && src_cur + sizeof(WCHAR) <= src_end) + if (offset && src_cur + sizeof(WORD) <= src_end) { /* read chunk header and extract size */ chunk_header = *(WORD *)src_cur; - src_cur += sizeof(WCHAR); + src_cur += sizeof(WORD); if (!chunk_header) goto out; chunk_size = (chunk_header & 0xFFF) + 1; @@ -167,15 +164,15 @@ src_cur += chunk_size; } - while (src_cur + sizeof(WCHAR) <= src_end) + /* handle remaining chunks */ + while (src_cur + sizeof(WORD) <= src_end) { /* read chunk header and extract size */ chunk_header = *(WORD *)src_cur; - src_cur += sizeof(WCHAR); + src_cur += sizeof(WORD); if (!chunk_header) goto out; chunk_size = (chunk_header & 0xFFF) + 1; - /* ensure we have enough buffer to process chunk */ if (src_cur + chunk_size > src_end) return STATUS_BAD_COMPRESSION_BUFFER; @@ -189,7 +186,8 @@ memset(dst_cur, 0, block_size); dst_cur += block_size; } - else if (dst_cur >= dst_end) + + if (dst_cur >= dst_end) goto out; if (chunk_header & 0x8000) @@ -219,17 +217,34 @@ static NTSTATUS -RtlpCompressBufferLZNT1(USHORT Engine, - PUCHAR UncompressedBuffer, - ULONG UncompressedBufferSize, - PUCHAR CompressedBuffer, - ULONG CompressedBufferSize, - ULONG UncompressedChunkSize, - PULONG FinalCompressedSize, - PVOID WorkSpace) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +RtlpCompressBufferLZNT1(UCHAR *src, ULONG src_size, UCHAR *dst, ULONG dst_size, + ULONG chunk_size, ULONG *final_size, UCHAR *workspace) +{ + UCHAR *src_cur = src, *src_end = src + src_size; + UCHAR *dst_cur = dst, *dst_end = dst + dst_size; + ULONG block_size; + + while (src_cur < src_end) + { + /* determine size of current chunk */ + block_size = min(0x1000, src_end - src_cur); + if (dst_cur + sizeof(WORD) + block_size > dst_end) + return STATUS_BUFFER_TOO_SMALL; + + /* write (uncompressed) chunk header */ + *(WORD *)dst_cur = 0x3000 | (block_size - 1); + dst_cur += sizeof(WORD); + + /* write chunk content */ + memcpy(dst_cur, src_cur, block_size); + dst_cur += block_size; + src_cur += block_size; + } + + if (final_size) + *final_size = dst_cur - dst; + + return STATUS_SUCCESS; } @@ -269,15 +284,14 @@ IN PVOID WorkSpace) { USHORT Format = CompressionFormatAndEngine & COMPRESSION_FORMAT_MASK; - USHORT Engine = CompressionFormatAndEngine & COMPRESSION_ENGINE_MASK; + /* USHORT Engine = CompressionFormatAndEngine & COMPRESSION_ENGINE_MASK; */ if ((Format == COMPRESSION_FORMAT_NONE) || (Format == COMPRESSION_FORMAT_DEFAULT)) return(STATUS_INVALID_PARAMETER); if (Format == COMPRESSION_FORMAT_LZNT1) - return(RtlpCompressBufferLZNT1(Engine, - UncompressedBuffer, + return(RtlpCompressBufferLZNT1(UncompressedBuffer, UncompressedBufferSize, CompressedBuffer, CompressedBufferSize,

9 years, 5 months

[ekohl] 68388: [USETUP] Show an error message if formatting a partition fails. Based on patch by mna. CORE-7969 #resolve #comment Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jul 11 12:40:34 2015 New Revision: 68388 URL: http://svn.reactos.org/svn/reactos?rev=68388&view=rev Log: [USETUP] Show an error message if formatting a partition fails. Based on patch by mna. CORE-7969 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/errorcode.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/errorcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/errorcod… ============================================================================== --- trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/errorcode.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -70,6 +70,7 @@ ERROR_INSUFFICIENT_PARTITION_SIZE, ERROR_PARTITION_TABLE_FULL, ERROR_ONLY_ONE_EXTENDED, + ERROR_FORMATTING_PARTITION, ERROR_LAST_ERROR_CODE } ERROR_NUMBER; Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -2899,7 +2899,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); - /* FIXME: show an error dialog */ + MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); return QUIT_PAGE; } Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1507,6 +1507,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1494,6 +1494,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1502,6 +1502,13 @@ "Nen¡ mo§n vytvoýit v¡ce ne§ jeden rozç¡ýenì odd¡l na disk.\n" "\n" " * Pokraujte stisknut¡m libovoln kl vesy." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1498,6 +1498,13 @@ "Sie knnen nur eine erweiterte Partition auf jeder Festplatte anlegen.\n" "\n" " * Eine beliebige Taste zum Fortsetzen drcken." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1511,6 +1511,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1494,6 +1494,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1502,6 +1502,13 @@ "No es posible crear m s de una partici¢n extendida por disco.\n" "\n" " * Presione una tecla para continuar." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1492,6 +1492,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1507,6 +1507,13 @@ "Impossible de crer plus d'une partition tendue par disque.\n" "\n" " * Appuyer sur une touche pour continuer." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1495,6 +1495,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1502,6 +1502,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1496,6 +1496,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1504,6 +1504,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1534,6 +1534,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1504,6 +1504,13 @@ "Nie mo¾esz utworzy wi©cej ni¾ jednej partycji rozszerzonej na dysku.\n" "\n" " * Nacinij dowolny klawisz, aby kontynuowa." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1532,6 +1532,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1565,6 +1565,13 @@ "Nu se poate crea mai mult de o partiîie extinsÇ pe un disc.\n" "\n" " * Tastaîi pentru a continua." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1495,6 +1495,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¤«ï ¯à®¤®«¦¥¨ï." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1506,6 +1506,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1499,6 +1499,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1502,6 +1502,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1482,6 +1482,13 @@ "Bir diskte birden ok geniletilmi blm oluturamazsnz.\n" "\n" " * Srdrmek iin bir d§meye basnz." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sat Jul 11 12:40:34 2015 @@ -1502,6 +1502,13 @@ "You can not create more than one extended partition per disk.\n" "\n" " * Press any key to continue." + }, + { + //ERROR_FORMATTING_PARTITION, + "Setup is unable to format the partition:\n" + " %S\n" + "\n" + "ENTER = Reboot computer" }, { NULL,

9 years, 5 months

[hbelusca] 68387: [KERNEL32]: Fix GCC build.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 11 00:29:01 2015 New Revision: 68387 URL: http://svn.reactos.org/svn/reactos?rev=68387&view=rev Log: [KERNEL32]: Fix GCC build. Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Sat Jul 11 00:29:01 2015 @@ -86,10 +86,10 @@ IN UINT uUnique, OUT LPWSTR lpTempFileName) { - CHAR * Let; + PUCHAR Let; HANDLE TempFile; UINT ID, Num = 0; - CHAR IDString[5]; + UCHAR IDString[5]; WCHAR * TempFileName; BASE_API_MESSAGE ApiMessage; PBASE_GET_TEMP_FILE GetTempFile = &ApiMessage.Data.GetTempFileRequest; @@ -176,7 +176,7 @@ } /* Convert that ID to wchar */ - RtlIntegerToChar(ID, 0x10, sizeof(IDString), IDString); + RtlIntegerToChar(ID, 0x10, sizeof(IDString), (PCHAR)IDString); Let = IDString; do {

9 years, 5 months

[hbelusca] 68386: [NDK][KERNEL32][LIBCNTPR] Add RtlAnsiCharToUnicodeChar prototype inside NDK. [NDK][NTVDM] Add few missing RTL bitmap prototypes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 11 00:18:30 2015 New Revision: 68386 URL: http://svn.reactos.org/svn/reactos?rev=68386&view=rev Log: [NDK][KERNEL32][LIBCNTPR] Add RtlAnsiCharToUnicodeChar prototype inside NDK. [NDK][NTVDM] Add few missing RTL bitmap prototypes. Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sat Jul 11 00:18:30 2015 @@ -357,9 +357,6 @@ WINAPI BaseSetLastNTError(IN NTSTATUS Status); -/* FIXME */ -WCHAR WINAPI RtlAnsiCharToUnicodeChar(LPSTR *); - VOID NTAPI BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Jul 11 00:18:30 2015 @@ -1927,12 +1927,12 @@ // // Ansi->Unicode String Functions // -NTSYSAPI -ULONG -NTAPI -RtlxAnsiStringToUnicodeSize( - PCANSI_STRING AnsiString -); +_IRQL_requires_max_(APC_LEVEL) +NTSYSAPI +WCHAR +NTAPI +RtlAnsiCharToUnicodeChar( + _Inout_ PUCHAR *SourceCharacter); NTSYSAPI NTSTATUS @@ -1941,6 +1941,13 @@ PUNICODE_STRING DestinationString, PCANSI_STRING SourceString, BOOLEAN AllocateDestinationString +); + +NTSYSAPI +ULONG +NTAPI +RtlxAnsiStringToUnicodeSize( + PCANSI_STRING AnsiString ); #ifdef NTOS_MODE_USER @@ -3077,6 +3084,33 @@ _In_ PRTL_BITMAP BitMapHeader, _In_ ULONG NumberToFind, _In_ ULONG HintIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindFirstRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _Out_ PULONG StartingIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindClearRuns( + _In_ PRTL_BITMAP BitMapHeader, + _Out_writes_to_(SizeOfRunArray, return) PRTL_BITMAP_RUN RunArray, + _In_range_(>, 0) ULONG SizeOfRunArray, + _In_ BOOLEAN LocateLongestRuns +); + +NTSYSAPI +ULONG +NTAPI +RtlFindLastBackwardRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex ); NTSYSAPI Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Sat Jul 11 00:18:30 2015 @@ -2,7 +2,6 @@ #include <ndk/rtlfuncs.h> #include <string.h> -WCHAR NTAPI RtlAnsiCharToUnicodeChar(IN OUT PUCHAR *AnsiChar); #undef MB_CUR_MAX #define MB_CUR_MAX 2 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sat Jul 11 00:18:30 2015 @@ -27,15 +27,6 @@ /* BOP Identifiers */ #define BOP_XMS 0x52 - -ULONG -NTAPI -RtlFindLastBackwardRunClear -( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - OUT PULONG StartingRunIndex -); /* PRIVATE VARIABLES **********************************************************/

9 years, 5 months

[hbelusca] 68385: [KERNEL32]: Whitespace fix; remove useless FIELD_OFFSET definition since we have it in the standard (*DK) headers.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jul 11 00:02:59 2015 New Revision: 68385 URL: http://svn.reactos.org/svn/reactos?rev=68385&view=rev Log: [KERNEL32]: Whitespace fix; remove useless FIELD_OFFSET definition since we have it in the standard (*DK) headers. Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Sat Jul 11 00:02:59 2015 @@ -37,33 +37,29 @@ #include "wine/unicode.h" #include "baseheap.h" -#define BINARY_UNKNOWN (0) -#define BINARY_PE_EXE32 (1) -#define BINARY_PE_DLL32 (2) -#define BINARY_PE_EXE64 (3) -#define BINARY_PE_DLL64 (4) -#define BINARY_WIN16 (5) -#define BINARY_OS216 (6) -#define BINARY_DOS (7) -#define BINARY_UNIX_EXE (8) -#define BINARY_UNIX_LIB (9) - -#define MAGIC(c1,c2,c3,c4) ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24)) - -#define MAGIC_HEAP MAGIC( 'H','E','A','P' ) - -#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) -#define ROUNDDOWN(a,b) (((a)/(b))*(b)) +#define BINARY_UNKNOWN (0) +#define BINARY_PE_EXE32 (1) +#define BINARY_PE_DLL32 (2) +#define BINARY_PE_EXE64 (3) +#define BINARY_PE_DLL64 (4) +#define BINARY_WIN16 (5) +#define BINARY_OS216 (6) +#define BINARY_DOS (7) +#define BINARY_UNIX_EXE (8) +#define BINARY_UNIX_LIB (9) + +#define MAGIC(c1,c2,c3,c4) ((c1) + ((c2)<<8) + ((c3)<<16) + ((c4)<<24)) + +#define MAGIC_HEAP MAGIC( 'H','E','A','P' ) + +#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b)) +#define ROUNDDOWN(a,b) (((a)/(b))*(b)) #define ROUND_DOWN(n, align) \ (((ULONG)n) & ~((align) - 1l)) #define ROUND_UP(n, align) \ ROUND_DOWN(((ULONG)n) + (align) - 1, (align)) - -#ifndef FIELD_OFFSET -#define FIELD_OFFSET(type,fld) ((LONG)&(((type *)0)->fld)) -#endif #define __TRY _SEH2_TRY #define __EXCEPT_PAGE_FAULT _SEH2_EXCEPT(_SEH2_GetExceptionCode() == STATUS_ACCESS_VIOLATION)

9 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2015