Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[cwittich] 27939: german text did not fit into the static controls
by cwittich＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: cwittich Date: Sat Jul 28 14:04:52 2007 New Revision: 27939 URL: http://svn.reactos.org/svn/reactos?rev=27939&view=rev Log: german text did not fit into the static controls Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc Sat Jul 28 14:04:52 2007 @@ -18,7 +18,7 @@ LTEXT "Niedrig", -1, 40, 85, 24, 10 LTEXT "Hoch", -1, 200, 85, 24, 10 CONTROL "", IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "&Klicken Sie hier, und drücken Sie zum Testen eine Taste:", -1, 15, 105, 180, 10 + LTEXT "&Klicken Sie hier, und drücken Sie zum Testen eine Taste:", -1, 15, 105, 200, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP GROUPBOX "&Cursorblinkgeschwindgkeit", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Sat Jul 28 14:04:52 2007 @@ -95,7 +95,7 @@ BEGIN LTEXT "Die lokalen Systemeinstellungen sollten mit der Sprache der Anwendungen, "\ "die Sie nutzen wollen übereinstimmen. Die lokalen Nutzereinstellungen geben vor, "\ - "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 26 + "wie Nummern, Währungen und Datumsangaben dargestellt werden.", IDC_STATIC, 53, 6, 253, 30 LTEXT "", IDC_LOCALETEXT, 54, 34, 250, 16 LTEXT "Um die lokalen Nutzer- oder Systemeinstellungen zu ändern, klicken Sie auf Einstellen", IDC_STATIC, 53, 57, 188, 15

1 0

[cwittich] 27938: -fix linking when entrypoint is set to "0" See issue #2489 for more details.
by cwittich＠svn.reactos.org 28 Jul '07

28 Jul '07

Author: cwittich Date: Sat Jul 28 13:42:27 2007 New Revision: 27938 URL: http://svn.reactos.org/svn/reactos?rev=27938&view=rev Log: -fix linking when entrypoint is set to "0" See issue #2489 for more details. 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 Sat Jul 28 13:42:27 2007 @@ -2735,7 +2735,16 @@ Library* pLibrary; if ( !module.isDefaultEntryPoint ) + { + if ( module.GetEntryPoint(false) == "0" ) + { + pLibrary = new Library ( module, "mingw_common" ); + module.non_if_data.libraries.insert ( module.non_if_data.libraries.begin() , pLibrary ); + pLibrary = new Library ( module, "msvcrt" ); + module.non_if_data.libraries.push_back ( pLibrary ); + } return; + } if ( module.IsDLL () ) {

1 0

[weiden] 27937: Remove incorrect error check
by weiden＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: weiden Date: Sat Jul 28 00:03:05 2007 New Revision: 27937 URL: http://svn.reactos.org/svn/reactos?rev=27937&view=rev Log: Remove incorrect error check Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Sat Jul 28 00:03:05 2007 @@ -2207,16 +2207,6 @@ /* Undocumented behavior! Return the class atom as a BOOL! */ Ret = (BOOL)ClassAtom; - - if (!(Class->Global || Class->System) && hInstance == NULL) - { - if (CapturedClassName.Length == 0) - WARN("Tried to get information of a non-existing class atom 0x%p\n", CapturedClassName.Buffer); - else - WARN("Tried to get information of a non-existing class \"%wZ\"\n", &CapturedClassName); - SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); - Ret = FALSE; - } } } else

1 0

[weiden] 27936: Disable debug output by default
by weiden＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: weiden Date: Fri Jul 27 23:26:11 2007 New Revision: 27936 URL: http://svn.reactos.org/svn/reactos?rev=27936&view=rev Log: Disable debug output by default Modified: trunk/reactos/lib/sdk/crt/wine/heap.c Modified: trunk/reactos/lib/sdk/crt/wine/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/heap.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/heap.c (original) +++ trunk/reactos/lib/sdk/crt/wine/heap.c Fri Jul 27 23:26:11 2007 @@ -27,6 +27,7 @@ #include <stdlib.h> #include <internal/mtdll.h> +#define NDEBUG #include <debug.h> /* MT */

1 0

[weiden] 27935: - Search for user32 window classes before searching for system classes - Register the user32 base address with win32k. Technically this is not really neccessary because user32's base address is fixed
by weiden＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: weiden Date: Fri Jul 27 23:23:22 2007 New Revision: 27935 URL: http://svn.reactos.org/svn/reactos?rev=27935&view=rev Log: - Search for user32 window classes before searching for system classes - Register the user32 base address with win32k. Technically this is not really neccessary because user32's base address is fixed Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/class.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h Fri Jul 27 23:23:22 2007 @@ -75,6 +75,9 @@ #define NtUserSetCaretBlinkTime(uMSeconds) \ (BOOL)NtUserCallOneParam((DWORD)uMSeconds, ONEPARAM_ROUTINE_SETCARETBLINKTIME) + +#define NtUserRegisterUserModule(hInstance) \ + (BOOL)NtUserCallOneParam((DWORD)hInstance, ONEPARAM_ROUTINE_REGISTERUSERMODULE) /* #define NtUserEnumClipboardFormats(format) \ Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dllmain.c (original) +++ trunk/reactos/dll/win32/user32/misc/dllmain.c Fri Jul 27 23:23:22 2007 @@ -93,6 +93,9 @@ { case DLL_PROCESS_ATTACH: User32Instance = hInstanceDll; + if (!NtUserRegisterUserModule(hInstanceDll)) + return FALSE; + hProcessHeap = RtlGetProcessHeap(); if (!Init()) return FALSE; Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Jul 27 23:23:22 2007 @@ -60,6 +60,7 @@ typedef struct _W32PROCESSINFO { PVOID UserHandleTable; + HINSTANCE hModUser; PWINDOWCLASS LocalClassList; PWINDOWCLASS GlobalClassList; PWINDOWCLASS SystemClassList; @@ -458,7 +459,8 @@ #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 #define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 -#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 +#define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 +#define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 DWORD NTAPI NtUserCallOneParam( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/class.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/class.c Fri Jul 27 23:23:22 2007 @@ -592,7 +592,7 @@ while (*PrevLink != BaseClass) { - ASSERT(BaseClass != NULL); + ASSERT(*PrevLink != NULL); PrevLink = &BaseClass->Next; } @@ -1112,7 +1112,27 @@ goto FoundClass; } - /* Step 3: try to find a system class */ + /* Step 3: try to find any local class registered by user32 */ + Class = IntFindClass(Atom, + pi->hModUser, + &pi->LocalClassList, + Link); + if (Class != NULL) + { + goto FoundClass; + } + + /* Step 4: try to find any global class registered by user32 */ + Class = IntFindClass(Atom, + pi->hModUser, + &pi->GlobalClassList, + Link); + if (Class != NULL) + { + goto FoundClass; + } + + /* Step 5: try to find a system class */ Class = IntFindClass(Atom, NULL, &pi->SystemClassList, @@ -1771,10 +1791,13 @@ IN BOOL Ansi, HINSTANCE hInstance) { + PW32PROCESSINFO pi; + lpwcx->style = Class->Style; + pi = GetW32ProcessInfo(); lpwcx->lpfnWndProc = IntGetClassWndProc(Class, - GetW32ProcessInfo(), + pi, Ansi, FALSE); @@ -1789,9 +1812,7 @@ else lpwcx->lpszMenuName = Class->MenuName; - if (hInstance) - lpwcx->hInstance = hInstance; - else if (Class->Global) + if (Class->hInstance == pi->hModUser) lpwcx->hInstance = NULL; else lpwcx->hInstance = Class->hInstance; @@ -2119,7 +2140,7 @@ /* probe the paramters */ CapturedClassName = ProbeForReadUnicodeString(ClassName); - if (IS_ATOM(CapturedClassName.Buffer)) + if (CapturedClassName.Length == 0) TRACE("hInst %p atom %04X lpWndClassEx %p Ansi %d\n", hInstance, CapturedClassName.Buffer, lpWndClassEx, Ansi); else TRACE("hInst %p class %wZ lpWndClassEx %p Ansi %d\n", hInstance, &CapturedClassName, lpWndClassEx, Ansi); @@ -2162,6 +2183,9 @@ NULL); if (ClassAtom != (RTL_ATOM)0) { + if (hInstance == NULL) + hInstance = pi->hModUser; + Ret = UserGetClassInfo(Class, lpWndClassEx, Ansi, @@ -2186,7 +2210,10 @@ if (!(Class->Global || Class->System) && hInstance == NULL) { - WARN("Tried to get information of a non-existing class\n"); + if (CapturedClassName.Length == 0) + WARN("Tried to get information of a non-existing class atom 0x%p\n", CapturedClassName.Buffer); + else + WARN("Tried to get information of a non-existing class \"%wZ\"\n", &CapturedClassName); SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); Ret = FALSE; } @@ -2194,7 +2221,10 @@ } else { - WARN("Tried to get information of a non-existing class\n"); + if (CapturedClassName.Length == 0) + WARN("Tried to get information of a non-existing class atom 0x%p\n", CapturedClassName.Buffer); + else + WARN("Tried to get information of a non-existing class \"%wZ\"\n", &CapturedClassName); SetLastWin32Error(ERROR_CLASS_DOES_NOT_EXIST); } } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Fri Jul 27 23:23:22 2007 @@ -407,6 +407,26 @@ case ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT: RETURN( (DWORD)UserGetKeyboardLayout(Param)); + + case ONEPARAM_ROUTINE_REGISTERUSERMODULE: + { + PW32THREADINFO ti; + + ti = GetW32ThreadInfo(); + if (ti == NULL) + { + DPRINT1("Cannot register user32 module instance!\n"); + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + if (InterlockedCompareExchangePointer(&ti->kpi->hModUser, + (HINSTANCE)Param, + NULL) == NULL) + { + RETURN(TRUE); + } + } } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param);

1 0

[dreimer] 27934: OK... Background Color needs to be called Text Color and vice versa
by dreimer＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: dreimer Date: Fri Jul 27 19:32:12 2007 New Revision: 27934 URL: http://svn.reactos.org/svn/reactos?rev=27934&view=rev Log: OK... Background Color needs to be called Text Color and vice versa Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Modified: trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/de-DE.rc Fri Jul 27 19:32:12 2007 @@ -7,9 +7,9 @@ { // x, pos_hight, width, hight LTEXT "Reactos Build Environment Einstellungen", 0x0, 10, 10, 140, 13 - LTEXT "Schriftfarbe", 0x0, 10, 35, 60, 12 + LTEXT "Hintergrundfarbe", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Hintergrundfarbe", 0x0, 10, 60, 60, 12 + LTEXT "Schriftfarbe", 0x0, 10, 60, 60, 12 COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Kompilierdauer anzeigen", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/en-US.rc Fri Jul 27 19:32:12 2007 @@ -7,9 +7,9 @@ { // x, pos_hight, width, hight LTEXT "Reactos Build Environment Settings", 0x0, 10, 10, 140, 13 - LTEXT "Font Color", 0x0, 10, 35, 60, 12 + LTEXT "Background Color", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Background Color", 0x0, 10, 60, 60, 12 + LTEXT "Font Color", 0x0, 10, 60, 60, 12 COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Show Build Time", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21 Modified: trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/config/l… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc (original) +++ trunk/tools/RosBE-Windows/Tools/config/lang/ru-RU.rc Fri Jul 27 19:32:12 2007 @@ -7,9 +7,9 @@ { // x, pos_hight, width, hight LTEXT "Óñòàíîâêè ïåðåìåííûõ êîìïèëÿòîðà ÐåàêòÎÑ", 0x0, 10, 10, 140, 13 - LTEXT "Öâåò Øðèôòà", 0x0, 10, 35, 60, 12 + LTEXT "Öâåò Ôîíà", 0x0, 10, 35, 60, 12 COMBOBOX IDC_FONT, 100, 35, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST - LTEXT "Öâåò Ôîíà", 0x0, 10, 60, 60, 12 + LTEXT "Öâåò Øðèôòà", 0x0, 10, 60, 60, 12 COMBOBOX IDC_BACK, 100, 60, 110, 100, WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST CONTROL "Ïîêàçûâàòü Âðåìÿ", ID_SHOWBUILDTIME, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 85, 90, 21 CONTROL "Âåñòè Ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 115, 85, 60, 21

1 0

[dreimer] 27933: - Remove a test Output. - Fix some whitespace stuff.
by dreimer＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: dreimer Date: Fri Jul 27 19:24:40 2007 New Revision: 27933 URL: http://svn.reactos.org/svn/reactos?rev=27933&view=rev Log: - Remove a test Output. - Fix some whitespace stuff. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jul 27 19:24:40 2007 @@ -29,7 +29,6 @@ :: :: Check if our log directory exists, if it doesn't, create it. :: -set logdiff if %logdiff% == 0 ( if not exist "%CD%\RosBE-Logs\." ( if not exist "%CD%\.svn\." ( @@ -48,7 +47,7 @@ echo LogFolder does not exist. ) else ( set _ROSBELOGDIR=%ROSBE_LOGPATH% - ) + ) ) ) Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Jul 27 19:24:40 2007 @@ -25,7 +25,6 @@ ) else ( set logdiff=0 goto :NEXT - ) :PREV @@ -35,7 +34,6 @@ ) else ( set logdiff=1 ) - :NEXT title ReactOS Build Environment %_VER%

1 0

[hpoussin] 27932: Add missing LIST_FOR_EACH_ENTRY_REV macro
by hpoussin＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: hpoussin Date: Fri Jul 27 19:07:07 2007 New Revision: 27932 URL: http://svn.reactos.org/svn/reactos?rev=27932&view=rev Log: Add missing LIST_FOR_EACH_ENTRY_REV macro Modified: trunk/reactos/include/reactos/wine/list.h Modified: trunk/reactos/include/reactos/wine/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/list.… ============================================================================== --- trunk/reactos/include/reactos/wine/list.h (original) +++ trunk/reactos/include/reactos/wine/list.h Fri Jul 27 19:07:07 2007 @@ -171,6 +171,12 @@ (cursor) = (cursor2), \ (cursor2) = LIST_ENTRY((cursor)->field.next, type, field)) +/* iterate through the list in reverse order using a list entry */ +#define LIST_FOR_EACH_ENTRY_REV(elem, list, type, field) \ + for ((elem) = LIST_ENTRY((list)->prev, type, field); \ + &(elem)->field != (list); \ + (elem) = LIST_ENTRY((elem)->field.prev, type, field)) + /* macros for statically initialized lists */ #define LIST_INIT(list) { &(list), &(list) }

1 0

[gedmurphy] 27931: set the text in the mem and cpu graphs to use the default GUI font. This cleans up the appearance
by gedmurphy＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: gedmurphy Date: Fri Jul 27 17:47:28 2007 New Revision: 27931 URL: http://svn.reactos.org/svn/reactos?rev=27931&view=rev Log: set the text in the mem and cpu graphs to use the default GUI font. This cleans up the appearance Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/lang/en-US.rc Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Fri Jul 27 17:47:28 2007 @@ -137,6 +137,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONG CpuUsage; ULONG CpuKernelUsage; int nBars; @@ -173,7 +174,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); /* @@ -303,6 +307,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; int nBars; @@ -338,7 +343,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground); /* Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc Fri Jul 27 17:47:28 2007 @@ -179,7 +179,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Task Manager" +CAPTION "ReactOS Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN

1 0

[hpoussin] 27930: "entrypoint=0" is now auto-generated
by hpoussin＠svn.reactos.org 27 Jul '07

27 Jul '07

Author: hpoussin Date: Fri Jul 27 17:14:35 2007 New Revision: 27930 URL: http://svn.reactos.org/svn/reactos?rev=27930&view=rev Log: "entrypoint=0" is now auto-generated Removed: trunk/reactos/dll/win32/cabinet/cabinet_ros.diff trunk/reactos/dll/win32/comcat/comcat_ros.diff trunk/reactos/dll/win32/lz32/lz32_ros.diff trunk/reactos/dll/win32/oleacc/oleacc_ros.diff trunk/reactos/dll/win32/olepro32/olepro32_ros.diff trunk/reactos/dll/win32/shfolder/shfolder_ros.diff Removed: trunk/reactos/dll/win32/cabinet/cabinet_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cabinet/cabinet_… ============================================================================== --- trunk/reactos/dll/win32/cabinet/cabinet_ros.diff (original) +++ trunk/reactos/dll/win32/cabinet/cabinet_ros.diff (removed) @@ -1,9 +1,0 @@ -Index: cabinet.rbuild -=================================================================== ---- cabinet.rbuild (revision 23782) -+++ cabinet.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="cabinet" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> --<module name="cabinet" type="win32dll" baseaddress="${BASEADDRESS_CABINET}" installbase="system32" installname="cabinet.dll" allowwarnings="true"> - <importlibrary definition="cabinet.spec.def" /> - <include base="cabinet">.</include> Removed: trunk/reactos/dll/win32/comcat/comcat_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comcat/comcat_ro… ============================================================================== --- trunk/reactos/dll/win32/comcat/comcat_ros.diff (original) +++ trunk/reactos/dll/win32/comcat/comcat_ros.diff (removed) @@ -1,10 +1,0 @@ -Index: comcat.rbuild -=================================================================== ---- comcat.rbuild (revision 23782) -+++ comcat.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" entrypoint="0" installname="comcat.dll" allowwarnings="true"> --<module name="comcat" type="win32dll" baseaddress="${BASEADDRESS_COMCAT}" installbase="system32" installname="comcat.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> - <importlibrary definition="comcat.spec.def" /> - Removed: trunk/reactos/dll/win32/lz32/lz32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lz32/lz32_ros.di… ============================================================================== --- trunk/reactos/dll/win32/lz32/lz32_ros.diff (original) +++ trunk/reactos/dll/win32/lz32/lz32_ros.diff (removed) @@ -1,9 +1,0 @@ -Index: lz32.rbuild -=================================================================== ---- lz32.rbuild (revision 23782) -+++ lz32.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="lz32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true"> --<module name="lz32" type="win32dll" baseaddress="${BASEADDRESS_LZ32}" installbase="system32" installname="lz32.dll" allowwarnings="true"> - <importlibrary definition="lz32.spec.def" /> - <include base="lz32">.</include> Removed: trunk/reactos/dll/win32/oleacc/oleacc_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleacc/oleacc_ro… ============================================================================== --- trunk/reactos/dll/win32/oleacc/oleacc_ros.diff (original) +++ trunk/reactos/dll/win32/oleacc/oleacc_ros.diff (removed) @@ -1,9 +1,0 @@ -Index: oleacc.rbuild -=================================================================== ---- oleacc.rbuild (revision 23782) -+++ oleacc.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="oleacc" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> --<module name="oleacc" type="win32dll" baseaddress="${BASEADDRESS_OLEACC}" installbase="system32" installname="oleacc.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> - <importlibrary definition="oleacc.spec.def" /> Removed: trunk/reactos/dll/win32/olepro32/olepro32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/olepro32/olepro3… ============================================================================== --- trunk/reactos/dll/win32/olepro32/olepro32_ros.diff (original) +++ trunk/reactos/dll/win32/olepro32/olepro32_ros.diff (removed) @@ -1,9 +1,0 @@ -Index: olepro32.rbuild -=================================================================== ---- olepro32.rbuild (revision 23782) -+++ olepro32.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="olepro32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> --<module name="olepro32" type="win32dll" baseaddress="${BASEADDRESS_OLEPRO32}" installbase="system32" installname="olepro32.dll" allowwarnings="true"> - <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> - <importlibrary definition="olepro32.spec.def" /> Removed: trunk/reactos/dll/win32/shfolder/shfolder_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shfolder/shfolde… ============================================================================== --- trunk/reactos/dll/win32/shfolder/shfolder_ros.diff (original) +++ trunk/reactos/dll/win32/shfolder/shfolder_ros.diff (removed) @@ -1,9 +1,0 @@ -Index: shfolder.rbuild -=================================================================== ---- shfolder.rbuild (revision 23782) -+++ shfolder.rbuild (working copy) -@@ -1,3 +1,3 @@ -+<module name="shfolder" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> --<module name="shfolder" type="win32dll" baseaddress="${BASEADDRESS_SHFOLDER}" installbase="system32" installname="shfolder.dll" allowwarnings="true"> - <importlibrary definition="shfolder.spec.def" /> - <include base="shfolder">.</include>

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
71
Older →

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 July 2007