Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

03 Jan '08

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

1 0

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

03 Jan '08

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

1 0

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

03 Jan '08

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

1 0

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

03 Jan '08

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

1 0

[jimtabor] 31578: Fix DxEngGetHdevData.
by jimtabor＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: jimtabor Date: Thu Jan 3 02:57:05 2008 New Revision: 31578 URL: http://svn.reactos.org/svn/reactos?rev=31578&view=rev Log: Fix DxEngGetHdevData. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 3 02:57:05 2008 @@ -69,7 +69,7 @@ HSURF FillPatterns[HS_DDI_MAX]; - ULONG DxDD_nCount; + ULONG DxDd_nCount; DEVINFO DevInfo; GDIINFO GDIInfo; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Jan 3 02:57:05 2008 @@ -382,11 +382,79 @@ /* DxEngGetHdevData */ /************************************************************************/ DWORD -DxEngGetHdevData(HDEV hdev, - DXEGSHDEVDATA Index) -{ - UNIMPLEMENTED; - return 0; +DxEngGetHdevData(HDEV hDev, + DXEGSHDEVDATA Type) +{ + DWORD retVal = 0; + PGDIDEVICE PDev = (PGDIDEVICE)hDev; + + switch ( Type ) + { + case DxEGShDevData_Surface: + retVal = (DWORD) PDev->pSurface; // ptr to Surface handle. + break; + case DxEGShDevData_hSpooler: + retVal = (DWORD) PDev->hSpooler; // If the device is a spooler driver. + break; + case DxEGShDevData_DitherFmt: + retVal = (DWORD) PDev->DevInfo.iDitherFormat; + break; + case DxEGShDevData_FxCaps: + retVal = (DWORD) PDev->DevInfo.flGraphicsCaps; + break; + case DxEGShDevData_FxCaps2: + retVal = (DWORD) PDev->DevInfo.flGraphicsCaps2; + break; + case DxEGShDevData_DrvFuncs: + retVal = (DWORD) &PDev->DriverFunctions; + break; + case DxEGShDevData_dhpdev: + retVal = (DWORD) PDev->hPDev; // DHPDEV + break; + case DxEGShDevData_eddg: + retVal = (DWORD) PDev->pEDDgpl; + break; + case DxEGShDevData_dd_nCount: + retVal = (DWORD) PDev->DxDd_nCount; + break; + case DxEGShDevData_dd_flags: + retVal = (DWORD) PDev->DxDd_Flags; + break; + case DxEGShDevData_disable: + retVal = (DWORD) PDev->flFlags & PDEV_DISABLED; + break; + case DxEGShDevData_metadev: + retVal = (DWORD) PDev->flFlags & PDEV_META_DEVICE; + break; + case DxEGShDevData_display: + retVal = (DWORD) PDev->flFlags & PDEV_DISPLAY; + break; + case DxEGShDevData_Parent: + retVal = (DWORD) PDev->ppdevParent; + break; + case DxEGShDevData_OpenRefs: + retVal = (DWORD) PDev->cPdevOpenRefs == 0; + break; + case DxEGShDevData_palette: + retVal = (DWORD) PDev->GDIInfo.flRaster & RC_PALETTE; + break; + case DxEGShDevData_ldev: + // ATM we do not support the Loader Device driver structure. +// retVal = (DWORD) PDev->pldev; + break; + case DxEGShDevData_GDev: + retVal = (DWORD) PDev->pGraphicsDev; // P"GRAPHICS_DEVICE" + break; + case DxEGShDevData_clonedev: + retVal = (DWORD) PDev->flFlags & PDEV_CLONE_DEVICE; + break; + + default: + break; + } + + return retVal; + } /*++ @@ -420,7 +488,7 @@ if ( Type == DxEGShDevData_dd_nCount ) { - ((PGDIDEVICE)hDev)->DxDD_nCount = Data; + ((PGDIDEVICE)hDev)->DxDd_nCount = Data; retVal = TRUE; // Set } return retVal;

1 0

[zguo] 31577: More documentation fixes
by zguo＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: zguo Date: Thu Jan 3 02:32:04 2008 New Revision: 31577 URL: http://svn.reactos.org/svn/reactos?rev=31577&view=rev Log: More documentation fixes Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Jan 3 02:32:04 2008 @@ -93,10 +93,10 @@ * @name DxEngDispUniq * @implemented * -* The function DxEngDispUniq return the DisplayUniqVisrgn counter from gdishare memory -* -* @return -* return DisplayUniqVisrgn counter value from gdishare memory +* The function DxEngDispUniq returns the DisplayUniqVisrgn counter value from GDI shared memory +* +* @return +* Returns the DisplayUniqVisrgn counter value from GDI shared memory * * @remarks. * none @@ -136,19 +136,19 @@ * @name DxEngGetDeviceGammaRamp * @implemented * -* The function DxEngSetDeviceGammaRamp Set Gamma ramp from from dxg.sys +* The function DxEngGetDeviceGammaRamp gets the gamma ramp in dxg.sys. * @param HDEV hPDev -* The hdev +* The hdev. * * @param PGAMMARAMP Ramp -* to fill in our gamma ramp +* Pointer to store the gamma ramp value in. * * @return *Returns TRUE for success, FALSE for failure * * @remarks. -* ReactOS does not loop it, only sets the gamma once. +* None * *--*/ BOOL @@ -168,7 +168,7 @@ * The handle we want to lock * * @return -* Returns PDC if lock succeeded or NULL depns if it failed +* Returns PDC if lock succeeded or NULL if it failed. * * @remarks. * none @@ -185,13 +185,13 @@ * @name DxEngUnlockDC * @implemented * -* The function DxEngUnlockDC unlocks a pDC (hdc) from dxg.sys +* The function DxEngUnlockDC unlocks a pDC (hdc) from dxg.sys. * @param PDC pDC -* The handle we want to unlock -* -* @return -* This function returns TRUE no matter what +* The handle we want to unlock. +* +* @return +* This function returns TRUE no matter what. * * @remarks. * none @@ -227,15 +227,15 @@ * @name DxEngLockShareSem * @implemented * -* The function DxEngLockShareSem doing share lock of ghsemShareDevLock -* -* @return -* This function returns TRUE for susssess, or FALSE for fail, FALSE can only -* mean it being already lock. -* -* @remarks. -* it being use in diffent ntuser* functions and ntgdi* -* ReactOS specify it is not been inuse at moment +* The function DxEngLockShareSem locks a struct of type ghsemShareDevLock that can be shared. +* +* @return +* This function returns TRUE for success and FALSE for failure. +* FALSE must mean the struct has already been locked. +* +* @remarks. +* It is being used in various ntuser* functions and ntgdi* +* ReactOS specific: It is not in use yet. *SystemResourcesList *--*/ BOOLEAN @@ -256,13 +256,13 @@ * @name DxEngUnlockShareSem * @implemented * -* The function DxEngUnlockShareSem doing share unlock of ghsemShareDevLock -* -* @return -* This function returns TRUE no matter what -* -* @remarks. -* ReactOS specify it is not been inuse at moment +* The function DxEngUnlockShareSem unlocks the struct of type ghsemShareDevLock. +* +* @return +* This function returns TRUE no matter what. +* +* @remarks. +* ReactOS specific: It is not in use yet. * *--*/ BOOLEAN @@ -333,16 +333,16 @@ * The hdev * * @param PGAMMARAMP Ramp -* Value to change gamma ramp to +* Value to change gamma ramp to. * * @param BOOL Test -* Whether gamma should be tested. TRUE to test, FALSE to not test -* -* @return -*Returns TRUE for success, FALSE for failure -* -* @remarks. -* ReactOS does not loop and only sets the gamma once. +* Whether gamma should be tested. TRUE to test, FALSE to not test. +* +* @return +*Returns TRUE for success, FALSE for failure. +* +* @remarks. +* None * *--*/ BOOL @@ -402,13 +402,13 @@ * Support only DxEGShDevData_dd_nCount it is a internal counter how many time hdev been lock and unlock * * @param DWORD Data -* The value to be save to hdev +* The value to be saved to hdev's internal counter. * * @return * Returns TRUE for success, FALSE for failure * * @remarks. -* ReactOS specfiy Not finish implement, I have not save the value into the hdev yet. +* ReactOS specific: Implementation ins incomplete, I do not save the value into the hdev yet. * *--*/ BOOLEAN @@ -495,7 +495,7 @@ * Return one of the type values * * @remarks. -* We do not have type 2 implement yet +* We do not have type 2 implemented yet * *--*/ DWORD @@ -644,10 +644,10 @@ * @name DxEngIncDispUniq * @implemented * -* The function DxEngIncDispUniq incress DisplayUniqVisrgn counter from gdishare memory -* -* @return -* This function returns TRUE no matter what +* The function DxEngIncDispUniq increments the DisplayUniqVisrgn counter from GDI shared memory. +* +* @return +* This function returns TRUE no matter what. * * @remarks. * none

1 0

[jimtabor] 31576: Fix DxEngSetHdevData.
by jimtabor＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: jimtabor Date: Thu Jan 3 02:21:24 2008 New Revision: 31576 URL: http://svn.reactos.org/svn/reactos?rev=31576&view=rev Log: Fix DxEngSetHdevData. Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Thu Jan 3 02:21:24 2008 @@ -46,6 +46,29 @@ #define DXENG_INDEX_DxEngGetRedirectionBitmap 0x29 #define DXENG_INDEX_DxEngLoadImage 0x2A +typedef enum _DXEGSHDEVDATA +{ + DxEGShDevData_Surface, + DxEGShDevData_hSpooler, + DxEGShDevData_DitherFmt, + DxEGShDevData_FxCaps, + DxEGShDevData_FxCaps2, + DxEGShDevData_DrvFuncs, + DxEGShDevData_dhpdev, + DxEGShDevData_eddg, + DxEGShDevData_dd_nCount, + DxEGShDevData_dd_flags, + DxEGShDevData_disable, + DxEGShDevData_metadev, + DxEGShDevData_display, + DxEGShDevData_Parent, + DxEGShDevData_OpenRefs, + DxEGShDevData_palette, + DxEGShDevData_ldev, + DxEGShDevData_GDev, + DxEGShDevData_clonedev, +} DXEGSHDEVDATA,*PDXEGSHDEVDATA; + /************************************************************************/ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ @@ -61,8 +84,8 @@ BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); -DWORD DxEngGetHdevData(HDEV hdev, DWORD Index); -BOOLEAN DxEngSetHdevData(HDEV hdev, DWORD Index, DWORD Save); +DWORD DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); /* prototypes are not done yet, I need gather all my notes Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 3 02:21:24 2008 @@ -69,7 +69,7 @@ HSURF FillPatterns[HS_DDI_MAX]; - ULONG DxDD_Data; + ULONG DxDD_nCount; DEVINFO DevInfo; GDIINFO GDIInfo; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Jan 3 02:21:24 2008 @@ -383,7 +383,7 @@ /************************************************************************/ DWORD DxEngGetHdevData(HDEV hdev, - DWORD Index) + DXEGSHDEVDATA Index) { UNIMPLEMENTED; return 0; @@ -398,11 +398,11 @@ * @param HDEV hPDev * The hdev * -* @param DWORD Index -* Support only Index 8 it is a internal counter how many time hdev been lock and unlock -* -* @param DWORD Save -* The value to be save to hdev internal counter +* @param DXEGSHDEVDATA Type +* Support only DxEGShDevData_dd_nCount it is a internal counter how many time hdev been lock and unlock +* +* @param DWORD Data +* The value to be save to hdev * * @return * Returns TRUE for success, FALSE for failure @@ -412,19 +412,18 @@ * *--*/ BOOLEAN -DxEngSetHdevData(HDEV hdev, - DWORD Index, - DWORD Save) -{ - BOOL retVal = FALSE; - if (Index == 8) - { - /* Counter how many time hdev been lock/unlock, we do not support it yet in ReactOS */ - DPRINT1("Warning not supproted yet\n"); - retVal = TRUE; - } - - return retVal; +DxEngSetHdevData(HDEV hDev, + DXEGSHDEVDATA Type, + DWORD Data) +{ + BOOL retVal = FALSE; // Default, no set. + + if ( Type == DxEGShDevData_dd_nCount ) + { + ((PGDIDEVICE)hDev)->DxDD_nCount = Data; + retVal = TRUE; // Set + } + return retVal; } /************************************************************************/

1 0

[jimtabor] 31575: Add tests and comments to IntPrepareDriver.
by jimtabor＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: jimtabor Date: Thu Jan 3 02:04:31 2008 New Revision: 31575 URL: http://svn.reactos.org/svn/reactos?rev=31575&view=rev Log: Add tests and comments to IntPrepareDriver. Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/tags.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/tags.h Thu Jan 3 02:04:31 2008 @@ -33,6 +33,8 @@ #define TAG_CLIP TAG('C', 'L', 'I', 'P') /* clipping */ #define TAG_COORD TAG('C', 'O', 'R', 'D') /* coords */ #define TAG_DC TAG('D', 'C', 'D', 'C') /* dc */ +#define TAG_GDIDEV TAG('G', 'd', 'e', 'v') /* gdi dev support*/ +#define TAG_GDIPDEV TAG('G', 'D', 'e', 'v') /* gdi PDev */ #define TAG_GDIOBJ TAG('G', 'D', 'I', 'O') /* gdi obj */ #define TAG_GDIHNDTBLE TAG('G', 'D', 'I', 'H') /* gdi handle table */ #define TAG_GDIICM TAG('G', 'i', 'c', 'm') /* gdi Icm */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 3 02:04:31 2008 @@ -353,7 +353,7 @@ ret = PrimarySurface.PreparedDriver; goto cleanup; } - + // HAX! Fixme so I can support more than one! So how many? for (DisplayNumber = 0; ; DisplayNumber++) { DPRINT("Trying to load display driver no. %d\n", DisplayNumber); @@ -445,6 +445,7 @@ } /* Allocate a phyical device handle from the driver */ + // Support DMW.dmSize + DMW.dmDriverExtra & Alloc DMW then set prt pdmwDev. PrimarySurface.DMW.dmSize = sizeof (PrimarySurface.DMW); if (SetupDevMode(&PrimarySurface.DMW, DisplayNumber)) { @@ -503,6 +504,17 @@ PrimarySurface.DMW.dmDisplayFrequency = PrimarySurface.GDIInfo.ulVRefresh; } + if (!PrimarySurface.DMW.dmDriverExtra) + { + PrimarySurface.pdmwDev = &PrimarySurface.DMW; // HAX! + } + else + { + DPRINT1("WARNING!!! Need to Alloc DMW !!!!!!\n"); + } + // Dont remove until we finish testing other drivers. + DPRINT1("DMW extra %x !!!!!!\n",PrimarySurface.DMW.dmDriverExtra); + if (0 == PrimarySurface.GDIInfo.ulLogPixelsX) { DPRINT("Adjusting GDIInfo.ulLogPixelsX\n"); @@ -531,7 +543,11 @@ PrimarySurface.DisplayNumber = DisplayNumber; PrimarySurface.flFlags = PDEV_DISPLAY; // Hard set,, add more flags. PrimarySurface.hsemDevLock = (PERESOURCE)EngCreateSemaphore(); - PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. + // Should be null,, but make sure for now. + PrimarySurface.pvGammaRamp = NULL; + PrimarySurface.ppdevNext = NULL; // Fixme! We need to support more than display drvs. + PrimarySurface.ppdevParent = NULL; // Always NULL if primary. + PrimarySurface.pGraphicsDev = NULL; // Fixme! ret = TRUE; goto cleanup; }

1 0

[akorotaev] 31574: More merging. No progress with bugcheck.
by akorotaev＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: akorotaev Date: Thu Jan 3 01:43:00 2008 New Revision: 31574 URL: http://svn.reactos.org/svn/reactos?rev=31574&view=rev Log: More merging. No progress with bugcheck. Modified: branches/cache_manager_rewrite/mm/pageop.c branches/cache_manager_rewrite/mm/pe.c branches/cache_manager_rewrite/mm/rmap.c branches/cache_manager_rewrite/mm/rpoolmgr.h branches/cache_manager_rewrite/mm/section.c branches/cache_manager_rewrite/mm/sysldr.c Modified: branches/cache_manager_rewrite/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pageop… ============================================================================== --- branches/cache_manager_rewrite/mm/pageop.c (original) +++ branches/cache_manager_rewrite/mm/pageop.c Thu Jan 3 01:43:00 2008 @@ -17,7 +17,7 @@ #if defined (ALLOC_PRAGMA) #pragma alloc_text(INIT, MmInitializePageOp) #endif - + /* GLOBALS *******************************************************************/ Modified: branches/cache_manager_rewrite/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/pe.c?r… ============================================================================== --- branches/cache_manager_rewrite/mm/pe.c (original) +++ branches/cache_manager_rewrite/mm/pe.c Thu Jan 3 01:43:00 2008 @@ -431,7 +431,7 @@ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { - ImageSectionObject->EntryPoint = piohOptHeader->ImageBase + + ImageSectionObject->EntryPoint = piohOptHeader->ImageBase + piohOptHeader->AddressOfEntryPoint; } @@ -598,9 +598,9 @@ if(pishSectionHeaders[i].SizeOfRawData != 0) { /* validate the alignment */ -#if 0 +#if 0 /* Yes, this should be a multiple of FileAlignment, but there's - * stuff out there that isn't. We can cope with that + * stuff out there that isn't. We can cope with that */ if(!IsAligned(pishSectionHeaders[i].SizeOfRawData, nFileAlignment)) DIE(("SizeOfRawData[%u] is not aligned\n", i)); @@ -677,108 +677,4 @@ return nStatus; } -BOOLEAN -NTAPI -MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) -{ - PIMAGE_NT_HEADERS NtHeader; - PAGED_CODE(); - - /* Get NT Headers */ - NtHeader = RtlImageNtHeader(BaseAddress); - if (NtHeader) - { - /* Check if this image is only safe for UP while we have 2+ CPUs */ - if ((KeNumberProcessors > 1) && - (NtHeader->FileHeader.Characteristics & IMAGE_FILE_UP_SYSTEM_ONLY)) - { - /* Fail */ - return FALSE; - } - } - - /* Otherwise, it's safe */ - return TRUE; -} - -NTSTATUS -NTAPI -MmCheckSystemImage(IN HANDLE ImageHandle, - IN BOOLEAN PurgeSection) -{ - NTSTATUS Status; - HANDLE SectionHandle; - PVOID ViewBase = NULL; - SIZE_T ViewSize = 0; - IO_STATUS_BLOCK IoStatusBlock; - FILE_STANDARD_INFORMATION FileStandardInfo; - KAPC_STATE ApcState; - PAGED_CODE(); - - /* Create a section for the DLL */ - Status = ZwCreateSection(&SectionHandle, - SECTION_MAP_EXECUTE, - NULL, - NULL, - PAGE_EXECUTE, - SEC_COMMIT, - ImageHandle); - if (!NT_SUCCESS(Status)) return Status; - - /* Make sure we're in the system process */ - KeStackAttachProcess(&PsInitialSystemProcess->Pcb, &ApcState); - - /* Map it */ - Status = ZwMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &ViewBase, - 0, - 0, - NULL, - &ViewSize, - ViewShare, - 0, - PAGE_EXECUTE); - if (!NT_SUCCESS(Status)) - { - /* We failed, close the handle and return */ - KeUnstackDetachProcess(&ApcState); - ZwClose(SectionHandle); - return Status; - } - - /* Now query image information */ - Status = ZwQueryInformationFile(ImageHandle, - &IoStatusBlock, - &FileStandardInfo, - sizeof(FileStandardInfo), - FileStandardInformation); - if ( NT_SUCCESS(Status) ) - { - /* First, verify the checksum */ - if (!LdrVerifyMappedImageMatchesChecksum(ViewBase, - FileStandardInfo. - EndOfFile.LowPart, - FileStandardInfo. - EndOfFile.LowPart)) - { - /* Set checksum failure */ - Status = STATUS_IMAGE_CHECKSUM_MISMATCH; - } - - /* Check that it's a valid SMP image if we have more then one CPU */ - if (!MmVerifyImageIsOkForMpUse(ViewBase)) - { - /* Otherwise it's not the right image */ - Status = STATUS_IMAGE_MP_UP_MISMATCH; - } - } - - /* Unmap the section, close the handle, and return status */ - ZwUnmapViewOfSection(NtCurrentProcess(), ViewBase); - KeUnstackDetachProcess(&ApcState); - ZwClose(SectionHandle); - return Status; -} - /* EOF */ Modified: branches/cache_manager_rewrite/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rmap.c… ============================================================================== --- branches/cache_manager_rewrite/mm/rmap.c (original) +++ branches/cache_manager_rewrite/mm/rmap.c Thu Jan 3 01:43:00 2008 @@ -120,7 +120,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; /* * Get or create a pageop @@ -245,7 +245,7 @@ Type = MemoryArea->Type; if (Type == MEMORY_AREA_SECTION_VIEW) { - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset;; /* @@ -410,7 +410,7 @@ new_entry->Process = (PEPROCESS)Process; #ifdef DBG new_entry->Caller = __builtin_return_address(0); -#endif +#endif if (MmGetPfnForProcess(Process, Address) != Page) { @@ -429,7 +429,7 @@ { if (current_entry->Address == new_entry->Address && current_entry->Process == new_entry->Process) { - DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", + DbgPrint("MmInsertRmap tries to add a second rmap entry for address %p\n current caller ", current_entry->Address); KeRosPrintAddress(new_entry->Caller); DbgPrint("\n previous caller "); Modified: branches/cache_manager_rewrite/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/rpoolm… ============================================================================== --- branches/cache_manager_rewrite/mm/rpoolmgr.h (original) +++ branches/cache_manager_rewrite/mm/rpoolmgr.h Thu Jan 3 01:43:00 2008 @@ -143,7 +143,7 @@ if ( Block->LastOwnerStack[i] != 0xDEADBEEF ) { R_DEBUG(" "); - if (!R_PRINT_ADDRESS ((PVOID)Block->LastOwnerStack[i]) ) + //if (!R_PRINT_ADDRESS ((PVOID)Block->LastOwnerStack[i]) ) { R_DEBUG("<%X>", Block->LastOwnerStack[i] ); } @@ -427,12 +427,12 @@ ASSERT ( Addr >= (char*)pool->UserBase && Addr < ((char*)pool->UserBase + pool->UserSize - 16) ); #ifdef R_MAGIC - if ( pUsed->UsedMagic == MM_PPOOL_FREEMAGIC ) + if ( pUsed->UsedMagic == R_FREE_MAGIC ) { pUsed->UserSize = 0; // just to keep from confusion, MmpBadBlock() doesn't return... RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 ); } - if ( pUsed->UsedMagic != MM_PPOOL_USEDMAGIC ) + if ( pUsed->UsedMagic != R_USED_MAGIC ) { RiBadBlock ( pUsed, Addr, "bad magic", file, line, 0 ); } @@ -650,7 +650,7 @@ { Block->Status = 1; RUsedFillStack ( Block ); -#if R_MAGIC +#ifdef R_MAGIC Block->UsedMagic = R_USED_MAGIC; #endif//R_MAGIC //ASSERT_SIZE ( Block->Size ); @@ -978,7 +978,7 @@ { PR_USED Block = RBodyToHdr(Addr); // TODO FIXME - should we validate params? -#if R_MAGIC +#ifdef R_MAGIC if ( Block->UsedMagic != R_USED_MAGIC ) return 0xDEADBEEF; #endif//R_MAGIC Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Thu Jan 3 01:43:00 2008 @@ -32,7 +32,7 @@ * Ge van Geldorp * Royce Mitchell III * Filip Navara - * Aleksey Bragin + * Aleksey Bragin * Jason Filby * Thomas Weidenmueller * Gunnar Andre' Dalsnes @@ -182,7 +182,7 @@ /* * FIXME: TODO. * Filip says to get the MADDRESS_SPACE from EPROCESS, - * then use the MmMarea routines to locate the Marea that + * then use the MmMarea routines to locate the Marea that * corresponds to the address. Then make sure it's a section * view type (MEMORY_AREA_SECTION_VIEW) and use the marea's * per-type union to get the .u.SectionView.Section pointer to @@ -1049,8 +1049,8 @@ AddressSpace, MemoryArea, Address, Locked); PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress - + MemoryArea->Data.SectionData.ViewOffset; + SegmentOffset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; @@ -2281,7 +2281,7 @@ * Find the offset of the page */ PAddress = MM_ROUND_DOWN(Address, PAGE_SIZE); - Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)PAddress - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; Segment = MemoryArea->Data.SectionData.Segment; @@ -2459,7 +2459,7 @@ { MmUnlockAddressSpace((PMADDRESS_SPACE)&Process->VadRoot); } - + if (PageOutContext->Private) { MmReleasePageMemoryConsumer(PageOutContext->Consumer, Page); @@ -2492,9 +2492,7 @@ Context.Segment = MemoryArea->Data.SectionData.Segment; Context.Section = MemoryArea->Data.SectionData.Section; - Context.Consumer = MemoryArea->Type == MEMORY_AREA_CACHE_SEGMENT ? MC_CACHE : MC_USER; - - Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Context.Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; FileOffset = Context.Offset + Context.Segment->FileOffset; @@ -2796,7 +2794,7 @@ Address = (PVOID)PAGE_ROUND_DOWN(Address); - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; /* @@ -2965,7 +2963,7 @@ ULONG Entry; PFN_TYPE Page; - Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + Offset = (ULONG_PTR)Address - (ULONG_PTR)MemoryArea->StartingAddress + MemoryArea->Data.SectionData.ViewOffset; Entry = MmGetPageEntrySectionSegment(Segment, Offset); Page = MmGetPfnForProcess(AddressSpace->Process, Address); @@ -3272,7 +3270,7 @@ UNICODE_STRING Name; DPRINT("Creating Section Object Type\n"); - + /* Initialize the Section object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); @@ -3434,10 +3432,13 @@ /* * Reference the file object */ - Status = ObReferenceObjectByPointer(FileObject, - FileAccess, - IoFileObjectType, - UserMode); + Status = ObReferenceObjectByHandle(FileObject, + FileAccess, + IoFileObjectType, + ExGetPreviousMode(), + (PVOID*)(PVOID)&FileObject, + NULL); + if (!NT_SUCCESS(Status)) { ObDereferenceObject(Section); @@ -4372,7 +4373,7 @@ ObDereferenceObject(Section); return(STATUS_NO_MEMORY); } - + RtlZeroMemory(ImageSectionObject, sizeof(MM_IMAGE_SECTION_OBJECT)); StatusExeFmt = ExeFmtpCreateImageSection(FileObject, ImageSectionObject); @@ -4987,7 +4988,7 @@ ASSERT(Process); AddressSpace = (PMADDRESS_SPACE)&(Process)->VadRoot; - + MmLockAddressSpace(AddressSpace); MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); Modified: branches/cache_manager_rewrite/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sysldr… ============================================================================== --- branches/cache_manager_rewrite/mm/sysldr.c (original) +++ branches/cache_manager_rewrite/mm/sysldr.c Thu Jan 3 01:43:00 2008 @@ -1353,8 +1353,6 @@ return TRUE; } -#if 0 - BOOLEAN NTAPI MmVerifyImageIsOkForMpUse(IN PVOID BaseAddress) @@ -1458,8 +1456,6 @@ ZwClose(SectionHandle); return Status; } - -#endif NTSTATUS NTAPI

1 0

[jimtabor] 31573: Add new dxdd support members to gdi device structure.
by jimtabor＠svn.reactos.org 02 Jan '08

02 Jan '08

Author: jimtabor Date: Thu Jan 3 01:17:59 2008 New Revision: 31573 URL: http://svn.reactos.org/svn/reactos?rev=31573&view=rev Log: Add new dxdd support members to gdi device structure. Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 3 01:17:59 2008 @@ -33,56 +33,66 @@ typedef struct _GDIPOINTER /* should stay private to ENG */ { /* private GDI pointer handling information, required for software emulation */ - BOOL Enabled; - POINTL Pos; - SIZEL Size; - POINTL HotSpot; + BOOL Enabled; + POINTL Pos; + SIZEL Size; + POINTL HotSpot; XLATEOBJ *XlateObject; - HSURF ColorSurface; - HSURF MaskSurface; - HSURF SaveSurface; - int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ + HSURF ColorSurface; + HSURF MaskSurface; + HSURF SaveSurface; + int ShowPointer; /* counter negtive do not show the mouse postive show the mouse */ /* public pointer information */ - RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ + RECTL Exclude; /* required publicly for SPS_ACCEPT_EXCLUDE */ PGD_MOVEPOINTER MovePointer; - ULONG Status; + ULONG Status; } GDIPOINTER, *PGDIPOINTER; typedef struct _GDIDEVICE { - HANDLE Handle; // HSURF - PVOID pvEntry; - ULONG lucExcLock; - ULONG Tid; + HANDLE hHmgr; + ULONG csCount; + ULONG lucExcLock; + PVOID Tid; struct _GDIDEVICE *ppdevNext; - FLONG flFlags; - PERESOURCE hsemDevLock; + INT cPdevRefs; + INT cPdevOpenRefs; + struct _GDIDEVICE *ppdevParent; + FLONG flFlags; + PERESOURCE hsemDevLock; // Device lock. - PVOID pvGammaRamp; + PVOID pvGammaRamp; // Gamma ramp pointer. - DHPDEV hPDev; - DEVMODEW DMW; - HSURF FillPatterns[HS_DDI_MAX]; - DEVINFO DevInfo; - GDIINFO GDIInfo; + DHPDEV hPDev; // DHPDEV for device. - HANDLE hSpooler; - ULONG DisplayNumber; + HSURF FillPatterns[HS_DDI_MAX]; - PFILE_OBJECT VideoFileObject; - BOOLEAN PreparedDriver; - GDIPOINTER Pointer; + ULONG DxDD_Data; + DEVINFO DevInfo; + GDIINFO GDIInfo; + HSURF pSurface; // SURFACE for this device. + HANDLE hSpooler; // Handle to spooler, if spooler dev driver. + ULONG DisplayNumber; + PVOID pGraphicsDev; // PGRAPHICS_DEVICE see VideoFileObject + + DEVMODEW DMW; + PVOID pdmwDev; // Ptr->DEVMODEW.dmSize + dmDriverExtra == alloc size. + + FLONG DxDd_Flags; // DxDD active status flags. + + PFILE_OBJECT VideoFileObject; + BOOLEAN PreparedDriver; + GDIPOINTER Pointer; /* Stuff to keep track of software cursors; win32k gdi part */ UINT SafetyRemoveLevel; /* at what level was the cursor removed? 0 for not removed */ UINT SafetyRemoveCount; + DRIVER_FUNCTIONS DriverFunctions; struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; - - DRIVER_FUNCTIONS DriverFunctions; } GDIDEVICE, *PGDIDEVICE; /* Internal functions */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Thu Jan 3 01:17:59 2008 @@ -622,9 +622,9 @@ DPRINT("calling EnableSurface\n"); /* Enable the drawing surface */ - PrimarySurface.Handle = + PrimarySurface.pSurface = PrimarySurface.DriverFunctions.EnableSurface(PrimarySurface.hPDev); - if (NULL == PrimarySurface.Handle) + if (NULL == PrimarySurface.pSurface) { /* PrimarySurface.DriverFunctions.AssertMode(PrimarySurface.hPDev, FALSE);*/ PrimarySurface.DriverFunctions.DisablePDEV(PrimarySurface.hPDev); @@ -643,7 +643,7 @@ /* attach monitor */ IntAttachMonitor(&PrimarySurface, PrimarySurface.DisplayNumber); - SurfObj = EngLockSurface((HSURF)PrimarySurface.Handle); + SurfObj = EngLockSurface(PrimarySurface.pSurface); SurfObj->dhpdev = PrimarySurface.hPDev; SurfSize = SurfObj->sizlBitmap; SurfaceRect.left = SurfaceRect.top = 0; @@ -791,7 +791,7 @@ NewDC->PDev = PrimarySurface.hPDev; if(pUMdhpdev) pUMdhpdev = NewDC->PDev; NewDC->pPDev = (PVOID)&PrimarySurface; - NewDC->w.hBitmap = PrimarySurface.Handle; + NewDC->w.hBitmap = (HBITMAP)PrimarySurface.pSurface; NewDC->w.bitsPerPixel = ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cBitsPixel * ((PGDIDEVICE)NewDC->pPDev)->GDIInfo.cPlanes; @@ -2668,11 +2668,11 @@ BOOL FASTCALL IntIsPrimarySurface(SURFOBJ *SurfObj) { - if (PrimarySurface.Handle == NULL) + if (PrimarySurface.pSurface == NULL) { return FALSE; } - return SurfObj->hsurf == PrimarySurface.Handle; + return SurfObj->hsurf == PrimarySurface.pSurface; } // Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Thu Jan 3 01:17:59 2008 @@ -49,7 +49,7 @@ Device = IntEnumHDev(); - SurfObj = EngLockSurface((HSURF)Device->Handle); + SurfObj = EngLockSurface( Device->pSurface ); if(!SurfObj) return; DoDeviceSync( SurfObj, NULL, Flags); EngUnlockSurface(SurfObj);

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