Ros-diffs November 2007

ros-diffs@reactos.org

20 participants
888 discussions

[hpoussin] 30189: Also use the module name in wine stubs object files
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 20:38:55 2007 New Revision: 30189 URL: http://svn.reactos.org/svn/reactos?rev=30189&view=rev Log: Also use the module name in wine stubs object files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 20:38:55 2007 @@ -509,7 +509,7 @@ if ( extension == ".rc" || extension == ".RC" ) newExtension = "_" + module.name + ".coff"; else if ( extension == ".spec" || extension == ".SPEC" ) - newExtension = ".stubs.o"; + newExtension = ".stubs_" + module.name + ".o"; else if ( extension == ".idl" || extension == ".IDL" ) { if ( module.type == RpcServer )

1 0

[hpoussin] 30188: Also use the module name in idl object files
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 20:27:58 2007 New Revision: 30188 URL: http://svn.reactos.org/svn/reactos?rev=30188&view=rev Log: Also use the module name in idl object files Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 20:27:58 2007 @@ -513,9 +513,9 @@ else if ( extension == ".idl" || extension == ".IDL" ) { if ( module.type == RpcServer ) - newExtension = "_s.o"; + newExtension = "_s_" + module.name + ".o"; else if ( module.type == RpcClient ) - newExtension = "_c.o"; + newExtension = "_c_" + module.name + ".o"; else newExtension = ".h"; }

1 0

[jimtabor] 30187: Ntoskrnl: - Add callback for BatchFlushRoutine in ps/win32.c. - Thanks to Thomas for helping me find out why it was not working.
by jimtabor＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: jimtabor Date: Mon Nov 5 20:27:25 2007 New Revision: 30187 URL: http://svn.reactos.org/svn/reactos?rev=30187&view=rev Log: Ntoskrnl: - Add callback for BatchFlushRoutine in ps/win32.c. - Thanks to Thomas for helping me find out why it was not working. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/usercall.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Mon Nov 5 20:27:25 2007 @@ -192,7 +192,8 @@ /* Flush it */ push edx push eax - //call [_KeGdiFlushUserBatch] +// <-- Remove these once it is working! +// call [_KeGdiFlushUserBatch] pop eax pop edx Modified: trunk/reactos/ntoskrnl/ke/i386/usercall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/usercall.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/usercall.c Mon Nov 5 20:27:25 2007 @@ -11,6 +11,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +extern PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch(); /* PRIVATE FUNCTIONS *********************************************************/ @@ -217,6 +219,8 @@ { /* Shouldn't happen in ROS yet */ ASSERT(FALSE); +// *UserEsp -= 256; +// KeGdiFlushUserBatch(); } /* Restore stack and return */ Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=30… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Mon Nov 5 20:27:25 2007 @@ -17,6 +17,7 @@ PKWIN32_PROCESS_CALLOUT PspW32ProcessCallout = NULL; PKWIN32_THREAD_CALLOUT PspW32ThreadCallout = NULL; +PGDI_BATCHFLUSH_ROUTINE KeGdiFlushUserBatch = NULL; extern PKWIN32_PARSEMETHOD_CALLOUT ExpWindowStationObjectParse; extern PKWIN32_DELETEMETHOD_CALLOUT ExpWindowStationObjectDelete; extern PKWIN32_DELETEMETHOD_CALLOUT ExpDesktopObjectDelete; @@ -114,6 +115,7 @@ ExpWindowStationObjectDelete = CalloutData->WindowStationDeleteProcedure; ExpDesktopObjectDelete = CalloutData->DesktopDeleteProcedure; PopEventCallout = CalloutData->PowerEventCallout; + KeGdiFlushUserBatch = CalloutData->BatchFlushRoutine; } NTSTATUS

1 0

[pschweitzer] 30186: Updated Shell32 French translation
by pschweitzer＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: pschweitzer Date: Mon Nov 5 20:06:44 2007 New Revision: 30186 URL: http://svn.reactos.org/svn/reactos?rev=30186&view=rev Log: Updated Shell32 French translation Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Mon Nov 5 20:06:44 2007 @@ -139,11 +139,11 @@ LTEXT "Version " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "This ReactOS version is registered to:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Cette version de ReactOS est enregistrée à:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ - LTEXT "Installed physical memory:", IDC_STATIC, 35, 152, 130, 10 + LTEXT "Mémoire physique installée:", IDC_STATIC, 35, 152, 130, 10 LTEXT "", IDC_SHELL_ABOUT_PHYSMEM, 167, 152, 88, 10 DEFPUSHBUTTON "OK", IDOK, 220, 178, 50, 14 @@ -212,28 +212,28 @@ SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "General" +CAPTION "Général" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "File", 14005, 68, 35, 160, 10 - LTEXT "Opens with:", 14006, 8, 53, 50, 10 + LTEXT "Type de fichier:", 14004, 8, 35, 50, 10 + LTEXT "Fichier", 14005, 68, 35, 160, 10 + LTEXT "Ouvrir avec:", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "Location:", 14008, 8, 72, 45, 10 + LTEXT "Localisation:", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Size:", 14010, 8, 93, 45, 10 + LTEXT "Taille:", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "Créé:", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Modified:", 14016, 8, 140, 45, 10 + LTEXT "Modifié:", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Accessed:", 14018, 8, 160, 45, 10 + LTEXT "Accédé:", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributes:", 14020, 8, 190, 45, 10 - CHECKBOX "&Read-only", 14021, 58, 190, 67, 10 - CHECKBOX "&Hidden", 14022, 126, 189, 50, 10 + LTEXT "Attributs:", 14020, 8, 190, 45, 10 + CHECKBOX "Lectu&re-seule", 14021, 58, 190, 67, 10 + CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 END @@ -242,15 +242,15 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "File version: ", 14000, 10, 10, 55, 10 + LTEXT "Version du fichier: ", 14000, 10, 10, 55, 10 LTEXT "", 14001, 77, 10, 152, 10 LTEXT "Description: ", 14002, 10, 27, 45, 10 LTEXT "", 14003, 77, 27, 152, 10 LTEXT "Copyright: ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Other version information: ", 14006, 6, 70, 222, 115 - LTEXT "Item name: ", 14007, 13, 82, 50, 10 - LTEXT "Value: ", 14008, 112, 82, 45, 10 + GROUPBOX "Autres informations de version: ", 14006, 6, 70, 222, 115 + LTEXT "Nom de l'élément: ", 14007, 13, 82, 50, 10 + LTEXT "Valeur: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END

1 0

[gedmurphy] 30185: Check the registry for previous servers and fill the combobox with them.
by gedmurphy＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: gedmurphy Date: Mon Nov 5 19:29:20 2007 New Revision: 30185 URL: http://svn.reactos.org/svn/reactos?rev=30185&view=rev Log: Check the registry for previous servers and fill the combobox with them. Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/resource.h Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Mon Nov 5 19:29:20 2007 @@ -23,6 +23,8 @@ #include <stdio.h> #include <tchar.h> #include "resource.h" + +#define MAX_KEY_NAME 255 /* As slider control can't contain user data, we have to keep an * array of RESOLUTION_INFO to have our own associated data. @@ -96,6 +98,84 @@ } } +static VOID +FillServerAddesssCombo(PINFO pInfo) +{ + HKEY hKey; + TCHAR KeyName[] = _T("Software\\Microsoft\\Terminal Server Client\\Default"); + TCHAR Name[MAX_KEY_NAME]; + LONG ret = ERROR_SUCCESS; + DWORD size; + INT i = 0; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, + KeyName, + 0, + KEY_READ, + &hKey) == ERROR_SUCCESS) + { + while (ret == ERROR_SUCCESS) + { + size = MAX_KEY_NAME; + ret = RegEnumValue(hKey, + i, + Name, + &size, + NULL, + NULL, + NULL, + NULL); + if (ret == ERROR_SUCCESS) + { + size = MAX_KEY_NAME; + if (RegQueryValueEx(hKey, + Name, + 0, + NULL, + NULL, + &size) == ERROR_SUCCESS) + { + LPTSTR lpAddress = HeapAlloc(GetProcessHeap(), + 0, + size); + if (lpAddress) + { + if (RegQueryValueEx(hKey, + Name, + 0, + NULL, + lpAddress, + &size) == ERROR_SUCCESS) + { + SendDlgItemMessage(pInfo->hGeneralPage, + IDC_SERVERCOMBO, + CB_ADDSTRING, + 0, + lpAddress); + } + + HeapFree(GetProcessHeap(), + 0, + lpAddress); + } + } + } + + i++; + } + } + + if (LoadString(hInst, + IDS_BROWSESERVER, + Name, + sizeof(Name) / sizeof(TCHAR))) + { + SendDlgItemMessage(pInfo->hGeneralPage, IDC_SERVERCOMBO, CB_ADDSTRING, 0, Name); + } +} + + + static VOID GeneralOnInit(PINFO pInfo) @@ -109,11 +189,11 @@ SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); pInfo->hLogon = LoadImage(hInst, - MAKEINTRESOURCE(IDI_LOGON), - IMAGE_ICON, - 32, - 32, - LR_DEFAULTCOLOR); + MAKEINTRESOURCE(IDI_LOGON), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); if (pInfo->hLogon) { SendDlgItemMessage(pInfo->hGeneralPage, @@ -138,9 +218,7 @@ 0); } - SetDlgItemText(pInfo->hGeneralPage, - IDC_SERVERCOMBO, - g_servername); + FillServerAddesssCombo(pInfo); } Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Mon Nov 5 19:29:20 2007 @@ -12,7 +12,7 @@ LTEXT "Enter the server address",IDC_STATIC,47,24,81,8 LTEXT "Server:",IDC_STATIC,47,41,25,8 LTEXT "User name:",IDC_STATIC,47,58,38,8 - COMBOBOX IDC_SERVERCOMBO,79,39,141,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Save",IDC_SAVE,67,139,50,14 PUSHBUTTON "SaveAs...",IDC_SAVEAS,123,139,50,14 PUSHBUTTON "Open...",IDC_OPEN,177,139,50,14 @@ -59,4 +59,5 @@ IDS_HIGHCOLOR24 "True Color (24 bit)" IDS_PIXEL "%lux%lu Pixels" IDS_FULLSCREEN "Full Screen" + IDS_BROWSESERVER "<Browse for more...>" END Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Mon Nov 5 19:29:20 2007 @@ -32,6 +32,7 @@ #define IDS_TAB_GENERAL 3001 #define IDS_PIXEL 3006 #define IDS_FULLSCREEN 3007 +#define IDS_BROWSESERVER 3008 #define IDS_256COLORS 4000 #define IDS_HIGHCOLOR15 4001

1 0

[hpoussin] 30184: Remove MP build option from config.template.rbuild See issue #1183 for more details.
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 19:20:30 2007 New Revision: 30184 URL: http://svn.reactos.org/svn/reactos?rev=30184&view=rev Log: Remove MP build option from config.template.rbuild See issue #1183 for more details. Modified: trunk/reactos/ReactOS-generic.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Mon Nov 5 19:20:30 2007 @@ -4,9 +4,6 @@ <xi:include href="baseaddress.rbuild" /> <define name="__REACTOS__" overridable="true" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP">1</define> - </if> <if property="DBG" value="1"> <define name="DBG">1</define> <define name="_SEH_ENABLE_TRACE" /> Modified: trunk/reactos/config.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev… ============================================================================== --- trunk/reactos/config.template.rbuild (original) +++ trunk/reactos/config.template.rbuild Mon Nov 5 19:20:30 2007 @@ -47,12 +47,6 @@  -<property name="MP" value="0" /> - - - <property name="KDBG" value="0" />

1 0

[hpoussin] 30183: Support to build more than one object file with one source file
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 19:19:10 2007 New Revision: 30183 URL: http://svn.reactos.org/svn/reactos?rev=30183&view=rev Log: Support to build more than one object file with one source file Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 19:19:10 2007 @@ -507,7 +507,7 @@ string newExtension; string extension = GetExtension ( *sourceFile ); if ( extension == ".rc" || extension == ".RC" ) - newExtension = ".coff"; + newExtension = "_" + module.name + ".coff"; else if ( extension == ".spec" || extension == ".SPEC" ) newExtension = ".stubs.o"; else if ( extension == ".idl" || extension == ".IDL" ) @@ -520,7 +520,7 @@ newExtension = ".h"; } else - newExtension = ".o"; + newExtension = "_" + module.name + ".o"; if ( module.type == BootSector ) destination_directory = OutputDirectory; @@ -1119,7 +1119,7 @@ const FileLocation* MingwModuleHandler::GetPrecompiledHeaderFilename () const { - const string& basePchFilename = module.pch->file.name + ".gch"; + const string& basePchFilename = module.pch->file.name + "_" + module.name + ".gch"; return new FileLocation ( IntermediateDirectory, module.pch->file.relative_path, basePchFilename );

1 0

[hpoussin] 30182: Add rbuild file to build ntkrnlmp.exe (not added to main build yet) See issue #1181 for more details.
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 19:16:41 2007 New Revision: 30182 URL: http://svn.reactos.org/svn/reactos?rev=30182&view=rev Log: Add rbuild file to build ntkrnlmp.exe (not added to main build yet) See issue #1181 for more details. Added: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild - copied, changed from r30180, trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild Copied: trunk/reactos/ntoskrnl/ntkrnlmp.rbuild (from r30180, trunk/reactos/ntoskrnl/ntoskrnl.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntkrnlmp.rbuild?p… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntkrnlmp.rbuild Mon Nov 5 19:16:41 2007 @@ -1,8 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> -<module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> +<module name="ntkrnlmp" type="kernel" installbase="system32" installname="ntkrnlmp.exe"> <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl.def" /> + +  + <define name="CONFIG_SMP" /> + <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> <define name="_NTOSKRNL_" /> @@ -65,8 +69,8 @@ <file>stubs.c</file> <file>systimer.c</file> <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> </directory> </if> <file>apc.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Nov 5 19:16:41 2007 @@ -65,8 +65,8 @@ <file>stubs.c</file> <file>systimer.c</file> <file>thrdini.c</file> - <file>ctxswitch.c</file> - <file>ctxhelp.S</file> + <file>ctxswitch.c</file> + <file>ctxhelp.S</file> </directory> </if> <file>apc.c</file>

1 0

[hpoussin] 30181: Add a Module argument to GetObjectFilename() Fix a typo when a define in incorrectly overridden
by hpoussin＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: hpoussin Date: Mon Nov 5 18:57:06 2007 New Revision: 30181 URL: http://svn.reactos.org/svn/reactos?rev=30181&view=rev Log: Add a Module argument to GetObjectFilename() Fix a typo when a define in incorrectly overridden Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Nov 5 18:57:06 2007 @@ -395,7 +395,7 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), importedModule, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) { dep += ssprintf ( " $(%s_HEADERS)", importedModule.name.c_str () ); @@ -500,6 +500,7 @@ const FileLocation* MingwModuleHandler::GetObjectFilename ( const FileLocation* sourceFile, + const Module& module, string_list* pclean_files ) const { DirectoryLocation destination_directory; @@ -621,7 +622,7 @@ { if ( objectFilenames.size () > 0 ) objectFilenames += " "; - objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), NULL ) ); + objectFilenames += backend->GetFullName ( *GetObjectFilename ( compilationUnits[i]->GetFilename (), module, NULL ) ); } return objectFilenames; } @@ -825,11 +826,11 @@ continue; if ( !define.overridable ) { - throw InvalidOperationException ( define.node->location.c_str (), + throw InvalidOperationException ( (*last_define)->node->location.c_str (), 0, "Invalid override of define '%s', already defined at %s", define.name.c_str (), - (*last_define)->node->location.c_str () ); + define.node->location.c_str () ); } if ( backend->configuration.Verbose ) printf("%s: Overriding '%s' already defined at %s\n", @@ -1033,7 +1034,7 @@ fprintf ( fMakefile, "%s := %s $(%s)\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ).c_str (), + backend->GetFullName ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ).c_str (), objectsMacro.c_str() ); } } @@ -1047,7 +1048,7 @@ CompilationUnit& compilationUnit = *compilationUnits[i]; if ( !compilationUnit.IsFirstFile () ) { - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) headers.push_back ( objectFilename ); else @@ -1110,7 +1111,7 @@ fMakefile, "%s += %s\n", objectsMacro.c_str(), - backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), NULL ) ).c_str () ); + backend->GetFullName ( *GetObjectFilename ( sourceCompilationUnits[i]->GetFilename (), module, NULL ) ).c_str () ); } CleanupCompilationUnitVector ( sourceCompilationUnits ); } @@ -1144,7 +1145,7 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, &clean_files ); + sourceFile, module, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), @@ -1167,7 +1168,7 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, &clean_files ); + sourceFile, module, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), @@ -1189,7 +1190,7 @@ dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); const FileLocation *objectFilename = GetObjectFilename ( - sourceFile, &clean_files ); + sourceFile, module, &clean_files ); fprintf ( fMakefile, "%s: %s | %s\n", backend->GetFullName ( *objectFilename ).c_str (), @@ -1210,7 +1211,7 @@ string dependencies = backend->GetFullName ( *sourceFile ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); - const FileLocation *objectFilename = GetObjectFilename ( sourceFile, &clean_files ); + const FileLocation *objectFilename = GetObjectFilename ( sourceFile, module, &clean_files ); string sourceFilenamePart = module.name + "." + ReplaceExtension ( sourceFile->name, "" ); FileLocation rciFilename ( TemporaryDirectory, @@ -1642,7 +1643,7 @@ for ( size_t i = 0; i < data.compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *data.compilationUnits[i]; - objectFiles.push_back ( *GetObjectFilename ( compilationUnit.GetFilename (), NULL ) ); + objectFiles.push_back ( *GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ) ); } } @@ -1819,7 +1820,7 @@ for ( i = 0; i < compilationUnits.size (); i++ ) { CompilationUnit& compilationUnit = *compilationUnits[i]; - const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), NULL ); + const FileLocation *objectFilename = GetObjectFilename ( compilationUnit.GetFilename (), module, NULL ); if ( GetExtension ( *objectFilename ) == ".h" ) { moduleDependencies = ssprintf ( " $(%s_HEADERS)", module.name.c_str () ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Mon Nov 5 18:57:06 2007 @@ -97,6 +97,7 @@ bool includeGeneratedFiles ) const; void GetSourceFilenamesWithoutGeneratedFiles ( std::vector<FileLocation>& list ) const; const FileLocation* GetObjectFilename ( const FileLocation* sourceFile, + const Module& module, string_list* pclean_files ) const; std::string GetObjectFilenames ();

1 0

[gedmurphy] 30180: fix displaying of current resolution
by gedmurphy＠svn.reactos.org 05 Nov '07

05 Nov '07

Author: gedmurphy Date: Mon Nov 5 18:31:22 2007 New Revision: 30180 URL: http://svn.reactos.org/svn/reactos?rev=30180&view=rev Log: fix displaying of current resolution Modified: trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/lang/en-US.rc trunk/reactos/base/applications/mstsc/resource.h Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… ============================================================================== --- trunk/reactos/base/applications/mstsc/connectdialog.c (original) +++ trunk/reactos/base/applications/mstsc/connectdialog.c Mon Nov 5 18:31:22 2007 @@ -387,24 +387,18 @@ static VOID UpdateDisplay(IN HWND hwndDlg, PINFO pGlobalData, IN BOOL bUpdateThumb) { + + + +} + + +static VOID +FillResolutionsAndColors(PINFO pInfo) +{ + PSETTINGS_ENTRY Current; TCHAR Buffer[64]; TCHAR Pixel[64]; - DWORD index; - - LoadString(hInst, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); - _stprintf(Buffer, Pixel, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); - //SendDlgItemMessage(pGlobalData->hDisplayPage, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); - SetDlgItemText(pGlobalData->hDisplayPage, pGlobalData->hDisplayPage, Buffer); - - if (LoadString(hInst, (2900 + pGlobalData->CurrentDisplayDevice->CurrentSettings->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) - SendDlgItemMessage(hwndDlg, IDC_GEOSLIDER, CB_SELECTSTRING, (WPARAM)-1, (LPARAM)Buffer); -} - - -static VOID -FillResolutionsAndColors(PINFO pInfo) -{ - PSETTINGS_ENTRY Current; DWORD index, i, num; DWORD MaxBpp = 0; UINT HighBpp; @@ -481,7 +475,21 @@ TRUE, MAKELONG(0, pInfo->DisplayDeviceList->ResolutionsCount)); //extra 1 for full screen - UpdateDisplay(pInfo->hDisplayPage, pInfo, TRUE); + LoadString(hInst, IDS_PIXEL, Pixel, sizeof(Pixel) / sizeof(TCHAR)); + _stprintf(Buffer, Pixel, pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth, pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight, Pixel); + SendDlgItemMessage(pInfo->hDisplayPage, IDC_SETTINGS_RESOLUTION_TEXT, WM_SETTEXT, 0, (LPARAM)Buffer); + + for (index = 0; index < pInfo->CurrentDisplayDevice->ResolutionsCount; index++) + { + if (pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsWidth == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsWidth && + pInfo->CurrentDisplayDevice->Resolutions[index].dmPelsHeight == pInfo->CurrentDisplayDevice->CurrentSettings->dmPelsHeight) + { + SendDlgItemMessage(pInfo->hDisplayPage, IDC_GEOSLIDER, TBM_SETPOS, TRUE, index); + break; + } + } + + //UpdateDisplay(pInfo->hDisplayPage, pInfo, TRUE); } Modified: trunk/reactos/base/applications/mstsc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/en-US.rc (original) +++ trunk/reactos/base/applications/mstsc/lang/en-US.rc Mon Nov 5 18:31:22 2007 @@ -35,7 +35,7 @@ LTEXT "Note: Settings on the remote computer might override this setting.",IDC_STATIC,56,143,165,18 LTEXT "Less",IDC_STATIC,35,42,15,8 LTEXT "More",IDC_STATIC,189,42,17,8 - LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 124, 10, SS_CENTER + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER END IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 267 Modified: trunk/reactos/base/applications/mstsc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/re… ============================================================================== --- trunk/reactos/base/applications/mstsc/resource.h (original) +++ trunk/reactos/base/applications/mstsc/resource.h Mon Nov 5 18:31:22 2007 @@ -14,8 +14,8 @@ #define IDC_LOGONICON 1016 #define IDC_CONNICON 1017 -#define IDC_REMICON 1014 -#define IDC_COLORSICON 1015 +#define IDC_REMICON 1018 +#define IDC_COLORSICON 1019 #define IDB_HEADER 1016 #define IDB_SPECT 1017

1 0

← Newer
1
...
71
72
73
74
75
76
77
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2007