Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[jimtabor] 31588: Add graphics device structure.
by jimtabor＠svn.reactos.org 04 Jan '08

04 Jan '08

Author: jimtabor Date: Fri Jan 4 05:26:09 2008 New Revision: 31588 URL: http://svn.reactos.org/svn/reactos?rev=31588&view=rev Log: Add graphics device structure. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Fri Jan 4 05:26:09 2008 @@ -30,7 +30,16 @@ #define PDEV_DRIVER_PUNTED_CALL 0x00040000 // Driver calls back to GDI engine #define PDEV_CLONE_DEVICE 0x00080000 -typedef struct _GDIPOINTER /* should stay private to ENG */ +// Graphics Device structure. +typedef struct _GRAPHICS_DEVICE +{ + CHAR szNtDeviceName[CCHDEVICENAME]; // Yes char AscII + CHAR szWinDeviceName[CCHDEVICENAME]; // <- chk GetMonitorInfoW MxIxEX.szDevice + struct _GRAPHICS_DEVICE * pNextGraphicsDevice; + DWORD StateFlags; // See DISPLAY_DEVICE_* +} GRAPHICS_DEVICE, *PGRAPHICS_DEVICE; + +typedef struct _GDIPOINTER /* should stay private to ENG? No, part of GDIDEVICE aka HDEV aka PDEV. */ { /* private GDI pointer handling information, required for software emulation */ BOOL Enabled; @@ -76,7 +85,7 @@ HSURF pSurface; // SURFACE for this device. HANDLE hSpooler; // Handle to spooler, if spooler dev driver. ULONG DisplayNumber; - PVOID pGraphicsDev; // PGRAPHICS_DEVICE see VideoFileObject + PVOID pGraphicsDev; // PGRAPHICS_DEVICE DEVMODEW DMW; PVOID pdmwDev; // Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size.

1 0

[cwittich] 31587: inlcude guids for hlink
by cwittich＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: cwittich Date: Thu Jan 3 21:41:28 2008 New Revision: 31587 URL: http://svn.reactos.org/svn/reactos?rev=31587&view=rev Log: inlcude guids for hlink Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=31… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Thu Jan 3 21:41:28 2008 @@ -63,6 +63,7 @@ #include "vfw.h" #include "mapiguid.h" +#include "hlguids.h" #if 0 /* FIXME */ #include "uuids.h"

1 0

[cwittich] 31586: add baseaddress for hlink.dll
by cwittich＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: cwittich Date: Thu Jan 3 21:41:02 2008 New Revision: 31586 URL: http://svn.reactos.org/svn/reactos?rev=31586&view=rev Log: add baseaddress for hlink.dll Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=315… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Thu Jan 3 21:41:02 2008 @@ -62,6 +62,7 @@ <property name="BASEADDRESS_URLMON" value="0x6b3c0000" /> <property name="BASEADDRESS_SERIALUI" value="0x6b3D0000" /> <property name="BASEADDRESS_WINSTA" value="0x6b3D0000" /> + <property name="BASEADDRESS_HLINK" value="0x6C6E0000" /> <property name="BASEADDRESS_DESKMON" value="0x6d400000" /> <property name="BASEADDRESS_DESKADP" value="0x6d410000" /> <property name="BASEADDRESS_WLDAP32" value="0x6e130000" />

1 0

[cwittich] 31585: update hlink headers to wine 0.9.52
by cwittich＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: cwittich Date: Thu Jan 3 21:40:38 2008 New Revision: 31585 URL: http://svn.reactos.org/svn/reactos?rev=31585&view=rev Log: update hlink headers to wine 0.9.52 Added: trunk/reactos/include/psdk/hlguids.h (with props) Modified: trunk/reactos/include/psdk/hlink.idl Added: trunk/reactos/include/psdk/hlguids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hlguids.h?rev… ============================================================================== --- trunk/reactos/include/psdk/hlguids.h (added) +++ trunk/reactos/include/psdk/hlguids.h Thu Jan 3 21:40:38 2008 @@ -1,0 +1,29 @@ +/* + * Implementation of hyperlinking (hlink.dll) + * + * Copyright 2005 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_HLGUIDS_H__ +#define __WINE_HLGUIDS_H__ + +DEFINE_GUID(CLSID_StdHlink, + 0x79eac9d0, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); +DEFINE_GUID(CLSID_StdHlinkBrowseContext, + 0x79eac9d1, 0xbaf9, 0x11ce, 0x8c, 0x82, 0x00, 0xaa,0x00,0x4b,0xa9,0x0b); + +#endif Propchange: trunk/reactos/include/psdk/hlguids.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/hlink.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hlink.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/hlink.idl (original) +++ trunk/reactos/include/psdk/hlink.idl Thu Jan 3 21:40:38 2008 @@ -26,6 +26,7 @@ cpp_quote("HRESULT WINAPI HlinkCreateFromMoniker(IMoniker*, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromString(LPCWSTR, LPCWSTR, LPCWSTR, IHlinkSite*, DWORD, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkCreateFromData(IDataObject*, IHlinkSite*, DWORD dwSiteData, IUnknown*, REFIID, void**);") +cpp_quote("HRESULT WINAPI HlinkCreateExtensionServices(LPCWSTR, HWND, LPCWSTR, LPCWSTR, IUnknown*, REFIID, void**);") cpp_quote("HRESULT WINAPI HlinkQueryCreateFromData(IDataObject*);") cpp_quote("HRESULT WINAPI HlinkClone(IHlink*, REFIID, IHlinkSite*, DWORD, void **);") cpp_quote("HRESULT WINAPI HlinkCreateBrowseContext(IUnknown*, REFIID, void **);") @@ -35,6 +36,17 @@ cpp_quote("HRESULT WINAPI HlinkIsShortcut(LPCWSTR);") cpp_quote("HRESULT WINAPI HlinkTranslateURL(LPCWSTR,DWORD,LPWSTR*);") +typedef enum _HLSR_NOREDEF10 { + HLSR_HOME, + HLSR_SEARCHPAGE, + HLSR_HISTORYFOLDER +} HLSR; + +cpp_quote("HRESULT WINAPI HlinkSetSpecialReference(ULONG uReference, LPCWSTR pwzReference);") +cpp_quote("HRESULT WINAPI HlinkGetSpecialReference(ULONG uReference, LPWSTR *ppwzReference);") + +cpp_quote("#define SID_SHlinkFrame IID_IHlinkFrame") + /***************************************************************************** * IHlink interface */ @@ -274,6 +286,10 @@ [in, unique] IMoniker *pimk, [out] DWORD *pdwRegister); +cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") +cpp_quote("#undef GetObject") +cpp_quote("#endif") + HRESULT GetObject( [in, unique] IMoniker *pimk, [in] BOOL fBindIfRootRegistered, @@ -377,24 +393,24 @@ { typedef IHlinkFrame *LPHLINKFRAME; - HRESULT SetBrowseContext( + HRESULT SetBrowseContext( [in, unique] IHlinkBrowseContext * pihlbc); - HRESULT GetBrowseContext( + HRESULT GetBrowseContext( [out] IHlinkBrowseContext ** ppihlbc); - HRESULT Navigate( - [in] DWORD grfHLNF, - [in, unique] LPBC pbc, - [in, unique] IBindStatusCallback *pibsc, + HRESULT Navigate( + [in] DWORD grfHLNF, + [in, unique] LPBC pbc, + [in, unique] IBindStatusCallback *pibsc, [in, unique] IHlink *pihlNavigate); - HRESULT OnNavigate( - [in] DWORD grfHLNF, - [in, unique] IMoniker *pimkTarget, - [in, unique] LPCWSTR pwzLocation, - [in, unique] LPCWSTR pwzFriendlyName, + HRESULT OnNavigate( + [in] DWORD grfHLNF, + [in, unique] IMoniker *pimkTarget, + [in, unique] LPCWSTR pwzLocation, + [in, unique] LPCWSTR pwzFriendlyName, [in] DWORD dwreserved); - HRESULT UpdateHlink( - [in] ULONG uHLID, - [in, unique] IMoniker *pimkTarget, - [in, unique] LPCWSTR pwzLocation, + HRESULT UpdateHlink( + [in] ULONG uHLID, + [in, unique] IMoniker *pimkTarget, + [in, unique] LPCWSTR pwzLocation, [in, unique] LPCWSTR pwzFriendlyName); }

1 0

[dchapyshev] 31584: - Add Russian Translation
by dchapyshev＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: dchapyshev Date: Thu Jan 3 20:48:05 2008 New Revision: 31584 URL: http://svn.reactos.org/svn/reactos?rev=31584&view=rev Log: - Add Russian Translation Added: trunk/rosapps/roscalc/lang/ru-RU.rc (with props) Modified: trunk/rosapps/roscalc/resource.rc Added: trunk/rosapps/roscalc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/lang/ru-RU.rc?rev=… ============================================================================== --- trunk/rosapps/roscalc/lang/ru-RU.rc (added) +++ trunk/rosapps/roscalc/lang/ru-RU.rc Thu Jan 3 20:48:05 2008 @@ -1,0 +1,365 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Êàëüêóëÿòîð ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29, + 10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29, + 10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27, + 10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24, + 26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Or",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "And",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "8 áàéò",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "4 áàéò",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "2 áàéò",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "1 áàéò",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Ãðàäóñû",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Ðàäèàíû",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Ãðàäû",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Êàëüêóëÿòîð ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Back",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sqrt",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Î ïðîãðàììå" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL 106,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "Êàëüêóëÿòîð ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Âåðñèÿ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Íàïèñàíî Êàðëî Áðàìèíè",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ñòàòèñòèêà" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîïèðîâàòü\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòü\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèä" + BEGIN + MENUITEM "Îáû÷íûé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷íûé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçîâàíèå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíàäöàòåðè÷íûé\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñÿòè÷íûé\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Âîñüìåðè÷íûé\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷íûé\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Ãðàäóñû\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Ðàäèàíû\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Ãðàäû\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Êîëè÷åñòâî öèôð â ãðóïïå", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ñïðàâêà" + BEGIN + MENUITEM "Âûçîâ ñïðàâêè", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Î ïðîãðàììå", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîïèðîâàòü\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòü\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèä" + BEGIN + MENUITEM "Îáû÷íûé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷íûé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçîâàíèå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Øåñòíàäöàòåðè÷íûé\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Äåñÿòè÷íûé\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Âîñüìåðè÷íûé\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Äâîè÷íûé\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "8 áàéò\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "4 áàéò\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "2 áàéò\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "1 áàéò\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Êîëè÷åñòâî öèôð â ãðóïïå", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ñïðàâêà" + BEGIN + MENUITEM "Âûçîâ ñïðàâêè", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Î ïðîãðàììå", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Ïðàâêà" + BEGIN + MENUITEM "Êîïèðîâàòü\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Âñòàâèòü\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Âèä" + BEGIN + MENUITEM "Îáû÷íûé", IDM_VIEW_STANDARD, CHECKED + MENUITEM "Íàó÷íûé", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Ïðåîáðàçîâàíèå", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Êîëè÷åñòâî öèôð â ãðóïïå", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ñïðàâêà" + BEGIN + MENUITEM "Âûçîâ ñïðàâêè", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Î ïðîãðàììå", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "Êàëüêóëÿòîð ReactOS - ñâîáîäíîå ïðîãðàììíîå îáåñïåöåíèå, ðàñïðîñòðàíÿþùååñÿ ïî ëèöåíçèè GNU GPL.\r\n\r\nÂû ìîæåòå ïîëó÷èòü êîïèþ ëèöåíçèè GNU GPL çäåñü:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nÏîëó÷èòü ïåðåâåäåííóþ íà âàø ÿçûê êîïèþ ëèöåíçèè GNU GPL ìîæíî çäåñü:\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "Îøèáêà" + IDS_QUICKHELP "Áûñòðàÿ ñïðàâêà" +END + Propchange: trunk/rosapps/roscalc/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/roscalc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roscalc/resource.rc?rev=31… ============================================================================== --- trunk/rosapps/roscalc/resource.rc (original) +++ trunk/rosapps/roscalc/resource.rc Thu Jan 3 20:48:05 2008 @@ -46,4 +46,5 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/it-IT.rc" +#include "lang/ru-RU.rc"

1 0

[dchapyshev] 31583: - Update Russian translation
by dchapyshev＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: dchapyshev Date: Thu Jan 3 19:26:08 2008 New Revision: 31583 URL: http://svn.reactos.org/svn/reactos?rev=31583&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rasdlg/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ru-R…

1 0

[dchapyshev] 31582: - Update Russian translation for regedit - Small fix English translation for devmgmt
by dchapyshev＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: dchapyshev Date: Thu Jan 3 19:24:08 2008 New Revision: 31582 URL: http://svn.reactos.org/svn/reactos?rev=31582&view=rev Log: - Update Russian translation for regedit - Small fix English translation for devmgmt Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mscutils/devmgmt/lang/en-US.rc Thu Jan 3 19:24:08 2008 @@ -43,7 +43,7 @@ FONT 8,"Tahoma",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc Thu Jan 3 19:24:08 2008 @@ -37,11 +37,11 @@ BEGIN POPUP "&Ôàéë" BEGIN - MENUITEM "Â&ûõîä", ID_REGISTRY_EXIT + MENUITEM "Â&ûõîä", ID_REGISTRY_EXIT END POPUP "&Ñïðàâêà" BEGIN - MENUITEM "&Î ïðîãðàììå", ID_HELP_ABOUT + MENUITEM "&Î ïðîãðàììå", ID_HELP_ABOUT END END @@ -50,19 +50,14 @@ POPUP "&Ðååñòð" BEGIN MENUITEM "&Èìïîðòèðîâàòü ôàéë ðååñòðà...", ID_REGISTRY_IMPORTREGISTRYFILE - MENUITEM "&Ýêñïîðòèðîâàòü ôàéë ðååñòðà...", ID_REGISTRY_EXPORTREGISTRYFILE - - MENUITEM SEPARATOR - MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED - MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Çàãðóçèòü êóñò...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Âûãðóçèòü êóñò...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM SEPARATOR - MENUITEM "&Ïîäêëþ÷èòü ñåòåâîé ðååñòð...", - ID_REGISTRY_CONNECTNETWORKREGISTRY - + MENUITEM "&Ïîäêëþ÷èòü ñåòåâîé ðååñòð...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Îòêëþ÷èòü ñåòåâîé ðååñòð...", - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - , GRAYED + ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR MENUITEM "&Ïå÷àòàü\tCtrl+P", ID_REGISTRY_PRINT, GRAYED MENUITEM SEPARATOR @@ -76,11 +71,11 @@ BEGIN MENUITEM "Êë&þ÷", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&Ñòðîêîâîå çíà÷åíèå", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Áèíàðíîå çíà÷åíèå", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD çíà÷åíèå", ID_EDIT_NEW_DWORDVALUE - MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&Ñòðîêîâûé ïàðàìåòð", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Äâîè÷íûé ïàðàìåòð", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Ïàðàìåòð DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Ìóëüòèñòðîêîâûé ïàðàìåòð", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Ðàñ&øèðÿåìûé ñòðîêîâûé ïàðàìåòð", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "&Ïðàâà äîñòóïà...", ID_EDIT_PERMISSIONS @@ -103,10 +98,8 @@ END POPUP "&Èçáðàííîå" BEGIN - MENUITEM "&Äîáàâèòü â èçáðàííîå", ID_FAVOURITES_ADDTOFAVOURITES - , GRAYED - MENUITEM "&Óäàëèòü èç èçáðàííîãî", ID_FAVOURITES_REMOVEFAVOURITE - , GRAYED + MENUITEM "&Äîáàâèòü â èçáðàííîå", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED + MENUITEM "&Óäàëèòü èç èçáðàííîãî", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED END POPUP "&Ñïðàâêà" BEGIN @@ -120,43 +113,43 @@ BEGIN POPUP "" BEGIN - MENUITEM "&Modify", ID_EDIT_MODIFY - MENUITEM "Modify Binary Data", ID_EDIT_MODIFY_BIN + MENUITEM "&Èçìåíèòü", ID_EDIT_MODIFY + MENUITEM "È&çìåíèòü äâîè÷íûå äàííûå", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "&Delete\tDel", ID_EDIT_DELETE - MENUITEM "&Rename", ID_EDIT_RENAME + MENUITEM "&Óäàëèòü\tDel", ID_EDIT_DELETE + MENUITEM "&Ïåðåèìåíîâàòü", ID_EDIT_RENAME END POPUP "" BEGIN - POPUP "&New" + POPUP "Ñîçä&àòü" BEGIN - MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM "&Êëþ÷", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Ñòðîêîâûé ïàðàìåòð", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Äâîè÷íûé ïàðàìåòð", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Ïàðàìåòð DWORD", ID_EDIT_NEW_DWORDVALUE END END POPUP "" BEGIN - MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH - POPUP "&New" + MENUITEM "Ðàçâåðíóòü/Ñâåðíóòü", ID_TREE_EXPANDBRANCH + POPUP "Ñîçä&àòü" BEGIN - MENUITEM "&Key", ID_EDIT_NEW_KEY + MENUITEM "&Êëþ÷", ID_EDIT_NEW_KEY MENUITEM SEPARATOR - MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE - MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE - MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Ñòðîêîâûé ïàðàìåòð", ID_EDIT_NEW_STRINGVALUE + MENUITEM "&Äâîè÷íûé ïàðàìåòð", ID_EDIT_NEW_BINARYVALUE + MENUITEM "&Ïàðàìåòð DWORD", ID_EDIT_NEW_DWORDVALUE END - MENUITEM "&Find", ID_EDIT_FIND - MENUITEM SEPARATOR - MENUITEM "&Delete", ID_TREE_DELETE - MENUITEM "&Rename", ID_TREE_RENAME - MENUITEM SEPARATOR - MENUITEM "&Export", ID_TREE_EXPORT - MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED - MENUITEM SEPARATOR - MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME + MENUITEM "&Íàéòè", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Óäàëèòü", ID_TREE_DELETE + MENUITEM "&Ïåðåèìåíîâàòü", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Ýêñïîðò", ID_TREE_EXPORT + MENUITEM "Ðàçðå&øåíèÿ...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Êîïèðîâàòü èìÿ êëþ÷à", ID_EDIT_COPYKEYNAME END END @@ -166,63 +159,59 @@ */ IDD_EDIT_STRING DIALOG 32, 24, 252, 84 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | - WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit String" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Value &name:",IDC_STATIC,6,6,134,8 - EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Value data:",IDC_STATIC,6,35,161,8 - EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,142,64,50,14 - PUSHBUTTON "Cancel",IDCANCEL,196,64,50,14 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå ñòðîêîâîãî ïàðàìåòðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàðàìåòð:", IDC_STATIC, 6, 6, 134, 8 + EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Çíà÷åíèå:", IDC_STATIC, 6, 35, 161, 8 + EDITTEXT IDC_VALUE_DATA, 6, 46, 240, 12, ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 142, 64, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 64, 50, 14 END IDD_EDIT_MULTI_STRING DIALOG 32, 24, 252, 174 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | - WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Multi-String" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Value &name:",IDC_STATIC,6,6,134,8 - EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Value data:",IDC_STATIC,6,35,161,8 - EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL - DEFPUSHBUTTON "OK",IDOK,142,154,50,14 - PUSHBUTTON "Cancel",IDCANCEL,196,154,50,14 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå ìóëüòèñòðî÷íîãî ïàðàìåòðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàðàìåòð:", IDC_STATIC, 6, 6, 134, 8 + EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Çíà÷åíèå:", IDC_STATIC, 6, 35, 161, 8 + EDITTEXT IDC_VALUE_DATA, 6, 46, 240, 102, ES_AUTOHSCROLL | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | WS_VSCROLL + DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 154, 50, 14 END IDD_EDIT_BIN_DATA DIALOG 32, 24, 252, 174 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | - WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit Binary Value" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Value &name:",IDC_STATIC,6,6,134,8 - EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Value data:",IDC_STATIC,6,35,161,8 - CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 - DEFPUSHBUTTON "OK",IDOK,142,154,50,14 - PUSHBUTTON "Cancel",IDCANCEL,196,154,50,14 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå äâîè÷íîãî ïàðàìåòðà" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàðàìåòð:", IDC_STATIC, 6, 6, 134, 8 + EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Çíà÷åíèå:", IDC_STATIC, 6, 35, 161, 8 + CONTROL "", IDC_VALUE_DATA, "HexEdit32", WS_VSCROLL | WS_BORDER | WS_TABSTOP, 6, 46, 240, 102 + DEFPUSHBUTTON "OK", IDOK, 142, 154, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 154, 50, 14 END IDD_EDIT_DWORD DIALOG 32, 24, 252, 104 -STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | - WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Edit DWORD" -FONT 8, "MS Shell Dlg" -BEGIN - LTEXT "Value &name:",IDC_STATIC,6,6,134,8 - EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "&Value data:",IDC_STATIC,6,35,161,8 - EDITTEXT IDC_VALUE_DATA,6,46,116,12,ES_AUTOHSCROLL - GROUPBOX "Base",IDC_STATIC,130,35,116,39 - AUTORADIOBUTTON "&Hexadecimal",IDC_FORMAT_HEX,141,46,60,10,WS_GROUP - AUTORADIOBUTTON "&Decimal",IDC_FORMAT_DEC,141,59,60,10 - DEFPUSHBUTTON "OK",IDOK,142,82,50,14 - PUSHBUTTON "Cancel",IDCANCEL,196,82,50,14 +STYLE DS_SETFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Èçìåíåíèå ïàðàìåòðà DWORD" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Ïàðàìåòð:", IDC_STATIC, 6, 6, 134, 8 + EDITTEXT IDC_VALUE_NAME, 6, 17, 240, 12, ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Çíà÷åíèå:", IDC_STATIC, 6, 35, 161, 8 + EDITTEXT IDC_VALUE_DATA, 6, 46, 116, 12, ES_AUTOHSCROLL + GROUPBOX "Ñèñòåìà èñ÷èñëåíèÿ", IDC_STATIC, 130, 35, 116, 39 + AUTORADIOBUTTON "&Øåñòíàäöàòåðè÷íàÿ", IDC_FORMAT_HEX, 141, 46, 90, 10, WS_GROUP + AUTORADIOBUTTON "&Äåñÿòè÷íàÿ", IDC_FORMAT_DEC, 141, 59, 60, 10 + DEFPUSHBUTTON "OK", IDOK, 142, 82, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 196, 82, 50, 14 END /* @@ -255,186 +244,173 @@ STRINGTABLE DISCARDABLE BEGIN - ID_EDIT_MODIFY "Èçìåíÿåò çíà÷åíèå" - ID_EDIT_NEW_KEY "Äîáàâëÿåò íîâûé êëþ÷" - ID_EDIT_NEW_STRINGVALUE "Äîáàâëÿåò íîâîå ñòðîêîâîå çíà÷åíèå" - ID_EDIT_NEW_BINARYVALUE "Äîáàâëÿåò íîâîå áèíàðíîå çíà÷åíèå" - ID_EDIT_NEW_DWORDVALUE "Äîáàâëÿåò íîâîå DWORD-çíà÷åíèå" - ID_REGISTRY_IMPORTREGISTRYFILE "Èìïîðòèðóåò òåêñòîâîé ôàéë â ðååñòð" - ID_REGISTRY_EXPORTREGISTRYFILE - "Ýêñïîðòèðóåò âåñü ðååñòð èëè åãî ÷àñòü â òåêñòîâîé ôàéë" - ID_REGISTRY_CONNECTNETWORKREGISTRY - "Ïîäêëþ÷àåòñÿ ê ðååñòðó óäàë¸ííîãî êîìïüþòåðà" - ID_REGISTRY_DISCONNECTNETWORKREGISTRY - "Îòêëþ÷àåòñÿ îò ðååñòðà óäàë¸ííîãî êîìïüþòåðà" - ID_REGISTRY_PRINT "Ïå÷àòàåò âåñü ðååñòð èëè îãî ÷àñòü" + ID_EDIT_MODIFY "Èçìåíÿåò çíà÷åíèå" + ID_EDIT_NEW_KEY "Äîáàâëÿåò íîâûé êëþ÷" + ID_EDIT_NEW_STRINGVALUE "Äîáàâëÿåò íîâîå ñòðîêîâîå çíà÷åíèå" + ID_EDIT_NEW_BINARYVALUE "Äîáàâëÿåò íîâîå áèíàðíîå çíà÷åíèå" + ID_EDIT_NEW_DWORDVALUE "Äîáàâëÿåò íîâîå DWORD-çíà÷åíèå" + ID_REGISTRY_IMPORTREGISTRYFILE "Èìïîðòèðóåò òåêñòîâîé ôàéë â ðååñòð" + ID_REGISTRY_EXPORTREGISTRYFILE "Ýêñïîðòèðóåò âåñü ðååñòð èëè åãî ÷àñòü â òåêñòîâîé ôàéë" + ID_REGISTRY_CONNECTNETWORKREGISTRY "Ïîäêëþ÷àåòñÿ ê ðååñòðó óäàë¸ííîãî êîìïüþòåðà" + ID_REGISTRY_DISCONNECTNETWORKREGISTRY "Îòêëþ÷àåòñÿ îò ðååñòðà óäàë¸ííîãî êîìïüþòåðà" + ID_REGISTRY_PRINT "Ïå÷àòàåò âåñü ðååñòð èëè îãî ÷àñòü" /* ID_HELP_HELPTOPICS "Îòêðûâàåò ñïðàâêó ðåäàêòîðà ðååñòðà" */ - ID_HELP_ABOUT "Îòîáðàæàåò èíôîðìàöèþ î ïðîãðàììå, íîìåð âåðñèè è àâòîðñêèå ïðàâà" -END - -STRINGTABLE DISCARDABLE -BEGIN - ID_REGISTRY_EXIT "Âûõîä èç ðåäàêòîðà ðååñòðà" + ID_HELP_ABOUT "Îòîáðàæàåò èíôîðìàöèþ î ïðîãðàììå, íîìåð âåðñèè è àâòîðñêèå ïðàâà" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_REGISTRY_EXIT "Âûõîä èç ðåäàêòîðà ðååñòðà" ID_FAVOURITES_ADDTOFAVOURITES "Äîáàâèòü êëþ÷ â èçáðàííîå" ID_FAVOURITES_REMOVEFAVOURITE "Óäàëèòü êëþ÷ èç èçáðàííîãî" - ID_VIEW_STATUSBAR "Ïîêàçàòü èëè ñêðûòü ñòðîêó ñîñòîÿíèÿ" - ID_VIEW_SPLIT "Èçìåíèòü ïîçèöèþ ðàçäåëèòåëÿ ìåæäó äâóìÿ ïàíåëÿìè" - ID_VIEW_REFRESH "Îáíîâëÿåò îêíî" - ID_EDIT_DELETE "Óäàëÿåò âûäåëåíèå" - ID_EDIT_RENAME "Ïåðåèìåíîâûâàåò âûäåëåíèå" - ID_EDIT_COPYKEYNAME "Êîïèðóåò èìÿ âûäåëåííîãî êëþ÷à â áóôåð îáìåíà" - ID_EDIT_FIND "Èùåò òåêñòîâóþ ñòðîêó â êëþ÷å, çíà÷åíèè èëè äàííûõ" - ID_EDIT_FINDNEXT "Èùåò ñëåäóþùåå ñîâïàäåíèå òåêñòà, çàäàííîãî â ïðåäûäóùåì ïîèñêå" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_ERROR "Error" - IDS_WARNING "Warning" - IDS_BAD_KEY "Can't query key '%s'" - IDS_BAD_VALUE "Can't query value '%s'" - IDS_UNSUPPORTED_TYPE "Can't edit keys of this type (%ld)" - IDS_TOO_BIG_VALUE "Value is too big (%ld)" - IDS_MULTI_SZ_EMPTY_STRING "Data of type REG_MULTI_SZ cannot contain empty strings.\nThe empty strings have been removed from the list." - IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?" - IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?" - IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete" - IDS_QUERY_DELETE_ONE "Are you sure you want to delete this value?" - IDS_QUERY_DELETE_MORE "Are you sure you want to delete these values?" - IDS_QUERY_DELETE_CONFIRM "Confirm Value Delete" - IDS_ERR_DELVAL_CAPTION "Error Deleting Values" - IDS_ERR_DELETEVALUE "Unable to delete all specified values!" - IDS_ERR_RENVAL_CAPTION "Error Renaming Value" - IDS_ERR_RENVAL_TOEMPTY "Cannot rename %s. The specified value name is empty. Try another name and try again." - IDS_NEW_KEY "New Key #%d" - IDS_NEW_VALUE "New Value #%d" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_BINARY_EMPTY "(zero-length binary value)" - IDS_DEFAULT_VALUE_NAME "(Default)" - IDS_VALUE_NOT_SET "(value not set)" - IDS_UNKNOWN_TYPE "Unknown type: (0x%lx)" - IDS_MY_COMPUTER "My Computer" - IDS_IMPORT_REG_FILE "Import Registry File" - IDS_EXPORT_REG_FILE "Export Registry File" - IDS_INVALID_DWORD "(invalid DWORD value)" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_FLT_REGFILES "Registration Files" + ID_VIEW_STATUSBAR "Ïîêàçàòü èëè ñêðûòü ñòðîêó ñîñòîÿíèÿ" + ID_VIEW_SPLIT "Èçìåíèòü ïîçèöèþ ðàçäåëèòåëÿ ìåæäó äâóìÿ ïàíåëÿìè" + ID_VIEW_REFRESH "Îáíîâëÿåò îêíî" + ID_EDIT_DELETE "Óäàëÿåò âûäåëåíèå" + ID_EDIT_RENAME "Ïåðåèìåíîâûâàåò âûäåëåíèå" + ID_EDIT_COPYKEYNAME "Êîïèðóåò èìÿ âûäåëåííîãî êëþ÷à â áóôåð îáìåíà" + ID_EDIT_FIND "Èùåò òåêñòîâóþ ñòðîêó â êëþ÷å, çíà÷åíèè èëè äàííûõ" + ID_EDIT_FINDNEXT "Èùåò ñëåäóþùåå ñîâïàäåíèå òåêñòà, çàäàííîãî â ïðåäûäóùåì ïîèñêå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Îøèáêà" + IDS_WARNING "Ïðåäóïðåæäåíèå" + IDS_BAD_KEY "Íå óäàëîñü ïîëó÷èòü êëþ÷ '%s'" + IDS_BAD_VALUE "Íå óäàëîñü ïîëó÷èòü çíà÷åíèå '%s'" + IDS_UNSUPPORTED_TYPE "Íåâîçìîæíî èçìåíèòü êëþ÷è ýòîãî òèïà (%ld)" + IDS_TOO_BIG_VALUE "Çíà÷åíèå ñëèøêîì áîëüøîå (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Äàííûå òèïà REG_MULTI_SZ íå ìîãóò ñîäåðæàòü ïóñòûå ñòðîêè.\nÂñå ïóñòûå ñòðîêè áóäóò óäàëåíû." + IDS_QUERY_DELETE_KEY_ONE "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòîò êëþ÷?" + IDS_QUERY_DELETE_KEY_MORE "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòè êëþ÷è?" + IDS_QUERY_DELETE_KEY_CONFIRM "Ïîäòâåðæäåíèå óäàëåíèÿ êëþ÷à" + IDS_QUERY_DELETE_ONE "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòî çíà÷åíèå?" + IDS_QUERY_DELETE_MORE "Âû äåéñòâèòåëüíî õîòèòå óäàëèòü ýòè çíà÷åíèÿ?" + IDS_QUERY_DELETE_CONFIRM "Ïîäòâåðæäåíèå óäàëåíèÿ çíà÷åíèÿ" + IDS_ERR_DELVAL_CAPTION "Îøèáêà óäàëåíèÿ çíà÷åíèÿ" + IDS_ERR_DELETEVALUE "Íåâîçìîæíî óäàëèòü âñå óêàçàííûå çíà÷åíèÿ!" + IDS_ERR_RENVAL_CAPTION "Îøèáêà ïåðåèìåíîâàíèÿ çíà÷åíèÿ" + IDS_ERR_RENVAL_TOEMPTY "Íåâîçìîæíî ïåðåèìåíîâàòü %s. Óêàçàííîå çíà÷åíèå íå ïóñòîå. Ââåäèòå äðóãîå çíà÷åíèå è ïîâòîðèòå ïîïûòêó." + IDS_NEW_KEY "Íîâûé êëþ÷ #%d" + IDS_NEW_VALUE "Íîâîå çíà÷åíèå #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(äâîè÷íîå çíà÷åíèå íóëåâîé äëèíû)" + IDS_DEFAULT_VALUE_NAME "(Ïî óìîë÷àíèþ)" + IDS_VALUE_NOT_SET "(çíà÷åíèå íå óñòàíîâëåíî)" + IDS_UNKNOWN_TYPE "Íåèçâåñòíûé òèï: (0x%lx)" + IDS_MY_COMPUTER "Ìîé êîìïüþòåð" + IDS_IMPORT_REG_FILE "Èìïîðòèðîâàíèå ôàéëà ðååñòðà" + IDS_EXPORT_REG_FILE "Ýêñïîðòèðîâàíèå ôàéëà ðååñòðà" + IDS_INVALID_DWORD "(íåïðàâèëüíîå çíà÷åíèå DWORD)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Ôàéëû ðååñòðà" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_REGEDIT4 "Win9x/NT4 Registration Files (REGEDIT4)" + IDS_FLT_REGEDIT4 "Ôàéëû ðååñòðà Win9x/NT4 (REGEDIT4)" IDS_FLT_REGEDIT4_FLT "*.reg" - IDS_FLT_ALLFILES "All Files (*.*)" + IDS_FLT_ALLFILES "Âñå ôàéëû (*.*)" IDS_FLT_ALLFILES_FLT "*.*" END STRINGTABLE DISCARDABLE BEGIN - IDS_ACCESS_FULLCONTROL "Full Control" - IDS_ACCESS_READ "Read" - IDS_ACCESS_QUERYVALUE "Query Value" - IDS_ACCESS_SETVALUE "Set Value" - IDS_ACCESS_CREATESUBKEY "Create Subkey" - IDS_ACCESS_ENUMERATESUBKEYS "Enumerate Subkeys" - IDS_ACCESS_NOTIFY "Notify" - IDS_ACCESS_CREATELINK "Create Link" - IDS_ACCESS_DELETE "Delete" - IDS_ACCESS_WRITEDAC "Write DAC" - IDS_ACCESS_WRITEOWNER "Write Owner" - IDS_ACCESS_READCONTROL "Read Control" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_INHERIT_THISKEYONLY "This key only" - IDS_INHERIT_THISKEYANDSUBKEYS "This key and subkeys" - IDS_INHERIT_SUBKEYSONLY "Subkeys only" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_EXPAND "&Expand" - IDS_COLLAPSE "&Collapse" - IDS_GOTO_SUGGESTED_KEY "&Go to '%s'" - IDS_FINISHEDFIND "Finished searching through the registry." + IDS_ACCESS_FULLCONTROL "Ïîëíûé êîíòðîëü" + IDS_ACCESS_READ "×òåíèå" + IDS_ACCESS_QUERYVALUE "Çàïðîñ çíà÷åíèé" + IDS_ACCESS_SETVALUE "Óñòàíîâêà çíà÷åíèé" + IDS_ACCESS_CREATESUBKEY "Ñîçäàíèå ïîäêëþ÷åé" + IDS_ACCESS_ENUMERATESUBKEYS "Ïåðå÷èñëåíèå ïîäêëþ÷åé" + IDS_ACCESS_NOTIFY "Óâåäîìëåíèå" + IDS_ACCESS_CREATELINK "Ñîçäàíèå ñâÿçè" + IDS_ACCESS_DELETE "Óäàëåíèå" + IDS_ACCESS_WRITEDAC "Çàïèñü DAC" + IDS_ACCESS_WRITEOWNER "Ñìåíà âëàäåëüöà" + IDS_ACCESS_READCONTROL "×òåíèå ðàçðåøåíèé" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Òîëüêî ýòîò êëþ÷" + IDS_INHERIT_THISKEYANDSUBKEYS "Òîëüêî ýòîò êëþ÷ è ïîäêëþ÷è" + IDS_INHERIT_SUBKEYSONLY "Òîëüêî ïîäêëþ÷è" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Ðàçâåðíóòü" + IDS_COLLAPSE "&Ñâåðíóòü" + IDS_GOTO_SUGGESTED_KEY "&Ïåðåéòè ê '%s'" + IDS_FINISHEDFIND "Ïîèñê â ðååñòðå çàâåðøåí." END /*****************************************************************/ - - /* * Dialog */ IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 268, 98 -STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | - WS_BORDER +STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER FONT 8, "MS Sans Serif" BEGIN - GROUPBOX "Export Range",IDC_STATIC,2,0,366,48 - CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11 - CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11 - EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12 + GROUPBOX "Äèàïàçîí ýêñïîðòà", IDC_STATIC, 2, 0, 366, 48 + CONTROL "&Âåñü ðååñòð", IDC_EXPORT_ALL, "Button", BS_AUTORADIOBUTTON, 10, 10, 70, 11 + CONTROL "Â&ûáðàííàÿ âåòâü", IDC_EXPORT_BRANCH, "Button", BS_AUTORADIOBUTTON, 10, 22, 100, 11 + EDITTEXT IDC_EXPORT_BRANCH_TEXT, 30, 34, 335, 12 END IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 187, 95 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Add to Favorites" +CAPTION "Äîáàâèòü â èçáðàííîå" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "OK",IDOK,130,7,50,14 - PUSHBUTTON "Îòìåíà",IDCANCEL,130,24,50,14 - LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10 - EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL + DEFPUSHBUTTON "OK", IDOK, 130, 7, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 130, 24, 50, 14 + LTEXT "&Èìÿ:", IDC_STATIC, 7, 7, 70, 10 + EDITTEXT IDC_FAVORITENAME, 7, 26, 110, 13, ES_AUTOHSCROLL END IDD_REMOVEFAVORITES DIALOG DISCARDABLE 0, 0, 164, 135 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Remove Favorites" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "OK",IDOK,107,114,50,14 - PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14 - CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | - WS_BORDER | WS_TABSTOP,7,20,150,90 - LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12 +CAPTION "Óäàëèòü èç èçáðàííîãî" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK", IDOK, 107, 114, 50, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 7, 114, 50, 14 + CONTROL "List1", IDC_FAVORITESLIST, "SysListView32", LVS_LIST | WS_BORDER | WS_TABSTOP, 7, 20, 150, 90 + LTEXT "Âûáåðèòå óäàëÿåìîå:", IDC_STATIC, 7, 7, 99, 12 END IDD_FIND DIALOG DISCARDABLE 0, 0, 254, 82 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Find" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "&Find Next",IDOK,197,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14 - GROUPBOX "Look at",IDC_STATIC,7,25,63,51 - LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10 - EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL - CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,36,35,8 - CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,48,36,8 - CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,14,60,42,8 - CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13 - CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,83,48,90,12 +CAPTION "Ïîèñê" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "&Èñêàòü äàëåå", IDOK, 193, 7, 58, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 193, 24, 58, 14 + GROUPBOX "Ïðîñìàòðèâàòü", IDC_STATIC, 7, 24, 87, 51 + LTEXT "Íà&éòè:", IDC_STATIC, 7, 8, 37, 10 + EDITTEXT IDC_FINDWHAT, 47, 7, 142, 13, ES_AUTOHSCROLL + CONTROL "&Êëþ÷è", IDC_LOOKAT_KEYS, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 36, 51, 8 + CONTROL "&Çíà÷åíèÿ", IDC_LOOKAT_VALUES, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 48, 51, 8 + CONTROL "&Äàííûå", IDC_LOOKAT_DATA, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 14, 60, 51, 8 + CONTROL "&Èñêàòü òîëüêî ñòðîêó öåëèêîì", IDC_MATCHSTRING, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 109, 44, 136, 13 + CONTROL "&Ñ ó÷åòîì ðåãèñòðà", IDC_MATCHCASE, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 109, 60, 90, 12 END IDD_FINDING DIALOGEX 0, 0, 145, 50 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | - WS_CAPTION | WS_SYSMENU -CAPTION "Find" +STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Ïîèñê" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 - PUSHBUTTON "&Cancel",IDCANCEL,93,29,45,14 - LTEXT "Searching the registry...",IDC_STATIC,33,12,83,8 + ICON IDI_REGEDIT, IDC_STATIC, 7, 7, 20, 20 + PUSHBUTTON "&Îòìåíà", IDCANCEL, 93, 29, 45, 14 + LTEXT "Ïîèñê â ðååñòðå...", IDC_STATIC, 33, 12, 83, 8 END /*

1 0

[greatlrd] 31581: cleanu dxeng.c add docs for DxEngGetHdevData
by greatlrd＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: greatlrd Date: Thu Jan 3 18:33:54 2008 New Revision: 31581 URL: http://svn.reactos.org/svn/reactos?rev=31581&view=rev Log: cleanu dxeng.c add docs for DxEngGetHdevData Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Jan 3 18:33:54 2008 @@ -10,9 +10,8 @@ #include <w32k.h> #include <debug.h> + ERESOURCE ghsemShareDevLock; - - ULONG gcEngFuncs = DXENG_INDEX_DxEngLoadImage + 1; DRVFN gaEngFuncs [] = @@ -62,32 +61,6 @@ {DXENG_INDEX_DxEngLoadImage, (PFN)DxEngLoadImage} }; -/************************************************************************/ -/* DxEngNUIsTermSrv */ -/************************************************************************/ - -/* Notes : Check see if termal server got a connections or not */ -BOOL -DxEngNUIsTermSrv() -{ - /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngRedrawDesktop */ -/************************************************************************/ - -/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ -BOOL -DxEngRedrawDesktop() -{ - /* FIXME add redraw code */ - UNIMPLEMENTED; - return TRUE; -} - /*++ * @name DxEngDispUniq @@ -108,35 +81,11 @@ return GdiHandleTable->flDeviceUniq; } -ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. - -/************************************************************************/ -/* DxEngVisRgnUniq */ -/************************************************************************/ -/* Notes : return the VisRgnUniq counter for win32k */ -ULONG -DxEngVisRgnUniq() -{ - return gulVisRgnUniqueness; -} - -/************************************************************************/ -/* DxEngEnumerateHdev */ -/************************************************************************/ -/* Enumerate all drivers in win32k */ -HDEV * -DxEngEnumerateHdev(HDEV *hdev) -{ - /* FIXME Enumerate all drivers in win32k */ - UNIMPLEMENTED; - return FALSE; -} - /*++ * @name DxEngGetDeviceGammaRamp * @implemented * -* The function DxEngGetDeviceGammaRamp gets the gamma ramp in dxg.sys. +* The function DxEngGetDeviceGammaRamp gets the gamma ramp to dxg.sys. * @param HDEV hPDev * The hdev. @@ -202,25 +151,6 @@ { DC_UnlockDc(pDC); return TRUE; -} - - -/************************************************************************/ -/* DxEngCreateMemoryDC */ -/************************************************************************/ -DWORD DxEngCreateMemoryDC(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngScreenAccessCheck */ -/************************************************************************/ -DWORD DxEngScreenAccessCheck() -{ - UNIMPLEMENTED; - return FALSE; } /*++ @@ -276,53 +206,6 @@ return TRUE; } -/************************************************************************/ -/* DxEngLockHdev */ -/************************************************************************/ -DWORD DxEngLockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUnlockHdev */ -/************************************************************************/ -DWORD DxEngUnlockHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngReferenceHdev */ -/************************************************************************/ -DWORD DxEngReferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngIsHdevLockedByCurrentThread */ -/************************************************************************/ -DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/************************************************************************/ -/* DxEngUnreferenceHdev */ -/************************************************************************/ -DWORD DxEngUnreferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - - /*++ * @name DxEngSetDeviceGammaRamp * @implemented @@ -351,36 +234,45 @@ return IntSetDeviceGammaRamp(hPDev, Ramp, Test); } -/************************************************************************/ -/* DxEngSpTearDownSprites */ -/************************************************************************/ -DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSpUnTearDownSprites */ -/************************************************************************/ -DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSpSpritesVisible */ -/************************************************************************/ -DWORD DxEngSpSpritesVisible(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetHdevData */ -/************************************************************************/ +/*++ +* @name DxEngGetHdevData +* @implemented +* +* The function DxEngGetHdevData get a value in hdev + +* @param HDEV hPDev +* The hdev +* +* @param DXEGSHDEVDATA Type +* follow type are supported +* type what it does +* DxEGShDevData_Surface get pointer to Surface handle. +* DxEGShDevData_hSpooler get If the device is a spooler driver. +* DxEGShDevData_DitherFmt get the device iDitherFormat +* DxEGShDevData_FxCaps get the device flGraphicsCaps +* DxEGShDevData_FxCaps2 get the device flGraphicsCaps2 +* DxEGShDevData_DrvFuncs get the device DriverFunctions function table +* DxEGShDevData_dhpdev get the device hPDev the real DHPDEV +* DxEGShDevData_eddg get the device pEDDgpl +* DxEGShDevData_dd_nCount get the device DxDd_nCount +* DxEGShDevData_dd_flags get the device DxDd_Flags +* DxEGShDevData_disable get if the device pdev is disable or not +* DxEGShDevData_metadev get if the device pdev is meta device or not +* DxEGShDevData_display get if the device is primary display driver or not +* DxEGShDevData_Parent get the ppdevParent +* DxEGShDevData_OpenRefs get the pdevOpenRefs counter +* DxEGShDevData_palette get the device RC_PALETTE is set or not +* DxEGShDevData_ldev ATM we do not support the Loader Device driver structure +* DxEGShDevData_GDev get the device pGraphicsDev +* DxEGShDevData_clonedev get the device PDEV_CLONE_DEVICE flag is set or not +* +* @return +* Returns the data we requested +* +* @remarks. +* ReactOS specific: Implementation ins incomplete, I do not save the value into the hdev yet. +* +*--*/ DWORD DxEngGetHdevData(HDEV hDev, DXEGSHDEVDATA Type) @@ -448,11 +340,11 @@ case DxEGShDevData_clonedev: retVal = (DWORD) PDev->flFlags & PDEV_CLONE_DEVICE; break; - + default: - break; + break; } - + return retVal; } @@ -476,7 +368,7 @@ * Returns TRUE for success, FALSE for failure * * @remarks. -* ReactOS specific: Implementation ins incomplete, I do not save the value into the hdev yet. +* none * *--*/ BOOLEAN @@ -493,53 +385,6 @@ } return retVal; } - -/************************************************************************/ -/* DxEngGetDesktopDC */ -/************************************************************************/ -DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteDC */ -/************************************************************************/ -DWORD DxEngDeleteDC(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngCleanDC */ -/************************************************************************/ -BOOLEAN DxEngCleanDC(HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetDCOwner */ -/************************************************************************/ -DWORD DxEngSetDCOwner(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetDCState */ -/************************************************************************/ -DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - - /*++ * @name DxEngGetDCState @@ -600,114 +445,6 @@ return retVal; } -/************************************************************************/ -/* DxEngSelectBitmap */ -/************************************************************************/ -DWORD DxEngSelectBitmap(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetBitmapOwner */ -/************************************************************************/ -DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteSurface */ -/************************************************************************/ -DWORD DxEngDeleteSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetSurfaceData */ -/************************************************************************/ -DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngAltLockSurface */ -/************************************************************************/ -DWORD DxEngAltLockSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUploadPaletteEntryToSurface */ -/************************************************************************/ -DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngMarkSurfaceAsDirectDraw */ -/************************************************************************/ -DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectPaletteToSurface */ -/************************************************************************/ -DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSyncPaletteTableWithDevice */ -/************************************************************************/ -DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetPaletteState */ -/************************************************************************/ -DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetRedirectionBitmap */ -/************************************************************************/ -DWORD DxEngGetRedirectionBitmap(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngLoadImage */ -/************************************************************************/ -DWORD DxEngLoadImage(DWORD x1,DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - /*++ * @name DxEngIncDispUniq * @implemented @@ -728,4 +465,295 @@ return TRUE; } - +/************************************************************************/ +/* DxEngNUIsTermSrv */ +/************************************************************************/ + +/* Notes : Check see if termal server got a connections or not */ +BOOL +DxEngNUIsTermSrv() +{ + /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngRedrawDesktop */ +/************************************************************************/ + +/* Notes : it always return TRUE, and it update whole the screen (redaw current desktop) */ +BOOL +DxEngRedrawDesktop() +{ + /* FIXME add redraw code */ + UNIMPLEMENTED; + return TRUE; +} +ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. + +/************************************************************************/ +/* DxEngVisRgnUniq */ +/************************************************************************/ +/* Notes : return the VisRgnUniq counter for win32k */ +ULONG +DxEngVisRgnUniq() +{ + return gulVisRgnUniqueness; +} + +/************************************************************************/ +/* DxEngEnumerateHdev */ +/************************************************************************/ +/* Enumerate all drivers in win32k */ +HDEV * +DxEngEnumerateHdev(HDEV *hdev) +{ + /* FIXME Enumerate all drivers in win32k */ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngCreateMemoryDC */ +/************************************************************************/ +DWORD DxEngCreateMemoryDC(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngScreenAccessCheck */ +/************************************************************************/ +DWORD DxEngScreenAccessCheck() +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngLockHdev */ +/************************************************************************/ +DWORD DxEngLockHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUnlockHdev */ +/************************************************************************/ +DWORD DxEngUnlockHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngReferenceHdev */ +/************************************************************************/ +DWORD DxEngReferenceHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngIsHdevLockedByCurrentThread */ +/************************************************************************/ +DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/************************************************************************/ +/* DxEngUnreferenceHdev */ +/************************************************************************/ +DWORD DxEngUnreferenceHdev(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetDesktopDC */ +/************************************************************************/ +DWORD DxEngGetDesktopDC(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteDC */ +/************************************************************************/ +DWORD DxEngDeleteDC(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngCleanDC */ +/************************************************************************/ +BOOLEAN DxEngCleanDC(HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCOwner */ +/************************************************************************/ +DWORD DxEngSetDCOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCState */ +/************************************************************************/ +DWORD DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectBitmap */ +/************************************************************************/ +DWORD DxEngSelectBitmap(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetBitmapOwner */ +/************************************************************************/ +DWORD DxEngSetBitmapOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteSurface */ +/************************************************************************/ +DWORD DxEngDeleteSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetSurfaceData */ +/************************************************************************/ +DWORD DxEngGetSurfaceData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngAltLockSurface */ +/************************************************************************/ +DWORD DxEngAltLockSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUploadPaletteEntryToSurface */ +/************************************************************************/ +DWORD DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngMarkSurfaceAsDirectDraw */ +/************************************************************************/ +DWORD DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectPaletteToSurface */ +/************************************************************************/ +DWORD DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSyncPaletteTableWithDevice */ +/************************************************************************/ +DWORD DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetPaletteState */ +/************************************************************************/ +DWORD DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetRedirectionBitmap */ +/************************************************************************/ +DWORD DxEngGetRedirectionBitmap(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngLoadImage */ +/************************************************************************/ +DWORD DxEngLoadImage(DWORD x1,DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpTearDownSprites */ +/************************************************************************/ +DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpUnTearDownSprites */ +/************************************************************************/ +DWORD DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSpSpritesVisible */ +/************************************************************************/ +DWORD DxEngSpSpritesVisible(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +}

1 0

[hpoussin] 31580: Display a message in debug log if umpnpmgr thread stops
by hpoussin＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: hpoussin Date: Thu Jan 3 15:53:17 2008 New Revision: 31580 URL: http://svn.reactos.org/svn/reactos?rev=31580&view=rev Log: Display a message in debug log if umpnpmgr thread stops Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.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 Thu Jan 3 15:53:17 2008 @@ -120,6 +120,10 @@ return 0; } + /* ROS HACK (this should never happen...) */ + DPRINT1("*** Other devices won't be installed correctly. If something\n"); + DPRINT1("*** doesn't work, try to reboot to get a new chance.\n"); + DPRINT("RpcServerThread() done\n"); return 0;

1 0

[akorotaev] 31579: It seems, bugcheck was caused by lack of this line, which somehow been lost while merging
by akorotaev＠svn.reactos.org 03 Jan '08

03 Jan '08

Author: akorotaev Date: Thu Jan 3 03:08:18 2008 New Revision: 31579 URL: http://svn.reactos.org/svn/reactos?rev=31579&view=rev Log: It seems, bugcheck was caused by lack of this line, which somehow been lost while merging Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Thu Jan 3 03:08:18 2008 @@ -2492,6 +2492,8 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; + Context.Consumer = MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER; + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; FileOffset = Context.Offset + Context.Segment->FileOffset;

1 0

← Newer
1
...
46
47
48
49
50
51
52
53
54
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 January 2008