Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[hbelusca] 71966: [REGEDIT] - Minor whitespace fixes in main.c - Use a correct info msgbox title when showing regedit command-line usage. Something to think about: translate the cmdline usage! :)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 18 22:27:17 2016 New Revision: 71966 URL: http://svn.reactos.org/svn/reactos?rev=71966&view=rev Log: [REGEDIT] - Minor whitespace fixes in main.c - Use a correct info msgbox title when showing regedit command-line usage. Something to think about: translate the cmdline usage! :) Modified: trunk/reactos/base/applications/regedit/main.c trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/main.c [iso-8859-1] Mon Jul 18 22:27:17 2016 @@ -196,26 +196,25 @@ UNREFERENCED_PARAMETER(hPrevInstance); + /* Initialize global strings */ + LoadStringW(hInstance, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); + LoadStringW(hInstance, IDC_REGEDIT_FRAME, szFrameClass, COUNT_OF(szFrameClass)); + LoadStringW(hInstance, IDC_REGEDIT, szChildClass, COUNT_OF(szChildClass)); + if (ProcessCmdLine(lpCmdLine)) { return 0; } - /* Initialize global strings */ - LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - LoadStringW(hInstance, IDC_REGEDIT_FRAME, szFrameClass, MAX_LOADSTRING); - LoadStringW(hInstance, IDC_REGEDIT, szChildClass, MAX_LOADSTRING); - - switch (GetUserDefaultUILanguage()) - { - case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): - SetProcessDefaultLayout(LAYOUT_RTL); - break; - - default: - break; - } + { + case MAKELANGID(LANG_HEBREW, SUBLANG_DEFAULT): + SetProcessDefaultLayout(LAYOUT_RTL); + break; + + default: + break; + } /* Store instance handle in our global variable */ hInst = hInstance; Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Mon Jul 18 22:27:17 2016 @@ -138,7 +138,7 @@ { case ACTION_ADD: { - WCHAR szTitle[512], szText[512]; + WCHAR szText[512]; WCHAR filename[MAX_PATH]; FILE *fp; @@ -146,11 +146,9 @@ if (!filename[0]) { InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No file name is specified."); - InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, usage); exit(4); } - - LoadStringW(hInst, IDS_APP_TITLE, szTitle, COUNT_OF(szTitle)); while (filename[0]) { @@ -217,7 +215,7 @@ if (!reg_key_name[0]) { InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No registry key is specified for removal."); - InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, usage); exit(6); } delete_registry_key(reg_key_name); @@ -233,7 +231,7 @@ if (!filename[0]) { InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, L"No file name is specified."); - InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, usage); exit(7); } @@ -318,7 +316,7 @@ action = ACTION_EXPORT; break; case L'?': - InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, NULL, usage); + InfoMessageBox(NULL, MB_OK | MB_ICONINFORMATION, szTitle, usage); exit(3); break; default:

8 years, 5 months

[ekohl] 71965: [SERVMAN] Service logon property page: - Fix initialization and display bugs. - Start work on the 'Apply' function. It doe not apply changes yet. - Add password check messages.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Jul 18 21:49:19 2016 New Revision: 71965 URL: http://svn.reactos.org/svn/reactos?rev=71965&view=rev Log: [SERVMAN] Service logon property page: - Fix initialization and display bugs. - Start work on the 'Apply' function. It doe not apply changes yet. - Add password check messages. Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c trunk/reactos/base/applications/mscutils/servman/resource.h Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/cs-CZ.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -331,8 +331,14 @@ STRINGTABLE BEGIN - IDS_NO_ACTION "Take no action" - IDS_RESTART_SERVICE "Restart the Service" - IDS_RUN_PROGRAM "Run a Program" - IDS_RESTART_COMPUTER "Restart the Computer" -END + IDS_NO_ACTION "Keine Aktion durchfÃ¼hren" + IDS_RESTART_SERVICE "Dienst neu starten" + IDS_RUN_PROGRAM "Ein Programm ausfÃ¼hren" + IDS_RESTART_COMPUTER "Computer neu starten" +END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "Die KennwÃ¶rter stimmen nicht Ã¼berein!" + IDS_INVALID_PASSWORD "Geben Sie ein gÃ¼ltiges Kennwort ein!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -339,3 +339,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/he-IL.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,10 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END + Modified: trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/it-IT.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ja-JP.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -338,3 +338,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -346,3 +346,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -341,3 +341,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -336,3 +336,10 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END + Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -341,3 +341,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sq-AL.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -341,3 +341,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sv-SE.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -343,3 +343,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -344,3 +344,10 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END + Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -338,3 +338,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -344,3 +344,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/zh-CN.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -338,3 +338,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/zh-TW.rc [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -338,3 +338,9 @@ IDS_RUN_PROGRAM "Run a Program" IDS_RESTART_COMPUTER "Restart the Computer" END + +STRINGTABLE +BEGIN + IDS_NOT_SAME_PASSWORD "The Passwords are not the same!" + IDS_INVALID_PASSWORD "Enter a valid Password!" +END Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/misc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/misc.c [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -275,3 +275,24 @@ return himl; } + + +#define BUFFERSIZE 512 + +VOID +ResourceMessageBox( + HINSTANCE hInstance, + HWND hwnd, + UINT uType, + UINT uCaptionId, + UINT uMessageId) +{ + WCHAR szErrorText[BUFFERSIZE]; + WCHAR szErrorCaption[BUFFERSIZE]; + + LoadStringW(hInstance, uMessageId, szErrorText, sizeof(szErrorText) / sizeof(WCHAR)); + LoadStringW(hInstance, uCaptionId, szErrorCaption, sizeof(szErrorCaption) / sizeof(WCHAR)); + + MessageBoxW(hwnd, szErrorText, szErrorCaption, uType); +} + Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -210,5 +210,12 @@ UINT Width, UINT Height, ULONG type); +VOID +ResourceMessageBox( + HINSTANCE hInstance, + HWND hwnd, + UINT uType, + UINT uCaptionId, + UINT uMessageId); #endif /* __SERVMAN_PRECOMP_H */ Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_logon.c [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -11,6 +11,8 @@ #define NDEBUG #include <debug.h> +#define DEFAULT_PASSWORD L" " + typedef struct _LOGONDATA { ENUM_SERVICE_STATUS_PROCESS *pService; @@ -18,9 +20,11 @@ WCHAR szAccountName[64]; WCHAR szPassword1[64]; WCHAR szPassword2[64]; - BOOL bInitial; - BOOL bAccountNameChanged; + BOOL bInitialized; + BOOL bLocalSystem; + BOOL bAccountChanged; } LOGONDATA, *PLOGONDATA; + static VOID @@ -29,28 +33,166 @@ PLOGONDATA pLogonData, BOOL bLocalSystem) { - BOOL y = bLocalSystem ? FALSE : TRUE; - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_INTERACTIVE), bLocalSystem); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_ACCOUNTNAME), y); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_SEARCH), y); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PW1TEXT), y); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PASSWORD1), y); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PW2TEXT), y); - EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PASSWORD2), y); - - if (bLocalSystem == TRUE && pLogonData->bInitial == FALSE) - { - GetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, pLogonData->szAccountName, 64); - GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, pLogonData->szPassword1, 64); - GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, pLogonData->szPassword2, 64); - } - - SetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, bLocalSystem ? L"" : pLogonData->szAccountName); - SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, bLocalSystem ? L"" : pLogonData->szPassword1); - SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, bLocalSystem ? L"" : pLogonData->szPassword2); - - pLogonData->bInitial = FALSE; + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_ACCOUNTNAME), !bLocalSystem); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_SEARCH), FALSE /*!bLocalSystem*/); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PW1TEXT), !bLocalSystem); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PASSWORD1), !bLocalSystem); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PW2TEXT), !bLocalSystem); + EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_PASSWORD2), !bLocalSystem); + + if (bLocalSystem) + { + if (pLogonData->bInitialized == TRUE) + { + GetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, pLogonData->szAccountName, 64); + GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, pLogonData->szPassword1, 64); + GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, pLogonData->szPassword2, 64); + } + + SetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, L""); + SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, L""); + SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, L""); + } + else + { + SetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, pLogonData->szAccountName); + SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, pLogonData->szPassword1); + SetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, pLogonData->szPassword2); + } + + pLogonData->bLocalSystem = bLocalSystem; +} + + +#if 0 +BOOL +SetServiceAccount( + LPWSTR lpServiceName, + LPWSTR lpStartName, + LPWSTR lpPassword) +{ + SC_HANDLE hSCManager; + SC_HANDLE hSc; + SC_LOCK scLock; + BOOL bRet = FALSE; + + hSCManager = OpenSCManagerW(NULL, + NULL, + SC_MANAGER_LOCK); + if (hSCManager) + { + scLock = LockServiceDatabase(hSCManager); + if (scLock) + { + hSc = OpenServiceW(hSCManager, + lpServiceName, + SERVICE_CHANGE_CONFIG); + if (hSc) + { + if (ChangeServiceConfigW(hSc, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + SERVICE_NO_CHANGE, + NULL, + NULL, + NULL, + NULL, + lpStartName, + lpPassword, + NULL)) + { + bRet = TRUE; + } + + CloseServiceHandle(hSc); + } + + UnlockServiceDatabase(scLock); + } + + CloseServiceHandle(hSCManager); + } + + if (!bRet) + GetError(); + + return bRet; +} +#endif + + +static +BOOL +OnQueryInitialFocus( + HWND hwndDlg, + PLOGONDATA pLogonData) +{ + HWND hwnd = GetDlgItem(hwndDlg, pLogonData->bLocalSystem ? IDC_LOGON_SYSTEMACCOUNT : IDC_LOGON_THISACCOUNT); + + SetWindowLong(hwndDlg, DWL_MSGRESULT, (LPARAM)hwnd); + + return TRUE; +} + + +static +BOOL +OnApply( + HWND hwndDlg, + PLOGONDATA pLogonData) +{ + WCHAR szAccountName[64]; + WCHAR szPassword1[64]; + WCHAR szPassword2[64]; + BOOL bRet = TRUE; + + if (!pLogonData->bAccountChanged) + return TRUE; + + if (SendDlgItemMessageW(hwndDlg, IDC_LOGON_SYSTEMACCOUNT, BM_GETCHECK, 0, 0) == BST_CHECKED) + { + /* System account selected */ + wcscpy(szAccountName, L"LocalSystem"); + wcscpy(szPassword1, L""); + wcscpy(szPassword2, L""); + } + else + { + /* Other account selected */ + GetDlgItemText(hwndDlg, IDC_LOGON_ACCOUNTNAME, szAccountName, 64); + GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD1, szPassword1, 64); + GetDlgItemText(hwndDlg, IDC_LOGON_PASSWORD2, szPassword2, 64); + + if (wcscmp(szPassword1, szPassword2)) + { + ResourceMessageBox(GetModuleHandle(NULL), hwndDlg, MB_OK | MB_ICONWARNING, IDS_APPNAME, IDS_NOT_SAME_PASSWORD); + return FALSE; + } + + if (!wcscmp(szPassword1, DEFAULT_PASSWORD)) + { + ResourceMessageBox(GetModuleHandle(NULL), hwndDlg, MB_OK | MB_ICONWARNING, IDS_APPNAME, IDS_INVALID_PASSWORD); + return FALSE; + } + + + } + +#if 0 + bRet = SetServiceAccount(pLogonData->pService->lpServiceName, + szAccountName, + szPassword1); + if (bRet == FALSE) + { + + } +#endif + + if (bRet == TRUE) + pLogonData->bAccountChanged = FALSE; + + return bRet; } @@ -86,25 +228,30 @@ GWLP_USERDATA, (LONG_PTR)pLogonData); - pLogonData->bInitial = TRUE; + pLogonData->bInitialized = FALSE; pLogonData->pService = ((PSERVICEPROPSHEET)(((LPPROPSHEETPAGE)lParam)->lParam))->pService; pLogonData->pServiceConfig = GetServiceConfig(pLogonData->pService->lpServiceName); if (pLogonData->pServiceConfig != NULL) { + wcscpy(pLogonData->szPassword1, DEFAULT_PASSWORD); + wcscpy(pLogonData->szPassword2, DEFAULT_PASSWORD); + if (pLogonData->pServiceConfig->lpServiceStartName == NULL || _wcsicmp(pLogonData->pServiceConfig->lpServiceStartName, L"LocalSystem") == 0) { - PostMessageW(GetDlgItem(hwndDlg, IDC_LOGON_SYSTEMACCOUNT), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - PostMessageW(hwndDlg, WM_COMMAND, IDC_LOGON_SYSTEMACCOUNT, 0); + SendMessageW(GetDlgItem(hwndDlg, IDC_LOGON_SYSTEMACCOUNT), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SetControlStates(hwndDlg, pLogonData, TRUE); } else { wcscpy(pLogonData->szAccountName, pLogonData->pServiceConfig->lpServiceStartName); - PostMessageW(GetDlgItem(hwndDlg, IDC_LOGON_THISACCOUNT), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); - PostMessageW(hwndDlg, WM_COMMAND, IDC_LOGON_THISACCOUNT, 0); + SendMessageW(GetDlgItem(hwndDlg, IDC_LOGON_THISACCOUNT), BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + SetControlStates(hwndDlg, pLogonData, FALSE); } } + + pLogonData->bInitialized = TRUE; } EnableWindow(GetDlgItem(hwndDlg, IDC_LOGON_HWPROFILE), FALSE); @@ -121,30 +268,49 @@ switch(LOWORD(wParam)) { case IDC_LOGON_SYSTEMACCOUNT: - SetControlStates(hwndDlg, pLogonData, TRUE); + if (HIWORD(wParam) == BN_CLICKED) + { + if (pLogonData->bInitialized) + { + pLogonData->bAccountChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + SetControlStates(hwndDlg, pLogonData, TRUE); + } break; case IDC_LOGON_THISACCOUNT: - SetControlStates(hwndDlg, pLogonData, FALSE); + if (HIWORD(wParam) == BN_CLICKED) + { + if (pLogonData->bInitialized) + { + pLogonData->bAccountChanged = TRUE; + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + SetControlStates(hwndDlg, pLogonData, FALSE); + } break; case IDC_LOGON_ACCOUNTNAME: - if (HIWORD(wParam) == EN_CHANGE) - { - pLogonData->bAccountNameChanged = TRUE; + case IDC_LOGON_PASSWORD1: + case IDC_LOGON_PASSWORD2: + if (HIWORD(wParam) == EN_CHANGE && pLogonData->bInitialized) + { + pLogonData->bAccountChanged = TRUE; PropSheet_Changed(GetParent(hwndDlg), hwndDlg); } break; - - } break; case WM_NOTIFY: switch (((LPNMHDR)lParam)->code) { + case PSN_QUERYINITIALFOCUS : + return OnQueryInitialFocus(hwndDlg, pLogonData); + case PSN_APPLY: - break; + return OnApply(hwndDlg, pLogonData); } break; } Modified: trunk/reactos/base/applications/mscutils/servman/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/resource.h [iso-8859-1] Mon Jul 18 21:49:19 2016 @@ -219,3 +219,6 @@ #define IDS_RESTART_SERVICE 12101 #define IDS_RUN_PROGRAM 12102 #define IDS_RESTART_COMPUTER 12103 + +#define IDS_NOT_SAME_PASSWORD 12150 +#define IDS_INVALID_PASSWORD 12151

8 years, 5 months

[hbelusca] 71964: [BOOTDATA]: Disable automatic debugger startup on application crash. This allows getting back the error popup as we used to have, and also warn the user there was indeed a problem...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Jul 18 19:25:53 2016 New Revision: 71964 URL: http://svn.reactos.org/svn/reactos?rev=71964&view=rev Log: [BOOTDATA]: Disable automatic debugger startup on application crash. This allows getting back the error popup as we used to have, and also warn the user there was indeed a problem, instead of silently start the default debugger (that I've set to an unexistant "drwtsn.exe") and fail silently, since that default debugger doesn't exist. CORE-11508 Modified: trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Mon Jul 18 19:25:53 2016 @@ -162,7 +162,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion","SoftwareType",2,"System" ; Auto-Execute (AE) Debugger -HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",2,"1" +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","Auto",2,"0" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","Debugger",2,"drwtsn32 -p %ld -e %ld -g" HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\AeDebug","UserDebuggerHotKey",0x00010001,0x00000000

8 years, 5 months

[akhaldi] 71963: [USER32_WINETEST] Sync with Wine Staging 1.9.14.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 18 15:48:27 2016 New Revision: 71963 URL: http://svn.reactos.org/svn/reactos?rev=71963&view=rev Log: [USER32_WINETEST] Sync with Wine Staging 1.9.14. Modified: trunk/rostests/winetests/user32/cursoricon.c trunk/rostests/winetests/user32/dce.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/listbox.c trunk/rostests/winetests/user32/menu.c trunk/rostests/winetests/user32/monitor.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/scroll.c trunk/rostests/winetests/user32/static.c trunk/rostests/winetests/user32/text.c trunk/rostests/winetests/user32/uitools.c trunk/rostests/winetests/user32/win.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/cursoric… Modified: trunk/rostests/winetests/user32/dce.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dce.c?re… Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… Modified: trunk/rostests/winetests/user32/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.… Modified: trunk/rostests/winetests/user32/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?r… Modified: trunk/rostests/winetests/user32/monitor.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/monitor.… Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… Modified: trunk/rostests/winetests/user32/scroll.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/scroll.c… Modified: trunk/rostests/winetests/user32/static.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/static.c… Modified: trunk/rostests/winetests/user32/text.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/text.c?r… Modified: trunk/rostests/winetests/user32/uitools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/uitools.… Modified: trunk/rostests/winetests/user32/win.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/win.c?re…

8 years, 5 months

[akhaldi] 71962: [USER32] Add missing lprc check in SetRect().

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 18 15:46:38 2016 New Revision: 71962 URL: http://svn.reactos.org/svn/reactos?rev=71962&view=rev Log: [USER32] Add missing lprc check in SetRect(). Modified: trunk/reactos/win32ss/user/user32/windows/rect.c Modified: trunk/reactos/win32ss/user/user32/windows/rect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/rect.c [iso-8859-1] Mon Jul 18 15:46:38 2016 @@ -159,11 +159,15 @@ int xRight, int yBottom) { + if (!lprc) + return FALSE; + lprc->left = xLeft; lprc->top = yTop; lprc->right = xRight; lprc->bottom = yBottom; - return(TRUE); + + return TRUE; }

8 years, 5 months

[akhaldi] 71961: [WS2_32_WINETEST] Sync with Wine Staging 1.9.14. Made possible thanks to Peter Hater's changes. CORE-11368 ROSTESTS-233

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 18 10:44:58 2016 New Revision: 71961 URL: http://svn.reactos.org/svn/reactos?rev=71961&view=rev Log: [WS2_32_WINETEST] Sync with Wine Staging 1.9.14. Made possible thanks to Peter Hater's changes. CORE-11368 ROSTESTS-233 Added: trunk/rostests/winetests/ws2_32/ros_diff.patch (with props) Modified: trunk/rostests/winetests/ws2_32/sock.c [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/rostests/winetests/ws2_32/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/ros_diff… Modified: trunk/rostests/winetests/ws2_32/sock.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ws2_32/sock.c?r…

8 years, 5 months

[akhaldi] 71960: [SHELL32] Add AVI file 151. By Jared Smudde. CORE-11638

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Jul 18 10:27:56 2016 New Revision: 71960 URL: http://svn.reactos.org/svn/reactos?rev=71960&view=rev Log: [SHELL32] Add AVI file 151. By Jared Smudde. CORE-11638 Added: trunk/reactos/dll/win32/shell32/res/avis/151.avi (with props) Modified: trunk/reactos/dll/win32/shell32/avi_res.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/avi_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/avi_res.… ============================================================================== --- trunk/reactos/dll/win32/shell32/avi_res.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/avi_res.rc [iso-8859-1] Mon Jul 18 10:27:56 2016 @@ -1,3 +1,4 @@ +IDA_SHELL_SEARCHING_INDEX AVI "res/avis/151.avi" IDA_SHELL_COPY AVI "res/avis/160+161+167+168.avi" IDA_SHELL_COPY1 AVI "res/avis/160+161+167+168.avi" IDA_SHELL_COPY2 AVI "res/avis/160+161+167+168.avi" Added: trunk/reactos/dll/win32/shell32/res/avis/151.avi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/avis… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/win32/shell32/res/avis/151.avi ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Mon Jul 18 10:27:56 2016 @@ -573,18 +573,19 @@ * AVI resources * * windows shell32 has 14 of them: 150-152 and 160-170 - * FIXME: Add 150-152 + * FIXME: Add 150, 152 */ -#define IDA_SHELL_COPY 160 -#define IDA_SHELL_COPY1 161 -#define IDA_SHELL_COPY2 167 -#define IDA_SHELL_COPY3 168 -#define IDA_SHELL_RECYCLE 162 -#define IDA_SHELL_EMPTY_RECYCLE 163 -#define IDA_SHELL_DELETE 164 -#define IDA_SHELL_DELETE1 169 -#define IDA_SHELL_DOWNLOAD 170 +#define IDA_SHELL_SEARCHING_INDEX 151 +#define IDA_SHELL_COPY 160 +#define IDA_SHELL_COPY1 161 +#define IDA_SHELL_COPY2 167 +#define IDA_SHELL_COPY3 168 +#define IDA_SHELL_RECYCLE 162 +#define IDA_SHELL_EMPTY_RECYCLE 163 +#define IDA_SHELL_DELETE 164 +#define IDA_SHELL_DELETE1 169 +#define IDA_SHELL_DOWNLOAD 170 /* Desktop Browser commands */ #define FCIDM_DESKBROWSER_CLOSE 0xA004

8 years, 5 months

[jimtabor] 71959: [User32] - Fix log out shutdown dialog window input. See CORE-11633 #resolve

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Jul 18 02:35:46 2016 New Revision: 71959 URL: http://svn.reactos.org/svn/reactos?rev=71959&view=rev Log: [User32] - Fix log out shutdown dialog window input. See CORE-11633 #resolve Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Mon Jul 18 02:35:46 2016 @@ -532,7 +532,7 @@ if (!(GetWindowLongPtrW( hwnd, GWL_STYLE ) & DS_NOIDLEMSG)) { /* No message present -> send ENTERIDLE and wait */ - if (owner) SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); + SendMessageW( owner, WM_ENTERIDLE, MSGF_DIALOGBOX, (LPARAM)hwnd ); } GetMessageW( &msg, 0, 0, 0 ); } @@ -919,25 +919,42 @@ if (modal_owner && owner) { - HWND parent; + HWND parent = NULL; /* * Owner needs to be top level window. We need to duplicate the logic from server, * because we need to disable it before creating dialog window. Note that we do that * even if dialog has WS_CHILD, but only for modal dialogs, which matched what * Windows does. */ - while ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) - { - parent = GetParent( owner ); - if (!parent || parent == GetDesktopWindow()) break; - owner = parent; + + ////// Wine'ie babies need to fix your code!!!! CORE-11633 + if ((GetWindowLongW( owner, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = owner; + while ((GetWindowLongW( parent, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + { + parent = GetParent( owner ); + if (!parent || parent == GetDesktopWindow()) + { + parent = NULL; + break; + } + } + } + else + parent = GetAncestor( owner, GA_ROOT ); + + if (parent) + { + owner = parent; + + if (IsWindowEnabled( owner )) + { + disabled_owner = owner; + EnableWindow( disabled_owner, FALSE ); + } } *modal_owner = owner; - if (IsWindowEnabled( owner )) - { - disabled_owner = owner; - EnableWindow( disabled_owner, FALSE ); - } } if (unicode) @@ -1052,7 +1069,6 @@ } return hwnd; } - //if (modal && ownerEnabled) DIALOG_EnableOwner(owner); if (disabled_owner) EnableWindow( disabled_owner, TRUE ); IntNotifyWinEvent(EVENT_SYSTEM_DIALOGEND, hwnd, OBJID_WINDOW, CHILDID_SELF, 0); if( IsWindow(hwnd) ) @@ -2036,6 +2052,7 @@ } else owner = GetWindow( hwnd, GW_OWNER ); + if (owner) EnableWindow( owner, TRUE );

8 years, 5 months

[hbelusca] 71958: [EVENTVWR] Commit "Part 1" of my Improvements for the Event Log Viewer. See CORE-11637 description for more details (too long to stay there).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jul 17 23:06:03 2016 New Revision: 71958 URL: http://svn.reactos.org/svn/reactos?rev=71958&view=rev Log: [EVENTVWR] Commit "Part 1" of my Improvements for the Event Log Viewer. See CORE-11637 description for more details (too long to stay there). Added: trunk/reactos/base/applications/mscutils/eventvwr/res/COPYING (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/key.ico (with props) trunk/reactos/base/applications/mscutils/eventvwr/res/lock.ico (with props) Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc trunk/reactos/base/applications/mscutils/eventvwr/resource.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/mscutils/eventvwr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/key.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/mscutils/eventvwr/res/lock.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils…

8 years, 5 months

[tthompson] 71957: [NTFS] Address some minor issues with attrib.c: Fix gcc build. Fix formatting.

by tthompson＠svn.reactos.org

Author: tthompson Date: Sun Jul 17 14:04:01 2016 New Revision: 71957 URL: http://svn.reactos.org/svn/reactos?rev=71957&view=rev Log: [NTFS] Address some minor issues with attrib.c: Fix gcc build. Fix formatting. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Sun Jul 17 14:04:01 2016 @@ -89,7 +89,7 @@ // Allocate some memory for the RunBuffer PUCHAR RunBuffer; - int RunBufferOffset = 0; + ULONG RunBufferOffset = 0; if (!AttrContext->Record.IsNonResident) return STATUS_INVALID_PARAMETER; @@ -108,7 +108,7 @@ // Add newly-assigned clusters to mcb _SEH2_TRY{ if (!FsRtlAddLargeMcbEntry(&DataRunsMCB, - NextVBN, + NextVBN, NextAssignedCluster, RunLength)) { @@ -217,8 +217,6 @@ LONGLONG DataRunOffset; ULONGLONG DataRunLength; LONGLONG DataRunStartLCN; - ULONGLONG NextCluster; - ULONGLONG LastLCN = 0; // Initialize the MCB, potentially catch an exception @@ -237,8 +235,6 @@ // Normal data run. DataRunStartLCN = LastLCN + DataRunOffset; LastLCN = DataRunStartLCN; - NextCluster = LastLCN + DataRunLength; - _SEH2_TRY{ if (!FsRtlAddLargeMcbEntry(DataRunsMCB, @@ -295,14 +291,14 @@ ULONG RunBufferOffset = 0; LONGLONG DataRunOffset; ULONGLONG LastLCN = 0; - LONGLONG Vbn, Lbn, Count; + int i; DPRINT("\t[Vbn, Lbn, Count]\n"); // convert each mcb entry to a data run - for (int i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) + for (i = 0; FsRtlGetNextLargeMcbEntry(DataRunsMCB, i, &Vbn, &Lbn, &Count); i++) { UCHAR DataRunOffsetSize = 0; UCHAR DataRunLengthSize = 0;

8 years, 5 months

← Newer
1
...
8
9
10
11
12
13
14
...
36
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 2016