Ros-diffs August 2014

ros-diffs@reactos.org

16 participants
226 discussions

[hbelusca] 63857: [TRANSLATIONS] Same remark as for revision 63856, but for "Button"!!

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 10 21:19:34 2014 New Revision: 63857 URL: http://svn.reactos.org/svn/reactos?rev=63857&view=rev Log: [TRANSLATIONS] Same remark as for revision 63856, but for "Button"!! Modified: trunk/reactos/dll/win32/serialui/lang/sq-AL.rc Modified: trunk/reactos/dll/win32/serialui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/sq… ============================================================================== --- trunk/… [View More]

10 years, 8 months

[hbelusca] 63856: [TRANSLATIONS] To Albanian translators!! Be careful, the "Static" string in CONTROL resource controls, is the name of the control class, and as such must NOT be translated!! (see ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 10 21:06:49 2014 New Revision: 63856 URL: http://svn.reactos.org/svn/reactos?rev=63856&view=rev Log: [TRANSLATIONS] To Albanian translators!! Be careful, the "Static" string in CONTROL resource controls, is the name of the control class, and as such must NOT be translated!! (see http://msdn.microsoft.com/en-us/library/windows/desktop/aa380911(v=vs.85).a… ) Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc trunk/reactos/base/shell/… [View More]explorer/explorer-sq.rc trunk/reactos/dll/cpl/console/lang/sq-AL.rc trunk/reactos/dll/cpl/desk/lang/sq-AL.rc trunk/reactos/dll/win32/serialui/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc Modified: trunk/reactos/base/applications/notepad/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -128,7 +128,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "ReactOS Notepad v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 - CONTROL " ", -1, "Statik", 0x50000000, 8, 48, 272, 11 + CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 DEFPUSHBUTTON "Mbyll", IDOK, 114, 149, 44, 15, WS_GROUP ICON IDI_NPICON, -1, 12, 9, 20, 30 EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL Modified: trunk/reactos/base/shell/explorer/explorer-sq.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-sq.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-sq.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -117,8 +117,8 @@ CAPTION "Ekzekuto" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", 101, "Statik", SS_SIMPLE | SS_NOPREFIX, 3, 6, 150, 10 - CONTROL "&Comanda:", -1, "Statik", SS_LEFTNOWORDWRAP | WS_GROUP, 3, 18, 60, 10 + CONTROL "", 101, "Static", SS_SIMPLE | SS_NOPREFIX, 3, 6, 150, 10 + CONTROL "&Comanda:", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 3, 18, 60, 10 EDITTEXT 201, 3, 29, 134, 12, ES_AUTOHSCROLL CONTROL "Si &Simbol", 214, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 3, 45, 71, 12 DEFPUSHBUTTON "&OK", 1, 158, 6, 47, 14 Modified: trunk/reactos/dll/cpl/console/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/sq-AL… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -38,13 +38,13 @@ BEGIN LTEXT "Dritare Preview:", -1, 10, 10, 94, 10 LTEXT "MasÃ«:", -1, 180, 10, 36, 10 - CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font:", -1, 10, 105, 33, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 - CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 LTEXT "Ãdo krarakter Ã«shtÃ«:", -1, 124, 166, 75, 10 LTEXT "pixeli ekranit i gjerÃ«\npixel ekranit i gjatÃ«", -1, 136, 180, 101, 20 LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 @@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Dritare Preview:", -1, 8, 6, 95, 10 - CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 GROUPBOX "Masa e Ekranit Buffer", -1, 130, 12, 115, 50 LTEXT "GjerÃ«:", -1, 140, 28, 40, 10 LTEXT "GjatÃ«:", -1, 140, 46, 39, 10 @@ -114,26 +114,26 @@ EDITTEXT IDC_EDIT_COLOR_BLUE, 175, 48, 35, 14, ES_RIGHT | ES_NUMBER | WS_GROUP CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_GROUP, 210, 48, 10, 14 - CONTROL "", IDC_STATIC_COLOR1, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR2, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR3, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR4, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR5, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR6, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR7, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR8, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR9, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR10, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR11, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR12, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR13, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR14, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR15, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 - CONTROL "", IDC_STATIC_COLOR16, "Statik", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 23, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 36, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 49, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 62, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 88, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 114, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 127, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 140, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 153, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 166, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 179, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 192, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 205, 80, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 218, 80, 12, 12 GROUPBOX "Preview (monitor)", -1, 8, 100, 237, 55 - CONTROL "", IDC_STATIC_SCREEN_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 110, 227, 40 GROUPBOX "Preview (Popup)", -1, 8, 160, 237, 55 - CONTROL "", IDC_STATIC_POPUP_COLOR, "Statik", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 13, 170, 227, 40 END IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 Modified: trunk/reactos/dll/cpl/desk/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sq-AL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -9,7 +9,7 @@ CAPTION "Sfond" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "", IDC_BACKGROUND_PREVIEW, "Statik", SS_OWNERDRAW, 70, 10, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 LTEXT "Zgjidhni njÃ« imazh pÃ«r t'u pÃ«rdorur si sfond tuaj desktop", IDC_STATIC, 8, 103, 230, 9 @@ -24,7 +24,7 @@ CAPTION "Screensaver" FONT 8, "MS Shell Dlg", 0, 0 BEGIN - CONTROL "", IDC_SCREENS_PREVIEW, "Statik", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "CilÃ«sime%t", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP @@ -134,7 +134,7 @@ LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER GROUPBOX "&Ngjyra", 1817, 125, 127, 115, 43 COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP - CONTROL "", IDC_SETTINGS_SPECTRUM, "Statik", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 PUSHBUTTON "PÃ«rparuar...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14 END Modified: trunk/reactos/dll/win32/serialui/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/sq… ============================================================================== --- trunk/reactos/dll/win32/serialui/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/serialui/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -28,11 +28,11 @@ CONTROL "", IDC_GRP1, "Buton", 0x50000007, 6, 5, 210, 146, 0x00000000 CONTROL "OK", IDC_OKBTN, "Buton", 0x50010000, 98, 156, 56, 13, 0x00000000 CONTROL "Anulo", IDC_CANCELBTN, "Buton", 0x50010000, 158, 156, 56, 13, 0x00000000 - CONTROL "Baud normÃ«:", IDC_STC1, "Statik", 0x50000000, 24, 31, 42, 9, 0x00000000 - CONTROL "Byte masÃ«:", IDC_STC2, "Statik", 0x50000000, 24, 53, 42, 9, 0x00000000 - CONTROL "Barazi:", IDC_STC3, "Statik", 0x50000000, 24, 73, 42, 9, 0x00000000 - CONTROL "Ndalo bits:", IDC_STC4, "Statik", 0x50000000, 24, 96, 42, 9, 0x00000000 - CONTROL "Kontroll Rrjedhe:", IDC_STC5, "Statik", 0x50000000, 24, 120, 42, 9, 0x00000000 + CONTROL "Baud normÃ«:", IDC_STC1, "Static", 0x50000000, 24, 31, 42, 9, 0x00000000 + CONTROL "Byte masÃ«:", IDC_STC2, "Static", 0x50000000, 24, 53, 42, 9, 0x00000000 + CONTROL "Barazi:", IDC_STC3, "Static", 0x50000000, 24, 73, 42, 9, 0x00000000 + CONTROL "Ndalo bits:", IDC_STC4, "Static", 0x50000000, 24, 96, 42, 9, 0x00000000 + CONTROL "Kontroll Rrjedhe:", IDC_STC5, "Static", 0x50000000, 24, 120, 42, 9, 0x00000000 CONTROL "", IDC_BAUDRATE, "ComboBox", 0x50210003, 98, 29, 100, 50, 0x00000000 CONTROL "", IDC_BYTESIZE, "ComboBox", 0x50210003, 98, 49, 100, 50, 0x00000000 CONTROL "", IDC_PARITY, "ComboBox", 0x50210003, 98, 72, 100, 50, 0x00000000 Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 21:06:49 2014 @@ -289,11 +289,11 @@ LTEXT "Dokumentimi Sistemit:", -1, 8, 51, 95, 10 EDITTEXT 14002, 110, 51, 120, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "", -1, 8, 64, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE - CONTROL "", 14013, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 + CONTROL "", 14013, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 69, 10, 10 LTEXT "HapÃ«sira pÃ«rdorur:", -1, 25, 69, 80, 10 EDITTEXT 14003, 110, 69, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14004, 197, 69, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14014, "Statik", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 + CONTROL "", 14014, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 82, 10, 10 LTEXT "HapÃ«sirÃ« Falas:", -1, 25, 82, 80, 10 EDITTEXT 14005, 110, 82, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14006, 197, 82, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL @@ -301,7 +301,7 @@ LTEXT "Kapaciteti:", -1, 25, 103, 80, 10 EDITTEXT 14007, 110, 103, 86, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL EDITTEXT 14008, 197, 103, 33, 10, ES_LEFT | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP | ES_AUTOHSCROLL - CONTROL "", 14015, "Statik", SS_OWNERDRAW, 70, 116, 100, 30 + CONTROL "", 14015, "Static", SS_OWNERDRAW, 70, 116, 100, 30 LTEXT "Drive %c", 14009, 100, 150, 70, 10 PUSHBUTTON "Pastrim &Disku", 14010, 160, 154, 70, 15, WS_TABSTOP LTEXT "", -1, 8, 171, 223, 1, SS_ETCHEDHORZ | WS_CHILD | WS_VISIBLE [View Less]

10 years, 8 months

[hbelusca] 63855: [CONSOLE.CPL]: Fix french resource.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 10 20:52:36 2014 New Revision: 63855 URL: http://svn.reactos.org/svn/reactos?rev=63855&view=rev Log: [CONSOLE.CPL]: Fix french resource. Modified: branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc Modified: branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/… [View More]

10 years, 8 months

[tfaber] 63854: [SYSSETUP] - Avoid logging the administrator password CORE-8019 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 10 19:25:52 2014 New Revision: 63854 URL: http://svn.reactos.org/svn/reactos?rev=63854&view=rev Log: [SYSSETUP] - Avoid logging the administrator password CORE-8019 #resolve Modified: trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/… [View More]

10 years, 8 months

[tfaber] 63853: [BROWSEUI] - CComObject cannot be a class member and must be allocated using new. Fixes invalid free.

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 10 18:39:05 2014 New Revision: 63853 URL: http://svn.reactos.org/svn/reactos?rev=63853&view=rev Log: [BROWSEUI] - CComObject cannot be a class member and must be allocated using new. Fixes invalid free. Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/internettoolbar.h Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/… [View More]interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Sun Aug 10 18:39:05 2014 @@ -481,14 +481,13 @@ fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; - fMenuCallback.AddRef(); + fMenuCallback = new CComObject<CMenuCallback>(); fToolbarWindow = NULL; fAdviseCookie = 0; } CInternetToolbar::~CInternetToolbar() { - fMenuCallback.Release(); } void CInternetToolbar::AddDockItem(IUnknown *newItem, int bandID, int flags) @@ -540,7 +539,7 @@ IID_IShellMenu, reinterpret_cast<void **>(menuBar)); if (FAILED(hResult)) return hResult; - hResult = fMenuCallback.QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); + hResult = fMenuCallback->QueryInterface(IID_IShellMenuCallback, reinterpret_cast<void **>(&callback)); if (FAILED(hResult)) return hResult; hResult = (*menuBar)->Initialize(callback, -1, ANCESTORDEFAULT, SMINIT_HORIZONTAL | SMINIT_TOPLEVEL); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Sun Aug 10 18:39:05 2014 @@ -90,7 +90,7 @@ CComPtr<IUnknown> fLogoBar; // the reactos logo CComPtr<IUnknown> fControlsBar; // navigation controls CComPtr<IUnknown> fNavigationBar; // address bar - CComObject<CMenuCallback> fMenuCallback; + CComPtr<CMenuCallback> fMenuCallback; CComPtr<IOleCommandTarget> fCommandTarget; GUID fCommandCategory; HWND fToolbarWindow; [View Less]

10 years, 8 months

[tfaber] 63852: [KERNEL32] - Fix an invalid free in DefineDosDeviceW, found by kernel32_apitest:dosdev

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 10 16:23:05 2014 New Revision: 63852 URL: http://svn.reactos.org/svn/reactos?rev=63852&view=rev Log: [KERNEL32] - Fix an invalid free in DefineDosDeviceW, found by kernel32_apitest:dosdev Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… =======================================================================… [View More]

10 years, 8 months

[tfaber] 63851: [KERNEL32] - Fix some style issues in DefineDosDevice

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Aug 10 16:20:43 2014 New Revision: 63851 URL: http://svn.reactos.org/svn/reactos?rev=63851&view=rev Log: [KERNEL32] - Fix some style issues in DefineDosDevice Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c Modified: trunk/reactos/dll/win32/kernel32/client/dosdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/… [View More]win32/kernel32/client/dosdev.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/dosdev.c [iso-8859-1] Sun Aug 10 16:20:43 2014 @@ -35,22 +35,18 @@ BOOL Result; if (lpDeviceName && - ! RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, - (LPSTR)lpDeviceName)) + !RtlCreateUnicodeStringFromAsciiz(&DeviceNameU, lpDeviceName)) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; } if (lpTargetPath && - ! RtlCreateUnicodeStringFromAsciiz(&TargetPathU, - (LPSTR)lpTargetPath)) + !RtlCreateUnicodeStringFromAsciiz(&TargetPathU, lpTargetPath)) { if (DeviceNameU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - DeviceNameU.Buffer); + RtlFreeUnicodeString(&DeviceNameU); } SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; @@ -62,16 +58,12 @@ if (TargetPathU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - TargetPathU.Buffer); + RtlFreeUnicodeString(&TargetPathU); } if (DeviceNameU.Buffer) { - RtlFreeHeap(RtlGetProcessHeap (), - 0, - DeviceNameU.Buffer); + RtlFreeUnicodeString(&DeviceNameU); } return Result; } @@ -114,7 +106,7 @@ ArgumentCount = 1; BufferSize = 0; - if (! lpTargetPath) + if (!lpTargetPath) { RtlInitUnicodeString(&NtTargetPathU, NULL); @@ -128,10 +120,10 @@ } else { - if (! RtlDosPathNameToNtPathName_U(lpTargetPath, - &NtTargetPathU, - 0, - 0)) + if (!RtlDosPathNameToNtPathName_U(lpTargetPath, + &NtTargetPathU, + NULL, + NULL)) { WARN("RtlDosPathNameToNtPathName_U() failed\n"); BaseSetLastNTError(STATUS_OBJECT_NAME_INVALID); @@ -151,7 +143,7 @@ CaptureBuffer = CsrAllocateCaptureBuffer(ArgumentCount, BufferSize); - if (! CaptureBuffer) + if (!CaptureBuffer) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); Result = FALSE; @@ -161,7 +153,7 @@ DefineDosDeviceRequest->Flags = dwFlags; CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)DeviceUpcaseNameU.Buffer, + DeviceUpcaseNameU.Buffer, DeviceUpcaseNameU.Length, (PVOID*)&DefineDosDeviceRequest->DeviceName.Buffer); @@ -173,7 +165,7 @@ if (NtTargetPathU.Buffer) { CsrCaptureMessageBuffer(CaptureBuffer, - (PVOID)NtTargetPathU.Buffer, + NtTargetPathU.Buffer, NtTargetPathU.Length, (PVOID*)&DefineDosDeviceRequest->TargetPath.Buffer); } @@ -212,7 +204,7 @@ dbcv.dbcv_size = sizeof(DEV_BROADCAST_VOLUME); dbcv.dbcv_devicetype = DBT_DEVTYP_VOLUME; dbcv.dbcv_reserved = 0; - dbcv.dbcv_unitmask |= + dbcv.dbcv_unitmask |= (1 << (DeviceUpcaseNameU.Buffer[0] - L'A')); dbcv.dbcv_flags = DBTF_NET; (void) BSM_ptr(BSF_SENDNOTIFYMESSAGE | BSF_FLUSHDISK, @@ -293,7 +285,7 @@ { CurrentLength = min (ucchMax, MAXUSHORT / 2); TargetPathU.MaximumLength = TargetPathU.Length = (USHORT)CurrentLength * sizeof(WCHAR); - + TargetPathA.Length = 0; TargetPathA.MaximumLength = (USHORT)CurrentLength; [View Less]

10 years, 8 months

[hbelusca] 63850: [CONSOLE.CPL]: Add LBS_HASSTRINGS to font listboxes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Aug 10 15:27:24 2014 New Revision: 63850 URL: http://svn.reactos.org/svn/reactos?rev=63850&view=rev Log: [CONSOLE.CPL]: Add LBS_HASSTRINGS to font listboxes. Modified: branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc branches/condrv_restructure/dll/cpl/console/lang/en-US.rc branches/condrv_restructure/dll/cpl/console/… [View More]lang/es-ES.rc branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc Modified: branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/bg-BG.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "ÐÑÐ¾Ð·Ð¾ÑÐµÑÐµÐ½ Ð¿ÑÐµÐ³Ð»ÐµÐ´:", -1, 10, 10, 94, 10 LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¾Ð»ÑÑÐµÑÐ¸ ÑÑÐ¸ÑÑÐ¾Ð²Ðµ", IDC_CHECK_BOLD_FONTS, 38, 105, 85, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/cs-CZ.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -41,7 +41,7 @@ LTEXT "NÃ¡hled okna:", -1, 10, 10, 94, 10 LTEXT "Velikost:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&PÃsmo:", -1, 10, 105, 33, 10 CHECKBOX "&TuÄnÃ¡ pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/de-DE.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Fenstervorschau", -1, 10, 7, 65, 10 LTEXT "GrÃ¶Ãe", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Schrift", -1, 10, 105, 35, 10 CHECKBOX "&Fette Schriften", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/en-US.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/en-US.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "Window Preview:", -1, 10, 10, 94, 10 LTEXT "Size:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font:", -1, 10, 105, 33, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/es-ES.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Ventana de PrevisualizaciÃ³n", -1, 10, 7, 65, 10 LTEXT "TamaÃ±o", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Fuente", -1, 10, 105, 35, 10 CHECKBOX "&Negrita", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/fr-FR.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "FenÃªtre de PrÃ©visualisation :", -1, 10, 10, 94, 10 LTEXT "Taille :", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Police :", -1, 10, 105, 33, 10 CHECKBOX "&Gras", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/he-IL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "×ª×¦××× ××§××××:", -1, 10, 10, 94, 10 LTEXT "××××:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "×××¤×:", -1, 10, 105, 33, 10 CHECKBOX "×××¤× ×× ×××××©××", IDC_CHECK_BOLD_FONTS, 41, 105, 33, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/id-ID.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Tinjauan Jendela", -1, 10, 7, 65, 10 LTEXT "Ukuran", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "Font &tebal", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/it-IT.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Anteprima", -1, 10, 7, 65, 10 LTEXT "Dimansione", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font", -1, 10, 105, 35, 10 CHECKBOX "&Grassetto fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/no-NO.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -35,7 +35,7 @@ LTEXT "Vindu forhÃ¥ndsvisning:", -1, 10, 10, 94, 10 LTEXT "StÃ¸rrelse:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Skrift:", -1, 10, 105, 33, 10 CHECKBOX "&Fet skrift", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/pl-PL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -42,7 +42,7 @@ LTEXT "Okno podglÄdu", -1, 10, 7, 65, 10 LTEXT "Rozmiar", -1, 130, 10, 30, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 - LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 130, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Czcionka", -1, 10, 105, 35, 10 CHECKBOX "&Pogrubiona czcionka", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 50, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -44,7 +44,7 @@ LTEXT "Previzionare:", -1, 10, 10, 94, 10 LTEXT "&MÄrime:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "F&ont:", -1, 10, 105, 33, 10 CHECKBOX "&Aldin", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/ru-RU.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "ÐÐºÐ½Ð¾ Ð¿ÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑÐ°:", -1, 10, 10, 94, 10 LTEXT "Ð Ð°Ð·Ð¼ÐµÑ:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¸ÑÐ½ÑÐ¹", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/sk-SK.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -39,7 +39,7 @@ LTEXT "UkÃ¡Å¾ka okna:", -1, 10, 10, 94, 10 LTEXT "VeÄ¾kosÅ¥:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&PÃsmo:", -1, 10, 105, 33, 10 CHECKBOX "&TuÄnÃ© pÃsma", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/sq-AL.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -39,7 +39,7 @@ LTEXT "Dritare Preview:", -1, 10, 10, 94, 10 LTEXT "MasÃ«:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Statik", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Font:", -1, 10, 105, 33, 10 CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/tr-TR.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "Pencere Ãn Ä°zlemesi:", -1, 10, 10, 94, 10 LTEXT "&Boyutlar:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&YazÄ± Tipi:", -1, 10, 105, 33, 10 CHECKBOX "&KalÄ±n YazÄ± Tipleri", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/uk-UA.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "ÐÑÐ°Ð·Ð¾Ðº Ð²ÑÐºÐ½Ð°", -1, 10, 10, 94, 10 LTEXT "Size:", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&Ð¨ÑÐ¸ÑÑ:", -1, 10, 105, 33, 10 CHECKBOX "&ÐÐ¸ÑÐ½Ñ", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL Modified: branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/cpl/cons… ============================================================================== --- branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] (original) +++ branches/condrv_restructure/dll/cpl/console/lang/zh-CN.rc [iso-8859-1] Sun Aug 10 15:27:24 2014 @@ -37,7 +37,7 @@ LTEXT "çªå£é¢è§ï¼", -1, 10, 10, 94, 10 LTEXT "å¤§å°ï¼", -1, 180, 10, 36, 10 CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 - LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_DISABLENOSCROLL | WS_VSCROLL + LISTBOX IDC_LBOX_FONTSIZE, 181, 20, 55, 80, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL LTEXT "&åä½(&F)ï¼", -1, 10, 105, 33, 10 CHECKBOX "ç²ä½(&B)", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 LISTBOX IDC_LBOX_FONTTYPE, 10, 120, 110, 40, LBS_SORT | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_VSCROLL [View Less]

10 years, 8 months

[hbelusca] 63849: [KERNEL32][CONSRV]: Implement a basic RegisterConsoleVDM (see revision 62371 for more details).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 9 19:47:40 2014 New Revision: 63849 URL: http://svn.reactos.org/svn/reactos?rev=63849&view=rev Log: [KERNEL32][CONSRV]: Implement a basic RegisterConsoleVDM (see revision 62371 for more details). Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c branches/condrv_restructure/include/psdk/wincon.h branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/… [View More]conoutput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/vdm.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/vdm.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -1640,26 +1640,101 @@ /* - * @unimplemented + * @implemented (undocumented) */ BOOL WINAPI -RegisterConsoleVDM ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3, - DWORD Unknown4, - DWORD Unknown5, - DWORD Unknown6, - DWORD Unknown7, - DWORD Unknown8, - DWORD Unknown9, - DWORD Unknown10 - ) -{ - STUB; - return FALSE; +RegisterConsoleVDM(IN DWORD dwRegisterFlags, + IN HANDLE hStartHardwareEvent, + IN HANDLE hEndHardwareEvent, + IN HANDLE hErrorHardwareEvent, + IN DWORD dwUnusedVar, + OUT LPDWORD lpVideoStateLength, + OUT PVOID* lpVideoState, // PVIDEO_HARDWARE_STATE_HEADER* + IN PVOID lpUnusedBuffer, + IN DWORD dwUnusedBufferLength, + IN COORD dwVDMBufferSize, + OUT PVOID* lpVDMBuffer) +{ + BOOL Success; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_REGISTERVDM RegisterVDMRequest = &ApiMessage.Data.RegisterVDMRequest; + PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; + + /* Set up the data to send to the Console Server */ + RegisterVDMRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + RegisterVDMRequest->RegisterFlags = dwRegisterFlags; + + if (dwRegisterFlags != 0) + { + RegisterVDMRequest->StartHardwareEvent = hStartHardwareEvent; + RegisterVDMRequest->EndHardwareEvent = hEndHardwareEvent; + RegisterVDMRequest->ErrorHardwareEvent = hErrorHardwareEvent; + + RegisterVDMRequest->VDMBufferSize = dwVDMBufferSize; + +#if 0 + RegisterVDMRequest->UnusedBufferLength = dwUnusedBufferLength; + + /* Allocate a Capture Buffer */ + CaptureBuffer = CsrAllocateCaptureBuffer(1, dwUnusedBufferLength); + if (CaptureBuffer == NULL) + { + DPRINT1("CsrAllocateCaptureBuffer failed!\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + /* Capture the buffer to write */ + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpUnusedBuffer, + dwUnusedBufferLength, + (PVOID*)&RegisterVDMRequest->UnusedBuffer); +#endif + } + else + { + // CaptureBuffer = NULL; + } + + /* Call the server */ + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepRegisterVDM), + sizeof(*RegisterVDMRequest)); + + /* Check for success */ + Success = NT_SUCCESS(ApiMessage.Status); + + /* Release the capture buffer if needed */ + if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); + + /* Retrieve the results */ + if (Success) + { + if (dwRegisterFlags != 0) + { + _SEH2_TRY + { + *lpVideoStateLength = RegisterVDMRequest->VideoStateLength; + *lpVideoState = RegisterVDMRequest->VideoState; + *lpVDMBuffer = RegisterVDMRequest->VDMBuffer; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; + } + } + else + { + BaseSetLastNTError(ApiMessage.Status); + } + + /* Return success status */ + return Success; } @@ -1756,9 +1831,8 @@ { DPRINT1("VDMOperationStarted(%d)\n", Unknown0); - return - BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler, - NULL, - 0, - Unknown0); -} + return BaseUpdateVDMEntry(VdmEntryUpdateControlCHandler, + NULL, + 0, + Unknown0); +} Modified: branches/condrv_restructure/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/psdk… ============================================================================== --- branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/psdk/wincon.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -618,6 +618,12 @@ // BOOL WINAPI SetStdHandle(_In_ DWORD, _In_ HANDLE); /* Undocumented */ BOOL WINAPI VerifyConsoleIoHandle(_In_ HANDLE); +/* Undocumented */ +BOOL +WINAPI +RegisterConsoleVDM(_In_ DWORD, _In_ HANDLE, _In_ HANDLE, _In_ HANDLE, _In_ DWORD, + _Out_ LPDWORD, _Out_ PVOID*, _In_ PVOID, _In_ DWORD, _In_ COORD, + _Out_ PVOID*); BOOL WINAPI Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -806,6 +806,28 @@ BOOL Ansi; } CONSOLE_GETKBDLAYOUTNAME, *PCONSOLE_GETKBDLAYOUTNAME; +typedef struct +{ + HANDLE ConsoleHandle; + ULONG RegisterFlags; + HANDLE StartHardwareEvent; + HANDLE EndHardwareEvent; + HANDLE ErrorHardwareEvent; + + /* Unused member */ + ULONG UnusedVar; + + ULONG VideoStateLength; + PVOID VideoState; // PVIDEO_HARDWARE_STATE_HEADER + + /* Unused members */ + PVOID UnusedBuffer; + ULONG UnusedBufferLength; + + COORD VDMBufferSize; + PVOID VDMBuffer; +} CONSOLE_REGISTERVDM, *PCONSOLE_REGISTERVDM; + typedef struct _CONSOLE_API_MESSAGE { PORT_MESSAGE Header; @@ -903,6 +925,9 @@ CONSOLE_GETINPUTOUTPUTCP GetConsoleCPRequest; CONSOLE_SETINPUTOUTPUTCP SetConsoleCPRequest; CONSOLE_GETKBDLAYOUTNAME GetKbdLayoutNameRequest; + + /* Virtual DOS Machine */ + CONSOLE_REGISTERVDM RegisterVDMRequest; } Data; } CONSOLE_API_MESSAGE, *PCONSOLE_API_MESSAGE; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/conoutput.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -208,6 +208,13 @@ /* PUBLIC DRIVER APIS *********************************************************/ NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN OUT PSMALL_RECT WriteRegion, + IN BOOLEAN DrawRegion); +NTSTATUS NTAPI ConDrvInvalidateBitMapRect(IN PCONSOLE Console, IN PCONSOLE_SCREEN_BUFFER Buffer, IN PSMALL_RECT Region) @@ -217,6 +224,19 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); + + /* In text-mode only, draw the VDM buffer if present */ + if (GetType(Buffer) == TEXTMODE_BUFFER) + { + PTEXTMODE_SCREEN_BUFFER TextBuffer = (PTEXTMODE_SCREEN_BUFFER)Buffer; + + /*Status =*/ ConDrvWriteConsoleOutputVDM(Buffer->Header.Console, + TextBuffer, + Console->VDMBuffer, + Console->VDMBufferSize, + Region, + FALSE); + } /* If the output buffer is the current one, redraw the correct portion of the screen */ if (Buffer == Console->ActiveBuffer) TermDrawRegion(Console, Region); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -722,6 +722,68 @@ return STATUS_SUCCESS; } +/* + * NOTE: This function is strongly inspired by ConDrvWriteConsoleOutput... + */ +NTSTATUS NTAPI +ConDrvWriteConsoleOutputVDM(IN PCONSOLE Console, + IN PTEXTMODE_SCREEN_BUFFER Buffer, + IN PCHAR_CELL CharInfo/*Buffer*/, + IN COORD CharInfoSize, + IN OUT PSMALL_RECT WriteRegion, + IN BOOLEAN DrawRegion) +{ + SHORT X, Y; + SMALL_RECT ScreenBuffer; + PCHAR_CELL CurCharInfo; + SMALL_RECT CapturedWriteRegion; + PCHAR_INFO Ptr; + + if (Console == NULL || Buffer == NULL || CharInfo == NULL || WriteRegion == NULL) + { + return STATUS_INVALID_PARAMETER; + } + + /* Validity check */ + ASSERT(Console == Buffer->Header.Console); + + CapturedWriteRegion = *WriteRegion; + + /* Make sure WriteRegion is inside the screen buffer */ + ConioInitRect(&ScreenBuffer, 0, 0, + Buffer->ScreenBufferSize.Y - 1, Buffer->ScreenBufferSize.X - 1); + if (!ConioGetIntersection(&CapturedWriteRegion, &ScreenBuffer, &CapturedWriteRegion)) + { + /* + * It is okay to have a WriteRegion completely outside + * the screen buffer. No data is written then. + */ + return STATUS_SUCCESS; + } + + // CurCharInfo = CharInfo; + + for (Y = CapturedWriteRegion.Top; Y <= CapturedWriteRegion.Bottom; ++Y) + { + /**/CurCharInfo = CharInfo + Y * CharInfoSize.X + CapturedWriteRegion.Left;/**/ + + Ptr = ConioCoordToPointer(Buffer, CapturedWriteRegion.Left, Y); + for (X = CapturedWriteRegion.Left; X <= CapturedWriteRegion.Right; ++X) + { + ConsoleAnsiCharToUnicodeChar(Console, &Ptr->Char.UnicodeChar, &CurCharInfo->Char); + Ptr->Attributes = CurCharInfo->Attributes; + ++Ptr; + ++CurCharInfo; + } + } + + if (DrawRegion) TermDrawRegion(Console, &CapturedWriteRegion); + + *WriteRegion = CapturedWriteRegion; + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI ConDrvWriteConsole(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER ScreenBuffer, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -18,6 +18,15 @@ #define DEFAULT_SCREEN_ATTRIB (FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED) #define DEFAULT_POPUP_ATTRIB (FOREGROUND_BLUE | FOREGROUND_RED | \ BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY) + +/* VGA character cell */ +typedef struct _CHAR_CELL +{ + CHAR Char; + BYTE Attributes; +} CHAR_CELL, *PCHAR_CELL; +C_ASSERT(sizeof(CHAR_CELL) == 2); + /* Object type magic numbers */ typedef enum _CONSOLE_IO_OBJECT_TYPE @@ -300,6 +309,17 @@ PCONSOLE_SCREEN_BUFFER ActiveBuffer; /* Pointer to currently active screen buffer */ UINT OutputCodePage; + /**** Per-console Virtual DOS Machine Text-mode Buffer ****/ + COORD VDMBufferSize; /* Real size of the VDM buffer, in units of ??? */ + HANDLE VDMBufferSection; /* Handle to the memory shared section for the VDM buffer */ + PVOID VDMBuffer; /* Our VDM buffer */ + PVOID ClientVDMBuffer; /* A copy of the client view of our VDM buffer */ + HANDLE VDMClientProcess; /* Handle to the client process who opened the buffer, to unmap the view */ + + HANDLE StartHardwareEvent; + HANDLE EndHardwareEvent; + HANDLE ErrorHardwareEvent; + /****************************** Other properties ******************************/ UNICODE_STRING OriginalTitle; /* Original title of console, the one defined when the console leader is launched; it never changes. Always NULL-terminated */ UNICODE_STRING Title; /* Title of console. Always NULL-terminated */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/subsysreg.c [iso-8859-1] Sat Aug 9 19:47:40 2014 @@ -21,8 +21,132 @@ CSR_API(SrvRegisterConsoleVDM) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCONSOLE_REGISTERVDM RegisterVDMRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.RegisterVDMRequest; + PCONSOLE Console; + + DPRINT1("SrvRegisterConsoleVDM(%d)\n", RegisterVDMRequest->RegisterFlags); + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), + &Console, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Can't get console\n"); + return Status; + } + + if (RegisterVDMRequest->RegisterFlags != 0) + { + LARGE_INTEGER SectionSize; + ULONG Size, ViewSize = 0; + HANDLE ProcessHandle; + + /* + * Remember the handle to the process so that we can close or unmap + * correctly the allocated resources when the client releases the + * screen buffer. + */ + ProcessHandle = CsrGetClientThread()->Process->ProcessHandle; + Console->VDMClientProcess = ProcessHandle; + + Console->VDMBufferSize = RegisterVDMRequest->VDMBufferSize; + + Size = Console->VDMBufferSize.X * Console->VDMBufferSize.Y + * sizeof(CHAR_CELL); + + /* + * Create a memory section for the VDM buffer, to share with the client. + */ + SectionSize.QuadPart = Size; + Status = NtCreateSection(&Console->VDMBufferSection, + SECTION_ALL_ACCESS, + NULL, + &SectionSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to create a shared section ; Status = %lu\n", Status); + goto Quit; + } + + /* + * Create a view for our needs. + */ + ViewSize = 0; + Console->VDMBuffer = NULL; + Status = NtMapViewOfSection(Console->VDMBufferSection, + NtCurrentProcess(), + (PVOID*)&Console->VDMBuffer, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + NtClose(Console->VDMBufferSection); + goto Quit; + } + + /* + * Create a view for the client. We must keep a trace of it so that + * we can unmap it when the client releases the VDM buffer. + */ + ViewSize = 0; + Console->ClientVDMBuffer = NULL; + Status = NtMapViewOfSection(Console->VDMBufferSection, + ProcessHandle, + (PVOID*)&Console->ClientVDMBuffer, + 0, + 0, + NULL, + &ViewSize, + ViewUnmap, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Error: Impossible to map the shared section ; Status = %lu\n", Status); + NtUnmapViewOfSection(NtCurrentProcess(), Console->VDMBuffer); + NtClose(Console->VDMBufferSection); + goto Quit; + } + + // TODO: Duplicate the event handles. + + RegisterVDMRequest->VDMBuffer = Console->ClientVDMBuffer; + + Status = STATUS_SUCCESS; + } + else + { + /* RegisterFlags == 0 means we are unregistering the VDM */ + + // TODO: Close the duplicated handles. + + if (Console->VDMBuffer) + { + /* + * Uninitialize the graphics screen buffer + * in the reverse way we initialized it. + */ + NtUnmapViewOfSection(Console->VDMClientProcess, Console->ClientVDMBuffer); + NtUnmapViewOfSection(NtCurrentProcess(), Console->VDMBuffer); + NtClose(Console->VDMBufferSection); + } + Console->VDMBuffer = Console->ClientVDMBuffer = NULL; + + Console->VDMBufferSize.X = Console->VDMBufferSize.Y = 0; + } + +Quit: + ConSrvReleaseConsole(Console, TRUE); + return Status; } CSR_API(SrvVDMConsoleOperation) [View Less]

10 years, 8 months

[hbelusca] 63848: [NTVDM]: Studying ntvdm, we can find the significance of some of the parameters. Others seem unused.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Aug 9 18:48:31 2014 New Revision: 63848 URL: http://svn.reactos.org/svn/reactos?rev=63848&view=rev Log: [NTVDM]: Studying ntvdm, we can find the significance of some of the parameters. Others seem unused. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… =============================================================… [View More]================= --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Sat Aug 9 18:48:31 2014 @@ -23,7 +23,7 @@ /* * Activate this line if you want to use the real - * RegisterConsoleVDM API of Windows/ReactOS. + * RegisterConsoleVDM API of ReactOS/Windows. */ // #define USE_REAL_REGISTERCONSOLEVDM @@ -314,33 +314,33 @@ BOOL WINAPI -__RegisterConsoleVDM(IN DWORD dwDosVDMFlag, - IN HANDLE hEventHandle1, - IN HANDLE hEventHandle2, - IN HANDLE hEventHandle3, - IN DWORD Unused1, - OUT PULONG returned_val_1, - OUT PVOID* returned_val_2, - IN PVOID lpUnknownBuffer, - IN DWORD dwUnknownBufferLength, +__RegisterConsoleVDM(IN DWORD dwRegisterFlags, + IN HANDLE hStartHardwareEvent, + IN HANDLE hEndHardwareEvent, + IN HANDLE hErrorHardwareEvent, + IN DWORD dwUnusedVar, + OUT LPDWORD lpVideoStateLength, + OUT PVOID* lpVideoState, // PVIDEO_HARDWARE_STATE_HEADER* + IN PVOID lpUnusedBuffer, + IN DWORD dwUnusedBufferLength, IN COORD dwVDMBufferSize, OUT PVOID* lpVDMBuffer) { - UNREFERENCED_PARAMETER(hEventHandle3); - UNREFERENCED_PARAMETER(Unused1); - UNREFERENCED_PARAMETER(returned_val_1); - UNREFERENCED_PARAMETER(returned_val_2); - UNREFERENCED_PARAMETER(lpUnknownBuffer); - UNREFERENCED_PARAMETER(dwUnknownBufferLength); + UNREFERENCED_PARAMETER(hErrorHardwareEvent); + UNREFERENCED_PARAMETER(dwUnusedVar); + UNREFERENCED_PARAMETER(lpVideoStateLength); + UNREFERENCED_PARAMETER(lpVideoState); + UNREFERENCED_PARAMETER(lpUnusedBuffer); + UNREFERENCED_PARAMETER(dwUnusedBufferLength); SetLastError(0); - DPRINT1("__RegisterConsoleVDM(%d)\n", dwDosVDMFlag); + DPRINT1("__RegisterConsoleVDM(%d)\n", dwRegisterFlags); if (lpVDMBuffer == NULL) return FALSE; - if (dwDosVDMFlag != 0) - { - // if (EventHandle_1 == NULL || EventHandle_2 == NULL) return FALSE; + if (dwRegisterFlags != 0) + { + // if (hStartHardwareEvent == NULL || hEndHardwareEvent == NULL) return FALSE; if (VDMBuffer != NULL) return FALSE; VDMBufferSize = dwVDMBufferSize; @@ -451,7 +451,7 @@ /* * Windows 2k3 winsrv.dll calls NtVdmControl(VdmQueryVdmProcess == 14, &ConsoleHandle); * in the two following APIs: - * SrvRegisterConsoleVDM (corresponding win32 API: RegisterConsoleVDM) + * SrvRegisterConsoleVDM (corresponding Win32 API: RegisterConsoleVDM) * SrvVDMConsoleOperation (corresponding Win32 API: ) * to check whether the current process is a VDM process, and fails otherwise with the * error 0xC0000022 (). [View Less]

10 years, 8 months

← Newer
1
...
14
15
16
17
18
19
20
...
23
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 August 2014