Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 20827: submit correct icon this time
by gedmurphy＠svn.reactos.org 13 Jan '06

13 Jan '06

submit correct icon this time Modified: trunk/reactos/subsys/system/explorer/res/minimize.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/minimize.ico (Binary files differ)

1 0

[ion] 20826: Acquire dispatcher lock if we're going to be expanding the owner table, so that we don't enter a race condition with the boost code in the wait for resource code on SMP systems
by ion＠svn.reactos.org 13 Jan '06

13 Jan '06

Acquire dispatcher lock if we're going to be expanding the owner table, so that we don't enter a race condition with the boost code in the wait for resource code on SMP systems Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:16:51 UTC (rev 20825) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:18:21 UTC (rev 20826) @@ -304,7 +304,7 @@ OldSize * sizeof(OWNER_ENTRY)); /* Acquire dispatcher lock to prevent thread boosting */ - //KeAcquireDispatcherDatabaseLockAtDpcLevel(); + KeAcquireDispatcherDatabaseLockAtDpcLevel(); /* Set the new table data */ Table->TableSize = NewSize; @@ -314,7 +314,7 @@ ExpVerifyResource(Resource); /* Release locks */ - //KeReleaseDispatcherDatabaseLockFromDpcLevel(); + KeReleaseDispatcherDatabaseLockFromDpcLevel(); ExReleaseResourceLock(&Resource->SpinLock, *OldIrql); /* Free the old table */

1 0

[ion] 20825: Fix typos
by ion＠svn.reactos.org 13 Jan '06

13 Jan '06

Fix typos Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:15:53 UTC (rev 20824) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:16:51 UTC (rev 20825) @@ -708,10 +708,10 @@ for (i = 1; i < Size; i++) { /* Move to next entry */ - Owner++ + Owner++; /* Get the thread */ - OwnerThread = (PKTHREAD)OwnerEntry->OwnerThread; + OwnerThread = (PKTHREAD)Owner->OwnerThread; /* Boost it */ if (OwnerThread) ExpBoostOwnerThread(Thread, OwnerThread);

1 0

[gedmurphy] 20824: - Split up the icon resources so each start menu entry has it's own icon
by gedmurphy＠svn.reactos.org 13 Jan '06

13 Jan '06

- Split up the icon resources so each start menu entry has it's own icon - Add many new icons to make ReactOS prettier Modified: trunk/reactos/subsys/system/explorer/explorer.cpp Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/globals.h Modified: trunk/reactos/subsys/system/explorer/res/action.ico Added: trunk/reactos/subsys/system/explorer/res/administration.ico Modified: trunk/reactos/subsys/system/explorer/res/config.ico Added: trunk/reactos/subsys/system/explorer/res/control-panel.ico Added: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico Modified: trunk/reactos/subsys/system/explorer/res/documents.ico Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico Modified: trunk/reactos/subsys/system/explorer/res/info.ico Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico Added: trunk/reactos/subsys/system/explorer/res/network-conns.ico Modified: trunk/reactos/subsys/system/explorer/res/network.ico Modified: trunk/reactos/subsys/system/explorer/res/printer.ico Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp _____ Modified: trunk/reactos/subsys/system/explorer/explorer.cpp --- trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-13 00:15:31 UTC (rev 20823) +++ trunk/reactos/subsys/system/explorer/explorer.cpp 2006-01-13 00:15:53 UTC (rev 20824) @@ -395,6 +395,10 @@ _icons[ICID_SHUTDOWN] = Icon(ICID_SHUTDOWN, IDI_SHUTDOWN); _icons[ICID_BOOKMARK] = Icon(ICID_BOOKMARK, IDI_DOT_TRANS); _icons[ICID_MINIMIZE] = Icon(ICID_MINIMIZE, IDI_MINIMIZE); + _icons[ICID_CONTROLPAN] = Icon(ICID_CONTROLPAN, IDI_CONTROLPAN); + _icons[ICID_DESKSETTING] = Icon(ICID_DESKSETTING, IDI_DESKSETTING); + _icons[ICID_NETCONNS] = Icon(ICID_NETCONNS, IDI_NETCONNS); + _icons[ICID_ADMINISTRATION] = Icon(ICID_ADMINISTRATION, IDI_ADMINISTRATION); } _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-13 00:15:31 UTC (rev 20823) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-13 00:15:53 UTC (rev 20824) @@ -166,6 +166,12 @@ IDI_NOTIFY_L ICON DISCARDABLE "res/notify_l.ico" IDI_NOTIFY_R ICON DISCARDABLE "res/notify_r.ico" IDI_MINIMIZE ICON DISCARDABLE "res/minimize.ico" +IDI_CONTROLPAN ICON DISCARDABLE "res/control-panel.ico" +IDI_DESKSETTING ICON DISCARDABLE "res/desktop-settings.ico" +IDI_NETCONNS ICON DISCARDABLE "res/network-conns.ico" +IDI_ADMINISTRATION ICON DISCARDABLE "res/administration.ico" + + #endif // Neutral resources //////////////////////////////////////////////////////////////////////// ///// _____ Modified: trunk/reactos/subsys/system/explorer/globals.h --- trunk/reactos/subsys/system/explorer/globals.h 2006-01-13 00:15:31 UTC (rev 20823) +++ trunk/reactos/subsys/system/explorer/globals.h 2006-01-13 00:15:53 UTC (rev 20824) @@ -83,6 +83,10 @@ ICID_SHUTDOWN, ICID_BOOKMARK, ICID_MINIMIZE, + ICID_CONTROLPAN, + ICID_DESKSETTING, + ICID_NETCONNS, + ICID_ADMINISTRATION, ICID_DYNAMIC }; _____ Modified: trunk/reactos/subsys/system/explorer/res/action.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/administration.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/administration.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/res/config.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/control-panel.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/control-panel.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/desktop-settings.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/res/documents.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/favorites.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/info.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logoff.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/explorer/res/network-conns.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/explorer/res/network-conns.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/explorer/res/network.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/printer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/shutdown.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2006-01-13 00:15:31 UTC (rev 20823) +++ trunk/reactos/subsys/system/explorer/resource.h 2006-01-13 00:15:53 UTC (rev 20824) @@ -118,6 +118,10 @@ #define IDB_MDI 170 #define IDB_SDI 171 #define IDI_MINIMIZE 172 +#define IDI_CONTROLPAN 173 +#define IDI_DESKSETTING 174 +#define IDI_NETCONNS 175 +#define IDI_ADMINISTRATION 176 #define ID_VIEW_NAME 401 #define ID_VIEW_ALL_ATTRIBUTES 402 #define ID_VIEW_SELECTED_ATTRIBUTES 403 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp --- trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-13 00:15:31 UTC (rev 20823) +++ trunk/reactos/subsys/system/explorer/taskbar/startmenu.cpp 2006-01-13 00:15:53 UTC (rev 20824) @@ -2148,23 +2148,23 @@ AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, false, IDC_CONNECTIONS); #else //TODO AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, true, IDC_PRINTERS_MENU); - AddButton(ResString(IDS_CONNECTIONS), ICID_NETWORK, true, IDC_CONNECTIONS); + AddButton(ResString(IDS_CONNECTIONS), ICID_NETCONNS, true, IDC_CONNECTIONS); #endif - AddButton(ResString(IDS_ADMIN), ICID_CONFIG, true, IDC_ADMIN); + AddButton(ResString(IDS_ADMIN), ICID_ADMINISTRATION, true, IDC_ADMIN); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) #endif AddButton(ResString(IDS_SETTINGS_MENU), ICID_CONFIG, true, IDC_SETTINGS_MENU); - AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_CONFIG, false, ID_DESKTOPBAR_SETTINGS); + AddButton(ResString(IDS_DESKTOPBAR_SETTINGS), ICID_DESKSETTING, false, ID_DESKTOPBAR_SETTINGS); AddButton(ResString(IDS_PRINTERS), ICID_PRINTER, false, IDC_PRINTERS); #ifndef __MINGW32__ // SHRestricted() missing in MinGW (as of 29.10.2003) if (!g_Globals._SHRestricted || !SHRestricted(REST_NOCONTROLPANEL)) #endif - AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONFIG, false, IDC_CONTROL_PANEL); + AddButton(ResString(IDS_CONTROL_PANEL), ICID_CONTROLPAN, false, IDC_CONTROL_PANEL); } void BrowseMenu::AddEntries()

1 0

[ion] 20823: Fix boost loop
by ion＠svn.reactos.org 13 Jan '06

13 Jan '06

Fix boost loop Modified: trunk/reactos/ntoskrnl/ex/resource.c _____ Modified: trunk/reactos/ntoskrnl/ex/resource.c --- trunk/reactos/ntoskrnl/ex/resource.c 2006-01-12 22:16:04 UTC (rev 20822) +++ trunk/reactos/ntoskrnl/ex/resource.c 2006-01-13 00:15:31 UTC (rev 20823) @@ -707,9 +707,13 @@ Size = Owner->TableSize; for (i = 1; i < Size; i++) { - /* Boot every thread in the table */ - OwnerThread = (PKTHREAD) - Resource->OwnerThreads[1].OwnerThread; + /* Move to next entry */ + Owner++ + + /* Get the thread */ + OwnerThread = (PKTHREAD)OwnerEntry->OwnerThread; + + /* Boost it */ if (OwnerThread) ExpBoostOwnerThread(Thread, OwnerThread); } }

1 0

[cwittich] 20822: added missing explorer-uk.rc (spotted by temarez@yandex.ru)
by cwittich＠svn.reactos.org 12 Jan '06

12 Jan '06

added missing explorer-uk.rc (spotted by temarez(a)yandex.ru) Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-12 21:28:07 UTC (rev 20821) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2006-01-12 22:16:04 UTC (rev 20822) @@ -207,6 +207,7 @@ #include "explorer-ru.rc" #include "explorer-jp.rc" #include "explorer-hu.rc" +#include "explorer-uk.rc" #ifndef __WINDRES__ #include "explorer-cn.rc"

1 0

[weiden] 20821: don't use a bitmap font to draw the text in the graphs. However, it currently doesn't use the shell font because the graph controls could use some serious work.
by weiden＠svn.reactos.org 12 Jan '06

12 Jan '06

don't use a bitmap font to draw the text in the graphs. However, it currently doesn't use the shell font because the graph controls could use some serious work. Deleted: trunk/reactos/subsys/system/taskmgr/font.c Deleted: trunk/reactos/subsys/system/taskmgr/font.h Modified: trunk/reactos/subsys/system/taskmgr/graph.c Modified: trunk/reactos/subsys/system/taskmgr/precomp.h Deleted: trunk/reactos/subsys/system/taskmgr/res/font.bmp Modified: trunk/reactos/subsys/system/taskmgr/resource.h Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml _____ Deleted: trunk/reactos/subsys/system/taskmgr/font.c --- trunk/reactos/subsys/system/taskmgr/font.c 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/font.c 2006-01-12 21:28:07 UTC (rev 20821) @@ -1,53 +0,0 @@ -/* - * ReactOS Task Manager - * - * font.cpp - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <precomp.h> - -void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y) -{ - HDC hFontDC; - HBITMAP hFontBitmap; - HBITMAP hOldBitmap; - int i; - - hFontDC = CreateCompatibleDC(hDC); - hFontBitmap = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_FONT)); - hOldBitmap = (HBITMAP)SelectObject(hFontDC, hFontBitmap); - - for (i = 0; i < (int)_tcslen(lpszText); i++) { - if ((lpszText[i] >= '0') && (lpszText[i] <= '9')) { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpszText[i] - '0') * 8, 0, SRCCOPY); - } - else if (lpszText[i] == 'K') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY); - } - else if (lpszText[i] == '%') - { - BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY); - } - } - SelectObject(hFontDC, hOldBitmap); - DeleteObject(hFontBitmap); - DeleteDC(hFontDC); -} - _____ Deleted: trunk/reactos/subsys/system/taskmgr/font.h --- trunk/reactos/subsys/system/taskmgr/font.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/font.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -1,28 +0,0 @@ -/* - * ReactOS Task Manager - * - * font.h - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef __FONT_H -#define __FONT_H - -void Font_DrawText(HDC hDC, LPCTSTR lpszText, int x, int y); - -#endif /* __FONT_H */ _____ Modified: trunk/reactos/subsys/system/taskmgr/graph.c --- trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/graph.c 2006-01-12 21:28:07 UTC (rev 20821) @@ -134,6 +134,8 @@ RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; + COLORREF crPrevForeground; TCHAR Text[260]; ULONG CpuUsage; ULONG CpuKernelUsage; @@ -163,28 +165,16 @@ if (CpuUsage < 0) CpuUsage = 0; if (CpuUsage > 100) CpuUsage = 100; - /* - * Check and see how many digits it will take - * so we get the indentation right every time. - */ - if (CpuUsage == 100) - { - _stprintf(Text, _T("%d%%"), (int)CpuUsage); - } - else if (CpuUsage < 10) - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } - else - { - _stprintf(Text, _T(" %d%%"), (int)CpuUsage); - } + _stprintf(Text, _T("%d%%"), (int)CpuUsage); /* * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); + rcText = rcClient; + InflateRect(&rcText, -2, -2); + crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SetTextColor(hDC, crPrevForeground); /* * Now we have to draw the graph @@ -310,6 +300,8 @@ RECT rcClient; RECT rcBarLeft; RECT rcBarRight; + RECT rcText; + COLORREF crPrevForeground; TCHAR Text[260]; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; @@ -342,9 +334,12 @@ _stprintf(Text, _T("%d K"), (int)CommitChargeTotal); /* * Draw the font text onto the graph - * The bottom 20 pixels are reserved for the text */ - Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (_tcslen(Text) * 8)) / 2, rcClient.bottom - 11 - 5); + rcText = rcClient; + InflateRect(&rcText, -2, -2); + crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SetTextColor(hDC, crPrevForeground); /* * Now we have to draw the graph _____ Modified: trunk/reactos/subsys/system/taskmgr/precomp.h --- trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/precomp.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -25,7 +25,6 @@ #include "dbgchnl.h" #include "debug.h" #include "endproc.h" -#include "font.h" #include "graph.h" #include "graphctl.h" #include "optnmenu.h" _____ Deleted: trunk/reactos/subsys/system/taskmgr/res/font.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/taskmgr/resource.h --- trunk/reactos/subsys/system/taskmgr/resource.h 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/resource.h 2006-01-12 21:28:07 UTC (rev 20821) @@ -28,7 +28,6 @@ #define IDR_PROCESS_PAGE_CONTEXT 144 #define IDB_TRAYMASK 150 #define IDB_TRAYICON 153 -#define IDB_FONT 154 #define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDC_DEBUG_CHANNELS_LIST 156 _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.rc --- trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.rc 2006-01-12 21:28:07 UTC (rev 20821) @@ -201,52 +201,6 @@ '00 00 00 00 00 00' } */ -/* BINRES font.bmp */ -IDB_FONT BITMAP DISCARDABLE res/font.bmp -/* { - '42 4D 86 02 00 00 00 00 00 00 76 00 00 00 28 00' - '00 00 60 00 00 00 0B 00 00 00 01 00 04 00 00 00' - '00 00 10 02 00 00 74 12 00 00 74 12 00 00 00 00' - '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80' - '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80' - '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF' - '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF' - '00 00 FF FF FF 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 00 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - '0A 00 00 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 0A' - '00 00 0A 00 AA 00 A0 00 00 A0 00 00 0A 00 A0 00' - '00 00 00 00 00 A0 00 00 00 A0 00 00 00 A0 A0 00' - '00 A0 00 00 00 A0 A0 00 00 A0 00 00 00 A0 A0 A0' - '00 00 00 A0 00 00 A0 00 00 A0 00 00 0A 00 AA AA' - 'AA A0 0A AA AA A0 AA AA AA A0 AA AA AA A0 AA AA' - 'AA A0 00 00 00 A0 AA AA AA A0 AA AA AA A0 AA 00' - '00 00 00 0A 00 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 A0' - '00 00 00 00 A0 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 0A' - '00 00 0A A0 0A 00 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - 'A0 00 A0 0A 00 A0 A0 00 00 A0 00 00 0A 00 00 00' - '00 A0 00 00 00 A0 A0 00 00 A0 A0 00 00 00 A0 00' - '00 00 00 00 00 A0 A0 00 00 A0 A0 00 00 A0 A0 00' - '0A 00 0A A0 00 00 AA AA AA A0 00 00 0A 00 AA AA' - 'AA A0 AA AA AA A0 A0 00 00 A0 AA AA AA A0 AA AA' - 'AA A0 AA AA AA A0 AA AA AA A0 AA AA AA A0 A0 00' - '00 A0 00 00 00 00' -} */ - #include "Cz.rc" #include "En.rc" #include "De.rc" _____ Modified: trunk/reactos/subsys/system/taskmgr/taskmgr.xml --- trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-12 21:21:19 UTC (rev 20820) +++ trunk/reactos/subsys/system/taskmgr/taskmgr.xml 2006-01-12 21:28:07 UTC (rev 20821) @@ -17,7 +17,6 @@ <file>dbgchnl.c</file> <file>debug.c</file> <file>endproc.c</file> - <file>font.c</file> <file>graph.c</file> <file>optnmenu.c</file> <file>perfdata.c</file>

1 0

[ion] 20820: Set KernelApcPending == TRUE in KiCheckForKernelApcDelivery if we are at APC_LEVEL. This should hopefully fix some of those silent bugs. Thanks to Ignatich for poking me about it.
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

Set KernelApcPending == TRUE in KiCheckForKernelApcDelivery if we are at APC_LEVEL. This should hopefully fix some of those silent bugs. Thanks to Ignatich for poking me about it. Modified: trunk/reactos/ntoskrnl/ke/apc.c _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2006-01-12 21:16:42 UTC (rev 20819) +++ trunk/reactos/ntoskrnl/ke/apc.c 2006-01-12 21:21:19 UTC (rev 20820) @@ -57,6 +57,7 @@ * be delivered now, but after the IRQL is lowered to passive * level again. */ + KeGetCurrentThread()->ApcState.KernelApcPending = TRUE; HalRequestSoftwareInterrupt(APC_LEVEL); } }

1 0

[ion] 20819: - Unfsck NtGdiExtCreatePen (thanks Christopher).
by ion＠svn.reactos.org 12 Jan '06

12 Jan '06

- Unfsck NtGdiExtCreatePen (thanks Christopher). Modified: trunk/reactos/lib/gdi32/gdi32.def Modified: trunk/reactos/lib/gdi32/objects/brush.c Modified: trunk/reactos/subsys/win32k/objects/pen.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/lib/gdi32/gdi32.def --- trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/gdi32.def 2006-01-12 21:16:42 UTC (rev 20819) @@ -223,7 +223,7 @@ EudcLoadLinkW@16 EudcUnloadLinkW@8 ExcludeClipRect@20=NtGdiExcludeClipRect@20 -ExtCreatePen@20=NtGdiExtCreatePen@20 +ExtCreatePen@20 ExtCreateRegion@12=NtGdiExtCreateRegion@12 ExtEscape@24=NtGdiExtEscape@24 ExtFloodFill@20=NtGdiExtFloodFill@20 _____ Modified: trunk/reactos/lib/gdi32/objects/brush.c --- trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/lib/gdi32/objects/brush.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -20,6 +20,31 @@ /* * @implemented */ +HPEN +APIENTRY +ExtCreatePen(DWORD dwPenStyle, + DWORD dwWidth, + CONST LOGBRUSH *lplb, + DWORD dwStyleCount, + CONST DWORD *lpStyle) +{ + /* Call NTGDI (hack... like most of gdi32..sigh) */ + return NtGdiExtCreatePen(dwPenStyle, + dwWidth, + lplb->lbStyle, + lplb->lbColor, + lplb->lbHatch, + 0, + dwStyleCount, + (PULONG)lpStyle, + 0, + FALSE, + NULL); +} + +/* + * @implemented + */ HBRUSH STDCALL CreateDIBPatternBrush( HGLOBAL hglbDIBPacked, _____ Modified: trunk/reactos/subsys/win32k/objects/pen.c --- trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/subsys/win32k/objects/pen.c 2006-01-12 21:16:42 UTC (rev 20819) @@ -137,9 +137,6 @@ IN OPTIONAL HBRUSH hbrush) { LOGPEN LogPen; - /* NOTE: This is HACK! */ - DPRINT1("FIXME: FIX CALLERS FIRST!\n"); - KEBUGCHECK(0); if (PenStyle & PS_USERSTYLE) PenStyle = (PenStyle & ~PS_STYLE_MASK) | PS_SOLID; _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:15:38 UTC (rev 20818) +++ trunk/reactos/tools/nci/w32ksvc.db 2006-01-12 21:16:42 UTC (rev 20819) @@ -70,7 +70,7 @@ NtGdiEqualRgn 2 NtGdiEscape 5 NtGdiExcludeClipRect 5 -NtGdiExtCreatePen 5 +NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5

1 0

[cwittich] 20818: added sk kbd layout to registry patch by Malin <malin23@atlas.sk> (fixed bug 1251)
by cwittich＠svn.reactos.org 12 Jan '06

12 Jan '06

added sk kbd layout to registry patch by Malin <malin23(a)atlas.sk> (fixed bug 1251) Modified: trunk/reactos/bootdata/hivesys.inf Modified: trunk/reactos/bootdata/packages/reactos.dff Modified: trunk/reactos/bootdata/txtsetup.sif _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/hivesys.inf 2006-01-12 21:15:38 UTC (rev 20818) @@ -64,6 +64,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000813","Layout Text",0x00000000,"BE (point)" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout File",0x00000000,"kbdhe.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000408","Layout Text",0x00000000,"Greek" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layou t File",0x00000000,"kbdsk.dll" +HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\0000041b","Layou t Text",0x00000000,"Slovak" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1- 08002BE10318}",,0x00000000,"Network Adapters" _____ Modified: trunk/reactos/bootdata/packages/reactos.dff --- trunk/reactos/bootdata/packages/reactos.dff 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/packages/reactos.dff 2006-01-12 21:15:38 UTC (rev 20818) @@ -113,6 +113,7 @@ lib\keyboard\kbdru\kbdru.dll 1 lib\keyboard\kbdse\kbdse.dll 1 lib\keyboard\kbdsg\kbdsg.dll 1 +lib\keyboard\kbdsk\kbdsk.dll 1 lib\keyboard\kbduk\kbduk.dll 1 lib\keyboard\kbdur\kbdur.dll 1 lib\keyboard\kbdus\kbdus.dll 1 _____ Modified: trunk/reactos/bootdata/txtsetup.sif --- trunk/reactos/bootdata/txtsetup.sif 2006-01-12 20:54:35 UTC (rev 20817) +++ trunk/reactos/bootdata/txtsetup.sif 2006-01-12 21:15:38 UTC (rev 20818) @@ -100,6 +100,7 @@ 00000408 = "Greek" 00000422 = "Ukrainian" 00010408 = "Greek 220" +0000041B = "Slovak (QWERTZ)" [Files.KeyboardLayout] 00000406 = kbdda.dll @@ -117,6 +118,7 @@ 00000813 = kbdbe.dll 00000408 = kbdhe.dll 00010408 = kbdhe.dll +0000041B = kbdsk.dll [HiveInfs.Install] AddReg=hivecls.inf,AddReg

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