Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[mbosma] 25812: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * CP_ACP changed into CP_UTF8 * removed unnecessary code in xml.c * fix memory leak * add more programs
by mbosma＠svn.reactos.org 16 Feb '07

16 Feb '07

Author: mbosma Date: Fri Feb 16 14:07:28 2007 New Revision: 25812 URL: http://svn.reactos.org/svn/reactos?rev=25812&view=rev Log: Lester Kortenhoeven (lester(at)kortenhoeven(dot)de): * CP_ACP changed into CP_UTF8 * removed unnecessary code in xml.c * fix memory leak * add more programs Modified: trunk/reactos/base/applications/downloader/downloader.xml trunk/reactos/base/applications/downloader/main.c trunk/reactos/base/applications/downloader/xml.c Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml (original) +++ trunk/reactos/base/applications/downloader/downloader.xml Fri Feb 16 14:07:28 2007 @@ -98,6 +98,18 @@ <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-0.3.4.exe</location> </application> + <application name="MinGW"> + <regname>MinGW 5.1.3</regname> + <version>5.1.3</version> + <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> + <location>http://puzzle.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> + </application> + <application name="FreeBASIC"> + <regname>FreeBASIC 0.16b</regname> + <version>0.16b</version> + <description>Open Source Basic Compiler. The Basic syntax is compatible to QBASIC.</description> + <location>http://switch.dl.sourceforge.net/sourceforge/fbc/FreeBASIC-v0.16b-win32.exe</location> + </application> </category> <category name="Games & Fun" icon="6"> <application name="ScummVM"> @@ -109,6 +121,12 @@ <application name="Tile World"> <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> + </application> + <application name="OpenTTD"> + <regname>OpenTTD 0.5.0</regname> + <version>0.5.0-RC5</version> + <description>Open-source-clone of the "Transport Tycoon Deluxe" game-engine. You need a copy of Transport Tycoon.</description> + <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.5.0-RC5-win32.e…</location> </application> <application name="LBreakout2">LBreakout2 2.4.1 <regname>LBreakout2 2.4.1</regname> @@ -137,7 +155,7 @@ <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z442.exe</location> </application> <application name="uTorrent"> - <regname>µTorrent</regname>  + <regname>µTorrent</regname> <version>1.6</version> <description>Small and fast Torrent Client.</description> <location>http://download.utorrent.com/1.6/uTorrent-1.6-install.exe</location> @@ -151,8 +169,14 @@ </category> <category name="Others" icon="8"> <application name="Simple Direct Media Layer (SDL) Runtime"> + <version>1.2.11</version> <description>Needed for many Open Source Games to run. You need 7-Zip or a similar Utility to extract it.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/libsdl/SDL-1.2.11-win32.zip</location> </application> + <application name="DOSBox"> + <version>0.65</version> + <description>DOSBox is a DOS emulator.</description> + <location>http://puzzle.dl.sourceforge.net/sourceforge/dosbox/DOSBox0.65-win32-instal…</location> + </application> </category> </tree> Modified: trunk/reactos/base/applications/downloader/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/main.c (original) +++ trunk/reactos/base/applications/downloader/main.c Fri Feb 16 14:07:28 2007 @@ -19,6 +19,7 @@ HBITMAP hLogo, hUnderline; WCHAR* DescriptionHeadline = L""; WCHAR* DescriptionText = L""; +WCHAR ApplicationText[700]; struct Category Root; struct Application* SelectedApplication; @@ -27,6 +28,7 @@ BOOL ProcessXML (const char* filename, struct Category* Root); VOID FreeTree (struct Category* Node); WCHAR Strings [STRING_COUNT][MAX_STRING_LENGHT]; + BOOL getUninstaller(WCHAR* RegName, WCHAR* Uninstaller) { @@ -131,9 +133,6 @@ if(StrCmpW(CurrentApplication->RegName,L"")) { if(getUninstaller(CurrentApplication->RegName, Uninstaller)) Insert.item.iImage = 9; - } else { - if(getUninstaller(CurrentApplication->Name, Uninstaller)) - Insert.item.iImage = 9; } SendMessage(hwnd, TVM_INSERTITEM, 0, (LPARAM)&Insert); CurrentApplication = CurrentApplication->Next; @@ -333,9 +332,6 @@ if(StrCmpW(SelectedApplication->RegName, L"")) { if(getUninstaller(SelectedApplication->RegName, Uninstaller)) startUninstaller(Uninstaller); - } else { - if(getUninstaller(SelectedApplication->Name, Uninstaller)) - startUninstaller(Uninstaller); } } } @@ -367,33 +363,29 @@ SelectedApplication = (struct Application*) ((LPNMTREEVIEW)lParam)->itemNew.lParam; if(SelectedApplication) { - DescriptionText = calloc(700,sizeof(WCHAR)); + ApplicationText[0]=L'\0'; if(StrCmpW(SelectedApplication->Version, L"")) { - StrCatW(DescriptionText, Strings[IDS_VERSION]); - StrCatW(DescriptionText, SelectedApplication->Version); - StrCatW(DescriptionText, L"\n"); + StrCatW(ApplicationText, Strings[IDS_VERSION]); + StrCatW(ApplicationText, SelectedApplication->Version); + StrCatW(ApplicationText, L"\n"); } if(StrCmpW(SelectedApplication->Licence, L"")) { - StrCatW(DescriptionText, Strings[IDS_LICENCE]); - StrCatW(DescriptionText, SelectedApplication->Licence); - StrCatW(DescriptionText, L"\n"); + StrCatW(ApplicationText, Strings[IDS_LICENCE]); + StrCatW(ApplicationText, SelectedApplication->Licence); + StrCatW(ApplicationText, L"\n"); } if(StrCmpW(SelectedApplication->Maintainer, L"")) { - StrCatW(DescriptionText, Strings[IDS_MAINTAINER]); - StrCatW(DescriptionText, SelectedApplication->Maintainer); - StrCatW(DescriptionText, L"\n"); + StrCatW(ApplicationText, Strings[IDS_MAINTAINER]); + StrCatW(ApplicationText, SelectedApplication->Maintainer); + StrCatW(ApplicationText, L"\n"); } if(StrCmpW(SelectedApplication->Licence, L"") || StrCmpW(SelectedApplication->Version, L"") || StrCmpW(SelectedApplication->Maintainer, L"")) - StrCatW(DescriptionText, L"\n"); - StrCatW(DescriptionText, SelectedApplication->Description); - ShowMessage(SelectedApplication->Name, DescriptionText); + StrCatW(ApplicationText, L"\n"); + StrCatW(ApplicationText, SelectedApplication->Description); + ShowMessage(SelectedApplication->Name, ApplicationText); WCHAR Uninstaller[200]; if(StrCmpW(SelectedApplication->RegName, L"")) { if(getUninstaller(SelectedApplication->RegName, Uninstaller)) { - bShowUninstaller = TRUE; - } - } else { - if(getUninstaller(SelectedApplication->Name, Uninstaller)) { bShowUninstaller = TRUE; } } Modified: trunk/reactos/base/applications/downloader/xml.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/xml.c (original) +++ trunk/reactos/base/applications/downloader/xml.c Fri Feb 16 14:07:28 2007 @@ -9,6 +9,7 @@ #include <string.h> #include <stdio.h> #include <windows.h> +#include <shlwapi.h> #include "structures.h" #include "resources.h" @@ -54,7 +55,7 @@ { if(!strcmp(arg[i], "name")) { - MultiByteToWideChar(CP_ACP, 0, arg[i+1], -1, Current->Name, 0x100); + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, Current->Name, 0x100); } if(!strcmp(arg[i], "icon")) { @@ -81,20 +82,11 @@ CurrentApplication = Current->Apps; } - int currentlengt = lstrlenW(CurrentApplication->Maintainer); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->RegName); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->Version); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Version[currentlengt], 0x100-currentlengt); - currentlengt = lstrlenW(CurrentApplication->Licence); - MultiByteToWideChar(CP_ACP, 0, 0, 0, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); - for (i=0; arg[i]; i+=2) { if(!strcmp(arg[i], "name")) { - MultiByteToWideChar(CP_ACP, 0, arg[i+1], -1, CurrentApplication->Name, 0x100); + MultiByteToWideChar(CP_UTF8, 0, arg[i+1], -1, CurrentApplication->Name, 0x100); } } } @@ -115,32 +107,32 @@ if(!strcmp(CurrentTag, "maintainer")) { int currentlengt = lstrlenW(CurrentApplication->Maintainer); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Maintainer[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "regname")) { int currentlengt = lstrlenW(CurrentApplication->RegName); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->RegName[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "description")) { int currentlengt = lstrlenW(CurrentApplication->Description); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Description[currentlengt], 0x400-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Description[currentlengt], 0x400-currentlengt); } else if(!strcmp(CurrentTag, "location")) { int currentlengt = lstrlenW(CurrentApplication->Location); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Location[currentlengt], 0x100-currentlengt); } else if(!strcmp(CurrentTag, "version")) { int currentlengt = lstrlenW(CurrentApplication->Version); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Version[currentlengt], 0x400-currentlengt); } else if(!strcmp(CurrentTag, "licence")) { int currentlengt = lstrlenW(CurrentApplication->Licence); - MultiByteToWideChar(CP_ACP, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); + MultiByteToWideChar(CP_UTF8, 0, data, len, &CurrentApplication->Licence[currentlengt], 0x100-currentlengt); } }

1 0

[fireball] 25811: Merge 25810
by fireball＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: fireball Date: Fri Feb 16 01:00:37 2007 New Revision: 25811 URL: http://svn.reactos.org/svn/reactos?rev=25811&view=rev Log: Merge 25810 Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf Fri Feb 16 01:00:37 2007 @@ -27,7 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] -HKR,,Characteristics,0x00010001,0x0000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Fri Feb 16 01:00:37 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 02/15/2007,1.01.0.0 +DriverVer = 02/15/2007,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,7 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x0000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455" Modified: branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netrtpnt.inf Fri Feb 16 01:00:37 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 11/14/2005,1.00 +DriverVer = 02/15/2007,1.01 [DestinationDirs] DefaultDestDir = 12 @@ -27,7 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BusType,0x00000000,"5" HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B"

1 0

[hpoussin] 25810: Set correct value for Characteristics (tested by Colin_Finck on IRC)
by hpoussin＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: hpoussin Date: Thu Feb 15 23:39:33 2007 New Revision: 25810 URL: http://svn.reactos.org/svn/reactos?rev=25810&view=rev Log: Set correct value for Characteristics (tested by Colin_Finck on IRC) Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf trunk/reactos/media/inf/netrtpnt.inf Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Thu Feb 15 23:39:33 2007 @@ -27,7 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] -HKR,,Characteristics,0x00010001,0x0000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Thu Feb 15 23:39:33 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 02/15/2007,1.01.0.0 +DriverVer = 02/15/2007,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,7 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x0000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455" Modified: trunk/reactos/media/inf/netrtpnt.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netrtpnt.inf?rev… ============================================================================== --- trunk/reactos/media/inf/netrtpnt.inf (original) +++ trunk/reactos/media/inf/netrtpnt.inf Thu Feb 15 23:39:33 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 11/14/2005,1.00 +DriverVer = 02/15/2007,1.01 [DestinationDirs] DefaultDestDir = 12 @@ -27,7 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] -HKR,,Characteristics,0x00010001,0x00000000 +HKR,,Characteristics,0x00010001,0x00000004 ; NCF_PHYSICAL HKR,,BusType,0x00000000,"5" HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B"

1 0

[ekohl] 25809: - Declare local functions static and get rid of prototypes by moving functions around. - Clean up the code. No changes to the functionality.
by ekohl＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: ekohl Date: Thu Feb 15 23:24:38 2007 New Revision: 25809 URL: http://svn.reactos.org/svn/reactos?rev=25809&view=rev Log: - Declare local functions static and get rid of prototypes by moving functions around. - Clean up the code. No changes to the functionality. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/appearance.h Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Thu Feb 15 23:24:38 2007 @@ -12,193 +12,58 @@ #include "desk.h" #include "appearance.h" -INT_PTR CALLBACK -AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - int iListIndex; - GLOBALS* g; - - switch(uMsg) - { - case WM_INITDIALOG: - { - g = (GLOBALS*)lParam; - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); - AdvAppearanceDlg_Init(hwndDlg); - break; - } - case WM_DESTROY: - { - AdvAppearanceDlg_CleanUp(hwndDlg); - break; - } - case WM_COMMAND: - { - g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(LOWORD(wParam)) - { - case IDOK: - { - SaveCurrentValues(hwndDlg); - EndDialog(hwndDlg, 0); - break; - } - case IDCANCEL: - { - g->ThemeAdv = g->Theme; - EndDialog(hwndDlg, 0); - break; - } - case IDC_ADVAPPEARANCE_ELEMENT: - { - if(HIWORD(wParam) == CBN_SELCHANGE) - { - SaveCurrentValues(hwndDlg); - iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); - g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); - UpdateControls(hwndDlg, g->CurrentElement); - break; - } - break; - } - case IDC_ADVAPPEARANCE_COLOR1_B: - { - GetColor(hwndDlg, g->CurrentElement, 0); - break; - } - case IDC_ADVAPPEARANCE_COLOR2_B: - { - GetColor(hwndDlg, g->CurrentElement, 1); - break; - } - case IDC_ADVAPPEARANCE_FONTCOLOR_B: - { - GetColor(hwndDlg, g->CurrentElement, 2); - break; - } - default: - { - return FALSE; - } - } - break; - } - default: - { - return FALSE; - } - } - return TRUE; -} - - -/* Initialize the advanced appearance dialog */ -void -AdvAppearanceDlg_Init(HWND hwndDlg) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - int i, iElement, iListIndex, iDeskIndex = 0; - TCHAR tstrText[80]; - LOGFONT lfFont; - LOGFONT lfButtonFont; - HFONT hMyFont; - HDC hScreenDC; - - /* Copy the current theme values */ - g->ThemeAdv = g->Theme; - - /* Add the elements to the combo */ - for(iElement = 0; iElement < NUM_ELEMENTS; iElement++) - { - LoadString(hApplet, IDS_ELEMENT_1 + iElement, (LPTSTR)&tstrText, 79); - iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_ADDSTRING, 0, (LPARAM)&tstrText); - SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)iElement); - } - - /* Get the list index of the desktop element */ - for(iListIndex = 0; iListIndex < NUM_ELEMENTS; iListIndex++) - { - iElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); - if (iElement == 0) - { - iDeskIndex = iListIndex; - break; - } - } - SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETCURSEL, iDeskIndex, 0); - - /* Set colors for the color buttons */ - g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; - g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; - g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; - g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; - - /* Create font for bold button */ - lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; - lfButtonFont.lfWeight = FW_BOLD; - lfButtonFont.lfItalic = FALSE; - hMyFont = CreateFontIndirect(&lfButtonFont); - if (hMyFont) - { - if (g->hBoldFont) - { - DeleteObject(g->hBoldFont); - } - g->hBoldFont = hMyFont; - } - - /* Create font for italic button */ - lfButtonFont.lfWeight = FW_REGULAR; - lfButtonFont.lfItalic = TRUE; - hMyFont = CreateFontIndirect(&lfButtonFont); - if (hMyFont) - { - if (g->hItalicFont) - { - DeleteObject(g->hItalicFont); - } - g->hItalicFont = hMyFont; - } - - /* Set the fonts for the font style buttons */ - SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, WM_SETFONT, (WPARAM)g->hBoldFont, (LPARAM)TRUE); - SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, WM_SETFONT, (WPARAM)g->hItalicFont, (LPARAM)TRUE); - - /* Draw Bitmaps for the colorbuttons */ - InitColorButtons(hwndDlg); - - /* Make the UpDown control count correctly */ - SendMessage (GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), UDM_SETRANGE, 0L, MAKELONG (200, 1)); - - /* Fill font selection combo */ - lfFont.lfCharSet = DEFAULT_CHARSET; - lfFont.lfFaceName[0] = (TCHAR)0; - lfFont.lfPitchAndFamily = 0; - hScreenDC = GetDC(0); - EnumFontFamiliesEx(hScreenDC, &lfFont, (FONTENUMPROC)EnumFontFamExProc, (LPARAM)GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONT_C), 0); - ReleaseDC(0, hScreenDC); - - /* Fill font size combo */ - TCHAR Size[4]; - for (i = 6; i <= 24; i++) - { - SetDlgItemInt(hwndDlg, IDC_CONVERT, i, FALSE); - GetDlgItemText(hwndDlg, IDC_CONVERT, (LPTSTR)&Size, 3); - SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, CB_ADDSTRING, 0, (LPARAM)&Size); - } - - /* Update the controls */ - iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); - g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); - UpdateControls(hwndDlg, g->CurrentElement); - return; -} + + +/* Draw the current color on the color picker buttons */ +static VOID +UpdateButtonColor(HWND hwndDlg, GLOBALS* g, INT ID, INT nButton, INT nColor) +{ + HDC hdcColorButton, hdcCompat; + RECT rect; + HBRUSH hbrush; + HWND hwndColorButton; + COLORREF crColor = g->ThemeAdv.crColor[nColor]; + HGDIOBJ hgdiTmp; + + if (nColor != -1) + { + /* Create a DC to draw on */ + hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); + hdcColorButton = GetDC(hwndColorButton); + hdcCompat = CreateCompatibleDC(hdcColorButton); + ReleaseDC(hwndColorButton, hdcColorButton); + + /* Select the button image to it */ + hgdiTmp = SelectObject(hdcCompat, g->hbmpColor[nButton]); + + /* Create a brush and draw the rectangle */ + rect.left = 2; + rect.top = 2; + rect.right = 22; + rect.bottom = 13; + hbrush = CreateSolidBrush(crColor); + FillRect(hdcCompat, &rect, hbrush); + DeleteObject(hbrush); + + /* hdcCompat is not needed anymore */ + SelectObject(hdcCompat,hgdiTmp); + DeleteDC(hdcCompat); + + SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[nButton]); + EnableWindow(GetDlgItem(hwndDlg, ID), TRUE); + } + else + { + SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)NULL); + EnableWindow(GetDlgItem(hwndDlg, ID), FALSE); + } +} + /* Create the basic bitmaps for the color picker buttons */ -void -InitColorButtons(HWND hwndDlg) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); +static VOID +InitColorButtons(HWND hwndDlg, GLOBALS* g) +{ INT i; HDC hdcColorButton, hdcCompat; RECT rect; @@ -209,7 +74,7 @@ const POINT Points[3] = {{29,6},{33,6},{31,8}}; - hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); + hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); hdcColorButton = GetDC(hwndColorButton); for (i = 0; i <= 2; i++) { @@ -223,13 +88,19 @@ hgdiTemp = SelectObject(hdcCompat, g->hbmpColor[i]); /* Draw the buttons background color */ - rect.left = 0; rect.top = 0; rect.right = 36; rect.bottom = 15; + rect.left = 0; + rect.top = 0; + rect.right = 36; + rect.bottom = 15; hbrush = CreateSolidBrush(g->crCOLOR_BTNFACE); FillRect(hdcCompat, &rect, hbrush); DeleteObject(hbrush); /* Draw the rectangle */ - rect.left = 1; rect.top = 1; rect.right = 23; rect.bottom = 14; + rect.left = 1; + rect.top = 1; + rect.right = 23; + rect.bottom = 14; hbrush = CreateSolidBrush(g->crCOLOR_BTNTEXT); FillRect(hdcCompat, &rect, hbrush); DeleteObject(hbrush); @@ -260,52 +131,48 @@ /* FIXME: HACK, see Points definition */ Polygon(hdcCompat, Points, 3); - /* Cleanup */ + /* Cleanup */ SelectObject(hdcCompat,hgdiTemp); DeleteDC(hdcCompat); DeleteObject(hPen); DeleteObject(hbrush); } + ReleaseDC(hwndColorButton, hdcColorButton); /* Set the images of the buttons */ SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[0]); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[1]); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[2]); - return; -} - -void -AdvAppearanceDlg_CleanUp(HWND hwndDlg) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - DeleteObject(g->hBoldFont); - DeleteObject(g->hItalicFont); - return; -} +} + /* This is the callback function to add the installed fonts to the font combo */ -int CALLBACK -EnumFontFamExProc( - ENUMLOGFONTEX *lpelfe, - NEWTEXTMETRICEX *lpntme, - DWORD dwFontType, - LPARAM lParam) +static int CALLBACK +EnumFontFamExProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX *lpntme, DWORD dwFontType, LPARAM lParam) { /* Don't enumerate more than 100 fonts */ - if (SendMessage((HWND)lParam, CB_GETCOUNT, 0, 0) >= 100) return(0); + if (SendMessage((HWND)lParam, CB_GETCOUNT, 0, 0) >= 100) + return 0; /* Only add the string once */ - if (SendMessage((HWND)lParam, CB_FINDSTRINGEXACT, -1, (WPARAM)&(lpelfe->elfLogFont.lfFaceName)) != CB_ERR) return(2); + if (SendMessage((HWND)lParam, CB_FINDSTRINGEXACT, -1, (WPARAM)&(lpelfe->elfLogFont.lfFaceName)) != CB_ERR) + return 2; + SendMessage((HWND)lParam, CB_ADDSTRING, 0, (WPARAM)&(lpelfe->elfLogFont.lfFaceName)); - return(1); -} + + return 1; +} + /* Update all the controls with the current values for the selected screen element */ -void -UpdateControls(HWND hwndDlg, int iElement) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); +static VOID +UpdateControls(HWND hwndDlg, GLOBALS *g) +{ + INT iElement; + HDC hdcDlg; + + iElement = g->CurrentElement; /* First enable / disable the controls */ EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1)); @@ -322,16 +189,16 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC), (g_Assignment[iElement].Font != -1)); /* Update the colors of the color buttons */ - UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B, 0, g_Assignment[iElement].Color1); - UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); - UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); + UpdateButtonColor(hwndDlg, g, IDC_ADVAPPEARANCE_COLOR1_B, 0, g_Assignment[iElement].Color1); + UpdateButtonColor(hwndDlg, g, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); + UpdateButtonColor(hwndDlg, g, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); if (g_Assignment[iElement].Size != -1) SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); else SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, TEXT("")); - HDC hdcDlg = GetDC(hwndDlg); + hdcDlg = GetDC(hwndDlg); if (g_Assignment[iElement].Font != -1) { LOGFONT lfFont = g->ThemeAdv.lfFont[g_Assignment[iElement].Font]; @@ -341,26 +208,30 @@ SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, CB_FINDSTRINGEXACT, -1, (WPARAM)lfFont.lfFaceName); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_SETCHECK, g->ThemeAdv.lfFont[g_Assignment[iElement].Font].lfWeight == FW_BOLD?1:0, 0); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_SETCHECK, g->ThemeAdv.lfFont[g_Assignment[iElement].Font].lfItalic, 0); - } else { + } + else + { SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, NULL); SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, NULL); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, BM_SETCHECK, 0, 0); SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_SETCHECK, 0, 0); } + ReleaseDC(hwndDlg, hdcDlg); - return; -} - -void -SaveCurrentValues(HWND hwndDlg) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); +} + + +static VOID +SaveCurrentValues(HWND hwndDlg, GLOBALS *g) +{ BOOL bTranslated; HDC hdcDlg = GetDC(hwndDlg); + if (g_Assignment[g->CurrentElement].Size != -1) { g->ThemeAdv.Size[g_Assignment[g->CurrentElement].Size] = GetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, &bTranslated, FALSE); } + if (g_Assignment[g->CurrentElement].Font != -1) { g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfHeight = -MulDiv(GetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, &bTranslated, FALSE), GetDeviceCaps(hdcDlg, LOGPIXELSY), 72); @@ -368,78 +239,40 @@ g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfItalic = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, BM_GETCHECK, 0, 0); GetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_FONT_C, g->ThemeAdv.lfFont[g_Assignment[g->CurrentElement].Font].lfFaceName, LF_FACESIZE * sizeof(TCHAR)); } + ReleaseDC(hwndDlg, hdcDlg); - return; -} - -/* Draw the current color on the color picker buttons */ -void -UpdateButtonColor(HWND hwndDlg, int ID, int nButton, int nColor) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - HDC hdcColorButton, hdcCompat; - RECT rect; - HBRUSH hbrush; - HWND hwndColorButton; - COLORREF crColor = g->ThemeAdv.crColor[nColor]; - - if(nColor != -1) - { - /* Create a DC to draw on */ - hwndColorButton = GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_B); - hdcColorButton = GetDC(hwndColorButton); - hdcCompat = CreateCompatibleDC(hdcColorButton); - ReleaseDC(hwndColorButton, hdcColorButton); - - /* Select the button image to it */ - HGDIOBJ hgdiTmp = SelectObject(hdcCompat, g->hbmpColor[nButton]); - - /* Create a brush and draw the rectangle */ - rect.left = 2; rect.top = 2; rect.right = 22; rect.bottom = 13; - hbrush = CreateSolidBrush(crColor); - FillRect(hdcCompat, &rect, hbrush); - DeleteObject(hbrush); - - /* hdcCompat is not needed anymore */ - SelectObject(hdcCompat,hgdiTmp); - DeleteDC(hdcCompat); - - SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)g->hbmpColor[nButton]); - EnableWindow(GetDlgItem(hwndDlg, ID), TRUE); - } else { - SendDlgItemMessage(hwndDlg, ID, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)NULL); - EnableWindow(GetDlgItem(hwndDlg, ID), FALSE); - } - return; -} +} + /* Select a color using a color picker */ -BOOL -GetColor(HWND hwndDlg, int iElement, int nButton) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); +static BOOL +GetColor(HWND hwndDlg, GLOBALS* g, INT nButton) +{ CHOOSECOLOR cc; COLORREF crCustom[16] = { 0 }; COLORREF crColor; - int ID = 0; - int ColorIndex = 0; + INT ID = 0; + INT ColorIndex = 0; /* Get the color index from the element index and button number */ - if (nButton == 0) - { - ColorIndex = g_Assignment[iElement].Color1; - ID = IDC_ADVAPPEARANCE_COLOR1_B; - } - if (nButton == 1) - { - ColorIndex = g_Assignment[iElement].Color2; - ID = IDC_ADVAPPEARANCE_COLOR2_B; - } - if (nButton == 2) - { - ColorIndex = g_Assignment[iElement].FontColor; - ID = IDC_ADVAPPEARANCE_FONTCOLOR_B; - } + switch (nButton) + { + case 0: + ColorIndex = g_Assignment[g->CurrentElement].Color1; + ID = IDC_ADVAPPEARANCE_COLOR1_B; + break; + + case 1: + ColorIndex = g_Assignment[g->CurrentElement].Color2; + ID = IDC_ADVAPPEARANCE_COLOR2_B; + break; + + case 2: + ColorIndex = g_Assignment[g->CurrentElement].FontColor; + ID = IDC_ADVAPPEARANCE_FONTCOLOR_B; + break; + } + crColor = g->ThemeAdv.crColor[ColorIndex]; /* Prepare cc structure */ @@ -459,9 +292,186 @@ g->ThemeAdv.crColor[ColorIndex] = cc.rgbResult; if (crColor != cc.rgbResult) { - UpdateButtonColor(hwndDlg, ID, nButton, ColorIndex); - return(TRUE); + UpdateButtonColor(hwndDlg, g, ID, nButton, ColorIndex); + return TRUE; } } - return(FALSE); -} + + return FALSE; +} + + +/* Initialize the advanced appearance dialog */ +static VOID +AdvAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) +{ + INT i, iElement, iListIndex, iDeskIndex = 0; + TCHAR tstrText[80]; + LOGFONT lfFont; + LOGFONT lfButtonFont; + HFONT hMyFont; + HDC hScreenDC; + TCHAR Size[4]; + + /* Copy the current theme values */ + g->ThemeAdv = g->Theme; + + /* Add the elements to the combo */ + for (iElement = 0; iElement < NUM_ELEMENTS; iElement++) + { + LoadString(hApplet, IDS_ELEMENT_1 + iElement, (LPTSTR)&tstrText, 79); + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_ADDSTRING, 0, (LPARAM)&tstrText); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)iElement); + } + + /* Get the list index of the desktop element */ + for (iListIndex = 0; iListIndex < NUM_ELEMENTS; iListIndex++) + { + iElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + if (iElement == 0) + { + iDeskIndex = iListIndex; + break; + } + } + + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_SETCURSEL, iDeskIndex, 0); + + /* Set colors for the color buttons */ + g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; + g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; + g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; + g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; + + /* Create font for bold button */ + lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; + lfButtonFont.lfWeight = FW_BOLD; + lfButtonFont.lfItalic = FALSE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hBoldFont) + DeleteObject(g->hBoldFont); + + g->hBoldFont = hMyFont; + } + + /* Create font for italic button */ + lfButtonFont.lfWeight = FW_REGULAR; + lfButtonFont.lfItalic = TRUE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hItalicFont) + DeleteObject(g->hItalicFont); + + g->hItalicFont = hMyFont; + } + + /* Set the fonts for the font style buttons */ + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTBOLD, WM_SETFONT, (WPARAM)g->hBoldFont, (LPARAM)TRUE); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTITALIC, WM_SETFONT, (WPARAM)g->hItalicFont, (LPARAM)TRUE); + + /* Draw Bitmaps for the colorbuttons */ + InitColorButtons(hwndDlg, g); + + /* Make the UpDown control count correctly */ + SendMessage (GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), UDM_SETRANGE, 0L, MAKELONG (200, 1)); + + /* Fill font selection combo */ + lfFont.lfCharSet = DEFAULT_CHARSET; + lfFont.lfFaceName[0] = (TCHAR)0; + lfFont.lfPitchAndFamily = 0; + hScreenDC = GetDC(0); + EnumFontFamiliesEx(hScreenDC, &lfFont, (FONTENUMPROC)EnumFontFamExProc, (LPARAM)GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_FONT_C), 0); + ReleaseDC(0, hScreenDC); + + /* Fill font size combo */ + for (i = 6; i <= 24; i++) + { + SetDlgItemInt(hwndDlg, IDC_CONVERT, i, FALSE); + GetDlgItemText(hwndDlg, IDC_CONVERT, (LPTSTR)&Size, 3); + SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_FONTSIZE_E, CB_ADDSTRING, 0, (LPARAM)&Size); + } + + /* Update the controls */ + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); + g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + UpdateControls(hwndDlg, g); +} + + +static VOID +AdvAppearanceDlg_CleanUp(HWND hwndDlg, GLOBALS* g) +{ + DeleteObject(g->hBoldFont); + DeleteObject(g->hItalicFont); +} + + +INT_PTR CALLBACK +AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + INT iListIndex; + GLOBALS* g; + + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + g = (GLOBALS*)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + AdvAppearanceDlg_Init(hwndDlg, g); + break; + + case WM_DESTROY: + AdvAppearanceDlg_CleanUp(hwndDlg, g); + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + SaveCurrentValues(hwndDlg, g); + EndDialog(hwndDlg, 0); + break; + + case IDCANCEL: + g->ThemeAdv = g->Theme; + EndDialog(hwndDlg, 0); + break; + + case IDC_ADVAPPEARANCE_ELEMENT: + if (HIWORD(wParam) == CBN_SELCHANGE) + { + SaveCurrentValues(hwndDlg, g); + iListIndex = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETCURSEL, 0, 0); + g->CurrentElement = SendDlgItemMessage(hwndDlg, IDC_ADVAPPEARANCE_ELEMENT, CB_GETITEMDATA, (WPARAM)iListIndex, 0); + UpdateControls(hwndDlg, g); + } + break; + + case IDC_ADVAPPEARANCE_COLOR1_B: + GetColor(hwndDlg, g, 0); + break; + + case IDC_ADVAPPEARANCE_COLOR2_B: + GetColor(hwndDlg, g, 1); + break; + + case IDC_ADVAPPEARANCE_FONTCOLOR_B: + GetColor(hwndDlg, g, 2); + break; + + default: + return FALSE; + } + break; + + default: + return FALSE; + } + + return TRUE; +} Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Thu Feb 15 23:24:38 2007 @@ -95,109 +95,240 @@ /******************************************************************************/ -INT_PTR CALLBACK -AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - INT i, index; - GLOBALS* g = NULL; - - switch(uMsg) - { - case WM_INITDIALOG: +static VOID +LoadCurrentTheme(GLOBALS* g) +{ + INT i; + NONCLIENTMETRICS NonClientMetrics; + + g->Theme.bHasChanged = FALSE; + /* FIXME: it may be custom! */ + g->Theme.bIsCustom = FALSE; + + /* Load colors */ + for (i = 0; i <= 30; i++) + { + g->ColorList[i] = i; + g->Theme.crColor[i] = (COLORREF)GetSysColor(i); + } + + /* Load sizes */ + for (i = 0; i <= 11; i++) + { + g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]); + } + + /* Load fonts */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + g->Theme.lfFont[FONT_CAPTION] = NonClientMetrics.lfCaptionFont; + g->Theme.lfFont[FONT_SMCAPTION] = NonClientMetrics.lfSmCaptionFont; + g->Theme.lfFont[FONT_MENU] = NonClientMetrics.lfMenuFont; + g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont; + g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont; + SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); +} + + +static VOID +LoadThemeFromReg(GLOBALS* g, INT iPreset) +{ + INT i; + TCHAR strSizeName[20] = {TEXT("Sizes\\0")}; + TCHAR strValueName[10]; + HKEY hkNewSchemes, hkScheme, hkSize; + DWORD dwType, dwLength; + + if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), + 0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS) + { + if(RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iPreset].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS) { - AppearancePage_Init(hwndDlg); - break; + lstrcpyn(&strSizeName[6],g->ThemeTemplates[iPreset].strSizeName, 3); + if(RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS) + { + dwLength = sizeof(BOOL); + RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength); + + for (i = 0; i <= 30; i++) + { + wsprintf(strValueName, TEXT("Color #%d"), i); + dwLength = sizeof(COLORREF); + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength); + } + for (i = 0; i <= 5; i++) + { + wsprintf(strValueName, TEXT("Font #%d"), i); + dwLength = sizeof(LOGFONT); + g->Theme.lfFont[i].lfFaceName[0] = 'x'; + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength); + } + for (i = 0; i <= 8; i++) + { + wsprintf(strValueName, TEXT("Size #%d"), i); + dwLength = sizeof(DWORD); + RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength); + } + RegCloseKey(hkScheme); + } + RegCloseKey(hkScheme); } - case WM_DESTROY: + RegCloseKey(hkNewSchemes); + } +} + + +static VOID +ApplyTheme(GLOBALS* g) +{ + INT i, Result; + HKEY hKey; + DWORD dwDisposition = 0; + TCHAR clText[16] = {0}; + NONCLIENTMETRICS NonClientMetrics; + HFONT hMyFont; + LOGFONT lfButtonFont; + + if (!g->Theme.bHasChanged) + return; + + g->Theme.bHasChanged = FALSE; + + /* Update some globals */ + g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; + g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; + g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; + g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; + lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; + + /* Create new font for bold button */ + lfButtonFont.lfWeight = FW_BOLD; + lfButtonFont.lfItalic = FALSE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hBoldFont) + DeleteObject(g->hBoldFont); + g->hBoldFont = hMyFont; + } + + /* Create new font for italic button */ + lfButtonFont.lfWeight = FW_REGULAR; + lfButtonFont.lfItalic = TRUE; + hMyFont = CreateFontIndirect(&lfButtonFont); + if (hMyFont) + { + if (g->hItalicFont) + DeleteObject(g->hItalicFont); + g->hItalicFont = hMyFont; + } + + /* Apply Colors from global variable */ + SetSysColors(30, &g->ColorList[0], &g->Theme.crColor[0]); + + /* Save colors to registry */ + Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_ALL_ACCESS, &hKey); + if (Result != ERROR_SUCCESS) + { + /* Could not open the key, try to create it */ + Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); + } + + if (Result == ERROR_SUCCESS) + { + for (i = 0; i <= 30; i++) { - AppearancePage_CleanUp(hwndDlg); - break; + DWORD red = GetRValue(g->Theme.crColor[i]); + DWORD green = GetGValue(g->Theme.crColor[i]); + DWORD blue = GetBValue(g->Theme.crColor[i]); + wsprintf(clText, TEXT("%d %d %d"), red, green, blue); + RegSetValueEx(hKey, g_RegColorNames[i], 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR)); } - case WM_COMMAND: - { - g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - switch(LOWORD(wParam)) - { - case IDC_APPEARANCE_ADVANCED: - { - DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE, - hwndDlg, AdvAppearanceDlgProc, (LPARAM)g); - - /* Was anything changed in the advanced appearance dialog? */ - if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - g->Theme = g->ThemeAdv; - g->Theme.bHasChanged = TRUE; - } - break; - } - case IDC_APPEARANCE_COLORSCHEME: - { - if(HIWORD(wParam) == CBN_SELCHANGE) - { - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); - g->Theme.bHasChanged = TRUE; - i = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); - index = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)i, 0); - LoadThemeFromReg(g, index); - break; - } - break; - } - default: - { - return FALSE; - } - } - return TRUE; - } - case WM_NOTIFY: - { - g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - LPNMHDR lpnm = (LPNMHDR)lParam; - switch(lpnm->code) - { - case PSN_APPLY: - { - if (g->Theme.bHasChanged) - { - ApplyTheme(g); - } - return(TRUE); - break; - } - default: - { - return FALSE; - } - } - return TRUE; - } - default: - { - return FALSE; - } - } - return TRUE; -} - -void -AppearancePage_Init(HWND hwndDlg) -{ - GLOBALS* g; + + RegCloseKey(hKey); + } + + /* Apply the fonts */ + NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + NonClientMetrics.lfCaptionFont = g->Theme.lfFont[FONT_CAPTION]; + NonClientMetrics.lfSmCaptionFont = g->Theme.lfFont[FONT_SMCAPTION]; + NonClientMetrics.lfMenuFont = g->Theme.lfFont[FONT_MENU]; + NonClientMetrics.lfStatusFont = g->Theme.lfFont[FONT_INFO]; + NonClientMetrics.lfMessageFont = g->Theme.lfFont[FONT_DIALOG]; + SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); + SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); + + /* FIXME: Apply size metrics */ + + /* Save fonts and size metrics to registry */ + Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, KEY_ALL_ACCESS, &hKey); + if (Result != ERROR_SUCCESS) + { + /* Could not open the key, try to create it */ + Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); + } + + if (Result == ERROR_SUCCESS) + { + RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_CAPTION], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_SMCAPTION], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_ICON], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_MENU], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_INFO], sizeof(LOGFONT)); + RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_DIALOG], sizeof(LOGFONT)); + + /* Save size metrics to registry */ + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_BORDER_X]); + RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); + RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); + RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); + RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); + RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_X]); + RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_Y]); + RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_X]); + RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_Y]); + RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_X]); + RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_Y]); + RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + wsprintf(clText, TEXT("%d"), g->Theme.Size[SIZE_ICON_X]); + RegSetValueEx(hKey, TEXT("Shell Icon Sizet"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); + + RegCloseKey(hKey); + } +} + + +/* Draw the preview window, unimplemented */ +#if 0 +static VOID +DrawPreview(HWND hwndPreview, THEME* pTheme) +{ +} +#endif + + +static VOID +AppearancePage_Init(HWND hwndDlg, GLOBALS *g) +{ HKEY hkNewSchemes, hkScheme, hkSizes, hkSize; FILETIME ftLastWriteTime; TCHAR strSelectedStyle[4]; DWORD dwLength, dwType; DWORD dwDisposition = 0; - int iStyle, iSize, iTemplateIndex, iListIndex = 0; - int Result; - - g = (GLOBALS*)malloc(sizeof(GLOBALS)); - // FIXME: correct handling of error (g == NULL) - - SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + INT iStyle, iSize, iTemplateIndex, iListIndex = 0; + INT Result; + LoadCurrentTheme(g); /* Fill color schemes combo */ @@ -264,230 +395,91 @@ RegCloseKey(hkNewSchemes); } SendMessage(GetDlgItem(hwndDlg, IDC_APPEARANCE_COLORSCHEME), LB_SETCURSEL, 0, 0); - return; -} - -void -AppearancePage_CleanUp(HWND hwndDlg) -{ - GLOBALS* g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); - free(g); - return; -} - -void -LoadCurrentTheme(GLOBALS* g) -{ - int i; - NONCLIENTMETRICS NonClientMetrics; - - g->Theme.bHasChanged = FALSE; - /* FIXME: it may be custom! */ - g->Theme.bIsCustom = FALSE; - - /* Load colors */ - for(i = 0; i <= 30; i++) - { - g->ColorList[i] = i; - g->Theme.crColor[i] = (COLORREF)GetSysColor(i); - } - - /* Load sizes */ - for(i = 0; i <= 11; i++) - { - g->Theme.Size[i] = GetSystemMetrics(g_SizeMetric[i]); - } - - /* Load fonts */ - NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - g->Theme.lfFont[FONT_CAPTION] = NonClientMetrics.lfCaptionFont; - g->Theme.lfFont[FONT_SMCAPTION] = NonClientMetrics.lfSmCaptionFont; - g->Theme.lfFont[FONT_MENU] = NonClientMetrics.lfMenuFont; - g->Theme.lfFont[FONT_INFO] = NonClientMetrics.lfStatusFont; - g->Theme.lfFont[FONT_DIALOG] = NonClientMetrics.lfMessageFont; - SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); - - return; -} - -void -LoadThemeFromReg(GLOBALS* g, INT iPreset) -{ - int i; - TCHAR strSizeName[20] = {TEXT("Sizes\\0")}; - TCHAR strValueName[10]; - HKEY hkNewSchemes, hkScheme, hkSize; - DWORD dwType, dwLength; - - if(RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance\\New Schemes"), - 0, KEY_READ, &hkNewSchemes) == ERROR_SUCCESS) - { - if(RegOpenKeyEx(hkNewSchemes, g->ThemeTemplates[iPreset].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS) - { - lstrcpyn(&strSizeName[6],g->ThemeTemplates[iPreset].strSizeName, 3); - if(RegOpenKeyEx(hkScheme, strSizeName, 0, KEY_READ, &hkSize) == ERROR_SUCCESS) +} + + +static VOID +AppearancePage_CleanUp(HWND hwndDlg, GLOBALS *g) +{ +} + + +INT_PTR CALLBACK +AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + INT i, index; + GLOBALS *g; + LPNMHDR lpnm; + + g = (GLOBALS*)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + g = (GLOBALS*)malloc(sizeof(GLOBALS)); + if (g == NULL) + return FALSE; + + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)g); + AppearancePage_Init(hwndDlg, g); + break; + + case WM_DESTROY: + AppearancePage_CleanUp(hwndDlg, g); + free(g); + break; + + case WM_COMMAND: + switch (LOWORD(wParam)) { - dwLength = sizeof(BOOL); - RegQueryValueEx(hkSize, TEXT("FlatMenus"), NULL, &dwType, (LPBYTE)&g->Theme.bFlatMenus, &dwLength); - - for (i = 0; i <= 30; i++) - { - wsprintf(strValueName, TEXT("Color #%d"), i); - dwLength = sizeof(COLORREF); - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.crColor[i], &dwLength); - } - for (i = 0; i <= 5; i++) - { - wsprintf(strValueName, TEXT("Font #%d"), i); - dwLength = sizeof(LOGFONT); - g->Theme.lfFont[i].lfFaceName[0] = 'x'; - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.lfFont[i], &dwLength); - } - for (i = 0; i <= 8; i++) - { - wsprintf(strValueName, TEXT("Size #%d"), i); - dwLength = sizeof(DWORD); - RegQueryValueEx(hkSize, strValueName, NULL, &dwType, (LPBYTE)&g->Theme.Size[i], &dwLength); - } - RegCloseKey(hkScheme); + case IDC_APPEARANCE_ADVANCED: + DialogBoxParam(hApplet, (LPCTSTR)IDD_ADVAPPEARANCE, + hwndDlg, AdvAppearanceDlgProc, (LPARAM)g); + + /* Was anything changed in the advanced appearance dialog? */ + if (memcmp(&g->Theme, &g->ThemeAdv, sizeof(THEME)) != 0) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme = g->ThemeAdv; + g->Theme.bHasChanged = TRUE; + } + break; + + case IDC_APPEARANCE_COLORSCHEME: + if(HIWORD(wParam) == CBN_SELCHANGE) + { + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + g->Theme.bHasChanged = TRUE; + i = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); + index = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)i, 0); + LoadThemeFromReg(g, index); + } + break; + + default: + return FALSE; } - RegCloseKey(hkScheme); - } - RegCloseKey(hkNewSchemes); - } - return; -} - -void -ApplyTheme(GLOBALS* g) -{ - int i, Result; - HKEY hKey; - DWORD dwDisposition = 0; - TCHAR clText[16] = {0}; - NONCLIENTMETRICS NonClientMetrics; - HFONT hMyFont; - LOGFONT lfButtonFont; - - if (!g->Theme.bHasChanged) return; - - g->Theme.bHasChanged = FALSE; - - /* Update some globals */ - g->crCOLOR_BTNFACE = g->Theme.crColor[COLOR_BTNFACE]; - g->crCOLOR_BTNTEXT = g->Theme.crColor[COLOR_BTNTEXT]; - g->crCOLOR_BTNSHADOW = g->Theme.crColor[COLOR_BTNSHADOW]; - g->crCOLOR_BTNHIGHLIGHT = g->Theme.crColor[COLOR_BTNHIGHLIGHT]; - lfButtonFont = g->Theme.lfFont[FONT_DIALOG]; - - /* Create new font for bold button */ - lfButtonFont.lfWeight = FW_BOLD; - lfButtonFont.lfItalic = FALSE; - hMyFont = CreateFontIndirect(&lfButtonFont); - if (hMyFont) - { - if (g->hBoldFont) DeleteObject(g->hBoldFont); - g->hBoldFont = hMyFont; - } - - /* Create new font for italic button */ - lfButtonFont.lfWeight = FW_REGULAR; - lfButtonFont.lfItalic = TRUE; - hMyFont = CreateFontIndirect(&lfButtonFont); - if (hMyFont) - { - if (g->hItalicFont) DeleteObject(g->hItalicFont); - g->hItalicFont = hMyFont; - } - - /* Apply Colors from global variable */ - SetSysColors(30, &g->ColorList[0], &g->Theme.crColor[0]); - - /* Save colors to registry */ - Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, KEY_ALL_ACCESS, &hKey); - if (Result != ERROR_SUCCESS) - { - /* Could not open the key, try to create it */ - Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Colors"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); - } - if (Result == ERROR_SUCCESS) - { - for(i = 0; i <= 30; i++) - { - DWORD red = GetRValue(g->Theme.crColor[i]); - DWORD green = GetGValue(g->Theme.crColor[i]); - DWORD blue = GetBValue(g->Theme.crColor[i]); - wsprintf(clText, TEXT("%d %d %d"), red, green, blue); - RegSetValueEx(hKey, g_RegColorNames[i], 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR)); - } - RegCloseKey(hKey); - } - - /* Apply the fonts */ - NonClientMetrics.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - NonClientMetrics.lfCaptionFont = g->Theme.lfFont[FONT_CAPTION]; - NonClientMetrics.lfSmCaptionFont = g->Theme.lfFont[FONT_SMCAPTION]; - NonClientMetrics.lfMenuFont = g->Theme.lfFont[FONT_MENU]; - NonClientMetrics.lfStatusFont = g->Theme.lfFont[FONT_INFO]; - NonClientMetrics.lfMessageFont = g->Theme.lfFont[FONT_DIALOG]; - SystemParametersInfo(SPI_SETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &NonClientMetrics, 0); - SystemParametersInfo(SPI_SETICONTITLELOGFONT, sizeof(LOGFONT), &g->Theme.lfFont[FONT_ICON], 0); - - /* FIXME: Apply size metrics */ - - /* Save fonts and size metrics to registry */ - Result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, KEY_ALL_ACCESS, &hKey); - if (Result != ERROR_SUCCESS) - { - /* Could not open the key, try to create it */ - Result = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop\\WindowMetrics"), 0, NULL, 0, KEY_ALL_ACCESS, NULL,&hKey, &dwDisposition); - } - if (Result == ERROR_SUCCESS) - { - RegSetValueEx(hKey, TEXT("CaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_CAPTION], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("SmCaptionFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_SMCAPTION], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("IconFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_ICON], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("MenuFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_MENU], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("StatusFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_INFO], sizeof(LOGFONT)); - RegSetValueEx(hKey, TEXT("MessageFont"), 0, REG_BINARY, (BYTE *)&g->Theme.lfFont[FONT_DIALOG], sizeof(LOGFONT)); - - /* Save size metrics to registry */ - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_BORDER_X]); - RegSetValueEx(hKey, TEXT("BorderWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); - RegSetValueEx(hKey, TEXT("CaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_CAPTION_Y]); - RegSetValueEx(hKey, TEXT("CaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); - RegSetValueEx(hKey, TEXT("SmCaptionWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SMCAPTION_Y]); - RegSetValueEx(hKey, TEXT("SmCaptionHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_X]); - RegSetValueEx(hKey, TEXT("IconSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_ICON_SPC_Y]); - RegSetValueEx(hKey, TEXT("IconVerticalSpacing"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_X]); - RegSetValueEx(hKey, TEXT("MenuWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_MENU_Y]); - RegSetValueEx(hKey, TEXT("MenuHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_X]); - RegSetValueEx(hKey, TEXT("ScrollWidth"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), -15 * g->Theme.Size[SIZE_SCROLL_Y]); - RegSetValueEx(hKey, TEXT("ScrollHeight"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - wsprintf(clText, TEXT("%d"), g->Theme.Size[SIZE_ICON_X]); - RegSetValueEx(hKey, TEXT("Shell Icon Sizet"), 0, REG_SZ, (BYTE *)clText, sizeof(clText)); - - RegCloseKey(hKey); - } - return; -} - -/* Draw the preview window, unimplemented */ -void -DrawPreview(HWND hwndPreview, THEME* pTheme) -{ - return; -} - + return TRUE; + + case WM_NOTIFY: + lpnm = (LPNMHDR)lParam; + switch (lpnm->code) + { + case PSN_APPLY: + if (g->Theme.bHasChanged) + { + ApplyTheme(g); + } + return TRUE; + + default: + return FALSE; + } + return TRUE; + + default: + return FALSE; + } + + return TRUE; +} Modified: trunk/reactos/dll/cpl/desk/appearance.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.h?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.h (original) +++ trunk/reactos/dll/cpl/desk/appearance.h Thu Feb 15 23:24:38 2007 @@ -85,19 +85,6 @@ /* prototypes for appearance.c */ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -void AppearancePage_Init(HWND hwndDlg); -void AppearancePage_CleanUp(HWND hwndDlg); -void LoadCurrentTheme(GLOBALS* g); -void LoadThemeFromReg(GLOBALS* g, INT iPreset); -void ApplyTheme(GLOBALS* g); /* prototypes for advappearancedlg.c */ INT_PTR CALLBACK AdvAppearanceDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -void AdvAppearanceDlg_Init(HWND hwndDlg); -void AdvAppearanceDlg_CleanUp(HWND hwndDlg); -void UpdateControls(HWND hwndDlg, int iElement); -void SaveCurrentValues(HWND hwndDlg); -void InitColorButtons(HWND hwndDlg); -void UpdateButtonColor(HWND hwndDlg, int ID, int nButton, int nColor); -BOOL GetColor(HWND hwndDlg, int iElement, int nButton); -int CALLBACK EnumFontFamExProc(ENUMLOGFONTEX*, NEWTEXTMETRICEX*, DWORD, LPARAM);

1 0

[hpoussin] 25808: Start registry keys enumeration at 0 instead of 1. This fixes enumeration of all protocols (which start at 0). Another side effect is that this fixes enumeration of network adapters (which, due to another bug, also start at 0 instead of 1 as in MS Windows). By the way, the correct way of enumerating adapters and protocols is to use the SetupDi* functions, which will potential fix other bugs. Fixes bug 2034 in branch 0.3.1
by hpoussin＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: hpoussin Date: Thu Feb 15 21:26:51 2007 New Revision: 25808 URL: http://svn.reactos.org/svn/reactos?rev=25808&view=rev Log: Start registry keys enumeration at 0 instead of 1. This fixes enumeration of all protocols (which start at 0). Another side effect is that this fixes enumeration of network adapters (which, due to another bug, also start at 0 instead of 1 as in MS Windows). By the way, the correct way of enumerating adapters and protocols is to use the SetupDi* functions, which will potential fix other bugs. Fixes bug 2034 in branch 0.3.1 Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.c Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/ncpa/ncpa.c Thu Feb 15 21:26:51 2007 @@ -100,7 +100,7 @@ return; } - for(i=1;;i++) + for(i=0;;i++) { TCHAR pszNewPath[MAX_PATH]; ret = RegEnumKeyEx(hKey,i,tpszName,&dwNameLen,NULL,NULL,NULL,NULL);

1 0

[fireball] 25807: Merge 25805.
by fireball＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: fireball Date: Thu Feb 15 21:24:19 2007 New Revision: 25807 URL: http://svn.reactos.org/svn/reactos?rev=25807&view=rev Log: Merge 25805. Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Modified: branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netamd.inf Thu Feb 15 21:24:19 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2001,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/media/… ============================================================================== --- branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf (original) +++ branches/ros-branch-0_3_1/reactos/media/inf/netisa.inf Thu Feb 15 21:24:19 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2007,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[ion] 25806: - Small placeholder change for future Cm code: - Added newcm.c which will contain some new Cm code part of the Cm Rewrite but not in the rewrite branch (used solely for supporting CmGetSystemControlValues). - Added System Control Vector which supports all the registry flags that Windows 2003 SP1 supports as well. - The most important part of this support, at least for us, is to get boot-time time zone support working properly. We can worry about the other options later. - Update Krn
by ion＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: ion Date: Thu Feb 15 20:44:04 2007 New Revision: 25806 URL: http://svn.reactos.org/svn/reactos?rev=25806&view=rev Log: - Small placeholder change for future Cm code: - Added newcm.c which will contain some new Cm code part of the Cm Rewrite but not in the rewrite branch (used solely for supporting CmGetSystemControlValues). - Added System Control Vector which supports all the registry flags that Windows 2003 SP1 supports as well. - The most important part of this support, at least for us, is to get boot-time time zone support working properly. We can worry about the other options later. - Update KrnlFun for previous DPC/HAL fixes. Added: trunk/reactos/ntoskrnl/cm/cmdata.c trunk/reactos/ntoskrnl/cm/newcm.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=258… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Feb 15 20:44:04 2007 @@ -9,12 +9,10 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Hal: -// - Use APC and DPC Interrupt Dispatchers. // - CMOS Initialization and CMOS Spinlock. // // Global: // - TODO: Complete the list of bufxies -// - Fix DPCs interrupting code at DISPATCH_LEVEL // - Fix atapi.sys or serial.sys loading one more time at each boot. // /////////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=25806… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Thu Feb 15 20:44:04 2007 @@ -447,4 +447,24 @@ #define ObGetObjectPointerCount(x) OBJECT_TO_OBJECT_HEADER(x)->PointerCount #define ObGetObjectHandleCount(x) OBJECT_TO_OBJECT_HEADER(x)->HandleCount +// +// System Control Vector +// +typedef struct _CM_SYSTEM_CONTROL_VECTOR +{ + PWCHAR KeyPath; + PWCHAR ValueName; + PVOID Buffer; + PULONG BufferLength; + PULONG Type; +} CM_SYSTEM_CONTROL_VECTOR, *PCM_SYSTEM_CONTROL_VECTOR; + +VOID +NTAPI +CmGetSystemControlValues( + IN PVOID SystemHiveData, + IN PCM_SYSTEM_CONTROL_VECTOR ControlVector +); + +extern CM_SYSTEM_CONTROL_VECTOR CmControlVector[]; #endif /*__INCLUDE_CM_H*/ Added: trunk/reactos/ntoskrnl/cm/cmdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cmdata.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cmdata.c (added) +++ trunk/reactos/ntoskrnl/cm/cmdata.c Thu Feb 15 20:44:04 2007 @@ -1,0 +1,710 @@ +#include "ntoskrnl.h" +#include "cm.h" + +/* SYSTEM CONFIGURATION VECTOR ***********************************************/ + +ULONG DummyData; +ULONG CmNtGlobalFlag; +ULONG CmNtCSDVersion; + +WCHAR CmDefaultLanguageId[12]; +ULONG CmDefaultLanguageIdLength = sizeof(CmDefaultLanguageId); +ULONG CmDefaultLanguageIdType; + +WCHAR CmInstallUILanguageId[12]; +ULONG CmInstallUILanguageIdLength = sizeof(CmInstallUILanguageId); +ULONG CmInstallUILanguageIdType; + +WCHAR CmSuiteBuffer[128]; +ULONG CmSuiteBufferLength = sizeof(CmSuiteBuffer); +ULONG CmSuiteBufferType; + +extern LANGID PsInstallUILanguageId; +extern LANGID PsDefaultUILanguageId; + +//CMHIVE CmControlHive; + +CM_SYSTEM_CONTROL_VECTOR CmControlVector[] = +{ + { + L"Session Manager", + L"ProtectionMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ObjectSecurityMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"LUIDDeviceMapsDisabled", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseDirectories", + &DummyData, + NULL, + NULL + }, + + { + L"LSA", + L"AuditBaseObjects", + &DummyData, + NULL, + NULL + }, + + { + L"LSA\\audit", + L"ProcessAccessesToAudit", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"ActiveTimeBias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"Bias", + &DummyData, + NULL, + NULL + }, + + { + L"TimeZoneInformation", + L"RealTimeIsUniversal", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"GlobalFlag", + &CmNtGlobalFlag, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PagingFileQuota", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"AllocationPreference", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DynamicMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"Mirroring", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionViewSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionImageSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SessionPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolUsageMaximum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MapAllocationFragment", + &DummyData, + NULL, + NULL + }, + +{ + L"Session Manager\\Memory Management", + L"PagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"NonPagedPoolMaximumPercent", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeSystemCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargeStackSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SystemPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LowMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"HighMemoryThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"DisablePagingExecutive", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ModifiedPageLife", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SecondLevelDataCache", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ClearPageFileAtShutdown", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagSmallTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagBigTableSize", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTag", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"PoolTagOverruns", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"SnapUnloads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"ProtectNonPagedPool", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackLockedPages", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"TrackPtes", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDrivers", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager\\Memory Management", + L"VerifyDriverLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"VerifyMode", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"LargePageMinimum", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"EnforceWriteProtection", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"MakeLowMemory", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Memory Management", + L"WriteWatch", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalCriticalWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"AdditionalDelayedWorkerThreads", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"PriorityQuantumMatrix", + &DummyData, + &DummyData, + NULL + }, + + { + L"Session Manager\\Kernel", + L"DpcQueueDepth", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"MinimumDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"AdjustDpcThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Kernel", + L"IdealDpcRate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"CountOperations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"LargeIrpStackLocations", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\I/O System", + L"IoVerifierLevel", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"ResourceTimeoutCount", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"CriticalSectionTimeout", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentReserve", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapSegmentCommit", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitTotalFreeThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"HeapDeCommitFreeBlockThreshold", + &DummyData, + NULL, + NULL + }, + + { + L"ProductOptions", + L"ProductType", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSEnabled", + &DummyData, + NULL, + NULL + }, + + { + L"Terminal Server", + L"TSAppCompat", + &DummyData, + NULL, + NULL + }, + + + { + L"ProductOptions", + L"ProductSuite", + CmSuiteBuffer, + &CmSuiteBufferLength, + &CmSuiteBufferType + }, + + { + L"Windows", + L"CSDVersion", + &CmNtCSDVersion, + NULL, + NULL + }, + + { + L"Nls\\Language", + L"Default", + CmDefaultLanguageId, + &CmDefaultLanguageIdLength, + &CmDefaultLanguageIdType + }, + + { + L"Nls\\Language", + L"InstallLanguage", + CmInstallUILanguageId, + &CmInstallUILanguageIdLength, + &CmInstallUILanguageIdType + }, + + { + L"\0\0", + L"RegistrySizeLimit", + &DummyData, + &DummyData, + &DummyData + }, + + { + L"Session Manager", + L"ForceNpxEmulation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"PowerPolicySimulate", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager\\Executive", + L"MaxTimeSeparationBeforeCorrect", + &DummyData, + NULL, + NULL + }, + + { + L"Windows", + L"ShutdownTime", + &DummyData, + &DummyData, + NULL + }, + + { + L"PriorityControl", + L"Win32PrioritySeparation", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"EnableTimerWatchdog", + &DummyData, + NULL, + NULL + }, + + { + L"Session Manager", + L"Debugger Retries", + &DummyData, + NULL, + NULL + }, + + { + L"WMI", + L"MaxEventSize", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"UsePerformanceClock", + &DummyData, + NULL, + NULL + }, + + { + L"WMI\\Trace", + L"TraceAlignment", + &DummyData, + NULL, + NULL + }, + + { + NULL, + NULL, + NULL, + NULL, + NULL +} +}; + Added: trunk/reactos/ntoskrnl/cm/newcm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/newcm.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/cm/newcm.c (added) +++ trunk/reactos/ntoskrnl/cm/newcm.c Thu Feb 15 20:44:04 2007 @@ -1,0 +1,12 @@ +#include "ntoskrnl.h" +#include "cm.h" +#include "debug.h" + +VOID +NTAPI +CmGetSystemControlValues(IN PVOID SystemHiveData, + IN PCM_SYSTEM_CONTROL_VECTOR ControlVector) +{ + return; +} + Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=258… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 15 20:44:04 2007 @@ -11,7 +11,9 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> +//#include <ntoskrnl/cm/newcm.h> +#include "ntoskrnl/cm/cm.h" /* DATA **********************************************************************/ @@ -889,7 +891,7 @@ KiInitializeBugCheck(); /* Setup initial system settings (FIXME: Needs Cm Rewrite) */ - //CmGetSystemControlValues(CommandLine, &CmControlVector); + CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); /* Initialize the executive at phase 0 */ if (!ExInitSystem()) KEBUGCHECK(PHASE0_INITIALIZATION_FAILED); 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 Thu Feb 15 20:44:04 2007 @@ -86,6 +86,8 @@ <file>regfile.c</file> <file>registry.c</file> <file>regobj.c</file> + <file>newcm.c</file> + <file>cmdata.c</file> </directory> <directory name="kdbg"> <if property="ARCH" value="i386">

1 0

[hpoussin] 25805: Add missing 'Characterists' registry key for netcards. Fixes part of bug 2034
by hpoussin＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: hpoussin Date: Thu Feb 15 20:34:26 2007 New Revision: 25805 URL: http://svn.reactos.org/svn/reactos?rev=25805&view=rev Log: Add missing 'Characterists' registry key for netcards. Fixes part of bug 2034 Modified: trunk/reactos/media/inf/netamd.inf trunk/reactos/media/inf/netisa.inf Modified: trunk/reactos/media/inf/netamd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netamd.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netamd.inf (original) +++ trunk/reactos/media/inf/netamd.inf Thu Feb 15 20:34:26 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2001,1.02 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = PCNet_CopyFiles.NT [PCNet_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,BUS_TO_SCAN,,"ALL" HKR,,BUSTIMER,,"0" HKR,,BUSTYPE,,"5" Modified: trunk/reactos/media/inf/netisa.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/netisa.inf?rev=2… ============================================================================== --- trunk/reactos/media/inf/netisa.inf (original) +++ trunk/reactos/media/inf/netisa.inf Thu Feb 15 20:34:26 2007 @@ -9,7 +9,7 @@ Class = Net ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 10/08/2005,1.01.0.0 +DriverVer = 02/15/2007,1.01.0.0 [DestinationDirs] DefaultDestDir = 12 @@ -27,6 +27,7 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] +HKR,,Characteristics,0x00010001,0x0000000 HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" HKR,,NetworkAddress,0x00000000,"001122334455"

1 0

[ekohl] 25804: - Enable/disable the size updown control when another window item is selected. - Remove the text when the size edit control gets disabled. - Disable the secondary color for the window item.
by ekohl＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: ekohl Date: Thu Feb 15 17:12:36 2007 New Revision: 25804 URL: http://svn.reactos.org/svn/reactos?rev=25804&view=rev Log: - Enable/disable the size updown control when another window item is selected. - Remove the text when the size edit control gets disabled. - Disable the secondary color for the window item. Modified: trunk/reactos/dll/cpl/desk/advappdlg.c trunk/reactos/dll/cpl/desk/appearance.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c Thu Feb 15 17:12:36 2007 @@ -309,6 +309,7 @@ /* First enable / disable the controls */ EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E), (g_Assignment[iElement].Size != -1)); + EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_UD), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_SIZE_T), (g_Assignment[iElement].Size != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR1_T), (g_Assignment[iElement].Color1 != -1)); EnableWindow(GetDlgItem(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_T), (g_Assignment[iElement].Color2 != -1)); @@ -325,7 +326,10 @@ UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_COLOR2_B, 1, g_Assignment[iElement].Color2); UpdateButtonColor(hwndDlg, IDC_ADVAPPEARANCE_FONTCOLOR_B, 2, g_Assignment[iElement].FontColor); - SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g_Assignment[iElement].Size == -1 ? 0 : g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + if (g_Assignment[iElement].Size != -1) + SetDlgItemInt(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, g->ThemeAdv.Size[g_Assignment[iElement].Size], FALSE); + else + SetDlgItemText(hwndDlg, IDC_ADVAPPEARANCE_SIZE_E, TEXT("")); HDC hdcDlg = GetDC(hwndDlg); if (g_Assignment[iElement].Font != -1) Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c (original) +++ trunk/reactos/dll/cpl/desk/appearance.c Thu Feb 15 17:12:36 2007 @@ -25,7 +25,7 @@ {SIZE_BORDER_X, SIZE_BORDER_Y, COLOR_ACTIVEBORDER, -1, -1, -1}, /* active window border */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_MENU, -1, FONT_MENU, COLOR_MENUTEXT}, /* menu */ {SIZE_MENU_X, SIZE_MENU_Y, COLOR_HIGHLIGHT, -1, FONT_HILIGHT, COLOR_HIGHLIGHTTEXT},/* marked element */ - {-1, -1, COLOR_WINDOW, COLOR_WINDOWFRAME, -1, COLOR_WINDOWTEXT}, /* window */ + {-1, -1, COLOR_WINDOW, -1 /*COLOR_WINDOWFRAME*/, -1, COLOR_WINDOWTEXT}, /* window */ {SIZE_SCROLL_X, SIZE_SCROLL_Y, COLOR_SCROLLBAR, -1, -1, -1}, /* scroll bar */ {-1, -1, COLOR_3DFACE, -1, -1, COLOR_BTNTEXT}, /* 3d objects */ {SIZE_SMCAPTION_Y,-1, -1, -1, FONT_SMCAPTION, -1}, /* palette window caption */

1 0

[dgorbachev] 25803: - fix "keyboard does not respond" bug on Biostar board (thanks to Peter Krawies) - fix printf()
by dgorbachev＠svn.reactos.org 15 Feb '07

15 Feb '07

Author: dgorbachev Date: Thu Feb 15 13:57:38 2007 New Revision: 25803 URL: http://svn.reactos.org/svn/reactos?rev=25803&view=rev Log: - fix "keyboard does not respond" bug on Biostar board (thanks to Peter Krawies) - fix printf() Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Thu Feb 15 13:57:38 2007 @@ -1621,58 +1621,69 @@ { UCHAR Status; UCHAR Scancode; - + ULONG Loops; + BOOLEAN Result = TRUE; + + /* Identify device */ WRITE_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA, 0xF2); - StallExecutionProcessor(10000); - - Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + /* Wait for reply */ + for (Loops = 0; Loops < 100; Loops++) + { + StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) + break; + } + + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* PC/XT keyboard or no keyboard */ - return FALSE; + Result = FALSE; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xFA) { /* No ACK received */ - return FALSE; + Result = FALSE; } StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* Found AT keyboard */ - return TRUE; + return Result; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0xAB) { /* No 0xAB received */ - return FALSE; + Result = FALSE; } StallExecutionProcessor(10000); + Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & 0x01) != 0x01) + if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) { /* No byte in buffer */ - return FALSE; + Result = FALSE; } Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x41) { /* No 0x41 received */ - return FALSE; + Result = FALSE; } /* Found MF-II keyboard */ - return TRUE; + return Result; } @@ -1880,7 +1891,6 @@ DetectPS2AuxPort(VOID) { ULONG Loops; - UCHAR Scancode; UCHAR Status; /* Put the value 0x5A in the output buffer using the @@ -1901,22 +1911,15 @@ for (Loops = 0; Loops < 10; Loops++) { + StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) != 0) - { - Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); - if ((Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL) != 0) - { - return TRUE; - } - break; - } - - StallExecutionProcessor(10000); - } - - return FALSE; + break; + } + + READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); + + return (Status & CONTROLLER_STATUS_MOUSE_OUTPUT_BUFFER_FULL); } @@ -1938,7 +1941,7 @@ 0xF2); /* Wait for reply */ - for (Loops = 0; Loops < 10; Loops++) + for (Loops = 0; Loops < 100; Loops++) { StallExecutionProcessor(10000); Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); @@ -1963,15 +1966,6 @@ Scancode = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_DATA); if (Scancode != 0x00) Result = FALSE; - - /* Flush output buffer */ - for (Loops = 0; Loops < 10; Loops++) - { - Status = READ_PORT_UCHAR((PUCHAR)CONTROLLER_REGISTER_STATUS); - if ((Status & CONTROLLER_STATUS_OUTPUT_BUFFER_FULL) == 0) - break; - StallExecutionProcessor(10000); - } return Result; } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c Thu Feb 15 13:57:38 2007 @@ -45,9 +45,9 @@ { case 'd': case 'u': case 'x': if (c == 'x') - *_itoa(va_arg(ap, unsigned long), str, 16) = 0; + _itoa(va_arg(ap, unsigned long), str, 16); else - *_itoa(va_arg(ap, unsigned long), str, 10) = 0; + _itoa(va_arg(ap, unsigned long), str, 10); ptr = str;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
27
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 February 2007