Ros-diffs

ros-diffs@reactos.org

81390 discussions

[weiden] 19746: fixed registry querying code in Ki386SetProcessorFeatures
by weiden＠svn.reactos.com 29 Nov '05

29 Nov '05

fixed registry querying code in Ki386SetProcessorFeatures Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 09:22:39 UTC (rev 19745) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 10:09:26 UTC (rev 19746) @@ -496,7 +496,12 @@ UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"FastSystemCallDisable"); HANDLE KeyHandle; ULONG ResultLength; - KEY_VALUE_PARTIAL_INFORMATION ValueData; + struct + { + KEY_VALUE_PARTIAL_INFORMATION Info; + UCHAR Buffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, + Data[0]) + sizeof(ULONG)]; + } ValueData; NTSTATUS Status; ULONG FastSystemCallDisable = 0; @@ -525,7 +530,7 @@ *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; } - /* Does the CPU Support Fast System Call? */ + /* Does the CPU Support Fast System Call? */ if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) { /* FIXME: Check for Family == 6, Model < 3 and Stepping < 3 and disable */ @@ -536,20 +541,29 @@ OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenKey(&KeyHandle, KEY_ALL_ACCESS, &ObjectAttributes); + Status = ZwOpenKey(&KeyHandle, + KEY_QUERY_VALUE, + &ObjectAttributes); if (NT_SUCCESS(Status)) { /* Read the Value then Close the Key */ - Status = NtQueryValueKey(KeyHandle, + Status = ZwQueryValueKey(KeyHandle, &ValueName, KeyValuePartialInformation, &ValueData, sizeof(ValueData), &ResultLength); - RtlMoveMemory(&FastSystemCallDisable, ValueData.Data, sizeof(ULONG)); + if (NT_SUCCESS(Status)) + { + if (ResultLength == sizeof(ValueData) && + ValueData.Info.Type == REG_DWORD) + { + FastSystemCallDisable = *(PULONG)ValueData.Info.Data != 0; + } - NtClose(KeyHandle); + ZwClose(KeyHandle); + } } } else {

1 0

[mf] 19745: switch to standard conform CRT function names
by mf＠svn.reactos.com 29 Nov '05

29 Nov '05

switch to standard conform CRT function names Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -985,7 +985,7 @@ _dup2(_open_osfhandle((long)GetStdHandle(STD_OUTPUT_HANDLE), 0), 1); _dup2(_open_osfhandle((long)GetStdHandle(STD_ERROR_HANDLE), 0), 2); - g_Globals._log = fdopen(1, "w"); + g_Globals._log = _fdopen(1, "w"); setvbuf(g_Globals._log, 0, _IONBF, 0); LOG(TEXT("starting explorer debug log\n")); _____ Modified: trunk/reactos/subsys/system/explorer/shell/filechild.cpp --- trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/shell/filechild.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -548,7 +548,7 @@ } -void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using <RETURN> key accelerator +void FileChildWindow::activate_entry(Pane* pane) ///@todo enable using RETURN key accelerator { Entry* entry = pane->_cur; _____ Modified: trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp --- trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/shell/ntobjfs.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -328,7 +328,7 @@ #else char type_name[32]; WideCharToMultiByte(CP_ACP, 0, info->type.string_ptr, info->type.string_len, type_name, 32, 0, 0); - entry->_type_name = strdup(type_name); + entry->_type_name = _strdup(type_name); #endif if (!first_entry) _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp --- trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-11-29 08:23:10 UTC (rev 19744) +++ trunk/reactos/subsys/system/explorer/taskbar/favorites.cpp 2005-11-29 09:22:39 UTC (rev 19745) @@ -72,9 +72,9 @@ while(isspace(*cont)) ++cont; - if (!strnicmp(keyword, "URL", 3)) + if (!_strnicmp(keyword, "URL", 3)) _url = DecodeURLString(cont); - else if (!strnicmp(keyword, "IconFile", 8)) + else if (!_strnicmp(keyword, "IconFile", 8)) _icon_path = DecodeURLString(cont); } }

1 0

[gvg] 19744: Samuel Serapióega <samcharly@hotmail.com>:
by gvg＠svn.reactos.com 29 Nov '05

29 Nov '05

Samuel Serapióega <samcharly(a)hotmail.com>: - Spanish translation update >From bug 1058. Modified: trunk/reactos/subsys/system/regedit/Es.rc _____ Modified: trunk/reactos/subsys/system/regedit/Es.rc --- trunk/reactos/subsys/system/regedit/Es.rc 2005-11-29 06:24:56 UTC (rev 19743) +++ trunk/reactos/subsys/system/regedit/Es.rc 2005-11-29 08:23:10 UTC (rev 19744) @@ -3,6 +3,7 @@ * * Copyright 2003 JosÚ Manuel Ferrer Ortiz * Copyright 2005 Patricio MartÝnez Ros + * Copyright 2005 Samuel Serapi¾n Vega * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -43,7 +44,10 @@ BEGIN MENUITEM "&Importar archivo de registro...", ID_REGISTRY_IMPORTREGISTRYFILE MENUITEM "&Exportar archivo de registro...", ID_REGISTRY_EXPORTREGISTRYFILE - MENUITEM SEPARATOR + + MENUITEM SEPARATOR + MENUITEM "Cargar archivo de registro...", ID_REGISTRY_LOADHIVE, GRAYED + MENUITEM "Descargar archivo de registro...", ID_REGISTRY_UNLOADHIVE, GRAYED MENUITEM "&Conectar registro de red...", ID_REGISTRY_CONNECTNETWORKREGISTRY MENUITEM "&Desconectar registro de red...", ID_REGISTRY_DISCONNECTNETWORKREGISTRY, GRAYED MENUITEM SEPARATOR @@ -62,9 +66,13 @@ MENUITEM "Valor de c&adena", ID_EDIT_NEW_STRINGVALUE MENUITEM "Valor &binario", ID_EDIT_NEW_BINARYVALUE MENUITEM "Valor &DWORD", ID_EDIT_NEW_DWORDVALUE + MENUITEM "&Valor de varias lineas", ID_EDIT_NEW_MULTISTRINGVALUE + MENUITEM "&Valor de una linea expandibles", ID_EDIT_NEW_EXPANDABLESTRINGVALUE END - MENUITEM SEPARATOR - MENUITEM "&Eliminar\tDel", ID_EDIT_DELETE + MENUITEM SEPARATOR + MENUITEM "&Permisos...", ID_EDIT_PERMISSIONS + MENUITEM SEPARATOR + MENUITEM "&Eliminar\tDel", ID_EDIT_DELETE MENUITEM "&Renombrar", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Copiar valor de la clave", ID_EDIT_COPYKEYNAME @@ -95,7 +103,115 @@ END END +IDR_POPUP_MENUS MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Modificar", ID_EDIT_MODIFY + MENUITEM "Modificar Data Binaria", ID_EDIT_MODIFY_BIN + MENUITEM SEPARATOR + MENUITEM "&Borrar\tDel", ID_EDIT_DELETE + MENUITEM "&Renombrar", ID_EDIT_RENAME + END + POPUP "" + BEGIN + POPUP "&Nuevo" + BEGIN + MENUITEM "&Clave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Valores& Linea", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valores& Binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valores &DWORD", ID_EDIT_NEW_DWORDVALUE + END + END + POPUP "" + BEGIN + MENUITEM "Expandir/Colapsar", ID_TREE_EXPANDBRANCH + POPUP "&Nuevo" + BEGIN + MENUITEM "&Clave", ID_EDIT_NEW_KEY + MENUITEM SEPARATOR + MENUITEM "Valores& Linea", ID_EDIT_NEW_STRINGVALUE + MENUITEM "Valores& Binario", ID_EDIT_NEW_BINARYVALUE + MENUITEM "Valores &DWORD", ID_EDIT_NEW_DWORDVALUE + END + MENUITEM "&Encuentra", ID_EDIT_FIND + MENUITEM SEPARATOR + MENUITEM "&Borrar", ID_TREE_DELETE + MENUITEM "&Renombrar", ID_TREE_RENAME + MENUITEM SEPARATOR + MENUITEM "&Exportar", ID_TREE_EXPORT + MENUITEM "&Permisos...", ID_TREE_PERMISSIONS, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Copiar nombre de clave", ID_EDIT_COPYKEYNAME + END +END + + /* + * Dialog + */ + +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 "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + EDITTEXT IDC_VALUE_DATA,6,46,240,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "Aceptar",IDOK,142,64,50,14 + PUSHBUTTON "Cancelar",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 "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del 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 "Aceptar",IDOK,142,64,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,64,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 "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del data:",IDC_STATIC,6,35,161,8 + CONTROL "",IDC_VALUE_DATA,"HexEdit32",WS_VSCROLL | WS_BORDER | WS_TABSTOP,6,46,240,102 + DEFPUSHBUTTON "Aceptar",IDOK,142,154,50,14 + PUSHBUTTON "Cancelar",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 "&Nombre de Valor:",IDC_STATIC,6,6,134,8 + EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "&Valor del 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 "Aceptar",IDOK,142,82,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,196,82,50,14 +END +/* * String Table */ @@ -157,6 +273,83 @@ ID_EDIT_FINDNEXT "Busca la siguiente ocurrencia del texto especificado en la b·squeda anterior" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ERROR "Error" + IDS_WARNING "Aviso" + IDS_BAD_KEY "No puede averiguar valor clave '%s'" + IDS_BAD_VALUE "No puede averiguar valor '%s'" + IDS_UNSUPPORTED_TYPE "No puede editar claves de este tipo (%ld)" + IDS_TOO_BIG_VALUE "Valor es muy grande (%ld)" + IDS_MULTI_SZ_EMPTY_STRING "Data del tipo REG_MULTI_SZ no puede contener lineas vacias.\nLas lineas vacias han sido removidas." + IDS_QUERY_DELETE_KEY_ONE "Esta seguro que quiere borrar esta clave?" + IDS_QUERY_DELETE_KEY_MORE "Esta seguro que quiere borrar estas claves?" + IDS_QUERY_DELETE_KEY_CONFIRM "Confirme borrar clave" + IDS_QUERY_DELETE_ONE "Esta seguro que quiere borrar este valor?" + IDS_QUERY_DELETE_MORE "Esta seguro que quiere borrar estos valores?" + IDS_QUERY_DELETE_CONFIRM "Confirme borrar valor" + IDS_ERR_DELVAL_CAPTION "Error Borrando Valores" + IDS_ERR_DELETEVALUE "Incapaz de borrar todos los valores especificados!" + IDS_ERR_RENVAL_CAPTION "Error Renombrando Valor" + IDS_ERR_RENVAL_TOEMPTY "No puede renombrar %s. El nombre de valor especificado esta vacio. Trate otro nombre y comienze otra vez." + IDS_NEW_KEY "Nueva Clave #%d" + IDS_NEW_VALUE "Nuevo Valor #%d" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BINARY_EMPTY "(valor binario de longitud zero)" + IDS_DEFAULT_VALUE_NAME "(Default)" + IDS_VALUE_NOT_SET "(valor no entrado)" + IDS_UNKNOWN_TYPE "Tipo desconocido: (0x%lx)" + IDS_MY_COMPUTER "My Computer" + IDS_IMPORT_REG_FILE "Importa Fichero de Registro" + IDS_EXPORT_REG_FILE "Exporta Fichero de Registro" + IDS_INVALID_DWORD "(valor DWORD invalido)" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FLT_REGFILES "Fichero de Registro" + IDS_FLT_REGFILES_FLT "*.reg" + IDS_FLT_REGEDIT4 "Fichero de Registro Win9x/NT4 (REGEDIT4)" + IDS_FLT_REGEDIT4_FLT "*.reg" + IDS_FLT_ALLFILES "Todos los archivos (*.*)" + IDS_FLT_ALLFILES_FLT "*.*" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ACCESS_FULLCONTROL "Control Completo" + IDS_ACCESS_READ "Lectura" + IDS_ACCESS_QUERYVALUE "Pregunta Valor" + IDS_ACCESS_SETVALUE "Modifica Valor" + IDS_ACCESS_CREATESUBKEY "Crear Subclave" + IDS_ACCESS_ENUMERATESUBKEYS "Enumera Subclaves" + IDS_ACCESS_NOTIFY "Notifica" + IDS_ACCESS_CREATELINK "Crear enlace" + IDS_ACCESS_DELETE "Borrar" + IDS_ACCESS_WRITEDAC "Escribir DAC" + IDS_ACCESS_WRITEOWNER "Due±o Escritura" + IDS_ACCESS_READCONTROL "Control de Lectura" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INHERIT_THISKEYONLY "Esta clave solamente" + IDS_INHERIT_THISKEYANDSUBKEYS "Esta clave y sus subclaves" + IDS_INHERIT_SUBKEYSONLY "Subclaves solamente" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_EXPAND "&Expandir" + IDS_COLLAPSE "&Colapsar" + IDS_GOTO_SUGGESTED_KEY "&Ir a '%s'" + IDS_FINISHEDFIND "Finalizado la busqueda del registro." +END + /*****************************************************************/ @@ -164,23 +357,73 @@ * Dialog */ -IDD_DIALOG1 DIALOG DISCARDABLE 50, 50, 268, 98 +IDD_EXPORTRANGE DIALOG DISCARDABLE 50, 50, 370, 50 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 END -IDD_DIALOG2 DIALOG DISCARDABLE 0, 0, 187, 95 +IDD_ADDFAVORITES DIALOG DISCARDABLE 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dißlogo" +CAPTION "A±adir a Favoritos" FONT 8, "MS Sans Serif" BEGIN - DEFPUSHBUTTON "Aceptar",IDOK,130,7,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,130,24,50,14 + DEFPUSHBUTTON "Aceptar",IDOK,129,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,129,24,50,14 + LTEXT "Nombre del &Favorito:",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 Sans Serif" +BEGIN + DEFPUSHBUTTON "Aceptar",IDOK,107,114,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,7,114,50,14 + CONTROL "Lista1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST | + WS_BORDER | WS_TABSTOP,7,20,150,90 + LTEXT "Select Favorite(s):",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 "Encontrar" +FONT 8, "MS Sans Serif" +BEGIN + DEFPUSHBUTTON "&Encontrar Pr¾ximo",IDOK,197,7,50,14 + PUSHBUTTON "Cancelar",IDCANCEL,197,24,50,14 + GROUPBOX "Mirar a",IDC_STATIC,7,25,63,51 + LTEXT "Encontrar& que:",IDC_STATIC,7,8,37,10 + EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL + CONTROL "&Claves",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,14,36,35,8 + CONTROL "&Valores",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 +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" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20 + PUSHBUTTON "&Cancelar",IDCANCEL,93,29,45,14 + LTEXT "Buscando en el registro...",IDC_STATIC,33,12,83,8 +END + /* * TEXTINCLUDE */ @@ -199,8 +442,8 @@ /* *STRINGTABLE DISCARDABLE *BEGIN - * ID_HELP_HELPTOPICS "Opens Registry Editor Help." - * ID_HELP_ABOUT "Displays program information, version number, and copyright." + * ID_HELP_HELPTOPICS "Abre la ayuda de registry editor." + * ID_HELP_ABOUT "Despliega informaci¾n del programa, version y licensia." *END */

1 0

[royce] 19743: enhance generated msvc projects - patch by Brezenbak
by royce＠svn.reactos.com 29 Nov '05

29 Nov '05

enhance generated msvc projects - patch by Brezenbak Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-29 02:40:18 UTC (rev 19742) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp 2005-11-29 06:24:56 UTC (rev 19743) @@ -56,6 +56,7 @@ bool lib = (module.type == ObjectLibrary) || (module_type == ".lib") || (module_type == ".a"); bool dll = (module_type == ".dll") || (module_type == ".cpl"); bool exe = (module_type == ".exe"); + bool sys = (module_type == ".sys"); // TODO FIXME - need more checks here for 'sys' and possibly 'drv'? bool console = exe && (module.type == Win32CUI); @@ -172,6 +173,7 @@ } string default_cfg = cfgs.back(); + string include_string; fprintf ( OUT, "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\r\n" ); fprintf ( OUT, "<VisualStudioProject\r\n" ); @@ -232,7 +234,9 @@ { if ( multiple_includes ) fprintf ( OUT, ";" ); + fprintf ( OUT, "%s", include.c_str() ); + include_string += " /I " + include; multiple_includes = true; } } @@ -293,7 +297,7 @@ { fprintf ( OUT, "\t\t\t<Tool\r\n" ); fprintf ( OUT, "\t\t\t\tName=\"VCLibrarianTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s%s\"/>\r\n", module.name.c_str(), module_type.c_str() ); + fprintf ( OUT, "\t\t\t\tOutputFile=\"$(OutDir)/%s.lib\"/>\r\n", module.name.c_str() ); } else { @@ -316,7 +320,32 @@ if ( debug ) fprintf ( OUT, "\t\t\t\tProgramDatabaseFile=\"$(OutDir)/%s.pdb\"\r\n", module.name.c_str() ); - fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + if ( sys ) + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /DRIVER /ALIGN:0x20 /subsystem:NATIVE /SECTION:INIT,D /FORCE:MULTIPLE /IGNORE:4001,4037,4039,4065,4070,4078,4087,4089,4096\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DriverEntry" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x10000" : module.baseaddress.c_str ()); + } + else if ( exe ) + { + if( module.non_if_data.compilationUnits.size () > 0 ) /* native apps */ + { + fprintf ( OUT, "\t\t\t\tAdditionalOptions=\" /SUBSYSTEM:NATIVE /SECTION:INIT,D /ALIGN:4096 /FORCE:MULTIPLE\"\r\n" ); + fprintf ( OUT, "\t\t\t\tIgnoreAllDefaultLibraries=\"TRUE\"\r\n" ); + } + else /* non native apps */ + { + fprintf ( OUT, "\t\t\t\tSubSystem=\"%d\"\r\n", console ? 1 : 2 ); + } + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress.c_str ()); + } + else if ( dll) + { + fprintf ( OUT, "\t\t\t\tEntryPointSymbol=\"%s\"\r\n", module.entrypoint == "" ? "DllMain" : module.entrypoint.c_str ()); + fprintf ( OUT, "\t\t\t\tBaseAddress=\"%s\"\r\n", module.baseaddress == "" ? "0x40000" : module.baseaddress.c_str ()); + } fprintf ( OUT, "\t\t\t\tTargetMachine=\"%d\"/>\r\n", 1 ); } @@ -364,26 +393,33 @@ fprintf ( OUT, "\t\t\tFilter=\"cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;S\">\r\n" ); for ( size_t isrcfile = 0; isrcfile < source_files.size(); isrcfile++ ) { - const string& source_file = DosSeparator(source_files[isrcfile]); + string source_file = DosSeparator(source_files[isrcfile]); fprintf ( OUT, "\t\t\t<File\r\n" ); fprintf ( OUT, "\t\t\t\tRelativePath=\"%s\">\r\n", source_file.c_str() ); - if (configuration.VSProjectVersion < "8.00") { - if (source_file.at(source_file.size() - 1) == 'S') { - for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) - { - std::string& config = cfgs[iconfig]; - fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); - fprintf ( OUT, "\t\t\t\t\tName=\"" ); - fprintf ( OUT, config.c_str()); - fprintf ( OUT, "|Win32\">\r\n" ); - fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" | as -o "$(OutDir)\\$(InputName).obj"\"\r\n" ); - fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\$(InputName).obj\"/>\r\n" ); - fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); - } + source_file.erase(0,2); + source_file = _replace_str(source_file, "\\", "-"); + string src_string = source_file.substr(0, source_file.find(".")); + for ( size_t iconfig = 0; iconfig < cfgs.size(); iconfig++ ) + { + std::string& config = cfgs[iconfig]; + fprintf ( OUT, "\t\t\t\t<FileConfiguration\r\n" ); + fprintf ( OUT, "\t\t\t\t\tName=\"" ); + fprintf ( OUT, config.c_str() ); + fprintf ( OUT, "|Win32\">\r\n" ); + fprintf ( OUT, "\t\t\t\t\t<Tool\r\n" ); + if (source_file.at(source_file.size() - 1) == 'c' || source_file.find(".cpp") != string::npos) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCLCompilerTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tObjectFile=\"$(OutDir)\\%s.obj\"/>\r\n", src_string.c_str()); } + else if (configuration.VSProjectVersion < "8.00" && (source_file.find(".asm") != string::npos || tolower(source_file.at(source_file.size() - 1)) == 's')) + { + fprintf ( OUT, "\t\t\t\t\t\tName=\"VCCustomBuildTool\"\r\n" ); + fprintf ( OUT, "\t\t\t\t\t\tCommandLine=\"cl /E "$(InputPath)" %s /D__ASM__ | as -o "$(OutDir)\\%s.obj"\"\r\n",include_string.c_str(), src_string.c_str() ); + fprintf ( OUT, "\t\t\t\t\t\tOutputs=\"$(OutDir)\\%s.obj\"/>\r\n",src_string.c_str() ); + } + fprintf ( OUT, "\t\t\t\t</FileConfiguration>\r\n" ); } fprintf ( OUT, "\t\t\t</File>\r\n" ); }

1 0

[ion] 19742: - Implement RtlPrefectMemoryNonTemporal. Patch by Patrick Baggett <baggett.patrick@gmail.com> and myself.
by ion＠svn.reactos.com 29 Nov '05

29 Nov '05

- Implement RtlPrefectMemoryNonTemporal. Patch by Patrick Baggett <baggett.patrick(a)gmail.com> and myself. Modified: trunk/reactos/lib/rtl/i386/mem_asm.S Modified: trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/lib/rtl/i386/mem_asm.S --- trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/lib/rtl/i386/mem_asm.S 2005-11-29 02:40:18 UTC (rev 19742) @@ -1,11 +1,11 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: mem.asm + * FILE: mem_asm.S * PURPOSE: Memory functions - * PROGRAMMER: Magnus Olsen (magnusolsen(a)greatlord.com) - * UPDATE HISTORY: - * Created 27/07/2005 + * PROGRAMMERS: Patrick Baggett (baggett.patrick(a)gmail.com) + * Alex Ionescu (alex(a)relsoft.net) + * Magnus Olsen (magnusolsen(a)greatlord.com) */ .intel_syntax noprefix @@ -17,6 +17,7 @@ .globl _RtlFillMemory@12 // [4] (no bug) .globl _RtlCompareMemoryUlong@12 // [5] (no bug) .globl _RtlCompareMemory@12 // [4] (no bug) +.globl @RtlPrefetchMemoryNonTemporal@8 /* FUNCTIONS ***************************************************************/ @@ -145,3 +146,18 @@ pop edi 3: ret 12 // return count + + +@RtlPrefetchMemoryNonTemporal@8: + ret /* Overwritten by ntoskrnl/ke/i386/kernel.c if SSE is supported (see Ki386SetProcessorFeatures() ) */ + + mov eax, [_Ke386CacheGranularity] // Get cache line size + + // This is fastcall, so ecx = address, edx = size + fetch_next_line: + prefetchnta byte ptr [ecx] // prefechnta(address) + sub edx, eax // count = count - cache_line_size + add ecx, eax // address = address + cache_line_size + cmp edx, 0 // if(count) <= 0 + ja fetch_next_line // goto fetch_next_line + ret _____ Modified: trunk/reactos/lib/rtl/mem.c --- trunk/reactos/lib/rtl/mem.c 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/lib/rtl/mem.c 2005-11-29 02:40:18 UTC (rev 19742) @@ -140,7 +140,7 @@ } /* -* @unimplemented +* @implemented */ VOID FASTCALL @@ -149,7 +149,9 @@ IN SIZE_T Length ) { - UNIMPLEMENTED; + /* By nature of prefetch, this is non-portable. */ + (void)Source; + (void)Length; } _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 01:54:33 UTC (rev 19741) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-29 02:40:18 UTC (rev 19742) @@ -22,6 +22,7 @@ ULONG Ke386CacheAlignment; CHAR Ke386CpuidModel[49] = {0,}; ULONG Ke386L1CacheSize; +ULONG Ke386CacheGranularity = 0x40; /* FIXME: Default to 64 bytes for RtlPrefetchMemoryNonTemporal(), need real size */ BOOLEAN Ke386NoExecute = FALSE; BOOLEAN Ke386Pae = FALSE; BOOLEAN Ke386GlobalPagesEnabled = FALSE; @@ -476,6 +477,7 @@ DPRINT("Ke386CacheAlignment: %d\n", Ke386CacheAlignment); if (Ke386L1CacheSize) { + DPRINT("Ke386L1CacheSize: %dkB\n", Ke386L1CacheSize); } if (Pcr->L2CacheSize) @@ -497,7 +499,7 @@ KEY_VALUE_PARTIAL_INFORMATION ValueData; NTSTATUS Status; ULONG FastSystemCallDisable = 0; - + SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_PRECISION_ERRATA] = FALSE; SharedUserData->ProcessorFeatures[PF_FLOATING_POINT_EMULATED] = FALSE; SharedUserData->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = @@ -516,6 +518,13 @@ SharedUserData->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = (Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE2); + /* Does the CPU Support 'prefetchnta' (SSE) */ + if(Pcr->PrcbData.FeatureBits & X86_FEATURE_SSE) + { + /* Replace the ret by a nop */ + *(PCHAR)RtlPrefetchMemoryNonTemporal = 0x90; + } + /* Does the CPU Support Fast System Call? */ if (Pcr->PrcbData.FeatureBits & X86_FEATURE_SYSCALL) {

1 0

[cwittich] 19741: fix warning
by cwittich＠svn.reactos.com 29 Nov '05

29 Nov '05

fix warning Modified: trunk/reactos/subsys/system/sc/sc.c _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-29 01:48:25 UTC (rev 19740) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-29 01:54:33 UTC (rev 19741) @@ -130,7 +130,7 @@ else if (_tcsicmp(Command, _T("control")) == 0) { if (ServiceName) - Control((DWORD)NULL, ServiceName, ServiceArgs); + Control(0, ServiceName, ServiceArgs); else ContinueUsage(); }

1 0

[cwittich] 19740: fixed some warnings when compiling with msvc
by cwittich＠svn.reactos.com 29 Nov '05

29 Nov '05

fixed some warnings when compiling with msvc Modified: trunk/reactos/subsys/system/regedit/childwnd.c Modified: trunk/reactos/subsys/system/regedit/edit.c Modified: trunk/reactos/subsys/system/regedit/hexedit.c Modified: trunk/reactos/subsys/system/regedit/listview.c Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/main.h Modified: trunk/reactos/subsys/system/regedit/treeview.c _____ Modified: trunk/reactos/subsys/system/regedit/childwnd.c --- trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/childwnd.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -287,8 +287,8 @@ _tcsncpy(pChildWnd->szPath, buffer, MAX_PATH); pChildWnd->nSplitPos = 250; pChildWnd->hWnd = hWnd; - pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, TREE_WINDOW); - pChildWnd->hListWnd = CreateListView(hWnd, LIST_WINDOW/*, pChildWnd->szPath*/); + pChildWnd->hTreeWnd = CreateTreeView(hWnd, pChildWnd->szPath, (HMENU) TREE_WINDOW); + pChildWnd->hListWnd = CreateListView(hWnd, (HMENU) LIST_WINDOW/*, pChildWnd->szPath*/); SetFocus(pChildWnd->hTreeWnd); break; } _____ Modified: trunk/reactos/subsys/system/regedit/edit.c --- trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/edit.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -248,7 +248,7 @@ { WNDPROC oldwndproc; - oldwndproc = (WNDPROC)GetWindowLongPtr(hwnd, GWL_USERDATA); + oldwndproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwnd, GWL_USERDATA); switch (uMsg) { @@ -301,7 +301,7 @@ /* subclass the edit control */ hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA); - oldproc = (WNDPROC)GetWindowLongPtr(hwndValue, GWL_WNDPROC); + oldproc = (WNDPROC)(LONG_PTR)GetWindowLongPtr(hwndValue, GWL_WNDPROC); SetWindowLongPtr(hwndValue, GWL_USERDATA, (DWORD_PTR)oldproc); SetWindowLongPtr(hwndValue, GWL_WNDPROC, (DWORD_PTR)DwordEditSubclassProc); _____ Modified: trunk/reactos/subsys/system/regedit/hexedit.c --- trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/hexedit.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -867,7 +867,7 @@ { PHEXEDIT_DATA hed; - hed = (PHEXEDIT_DATA)GetWindowLongPtr(hWnd, (DWORD_PTR)0); + hed = (PHEXEDIT_DATA)(LONG_PTR)GetWindowLongPtr(hWnd, (DWORD_PTR)0); switch(uMsg) { case WM_ERASEBKGND: _____ Modified: trunk/reactos/subsys/system/regedit/listview.c --- trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/listview.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -474,7 +474,7 @@ } -HWND CreateListView(HWND hwndParent, int id) +HWND CreateListView(HWND hwndParent, HMENU id) { RECT rcClient; HWND hwndLV; @@ -484,7 +484,7 @@ hwndLV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_LISTVIEW, _T("List View"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | LVS_REPORT | LVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, id, hInst, NULL); if (!hwndLV) return NULL; /* Initialize the image list, and add items to the control. */ _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -144,7 +144,7 @@ DWORD dwError = GetLastError(); } */ - hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(int)hFrameWndClass, szTitle, + hFrameWnd = CreateWindowEx(WS_EX_WINDOWEDGE, (LPCTSTR)(UlongToPtr(hFrameWndClass)), szTitle, WS_OVERLAPPEDWINDOW | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, hMenuFrame, hInstance, NULL/*lpParam*/); _____ Modified: trunk/reactos/subsys/system/regedit/main.h --- trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/main.h 2005-11-29 01:48:25 UTC (rev 19740) @@ -99,14 +99,14 @@ extern BOOL ExportRegistryFile(HWND hWnd); /* listview.c */ -extern HWND CreateListView(HWND hwndParent, int id); +extern HWND CreateListView(HWND hwndParent, HMENU id); extern BOOL RefreshListView(HWND hwndLV, HKEY hKey, LPCTSTR keyPath); extern LPCTSTR GetValueName(HWND hwndLV, int iStartAt); extern BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result); extern BOOL IsDefaultValue(HWND hwndLV, int i); /* treeview.c */ -extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id); +extern HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id); extern BOOL RefreshTreeView(HWND hWndTV); extern BOOL RefreshTreeItem(HWND hwndTV, HTREEITEM hItem); extern BOOL OnTreeExpanding(HWND hWnd, NMTREEVIEW* pnmtv); _____ Modified: trunk/reactos/subsys/system/regedit/treeview.c --- trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:35:32 UTC (rev 19739) +++ trunk/reactos/subsys/system/regedit/treeview.c 2005-11-29 01:48:25 UTC (rev 19740) @@ -572,7 +572,7 @@ * Returns the handle to the new control if successful, or NULL otherwise. * hwndParent - handle to the control's parent window. */ -HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, int id) +HWND CreateTreeView(HWND hwndParent, LPTSTR pHostName, HMENU id) { RECT rcClient; HWND hwndTV; @@ -582,7 +582,7 @@ hwndTV = CreateWindowEx(WS_EX_CLIENTEDGE, WC_TREEVIEW, NULL, WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_HASBUTTONS | TVS_LINESATROOT | TVS_EDITLABELS, 0, 0, rcClient.right, rcClient.bottom, - hwndParent, (HMENU)id, hInst, NULL); + hwndParent, id, hInst, NULL); /* Initialize the image list, and add items to the control. */ if (!InitTreeViewImageLists(hwndTV) || !InitTreeViewItems(hwndTV, pHostName)) { DestroyWindow(hwndTV);

1 0

[weiden] 19739: another hack to get reactos to build again
by weiden＠svn.reactos.com 29 Nov '05

29 Nov '05

another hack to get reactos to build again Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h _____ Modified: trunk/reactos/drivers/video/displays/framebuf/framebuf.h --- trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-11-29 00:33:22 UTC (rev 19738) +++ trunk/reactos/drivers/video/displays/framebuf/framebuf.h 2005-11-29 01:35:32 UTC (rev 19739) @@ -21,12 +21,18 @@ #ifndef FRAMEBUF_H #define FRAMEBUF_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> #include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl //#define EXPERIMENTAL_MOUSE_CURSOR_SUPPORT typedef struct _PDEV

1 0

[ion] 19738: - Fix the build (patch by Thomas Weidenmueller)
by ion＠svn.reactos.com 29 Nov '05

29 Nov '05

- Fix the build (patch by Thomas Weidenmueller) Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c --- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,11 @@ -#include <ntddk.h> -#define NDEBUG -#include <debug.h> #include "../vgaddi.h" #include "../vgavideo/vgavideo.h" #include "brush.h" #include "bitblt.h" +#define NDEBUG +#include <debug.h> + typedef BOOL (*PFN_VGABlt)(SURFOBJ*, SURFOBJ*, XLATEOBJ*, RECTL*, POINTL*); typedef BOOL STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj, SURFOBJ* InputObj, _____ Modified: trunk/reactos/drivers/video/displays/vga/objects/transblt.c --- trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/objects/transblt.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,11 @@ -#include <ntddk.h> -#define NDEBUG -#include <debug.h> #include "../vgaddi.h" #include "../vgavideo/vgavideo.h" #include "brush.h" #include "bitblt.h" +#define NDEBUG +#include <debug.h> + BOOL STDCALL DrvTransparentBlt(SURFOBJ* Dest, SURFOBJ* Source, _____ Modified: trunk/reactos/drivers/video/displays/vga/vgaddi.h --- trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/vgaddi.h 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,62 @@ #define _WINBASE_ #define _WINDOWS_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> #include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> +/* FIXME - what a headers mess.... */ + +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl + +ULONG DbgPrint(PCH Format,...); +VOID DDKAPI DbgBreakPoint(VOID); +VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); +VOID DDKAPI WRITE_REGISTER_UCHAR(IN PUCHAR Register, IN UCHAR Value); +UCHAR DDKAPI READ_REGISTER_UCHAR(IN PUCHAR Register); + +static __inline BOOLEAN +RemoveEntryList( + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (OldFlink == OldBlink); +} + +static __inline VOID +InsertHeadList( + IN PLIST_ENTRY ListHead, + IN PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + OldFlink = ListHead->Flink; + Entry->Flink = OldFlink; + Entry->Blink = ListHead; + OldFlink->Blink = Entry; + ListHead->Flink = Entry; +} + +static __inline VOID +InitializeListHead( + IN PLIST_ENTRY ListHead) +{ + ListHead->Flink = ListHead->Blink = ListHead; +} + +/***********************************************************/ + #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define DS_SOLIDBRUSH 0x00000001 _____ Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c --- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-28 23:58:49 UTC (rev 19737) +++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c 2005-11-29 00:33:22 UTC (rev 19738) @@ -1,11 +1,23 @@ +#define _WINBASE_ +#define _WINDOWS_H +#include <stdarg.h> #include <windef.h> +#include <guiddef.h> #include <wingdi.h> -#include <ddk/ntddk.h> +#include <ddk/winddi.h> +#include <winioctl.h> #include <ddk/ntddvdeo.h> -#include <ddk/winddi.h> #include <stdlib.h> #include "vgavideo.h" +#define DDKAPI __stdcall +#define DDKFASTAPI __fastcall +#define FASTCALL __fastcall +#define DDKCDECLAPI __cdecl + +VOID DDKAPI WRITE_PORT_UCHAR(IN PUCHAR Port, IN UCHAR Value); +VOID DDKAPI WRITE_PORT_USHORT(IN PUSHORT Port, IN USHORT Value); + UCHAR PreCalcReverseByte[256]; int maskbit[640]; int y80[480];

1 0

[npwoods] 19737: Regedit: Implemented accelerator keys
by npwoods＠svn.reactos.com 28 Nov '05

28 Nov '05

Regedit: Implemented accelerator keys Modified: trunk/reactos/subsys/system/regedit/main.c Modified: trunk/reactos/subsys/system/regedit/resource.h Modified: trunk/reactos/subsys/system/regedit/rsrc.rc _____ Modified: trunk/reactos/subsys/system/regedit/main.c --- trunk/reactos/subsys/system/regedit/main.c 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/main.c 2005-11-28 23:58:49 UTC (rev 19737) @@ -242,11 +242,11 @@ if (!InitInstance(hInstance, nCmdShow)) { return FALSE; } - hAccel = LoadAccelerators(hInstance, (LPCTSTR)IDC_REGEDIT); + hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL)); /* Main message loop */ while (GetMessage(&msg, (HWND)NULL, 0, 0)) { - if (!TranslateAccelerator(msg.hwnd, hAccel, &msg) + if (!TranslateAccelerator(hFrameWnd, hAccel, &msg) && !TranslateChildTabMessage(&msg)) { TranslateMessage(&msg); DispatchMessage(&msg); _____ Modified: trunk/reactos/subsys/system/regedit/resource.h --- trunk/reactos/subsys/system/regedit/resource.h 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/resource.h 2005-11-28 23:58:49 UTC (rev 19737) @@ -206,4 +206,6 @@ #define ID_FAVORITES_MIN 2100 #define ID_FAVORITES_MAX 2999 +#define ID_ACCEL 3000 + #define IDC_STATIC -1 _____ Modified: trunk/reactos/subsys/system/regedit/rsrc.rc --- trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-28 23:54:06 UTC (rev 19736) +++ trunk/reactos/subsys/system/regedit/rsrc.rc 2005-11-28 23:58:49 UTC (rev 19737) @@ -21,6 +21,15 @@ #include "windows.h" #include "resource.h" +ID_ACCEL ACCELERATORS +{ + VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT + "^F", ID_EDIT_FIND + VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT + VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT +} + /* define language neutral resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

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