Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[fireball] 31170: - Reshuflle baseaddresses so no relocations occur during booting. - Give beepmidi.dll a baseaddress. - Silence non-critical trace-style messages in umpnpmgr and in the kernel.
by fireball＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: fireball Date: Wed Dec 12 00:25:10 2007 New Revision: 31170 URL: http://svn.reactos.org/svn/reactos?rev=31170&view=rev Log: - Reshuflle baseaddresses so no relocations occur during booting. - Give beepmidi.dll a baseaddress. - Silence non-critical trace-style messages in umpnpmgr and in the kernel. Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c trunk/reactos/baseaddress.rbuild trunk/reactos/dll/win32/advapi32/advapi32.rbuild trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild trunk/reactos/dll/win32/lsasrv/lsarpc.c Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump… ============================================================================== --- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original) +++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Wed Dec 12 00:25:10 2007 @@ -201,7 +201,7 @@ UNREFERENCED_PARAMETER(BindingHandle); - DPRINT1("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); + DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId); /* Get the users token */ hProcess = OpenProcess(PROCESS_ALL_ACCESS, Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=311… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Wed Dec 12 00:25:10 2007 @@ -30,7 +30,7 @@ <property name="BASEADDRESS_NCPL" value="0x64ea0000" /> <property name="BASEADDRESS_MAIN" value="0x64f40000" /> <property name="BASEADDRESS_INTL" value="0x64fb0000" /> - <property name="BASEADDRESS_CONSOLE" value="0x6E4D0000" /> + <property name="BASEADDRESS_CONSOLE" value="0x6e4d0000" /> <property name="BASEADDRESS_DESK" value="0x65080000" /> <property name="BASEADDRESS_APPWIZ" value="0x65100000" /> <property name="BASEADDRESS_MLANG" value="0x65140000" /> @@ -43,7 +43,7 @@ <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> - <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> + <property name="BASEADDRESS_BROWSEUI" value="0x69cd0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> @@ -102,7 +102,6 @@ <property name="BASEADDRESS_SHLWAPI" value="0x76120000" /> <property name="BASEADDRESS_COMCTL32" value="0x76160000" /> <property name="BASEADDRESS_COMDLG32" value="0x76210000" /> - <property name="BASEADDRESS_OLEAUT32" value="0x76290000" /> <property name="BASEADDRESS_RICHED32" value="0x76340000" /> <property name="BASEADDRESS_D3D8THK" value="0x76340000" /> <property name="BASEADDRESS_RICHED20" value="0x76360000" /> @@ -125,9 +124,10 @@ <property name="BASEADDRESS_CLUSAPI" value="0x76d10000" /> <property name="BASEADDRESS_DHCPCSVC" value="0x76d80000" /> <property name="BASEADDRESS_FMIFS" value="0x76df0000" /> - <property name="BASEADDRESS_RASAPI32" value="0x76ee0000h" /> + <property name="BASEADDRESS_OLEAUT32" value="0x76e00000" /> + <property name="BASEADDRESS_RASAPI32" value="0x76ee0000" /> <property name="BASEADDRESS_WTSAPI32" value="0x76f50000" /> - <property name="BASEADDRESS_MSVFW32" value="0x77400000" /> + <property name="BASEADDRESS_MSVFW32" value="0x76f60000" /> <property name="BASEADDRESS_MSACM32" value="0x77400000" /> <property name="BASEADDRESS_CRTDLL" value="0x77630000" /> <property name="BASEADDRESS_AUTHZ" value="0x77690000" /> @@ -143,7 +143,7 @@ <property name="BASEADDRESS_WSHIRDA" value="0x777f0000" /> <property name="BASEADDRESS_VERSION" value="0x77a40000" /> <property name="BASEADDRESS_OLE32" value="0x77a50000" /> - <property name="BASEADDRESS_OLEPRO32" value="0x77aa0000" /> + <property name="BASEADDRESS_OLEPRO32" value="0x77b10000" /> <property name="BASEADDRESS_ADVAPI32" value="0x77dc0000" /> <property name="BASEADDRESS_USER32" value="0x77e30000" /> <property name="BASEADDRESS_GDI32" value="0x77f70000" /> @@ -153,5 +153,6 @@ <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7c900000" /> <property name="BASEADDRESS_HHCTRL" value="0x7e410000" /> + <property name="BASEADDRESS_BEEPMIDI" value="0x7ef0000" /> <property name="BASEADDRESS_FREETYPE" value="0x7f000000" /> </group> Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.rbuild (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild Wed Dec 12 00:25:10 2007 @@ -1,4 +1,4 @@ -<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> +<module name="advapi32" type="win32dll" baseaddress="${BASEADDRESS_ADVAPI32}" installbase="system32" installname="advapi32.dll"> <importlibrary definition="advapi32.def" /> <include base="advapi32">.</include> Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.rbuild Wed Dec 12 00:25:10 2007 @@ -1,4 +1,4 @@ -<module name="beepmidi" type="win32dll" installbase="system32" installname="beepmidi.dll"> +<module name="beepmidi" type="win32dll" baseaddress="${BASEADDRESS_BEEPMIDI}" installbase="system32" installname="beepmidi.dll"> <importlibrary definition="beepmidi.def" /> <include base="beepmidi">.</include> <define name="UNICODE" /> Modified: trunk/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsarpc.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsarpc.c (original) +++ trunk/reactos/dll/win32/lsasrv/lsarpc.c Wed Dec 12 00:25:10 2007 @@ -129,7 +129,7 @@ PLSAR_POLICY_HANDLE Policy = NULL; NTSTATUS Status; - DPRINT1("LsarClose(0x%p) called!\n", ObjectHandle); + DPRINT("LsarClose(0x%p) called!\n", ObjectHandle); Status = ReferencePolicyHandle((LSA_HANDLE)ObjectHandle, 0,

1 0

[gbrunmar] 31169: Added an older still valid version of the D3D9 SDK
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Wed Dec 12 00:02:03 2007 New Revision: 31169 URL: http://svn.reactos.org/svn/reactos?rev=31169&view=rev Log: Added an older still valid version of the D3D9 SDK Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=31… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Wed Dec 12 00:02:03 2007 @@ -58,9 +58,11 @@ * #defines and error codes */ #ifdef D3D_DEBUG_INFO -#define D3D_SDK_VERSION (32 | 0x80000000) +#define D3D_SDK_VERSION (32 | 0x80000000L) +#define D3D9b_SDK_VERSION (31 | 0x80000000L) #else #define D3D_SDK_VERSION 32 +#define D3D9b_SDK_VERSION 31 #endif #define D3DADAPTER_DEFAULT 0

1 0

[gbrunmar] 31168: * Fixed d3d9.dll stubs * Added first draft of IDirect3D9 implementation based on greatlrd's work
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Tue Dec 11 23:53:17 2007 New Revision: 31168 URL: http://svn.reactos.org/svn/reactos?rev=31168&view=rev Log: * Fixed d3d9.dll stubs * Added first draft of IDirect3D9 implementation based on greatlrd's work Added: trunk/reactos/dll/directx/d3d9/d3d9_private.h - copied, changed from r31064, trunk/reactos/dll/directx/d3d9/d3d9.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… Copied: trunk/reactos/dll/directx/d3d9/d3d9_private.h (from r31064, trunk/reactos/dll/directx/d3d9/d3d9.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv…

1 0

[gbrunmar] 31167: Added debug version of IDirect3D9 interface
by gbrunmar＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: gbrunmar Date: Tue Dec 11 23:37:55 2007 New Revision: 31167 URL: http://svn.reactos.org/svn/reactos?rev=31167&view=rev Log: Added debug version of IDirect3D9 interface Modified: trunk/reactos/include/psdk/d3d9.h Modified: trunk/reactos/include/psdk/d3d9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9.h?rev=31… ============================================================================== --- trunk/reactos/include/psdk/d3d9.h (original) +++ trunk/reactos/include/psdk/d3d9.h Tue Dec 11 23:37:55 2007 @@ -57,7 +57,12 @@ /***************************************************************************** * #defines and error codes */ +#ifdef D3D_DEBUG_INFO +#define D3D_SDK_VERSION (32 | 0x80000000) +#else #define D3D_SDK_VERSION 32 +#endif + #define D3DADAPTER_DEFAULT 0 #define D3DENUM_NO_WHQL_LEVEL 0x00000002L #define D3DPRESENT_BACK_BUFFERS_MAX 3L @@ -176,6 +181,11 @@ STDMETHOD(GetDeviceCaps)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) PURE; STDMETHOD_(HMONITOR, GetAdapterMonitor)(THIS_ UINT Adapter) PURE; STDMETHOD(CreateDevice)(THIS_ UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, struct IDirect3DDevice9** ppReturnedDeviceInterface) PURE; + +#ifdef D3D_DEBUG_INFO + LPCWSTR Version; +#endif + }; #undef INTERFACE

1 0

[dchapyshev] 31166: - Update English and Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 23:07:27 2007 New Revision: 31166 URL: http://svn.reactos.org/svn/reactos?rev=31166&view=rev Log: - Update English and Russian translation Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/syssetup/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/en… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/en-US.rc Tue Dec 11 23:07:27 2007 @@ -75,16 +75,16 @@ "If you are on a network, your computer name must be unique.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Computer Name:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Setup will create a user account on your computer called Administrator. "\ "You can use this account if you need full access to your computer.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Type an Administrator Password that is 14 characters or less.", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 75, 8 - EDITTEXT IDC_ADMINPASSWORD1, 132, 101, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD - LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 132, 120, 172, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Administrator Password:", IDC_STATIC, 54, 104, 105, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "C&onfirm Password:", IDC_STATIC, 54, 123, 105, 8 + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -98,14 +98,14 @@ "currencies, and dates appear.", IDC_STATIC, 53, 7, 253, 20 LTEXT "", IDC_LOCALETEXT, 53, 29, 250, 16 LTEXT "To change system or user locale settings, click Customize.", - IDC_STATIC, 53, 60, 184, 8 - PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 245, 57, 50, 14 + IDC_STATIC, 53, 60, 196, 8 + PUSHBUTTON "&Customize...", IDC_CUSTOMLOCALE, 250, 57, 50, 14 LTEXT "The keyboard layout controls the characters that appear when you type.", IDC_STATIC, 53, 86, 253, 8 LTEXT "", IDC_LAYOUTTEXT, 53, 100, 250, 16 LTEXT "To change the keyboard layout, click Customize.", IDC_STATIC, 53, 126, 184, 8 - PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 245, 122, 50, 14 + PUSHBUTTON "C&ustomize...", IDC_CUSTOMLAYOUT, 250, 122, 50, 14 END @@ -114,12 +114,12 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Date and Time", IDC_STATIC, 53, 7, 253, 8 + LTEXT "Date and Time:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 - LTEXT "Timezone", IDC_STATIC, 53, 42, 253, 8 + LTEXT "Timezone:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL AUTOCHECKBOX "Automatically adjust clock for &daylight saving changes", Modified: trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ru… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/ru-RU.rc Tue Dec 11 23:07:27 2007 @@ -42,9 +42,9 @@ LTEXT "Ââåäèòå âàøå ïîëíîå èìÿ è íàçâàíèå îðãàíèçàöèè.", IDC_STATIC, 54, 7, 242, 21 LTEXT "&Èìÿ:", IDC_STATIC, 54, 37, 44, 8 - EDITTEXT IDC_OWNERNAME, 132, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERNAME, 132, 35, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL LTEXT "&Îðãàíèçàöèÿ:", IDC_STATIC, 54, 57, 47, 8 - EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL + EDITTEXT IDC_OWNERORGANIZATION, 132, 55, 163, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL END @@ -57,16 +57,16 @@ "Åñëè âàø êîìïüþòåð ïîäêëþ÷åí ê ñåòè, òî åãî èìÿ äîëæíî áûòü óíèêàëüíî.", IDC_STATIC, 54, 7, 250, 24 LTEXT "&Èìÿ êîìïüþòåðà:", IDC_STATIC, 54, 38, 75, 8 - EDITTEXT IDC_COMPUTERNAME, 140, 35, 163, 11, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE + EDITTEXT IDC_COMPUTERNAME, 165, 35, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_AUTOHSCROLL | ES_UPPERCASE LTEXT "Ïðè óñòàíîâêå áóäåò ñîçäàí ïðîôèëü ïîëüçîâàòåëÿ ñ èìåíåì Administrator "\ "Âû ìîæåòå èñïîëüçîâàòü ýòîò ïðîôèëü, åñëè âàì íóæíî ïîëó÷èòü ïðàâà àäìèíèñòðàòîðà.", IDC_STATIC, 54, 57, 250, 25 LTEXT "Ââåäèòå ïàðîëü àäìèíèñòðàòîðà (íå áîëåå 14 ñèìâîëîâ).", IDC_STATIC, 54, 87, 250, 8 - LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 110, 8 - EDITTEXT IDC_ADMINPASSWORD1, 142, 101, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + LTEXT "&Ïàðîëü àäìèíèñòðàòîðà:", IDC_STATIC, 54, 104, 96, 8 + EDITTEXT IDC_ADMINPASSWORD1, 165, 101, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD LTEXT "Ï&îâòîðèòå ïàðîëü:", IDC_STATIC, 54, 123, 75, 8 - EDITTEXT IDC_ADMINPASSWORD2, 142, 120, 170, 11, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD + EDITTEXT IDC_ADMINPASSWORD2, 165, 120, 148, 14, WS_VISIBLE | WS_TABSTOP | ES_PASSWORD END @@ -97,9 +97,9 @@ BEGIN LTEXT "Äàòà è âðåìÿ:", IDC_STATIC, 53, 7, 253, 8 CONTROL "", IDC_DATEPICKER, "SysDateTimePick32", - DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 11 + DTS_LONGDATEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 53, 17, 137, 14 CONTROL "", IDC_TIMEPICKER, "SysDateTimePick32", - DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 11 + DTS_TIMEFORMAT | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 200, 17, 54, 14 LTEXT "×àñîâîé ïîÿñ:", IDC_STATIC, 53, 42, 253, 8 COMBOBOX IDC_TIMEZONELIST, 53, 52, 201, 93, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL

1 0

[hpoussin] 31165: Don't create a key name with a final \0
by hpoussin＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: hpoussin Date: Tue Dec 11 23:07:04 2007 New Revision: 31165 URL: http://svn.reactos.org/svn/reactos?rev=31165&view=rev Log: Don't create a key name with a final \0 Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Tue Dec 11 23:07:04 2007 @@ -2704,6 +2704,7 @@ const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); static ULONG DeviceIndexMouse = 0; + UNICODE_STRING HardwareIdKey; PUNICODE_STRING pHardwareId; ULONG DeviceIndex = 0; @@ -2980,8 +2981,12 @@ goto nextdevice; } + /* Prepare hardware id key (hardware id value without final \0) */ + HardwareIdKey = *pHardwareId; + HardwareIdKey.Length -= sizeof(UNICODE_NULL); + /* Add the detected device to Root key */ - InitializeObjectAttributes(&ObjectAttributes, pHardwareId, OBJ_KERNEL_HANDLE, hRootKey, NULL); + InitializeObjectAttributes(&ObjectAttributes, &HardwareIdKey, OBJ_KERNEL_HANDLE, hRootKey, NULL); Status = ZwCreateKey( &hLevel1Key, KEY_CREATE_SUB_KEY, @@ -3012,7 +3017,7 @@ DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); goto nextdevice; } - DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, pHardwareId); + DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, &HardwareIdKey); Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength); if (!NT_SUCCESS(Status)) {

1 0

[dchapyshev] 31164: - Update English and Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 22:31:44 2007 New Revision: 31164 URL: http://svn.reactos.org/svn/reactos?rev=31164&view=rev Log: - Update English and Russian translation Modified: trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc Tue Dec 11 22:31:44 2007 @@ -136,11 +136,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,120,82 +DLG_ABOUT DIALOG 12,0,175,90 CAPTION "About GNU winecalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 70, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc Tue Dec 11 22:31:44 2007 @@ -4,8 +4,8 @@ { IDS_APPNAME, "Êàëüêóëÿòîð" - IDS_COPYRIGHT1, "Êàëüêóëÿòîð 5.0. Ðàñïðîñòðàíÿåòñÿ ïîä LGPL 2" - IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT1, "Êàëüêóëÿòîð 5.0. Ðàñïðîñòðàíÿåòñÿ ïî LGPL 2" + IDS_COPYRIGHT2 "Àâòîðñêèå ïðàâà (ñ) 2003, Äæåìåñ Áðèãñ" IDS_COPYRIGHT3 "Ñàí-Õîñå, Êàëèôîðíèÿ, ÑØÀ" IDS_COPYRIGHT4 "james(a)ActionMessage.com" IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" @@ -112,11 +112,12 @@ VK_F1, IDV_HELP, VIRTKEY END -DLG_ABOUT DIALOG 12,0,175,80 +DLG_ABOUT DIALOG 12,0,175,82 CAPTION "Î ïðîãðàììå GNU WineCalc" STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 9, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "OK", IDOK, 5, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 73, 62, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END WHATS_THIS_MENU MENU DISCARDABLE

1 0

[weiden] 31163: Remove comment, SetEntriesInAcl is now (partly) implemented
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 22:26:28 2007 New Revision: 31163 URL: http://svn.reactos.org/svn/reactos?rev=31163&view=rev Log: Remove comment, SetEntriesInAcl is now (partly) implemented Modified: trunk/reactos/base/system/winlogon/sas.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c (original) +++ trunk/reactos/base/system/winlogon/sas.c Tue Dec 11 22:26:28 2007 @@ -395,7 +395,6 @@ if (SetEntriesInAcl(1, &Access, NULL, &pACL) != ERROR_SUCCESS) { - // SetEntriesInAcl is not implemented yet ERR("Failed to set Access Rights for logoff thread. Logging out will most likely fail.\n"); HeapFree(GetProcessHeap(), 0, pMem);

1 0

[dchapyshev] 31162: - Update Russian translation
by dchapyshev＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: dchapyshev Date: Tue Dec 11 22:17:03 2007 New Revision: 31162 URL: http://svn.reactos.org/svn/reactos?rev=31162&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc Modified: trunk/reactos/base/shell/cmd/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ru-RU.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/ru-RU.rc (original) +++ trunk/reactos/base/shell/cmd/lang/ru-RU.rc Tue Dec 11 22:17:03 2007 @@ -61,7 +61,7 @@ nnn Íîìåð êîäîâîé ñòðàíèöû.\n\n\ Êîìàíäà CHCP áåç ïàðàìåòðà âûâîäèò òåêóùèé íîìåð êîäîâîé ñòðàíèöû.\n" -STRING_CHOICE_HELP, "Æä¸ò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\n\ +STRING_CHOICE_HELP, "Æäåò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\n\ CHOICE [/C[:]ñïèñîê_ñèìâîëîâ][/N][/S][/T[:]c,nn][òåêñò]\n\n\ /C[:]ñïèñîê_ñèìâîëîâ Óêàçûâàåò äîïóñòèìûå ñèìâîëû. Ïî óìîë÷àíèþ ýòî YN.\n\ /N Íå âûâîäèòü ñïèñîê ñèìâîëîâ è ? ïîñëå ïîäñêàçêè.\n\ @@ -149,7 +149,7 @@ èìåíà_ôàéëîâ Èìåíà îäíîãî èëè íåñêîëüêèõ ôàéëîâ.\n\n\ /N Íåâûïîëíÿòü íåïîñðåäñòâåííî îïåðàöèþ óäàëåíèÿ ôàéëà.\n\ /P Çàïðîñ íà ïîäòâåðæäåíèå ïåðåä óäàëåíèåì êàæäîãî ôàéëà.\n\ - /T Ïîêàçûâàåò êîëè÷åñòâî óäàë¸ííûõ ôàéëîâ è îñâîáîäèâøåãîñÿ\n\ + /T Ïîêàçûâàåò êîëè÷åñòâî óäàëåííûõ ôàéëîâ è îñâîáîäèâøåãîñÿ\n\ äèñêîâîãî ïðîñòðàíñòâà.\n\ /Q Îòêëþ÷åíèå çàïðîñà íà ïîäòâåðæäåíèå ïðè óäàëåíèè ôàéëîâ.\n\ /W Ïåðåïèñàòü ôàéë ñëó÷àéíûìè äàííûìè ïåðåä óäàëåíèåì.\n\ @@ -165,7 +165,7 @@ Ïðåôèêñ ""-"" èìååò çíà÷åíèå ÍÅ\n" STRING_DEL_HELP2, "Âñå ôàéëû â êàòàëîãå áóäóò óäàëåíû!\nÂû óâåðåíû (Y/N)?" -STRING_DEL_HELP3, " %lu ôàéë óäàë¸í\n" +STRING_DEL_HELP3, " %lu ôàéë óäàëåí\n" STRING_DEL_HELP4, " %lu ôàéëîâ óäàëåíî\n" STRING_DELAY_HELP, "ïàóçà íà n ñåêóíä èëè ìèëëèñåêóíä\n\ @@ -214,7 +214,7 @@ STRING_DIR_HELP8, "%16i ôàéë(îâ)% 14s áàéò\n" STRING_DIRSTACK_HELP1, "Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ äëÿ èñïîëüçîâàíèÿ êîìàíäîé POPD, çàòåì\n\ -èçìåíÿåò å¸ íà óêàçàííóþ.\n\n\ +èçìåíÿåò åå íà óêàçàííóþ.\n\n\ PUSHD [path | ..]\n\n\ path Óêàçûâàåò äèðåêòîðèþ, êîòîðóþ íàäî ñäåëàòü òåêóùåé\n" @@ -299,7 +299,7 @@ STRING_MKDIR_HELP, "Ñîçäàíèå êàòàëîãà.\n\n\ MKDIR [äèñê:]ïóòü\nMD [äèñê:]ïóòü" -STRING_MEMMORY_HELP1, "Âûâîä îáú¸ìà ñèñòåìíîé ïàìÿòè.\n\nMEMORY" +STRING_MEMMORY_HELP1, "Âûâîä îáúåìà ñèñòåìíîé ïàìÿòè.\n\nMEMORY" STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n\ %13s áàéò âñåãî ôèçè÷åñêîé ïàìÿòè.\n\ @@ -384,7 +384,7 @@ /E Íå âûâîäèòü ñîîáùåíèÿ îá îøèáêàõ.\n\ /N Nothing.\n\ /P Çàïðîñ ïîäòâåðæäåíèÿ ïåðåä ïåðåèìåíîâàíèåì.\n\ - (Not implemented yet!)\n\ + (Íå ðåàëèçîâàíî â äàííûé ìîìåíò!)\n\ /Q Quiet.\n\ /S Ïåðåèìåíîâûâàòü ïîäêàòàëîãè.\n\ /T Âûâîä êîëè÷åñòâà ïåðåèìåíîâàííûõ ôàéëîâ.\n\n\ @@ -422,7 +422,7 @@ TIME [/T][âðåìÿ]\n\n\ /T íå èçìåíÿòü âðåìÿ\n\n\ TIME áåç ïàðàìåòðîâ âûâîäèò òåêóùåå âðåìÿ è çàïðàøèâàåò\n\ -íîâîå âðåìÿ. Íàæàòèå ENTER ñîõðàíÿåò òåêóùåå âðåìÿ.\n" +íîâîå âðåìÿ. Íàæàòèå ENTER ñîõðàíèò òåêóùåå âðåìÿ.\n" STRING_TIME_HELP2, "Ââåäèòå íîâîå âðåìÿ: " @@ -520,7 +520,7 @@ CALL Âûçîâ îäíîãî ïàêåòíîãî ôàéëà èç äðóãîãî.\n\ CD Âûâîä èìåíè ëèáî ñìåíà òåêóùåãî êàòàëîãà.\n\ CHCP Âûâîä èëè ñìåíà òåêóùåãî íîìåðà êîäîâîé ñòðàíèöû.\n\ -CHOICE Æä¸ò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\ +CHOICE Æäåò, ïîêà ïîëüçîâàòåëü íå âûáåðåò îäèí èç óêàçàííûõ â ñïèñêå ñèìâîëîâ.\n\ CLS Î÷èñòêà ýêðàíà.\n\ CMD Çàïóñê íîâîé êîïèè èíòåðïðåòàòîðà êîìàíä.\n\ COLOR Óñòàíîâêà öâåòîâ ïî óìîë÷àíèþ äëÿ òåêñòà è ôîíà.\n\ @@ -546,7 +546,7 @@ POPD Âîñòòàíàâëèâàåò ïðåäûäóùåå çíà÷åíèå òåêóùåé äèðåêòîðèè ñîõðàíåííîå êîìàíäîé\n\ PUSHD.\n\ PROMPT Èçìåíåíèå ïðèãëàøåíèÿ êîìàíäíîé ñòðîêè.\n\ -PUSHD Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ, à ïîòîì ìåíÿåò å¸.\n\ +PUSHD Ñîõðàíÿåò òåêóùóþ äèðåêòîðèþ, à ïîòîì ìåíÿåò åå.\n\ RD Óäàëåíèå êàòàëîãà.\n\ REM Çàïèñûâàåò êîììåíòàðèè (çàìå÷åíèÿ) â ïàêåòíûõ ôàéëàõ.\n\ REN Ïåðåèìåíîâàíèå îäíîãî èëè íåñêîëüêèõ ôàéëîâ èëè êàòàëîãîâ.\n\ @@ -571,7 +571,7 @@ STRING_COPY_OPTION, "YNA" -STRING_ALIAS_ERROR, "Êîìàíäíàÿ ñòðîêà ñëèøêîì äëèííàÿ ïîñëå ðàçâ¸ðòûâàíèÿ ïñåâäîíèìîâ!\n" +STRING_ALIAS_ERROR, "Êîìàíäíàÿ ñòðîêà ñëèøêîì äëèííàÿ ïîñëå ðàçâåðòûâàíèÿ ïñåâäîíèìîâ!\n" STRING_BATCH_ERROR, "Îøèáêà îòêðûòèÿ êîìàíäíîãî ôàéëà\n" STRING_CHCP_ERROR1, "Òåêóùàÿ êîäîâàÿ ñòðàíèöà: %u\n" STRING_CHCP_ERROR4, "Îøèáî÷íàÿ êîäîâàÿ ñòðàíèöà\n" @@ -590,12 +590,12 @@ STRING_COLOR_ERROR3, "Öâåò %x\n" STRING_COLOR_ERROR4, "Îäèíàêîâûå öâåòà!" STRING_CONSOLE_ERROR, "Íåèçâåñòíàÿ îøèáêà: %d\n" -STRING_COPY_ERROR1, "Îøèáêà: Íå ìîãó îòêðûòü èñòî÷íèê - %s!\n" -STRING_COPY_ERROR2, "Îøèáêà: Íå ìîãó êîïèðîâàòü â ñåáÿ!\n" +STRING_COPY_ERROR1, "Îøèáêà: Íåâîçìîæíî îòêðûòü èñòî÷íèê - %s!\n" +STRING_COPY_ERROR2, "Îøèáêà: Íåâîçìîæíî êîïèðîâàòü â ñåáÿ!\n" STRING_COPY_ERROR3, "Îøèáêà çàïèñè!\n" -STRING_COPY_ERROR4, "Îøèáêà: Not implemented yet!\n" +STRING_COPY_ERROR4, "Îøèáêà: Â äàííûé ìîìåíò íå ðåàëèçîâàíî!\n" STRING_DATE_ERROR, "Íåïðàâèëüíàÿ äàòà." -STRING_DEL_ERROR5, "Ôàéë %s áóäåò óäàë¸í! " +STRING_DEL_ERROR5, "Ôàéë %s áóäåò óäàëåí! " STRING_DEL_ERROR6, "Âû óâåðåíû (Y/N)?" STRING_DEL_ERROR7, "Óäàëåíèå: %s\n" STRING_ERROR_ERROR1, "Íåèçâåñòíàÿ îøèáêà! Êîä îøèáêè: 0x%lx\n" @@ -605,7 +605,7 @@ STRING_FOR_ERROR3, "'do' îòñóòñâóåò." STRING_FOR_ERROR4, "íåò êîìàíäû ïîñëå 'do'." STRING_FREE_ERROR1, "Íåïðàâèëüíîå èìÿ äèñêà" -STRING_FREE_ERROR2, "unlabeled" +STRING_FREE_ERROR2, "íåîòìå÷åíî" STRING_GOTO_ERROR1, "Íå îïðåäåëåíà ìåòêà äëÿ GOTO" STRING_GOTO_ERROR2, "Ìåòêà '%s' íå íàéäåíà\n" @@ -624,14 +624,14 @@ STRING_ERROR_PARAMETERF_ERROR, "Íåêîððåêòíûé ôîðìàò ïàðàìåòðà - %c\n" -STRING_ERROR_INVALID_SWITCH, "Íåâåðíûàÿ îïöèÿ - /%c\n" +STRING_ERROR_INVALID_SWITCH, "Íåâåðíûé ïàðàìåòð - /%c\n" STRING_ERROR_TOO_MANY_PARAMETERS, "Ñëèøêîì ìíîãî ïàðàìåòðîâ - %s\n" STRING_ERROR_PATH_NOT_FOUND, "Ïóòü íå íàéäåí\n" STRING_ERROR_FILE_NOT_FOUND, "Ôàéë íå íàéäåí\n" STRING_ERROR_REQ_PARAM_MISSING, "Îòñóòñòâóåò íåîáõîäèìûé ïàðàìåòð\n" STRING_ERROR_INVALID_DRIVE, "Îøèáî÷íîå îïðåäåëåíèå äèñêà\n" STRING_ERROR_INVALID_PARAM_FORMAT, "Îøèáî÷íûé ôîðìàò ïàðàìåòðà - %s\n" -STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè èìÿ ôàéëà\n" +STRING_ERROR_BADCOMMAND, "Íåïðàâèëüíàÿ êîìàíäà èëè íåâåðíîå èìÿ ôàéëà\n" STRING_ERROR_OUT_OF_MEMORY, "Íåõâàòêà ïàìÿòè.\n" STRING_ERROR_CANNOTPIPE, "Îøèáêà! Íåâîçìîæíî èñïîëüçîâàòü pipe! Íåâîçìîæíî ñîçäàòü âðåìåííûé ôàéë!\n" STRING_ERROR_D_PAUSEMSG, "Äëÿ ïðîäîëæåíèÿ íàæìèòå ëþáóþ êëàâèøó . . ." @@ -639,7 +639,7 @@ STRING_PATH_ERROR, "CMD: Íå â ñðåäå îêðóæåíèÿ '%s'\n" -STRING_CMD_SHELLINFO, "\nReactOS Command Line Interpreter" +STRING_CMD_SHELLINFO, "\nÈíòåðïðåòàòîð êîìàíäíîé ñòðîêè ReactOS" STRING_VERSION_RUNVER, " çàïóùåí íà %s" STRING_COPY_FILE , " %d ôàéë(îâ) ñêîïèðîâàíî\n" STRING_DELETE_WIPE, "wiped" @@ -651,6 +651,6 @@ STRING_INVALID_OPERAND, "Íåâåðíûé îïåðàíä." STRING_EXPECTED_CLOSE_PAREN, "Îæèäàåòñÿ ')'." STRING_EXPECTED_NUMBER_OR_VARIABLE,"Îæèäàåòñÿ ÷èñëî èëè íàçâàíèå ïåðåìåííîé." -STRING_SYNTAX_COMMAND_INCORRECT, "Íåêîððåêòíûé ñèíòàêñèñ êîìàíäû." +STRING_SYNTAX_COMMAND_INCORRECT, "Íåâåðíûé ñèíòàêñèñ êîìàíäû." }

1 0

[weiden] 31161: Fix a memory leak in AccpLookupSidByName
by weiden＠svn.reactos.org 11 Dec '07

11 Dec '07

Author: weiden Date: Tue Dec 11 21:56:55 2007 New Revision: 31161 URL: http://svn.reactos.org/svn/reactos?rev=31161&view=rev Log: Fix a memory leak in AccpLookupSidByName Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c Tue Dec 11 21:56:55 2007 @@ -366,7 +366,10 @@ return LsaNtStatusToWinError(Status); if (TranslatedSid->Use == SidTypeUnknown || TranslatedSid->Use == SidTypeInvalid) - return LsaNtStatusToWinError(STATUS_NONE_MAPPED); /* FIXME- what error code? */ + { + Ret = LsaNtStatusToWinError(STATUS_NONE_MAPPED); /* FIXME- what error code? */ + goto Cleanup; + } SidLen = GetLengthSid(TranslatedSid->Sid); ASSERT(SidLen != 0); @@ -387,6 +390,7 @@ else Ret = ERROR_NOT_ENOUGH_MEMORY; +Cleanup: LsaFreeMemory(ReferencedDomains); LsaFreeMemory(TranslatedSid);

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007