Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 53419: [KMTESTS/IO] - Add IoInterrupt test with a simple test for KeSynchronizeExecution
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 14:09:53 2011 New Revision: 53419 URL: http://svn.reactos.org/svn/reactos?rev=53419&view=rev Log: [KMTESTS/IO] - Add IoInterrupt test with a simple test for KeSynchronizeExecution Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoInterrupt.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Aug 24 14:09:53 2011 @@ -27,6 +27,7 @@ ntos_ex/ExTimer.c ntos_fsrtl/FsRtlExpression.c ntos_io/IoDeviceInterface.c + ntos_io/IoInterrupt.c ntos_io/IoIrp.c ntos_io/IoMdl.c ntos_ke/KeApc.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Aug 24 14:09:53 2011 @@ -30,6 +30,7 @@ </directory> <directory name="ntos_io"> <file>IoDeviceInterface.c</file> + <file>IoInterrupt.c</file> <file>IoIrp.c</file> <file>IoMdl.c</file> </directory> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/testlist.c [iso-8859-1] Wed Aug 24 14:09:53 2011 @@ -20,6 +20,7 @@ KMT_TESTFUNC Test_ExTimer; KMT_TESTFUNC Test_FsRtlExpression; KMT_TESTFUNC Test_IoDeviceInterface; +KMT_TESTFUNC Test_IoInterrupt; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; KMT_TESTFUNC Test_KeApc; @@ -51,6 +52,7 @@ { "Example", Test_Example }, { "FsRtlExpression", Test_FsRtlExpression }, { "IoDeviceInterface", Test_IoDeviceInterface }, + { "IoInterrupt", Test_IoInterrupt }, { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, { "KeApc", Test_KeApc }, Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoInterrupt.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoInterrupt.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoInterrupt.c [iso-8859-1] Wed Aug 24 14:09:53 2011 @@ -1,0 +1,95 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Interrupt test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define NDEBUG +#include <debug.h> + +#define CheckSpinLock(Lock, Locked) do \ +{ \ + if (KmtIsMultiProcessorBuild) \ + ok_eq_ulongptr(*(Lock), (Locked) != 0); \ + else \ + ok_eq_ulongptr(*(Lock), 0); \ +} while (0) + +typedef struct +{ + BOOLEAN ReturnValue; + KIRQL ExpectedIrql; + PKINTERRUPT Interrupt; +} TEST_CONTEXT, *PTEST_CONTEXT; + +static KSYNCHRONIZE_ROUTINE SynchronizeRoutine; + +static +BOOLEAN +NTAPI +SynchronizeRoutine( + IN PVOID Context) +{ + PTEST_CONTEXT TestContext = Context; + + ok_irql(TestContext->ExpectedIrql); + + CheckSpinLock(TestContext->Interrupt->ActualLock, TRUE); + + return TestContext->ReturnValue; +} + +static +VOID +TestSynchronizeExecution(VOID) +{ + KINTERRUPT Interrupt; + TEST_CONTEXT TestContext; + KIRQL SynchIrql; + KIRQL OriginalIrql; + KIRQL Irql; + KSPIN_LOCK ActualLock; + BOOLEAN Ret; + + RtlFillMemory(&Interrupt, sizeof Interrupt, 0x55); + Interrupt.ActualLock = &ActualLock; + KeInitializeSpinLock(Interrupt.ActualLock); + CheckSpinLock(Interrupt.ActualLock, FALSE); + + TestContext.Interrupt = &Interrupt; + TestContext.ReturnValue = TRUE; + + for (TestContext.ReturnValue = 0; TestContext.ReturnValue <= 2; ++TestContext.ReturnValue) + { + for (OriginalIrql = PASSIVE_LEVEL; OriginalIrql <= HIGH_LEVEL; ++OriginalIrql) + { + /* TODO: don't hardcode this :| */ + if (OriginalIrql == 3 || (OriginalIrql >= 11 && OriginalIrql <= 26) || OriginalIrql == 30) + continue; + KeRaiseIrql(OriginalIrql, &Irql); + for (SynchIrql = max(DISPATCH_LEVEL, OriginalIrql); SynchIrql <= HIGH_LEVEL; ++SynchIrql) + { + if (SynchIrql == 3 || (SynchIrql >= 11 && SynchIrql <= 26) || SynchIrql == 30) + continue; + Interrupt.SynchronizeIrql = SynchIrql; + ok_irql(OriginalIrql); + CheckSpinLock(Interrupt.ActualLock, FALSE); + TestContext.ExpectedIrql = SynchIrql; + Ret = KeSynchronizeExecution(&Interrupt, SynchronizeRoutine, &TestContext); + ok_eq_int(Ret, TestContext.ReturnValue); + ok_irql(OriginalIrql); + CheckSpinLock(Interrupt.ActualLock, FALSE); + /* TODO: Check that all other fields of the interrupt are untouched */ + } + KeLowerIrql(Irql); + } + } +} + +START_TEST(IoInterrupt) +{ + TestSynchronizeExecution(); +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_io/IoInterrupt.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 53418: [DDK/XDK] - Add function types, not only function pointers types for EXPAND_STACK_CALLOUT and KSYNCHRONIZE_ROUTINE
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 14:07:13 2011 New Revision: 53418 URL: http://svn.reactos.org/svn/reactos?rev=53418&view=rev Log: [DDK/XDK] - Add function types, not only function pointers types for EXPAND_STACK_CALLOUT and KSYNCHRONIZE_ROUTINE Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/ketypes.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=53… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Wed Aug 24 14:07:13 2011 @@ -1908,8 +1908,9 @@ #define NX_SUPPORT_POLICY_OPTOUT 3 typedef VOID -(NTAPI *PEXPAND_STACK_CALLOUT)( +(NTAPI EXPAND_STACK_CALLOUT)( IN PVOID Parameter OPTIONAL); +typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; typedef VOID (NTAPI *PTIMER_APC_ROUTINE)( Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=5341… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Wed Aug 24 14:07:13 2011 @@ -1390,8 +1390,9 @@ #define KTIMER_ACTUAL_LENGTH (FIELD_OFFSET(KTIMER, Period) + sizeof(LONG)) typedef BOOLEAN -(NTAPI *PKSYNCHRONIZE_ROUTINE)( +(NTAPI KSYNCHRONIZE_ROUTINE)( IN PVOID SynchronizeContext); +typedef KSYNCHRONIZE_ROUTINE *PKSYNCHRONIZE_ROUTINE; typedef enum _POOL_TYPE { NonPagedPool, Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Wed Aug 24 14:07:13 2011 @@ -826,8 +826,9 @@ #define KTIMER_ACTUAL_LENGTH (FIELD_OFFSET(KTIMER, Period) + sizeof(LONG)) typedef BOOLEAN -(NTAPI *PKSYNCHRONIZE_ROUTINE)( +(NTAPI KSYNCHRONIZE_ROUTINE)( IN PVOID SynchronizeContext); +typedef KSYNCHRONIZE_ROUTINE *PKSYNCHRONIZE_ROUTINE; typedef enum _POOL_TYPE { NonPagedPool, @@ -1007,8 +1008,9 @@ #define NX_SUPPORT_POLICY_OPTOUT 3 typedef VOID -(NTAPI *PEXPAND_STACK_CALLOUT)( +(NTAPI EXPAND_STACK_CALLOUT)( IN PVOID Parameter OPTIONAL); +typedef EXPAND_STACK_CALLOUT *PEXPAND_STACK_CALLOUT; typedef VOID (NTAPI *PTIMER_APC_ROUTINE)(

1 0

[tfaber] 53417: [NTOSKRNL] - Fix return value of KeSynchronizeExecution again... the SynchronizeRoutine also returns BOOLEAN
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 13:05:22 2011 New Revision: 53417 URL: http://svn.reactos.org/svn/reactos?rev=53417&view=rev Log: [NTOSKRNL] - Fix return value of KeSynchronizeExecution again... the SynchronizeRoutine also returns BOOLEAN Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Wed Aug 24 13:05:22 2011 @@ -572,7 +572,7 @@ IN PKSYNCHRONIZE_ROUTINE SynchronizeRoutine, IN PVOID SynchronizeContext OPTIONAL) { - NTSTATUS Status; + BOOLEAN Success; KIRQL OldIrql; /* Raise IRQL */ @@ -582,7 +582,7 @@ KeAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); /* Call the routine */ - Status = SynchronizeRoutine(SynchronizeContext); + Success = SynchronizeRoutine(SynchronizeContext); /* Release lock */ KeReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); @@ -591,7 +591,7 @@ KfLowerIrql(OldIrql); /* Return status */ - return NT_SUCCESS(Status); + return Success; } /* EOF */

1 0

[rharabien] 53416: [CALC] - Reposition controls to match WinXP calculator - Improve Polish translation
by rharabien＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: rharabien Date: Wed Aug 24 12:35:28 2011 New Revision: 53416 URL: http://svn.reactos.org/svn/reactos?rev=53416&view=rev Log: [CALC] - Reposition controls to match WinXP calculator - Improve Polish translation Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ja-JP.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/lang/zh-CN.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan…

1 0

[rharabien] 53415: [3DTEXT] - Don't assume reg key exists - Make rotation independent of computer speed
by rharabien＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: rharabien Date: Wed Aug 24 12:33:45 2011 New Revision: 53415 URL: http://svn.reactos.org/svn/reactos?rev=53415&view=rev Log: [3DTEXT] - Don't assume reg key exists - Make rotation independent of computer speed Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c trunk/reactos/base/applications/screensavers/3dtext/settings.c Modified: trunk/reactos/base/applications/screensavers/3dtext/3dtext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/3dtext.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/3dtext.c [iso-8859-1] Wed Aug 24 12:33:45 2011 @@ -200,6 +200,9 @@ // Handles Rendering GLvoid DrawGLScene(GLvoid) { + // Save ticks count of previous frame here + static DWORD dwTicks = 0; + // Clear The Screen And The Depth Buffer glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); @@ -235,7 +238,9 @@ glColor3f(0.0f, 0.0f, 1.0f); // Increase The Rotation Variable - rot += 0.1f; + if(dwTicks) + rot += (GetTickCount() - dwTicks) / 20.0f; + dwTicks = GetTickCount(); } LRESULT CALLBACK Modified: trunk/reactos/base/applications/screensavers/3dtext/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/settings.c [iso-8859-1] Wed Aug 24 12:33:45 2011 @@ -22,32 +22,29 @@ #include "3dtext.h" -TCHAR m_Text[MAX_PATH]; +TCHAR m_Text[MAX_PATH] = _T("ReactOS Rocks!"); VOID LoadSettings(VOID) { HKEY hkey; DWORD len = MAX_PATH * sizeof(TCHAR); - RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, - _T(""), 0, KEY_READ, NULL, &hkey, NULL); - - if (RegQueryValueEx(hkey, _T("DisplayString"), NULL, NULL, (LPBYTE)m_Text, &len) != ERROR_SUCCESS) - { - _tcscpy(m_Text, _TEXT("ReactOS Rocks!")); - } - - RegCloseKey(hkey); + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, + _T(""), 0, KEY_READ, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + RegQueryValueEx(hkey, _T("DisplayString"), NULL, NULL, (LPBYTE)m_Text, &len); + RegCloseKey(hkey); + } } VOID SaveSettings(VOID) { HKEY hkey; - RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, - _T(""), 0, KEY_WRITE, NULL, &hkey, NULL); - - RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (LPBYTE)m_Text, (_tcslen(m_Text) + 1) * sizeof(TCHAR)); - - RegCloseKey(hkey); + if (RegCreateKeyEx(HKEY_CURRENT_USER, _T("Software\\Microsoft\\ScreenSavers\\Text3D"), 0, + _T(""), 0, KEY_WRITE, NULL, &hkey, NULL) == ERROR_SUCCESS) + { + RegSetValueEx(hkey, _T("DisplayString"), 0, REG_SZ, (LPBYTE)m_Text, (_tcslen(m_Text) + 1) * sizeof(TCHAR)); + RegCloseKey(hkey); + } }

1 0

[rharabien] 53414: [SNDREC32] - Fix about box icon - Improve polish translation
by rharabien＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: rharabien Date: Wed Aug 24 12:32:25 2011 New Revision: 53414 URL: http://svn.reactos.org/svn/reactos?rev=53414&view=rev Log: [SNDREC32] - Fix about box icon - Improve polish translation Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc trunk/reactos/base/applications/sndrec32/lang/de-DE.rc trunk/reactos/base/applications/sndrec32/lang/en-US.rc trunk/reactos/base/applications/sndrec32/lang/es-ES.rc trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc trunk/reactos/base/applications/sndrec32/lang/it-IT.rc trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/cs-CZ.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -16,7 +16,7 @@ CAPTION "ReactOS Záznam zvuku" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "ReactOS Záznam zvuku, verze 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/de-DE.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "Information zum Audiorecorder" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "ReactOS Audiorecorder, Version 1.0",IDC_STATIC,16,16,134,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,16,25,134,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/en-US.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "Information about ReactOS Sound Recorder" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "ReactOS Sound Recorder, version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/es-ES.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "Acerca de Grabadora de sonidos ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "reactOS_sndrec32, version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "Aceptar",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/fr-FR.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "Information à propos de l'Enregistreur de Son ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "Enregistreur de Son ReactOS, version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "Accepter",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/it-IT.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "Informazioni su reactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "reactOS_sndrec32, versione 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/ja-JP.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -11,7 +11,7 @@ CAPTION "reactOS_sndrec32 ÉÖ·éîñ" FONT 9, "MS UI Gothic", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "reactOS_sndrec32, o[W 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/pl-PL.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -16,11 +16,11 @@ IDD_ABOUTBOX DIALOGEX 0, 0, 196, 75 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Informacje o reactOS_sndrec32" +CAPTION "Informacje o Rejestratorze dÅºwiÄku ReactOS" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 - LTEXT "ReactOS_sndrec32, wersja 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX + ICON IDI_SNDREC32,-1,19,14,21,20 + LTEXT "Rejestrator dÅºwiÄku ReactOS, wersja 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP END @@ -29,18 +29,18 @@ BEGIN POPUP "Plik" BEGIN - MENUITEM "Nowy", ID_NEW - MENUITEM "OtwÃ³rz...", ID_FILE_OPEN - MENUITEM "Zapisz", ID_FILE_SAVE, GRAYED - MENUITEM "Zapisz jako...", ID_FILE_SAVEAS, GRAYED + MENUITEM "Nowy", ID_NEW + MENUITEM "OtwÃ³rz...", ID_FILE_OPEN + MENUITEM "Zapisz", ID_FILE_SAVE, GRAYED + MENUITEM "Zapisz jako...", ID_FILE_SAVEAS, GRAYED MENUITEM SEPARATOR - MENUITEM "WyjÅcie", ID_EXIT + MENUITEM "WyjÅcie", ID_EXIT END MENUITEM "todo1", 0 MENUITEM "todo2", 0 POPUP "?" BEGIN - MENUITEM "O programie...", ID__ABOUT + MENUITEM "O programie...", ID__ABOUT END END @@ -55,7 +55,7 @@ IDS_STRPOS "Pozycja: %.2f s" IDS_STRDUR "DÅugoÅÄ: %.2f s" IDS_STRBUF "Bufor: %.2f kb" - IDS_STRFMT "%.1f kHz %u bits" + IDS_STRFMT "%.1f kHz %u bitÃ³w" IDS_STRMONO "mono" IDS_STRSTEREO "stereo" IDS_STRCHAN "%s" Modified: trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sk-SK.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -16,7 +16,7 @@ CAPTION "Èo je reactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "reactOS_sndrec32, verzia 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Autorské práva (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/sv-SE.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -17,7 +17,7 @@ CAPTION "Information om ReactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "ReactOS_sndrec32, version 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/uk-UA.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -19,7 +19,7 @@ CAPTION "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ reactOS_sndrec32" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "reactOS_sndrec32, Ð²ÐµÑÑÑÑ 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "Copyright (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "OK",IDOK,139,54,50,14,WS_GROUP Modified: trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… ============================================================================== --- trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/sndrec32/lang/zh-CN.rc [iso-8859-1] Wed Aug 24 12:32:25 2011 @@ -16,7 +16,7 @@ CAPTION "å³äº ReactOS å½é³æº" FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - ICON 128,IDC_REACTOS_SNDREC32,19,14,21,20 + ICON IDI_SNDREC32,-1,19,14,21,20 LTEXT "ReactOS å½é³æºï¼çæ¬ 1.0",IDC_STATIC,56,16,114,8,SS_NOPREFIX LTEXT "çæææ (C) 2009",IDC_STATIC,55,25,114,8 DEFPUSHBUTTON "ç¡®å®",IDOK,139,54,50,14,WS_GROUP

1 0

[tfaber] 53413: [NTOSKRNL] - Do not return an NTSTATUS from KeSynchronizeExecution, which returns BOOLEAN [KERNEL32] - Do not return an NTSTATUS from BasepGetModuleHandleExW Found by MSVC.
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 12:31:08 2011 New Revision: 53413 URL: http://svn.reactos.org/svn/reactos?rev=53413&view=rev Log: [NTOSKRNL] - Do not return an NTSTATUS from KeSynchronizeExecution, which returns BOOLEAN [KERNEL32] - Do not return an NTSTATUS from BasepGetModuleHandleExW Found by MSVC. Modified: trunk/reactos/dll/win32/kernel32/client/loader.c trunk/reactos/ntoskrnl/ke/i386/irqobj.c Modified: trunk/reactos/dll/win32/kernel32/client/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/loader.c [iso-8859-1] Wed Aug 24 12:31:08 2011 @@ -818,7 +818,7 @@ /* Fail */ BaseSetLastNTError(Status); if (phModule) *phModule = 0; - return Status; + return NT_SUCCESS(Status); } } Modified: trunk/reactos/ntoskrnl/ke/i386/irqobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/irqobj.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/irqobj.c [iso-8859-1] Wed Aug 24 12:31:08 2011 @@ -591,7 +591,7 @@ KfLowerIrql(OldIrql); /* Return status */ - return Status; + return NT_SUCCESS(Status); } /* EOF */

1 0

[tfaber] 53412: [USETUP] - Remove a circular header dependency to make it easier for the poor PCH compiler
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 11:46:06 2011 New Revision: 53412 URL: http://svn.reactos.org/svn/reactos?rev=53412&view=rev Log: [USETUP] - Remove a circular header dependency to make it easier for the poor PCH compiler Modified: trunk/reactos/base/setup/usetup/native/console.c trunk/reactos/base/setup/usetup/native/host_native.h Modified: trunk/reactos/base/setup/usetup/native/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/c… ============================================================================== --- trunk/reactos/base/setup/usetup/native/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/console.c [iso-8859-1] Wed Aug 24 11:46:06 2011 @@ -1,4 +1,4 @@ -#include "host_native.h" +#include "usetup.h" BOOLEAN NATIVE_InitConsole( Modified: trunk/reactos/base/setup/usetup/native/host_native.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/h… ============================================================================== --- trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/host_native.h [iso-8859-1] Wed Aug 24 11:46:06 2011 @@ -1,6 +1,4 @@ #pragma once - -#include "usetup.h" #define SetupInitDefaultQueueCallback(a) NULL #define SetupDefaultQueueCallbackW(a, b, c, d) TRUE

1 0

[tkreuzer] 53411: [FREELDR] Don't use RtlZeroMemory to initialize a pointer
by tkreuzer＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tkreuzer Date: Wed Aug 24 09:59:35 2011 New Revision: 53411 URL: http://svn.reactos.org/svn/reactos?rev=53411&view=rev Log: [FREELDR] Don't use RtlZeroMemory to initialize a pointer Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c Modified: trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/scsiport.c [iso-8859-1] Wed Aug 24 09:59:35 2011 @@ -975,10 +975,9 @@ ULONG FunctionNumber; CHAR VendorIdString[8]; CHAR DeviceIdString[8]; - PCM_RESOURCE_LIST ResourceList; + PCM_RESOURCE_LIST ResourceList = NULL; NTSTATUS Status; - RtlZeroMemory(&ResourceList, sizeof(PCM_RESOURCE_LIST)); SlotNumber.u.AsULONG = 0; /* Loop through all devices */

1 0

[tfaber] 53410: [EVENTLOG] - Don't use sizeof for a variable-length structure - Fix string buffer building
by tfaber＠svn.reactos.org 24 Aug '11

24 Aug '11

Author: tfaber Date: Wed Aug 24 09:45:50 2011 New Revision: 53410 URL: http://svn.reactos.org/svn/reactos?rev=53410&view=rev Log: [EVENTLOG] - Don't use sizeof for a variable-length structure - Fix string buffer building Modified: trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… ============================================================================== --- trunk/reactos/base/services/eventlog/file.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/file.c [iso-8859-1] Wed Aug 24 09:45:50 2011 @@ -959,7 +959,7 @@ PEVENTLOGRECORD pRec; SYSTEMTIME SysTime; WCHAR *str; - UINT i, pos, nStrings; + UINT i, pos; PBYTE Buffer; dwRecSize = @@ -983,7 +983,7 @@ dwRecSize += 4; - Buffer = (BYTE *) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); + Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); if (!Buffer) { @@ -1002,7 +1002,6 @@ pRec->EventID = dwEventId; pRec->EventType = wType; - pRec->NumStrings = wNumStrings; pRec->EventCategory = wCategory; pos = sizeof(EVENTLOGRECORD); @@ -1024,14 +1023,13 @@ } pRec->StringOffset = pos; - for (i = 0, str = lpStrings, nStrings = 0; i < wNumStrings; i++) + for (i = 0, str = lpStrings; i < wNumStrings; i++) { lstrcpyW((WCHAR *) (Buffer + pos), str); pos += (lstrlenW(str) + 1) * sizeof(WCHAR); str += lstrlenW(str) + 1; - nStrings++; - } - pRec->NumStrings = nStrings; + } + pRec->NumStrings = wNumStrings; pRec->DataOffset = pos; if (dwDataSize) Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Wed Aug 24 09:45:50 2011 @@ -397,6 +397,7 @@ DWORD lastRec; DWORD recSize; DWORD dwStringsSize = 0; + DWORD dwUserSidLength = 0; DWORD dwError = ERROR_SUCCESS; WCHAR *lpStrings; int pos = 0; @@ -439,10 +440,10 @@ DPRINT1("Type %hu: %wZ\n", EventType, Strings[i]); break; } - dwStringsSize += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); - } - - lpStrings = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, dwStringsSize * 2); + dwStringsSize += Strings[i]->Length + sizeof UNICODE_NULL; + } + + lpStrings = HeapAlloc(GetProcessHeap(), 0, dwStringsSize); if (!lpStrings) { DPRINT1("Failed to allocate heap\n"); @@ -451,10 +452,14 @@ for (i = 0; i < NumStrings; i++) { - wcscpy((WCHAR*)(lpStrings + pos), Strings[i]->Buffer); - pos += (wcslen(Strings[i]->Buffer) + 1) * sizeof(WCHAR); - } - + CopyMemory(lpStrings + pos, Strings[i]->Buffer, Strings[i]->Length); + pos += Strings[i]->Length / sizeof(WCHAR); + lpStrings[pos] = UNICODE_NULL; + pos += sizeof UNICODE_NULL / sizeof(WCHAR); + } + + if (UserSID) + dwUserSidLength = FIELD_OFFSET(SID, SubAuthority[UserSID->SubAuthorityCount]); LogBuffer = LogfAllocAndBuildNewRecord(&recSize, lastRec, EventType, @@ -462,10 +467,10 @@ EventID, lpLogHandle->szName, ComputerName->Buffer, - sizeof(RPC_SID), - &UserSID, + dwUserSidLength, + UserSID, NumStrings, - (WCHAR*)lpStrings, + lpStrings, DataSize, Data);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs