Ros-diffs January 2014

ros-diffs@reactos.org

14 participants
426 discussions

[hbelusca] 61865: [NTVDM]: Replace my #if 0 by #ifdef IPS_DISPLAY for DPRINTing (or not) the no. of instructions per seconds.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 28 20:18:52 2014 New Revision: 61865 URL: http://svn.reactos.org/svn/reactos?rev=61865&view=rev Log: [NTVDM]: Replace my #if 0 by #ifdef IPS_DISPLAY for DPRINTing (or not) the no. of instructions per seconds. Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Tue Jan 28 20:18:52 2014 @@ -25,6 +25,8 @@ * ntvdm.exe <program> */ #define TESTING + +#define IPS_DISPLAY /* PUBLIC VARIABLES ***********************************************************/ @@ -169,7 +171,7 @@ DWORD StartTickCount, CurrentTickCount; DWORD LastClockUpdate; DWORD LastVerticalRefresh; -#if 0 +#ifdef IPS_DISPLAY DWORD LastCyclePrintout; DWORD Cycles = 0; #endif @@ -243,7 +245,11 @@ QueryPerformanceCounter(&StartPerfCount); /* Set the different last counts to the starting count */ - LastClockUpdate = LastVerticalRefresh = /*LastCyclePrintout =*/ StartTickCount; + LastClockUpdate = LastVerticalRefresh = +#ifdef IPS_DISPLAY + LastCyclePrintout = +#endif + StartTickCount; /* Set the last timer ticks to the current time */ LastTimerTick = LastRtcTick = StartPerfCount; @@ -317,12 +323,12 @@ for (i = 0; (i < STEPS_PER_CYCLE) && VdmRunning; i++) { EmulatorStep(); -#if 0 +#ifdef IPS_DISPLAY Cycles++; #endif } -#if 0 +#ifdef IPS_DISPLAY if ((CurrentTickCount - LastCyclePrintout) >= 1000) { DPRINT1("NTVDM: %lu Instructions Per Second\n", Cycles);

10 years, 10 months

[ekohl] 61864: [MSGINA] Implement the change password dialog.

by ekohl＠svn.reactos.org

Author: ekohl Date: Tue Jan 28 19:32:53 2014 New Revision: 61864 URL: http://svn.reactos.org/svn/reactos?rev=61864&view=rev Log: [MSGINA] Implement the change password dialog. Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt trunk/reactos/dll/win32/msgina/gui.c trunk/reactos/dll/win32/msgina/lang/bg-BG.rc trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc trunk/reactos/dll/win32/msgina/lang/de-DE.rc trunk/reactos/dll/win32/msgina/lang/en-US.rc trunk/reactos/dll/win32/msgina/lang/es-ES.rc trunk/reactos/dll/win32/msgina/lang/fr-FR.rc trunk/reactos/dll/win32/msgina/lang/he-IL.rc trunk/reactos/dll/win32/msgina/lang/id-ID.rc trunk/reactos/dll/win32/msgina/lang/it-IT.rc trunk/reactos/dll/win32/msgina/lang/ja-JP.rc trunk/reactos/dll/win32/msgina/lang/no-NO.rc trunk/reactos/dll/win32/msgina/lang/pl-PL.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ru-RU.rc trunk/reactos/dll/win32/msgina/lang/sk-SK.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msgina/lang/uk-UA.rc trunk/reactos/dll/win32/msgina/msgina.h trunk/reactos/dll/win32/msgina/resource.h Modified: trunk/reactos/dll/win32/msgina/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/CMakeLists.txt [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -17,6 +17,6 @@ add_library(msgina SHARED ${SOURCE}) set_module_type(msgina win32dll) target_link_libraries(msgina wine) -add_importlibs(msgina advapi32 user32 gdi32 userenv msvcrt kernel32 ntdll) +add_importlibs(msgina advapi32 user32 gdi32 secur32 userenv msvcrt kernel32 ntdll) add_pch(msgina msgina.h) add_cd_file(TARGET msgina DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -221,10 +221,193 @@ static +INT +ResourceMessageBox( + IN PGINA_CONTEXT pgContext, + IN HWND hwnd, + IN UINT uType, + IN UINT uCaption, + IN UINT uText) +{ + WCHAR szCaption[256]; + WCHAR szText[256]; + + LoadStringW(pgContext->hDllInstance, uCaption, szCaption, 256); + LoadStringW(pgContext->hDllInstance, uText, szText, 256); + + return pgContext->pWlxFuncs->WlxMessageBox(pgContext->hWlx, + hwnd, + szText, + szCaption, + uType); +} + + +static BOOL -DoChangePassword(HWND hwndDlg) -{ - return FALSE; +DoChangePassword( + IN PGINA_CONTEXT pgContext, + IN HWND hwndDlg) +{ + WCHAR UserName[256]; + WCHAR DomainName[256]; + WCHAR OldPassword[256]; + WCHAR NewPassword1[256]; + WCHAR NewPassword2[256]; + PMSV1_0_CHANGEPASSWORD_REQUEST RequestBuffer = NULL; + PMSV1_0_CHANGEPASSWORD_RESPONSE ResponseBuffer = NULL; + ULONG RequestBufferSize; + ULONG ResponseBufferSize = 0; + LPWSTR Ptr; + LSA_STRING PackageName; + HANDLE LsaHandle = NULL; + ULONG AuthenticationPackage = 0; + BOOL res = FALSE; + NTSTATUS ProtocolStatus; + NTSTATUS Status; + + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_USERNAME, UserName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_DOMAIN, DomainName, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_OLDPWD, OldPassword, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD1, NewPassword1, 256); + GetDlgItemTextW(hwndDlg, IDC_CHANGEPWD_NEWPWD2, NewPassword2, 256); + + /* Compare the two passwords and fail if they do not match */ + if (wcscmp(NewPassword1, NewPassword2) != 0) + { + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONEXCLAMATION, + IDS_CHANGEPWDTITLE, + IDS_NONMATCHINGPASSWORDS); + return FALSE; + } + + /* Calculate the request buffer size */ + RequestBufferSize = sizeof(MSV1_0_CHANGEPASSWORD_REQUEST) + + ((wcslen(DomainName) + 1) * sizeof(WCHAR)) + + ((wcslen(UserName) + 1) * sizeof(WCHAR)) + + ((wcslen(OldPassword) + 1) * sizeof(WCHAR)) + + ((wcslen(NewPassword1) + 1) * sizeof(WCHAR)); + + /* Allocate the request buffer */ + RequestBuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + RequestBufferSize); + if (RequestBuffer == NULL) + { + ERR("HeapAlloc failed\n"); + return FALSE; + } + + /* Initialize the request buffer */ + RequestBuffer->MessageType = MsV1_0ChangePassword; + RequestBuffer->Impersonating = TRUE; + + Ptr = (LPWSTR)((ULONG_PTR)RequestBuffer + sizeof(MSV1_0_CHANGEPASSWORD_REQUEST)); + + /* Pack the domain name */ + RequestBuffer->DomainName.Length = wcslen(DomainName) * sizeof(WCHAR); + RequestBuffer->DomainName.MaximumLength = RequestBuffer->DomainName.Length + sizeof(WCHAR); + RequestBuffer->DomainName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->DomainName.Buffer, + DomainName, + RequestBuffer->DomainName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->DomainName.MaximumLength); + + /* Pack the user name */ + RequestBuffer->AccountName.Length = wcslen(UserName) * sizeof(WCHAR); + RequestBuffer->AccountName.MaximumLength = RequestBuffer->AccountName.Length + sizeof(WCHAR); + RequestBuffer->AccountName.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->AccountName.Buffer, + UserName, + RequestBuffer->AccountName.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->AccountName.MaximumLength); + + /* Pack the old password */ + RequestBuffer->OldPassword.Length = wcslen(OldPassword) * sizeof(WCHAR); + RequestBuffer->OldPassword.MaximumLength = RequestBuffer->OldPassword.Length + sizeof(WCHAR); + RequestBuffer->OldPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->OldPassword.Buffer, + OldPassword, + RequestBuffer->OldPassword.MaximumLength); + + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RequestBuffer->OldPassword.MaximumLength); + + /* Pack the new password */ + RequestBuffer->NewPassword.Length = wcslen(NewPassword1) * sizeof(WCHAR); + RequestBuffer->NewPassword.MaximumLength = RequestBuffer->NewPassword.Length + sizeof(WCHAR); + RequestBuffer->NewPassword.Buffer = Ptr; + + RtlCopyMemory(RequestBuffer->NewPassword.Buffer, + NewPassword1, + RequestBuffer->NewPassword.MaximumLength); + + /* Connect to the LSA server */ + Status = LsaConnectUntrusted(&LsaHandle); + if (!NT_SUCCESS(Status)) + { + ERR("LsaConnectUntrusted failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Get the authentication package */ + RtlInitAnsiString((PANSI_STRING)&PackageName, + MSV1_0_PACKAGE_NAME); + + Status = LsaLookupAuthenticationPackage(LsaHandle, + &PackageName, + &AuthenticationPackage); + if (!NT_SUCCESS(Status)) + { + ERR("LsaLookupAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + + /* Call the authentication package */ + Status = LsaCallAuthenticationPackage(LsaHandle, + AuthenticationPackage, + RequestBuffer, + RequestBufferSize, + (PVOID*)&ResponseBuffer, + &ResponseBufferSize, + &ProtocolStatus); + if (!NT_SUCCESS(Status)) + { + ERR("LsaCallAuthenticationPackage failed (Status 0x%08lx)\n", Status); + goto done; + } + + if (!NT_SUCCESS(ProtocolStatus)) + { + TRACE("LsaCallAuthenticationPackage failed (ProtocolStatus 0x%08lx)\n", ProtocolStatus); + goto done; + } + + res = TRUE; + + ResourceMessageBox(pgContext, + hwndDlg, + MB_OK | MB_ICONINFORMATION, + IDS_CHANGEPWDTITLE, + IDS_PASSWORDCHANGED); + +done: + if (RequestBuffer != NULL) + HeapFree(GetProcessHeap(), 0, RequestBuffer); + + if (ResponseBuffer != NULL) + LsaFreeReturnBuffer(ResponseBuffer); + + if (LsaHandle != NULL) + NtClose(LsaHandle); + + return res; } @@ -255,7 +438,7 @@ switch (LOWORD(wParam)) { case IDOK: - if (DoChangePassword(hwndDlg)) + if (DoChangePassword(pgContext, hwndDlg)) { EndDialog(hwndDlg, TRUE); } @@ -322,7 +505,7 @@ { INT res; - FIXME("OnChangePassword()\n"); + TRACE("OnChangePassword()\n"); res = pgContext->pWlxFuncs->WlxDialogBoxParam( pgContext->hWlx, @@ -332,7 +515,7 @@ ChangePasswordDialogProc, (LPARAM)pgContext); - FIXME("Result: %x\n", res); + TRACE("Result: %x\n", res); return FALSE; } Modified: trunk/reactos/dll/win32/msgina/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/bg-B… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/bg-BG.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -130,4 +130,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/de-D… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/de-DE.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -46,7 +46,7 @@ PUSHBUTTON "Computer sperren", IDC_LOCK, 10, 135, 76, 14 PUSHBUTTON "Abmelden...", IDC_LOGOFF, 100, 135, 75, 14 PUSHBUTTON "Herunterfahren", IDC_SHUTDOWN, 189, 135, 76, 14 - PUSHBUTTON "Password Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14 + PUSHBUTTON "Passwort Ã¤ndern", IDC_CHANGEPWD, 10, 154, 76, 14 PUSHBUTTON "Task-Manager", IDC_TASKMGR, 100, 154, 75, 14 PUSHBUTTON "Abbrechen", IDCANCEL, 189, 154, 76, 14 END @@ -123,6 +123,9 @@ IDS_LOGONMSG "Sie sind angemeldet als %s." IDS_LOGONDATE "Anmeldedatum: %s %s" IDS_COMPUTERLOCKED "Computer ist gesperrt" - IDS_LOCKEDWRONGPASSWORD "Das Kennwort ist falsch. Bitte geben Sie das Kennwort erneut ein. Bei Buchstaben des Kennworts wird GroÃ- und Kleinschreibung unterschieden." + IDS_LOCKEDWRONGPASSWORD "Das Passwort ist falsch. Bitte geben Sie das Passwort erneut ein. Bei Buchstaben des Passworts wird GroÃ- und Kleinschreibung unterschieden." IDS_LOCKEDWRONGUSER "Der Computer ist gesperrt. Nur %s\\%s oder ein Administrator kann den Computer entsperren." + IDS_CHANGEPWDTITLE "Passwort Ã¤ndern" + IDS_NONMATCHINGPASSWORDS "Die eingegebenen Passworte stimmen nicht Ã¼berein. Geben Sie das neue Passwort in beide Textfelder ein." + IDS_PASSWORDCHANGED "Ihr Passwort wurde geÃ¤ndert." END Modified: trunk/reactos/dll/win32/msgina/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/en-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/en-US.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/es-E… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/es-ES.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -127,4 +127,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/fr-F… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/fr-FR.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/he-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/he-IL.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/id-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/id-ID.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -124,4 +124,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/it-I… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/it-IT.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -133,4 +133,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ja-J… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ja-JP.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/no-N… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/no-NO.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -125,4 +125,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/pl-PL.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -134,4 +134,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -127,4 +127,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ru-RU.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -127,4 +127,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/sk-S… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/sk-SK.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -130,4 +130,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/tr-TR.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -127,4 +127,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/uk-UA.rc [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -133,4 +133,7 @@ IDS_COMPUTERLOCKED "Computer locked" IDS_LOCKEDWRONGPASSWORD "The password is wrong. Please enter your password again. Letters in passwords must be typed using the correct case." IDS_LOCKEDWRONGUSER "This computer is locked. Only %s\\%s or an Administrator can unlock this computer." + IDS_CHANGEPWDTITLE "Change Password" + IDS_NONMATCHINGPASSWORDS "The passwords you typed do not match. Type the same password in both text boxes." + IDS_PASSWORDCHANGED "Your password has been changed." END Modified: trunk/reactos/dll/win32/msgina/msgina.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.h?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.h [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -15,8 +15,11 @@ #include <winuser.h> #include <userenv.h> #include <winwlx.h> +#include <ndk/obfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/sefuncs.h> +#include <ntlsa.h> +#include <ntsecapi.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(msgina); Modified: trunk/reactos/dll/win32/msgina/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/resource.… ============================================================================== --- trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/resource.h [iso-8859-1] Tue Jan 28 19:32:53 2014 @@ -34,15 +34,18 @@ #define IDI_LOCKICON 21 -#define IDS_LOGGEDOUTSAS 40000 -#define IDS_LOCKEDSAS 40001 -#define IDS_PRESSCTRLALTDELETE 40002 -#define IDS_ASKFORUSER 40003 -#define IDS_ASKFORPASSWORD 40004 -#define IDS_FORCELOGOFF 40005 -#define IDS_LOCKMSG 40006 -#define IDS_LOGONMSG 40007 -#define IDS_LOGONDATE 40008 -#define IDS_COMPUTERLOCKED 40009 -#define IDS_LOCKEDWRONGPASSWORD 40010 -#define IDS_LOCKEDWRONGUSER 40011 +#define IDS_LOGGEDOUTSAS 40000 +#define IDS_LOCKEDSAS 40001 +#define IDS_PRESSCTRLALTDELETE 40002 +#define IDS_ASKFORUSER 40003 +#define IDS_ASKFORPASSWORD 40004 +#define IDS_FORCELOGOFF 40005 +#define IDS_LOCKMSG 40006 +#define IDS_LOGONMSG 40007 +#define IDS_LOGONDATE 40008 +#define IDS_COMPUTERLOCKED 40009 +#define IDS_LOCKEDWRONGPASSWORD 40010 +#define IDS_LOCKEDWRONGUSER 40011 +#define IDS_CHANGEPWDTITLE 40012 +#define IDS_NONMATCHINGPASSWORDS 40013 +#define IDS_PASSWORDCHANGED 40014

10 years, 10 months

[tfaber] 61863: [MSPAINT] - Fix buffer overflow

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 28 18:25:57 2014 New Revision: 61863 URL: http://svn.reactos.org/svn/reactos?rev=61863&view=rev Log: [MSPAINT] - Fix buffer overflow Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Tue Jan 28 18:25:57 2014 @@ -210,7 +210,7 @@ TCHAR droppedfile[MAX_PATH]; HBITMAP bmNew = NULL; drophandle = (HDROP)wParam; - DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragQueryFile(drophandle, 0, droppedfile, SIZEOF(droppedfile)); DragFinish(drophandle); LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL)

10 years, 11 months

[tfaber] 61862: [MSPAINT] - Fix build

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 28 18:22:46 2014 New Revision: 61862 URL: http://svn.reactos.org/svn/reactos?rev=61862&view=rev Log: [MSPAINT] - Fix build Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Tue Jan 28 18:22:46 2014 @@ -208,10 +208,10 @@ { HDROP drophandle; TCHAR droppedfile[MAX_PATH]; + HBITMAP bmNew = NULL; drophandle = (HDROP)wParam; DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); DragFinish(drophandle); - HBITMAP bmNew = NULL; LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) {

10 years, 11 months

[hbelusca] 61861: [NTVDM]: Remove erroneous comments.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Jan 28 17:26:26 2014 New Revision: 61861 URL: http://svn.reactos.org/svn/reactos?rev=61861&view=rev Log: [NTVDM]: Remove erroneous comments. Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Tue Jan 28 17:26:26 2014 @@ -289,19 +289,16 @@ IOWriteB(PIT_COMMAND_PORT, 0x34); IOWriteB(PIT_DATA_PORT(0), 0x00); IOWriteB(PIT_DATA_PORT(0), 0x00); - // PitSetGate(0, TRUE); /* Initialize PIT Counter 1 */ IOWriteB(PIT_COMMAND_PORT, 0x74); IOWriteB(PIT_DATA_PORT(1), 0x00); IOWriteB(PIT_DATA_PORT(1), 0x00); - // PitSetGate(1, TRUE); /* Initialize PIT Counter 2 */ IOWriteB(PIT_COMMAND_PORT, 0xB4); IOWriteB(PIT_DATA_PORT(2), 0x00); IOWriteB(PIT_DATA_PORT(2), 0x00); - // PitSetGate(2, FALSE); // PitSetGate(2, TRUE); EnableHwIRQ(0, BiosTimerIrq); }

10 years, 11 months

[bfreisen] 61860: [MSPAINT] Apply patches from CORE-7551 (Drag and Drop between Paint and the shell) and CORE-7561 (insert from file)

by bfreisen＠svn.reactos.org

Author: bfreisen Date: Tue Jan 28 15:46:28 2014 New Revision: 61860 URL: http://svn.reactos.org/svn/reactos?rev=61860&view=rev Log: [MSPAINT] Apply patches from CORE-7551 (Drag and Drop between Paint and the shell) and CORE-7561 (insert from file) Modified: trunk/reactos/base/applications/mspaint/dib.c trunk/reactos/base/applications/mspaint/dib.h trunk/reactos/base/applications/mspaint/main.c trunk/reactos/base/applications/mspaint/precomp.h trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/dib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -95,6 +95,17 @@ HeapFree(GetProcessHeap(), 0, buffer); } +void ShowFileLoadError(LPTSTR name) +{ + TCHAR programname[20]; + TCHAR loaderrortext[100]; + TCHAR temptext[500]; + LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); + LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); + _stprintf(temptext, loaderrortext, name); + MessageBox(hMainWnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); +} + void LoadDIBFromFile(HBITMAP * hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes) { @@ -105,18 +116,25 @@ HANDLE hFile; if (!hBitmap) + { + ShowFileLoadError(name); return; + } hFile = CreateFile(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); if (hFile == INVALID_HANDLE_VALUE) + { + ShowFileLoadError(name); return; + } /* read header and check for 'BM' magic */ ReadFile(hFile, &bfh, sizeof(BITMAPFILEHEADER), &dwBytesRead, NULL); if (bfh.bfType != 0x4d42) { CloseHandle(hFile); + ShowFileLoadError(name); return; } @@ -133,6 +151,7 @@ if (!bi) { CloseHandle(hFile); + ShowFileLoadError(name); return; } Modified: trunk/reactos/base/applications/mspaint/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/dib.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/dib.h [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -16,3 +16,5 @@ int vRes); void LoadDIBFromFile(HBITMAP *hBitmap, LPTSTR name, LPSYSTEMTIME time, int *size, int *hRes, int *vRes); + +void ShowFileLoadError(LPTSTR name); Modified: trunk/reactos/base/applications/mspaint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/main.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -409,6 +409,10 @@ clearHistory(); isAFile = TRUE; } + else + { + exit(0); + } } /* initializing the CHOOSECOLOR structure for use with ChooseColor */ @@ -489,6 +493,9 @@ /* Make the window visible on the screen */ ShowWindow (hwnd, nFunsterStil); + /* inform the system, that the main window accepts dropped files */ + DragAcceptFiles(hwnd, TRUE); + /* Run the message loop. It will run until GetMessage() returns 0 */ while (GetMessage(&messages, NULL, 0, 0)) { Modified: trunk/reactos/base/applications/mspaint/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/precomp.h [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -9,6 +9,7 @@ #include <commctrl.h> #include <tchar.h> #include <stdlib.h> +#include <shellapi.h> #include "definitions.h" #include "drawing.h" Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Tue Jan 28 15:46:28 2014 @@ -10,8 +10,6 @@ /* INCLUDES *********************************************************/ #include "precomp.h" - -#include <shellapi.h> #include "dialogs.h" #include "registry.h" @@ -162,6 +160,43 @@ } } +void +UpdateApplicationProperties(HBITMAP bitmap, LPTSTR newfilename, LPTSTR newfilepathname) +{ + TCHAR tempstr[1000]; + TCHAR resstr[100]; + insertReversible(bitmap); + updateCanvasAndScrollbars(); + CopyMemory(filename, newfilename, sizeof(filename)); + CopyMemory(filepathname, newfilepathname, sizeof(filepathname)); + LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); + _stprintf(tempstr, resstr, filename); + SetWindowText(hMainWnd, tempstr); + clearHistory(); + isAFile = TRUE; +} + +void +InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) +{ + HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); + SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); + SendMessage(window, WM_COMMAND, ID_RECTSEL, 0); + + DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(bitmap, + IMAGE_BITMAP, 0, 0, + LR_COPYRETURNORG))); + newReversible(); + rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; + rectSel_dest[0] = rectSel_dest[1] = 0; + rectSel_dest[2] = GetDIBWidth(hSelBm); + rectSel_dest[3] = GetDIBHeight(hSelBm); + BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], + hSelDC, 0, 0, SRCCOPY); + placeSelWin(); + ShowWindow(hSelection, SW_SHOW); +} + BOOL drawing; LRESULT CALLBACK @@ -169,6 +204,25 @@ { switch (message) /* handle the messages */ { + case WM_DROPFILES: + { + HDROP drophandle; + TCHAR droppedfile[MAX_PATH]; + drophandle = (HDROP)wParam; + DragQueryFile(drophandle, 0, droppedfile, sizeof(droppedfile)); + DragFinish(drophandle); + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, droppedfile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + TCHAR *pathend; + pathend = _tcsrchr(droppedfile, '\\'); + pathend++; + UpdateApplicationProperties(bmNew, pathend, pathend); + } + break; + } + case WM_CREATE: ptStack = NULL; ptSP = 0; @@ -785,27 +839,7 @@ LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); if (bmNew != NULL) { - TCHAR tempstr[1000]; - TCHAR resstr[100]; - insertReversible(bmNew); - updateCanvasAndScrollbars(); - CopyMemory(filename, ofn.lpstrFileTitle, sizeof(filename)); - CopyMemory(filepathname, ofn.lpstrFileTitle, sizeof(filepathname)); - LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); - _stprintf(tempstr, resstr, filename); - SetWindowText(hMainWnd, tempstr); - clearHistory(); - isAFile = TRUE; - } - else - { - TCHAR programname[20]; - TCHAR loaderrortext[100]; - TCHAR temptext[500]; - LoadString(hProgInstance, IDS_PROGRAMNAME, programname, SIZEOF(programname)); - LoadString(hProgInstance, IDS_LOADERRORTEXT, loaderrortext, SIZEOF(loaderrortext)); - _stprintf(temptext, loaderrortext, ofn.lpstrFile); - MessageBox(hwnd, temptext, programname, MB_OK | MB_ICONEXCLAMATION); + UpdateApplicationProperties(bmNew, ofn.lpstrFileTitle, ofn.lpstrFileTitle); } } break; @@ -848,22 +882,7 @@ OpenClipboard(hMainWnd); if (GetClipboardData(CF_BITMAP) != NULL) { - HWND hToolbar = FindWindowEx(hToolBoxContainer, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELONG(TRUE, 0)); - SendMessage(hwnd, WM_COMMAND, ID_RECTSEL, 0); - - DeleteObject(SelectObject(hSelDC, hSelBm = CopyImage(GetClipboardData(CF_BITMAP), - IMAGE_BITMAP, 0, 0, - LR_COPYRETURNORG))); - newReversible(); - rectSel_src[0] = rectSel_src[1] = rectSel_src[2] = rectSel_src[3] = 0; - rectSel_dest[0] = rectSel_dest[1] = 0; - rectSel_dest[2] = GetDIBWidth(hSelBm); - rectSel_dest[3] = GetDIBHeight(hSelBm); - BitBlt(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2], rectSel_dest[3], - hSelDC, 0, 0, SRCCOPY); - placeSelWin(); - ShowWindow(hSelection, SW_SHOW); + InsertSelectionFromHBITMAP(GetClipboardData(CF_BITMAP), hwnd); } CloseClipboard(); break; @@ -898,6 +917,18 @@ case IDM_EDITCOPYTO: if (GetSaveFileName(&ofn) != 0) SaveDIBToFile(hSelBm, ofn.lpstrFile, hDrawingDC, NULL, NULL, fileHPPM, fileVPPM); + break; + case IDM_EDITPASTEFROM: + if (GetOpenFileName(&ofn) != 0) + { + HBITMAP bmNew = NULL; + LoadDIBFromFile(&bmNew, ofn.lpstrFile, &fileTime, &fileSize, &fileHPPM, &fileVPPM); + if (bmNew != NULL) + { + InsertSelectionFromHBITMAP(bmNew, hwnd); + DeleteObject(bmNew); + } + } break; case IDM_COLORSEDITPALETTE: if (ChooseColor(&choosecolor))

10 years, 11 months

[akhaldi] 61859: [PCIX] * Improve the GUIDs situation. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jan 28 11:17:12 2014 New Revision: 61859 URL: http://svn.reactos.org/svn/reactos?rev=61859&view=rev Log: [PCIX] * Improve the GUIDs situation. CORE-7716 Modified: trunk/reactos/drivers/bus/pcix/guid.c Modified: trunk/reactos/drivers/bus/pcix/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/guid.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/guid.c [iso-8859-1] Tue Jan 28 11:17:12 2014 @@ -1,5 +1,6 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include <wdm.h> #include <initguid.h> #include <ntddk.h> #include <wdmguid.h>

10 years, 11 months

[akhaldi] 61858: [ACPI] * Create a main header and move some inclusions to it. CORE-7716

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Jan 28 11:11:36 2014 New Revision: 61858 URL: http://svn.reactos.org/svn/reactos?rev=61858&view=rev Log: [ACPI] * Create a main header and move some inclusions to it. CORE-7716 Added: trunk/reactos/drivers/bus/acpi/precomp.h (with props) Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/acpi/busmgr/bus.c trunk/reactos/drivers/bus/acpi/busmgr/button.c trunk/reactos/drivers/bus/acpi/busmgr/power.c trunk/reactos/drivers/bus/acpi/busmgr/system.c trunk/reactos/drivers/bus/acpi/busmgr/utils.c trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/eval.c trunk/reactos/drivers/bus/acpi/interface.c trunk/reactos/drivers/bus/acpi/main.c trunk/reactos/drivers/bus/acpi/osl.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/drivers/bus/acpi/power.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -6,11 +6,8 @@ * UPDATE HISTORY: * 01-05-2001 CSH Created */ -#include <acpi.h> -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <list.h> + +#include "precomp.h" #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/bus.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -27,12 +27,7 @@ * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/bu… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -22,17 +22,11 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> + +#include <precomp.h> #define NDEBUG #include <debug.h> - - #define _COMPONENT ACPI_BUTTON_COMPONENT ACPI_MODULE_NAME ("acpi_button") Modified: trunk/reactos/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/po… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -40,15 +40,10 @@ * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> - #define _COMPONENT ACPI_POWER_COMPONENT ACPI_MODULE_NAME ("acpi_power") Modified: trunk/reactos/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/sy… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -26,11 +26,8 @@ /* Modified for ReactOS and latest ACPICA * Copyright (C)2009 Samuel Serapion */ -#include <ntddk.h> -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include "list.h" + +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/busmgr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/busmgr/ut… ============================================================================== --- trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/busmgr/utils.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -23,12 +23,7 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ -#include <ntddk.h> - -#include <acpi.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <glue.h> +#include <precomp.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,4 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> -#include <wdmguid.h> -#include <stdio.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> +#include "precomp.h" #include <initguid.h> #include <poclass.h> Modified: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,18 +1,5 @@ -#include <ntddk.h> +#include "precomp.h" -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> -#include <acpiioct.h> - -#include <glue.h> -#include <accommon.h> -#include <acobject.h> -#include <actypes.h> - -#include <wdmguid.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/interface… ============================================================================== --- trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/interface.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> +#include "precomp.h" -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <wdmguid.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <acpiioct.h> +#include "precomp.h" + #include <poclass.h> #define NDEBUG Modified: trunk/reactos/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/osl.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/osl.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -3,11 +3,11 @@ * ACPI Component Architecture Operating System Layer (OSL) for ReactOS * * * *******************************************************************************/ -#include <ntddk.h> - -#include <acpi.h> + +#include "precomp.h" #include <pseh/pseh2.h> + #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,12 +1,5 @@ -#include <ntddk.h> - -#include <acpi.h> - -#include <acpisys.h> -#include <acpi_bus.h> -#include <acpi_drivers.h> - -#include <wdmguid.h> +#include "precomp.h" + #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/bus/acpi/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/power.c?r… ============================================================================== --- trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/power.c [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -1,10 +1,4 @@ -#include <ntddk.h> - -#include <acpi.h> -#include <acpisys.h> - -#include <acpi_bus.h> -#include <acpi_drivers.h> +#include "precomp.h" #define NDEBUG #include <debug.h> Added: trunk/reactos/drivers/bus/acpi/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/precomp.h… ============================================================================== --- trunk/reactos/drivers/bus/acpi/precomp.h (added) +++ trunk/reactos/drivers/bus/acpi/precomp.h [iso-8859-1] Tue Jan 28 11:11:36 2014 @@ -0,0 +1,12 @@ +#ifndef _ACPI_PCH_ +#define _ACPI_PCH_ + +#include <acpi.h> +#include <acpisys.h> +#include <acpi_bus.h> +#include <acpi_drivers.h> +#include <glue.h> +#include <wdmguid.h> +#include <acpiioct.h> + +#endif /* _ACPI_PCH_ */ Propchange: trunk/reactos/drivers/bus/acpi/precomp.h ------------------------------------------------------------------------------ svn:eol-style = native

10 years, 11 months

[tfaber] 61857: [SPELLING] - Fix some typos that say "lastest." Patch by Sergei Antonov

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 28 06:07:56 2014 New Revision: 61857 URL: http://svn.reactos.org/svn/reactos?rev=61857&view=rev Log: [SPELLING] - Fix some typos that say "lastest." Patch by Sergei Antonov Modified: trunk/reactos/base/system/format/format.c trunk/reactos/dll/win32/fmifs/query.c trunk/reactos/dll/win32/setupapi/devinst.c trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/include/reactos/libs/fmifs/fmifs.h Modified: trunk/reactos/base/system/format/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/format.… ============================================================================== --- trunk/reactos/base/system/format/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/format/format.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -276,7 +276,7 @@ WCHAR szFormatW[MAX_PATH]; DWORD Index = 0; BYTE dummy; - BOOLEAN lastestVersion; + BOOLEAN latestVersion; LoadStringAndOem( GetModuleHandle(NULL), STRING_HELP, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); if (!LoadFMIFSEntryPoints()) @@ -286,9 +286,9 @@ } szFormats[0] = 0; - while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &lastestVersion)) + while (QueryAvailableFileSystemFormat(Index++, szFormatW, &dummy, &dummy, &latestVersion)) { - if (!lastestVersion) + if (!latestVersion) continue; if (szFormats[0]) _tcscat(szFormats, _T(", ")); Modified: trunk/reactos/dll/win32/fmifs/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/fmifs/query.c?re… ============================================================================== --- trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/fmifs/query.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -15,12 +15,12 @@ IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion) + OUT BOOLEAN* LatestVersion) { PLIST_ENTRY ListEntry; PIFS_PROVIDER Provider; - if (!FileSystem || !Major ||!Minor ||!LastestVersion) + if (!FileSystem || !Major ||!Minor ||!LatestVersion) return FALSE; ListEntry = ProviderListHead.Flink; @@ -38,7 +38,7 @@ wcscpy(FileSystem, Provider->Name); *Major = 0; /* FIXME */ *Minor = 0; /* FIXME */ - *LastestVersion = TRUE; /* FIXME */ + *LatestVersion = TRUE; /* FIXME */ return TRUE; } Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -211,7 +211,7 @@ * Field[3] Minor version * Field[4] Product type * Field[5] Suite mask - * Remark: lastests fields may be NULL if the information is not provided + * Remark: these fields may be NULL if the information is not provided */ Fields[0] = Section; if (Fields[0] == NULL) Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -214,7 +214,7 @@ (DeviceExtension->MouseButtonState & ~Mask) | (NewButtonData & Mask); } -/* Does lastest initializations for the mouse. This method +/* Does final initializations for the mouse. This method * is called just before connecting the interrupt. */ NTSTATUS Modified: trunk/reactos/include/reactos/libs/fmifs/fmifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fmifs… ============================================================================== --- trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fmifs/fmifs.h [iso-8859-1] Tue Jan 28 06:07:56 2014 @@ -148,7 +148,7 @@ IN OUT PWCHAR FileSystem, /* FIXME: Probably one minimal size is mandatory, but which one? */ OUT UCHAR* Major, OUT UCHAR* Minor, - OUT BOOLEAN* LastestVersion); + OUT BOOLEAN* LatestVersion); BOOL NTAPI QueryDeviceInformation(

10 years, 11 months

[tfaber] 61856: [PEFIXUP] - Use correct struct member for section count. Patch by Sergei Antonov (saproj at gmail dot com)

by tfaber＠svn.reactos.org

Author: tfaber Date: Tue Jan 28 05:49:19 2014 New Revision: 61856 URL: http://svn.reactos.org/svn/reactos?rev=61856&view=rev Log: [PEFIXUP] - Use correct struct member for section count. Patch by Sergei Antonov (saproj at gmail dot com) Modified: trunk/reactos/tools/pefixup.c Modified: trunk/reactos/tools/pefixup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.c?rev=61856&… ============================================================================== --- trunk/reactos/tools/pefixup.c [iso-8859-1] (original) +++ trunk/reactos/tools/pefixup.c [iso-8859-1] Tue Jan 28 05:49:19 2014 @@ -378,7 +378,7 @@ { /* Update section flags */ for (i = 0, section_header = IMAGE_FIRST_SECTION(nt_header); - i < dtohl(nt_header->OptionalHeader.NumberOfRvaAndSizes); + i < dtohl(nt_header->FileHeader.NumberOfSections); i++, section_header++) { if (!strcmp((char*)section_header->Name, ".text") ||

10 years, 11 months

← Newer
1
2
3
4
5
6
7
...
43
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 January 2014