Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 47975: - Merge everything csrss/console-related 44999:47973. - Remove PrivateCsrssInitialized ReactOS-only export.
by fireball＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: fireball Date: Thu Jul 8 22:11:51 2010 New Revision: 47975 URL: http://svn.reactos.org/svn/reactos?rev=47975&view=rev Log: - Merge everything csrss/console-related 44999:47973. - Remove PrivateCsrssInitialized ReactOS-only export. Added: branches/arwinss/reactos/include/psdk/strsafe.h - copied unchanged from r47026, trunk/reactos/include/psdk/strsafe.h branches/arwinss/reactos/subsystems/win32/csrss/csrsrv/ - copied from r47604, trunk/reactos/subsystems/win32/csrss/csrsrv/ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/coninput.c - copied, changed from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.h - copied, changed from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/conio.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conoutput.c - copied, changed from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/console.c - copied unchanged from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/console.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.h - copied unchanged from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/desktopbg.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/handle.c - copied unchanged from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/handle.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/harderror.c - copied, changed from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lineinput.c - copied, changed from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.h - copied unchanged from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h Removed: branches/arwinss/reactos/subsystems/win32/csrss/api/ branches/arwinss/reactos/subsystems/win32/csrss/csrss.h branches/arwinss/reactos/subsystems/win32/csrss/include/conio.h branches/arwinss/reactos/subsystems/win32/csrss/include/desktopbg.h branches/arwinss/reactos/subsystems/win32/csrss/include/win32csr.h branches/arwinss/reactos/subsystems/win32/csrss/init.c branches/arwinss/reactos/subsystems/win32/csrss/print.c branches/arwinss/reactos/subsystems/win32/csrss/video.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/console.c (contents, props changed) branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/user32.spec branches/arwinss/reactos/include/psdk/ (props changed) branches/arwinss/reactos/include/reactos/subsys/ (props changed) branches/arwinss/reactos/include/reactos/subsys/csrss/csrss.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h branches/arwinss/reactos/subsystems/win32/csrss/ (props changed) branches/arwinss/reactos/subsystems/win32/csrss/csrsrv/api/ (props changed) branches/arwinss/reactos/subsystems/win32/csrss/csrss.c branches/arwinss/reactos/subsystems/win32/csrss/csrss.rbuild branches/arwinss/reactos/subsystems/win32/csrss/include/api.h branches/arwinss/reactos/subsystems/win32/csrss/include/csrplugin.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/appswitch.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c (contents, props changed) branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/exitros.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc branches/arwinss/reactos/subsystems/win32/csrss/win32csr/resource.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/w32csr.h branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.spec branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c branches/arwinss/reactos/subsystems/win32/win32k/main/init.c branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/dll/win32/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… Modified: branches/arwinss/reactos/include/reactos/subsys/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/desktopbg.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/include/win32csr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/print.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/video.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/appswitch.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/coninput.c (from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Removed: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conio.h (from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/conio.h) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/conoutput.c (from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/guiconsole.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/harderror.c (from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Copied: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/lineinput.c (from r47604, trunk/reactos/subsystems/win32/csrss/win32csr/lineinput.c) URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/csr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/csr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3…

1 0

[akhaldi] 47974: Ukrainian translation patch for mstsc, notepad, paint, regedit, cmd, aclui, newdev and syssetup. By Igor Paliychuk (Igor-hkr[at]mail.ru)
by akhaldi＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: akhaldi Date: Thu Jul 8 22:07:23 2010 New Revision: 47974 URL: http://svn.reactos.org/svn/reactos?rev=47974&view=rev Log: Ukrainian translation patch for mstsc, notepad, paint, regedit, cmd, aclui, newdev and syssetup. By Igor Paliychuk (Igor-hkr[at]mail.ru) Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc trunk/reactos/base/applications/notepad/lang/uk-UA.rc trunk/reactos/base/applications/paint/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/shell/cmd/lang/uk-UA.rc trunk/reactos/dll/win32/aclui/aclui_Uk.rc trunk/reactos/dll/win32/newdev/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Modified: trunk/reactos/base/applications/mstsc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/mstsc/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for mstsc - * TRANSLATOR: Artem Reznikov + * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -16,8 +16,8 @@ GROUPBOX "Ïàðàìåòðè ï³äêëþ÷åííÿ",IDC_STATIC,7,103,228,65 ICON "", IDC_LOGONICON, 15,19,20,20 LTEXT "Ââåä³òü àäðåñó ñåðâåðà",IDC_STATIC,47,24,81,8 - LTEXT "Ñåðâåð:",IDC_STATIC,47,41,25,8 - LTEXT "Êîðèñòóâà÷:",IDC_STATIC,47,58,38,8 + LTEXT "Ñåðâåð:",IDC_STATIC,47,41,27,8 + LTEXT "Êîðèñòóâà÷:",IDC_STATIC,47,58,41,8 COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Çáåðåãòè",IDC_SAVE,67,139,50,14 PUSHBUTTON "Çáåðåãòè ÿê...",IDC_SAVEAS,123,139,50,14 @@ -30,23 +30,23 @@ STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - GROUPBOX "Ðîçì³ð â³ääàëåíîãî ðîáî÷îãî ñòîëà",IDC_STATIC,7,7,228,68 + GROUPBOX "Ðîçì³ð â³ääàëåíîãî ðîáî÷îãî ñòîëó",IDC_STATIC,7,7,228,71 GROUPBOX "Êîë³ðíà ïàë³òðà",IDC_STATIC,7,83,228,85 ICON "", IDC_REMICON, 15,19,20,20 ICON "", IDC_COLORSICON, 15,98,20,20 - LTEXT "Óêàæ³òü ðîçì³ð â³ääàëåíîãî ðîáî÷îãî ñòîëà. Ïåðåòÿãí³òü ïîâçóíîê ïðàâîðó÷ äî ê³íöÿ, ùîá ïåðåéòè ó ïîâíîåêðàííèé ðåæèì",IDC_STATIC,53,22,175,21 - CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + LTEXT "Âêàæ³òü ðîçì³ð â³ääàëåíîãî ðîáî÷îãî ñòîëó. Ïåðåòÿãí³òü ïîâçóíîê ïðàâîðó÷ äî ê³íöÿ, ùîá ïåðåéòè ó ïîâíîåêðàííèé ðåæèì",IDC_STATIC,53,15,175,24 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 45, 124, 17 COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 - LTEXT "Ïðèì³òêà: ïàðàìåòðè íà â³ääàëåíîìó êîìï'þòåð³ ìîæóòü ïåðåêðèâàòè çíà÷åííÿ öüîãî ïàðàìåòðà.",IDC_STATIC,56,143,165,18 - LTEXT "ìåíøå",IDC_STATIC,35,42,15,8 - LTEXT "á³ëüøå",IDC_STATIC,189,42,17,8 - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER + LTEXT "Ïðèì³òêà: ïàðàìåòðè íà â³ääàëåíîìó êîìï'þòåð³ ìîæóòü ïåðåêðèâàòè çíà÷åííÿ öüîãî ïàðàìåòðà.",IDC_STATIC,56,143,175,18 + LTEXT "ìåíøå",IDC_STATIC,29,45,21,8 + LTEXT "á³ëüøå",IDC_STATIC,189,45,23,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 65, 120, 10, SS_CENTER END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Ï³äêëþ÷åííÿ äî â³ääàëåíîãî ðîáî÷îãî ñòîëà" +CAPTION "Ï³äêëþ÷åííÿ äî â³ääàëåíîãî ðîáî÷îãî ñòîëó" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Ï³äêëþ÷èòè",IDOK,147,249,50,14 @@ -62,10 +62,10 @@ IDS_256COLORS "256 êîëüîð³â" IDS_HIGHCOLOR15 "32,768 êîëüîð³â (15 á³ò)" IDS_HIGHCOLOR16 "65,536 êîëüîð³â (16 á³ò)" - IDS_HIGHCOLOR24 "16,777,216 êîëüîð³â (24 á³òà)" + IDS_HIGHCOLOR24 "16,777,216 êîëüîð³â (24 á³òè)" IDS_PIXEL "%lu íà %lu êðàïîê" IDS_FULLSCREEN "Íà âåñü åêðàí" IDS_BROWSESERVER "<Ïîøóê ³íøèõ...>" - IDS_HEADERTEXT1 "Â³ääàëåíå êåðóâàííÿ ðîáî÷èì ñòîëîì" - IDS_HEADERTEXT2 "Ï³äêëþ÷åííÿ" + IDS_HEADERTEXT1 "Êåðóâàííÿ ðîáî÷èì" + IDS_HEADERTEXT2 "Ñòîëîì" END Modified: trunk/reactos/base/applications/notepad/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -2,6 +2,7 @@ * Notepad (Ukrainian resources) * * Copyright 2005, 2006 Artem Reznikov + * Copyright 2010 Igor Paliychuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -49,7 +50,7 @@ MENUITEM SEPARATOR MENUITEM "Ïàðà&ìåòðè ñòîð³íêè...", CMD_PAGE_SETUP MENUITEM "Ä&ðóê\tCtrl+P", CMD_PRINT - MENUITEM "Íàñòðîéêà &ïðèíòåðà...", CMD_PRINTER_SETUP + MENUITEM "Íàëàøòóâàííÿ &ïðèíòåðà...", CMD_PRINTER_SETUP MENUITEM SEPARATOR MENUITEM "Â&èõ³ä", CMD_EXIT END @@ -127,7 +128,7 @@ COMBOBOX ID_ENCODING,54,0,156,80,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Êîäóâàííÿ:",0x155,5,2,41,12 COMBOBOX ID_EOLN,54,18,156,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP -LTEXT "Ðîçðèâè ðÿäê³â:",0x156,5,20,41,12 +LTEXT "Ê³íåöü ðÿäêà:",0x156,5,20,47,12 END /* Dialog 'Go To' */ Modified: trunk/reactos/base/applications/paint/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: base/applications/paint/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Paint - * TRANSLATORS: Artem Reznikov, Sakara Yevhen + * TRANSLATORS: Artem Reznikov, Sakara Yevhen, igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -49,7 +49,7 @@ MENUITEM SEPARATOR POPUP "Ìàñøòàá" BEGIN - POPUP "Êîðèñòóâàëüíèöüêèé" + POPUP "Êîðèñòóâàöüêèé" BEGIN MENUITEM "12,5%", IDM_VIEWZOOM125 MENUITEM "25%", IDM_VIEWZOOM25 @@ -137,22 +137,22 @@ EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 LTEXT "Øèðèíà:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 LTEXT "Âèñîòà:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 - LTEXT "Äàòà ôàéëà:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 - LTEXT "Ðîçì³ð ôàéëà:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 - LTEXT "Ðîçä³ëüíà çäàòí³ñòü:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 + LTEXT "Äàòà ôàéëó:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Ðîçì³ð ôàéëó:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Ðîçøèðåííÿ:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 + LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 + LTEXT "Íåäîñòóïíî", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 GROUPBOX "Îäèíèö³ âèì³ðþâàííÿ", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 AUTORADIOBUTTON "äþéìè", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP AUTORADIOBUTTON "ñì", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 AUTORADIOBUTTON "ï³êñåë³", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 GROUPBOX "Êîëüîðè", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 - AUTORADIOBUTTON "÷îðíî-á³ëà", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP - AUTORADIOBUTTON "êîëüîðîâà", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + AUTORADIOBUTTON "÷îðíî-á³ëèé", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "êîëüîðè", IDD_ATTRIBUTESRB5, 92, 100, 39, 10 DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 155, 24, 48, 14 - PUSHBUTTON "Çà ïðîìîâ÷àííÿì", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 + PUSHBUTTON "Ñòàíäàðòíî", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 END IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 @@ -160,15 +160,15 @@ FONT 8, "MS Shell Dlg" CAPTION "Çì³íà ðîçì³ðó" BEGIN - GROUPBOX "Çì³íåííÿ ðîçì³ðó", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 + GROUPBOX "Çì³íà ðîçì³ðó", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18, 32, 32 - LTEXT "Ïî ãîðèçîíòàë³:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 - EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 - LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + LTEXT "Ãîðèçîíòàëü:", IDD_CHANGESIZETEXT1, 45, 24, 45, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 92, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 127, 24, 15, 10 ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43, 32, 32 - LTEXT "Ïî âåðòèêàë³:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 - EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 - LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + LTEXT "Âåðòèêàëü:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 92, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 127, 49, 15, 10 DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 155, 24, 48, 14 END @@ -184,7 +184,7 @@ IDS_MINIATURETITLE, "Ì³í³àòþðà" IDS_TOOLTIP1, "Âèä³ëåííÿ äîâ³ëüíî¿ îáëàñò³" IDS_TOOLTIP2, "Âèä³ëåííÿ" - IDS_TOOLTIP3, "Ëàñòèê" + IDS_TOOLTIP3, "Ãóìêà" IDS_TOOLTIP4, "Çàëèâêà" IDS_TOOLTIP5, "Âèá³ð êîëüîð³â" IDS_TOOLTIP6, "Ìàñøòàá" @@ -201,5 +201,5 @@ IDS_OPENFILTER, "Òî÷êîâ³ ðèñóíêè (*.bmp;*.dib)\1*.bmp;*.dib\1Óñ³ ôàéëè (*.*)\1*.*\1" IDS_SAVEFILTER, "24-ðîçðÿäíèé ðèñóíîê (*.bmp;*.dib)\1*.bmp;*.dib\1" IDS_FILESIZE, "%d áàéò" - IDS_PRINTRES, "%d x %d ï³êñåë³â íà ìåòð" -END + IDS_PRINTRES, "%d x %d ï³êñ. íà ìåòð" +END Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -2,6 +2,7 @@ * Regedit (Ukrainian resources) * * Copyright 2006,2007 Artem Reznikov + * Copyright 2010 Igor Paliychuk * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -79,8 +80,8 @@ 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 + MENUITEM "&Áàãàòîðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "Ðîç&øèðþâàíå ðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM SEPARATOR MENUITEM "Äîçâ&îëè...", ID_EDIT_PERMISSIONS @@ -112,7 +113,7 @@ BEGIN MENUITEM "&Çì³ñò\tF1", ID_HELP_HELPTOPICS MENUITEM SEPARATOR - MENUITEM "&Ïðî ðåäàêòîð ðåºñòðà", ID_HELP_ABOUT + MENUITEM "&Ïðî ðåäàêòîð ðåºñòðó", ID_HELP_ABOUT END END @@ -136,7 +137,7 @@ MENUITEM "&Äâ³éêîâå çíà÷åííÿ", ID_EDIT_NEW_BINARYVALUE MENUITEM "&DWORD çíà÷åííÿ", ID_EDIT_NEW_DWORDVALUE MENUITEM "&Áàãàòîðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_MULTISTRINGVALUE - MENUITEM "&Ðîçøèðåíå ðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE + MENUITEM "&Ðîçøèðþâàíå ðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END END POPUP "" @@ -144,13 +145,13 @@ MENUITEM "Ðîçãîðíóòè/Çãîðíóòè", ID_TREE_EXPANDBRANCH POPUP "&Ñòâîðèòè" BEGIN - MENUITEM "Êë&þ÷", ID_EDIT_NEW_KEY + MENUITEM "Ðîç&ä³ë", ID_EDIT_NEW_KEY MENUITEM SEPARATOR 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 + MENUITEM "&Ðîçøèðþâàíå ðÿäêîâå çíà÷åííÿ", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END MENUITEM "Ç&íàéòè", ID_EDIT_FIND MENUITEM SEPARATOR @@ -186,7 +187,7 @@ IDD_EDIT_MULTI_STRING DIALOGEX 32, 24, 252, 174 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Ðåäàãóâàííÿ ìóëüòèðÿäêîâîãî çíà÷åííÿ" +CAPTION "Ðåäàãóâàííÿ áàãàòîðÿäêîâîãî çíà÷åííÿ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Íàçâà çíà÷åííÿ:",IDC_STATIC,6,6,134,8 @@ -242,7 +243,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_APP_TITLE "Ðåäàêòîð ðåºñòðà" + IDS_APP_TITLE "Ðåäàêòîð ðåºñòðó" IDC_REGEDIT "REGEDIT" IDC_REGEDIT_FRAME "REGEDIT_FRAME" END @@ -264,7 +265,7 @@ ID_EDIT_NEW_STRINGVALUE "Äîäàº íîâå ðÿäêîâå çíà÷åííÿ" ID_EDIT_NEW_BINARYVALUE "Äîäàº íîâå äâ³éêîâå çíà÷åííÿ" ID_EDIT_NEW_DWORDVALUE "Äîäàº íîâå DWORD-çíà÷åííÿ" - ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðà" + ID_REGISTRY_IMPORTREGISTRYFILE "²ìïîðòóº òåêñòîâèé ôàéë äî ðåºñòðó" ID_REGISTRY_EXPORTREGISTRYFILE "Åêñïîðòóº âåñü ðåºñòð àáî éîãî ÷àñòèíó â òåêñòîâèé ôàéë" ID_REGISTRY_CONNECTNETWORKREGISTRY @@ -278,7 +279,7 @@ STRINGTABLE DISCARDABLE BEGIN - ID_REGISTRY_EXIT "Âèõîäèòü ç ðåäàêòîðà ðåºñòðà" + ID_REGISTRY_EXIT "Âèõîäèòü ç ðåäàêòîðà ðåºñòðó" ID_FAVOURITES_ADDTOFAVOURITES "Äîäàº ðîçä³ë äî îáðàíîãî" ID_FAVOURITES_REMOVEFAVOURITE "Âèäàëÿº ðîçä³ë ç îáðàíîãî" ID_VIEW_STATUSBAR "Â³äîáðàæóº àáî õîâàº ðÿäîê ñòàíó" Modified: trunk/reactos/base/shell/cmd/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/uk-UA.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -534,7 +534,7 @@ (íà âàø âèáið) áóäü-ÿêî¿ íîâiøî¿ âåðñi¿.\n" STRING_VERSION_HELP5, "\nÂiäñèëàéòå çâiòè ïðî ïîìèëêè íà <ros-dev(a)reactos.org>.\n\ -Îíîâëåííÿ äîñòïíi íà: http://www.reactos.org" +Îíîâëåííÿ äîñòóïíi íà: http://www.reactos.org" STRING_VERSION_HELP6, "\nFreeDOS-âåðñiÿ íàïèñàíà:\n" Modified: trunk/reactos/dll/win32/aclui/aclui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui_Uk.r… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui_Uk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/aclui/aclui_Uk.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/aclui/aclui_Uk.rc * PURPOSE: Ukraianian Language File for aclui - * TRANSLATOR: Artem Reznikov + * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -20,10 +20,10 @@ PUSHBUTTON "&Äîäàòè...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 PUSHBUTTON "Â&èäàëèòè", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX - LTEXT "Äîçâîëèòè", IDC_LABEL_ALLOW, 135, 107, 32, 8, SS_CENTER - LTEXT "Çàáîðîíèòè", IDC_LABEL_DENY, 176, 107, 32, 8, SS_CENTER + LTEXT "Äîçâîëèòè", IDC_LABEL_ALLOW, 133, 107, 36, 8, SS_CENTER + LTEXT "Çàáîðîíèòè", IDC_LABEL_DENY, 172, 107, 40, 8, SS_CENTER CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE - LTEXT "Äëÿ çàâäàííÿ îñîáëèâèõ äîçâîë³â àáî ïàðàìåòð³â, íàòèñí³òü Äîäàòêîâî.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + LTEXT "Äëÿ çàäàííÿ îñîáëèâèõ äîçâîë³â àáî ïàðàìåòð³â, íàòèñí³òü Äîäàòêîâî.", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT PUSHBUTTON "Äîä&àòêîâî", IDC_ADVANCED, 165, 194, 55, 14 END Modified: trunk/reactos/dll/win32/newdev/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/uk-U… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/win32/newdev/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for newdev - * TRANSLATOR: Artem Reznikov + * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT @@ -11,7 +11,7 @@ IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Ëàñêàâî ïðîñèìî",IDC_WELCOMETITLE,120,8,195,24 @@ -19,7 +19,7 @@ IDC_STATIC,120,21,195,16 LTEXT "Íàòèñí³òü ""Äàë³"" äëÿ ïðîäîâæåííÿ.",IDC_STATIC,120,169,195,17 LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,134,36,164,11 - LTEXT "ÏÎÏÅÐÅÄÆÅÍÍß! ÓÑÒÀÍÎÂÊÀ ÑÏÅÖ²ÀËÜÍÎÃÎ ÏÐÈÑÒÐÎÞ ÌÎÆÅ ÇÀÌÎÐÎÇÈÒÈ ÂÀØ ÊÎÌÏ'ÞÒÅÐ ÀÁÎ ÇÐÎÁÈÒÈ ÉÎÃÎ ÍÅÇÄÀÒÍÈÌ ÄÎ ÇÀÂÀÍÒÀÆÅÍÍß!",IDC_STATIC,120,59,195,16 + LTEXT "ÏÎÏÅÐÅÄÆÅÍÍß! ÂÑÒÀÍÎÂËÅÍÍß ÏÐÈÑÒÐÎÞ ÌÎÆÅ ÇÀÌÎÐÎÇÈÒÈ ÂÀØ ÊÎÌÏ'ÞÒÅÐ ÀÁÎ ÇÐÎÁÈÒÈ ÉÎÃÎ ÍÅÇÄÀÒÍÈÌ ÄÎ ÇÀÂÀÍÒÀÆÅÍÍß!",IDC_STATIC,120,59,195,24 CONTROL "Âñòàíîâèòè äðàéâåð àâòîìàòè÷íî",IDC_RADIO_AUTO,"Button", BS_AUTORADIOBUTTON,120,112,178,13 CONTROL "Âñòàíîâèòè äðàéâåð ç âêàçàíîãî ì³ñöÿ",IDC_RADIO_MANUAL, @@ -29,13 +29,13 @@ IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Óñòàíîâêà íå âäàëàñÿ",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Âñòàíîâëåííÿ íå âäàëîñÿ",IDC_FINISHTITLE,120,8,195,24 LTEXT "Ïðèñòð³é íå âñòàíîâëåíî, òîìó ùî äðàéâåð íå çíàéäåíî.", IDC_STATIC,120,40,195,19 - LTEXT "Íàòèñí³òü ""Íàçàä"", ÿêùî ó Âàñ º äèñê äðàéâåðà àáî çíàºòå øëÿõ äî äðàéâåðà.", + LTEXT "Íàòèñí³òü ""Íàçàä"", ÿêùî ó Âàñ º äèñê ç äðàéâåðîì àáî Âè çíàºòå øëÿõ äî äðàéâåðà.", IDC_STATIC,120,98,181,24 CONTROL "Á³ëüøå íå ïîêàçóâàòè öåé ä³àëîã",IDC_DONOTSHOWDLG,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 @@ -44,10 +44,10 @@ IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Óñòàíîâêà íå âäàëàñÿ",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Âñòàíîâëåííÿ íå âäàëîñÿ",IDC_FINISHTITLE,120,8,195,24 LTEXT "Ïðèñòð³é íå âñòàíîâëåíî òîìó ùî ñòàëàñÿ íåñïîä³âàíà ïîìèëêà.", IDC_STATIC,120,40,195,19 LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,134,55,164,11 @@ -55,7 +55,7 @@ IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Ïîøóê ïî öèõ øëÿõàõ",IDC_RADIO_SEARCHHERE,"Button", @@ -73,7 +73,7 @@ IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,51,20,169,16 @@ -81,7 +81,7 @@ IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN LTEXT "ÍÅÂ²ÄÎÌÈÉ ÏÐÈÑÒÐ²É",IDC_DEVICE,51,20,169,16 @@ -90,11 +90,11 @@ IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Óñòàíîâêà çàâåðøåíà",IDC_FINISHTITLE,120,8,195,11 - LTEXT "Âè ìàºòå ïåðåçàïóñòèòè êîìïþòåð, ùîá çàê³í÷èòè óñòàíîâêó:", + LTEXT "Âñòàíîâëåííÿ çàâåðøåíå",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Âè ìàºòå ïåðåçàïóñòèòè êîìïþòåð, ùîá çàê³í÷èòè âñòàíîâëåííÿ:", IDC_STATIC,120,32,195,19 LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, 179,11 @@ -104,11 +104,11 @@ IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Óñòàíîâêà ïðèñòðîþ" +CAPTION "Âñòàíîâëåííÿ ïðèñòðîþ" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Óñòàíîâêà çàâåðøåíà",IDC_FINISHTITLE,120,8,195,11 - LTEXT "Ìàéñòåð çàê³í÷èâ óñòàíîâêó äðàéâåðà äëÿ:", + LTEXT "Âñòàíîâëåííÿ çàâåðøåíå",IDC_FINISHTITLE,120,8,195,11 + LTEXT "Ìàéñòåð çàê³í÷èâ âñòàíîâëåííÿ äðàéâåðà äëÿ:", IDC_STATIC,120,32,195,19 LTEXT "Íàòèñí³òü ""Çàâåðøèòè"" äëÿ âèõîäó ç ìàéñòðà.",IDC_STATIC,120,174, 179,11 Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Thu Jul 8 22:07:23 2010 @@ -264,7 +264,7 @@ IDS_SHORT_MAGNIFY "Åêðàííà ëóïà.lnk" IDS_SHORT_MPLAY32 "Ìóëüòèìåä³éíèé ïëåºð.lnk" IDS_SHORT_MSCONFIG "Êîíô³ãóðàö³ÿ ñèñòåìè.lnk" - IDS_SHORT_NOTEPAD "Notepad.lnk" + IDS_SHORT_NOTEPAD "Áëîêíîò.lnk" IDS_SHORT_RDESKTOP "Â³ääàëåíå êåðóâàííÿ ðîáî÷èì ñòîëîì.lnk" IDS_SHORT_REGEDIT "Ðåäàêòîð ðåºñòðó.lnk" IDS_SHORT_SERVICE "Äèñïåò÷åð ñëóæá.lnk"

1 0

[khornicek] 47973: Fix the bug of the month in arwinss too.
by khornicek＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: khornicek Date: Thu Jul 8 19:57:08 2010 New Revision: 47973 URL: http://svn.reactos.org/svn/reactos?rev=47973&view=rev Log: Fix the bug of the month in arwinss too. Modified: branches/arwinss/reactos/base/system/winlogon/sas.c Modified: branches/arwinss/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/win… ============================================================================== --- branches/arwinss/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/system/winlogon/sas.c [iso-8859-1] Thu Jul 8 19:57:08 2010 @@ -238,7 +238,7 @@ } /* Allocate enough memory */ - lpFullEnv = HeapAlloc(GetProcessHeap, 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); + lpFullEnv = HeapAlloc(GetProcessHeap(), 0, (EnvBlockSize + ProfileSize + 1) * sizeof(WCHAR)); if (!lpFullEnv) { TRACE("HeapAlloc() failed\n");

1 0

[ilardig] 47972: [NTOSKRNL] - Warn only once about FsRtlPrivateLock and FsRtlFastUnlockSingle being stubplemented.
by ilardig＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: ilardig Date: Thu Jul 8 19:28:25 2010 New Revision: 47972 URL: http://svn.reactos.org/svn/reactos?rev=47972&view=rev Log: [NTOSKRNL] - Warn only once about FsRtlPrivateLock and FsRtlFastUnlockSingle being stubplemented. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Jul 8 19:28:25 2010 @@ -79,7 +79,8 @@ { NTSTATUS Status; - DPRINT1("FsRtlPrivateLock() is stubplemented!\n"); + static BOOLEAN Warn; + if (!Warn++) DPRINT1("FsRtlPrivateLock() is stubplemented!\n"); /* Initialize the lock, if necessary */ if (!FileLock->LockInformation) @@ -177,7 +178,8 @@ IN PVOID Context OPTIONAL, IN BOOLEAN AlreadySynchronized) { - DPRINT1("FsRtlFastUnlockSingle() is stubplemented!\n"); + static BOOLEAN Warn; + if (!Warn++) DPRINT1("FsRtlFastUnlockSingle() is stubplemented!\n"); return STATUS_SUCCESS; }

1 0

[dreimer] 47971: Forgot to remove some now useless header
by dreimer＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: dreimer Date: Thu Jul 8 18:44:59 2010 New Revision: 47971 URL: http://svn.reactos.org/svn/reactos?rev=47971&view=rev Log: Forgot to remove some now useless header Removed: trunk/reactos/dll/win32/rpcrt4/unix_func.h Removed: trunk/reactos/dll/win32/rpcrt4/unix_func.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/unix_func… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/unix_func.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/unix_func.h (removed) @@ -1,12 +1,0 @@ - -#define F_SETFL 4 /* set file->f_flags */ - -#ifndef O_NONBLOCK -#define O_NONBLOCK 00004000 -#endif - -#define EINTR 4 /* Interrupted system call */ - -int poll(struct pollfd *fds, unsigned long nfds, int timo); -int socketpair (int af, int type, int protocol, SOCKET socket[2]); -int fcntl(int fd, int cmd, long arg);

1 0

[dreimer] 47970: Sync rpcrt4 to Wine 1.2rc6 (Samuel Serapion) http transport support commented out. Remove unix functions that are no longer needed. Comment out check in cpsf.c that caused 2nd stage dll registrations to fail. All rpcrt4 tests no longer crash.
by dreimer＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: dreimer Date: Thu Jul 8 18:39:18 2010 New Revision: 47970 URL: http://svn.reactos.org/svn/reactos?rev=47970&view=rev Log: Sync rpcrt4 to Wine 1.2rc6 (Samuel Serapion) http transport support commented out. Remove unix functions that are no longer needed. Comment out check in cpsf.c that caused 2nd stage dll registrations to fail. All rpcrt4 tests no longer crash. Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c trunk/reactos/dll/win32/rpcrt4/cpsf.c trunk/reactos/dll/win32/rpcrt4/cstub.c trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c trunk/reactos/dll/win32/rpcrt4/ndr_ole.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h trunk/reactos/dll/win32/rpcrt4/rpc_async.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.c trunk/reactos/dll/win32/rpcrt4/rpc_binding.h trunk/reactos/dll/win32/rpcrt4/rpc_defs.h trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpc_message.c trunk/reactos/dll/win32/rpcrt4/rpc_message.h trunk/reactos/dll/win32/rpcrt4/rpc_server.c trunk/reactos/dll/win32/rpcrt4/rpc_server.h trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c trunk/reactos/dll/win32/rpcrt4/unix_func.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/rpcrt4/cproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cproxy.c?… Modified: trunk/reactos/dll/win32/rpcrt4/cpsf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cpsf.c?re… Modified: trunk/reactos/dll/win32/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/cstub.c?r… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_marsh… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_ole.c… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_assoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_assoc… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_async.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_async… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_bindi… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_defs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_defs.… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_message.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_messa… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_serve… Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ma… Modified: trunk/reactos/dll/win32/rpcrt4/unix_func.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/unix_func…

1 0

[ilardig] 47969: [MSIMTF] - Silence debug spam again, lost after syncing.
by ilardig＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: ilardig Date: Thu Jul 8 15:34:30 2010 New Revision: 47969 URL: http://svn.reactos.org/svn/reactos?rev=47969&view=rev Log: [MSIMTF] - Silence debug spam again, lost after syncing. Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c Modified: trunk/reactos/dll/win32/msimtf/activeimmapp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msimtf/activeimm… ============================================================================== --- trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msimtf/activeimmapp.c [iso-8859-1] Thu Jul 8 15:34:30 2010 @@ -655,7 +655,7 @@ static HRESULT WINAPI ActiveIMMApp_OnDefWindowProc(IActiveIMMApp* This, HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) { - FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); + //FIXME("Stub (%p %x %lx %lx)\n",hWnd,Msg,wParam,lParam); return E_FAIL; }

1 0

[dreimer] 47968: Sync format_msg from kernel32 (Samuel Serapion) Winetest now passes with 0 errors.
by dreimer＠svn.reactos.org 08 Jul '10

08 Jul '10

Author: dreimer Date: Thu Jul 8 15:20:46 2010 New Revision: 47968 URL: http://svn.reactos.org/svn/reactos?rev=47968&view=rev Log: Sync format_msg from kernel32 (Samuel Serapion) Winetest now passes with 0 errors. Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c Modified: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/format_msg.c [iso-8859-1] Thu Jul 8 15:20:46 2010 @@ -21,10 +21,11 @@ #include <k32.h> -#define NDEBUG - -#include <debug.h> + #include "wine/unicode.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(resource); struct format_args { @@ -61,15 +62,15 @@ static const WCHAR FMTWSTR[] = { '%','s',0 }; /********************************************************************** - * load_messageW (internal) - */ -static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) + * load_message (internal) + */ +static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) { PMESSAGE_RESOURCE_ENTRY mre; WCHAR *buffer; NTSTATUS status; - DPRINT("module = %p, id = %08x\n", module, id ); + TRACE("module = %p, id = %08x\n", module, id ); if (!module) module = GetModuleHandleW( NULL ); if ((status = RtlFindMessage( module, (ULONG)RT_MESSAGETABLE, lang, id, &mre )) != STATUS_SUCCESS) @@ -90,45 +91,9 @@ if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; MultiByteToWideChar( CP_ACP, 0, (const char*)mre->Text, -1, buffer, len ); } - DPRINT("returning %S\n", buffer); + TRACE("returning %s\n", wine_dbgstr_w(buffer)); return buffer; } - - -/********************************************************************** - * load_messageA (internal) - */ -static LPSTR load_messageA( HMODULE module, UINT id, WORD lang ) -{ - PMESSAGE_RESOURCE_ENTRY mre; - char *buffer; - NTSTATUS status; - - DPRINT("module = %p, id = %08x\n", module, id ); - - if (!module) module = GetModuleHandleW( NULL ); - if ((status = RtlFindMessage( module, (ULONG)RT_MESSAGETABLE, lang, id, &mre )) != STATUS_SUCCESS) - { - SetLastError( RtlNtStatusToDosError(status) ); - return NULL; - } - - if (mre->Flags & MESSAGE_RESOURCE_UNICODE) - { - int len = WideCharToMultiByte( CP_ACP, 0, (const WCHAR *)mre->Text, -1, NULL, 0, NULL, NULL ); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; - WideCharToMultiByte( CP_ACP, 0, (const WCHAR *)mre->Text, -1, buffer, len, NULL, NULL ); - } - else - { - int len = strlen((const char*)mre->Text) + 1; - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len ))) return NULL; - memcpy( buffer, mre->Text, len ); - } - DPRINT("returning %s\n", buffer); - return buffer; -} - /********************************************************************** * get_arg (internal) @@ -146,22 +111,34 @@ return args->args[nr - 1]; } - /********************************************************************** - * format_insertA (internal) - */ -static LPCSTR format_insertA( int insert, LPCSTR format, DWORD flags, - struct format_args *args, LPSTR *result ) -{ - char *astring = NULL, *p, fmt[256]; + * format_insert (internal) + */ +static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, + DWORD flags, struct format_args *args, + LPWSTR *result ) +{ + static const WCHAR fmt_lu[] = {'%','l','u',0}; + WCHAR *wstring = NULL, *p, fmt[256]; ULONG_PTR arg; int size; if (*format != '!') /* simple string */ { - char *str = (char *)get_arg( insert, flags, args ); - *result = HeapAlloc( GetProcessHeap(), 0, strlen(str) + 1 ); - strcpy( *result, str ); + arg = get_arg( insert, flags, args ); + if (unicode_caller) + { + WCHAR *str = (WCHAR *)arg; + *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); + strcpyW( *result, str ); + } + else + { + char *str = (char *)arg; + DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); + } return format; } @@ -178,162 +155,38 @@ { if (*format == '*') { - p += sprintf( p, "%lu", get_arg( insert, flags, args )); + p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); insert = -1; format++; } else *p++ = *format++; } - while (isdigit(*format)) *p++ = *format++; + while (isdigitW(*format)) *p++ = *format++; if (*format == '.') { *p++ = *format++; if (*format == '*') { - p += sprintf( p, "%lu", get_arg( insert, flags, args )); + p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); insert = -1; format++; } else - while (isdigit(*format)) *p++ = *format++; + while (isdigitW(*format)) *p++ = *format++; } /* replicate MS bug: drop an argument when using va_list with width/precision */ if (insert == -1 && args->list) args->last--; arg = get_arg( insert, flags, args ); - /* check for wide string format */ - if ((format[0] == 'l' && format[1] == 's') || - (format[0] == 'l' && format[1] == 'S') || - (format[0] == 'w' && format[1] == 's') || - (format[0] == 'S')) - { - DWORD len = WideCharToMultiByte( CP_ACP, 0, (WCHAR *)arg, -1, /*FIXME*/ - NULL, 0, NULL, NULL ); - astring = HeapAlloc( GetProcessHeap(), 0, len ); - WideCharToMultiByte( CP_ACP, 0, (WCHAR *)arg, -1, astring, len, NULL, NULL ); - arg = (ULONG_PTR)astring; - *p++ = 's'; - } - /* check for wide character format */ - else if ((format[0] == 'l' && format[1] == 'c') || - (format[0] == 'l' && format[1] == 'C') || - (format[0] == 'w' && format[1] == 'c') || - (format[0] == 'C')) - { - WCHAR ch = arg; - DWORD len = WideCharToMultiByte( CP_ACP, 0, &ch, 1, NULL, 0, NULL, NULL ); - astring = HeapAlloc( GetProcessHeap(), 0, len + 1 ); - WideCharToMultiByte( CP_ACP, 0, &ch, 1, astring, len, NULL, NULL ); - astring[len] = 0; - arg = (ULONG_PTR)astring; - *p++ = 's'; - } - /* check for ascii string format */ - else if ((format[0] == 'h' && format[1] == 's') || - (format[0] == 'h' && format[1] == 'S')) - { - *p++ = 's'; - } - /* check for ascii character format */ - else if ((format[0] == 'h' && format[1] == 'c') || - (format[0] == 'h' && format[1] == 'C')) - { - *p++ = 'c'; - } - /* FIXME: handle I64 etc. */ - else while (*format && *format != '!') *p++ = *format++; - - *p = 0; - size = 256; - for (;;) - { - char *ret = HeapAlloc( GetProcessHeap(), 0, size ); - int needed = snprintf( ret, size, fmt, arg ); - if (needed == -1 || needed >= size) - { - HeapFree( GetProcessHeap(), 0, ret ); - size = max( needed + 1, size * 2 ); - } - else - { - *result = ret; - break; - } - } - - while (*format && *format != '!') format++; - if (*format == '!') format++; - - HeapFree( GetProcessHeap(), 0, astring ); - return format; -} - - -/********************************************************************** - * format_insertW (internal) - */ -static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, - struct format_args *args, LPWSTR *result ) -{ - static const WCHAR fmt_lu[] = {'%','l','u',0}; - WCHAR *wstring = NULL, *p, fmt[256]; - ULONG_PTR arg; - int size; - - if (*format != '!') /* simple string */ - { - WCHAR *str = (WCHAR *)get_arg( insert, flags, args ); - *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); - strcpyW( *result, str ); - return format; - } - - format++; - p = fmt; - *p++ = '%'; - - while (*format == '0' || - *format == '+' || - *format == '-' || - *format == ' ' || - *format == '*' || - *format == '#') - { - if (*format == '*') - { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); - insert = -1; - format++; - } - else *p++ = *format++; - } - while (isdigitW(*format)) *p++ = *format++; - - if (*format == '.') - { - *p++ = *format++; - if (*format == '*') - { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); - insert = -1; - format++; - } - else - while (isdigitW(*format)) *p++ = *format++; - } - - /* replicate MS bug: drop an argument when using va_list with width/precision */ - if (insert == -1 && args->list) args->last--; - arg = get_arg( insert, flags, args ); - /* check for ascii string format */ if ((format[0] == 'h' && format[1] == 's') || (format[0] == 'h' && format[1] == 'S') || - (format[0] == 'S')) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, /*FIXME*/ NULL, 0 ); + (unicode_caller && format[0] == 'S') || + (!unicode_caller && format[0] == 's')) + { + DWORD len = MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, NULL, 0 ); wstring = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, wstring, len ); arg = (ULONG_PTR)wstring; @@ -342,7 +195,8 @@ /* check for ascii character format */ else if ((format[0] == 'h' && format[1] == 'c') || (format[0] == 'h' && format[1] == 'C') || - (format[0] == 'C')) + (unicode_caller && format[0] == 'C') || + (!unicode_caller && format[0] == 'c')) { char ch = arg; wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); @@ -354,14 +208,16 @@ /* check for wide string format */ else if ((format[0] == 'l' && format[1] == 's') || (format[0] == 'l' && format[1] == 'S') || - (format[0] == 'w' && format[1] == 's')) + (format[0] == 'w' && format[1] == 's') || + (!unicode_caller && format[0] == 'S')) { *p++ = 's'; } /* check for wide character format */ else if ((format[0] == 'l' && format[1] == 'c') || (format[0] == 'l' && format[1] == 'C') || - (format[0] == 'w' && format[1] == 'c')) + (format[0] == 'w' && format[1] == 'c') || + (!unicode_caller && format[0] == 'C')) { *p++ = 'c'; } @@ -393,6 +249,129 @@ return format; } +/********************************************************************** + * format_message (internal) + */ +static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr, + struct format_args *format_args ) +{ + LPWSTR target,t; + DWORD talloced; + LPCWSTR f; + DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; + BOOL eos = FALSE; + WCHAR ch; + + target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); + talloced = 100; + +#define ADD_TO_T(c) do {\ + *t++=c;\ + if ((DWORD)(t-target) == talloced) {\ + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ + t = target+talloced;\ + talloced*=2;\ + } \ +} while (0) + + f = fmtstr; + while (*f && !eos) { + if (*f=='%') { + int insertnr; + WCHAR *str,*x; + + f++; + switch (*f) { + case '1':case '2':case '3':case '4':case '5': + case '6':case '7':case '8':case '9': + if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) + goto ignore_inserts; + else if (((dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->args) || + (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) && !format_args->list)) + { + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; + } + insertnr = *f-'0'; + switch (f[1]) { + case '0':case '1':case '2':case '3': + case '4':case '5':case '6':case '7': + case '8':case '9': + f++; + insertnr = insertnr*10 + *f-'0'; + f++; + break; + default: + f++; + break; + } + f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str ); + for (x = str; *x; x++) ADD_TO_T(*x); + HeapFree( GetProcessHeap(), 0, str ); + break; + case 'n': + ADD_TO_T('\r'); + ADD_TO_T('\n'); + f++; + break; + case 'r': + ADD_TO_T('\r'); + f++; + break; + case 't': + ADD_TO_T('\t'); + f++; + break; + case '0': + eos = TRUE; + f++; + break; + case '\0': + SetLastError(ERROR_INVALID_PARAMETER); + HeapFree(GetProcessHeap(), 0, target); + return NULL; + ignore_inserts: + default: + if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) + ADD_TO_T('%'); + ADD_TO_T(*f++); + break; + } + } else { + ch = *f; + f++; + if (ch == '\r') { + if (*f == '\n') + f++; + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } else { + if (ch == '\n') + { + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } + else + ADD_TO_T(ch); + } + } + } + *t = '\0'; + + return target; +} +#undef ADD_TO_T /*********************************************************************** * FormatMessageA (KERNEL32.@) @@ -409,25 +388,24 @@ { struct format_args format_args; DWORD ret = 0; - LPSTR target,t; - DWORD talloced; - LPSTR from; - LPCSTR f; + LPWSTR target; + DWORD destlength; + LPWSTR from; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; - BOOL eos = FALSE; - CHAR ch; HMODULE kernel32_handle = GetModuleHandleW(kernel32W); - DPRINT("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); - if ((dwFlags & FORMAT_MESSAGE_FROM_STRING) - &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) - || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; - - if (!lpBuffer) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return 0; + + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) + { + if (!lpBuffer) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + else + *(LPSTR *)lpBuffer = NULL; } if (dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) @@ -444,136 +422,64 @@ } if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - DPRINT1("FIXME: line wrapping (%u) not supported.\n", width); + FIXME("line wrapping (%u) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { - from = HeapAlloc( GetProcessHeap(), 0, strlen(lpSource) + 1 ); - strcpy( from, lpSource ); - } - else { - from = NULL; + DWORD length = MultiByteToWideChar(CP_ACP, 0, lpSource, -1, NULL, 0); + from = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, lpSource, -1, from, length); + } + else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) + { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_messageA( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_messageA( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } - target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100); - t = target; - talloced= 100; - -#define ADD_TO_T(c) do { \ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ - t = target+talloced;\ - talloced*=2;\ - }\ -} while (0) - - if (from) { - f=from; - if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); - } - else { - while (*f && !eos) { - if (*f=='%') { - int insertnr; - char *str,*x; - - f++; - if (!*f) { - ADD_TO_T('%'); - continue; - } - switch (*f) { - case '1':case '2':case '3':case '4':case '5': - case '6':case '7':case '8':case '9': - insertnr=*f-'0'; - switch (f[1]) { - case '0':case '1':case '2':case '3': - case '4':case '5':case '6':case '7': - case '8':case '9': - f++; - insertnr=insertnr*10+*f-'0'; - f++; - break; - default: - f++; - break; - } - f = format_insertA( insertnr, f, dwFlags, &format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); - HeapFree( GetProcessHeap(), 0, str ); - break; - case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); - f++; - break; - case '0': - eos = TRUE; - f++; - break; - default: - ADD_TO_T(*f++); - break; - } - } else { - ch = *f; - f++; - if (ch == '\r') { - if (*f == '\n') - f++; - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } else { - if (ch == '\n') - { - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } - else - ADD_TO_T(ch); - } - } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + target = format_message( FALSE, dwFlags, from, &format_args ); + if (!target) + goto failure; + + TRACE("-- %s\n", debugstr_w(target)); + + /* Only try writing to an output buffer if there are processed characters + * in the temporary output buffer. */ + if (*target) + { + destlength = WideCharToMultiByte(CP_ACP, 0, target, -1, NULL, 0, NULL, NULL); + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) + { + LPSTR buf = LocalAlloc(LMEM_ZEROINIT, max(nSize, destlength)); + WideCharToMultiByte(CP_ACP, 0, target, -1, buf, destlength, NULL, NULL); + *((LPSTR*)lpBuffer) = buf; + } + else + { + if (nSize < destlength) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto failure; } - } - *t='\0'; - } - talloced = strlen(target)+1; - if (nSize && talloced<nSize) { - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize); - } - DPRINT("-- %S\n", target); - if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,max(nSize, talloced)); - memcpy(*(LPSTR*)lpBuffer,target,talloced); - } else { - lstrcpynA(lpBuffer,target,nSize); - } + WideCharToMultiByte(CP_ACP, 0, target, -1, lpBuffer, destlength, NULL, NULL); + } + ret = destlength - 1; /* null terminator */ + } + +failure: HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); if (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) HeapFree( GetProcessHeap(), 0, format_args.args ); - ret = (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? strlen(*(LPSTR*)lpBuffer) : strlen(lpBuffer); - DPRINT("-- returning %d\n", ret); + TRACE("-- returning %u\n", ret); return ret; } -#undef ADD_TO_T - /*********************************************************************** * FormatMessageW (KERNEL32.@) @@ -588,26 +494,24 @@ __ms_va_list* args ) { struct format_args format_args; - LPWSTR target,t; + DWORD ret = 0; + LPWSTR target; DWORD talloced; LPWSTR from; - LPCWSTR f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; - BOOL eos = FALSE; - WCHAR ch; HMODULE kernel32_handle = GetModuleHandleW(kernel32W); - DPRINT("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); - if ((dwFlags & FORMAT_MESSAGE_FROM_STRING) - &&((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) - || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; if (!lpBuffer) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } + + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) + *(LPWSTR *)lpBuffer = NULL; if (dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY) { @@ -623,135 +527,61 @@ } if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - DPRINT1("FIXME: line wrapping not supported.\n"); + FIXME("line wrapping not supported.\n"); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) { from = HeapAlloc( GetProcessHeap(), 0, (strlenW(lpSource) + 1) * sizeof(WCHAR) ); strcpyW( from, lpSource ); } - else { - from = NULL; + else if (dwFlags & (FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM)) + { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } - target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); - t = target; - talloced= 100; - -#define ADD_TO_T(c) do {\ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - } \ -} while (0) - - if (from) { - f=from; - if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); - } - else { - while (*f && !eos) { - if (*f=='%') { - int insertnr; - WCHAR *str,*x; - - f++; - if (!*f) { - ADD_TO_T('%'); - continue; - } - - switch (*f) { - case '1':case '2':case '3':case '4':case '5': - case '6':case '7':case '8':case '9': - insertnr=*f-'0'; - switch (f[1]) { - case '0':case '1':case '2':case '3': - case '4':case '5':case '6':case '7': - case '8':case '9': - f++; - insertnr=insertnr*10+*f-'0'; - f++; - break; - default: - f++; - break; - } - f = format_insertW( insertnr, f, dwFlags, &format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); - HeapFree( GetProcessHeap(), 0, str ); - break; - case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); - f++; - break; - case '0': - eos = TRUE; - f++; - break; - default: - ADD_TO_T(*f++); - break; - } - } else { - ch = *f; - f++; - if (ch == '\r') { - if (*f == '\n') - f++; - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } else { - if (ch == '\n') - { - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } - else - ADD_TO_T(ch); - } - } - } - } - *t='\0'; - } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + target = format_message( TRUE, dwFlags, from, &format_args ); + if (!target) + goto failure; + talloced = strlenW(target)+1; - if (nSize && talloced<nSize) - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,nSize*sizeof(WCHAR)); - if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { - /* nSize is the MINIMUM size */ - DWORD len = strlenW(target) + 1; - *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); - strcpyW(*(LPWSTR*)lpBuffer, target); - } - else lstrcpynW(lpBuffer, target, nSize); - + TRACE("-- %s\n",debugstr_w(target)); + + /* Only allocate a buffer if there are processed characters in the + * temporary output buffer. If a caller supplies the buffer, then + * a null terminator will be written to it. */ + if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) + { + if (*target) + { + /* nSize is the MINIMUM size */ + *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT, max(nSize, talloced)*sizeof(WCHAR)); + strcpyW(*(LPWSTR*)lpBuffer, target); + } + } + else + { + if (nSize < talloced) + { + SetLastError(ERROR_INSUFFICIENT_BUFFER); + goto failure; + } + strcpyW(lpBuffer, target); + } + + ret = talloced - 1; /* null terminator */ +failure: HeapFree(GetProcessHeap(),0,target); HeapFree(GetProcessHeap(),0,from); if (!(dwFlags & FORMAT_MESSAGE_ARGUMENT_ARRAY)) HeapFree( GetProcessHeap(), 0, format_args.args ); - DPRINT("ret=%S\n", (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - *(LPWSTR*)lpBuffer : lpBuffer); - return (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) ? - strlenW(*(LPWSTR*)lpBuffer): - strlenW(lpBuffer); + TRACE("-- returning %u\n", ret); + return ret; } -#undef ADD_TO_T

1 0

[akhaldi] 47967: [PSDK] - Update DPFLTR_TYPE enum. [NTOSKRNL] - Update kdbg/kdb_cli.c accordingly.
by akhaldi＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: akhaldi Date: Wed Jul 7 22:29:21 2010 New Revision: 47967 URL: http://svn.reactos.org/svn/reactos?rev=47967&view=rev Log: [PSDK] - Update DPFLTR_TYPE enum. [NTOSKRNL] - Update kdbg/kdb_cli.c accordingly. Modified: trunk/reactos/include/psdk/dpfilter.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/include/psdk/dpfilter.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dpfilter.h?re… ============================================================================== --- trunk/reactos/include/psdk/dpfilter.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dpfilter.h [iso-8859-1] Wed Jul 7 22:29:21 2010 @@ -24,263 +24,152 @@ #define DPFLTR_INFO_LEVEL 3 #define DPFLTR_MASK 0x80000000 -#if 1 -typedef enum _DPFLTR_TYPE -{ - DPFLTR_SYSTEM_ID = 0, - DPFLTR_SMSS_ID = 1, - DPFLTR_SETUP_ID = 2, - DPFLTR_NTFS_ID = 3, - DPFLTR_FSTUB_ID = 4, - DPFLTR_CRASHDUMP_ID = 5, - DPFLTR_CDAUDIO_ID = 6, - DPFLTR_CDROM_ID = 7, - DPFLTR_CLASSPNP_ID = 8, - DPFLTR_DISK_ID = 9, - DPFLTR_REDBOOK_ID = 10, - DPFLTR_STORPROP_ID = 11, - DPFLTR_SCSIPORT_ID = 12, - DPFLTR_SCSIMINIPORT_ID = 13, - DPFLTR_CONFIG_ID = 14, - DPFLTR_I8042PRT_ID = 15, - DPFLTR_SERMOUSE_ID = 16, - DPFLTR_LSERMOUS_ID = 17, - DPFLTR_KBDHID_ID = 18, - DPFLTR_MOUHID_ID = 19, - DPFLTR_KBDCLASS_ID = 20, - DPFLTR_MOUCLASS_ID = 21, - DPFLTR_TWOTRACK_ID = 22, - DPFLTR_WMILIB_ID = 23, - DPFLTR_ACPI_ID = 24, - DPFLTR_AMLI_ID = 25, - DPFLTR_HALIA64_ID = 26, - DPFLTR_VIDEO_ID = 27, - DPFLTR_SVCHOST_ID = 28, - DPFLTR_VIDEOPRT_ID = 29, - DPFLTR_TCPIP_ID = 30, - DPFLTR_DMSYNTH_ID = 31, - DPFLTR_NTOSPNP_ID = 32, - DPFLTR_FASTFAT_ID = 33, - DPFLTR_SAMSS_ID = 34, - DPFLTR_PNPMGR_ID = 35, - DPFLTR_NETAPI_ID = 36, - DPFLTR_SCSERVER_ID = 37, - DPFLTR_SCCLIENT_ID = 38, - DPFLTR_SERIAL_ID = 39, - DPFLTR_SERENUM_ID = 40, - DPFLTR_UHCD_ID = 41, - DPFLTR_BOOTOK_ID = 42, - DPFLTR_BOOTVRFY_ID = 43, - DPFLTR_RPCPROXY_ID = 44, - DPFLTR_AUTOCHK_ID = 45, - DPFLTR_DCOMSS_ID = 46, - DPFLTR_UNIMODEM_ID = 47, - DPFLTR_SIS_ID = 48, - DPFLTR_FLTMGR_ID = 49, - DPFLTR_WMICORE_ID = 50, - DPFLTR_BURNENG_ID = 51, - DPFLTR_IMAPI_ID = 52, - DPFLTR_SXS_ID = 53, - DPFLTR_FUSION_ID = 54, - DPFLTR_IDLETASK_ID = 55, - DPFLTR_SOFTPCI_ID = 56, - DPFLTR_TAPE_ID = 57, - DPFLTR_MCHGR_ID = 58, - DPFLTR_IDEP_ID = 59, - DPFLTR_PCIIDE_ID = 60, - DPFLTR_FLOPPY_ID = 61, - DPFLTR_FDC_ID = 62, - DPFLTR_TERMSRV_ID = 63, - DPFLTR_W32TIME_ID = 64, - DPFLTR_PREFETCHER_ID = 65, - DPFLTR_RSFILTER_ID = 66, - DPFLTR_FCPORT_ID = 67, - DPFLTR_PCI_ID = 68, - DPFLTR_DMIO_ID = 69, - DPFLTR_DMCONFIG_ID = 70, - DPFLTR_DMADMIN_ID = 71, - DPFLTR_WSOCKTRANSPORT_ID = 72, - DPFLTR_VSS_ID = 73, - DPFLTR_PNPMEM_ID = 74, - DPFLTR_PROCESSOR_ID = 75, - DPFLTR_DMSERVER_ID = 76, - DPFLTR_SR_ID = 77, - DPFLTR_INFINIBAND_ID = 78, - DPFLTR_IHVDRIVER_ID = 79, - DPFLTR_IHVVIDEO_ID = 80, - DPFLTR_IHVAUDIO_ID = 81, - DPFLTR_IHVNETWORK_ID = 82, - DPFLTR_IHVSTREAMING_ID = 83, - DPFLTR_IHVBUS_ID = 84, - DPFLTR_HPS_ID = 85, - DPFLTR_RTLTHREADPOOL_ID = 86, - DPFLTR_LDR_ID = 87, - DPFLTR_TCPIP6_ID = 88, - DPFLTR_ISAPNP_ID = 89, - DPFLTR_SHPC_ID = 90, - DPFLTR_STORPORT_ID = 91, - DPFLTR_STORMINIPORT_ID = 92, - DPFLTR_PRINTSPOOLER_ID = 93, - DPFLTR_VDS_ID = 94, - DPFLTR_VDSBAS_ID = 95, - DPFLTR_VDSDYNDR_ID = 96, - DPFLTR_VDSUTIL_ID = 97, - DPFLTR_DFRGIFC_ID = 98, - DPFLTR_DEFAULT_ID = 99, - DPFLTR_MM_ID = 100, - DPFLTR_DFSC_ID = 101, - DPFLTR_WOW64_ID = 102, - DPFLTR_ENDOFTABLE_ID +typedef enum _DPFLTR_TYPE { + DPFLTR_SYSTEM_ID = 0, + DPFLTR_SMSS_ID = 1, + DPFLTR_SETUP_ID = 2, + DPFLTR_NTFS_ID = 3, + DPFLTR_FSTUB_ID = 4, + DPFLTR_CRASHDUMP_ID = 5, + DPFLTR_CDAUDIO_ID = 6, + DPFLTR_CDROM_ID = 7, + DPFLTR_CLASSPNP_ID = 8, + DPFLTR_DISK_ID = 9, + DPFLTR_REDBOOK_ID = 10, + DPFLTR_STORPROP_ID = 11, + DPFLTR_SCSIPORT_ID = 12, + DPFLTR_SCSIMINIPORT_ID = 13, + DPFLTR_CONFIG_ID = 14, + DPFLTR_I8042PRT_ID = 15, + DPFLTR_SERMOUSE_ID = 16, + DPFLTR_LSERMOUS_ID = 17, + DPFLTR_KBDHID_ID = 18, + DPFLTR_MOUHID_ID = 19, + DPFLTR_KBDCLASS_ID = 20, + DPFLTR_MOUCLASS_ID = 21, + DPFLTR_TWOTRACK_ID = 22, + DPFLTR_WMILIB_ID = 23, + DPFLTR_ACPI_ID = 24, + DPFLTR_AMLI_ID = 25, + DPFLTR_HALIA64_ID = 26, + DPFLTR_VIDEO_ID = 27, + DPFLTR_SVCHOST_ID = 28, + DPFLTR_VIDEOPRT_ID = 29, + DPFLTR_TCPIP_ID = 30, + DPFLTR_DMSYNTH_ID = 31, + DPFLTR_NTOSPNP_ID = 32, + DPFLTR_FASTFAT_ID = 33, + DPFLTR_SAMSS_ID = 34, + DPFLTR_PNPMGR_ID = 35, + DPFLTR_NETAPI_ID = 36, + DPFLTR_SCSERVER_ID = 37, + DPFLTR_SCCLIENT_ID = 38, + DPFLTR_SERIAL_ID = 39, + DPFLTR_SERENUM_ID = 40, + DPFLTR_UHCD_ID = 41, + DPFLTR_RPCPROXY_ID = 42, + DPFLTR_AUTOCHK_ID = 43, + DPFLTR_DCOMSS_ID = 44, + DPFLTR_UNIMODEM_ID = 45, + DPFLTR_SIS_ID = 46, + DPFLTR_FLTMGR_ID = 47, + DPFLTR_WMICORE_ID = 48, + DPFLTR_BURNENG_ID = 49, + DPFLTR_IMAPI_ID = 50, + DPFLTR_SXS_ID = 51, + DPFLTR_FUSION_ID = 52, + DPFLTR_IDLETASK_ID = 53, + DPFLTR_SOFTPCI_ID = 54, + DPFLTR_TAPE_ID = 55, + DPFLTR_MCHGR_ID = 56, + DPFLTR_IDEP_ID = 57, + DPFLTR_PCIIDE_ID = 58, + DPFLTR_FLOPPY_ID = 59, + DPFLTR_FDC_ID = 60, + DPFLTR_TERMSRV_ID = 61, + DPFLTR_W32TIME_ID = 62, + DPFLTR_PREFETCHER_ID = 63, + DPFLTR_RSFILTER_ID = 64, + DPFLTR_FCPORT_ID = 65, + DPFLTR_PCI_ID = 66, + DPFLTR_DMIO_ID = 67, + DPFLTR_DMCONFIG_ID = 68, + DPFLTR_DMADMIN_ID = 69, + DPFLTR_WSOCKTRANSPORT_ID = 70, + DPFLTR_VSS_ID = 71, + DPFLTR_PNPMEM_ID = 72, + DPFLTR_PROCESSOR_ID = 73, + DPFLTR_DMSERVER_ID = 74, + DPFLTR_SR_ID = 75, + DPFLTR_INFINIBAND_ID = 76, + DPFLTR_IHVDRIVER_ID = 77, + DPFLTR_IHVVIDEO_ID = 78, + DPFLTR_IHVAUDIO_ID = 79, + DPFLTR_IHVNETWORK_ID = 80, + DPFLTR_IHVSTREAMING_ID = 81, + DPFLTR_IHVBUS_ID = 82, + DPFLTR_HPS_ID = 83, + DPFLTR_RTLTHREADPOOL_ID = 84, + DPFLTR_LDR_ID = 85, + DPFLTR_TCPIP6_ID = 86, + DPFLTR_ISAPNP_ID = 87, + DPFLTR_SHPC_ID = 88, + DPFLTR_STORPORT_ID = 89, + DPFLTR_STORMINIPORT_ID = 90, + DPFLTR_PRINTSPOOLER_ID = 91, + DPFLTR_VSSDYNDISK_ID = 92, + DPFLTR_VERIFIER_ID = 93, + DPFLTR_VDS_ID = 94, + DPFLTR_VDSBAS_ID = 95, + DPFLTR_VDSDYN_ID = 96, + DPFLTR_VDSDYNDR_ID = 97, + DPFLTR_VDSLDR_ID = 98, + DPFLTR_VDSUTIL_ID = 99, + DPFLTR_DFRGIFC_ID = 100, + DPFLTR_DEFAULT_ID = 101, + DPFLTR_MM_ID = 102, + DPFLTR_DFSC_ID = 103, + DPFLTR_WOW64_ID = 104, + DPFLTR_ALPC_ID = 105, + DPFLTR_WDI_ID = 106, + DPFLTR_PERFLIB_ID = 107, + DPFLTR_KTM_ID = 108, + DPFLTR_IOSTRESS_ID = 109, + DPFLTR_HEAP_ID = 110, + DPFLTR_WHEA_ID = 111, + DPFLTR_USERGDI_ID = 112, + DPFLTR_MMCSS_ID = 113, + DPFLTR_TPM_ID = 114, + DPFLTR_THREADORDER_ID = 115, + DPFLTR_ENVIRON_ID = 116, + DPFLTR_EMS_ID = 117, + DPFLTR_WDT_ID = 118, + DPFLTR_FVEVOL_ID = 119, + DPFLTR_NDIS_ID = 120, + DPFLTR_NVCTRACE_ID = 121, + DPFLTR_LUAFV_ID = 122, + DPFLTR_APPCOMPAT_ID = 123, + DPFLTR_USBSTOR_ID = 124, + DPFLTR_SBP2PORT_ID = 125, + DPFLTR_COVERAGE_ID = 126, + DPFLTR_CACHEMGR_ID = 127, + DPFLTR_MOUNTMGR_ID = 128, + DPFLTR_CFR_ID = 129, + DPFLTR_TXF_ID = 130, + DPFLTR_KSECDD_ID = 131, + DPFLTR_FLTREGRESS_ID = 132, + DPFLTR_MPIO_ID = 133, + DPFLTR_MSDSM_ID = 134, + DPFLTR_UDFS_ID = 135, + DPFLTR_PSHED_ID = 136, + DPFLTR_STORVSP_ID = 137, + DPFLTR_LSASS_ID = 138, + DPFLTR_SSPICLI_ID = 139, + DPFLTR_CNG_ID = 140, + DPFLTR_EXFAT_ID = 141, + DPFLTR_FILETRACE_ID = 142, + DPFLTR_XSAVE_ID = 143, + DPFLTR_SE_ID = 144, + DPFLTR_DRIVEEXTENDER_ID = 145, + DPFLTR_ENDOFTABLE_ID } DPFLTR_TYPE; -#else -typedef enum _DPFLTR_TYPE -{ - DPFLTR_SYSTEM_ID = 0, - DPFLTR_SMSS_ID = 1, - DPFLTR_SETUP_ID = 2, - DPFLTR_NTFS_ID = 3, - DPFLTR_FSTUB_ID = 4, - DPFLTR_CRASHDUMP_ID = 5, - DPFLTR_CDAUDIO_ID = 6, - DPFLTR_CDROM_ID = 7, - DPFLTR_CLASSPNP_ID = 8, - DPFLTR_DISK_ID = 9, - DPFLTR_REDBOOK_ID = 10, - DPFLTR_STORPROP_ID = 11, - DPFLTR_SCSIPORT_ID = 12, - DPFLTR_SCSIMINIPORT_ID = 13, - DPFLTR_CONFIG_ID = 14, - DPFLTR_I8042PRT_ID = 15, - DPFLTR_SERMOUSE_ID = 16, - DPFLTR_LSERMOUS_ID = 17, - DPFLTR_KBDHID_ID = 18, - DPFLTR_MOUHID_ID = 19, - DPFLTR_KBDCLASS_ID = 20, - DPFLTR_MOUCLASS_ID = 21, - DPFLTR_TWOTRACK_ID = 22, - DPFLTR_WMILIB_ID = 23, - DPFLTR_ACPI_ID = 24, - DPFLTR_AMLI_ID = 25, - DPFLTR_HALIA64_ID = 26, - DPFLTR_VIDEO_ID = 27, - DPFLTR_SVCHOST_ID = 28, - DPFLTR_VIDEOPRT_ID = 29, - DPFLTR_TCPIP_ID = 30, - DPFLTR_DMSYNTH_ID = 31, - DPFLTR_NTOSPNP_ID = 32, - DPFLTR_FASTFAT_ID = 33, - DPFLTR_SAMSS_ID = 34, - DPFLTR_PNPMGR_ID = 35, - DPFLTR_NETAPI_ID = 36, - DPFLTR_SCSERVER_ID = 37, - DPFLTR_SCCLIENT_ID = 38, - DPFLTR_SERIAL_ID = 39, - DPFLTR_SERENUM_ID = 40, - DPFLTR_UHCD_ID = 41, - DPFLTR_RPCPROXY_ID = 42, - DPFLTR_AUTOCHK_ID = 43, - DPFLTR_DCOMSS_ID = 44, - DPFLTR_UNIMODEM_ID = 45, - DPFLTR_SIS_ID = 46, - DPFLTR_FLTMGR_ID = 47, - DPFLTR_WMICORE_ID = 48, - DPFLTR_BURNENG_ID = 49, - DPFLTR_IMAPI_ID = 50, - DPFLTR_SXS_ID = 51, - DPFLTR_FUSION_ID = 52, - DPFLTR_IDLETASK_ID = 53, - DPFLTR_SOFTPCI_ID = 54, - DPFLTR_TAPE_ID = 55, - DPFLTR_MCHGR_ID = 56, - DPFLTR_IDEP_ID = 57, - DPFLTR_PCIIDE_ID = 58, - DPFLTR_FLOPPY_ID = 59, - DPFLTR_FDC_ID = 60, - DPFLTR_TERMSRV_ID = 61, - DPFLTR_W32TIME_ID = 62, - DPFLTR_PREFETCHER_ID = 63, - DPFLTR_RSFILTER_ID = 64, - DPFLTR_FCPORT_ID = 65, - DPFLTR_PCI_ID = 66, - DPFLTR_DMIO_ID = 67, - DPFLTR_DMCONFIG_ID = 68, - DPFLTR_DMADMIN_ID = 69, - DPFLTR_WSOCKTRANSPORT_ID = 70, - DPFLTR_VSS_ID = 71, - DPFLTR_PNPMEM_ID = 72, - DPFLTR_PROCESSOR_ID = 73, - DPFLTR_DMSERVER_ID = 74, - DPFLTR_SR_ID = 75, - DPFLTR_INFINIBAND_ID = 76, - DPFLTR_IHVDRIVER_ID = 77, - DPFLTR_IHVVIDEO_ID = 78, - DPFLTR_IHVAUDIO_ID = 79, - DPFLTR_IHVNETWORK_ID = 80, - DPFLTR_IHVSTREAMING_ID = 81, - DPFLTR_IHVBUS_ID = 82, - DPFLTR_HPS_ID = 83, - DPFLTR_RTLTHREADPOOL_ID = 84, - DPFLTR_LDR_ID = 85, - DPFLTR_TCPIP6_ID = 86, - DPFLTR_ISAPNP_ID = 87, - DPFLTR_SHPC_ID = 88, - DPFLTR_STORPORT_ID = 89, - DPFLTR_STORMINIPORT_ID = 90, - DPFLTR_PRINTSPOOLER_ID = 91, - DPFLTR_VSSDYNDISK_ID = 92, - DPFLTR_VERIFIER_ID = 93, - DPFLTR_VDS_ID = 94, - DPFLTR_VDSBAS_ID = 95, - DPFLTR_VDSDYN_ID = 96, - DPFLTR_VDSDYNDR_ID = 97, - DPFLTR_VDSLDR_ID = 98, - DPFLTR_VDSUTIL_ID = 99, - DPFLTR_DFRGIFC_ID = 100, - DPFLTR_DEFAULT_ID = 101, - DPFLTR_MM_ID = 102, - DPFLTR_DFSC_ID = 103, - DPFLTR_WOW64_ID = 104, - DPFLTR_ALPC_ID = 105, - DPFLTR_WDI_ID = 106, - DPFLTR_PERFLIB_ID = 107, - DPFLTR_KTM_ID = 108, - DPFLTR_IOSTRESS_ID = 109, - DPFLTR_HEAP_ID = 110, - DPFLTR_WHEA_ID = 111, - DPFLTR_USERGDI_ID = 112, - DPFLTR_MMCSS_ID = 113, - DPFLTR_TPM_ID = 114, - DPFLTR_THREADORDER_ID = 115, - DPFLTR_ENVIRON_ID = 116, - DPFLTR_EMS_ID = 117, - DPFLTR_WDT_ID = 118, - DPFLTR_FVEVOL_ID = 119, - DPFLTR_NDIS_ID = 120, - DPFLTR_NVCTRACE_ID = 121, - DPFLTR_LUAFV_ID = 122, - DPFLTR_APPCOMPAT_ID = 123, - DPFLTR_USBSTOR_ID = 124, - DPFLTR_SBP2PORT_ID = 125, - DPFLTR_COVERAGE_ID = 126, - DPFLTR_CACHEMGR_ID = 127, - DPFLTR_MOUNTMGR_ID = 128, - DPFLTR_CFR_ID = 129, - DPFLTR_TXF_ID = 130, - DPFLTR_KSECDD_ID = 131, - DPFLTR_FLTREGRESS_ID = 132, - DPFLTR_MPIO_ID = 133, - DPFLTR_MSDSM_ID = 134, - DPFLTR_UDFS_ID = 135, - DPFLTR_PSHED_ID = 136, - DPFLTR_STORVSP_ID = 137, - DPFLTR_LSASS_ID = 138, - DPFLTR_SSPICLI_ID = 139, - DPFLTR_CNG_ID = 140, - DPFLTR_EXFAT_ID = 141, - DPFLTR_FILETRACE_ID = 142, - DPFLTR_XSAVE_ID = 143, - DPFLTR_SE_ID = 144, - DPFLTR_DRIVEEXTENDER_ID = 145, - DPFLTR_ENDOFTABLE_ID -} DPFLTR_TYPE; -#endif Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Wed Jul 7 22:29:21 2010 @@ -220,8 +220,6 @@ { "SERIAL", DPFLTR_SERIAL_ID }, { "SERENUM", DPFLTR_SERENUM_ID }, { "UHCD", DPFLTR_UHCD_ID }, - { "BOOTOK", DPFLTR_BOOTOK_ID }, - { "BOOTVRFY", DPFLTR_BOOTVRFY_ID }, { "RPCPROXY", DPFLTR_RPCPROXY_ID }, { "AUTOCHK", DPFLTR_AUTOCHK_ID }, { "DCOMSS", DPFLTR_DCOMSS_ID }, @@ -272,7 +270,60 @@ { "STORPORT", DPFLTR_STORPORT_ID }, { "STORMINIPORT", DPFLTR_STORMINIPORT_ID }, { "PRINTSPOOLER", DPFLTR_PRINTSPOOLER_ID }, - }; + { "VSSDYNDISK", DPFLTR_VSSDYNDISK_ID }, + { "VERIFIER", DPFLTR_VERIFIER_ID }, + { "VDS", DPFLTR_VDS_ID }, + { "VDSBAS", DPFLTR_VDSBAS_ID }, + { "VDSDYN", DPFLTR_VDSDYN_ID }, + { "VDSDYNDR", DPFLTR_VDSDYNDR_ID }, + { "VDSLDR", DPFLTR_VDSLDR_ID }, + { "VDSUTIL", DPFLTR_VDSUTIL_ID }, + { "DFRGIFC", DPFLTR_DFRGIFC_ID }, + { "MM", DPFLTR_MM_ID }, + { "DFSC", DPFLTR_DFSC_ID }, + { "WOW64", DPFLTR_WOW64_ID }, + { "ALPC", DPFLTR_ALPC_ID }, + { "WDI", DPFLTR_WDI_ID }, + { "PERFLIB", DPFLTR_PERFLIB_ID }, + { "KTM", DPFLTR_KTM_ID }, + { "IOSTRESS", DPFLTR_IOSTRESS_ID }, + { "HEAP", DPFLTR_HEAP_ID }, + { "WHEA", DPFLTR_WHEA_ID }, + { "USERGDI", DPFLTR_USERGDI_ID }, + { "MMCSS", DPFLTR_MMCSS_ID }, + { "TPM", DPFLTR_TPM_ID }, + { "THREADORDER", DPFLTR_THREADORDER_ID }, + { "ENVIRON", DPFLTR_ENVIRON_ID }, + { "EMS", DPFLTR_EMS_ID }, + { "WDT", DPFLTR_WDT_ID }, + { "FVEVOL", DPFLTR_FVEVOL_ID }, + { "NDIS", DPFLTR_NDIS_ID }, + { "NVCTRACE", DPFLTR_NVCTRACE_ID }, + { "LUAFV", DPFLTR_LUAFV_ID }, + { "APPCOMPAT", DPFLTR_APPCOMPAT_ID }, + { "USBSTOR", DPFLTR_USBSTOR_ID }, + { "SBP2PORT", DPFLTR_SBP2PORT_ID }, + { "COVERAGE", DPFLTR_COVERAGE_ID }, + { "CACHEMGR", DPFLTR_CACHEMGR_ID }, + { "MOUNTMGR", DPFLTR_MOUNTMGR_ID }, + { "CFR", DPFLTR_CFR_ID }, + { "TXF", DPFLTR_TXF_ID }, + { "KSECDD", DPFLTR_KSECDD_ID }, + { "FLTREGRESS", DPFLTR_FLTREGRESS_ID }, + { "MPIO", DPFLTR_MPIO_ID }, + { "MSDSM", DPFLTR_MSDSM_ID }, + { "UDFS", DPFLTR_UDFS_ID }, + { "PSHED", DPFLTR_PSHED_ID }, + { "STORVSP", DPFLTR_STORVSP_ID }, + { "LSASS", DPFLTR_LSASS_ID }, + { "SSPICLI", DPFLTR_SSPICLI_ID }, + { "CNG", DPFLTR_CNG_ID }, + { "EXFAT", DPFLTR_EXFAT_ID }, + { "FILETRACE", DPFLTR_FILETRACE_ID }, + { "XSAVE", DPFLTR_XSAVE_ID }, + { "SE", DPFLTR_SE_ID }, + { "DRIVEEXTENDER", DPFLTR_DRIVEEXTENDER_ID }, + }; for (i = 0; i < sizeof(ComponentTable) / sizeof(ComponentTable[0]); i++) {

1 0

[fireball] 47966: - SwmCopyBits: Implement moving bits of a non-foreground window (which usually is the case, because at least a taskbar is an always-on-top window). Fixes e.g. visual glitches when moving a window over the taskbar.
by fireball＠svn.reactos.org 07 Jul '10

07 Jul '10

Author: fireball Date: Wed Jul 7 22:10:22 2010 New Revision: 47966 URL: http://svn.reactos.org/svn/reactos?rev=47966&view=rev Log: - SwmCopyBits: Implement moving bits of a non-foreground window (which usually is the case, because at least a taskbar is an always-on-top window). Fixes e.g. visual glitches when moving a window over the taskbar. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Jul 7 22:10:22 2010 @@ -29,4 +29,7 @@ ((PDC) GDIOBJ_LockObj ((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC)) #define DC_Unlock(pDC) \ GDIOBJ_UnlockObjByPtr ((PBASEOBJECT)pDC) + +VOID APIENTRY RosGdiUpdateClipping(PDC pDC); + #endif Modified: branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/swm/winman.c [iso-8859-1] Wed Jul 7 22:10:22 2010 @@ -614,14 +614,108 @@ VOID NTAPI -SwmCopyBits(const RECT *WindowRect, const RECT *OldRect) -{ +SwmCopyBits(const PSWM_WINDOW SwmWin, const RECT *OldRect) +{ + RECTL rcBounds; + PDC pDC; + PLIST_ENTRY Current; + struct region *TempRegion, *ParentRegion, *WinRegion = NULL; + rectangle_t rcScreen, rcOldWindow; + PSWM_WINDOW Window; + /* Lazily create a global screen DC */ if (!SwmDc) SwmCreateScreenDc(); + /* Set clipping to prevent touching higher-level windows */ + pDC = DC_Lock(SwmDc); + + /* Check if we have higher-level windows */ + if (SwmWin->Entry.Blink != &SwmWindows) + { + /* Create a whole screen region */ + rcScreen.left = 0; + rcScreen.top = 0; + rcScreen.right = pDC->rcVport.right; + rcScreen.bottom = pDC->rcVport.bottom; + set_region_rect(pDC->Clipping, &rcScreen); + + ParentRegion = create_empty_region(); + + /* Compile a total region clipped by parent windows */ + Current = SwmWin->Entry.Blink; + while(Current != &SwmWindows) + { + Window = CONTAINING_RECORD(Current, SWM_WINDOW, Entry); + + /* Skip hidden windows */ + if (Window->Hidden) + { + /* Advance to the next window */ + Current = Current->Blink; + continue; + } + DPRINT("hwnd: %x\n", Window->hwnd); + + /* Calculate window's region */ + TempRegion = create_empty_region(); + set_region_rect(TempRegion, &Window->Window); + + /* Union it with parent if it's not empty and free temp region */ + if (!is_region_empty(TempRegion)) + union_region(ParentRegion, ParentRegion, TempRegion); + free_region(TempRegion); + + /* Advance to the previous window */ + Current = Current->Blink; + } + + /* Remove parts clipped by parents from the window region */ + if (!is_region_empty(ParentRegion)) + subtract_region(pDC->Clipping, pDC->Clipping, ParentRegion); + + /* Set DC clipping */ + RosGdiUpdateClipping(pDC); + + /* Get the part which was previously hidden by parent area */ + WinRegion = create_empty_region(); + rcOldWindow.bottom = OldRect->bottom; + rcOldWindow.left = OldRect->left; + rcOldWindow.top = OldRect->top; + rcOldWindow.right = OldRect->right; + set_region_rect(WinRegion, &rcOldWindow); + + intersect_region(WinRegion, WinRegion, ParentRegion); + if (!is_region_empty(WinRegion)) + { + /* Offset it to the new position */ + offset_region(WinRegion, + SwmWin->Window.left - OldRect->left, + SwmWin->Window.top - OldRect->top); + + /* Paint it */ + SwmPaintRegion(WinRegion); + } + + free_region(WinRegion); + free_region(ParentRegion); + } + else + { + /* Simple case, use whole viewport as a clipping rect */ + RECTL_vSetRect(&rcBounds, + 0, + 0, + pDC->rcVport.right, + pDC->rcVport.bottom); + IntEngDeleteClipRegion(pDC->CombinedClip); + pDC->CombinedClip = IntEngCreateClipRegion(1, &rcBounds, &rcBounds); + } + + DC_Unlock(pDC); + /* Copy bits */ - RosGdiBitBlt(SwmDc, WindowRect->left, WindowRect->top, WindowRect->right - WindowRect->left, - WindowRect->bottom - WindowRect->top, SwmDc, OldRect->left, OldRect->top, SRCCOPY); + RosGdiBitBlt(SwmDc, SwmWin->Window.left, SwmWin->Window.top, SwmWin->Window.right - SwmWin->Window.left, + SwmWin->Window.bottom - SwmWin->Window.top, SwmDc, OldRect->left, OldRect->top, SRCCOPY); } VOID @@ -711,12 +805,7 @@ SwmClipAllWindows(); /* Copy bitmap bits if it's a move */ - if (IsMove) - { - /* FIXME: The window MUST be foreground, otherwise bits will be - copied incorrectly */ - SwmCopyBits(WindowRect, OldRect); - } + if (IsMove) SwmCopyBits(SwmWin, OldRect); /* Paint area changed after moving or resizing */ if (Width < OldWidth ||

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs