Ros-diffs November 2006

ros-diffs@reactos.org

16 participants
324 discussions

[fireball] 24837: Dmitry G. Gorbachev: Fix possible buffer overflow in FreeLdr See issue #1881 for more details.
by fireball＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: fireball Date: Sun Nov 26 16:37:50 2006 New Revision: 24837 URL: http://svn.reactos.org/svn/reactos?rev=24837&view=rev Log: Dmitry G. Gorbachev: Fix possible buffer overflow in FreeLdr See issue #1881 for more details. Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/miscboot.c trunk/reactos/boot/freeldr/freeldr/oslist.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c Sun Nov 26 16:37:50 2006 @@ -111,7 +111,7 @@ } // Try to read the boot type - if (!IniReadSettingByName(SectionId, "BootType", SettingValue, 80)) + if (!IniReadSettingByName(SectionId, "BootType", SettingValue, sizeof(SettingValue))) { sprintf(SettingName, "BootType= line not found in section [%s] in freeldr.ini.\n", OperatingSystemSectionNames[SelectedOperatingSystem]); UiMessageBox(SettingName); @@ -180,7 +180,7 @@ DefaultOSName = CmdLineGetDefaultOS(); if (NULL == DefaultOSName) { - if (IniReadSettingByName(SectionId, "DefaultOS", DefaultOSText, 80)) + if (IniReadSettingByName(SectionId, "DefaultOS", DefaultOSText, sizeof(DefaultOSText))) { DefaultOSName = DefaultOSText; } @@ -218,7 +218,7 @@ return -1; } - if (IniReadSettingByName(SectionId, "TimeOut", TimeOutText, 20)) + if (IniReadSettingByName(SectionId, "TimeOut", TimeOutText, sizeof(TimeOutText))) { TimeOut = atoi(TimeOutText); } Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c (original) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c Sun Nov 26 16:37:50 2006 @@ -54,7 +54,7 @@ for (Index=0; Index<SectionItemCount; Index++) { // Get the next setting from the .ini file section - if (IniReadSettingByNumber(SectionId, Index, SettingName, 80, SettingValue, 80)) + if (IniReadSettingByNumber(SectionId, Index, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue))) { if (_stricmp(SettingName, "DriveMap") == 0) { Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c Sun Nov 26 16:37:50 2006 @@ -233,27 +233,27 @@ return FALSE; } - if (!IniReadSettingByName(SectionId, "BootPath", LinuxBootPath, 260)) + if (!IniReadSettingByName(SectionId, "BootPath", LinuxBootPath, sizeof(LinuxBootPath))) { UiMessageBox("Boot path not specified for selected OS!"); return FALSE; } // Get the kernel name - if (!IniReadSettingByName(SectionId, "Kernel", LinuxKernelName, 260)) + if (!IniReadSettingByName(SectionId, "Kernel", LinuxKernelName, sizeof(LinuxKernelName))) { UiMessageBox("Linux kernel filename not specified for selected OS!"); return FALSE; } // Get the initrd name - if (IniReadSettingByName(SectionId, "Initrd", LinuxInitrdName, 260)) + if (IniReadSettingByName(SectionId, "Initrd", LinuxInitrdName, sizeof(LinuxInitrdName))) { LinuxHasInitrd = TRUE; } // Get the command line - if (IniReadSettingByName(SectionId, "CommandLine", LinuxCommandLine, 260)) + if (IniReadSettingByName(SectionId, "CommandLine", LinuxCommandLine, sizeof(LinuxCommandLine))) { RemoveQuotes(LinuxCommandLine); LinuxCommandLineSize = strlen(LinuxCommandLine) + 1; Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c Sun Nov 26 16:37:50 2006 @@ -38,7 +38,7 @@ return; } - if (!IniReadSettingByName(SectionId, "BootSectorFile", FileName, 260)) + if (!IniReadSettingByName(SectionId, "BootSectorFile", FileName, sizeof(FileName))) { UiMessageBox("Boot sector file not specified for selected OS!"); return; @@ -111,7 +111,7 @@ } // Read the boot drive - if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, 80)) + if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, sizeof(SettingValue))) { UiMessageBox("Boot drive not specified for selected OS!"); return; @@ -120,7 +120,7 @@ DriveNumber = DriveMapGetBiosDriveNumber(SettingValue); // Read the boot partition - if (!IniReadSettingByName(SectionId, "BootPartition", SettingValue, 80)) + if (!IniReadSettingByName(SectionId, "BootPartition", SettingValue, sizeof(SettingValue))) { UiMessageBox("Boot partition not specified for selected OS!"); return; @@ -179,7 +179,7 @@ return; } - if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, 80)) + if (!IniReadSettingByName(SectionId, "BootDrive", SettingValue, sizeof(SettingValue))) { UiMessageBox("Boot drive not specified for selected OS!"); return; Modified: trunk/reactos/boot/freeldr/freeldr/oslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/oslis… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/oslist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/oslist.c Sun Nov 26 16:37:50 2006 @@ -58,7 +58,7 @@ CurrentOperatingSystemIndex = 0; for (Idx=0; Idx<SectionSettingCount; Idx++) { - IniReadSettingByNumber(SectionId, Idx, SettingName, 260, SettingValue, 260); + IniReadSettingByNumber(SectionId, Idx, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue)); if (IniOpenSection(SettingName, &OperatingSystemSectionId)) { @@ -94,7 +94,7 @@ SectionSettingCount = IniGetNumSectionItems(SectionId); for (Idx=0; Idx<SectionSettingCount; Idx++) { - IniReadSettingByNumber(SectionId, Idx, SettingName, 260, SettingValue, 260); + IniReadSettingByNumber(SectionId, Idx, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue)); if (IniOpenSection(SettingName, NULL)) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sun Nov 26 16:37:50 2006 @@ -758,7 +758,7 @@ /* * Read the optional kernel parameters (if any) */ - if (IniReadSettingByName(SectionId, "Options", value, 1024)) + if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) { strcat(reactos_kernel_cmdline, " "); strcat(reactos_kernel_cmdline, value); @@ -795,7 +795,7 @@ * Find the kernel image name * and try to load the kernel off the disk */ - if(IniReadSettingByName(SectionId, "Kernel", value, 1024)) + if(IniReadSettingByName(SectionId, "Kernel", value, sizeof(value))) { /* * Set the name and @@ -823,7 +823,7 @@ * Find the HAL image name * and try to load the kernel off the disk */ - if(IniReadSettingByName(SectionId, "Hal", value, 1024)) + if(IniReadSettingByName(SectionId, "Hal", value, sizeof(value))) { /* * Set the name and Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c Sun Nov 26 16:37:50 2006 @@ -83,84 +83,84 @@ DisplayModeText[0] = '\0'; if (IniOpenSection("Display", &SectionId)) { - if (! IniReadSettingByName(SectionId, "DisplayMode", DisplayModeText, 260)) + if (! IniReadSettingByName(SectionId, "DisplayMode", DisplayModeText, sizeof(DisplayModeText))) { DisplayModeText[0] = '\0'; } - if (IniReadSettingByName(SectionId, "TitleText", SettingText, 260)) + if (IniReadSettingByName(SectionId, "TitleText", SettingText, sizeof(SettingText))) { strcpy(UiTitleBoxTitleText, SettingText); } - if (IniReadSettingByName(SectionId, "TimeText", SettingText, 260)) + if (IniReadSettingByName(SectionId, "TimeText", SettingText, sizeof(SettingText))) { strcpy(UiTimeText, SettingText); } - if (IniReadSettingByName(SectionId, "StatusBarColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "StatusBarColor", SettingText, sizeof(SettingText))) { UiStatusBarBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "StatusBarTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "StatusBarTextColor", SettingText, sizeof(SettingText))) { UiStatusBarFgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "BackdropTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "BackdropTextColor", SettingText, sizeof(SettingText))) { UiBackdropFgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "BackdropColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "BackdropColor", SettingText, sizeof(SettingText))) { UiBackdropBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "BackdropFillStyle", SettingText, 260)) + if (IniReadSettingByName(SectionId, "BackdropFillStyle", SettingText, sizeof(SettingText))) { UiBackdropFillStyle = UiTextToFillStyle(SettingText); } - if (IniReadSettingByName(SectionId, "TitleBoxTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "TitleBoxTextColor", SettingText, sizeof(SettingText))) { UiTitleBoxFgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "TitleBoxColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "TitleBoxColor", SettingText, sizeof(SettingText))) { UiTitleBoxBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "MessageBoxTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MessageBoxTextColor", SettingText, sizeof(SettingText))) { UiMessageBoxFgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "MessageBoxColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MessageBoxColor", SettingText, sizeof(SettingText))) { UiMessageBoxBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "MenuTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MenuTextColor", SettingText, sizeof(SettingText))) { UiMenuFgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "MenuColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MenuColor", SettingText, sizeof(SettingText))) { UiMenuBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "TextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "TextColor", SettingText, sizeof(SettingText))) { UiTextColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "SelectedTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "SelectedTextColor", SettingText, sizeof(SettingText))) { UiSelectedTextColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "SelectedColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "SelectedColor", SettingText, sizeof(SettingText))) { UiSelectedTextBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "EditBoxTextColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "EditBoxTextColor", SettingText, sizeof(SettingText))) { UiEditBoxTextColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "EditBoxColor", SettingText, 260)) + if (IniReadSettingByName(SectionId, "EditBoxColor", SettingText, sizeof(SettingText))) { UiEditBoxBgColor = UiTextToColor(SettingText); } - if (IniReadSettingByName(SectionId, "SpecialEffects", SettingText, 260)) + if (IniReadSettingByName(SectionId, "SpecialEffects", SettingText, sizeof(SettingText))) { if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) { @@ -171,7 +171,7 @@ UiUseSpecialEffects = FALSE; } } - if (IniReadSettingByName(SectionId, "ShowTime", SettingText, 260)) + if (IniReadSettingByName(SectionId, "ShowTime", SettingText, sizeof(SettingText))) { if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) { @@ -182,7 +182,7 @@ UiDrawTime = FALSE; } } - if (IniReadSettingByName(SectionId, "MinimalUI", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MinimalUI", SettingText, sizeof(SettingText))) { if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) { @@ -193,7 +193,7 @@ UiMinimal = FALSE; } } - if (IniReadSettingByName(SectionId, "MenuBox", SettingText, 260)) + if (IniReadSettingByName(SectionId, "MenuBox", SettingText, sizeof(SettingText))) { if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) { @@ -204,7 +204,7 @@ UiMenuBox = FALSE; } } - if (IniReadSettingByName(SectionId, "CenterMenu", SettingText, 260)) + if (IniReadSettingByName(SectionId, "CenterMenu", SettingText, sizeof(SettingText))) { if (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3) { @@ -595,7 +595,7 @@ // for (Idx=0; Idx<IniGetNumSectionItems(SectionId); Idx++) { - IniReadSettingByNumber(SectionId, Idx, SettingName, 79, SettingValue, 79); + IniReadSettingByNumber(SectionId, Idx, SettingName, sizeof(SettingName), SettingValue, sizeof(SettingValue)); if (_stricmp(SettingName, "MessageBox") == 0) { @@ -610,7 +610,7 @@ if (MessageBoxText) { // Get the MessageBox text - IniReadSettingByNumber(SectionId, Idx, SettingName, 80, MessageBoxText, MessageBoxTextSize); + IniReadSettingByNumber(SectionId, Idx, SettingName, sizeof(SettingName), MessageBoxText, MessageBoxTextSize); // Fix it up UiEscapeString(MessageBoxText);

1 0

[ekohl] 24836: - Move global variables into a struct that is attached to the property sheet page dialog. - Remove trailing whitespace and tabs. - Clean up the source code.
by ekohl＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: ekohl Date: Sun Nov 26 15:47:56 2006 New Revision: 24836 URL: http://svn.reactos.org/svn/reactos?rev=24836&view=rev Log: - Move global variables into a struct that is attached to the property sheet page dialog. - Remove trailing whitespace and tabs. - Clean up the source code. Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/background.c trunk/reactos/dll/cpl/desk/de.rc trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.h trunk/reactos/dll/cpl/desk/dibitmap.c trunk/reactos/dll/cpl/desk/screensaver.c 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 Sun Nov 26 15:47:56 2006 @@ -10,26 +10,25 @@ #include "desk.h" -INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) +INT_PTR CALLBACK +AppearancePageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) { UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(hwndDlg); - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: - { - } break; - + break; + case WM_COMMAND: - { - } break; + break; } - + return FALSE; } Modified: trunk/reactos/dll/cpl/desk/background.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/background.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/background.c (original) +++ trunk/reactos/dll/cpl/desk/background.c Sun Nov 26 15:47:56 2006 @@ -20,40 +20,36 @@ typedef struct { BOOL bWallpaper; /* Is this background a wallpaper */ - + TCHAR szFilename[MAX_PATH]; TCHAR szDisplayName[256]; - + } BackgroundItem; -BackgroundItem g_backgroundItems[MAX_BACKGROUNDS]; - -DIBitmap *g_pWallpaperBitmap = NULL; - -int g_placementSelection = 0; -int g_backgroundSelection = 0; - -/* this holds current selection of background color */ -COLORREF g_backgroundDesktopColor = 0; -/* this holds selection of custom colors in dialog box */ -COLORREF custom_colors[16] = {0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0}; - -int g_listViewItemCount = 0; - -HWND g_hBackgroundPage = NULL; -HWND g_hBackgroundList = NULL; -HWND g_hBackgroundPreview = NULL; - -HWND g_hPlacementCombo = NULL; -HWND g_hColorButton = NULL; - -HIMAGELIST g_hShellImageList = NULL; - -static HBITMAP hBitmap = NULL; -static int cxSource, cySource; +typedef struct _GLOBAL_DATA +{ + BackgroundItem backgroundItems[MAX_BACKGROUNDS]; + + PDIBITMAP pWallpaperBitmap; + + int placementSelection; + int backgroundSelection; + + COLORREF backgroundDesktopColor; + COLORREF custom_colors[16]; + + int listViewItemCount; + + HBITMAP hBitmap; + int cxSource; + int cySource; +} GLOBAL_DATA, *PGLOBAL_DATA; + + /* Add the images in the C:\ReactOS directory and the current wallpaper if any */ -void AddListViewItems() +static VOID +AddListViewItems(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { WIN32_FIND_DATA fd; HANDLE hFind; @@ -73,42 +69,45 @@ BackgroundItem *backgroundItem = NULL; TCHAR separators[] = TEXT(";"); TCHAR *token; - - GetClientRect(g_hBackgroundList, &clientRect); - + HWND hwndBackgroundList; + + hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); + + GetClientRect(hwndBackgroundList, &clientRect); + + /* Add a new column to the list */ ZeroMemory(&dummy, sizeof(LV_COLUMN)); dummy.mask = LVCF_SUBITEM | LVCF_WIDTH; dummy.iSubItem = 0; dummy.cx = (clientRect.right - clientRect.left) - GetSystemMetrics(SM_CXVSCROLL); - - (void)ListView_InsertColumn(g_hBackgroundList, 0, &dummy); - + ListView_InsertColumn(hwndBackgroundList, 0, &dummy); + /* Add the "None" item */ - backgroundItem = &g_backgroundItems[g_listViewItemCount]; + backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; backgroundItem->bWallpaper = FALSE; LoadString(hApplet, IDS_NONE, backgroundItem->szDisplayName, sizeof(backgroundItem->szDisplayName) / sizeof(TCHAR)); - + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.state = LVIS_SELECTED; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = -1; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; - - (void)ListView_InsertItem(g_hBackgroundList, &listItem); - ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - - g_listViewItemCount++; + listItem.iItem = pGlobalData->listViewItemCount; + listItem.lParam = pGlobalData->listViewItemCount; + + ListView_InsertItem(hwndBackgroundList, &listItem); + ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + + pGlobalData->listViewItemCount++; /* Add current wallpaper if any */ RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); + result = RegQueryValueEx(regKey, TEXT("Wallpaper"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); - - if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) + if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) { himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, 0, @@ -117,16 +116,15 @@ SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if(himl != NULL) + if (himl != NULL) { - if(i++ == 0) + if (i++ == 0) { - g_hShellImageList = himl; - (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } - backgroundItem = &g_backgroundItems[g_listViewItemCount]; - + backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem->bWallpaper = TRUE; _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); @@ -137,43 +135,42 @@ listItem.state = LVIS_SELECTED; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; - - (void)ListView_InsertItem(g_hBackgroundList, &listItem); - ListView_SetItemState(g_hBackgroundList, g_listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); - - g_listViewItemCount++; + listItem.iItem = pGlobalData->listViewItemCount; + listItem.lParam = pGlobalData->listViewItemCount; + + ListView_InsertItem(hwndBackgroundList, &listItem); + ListView_SetItemState(hwndBackgroundList, pGlobalData->listViewItemCount, LVIS_SELECTED, LVIS_SELECTED); + + pGlobalData->listViewItemCount++; } } - + RegCloseKey(regKey); /* Add all the images in the C:\ReactOS directory. */ LoadString(hApplet, IDS_SUPPORTED_EXT, szFileTypes, sizeof(szFileTypes) / sizeof(TCHAR)); - - - token = _tcstok ( szFileTypes, separators ); - while ( token != NULL ) + + token = _tcstok(szFileTypes, separators); + while (token != NULL) { GetWindowsDirectory(szSearchPath, MAX_PATH); _tcscat(szSearchPath, TEXT("\\")); _tcscat(szSearchPath, token); - + hFind = FindFirstFile(szSearchPath, &fd); - while(hFind != INVALID_HANDLE_VALUE) + while (hFind != INVALID_HANDLE_VALUE) { /* Don't add any hidden bitmaps */ - if((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) + if ((fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) == 0) { TCHAR filename[MAX_PATH]; - + GetWindowsDirectory(filename, MAX_PATH); _tcscat(filename, TEXT("\\")); _tcscat(filename, fd.cFileName); - + himl = (HIMAGELIST)SHGetFileInfo(filename, 0, &sfi, @@ -181,18 +178,18 @@ SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if(himl == NULL) break; - - if(i++ == 0) + if (himl == NULL) + break; + + if (i++ == 0) { - g_hShellImageList = himl; - (void)ListView_SetImageList(g_hBackgroundList, himl, LVSIL_SMALL); + ListView_SetImageList(hwndBackgroundList, himl, LVSIL_SMALL); } - backgroundItem = &g_backgroundItems[g_listViewItemCount]; + backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; backgroundItem->bWallpaper = TRUE; - + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); _tcscpy(backgroundItem->szFilename, filename); @@ -201,23 +198,25 @@ listItem.pszText = backgroundItem->szDisplayName; listItem.state = 0; listItem.iImage = sfi.iIcon; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; - - (void)ListView_InsertItem(g_hBackgroundList, &listItem); - - g_listViewItemCount++; + listItem.iItem = pGlobalData->listViewItemCount; + listItem.lParam = pGlobalData->listViewItemCount; + + ListView_InsertItem(hwndBackgroundList, &listItem); + + pGlobalData->listViewItemCount++; } - + if(!FindNextFile(hFind, &fd)) hFind = INVALID_HANDLE_VALUE; } - token = _tcstok ( NULL, separators ); - } -} - -void InitBackgroundDialog() + token = _tcstok(NULL, separators); + } +} + + +static VOID +InitBackgroundDialog(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { TCHAR szString[256]; HKEY regKey; @@ -226,27 +225,23 @@ DWORD varType = REG_SZ; LONG result; BITMAP bitmap; - - g_backgroundDesktopColor = GetSysColor( COLOR_BACKGROUND ); - g_hBackgroundList = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_LIST); - g_hBackgroundPreview = GetDlgItem(g_hBackgroundPage, IDC_BACKGROUND_PREVIEW); - g_hPlacementCombo = GetDlgItem(g_hBackgroundPage, IDC_PLACEMENT_COMBO); - g_hColorButton = GetDlgItem(g_hBackgroundPage, IDC_COLOR_BUTTON); - - AddListViewItems(); - + + pGlobalData->backgroundDesktopColor = GetSysColor(COLOR_BACKGROUND); + + AddListViewItems(hwndDlg, pGlobalData); + LoadString(hApplet, IDS_CENTER, szString, sizeof(szString) / sizeof(TCHAR)); - SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_CENTER, (LPARAM)szString); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_CENTER, (LPARAM)szString); LoadString(hApplet, IDS_STRETCH, szString, sizeof(szString) / sizeof(TCHAR)); - SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_STRETCH, (LPARAM)szString); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_STRETCH, (LPARAM)szString); LoadString(hApplet, IDS_TILE, szString, sizeof(szString) / sizeof(TCHAR)); - SendMessage(g_hPlacementCombo, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_INSERTSTRING, PLACEMENT_TILE, (LPARAM)szString); /* Load the default settings from the registry */ result = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - if( result != ERROR_SUCCESS ) + if (result != ERROR_SUCCESS) { /* reg key open failed; maybe it does not exist? create it! */ DWORD dwDisposition = 0; @@ -256,122 +251,136 @@ /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ /* this case :( */ } - + result = RegQueryValueEx(regKey, TEXT("WallpaperStyle"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); - - if(result == ERROR_SUCCESS) - { - if(_ttoi(szBuffer) == 0) + if (result == ERROR_SUCCESS) + { + if (_ttoi(szBuffer) == 0) { - SendMessage(g_hPlacementCombo, CB_SETCURSEL, PLACEMENT_CENTER, 0); - g_placementSelection = PLACEMENT_CENTER; + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); + pGlobalData->placementSelection = PLACEMENT_CENTER; } - if(_ttoi(szBuffer) == 2) + if (_ttoi(szBuffer) == 2) { - SendMessage(g_hPlacementCombo, CB_SETCURSEL, PLACEMENT_STRETCH, 0); - g_placementSelection = PLACEMENT_STRETCH; + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_STRETCH, 0); + pGlobalData->placementSelection = PLACEMENT_STRETCH; } } else { - SendMessage(g_hPlacementCombo, CB_SETCURSEL, PLACEMENT_CENTER, 0); - g_placementSelection = PLACEMENT_CENTER; - } - + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_CENTER, 0); + pGlobalData->placementSelection = PLACEMENT_CENTER; + } + result = RegQueryValueEx(regKey, TEXT("TileWallpaper"), 0, &varType, (LPBYTE)szBuffer, &bufferSize); - - if(result == ERROR_SUCCESS) - { - if(_ttoi(szBuffer) == 1) + if (result == ERROR_SUCCESS) + { + if (_ttoi(szBuffer) == 1) { - SendMessage(g_hPlacementCombo, CB_SETCURSEL, PLACEMENT_TILE, 0); - g_placementSelection = PLACEMENT_TILE; + SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_SETCURSEL, PLACEMENT_TILE, 0); + pGlobalData->placementSelection = PLACEMENT_TILE; } } RegCloseKey(regKey); - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); - if (hBitmap != NULL) - { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); - - cxSource = bitmap.bmWidth; - cySource = bitmap.bmHeight; - } -} - -void OnColorButton() + pGlobalData->hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT); + if (pGlobalData->hBitmap != NULL) + { + GetObject(pGlobalData->hBitmap, sizeof(BITMAP), &bitmap); + + pGlobalData->cxSource = bitmap.bmWidth; + pGlobalData->cySource = bitmap.bmHeight; + } +} + + +static VOID +OnColorButton(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { /* Load custom colors from Registry */ HKEY hKey = NULL; LONG res = ERROR_SUCCESS; CHOOSECOLOR cc; - res = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, NULL, 0, - KEY_ALL_ACCESS, NULL, &hKey, NULL ); + + res = RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, NULL, 0, + KEY_ALL_ACCESS, NULL, &hKey, NULL); /* Now the key is either created or opened existing, if res == ERROR_SUCCESS */ - if( res == ERROR_SUCCESS ) + if (res == ERROR_SUCCESS) { /* Key opened */ DWORD dwType = REG_BINARY; - DWORD cbData = sizeof(custom_colors); - res = RegQueryValueEx( hKey, TEXT("CustomColors"), NULL, &dwType, - (LPBYTE)custom_colors, &cbData ); - RegCloseKey( hKey ); + DWORD cbData = sizeof(pGlobalData->custom_colors); + res = RegQueryValueEx(hKey, TEXT("CustomColors"), NULL, &dwType, + (LPBYTE)pGlobalData->custom_colors, &cbData); + RegCloseKey(hKey); hKey = NULL; } - + /* Launch ChooseColor() dialog */ cc.lStructSize = sizeof(CHOOSECOLOR); - cc.hwndOwner = g_hBackgroundPage; + cc.hwndOwner = hwndDlg; cc.hInstance = NULL; - cc.rgbResult = g_backgroundDesktopColor; - cc.lpCustColors = custom_colors; + cc.rgbResult = pGlobalData->backgroundDesktopColor; + cc.lpCustColors = pGlobalData->custom_colors; cc.Flags = CC_ANYCOLOR | /* Causes the dialog box to display all available colors in the set of basic colors. */ CC_FULLOPEN | /* opens dialog in full size */ CC_RGBINIT ; /* init chosen color by rgbResult value */ cc.lCustData = 0; cc.lpfnHook = NULL; cc.lpTemplateName = NULL; - if( ChooseColor( &cc ) ) + if (ChooseColor(&cc)) { /* Save selected color to var */ - g_backgroundDesktopColor = cc.rgbResult; + pGlobalData->backgroundDesktopColor = cc.rgbResult; + /* Allpy buuton will be activated */ - PropSheet_Changed( GetParent( g_hBackgroundPage ), g_hBackgroundPage ); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + /* Window will be updated :) */ - InvalidateRect(g_hBackgroundPreview, NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); + /* Save custom colors to reg. To this moment key must be ceated already. See above */ - res = RegOpenKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, - KEY_WRITE, &hKey ); - if( res == ERROR_SUCCESS ) + res = RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Appearance"), 0, + KEY_WRITE, &hKey); + if (res == ERROR_SUCCESS) { /* Key opened */ - RegSetValueEx( hKey, TEXT("CustomColors"), 0, REG_BINARY, - (const BYTE *)custom_colors, sizeof(custom_colors) ); - RegCloseKey( hKey ); + RegSetValueEx(hKey, TEXT("CustomColors"), 0, REG_BINARY, + (const BYTE *)pGlobalData->custom_colors, sizeof(pGlobalData->custom_colors)); + RegCloseKey(hKey); hKey = NULL; } } } -BOOL CheckListViewFilenameExists(HWND hWndList, LPCTSTR tszFileName) -{ - /* ListView_FindItem() Macro: Searches for a list-view item with the specified * - * characteristics. Returns the index of the item if successful, or -1 otherwise */ + +/* + * ListView_FindItem() Macro: Searches for a list-view item with the specified + * characteristics. Returns the index of the item if successful, or -1 otherwise + */ +static BOOL +CheckListViewFilenameExists(HWND hwndList, LPCTSTR tszFileName) +{ LVFINDINFO lvfi; int retVal; + lvfi.flags = LVFI_STRING; /* search item by EXACT string */ lvfi.psz = tszFileName; /* string to search */ + /* other items of this structure are not valid, besacuse flags are not set. */ - retVal = ListView_FindItem( hWndList, -1, &lvfi ); - if( retVal != -1 ) return TRUE; /* item found! */ + retVal = ListView_FindItem(hwndList, -1, &lvfi); + if (retVal != -1) + return TRUE; /* item found! */ + return FALSE; /* item not found. */ } -void OnBrowseButton() + +static VOID +OnBrowseButton(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { OPENFILENAME ofn; TCHAR filename[MAX_PATH]; @@ -380,11 +389,14 @@ BackgroundItem *backgroundItem = NULL; SHFILEINFO sfi; LV_ITEM listItem; + HWND hwndBackgroundList; + + hwndBackgroundList = GetDlgItem(hwndDlg, IDC_BACKGROUND_LIST); ZeroMemory(&ofn, sizeof(OPENFILENAME)); ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = g_hBackgroundPage; + ofn.hwndOwner = hwndDlg; ofn.lpstrFile = filename; LoadString(hApplet, IDS_BACKGROUND_COMDLG_FILTER, filter, sizeof(filter) / sizeof(TCHAR)); @@ -400,74 +412,79 @@ ofn.lpstrInitialDir = NULL; ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - if(GetOpenFileName(&ofn) == TRUE) + if (GetOpenFileName(&ofn) == TRUE) { /* Check if there is already a entry that holds this filename */ - if(CheckListViewFilenameExists(g_hBackgroundList, ofn.lpstrFileTitle) == TRUE) + if (CheckListViewFilenameExists(hwndBackgroundList, ofn.lpstrFileTitle) == TRUE) return; - - if(g_listViewItemCount > (MAX_BACKGROUNDS - 1)) + + if (pGlobalData->listViewItemCount > (MAX_BACKGROUNDS - 1)) return; - + SHGetFileInfo(filename, 0, &sfi, sizeof(sfi), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - - backgroundItem = &g_backgroundItems[g_listViewItemCount]; - + + backgroundItem = &pGlobalData->backgroundItems[pGlobalData->listViewItemCount]; + backgroundItem->bWallpaper = TRUE; - + _tcscpy(backgroundItem->szDisplayName, sfi.szDisplayName); _tcscpy(backgroundItem->szFilename, filename); - + ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_STATE | LVIF_IMAGE; listItem.state = 0; listItem.pszText = backgroundItem->szDisplayName; listItem.iImage = sfi.iIcon; - listItem.iItem = g_listViewItemCount; - listItem.lParam = g_listViewItemCount; - - (void)ListView_InsertItem(g_hBackgroundList, &listItem); - - g_listViewItemCount++; - } -} - -void ListViewItemChanged(int itemIndex) + listItem.iItem = pGlobalData->listViewItemCount; + listItem.lParam = pGlobalData->listViewItemCount; + + ListView_InsertItem(hwndBackgroundList, &listItem); + + pGlobalData->listViewItemCount++; + } +} + + +static VOID +ListViewItemChanged(HWND hwndDlg, PGLOBAL_DATA pGlobalData, int itemIndex) { BackgroundItem *backgroundItem = NULL; - - g_backgroundSelection = itemIndex; - backgroundItem = &g_backgroundItems[g_backgroundSelection]; - - if(g_pWallpaperBitmap != NULL) - { - DibFreeImage(g_pWallpaperBitmap); - g_pWallpaperBitmap = NULL; - } - - if(backgroundItem->bWallpaper == TRUE) - { - g_pWallpaperBitmap = DibLoadImage(backgroundItem->szFilename); - - if(g_pWallpaperBitmap == NULL) - { + + pGlobalData->backgroundSelection = itemIndex; + backgroundItem = &pGlobalData->backgroundItems[pGlobalData->backgroundSelection]; + + if (pGlobalData->pWallpaperBitmap != NULL) + { + DibFreeImage(pGlobalData->pWallpaperBitmap); + pGlobalData->pWallpaperBitmap = NULL; + } + + if (backgroundItem->bWallpaper == TRUE) + { + pGlobalData->pWallpaperBitmap = DibLoadImage(backgroundItem->szFilename); + + if (pGlobalData->pWallpaperBitmap == NULL) return; - } - } - - InvalidateRect(g_hBackgroundPreview, NULL, TRUE); - - EnableWindow(g_hColorButton, (backgroundItem->bWallpaper == FALSE ? TRUE : FALSE)); - EnableWindow(g_hPlacementCombo, backgroundItem->bWallpaper); - - PropSheet_Changed(GetParent(g_hBackgroundPage), g_hBackgroundPage); -} - -void DrawBackgroundPreview(LPDRAWITEMSTRUCT draw) + } + + InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), + NULL, TRUE); + + EnableWindow(GetDlgItem(hwndDlg, IDC_COLOR_BUTTON), + (backgroundItem->bWallpaper == FALSE ? TRUE : FALSE)); + EnableWindow(GetDlgItem(hwndDlg, IDC_PLACEMENT_COMBO), + backgroundItem->bWallpaper); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); +} + + +static VOID +DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PGLOBAL_DATA pGlobalData) { float scaleX; float scaleY; @@ -475,143 +492,147 @@ int scaledHeight; int posX; int posY; - - if(g_backgroundItems[g_backgroundSelection].bWallpaper == FALSE) + HBRUSH hBrush; + int x; + int y; + + if (pGlobalData->backgroundItems[pGlobalData->backgroundSelection].bWallpaper == FALSE) { /* update desktop background color image */ - HBRUSH hBrush = CreateSolidBrush( g_backgroundDesktopColor ); - FillRect(draw->hDC, &draw->rcItem, hBrush ); - DeleteObject( hBrush ); + hBrush = CreateSolidBrush(pGlobalData->backgroundDesktopColor); + FillRect(draw->hDC, &draw->rcItem, hBrush); + DeleteObject(hBrush); return; } - - if(g_pWallpaperBitmap == NULL) + + if (pGlobalData->pWallpaperBitmap == NULL) return; scaleX = ((float)GetSystemMetrics(SM_CXSCREEN) - 1) / (float)draw->rcItem.right; scaleY = ((float)GetSystemMetrics(SM_CYSCREEN) - 1) / (float)draw->rcItem.bottom; - scaledWidth = g_pWallpaperBitmap->width / scaleX; - scaledHeight = g_pWallpaperBitmap->height / scaleY; - + scaledWidth = pGlobalData->pWallpaperBitmap->width / scaleX; + scaledHeight = pGlobalData->pWallpaperBitmap->height / scaleY; + posX = (draw->rcItem.right / 2) - (scaledWidth / 2); posY = (draw->rcItem.bottom / 2) - (scaledHeight / 2); - + FillRect(draw->hDC, &draw->rcItem, GetSysColorBrush(COLOR_BACKGROUND)); - + SetStretchBltMode(draw->hDC, COLORONCOLOR); - - if(g_placementSelection == PLACEMENT_CENTER) - { - StretchDIBits(draw->hDC, - posX, - posY, - scaledWidth, - scaledHeight, - 0, - 0, - g_pWallpaperBitmap->width, - g_pWallpaperBitmap->height, - g_pWallpaperBitmap->bits, - g_pWallpaperBitmap->info, - DIB_RGB_COLORS, - SRCCOPY); - } - - if(g_placementSelection == PLACEMENT_STRETCH) - { - StretchDIBits(draw->hDC, - 0, - 0, - draw->rcItem.right, - draw->rcItem.bottom, - 0, - 0, - g_pWallpaperBitmap->width, - g_pWallpaperBitmap->height, - g_pWallpaperBitmap->bits, - g_pWallpaperBitmap->info, - DIB_RGB_COLORS, - SRCCOPY); - } - - if(g_placementSelection == PLACEMENT_TILE) - { - int x; - int y; - - for(y = 0; y < draw->rcItem.bottom; y += scaledHeight) - { - for(x = 0; x < draw->rcItem.right; x += scaledWidth) + + switch (pGlobalData->placementSelection) + { + case PLACEMENT_CENTER: + StretchDIBits(draw->hDC, + posX, + posY, + scaledWidth, + scaledHeight, + 0, + 0, + pGlobalData->pWallpaperBitmap->width, + pGlobalData->pWallpaperBitmap->height, + pGlobalData->pWallpaperBitmap->bits, + pGlobalData->pWallpaperBitmap->info, + DIB_RGB_COLORS, + SRCCOPY); + break; + + case PLACEMENT_STRETCH: + StretchDIBits(draw->hDC, + 0, + 0, + draw->rcItem.right, + draw->rcItem.bottom, + 0, + 0, + pGlobalData->pWallpaperBitmap->width, + pGlobalData->pWallpaperBitmap->height, + pGlobalData->pWallpaperBitmap->bits, + pGlobalData->pWallpaperBitmap->info, + DIB_RGB_COLORS, + SRCCOPY); + break; + + case PLACEMENT_TILE: + for (y = 0; y < draw->rcItem.bottom; y += scaledHeight) { - StretchDIBits(draw->hDC, - x, - y, - scaledWidth, - scaledHeight, - 0, - 0, - g_pWallpaperBitmap->width, - g_pWallpaperBitmap->height, - g_pWallpaperBitmap->bits, - g_pWallpaperBitmap->info, - DIB_RGB_COLORS, - SRCCOPY); + for (x = 0; x < draw->rcItem.right; x += scaledWidth) + { + StretchDIBits(draw->hDC, + x, + y, + scaledWidth, + scaledHeight, + 0, + 0, + pGlobalData->pWallpaperBitmap->width, + pGlobalData->pWallpaperBitmap->height, + pGlobalData->pWallpaperBitmap->bits, + pGlobalData->pWallpaperBitmap->info, + DIB_RGB_COLORS, + SRCCOPY); + } } - } - } -} - -void SetWallpaper() + break; + } +} + + +static VOID +SetWallpaper(PGLOBAL_DATA pGlobalData) { HKEY regKey; - + RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - if(g_placementSelection == PLACEMENT_TILE) + if (pGlobalData->placementSelection == PLACEMENT_TILE) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("1"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); } - - if(g_placementSelection == PLACEMENT_CENTER) + + if (pGlobalData->placementSelection == PLACEMENT_CENTER) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); } - if(g_placementSelection == PLACEMENT_STRETCH) + if (pGlobalData->placementSelection == PLACEMENT_STRETCH) { RegSetValueEx(regKey, TEXT("TileWallpaper"), 0, REG_SZ, (BYTE *)TEXT("0"), sizeof(TCHAR) * 2); RegSetValueEx(regKey, TEXT("WallpaperStyle"), 0, REG_SZ, (BYTE *)TEXT("2"), sizeof(TCHAR) * 2); } - + RegCloseKey(regKey); - - if(g_backgroundItems[g_backgroundSelection].bWallpaper == TRUE) + + if (pGlobalData->backgroundItems[pGlobalData->backgroundSelection].bWallpaper == TRUE) { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, - g_backgroundItems[g_backgroundSelection].szFilename, + pGlobalData->backgroundItems[pGlobalData->backgroundSelection].szFilename, SPIF_UPDATEINIFILE); } else - { + { SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); } } -void SetDesktopBackColor() -{ - /* Change system color */ + +/* Change system color */ +static VOID +SetDesktopBackColor(HWND hwndDlg, PGLOBAL_DATA pGlobalData) +{ INT iElement = COLOR_BACKGROUND; - HKEY hKey; - LONG result; + HKEY hKey; + LONG result; TCHAR clText[16]; - DWORD red, green, blue; - - if( !SetSysColors( 1, &iElement, &g_backgroundDesktopColor ) ) - MessageBox( g_hBackgroundPage, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ + DWORD red, green, blue; + + if( !SetSysColors( 1, &iElement, &pGlobalData->backgroundDesktopColor ) ) + MessageBox(hwndDlg, TEXT("SetSysColor() failed!"), /* these error texts can need internationalization? */ TEXT("Error!"), MB_ICONSTOP ); /* Write color to registry key: HKEY_CURRENT_USER\Control Panel\Colors\Background */ hKey = NULL; @@ -626,61 +647,60 @@ /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ /* this case :( */ } - red = GetRValue( g_backgroundDesktopColor ); - green = GetGValue( g_backgroundDesktopColor ); - blue = GetBValue( g_backgroundDesktopColor ); - _stprintf( clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ - RegSetValueEx( hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); - RegCloseKey( hKey ); -} - -INT_PTR CALLBACK BackgroundPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - g_hBackgroundPage = hwndDlg; - - switch(uMsg) + red = GetRValue(pGlobalData->backgroundDesktopColor); + green = GetGValue(pGlobalData->backgroundDesktopColor); + blue = GetBValue(pGlobalData->backgroundDesktopColor); + _stprintf(clText, TEXT("%d %d %d"), red, green, blue ); /* format string to be set to registry */ + RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, lstrlen( clText )*sizeof(TCHAR) + sizeof(TCHAR) ); + RegCloseKey(hKey); +} + + +INT_PTR CALLBACK +BackgroundPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) { case WM_INITDIALOG: + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + InitBackgroundDialog(hwndDlg, pGlobalData); + break; + + case WM_COMMAND: { - InitBackgroundDialog(); - } break; - - case WM_COMMAND: - { DWORD controlId = LOWORD(wParam); DWORD command = HIWORD(wParam); - - switch(controlId) + + switch (controlId) { case IDC_COLOR_BUTTON: + if (command == BN_CLICKED) + OnColorButton(hwndDlg, pGlobalData); + break; + + case IDC_BROWSE_BUTTON: + if (command == BN_CLICKED) + OnBrowseButton(hwndDlg, pGlobalData); + break; + + case IDC_PLACEMENT_COMBO: + if (command == CBN_SELCHANGE) { - if(command == BN_CLICKED) - OnColorButton(); - - } break; - - case IDC_BROWSE_BUTTON: - { - if(command == BN_CLICKED) - OnBrowseButton(); - - } break; - - case IDC_PLACEMENT_COMBO: - { - if(command == CBN_SELCHANGE) - { - g_placementSelection = (int)SendMessage(g_hPlacementCombo, CB_GETCURSEL, 0, 0); - - InvalidateRect(g_hBackgroundPreview, NULL, TRUE); - - PropSheet_Changed(GetParent(g_hBackgroundPage), g_hBackgroundPage); - } - - } break; + pGlobalData->placementSelection = (int)SendDlgItemMessage(hwndDlg, IDC_PLACEMENT_COMBO, CB_GETCURSEL, 0, 0); + + InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUND_PREVIEW), NULL, TRUE); + + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + } + break; } } break; @@ -688,71 +708,68 @@ { PAINTSTRUCT ps; HDC hdc, hdcMem; - + hdc = BeginPaint(hwndDlg, &ps); - + hdcMem = CreateCompatibleDC(hdc); - SelectObject(hdcMem, hBitmap); - - TransparentBlt(hdc, 98, 0, cxSource, cySource, hdcMem, 0, 0, cxSource, cySource, 0xFF80FF); + SelectObject(hdcMem, pGlobalData->hBitmap); + + TransparentBlt(hdc, 98, 0, + pGlobalData->cxSource, pGlobalData->cySource, hdcMem, 0, 0, + pGlobalData->cxSource, pGlobalData->cySource, 0xFF80FF); DeleteDC(hdcMem); EndPaint(hwndDlg, &ps); - - } break; + } + break; case WM_DRAWITEM: { LPDRAWITEMSTRUCT drawItem; drawItem = (LPDRAWITEMSTRUCT)lParam; - if(drawItem->CtlID == IDC_BACKGROUND_PREVIEW) + if (drawItem->CtlID == IDC_BACKGROUND_PREVIEW) { - DrawBackgroundPreview(drawItem); + DrawBackgroundPreview(drawItem, pGlobalData); } - } break; - + } + break; + case WM_NOTIFY: { LPNMHDR lpnm = (LPNMHDR)lParam; - + switch(lpnm->code) - { + { case PSN_APPLY: - { - SetWallpaper(); - SetDesktopBackColor(); - return TRUE; - } break; + SetWallpaper(pGlobalData); + SetDesktopBackColor(hwndDlg, pGlobalData); + return TRUE; case LVN_ITEMCHANGED: { LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; - - if((nm->uNewState & LVIS_SELECTED) == 0) + + if ((nm->uNewState & LVIS_SELECTED) == 0) return FALSE; - - ListViewItemChanged(nm->iItem); + + ListViewItemChanged(hwndDlg, pGlobalData, nm->iItem); } break; - - default: - break; } - - } break; + } + break; case WM_DESTROY: - { - if(g_pWallpaperBitmap != NULL) - DibFreeImage(g_pWallpaperBitmap); - - DeleteObject(hBitmap); - - } break; - } - + if (pGlobalData->pWallpaperBitmap != NULL) + DibFreeImage(pGlobalData->pWallpaperBitmap); + + DeleteObject(pGlobalData->hBitmap); + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; + } + return FALSE; } Modified: trunk/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/de.rc?rev=248… ============================================================================== --- trunk/reactos/dll/cpl/desk/de.rc (original) +++ trunk/reactos/dll/cpl/desk/de.rc Sun Nov 26 15:47:56 2006 @@ -2,7 +2,7 @@ IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 205 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Desktop" +CAPTION "Hintergrund" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 80, 10, 83, 57, WS_EX_STATICEDGE Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c (original) +++ trunk/reactos/dll/cpl/desk/desk.c Sun Nov 26 15:47:56 2006 @@ -32,7 +32,9 @@ } }; -static VOID InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) + +static VOID +InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -42,20 +44,22 @@ psp->pfnDlgProc = DlgProc; } + /* Display Applet */ -LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) +LONG APIENTRY +DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) { PROPSHEETPAGE psp[4]; PROPSHEETHEADER psh; TCHAR Caption[1024]; - + UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(uMsg); UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); - + ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_USECALLBACK | PSH_PROPTITLE; @@ -66,33 +70,30 @@ psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.nStartPage = 0; psh.ppsp = psp; - + InitPropSheetPage(&psp[0], IDD_BACKGROUND, (DLGPROC) BackgroundPageProc); InitPropSheetPage(&psp[1], IDD_SCREENSAVER, (DLGPROC) ScreenSaverPageProc); InitPropSheetPage(&psp[2], IDD_APPEARANCE, (DLGPROC) AppearancePageProc); InitPropSheetPage(&psp[3], IDD_SETTINGS, (DLGPROC) SettingsPageProc); - + return (LONG)(PropertySheet(&psh) != -1); } /* Control Panel Callback */ -LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) +LONG CALLBACK +CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { int i = (int)lParam1; - - switch(uMsg) + + switch (uMsg) { case CPL_INIT: - { - return TRUE; - } - + return TRUE; + case CPL_GETCOUNT: - { - return NUM_APPLETS; - } - + return NUM_APPLETS; + case CPL_INQUIRE: { CPLINFO *CPlInfo = (CPLINFO*)lParam2; @@ -100,30 +101,30 @@ CPlInfo->idIcon = Applets[i].idIcon; CPlInfo->idName = Applets[i].idName; CPlInfo->idInfo = Applets[i].idDescription; - } break; - + } + break; + case CPL_DBLCLK: - { - Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); - } break; + Applets[i].AppletProc(hwndCPl, uMsg, lParam1, lParam2); + break; } - + return FALSE; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved); - switch(dwReason) + + switch (dwReason) { case DLL_PROCESS_ATTACH: case DLL_THREAD_ATTACH: - { - hApplet = hinstDLL; - } break; + hApplet = hinstDLL; + break; } - + return TRUE; } - Modified: trunk/reactos/dll/cpl/desk/desk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.h?rev=24… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.h (original) +++ trunk/reactos/dll/cpl/desk/desk.h Sun Nov 26 15:47:56 2006 @@ -11,31 +11,27 @@ #include "resource.h" -typedef struct +typedef struct _APPLET { int idIcon; int idName; int idDescription; - APPLET_PROC AppletProc; - } APPLET, *PAPPLET; -extern HINSTANCE hApplet; - -typedef struct +typedef struct _DIBITMAP { BITMAPFILEHEADER *header; BITMAPINFO *info; BYTE *bits; - int width; int height; +} DIBITMAP, *PDIBITMAP; -} DIBitmap; +extern HINSTANCE hApplet; -extern DIBitmap *DibLoadImage(TCHAR *filename); -extern void DibFreeImage(DIBitmap *bitmap); +PDIBITMAP DibLoadImage(LPTSTR lpFilename); +VOID DibFreeImage(PDIBITMAP lpBitmap); DWORD DbgPrint(PCH Format,...); Modified: trunk/reactos/dll/cpl/desk/dibitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/dibitmap.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/dibitmap.c (original) +++ trunk/reactos/dll/cpl/desk/dibitmap.c Sun Nov 26 15:47:56 2006 @@ -10,83 +10,85 @@ #include "desk.h" -DIBitmap *DibLoadImage(TCHAR *filename) +PDIBITMAP +DibLoadImage(LPTSTR lpFilename) { - BOOL bSuccess; - DWORD dwFileSize, dwHighSize, dwBytesRead; - HANDLE hFile; - DIBitmap *bitmap; - - hFile = CreateFile(filename, + BOOL bSuccess; + DWORD dwFileSize, dwHighSize, dwBytesRead; + HANDLE hFile; + PDIBITMAP lpBitmap; + + hFile = CreateFile(lpFilename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); - - if(hFile == INVALID_HANDLE_VALUE) + if (hFile == INVALID_HANDLE_VALUE) return NULL; - + dwFileSize = GetFileSize(hFile, &dwHighSize); - - if(dwHighSize) + + if (dwHighSize) { CloseHandle(hFile); return NULL; } - bitmap = malloc(sizeof(DIBitmap)); - if(!bitmap) + lpBitmap = HeapAlloc(GetProcessHeap(), 0, sizeof(DIBITMAP)); + if (lpBitmap == NULL) return NULL; - - bitmap->header = malloc(dwFileSize); - if(!bitmap->header) + + lpBitmap->header = HeapAlloc(GetProcessHeap(), 0, dwFileSize); + if (lpBitmap->header == NULL) { CloseHandle(hFile); return NULL; } - - bSuccess = ReadFile(hFile, bitmap->header, dwFileSize, &dwBytesRead, NULL); + + bSuccess = ReadFile(hFile, lpBitmap->header, dwFileSize, &dwBytesRead, NULL); CloseHandle(hFile); - - if(!bSuccess || (dwBytesRead != dwFileSize) - || (bitmap->header->bfType != * (WORD *) "BM") - || (bitmap->header->bfSize != dwFileSize)) + + if (!bSuccess || + (dwBytesRead != dwFileSize) || + (lpBitmap->header->bfType != * (WORD *) "BM") || + (lpBitmap->header->bfSize != dwFileSize)) { - free(bitmap->header); + HeapFree(GetProcessHeap(), 0, lpBitmap->header); return NULL; } - - bitmap->info = (BITMAPINFO *)(bitmap->header + 1); - bitmap->bits = (BYTE *)bitmap->header + bitmap->header->bfOffBits; - + + lpBitmap->info = (BITMAPINFO *)(lpBitmap->header + 1); + lpBitmap->bits = (BYTE *)lpBitmap->header + lpBitmap->header->bfOffBits; + /* Get the DIB width and height */ - if(bitmap->info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + if (lpBitmap->info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { - bitmap->width = ((BITMAPCOREHEADER *)bitmap->info)->bcWidth; - bitmap->height = ((BITMAPCOREHEADER *)bitmap->info)->bcHeight; + lpBitmap->width = ((BITMAPCOREHEADER *)lpBitmap->info)->bcWidth; + lpBitmap->height = ((BITMAPCOREHEADER *)lpBitmap->info)->bcHeight; } else { - bitmap->width = bitmap->info->bmiHeader.biWidth; - bitmap->height = abs(bitmap->info->bmiHeader.biHeight); + lpBitmap->width = lpBitmap->info->bmiHeader.biWidth; + lpBitmap->height = abs(lpBitmap->info->bmiHeader.biHeight); } - - return bitmap; + + return lpBitmap; } -void DibFreeImage(DIBitmap *bitmap) + +VOID +DibFreeImage(PDIBITMAP lpBitmap) { - if(bitmap == NULL) + if (lpBitmap == NULL) return; /* Free the header */ - if(bitmap->header != NULL) - free(bitmap->header); + if (lpBitmap->header != NULL) + HeapFree(GetProcessHeap(), 0, lpBitmap->header); /* Free the bitmap structure */ - if(bitmap != NULL) - free(bitmap); + if (lpBitmap != NULL) + HeapFree(GetProcessHeap(), 0, lpBitmap); } - Modified: trunk/reactos/dll/cpl/desk/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/screensaver.c… ============================================================================== --- trunk/reactos/dll/cpl/desk/screensaver.c (original) +++ trunk/reactos/dll/cpl/desk/screensaver.c Sun Nov 26 15:47:56 2006 @@ -13,10 +13,6 @@ #define MAX_SCREENSAVERS 100 -static VOID SetScreenSaver(VOID); -static VOID AddListViewItems(HWND); -static VOID CheckRegScreenSaverIsSecure(HWND); - typedef struct { BOOL bIsScreenSaver; /* Is this background a wallpaper */ @@ -24,12 +20,18 @@ TCHAR szDisplayName[256]; } ScreenSaverItem; -int ImageListSelection = -1; -ScreenSaverItem g_ScreenSaverItems[MAX_SCREENSAVERS]; - -HMENU g_hPopupMenu = NULL; - -VOID ListViewItemAreChanged(HWND hwndDlg, int itemIndex) + +typedef struct _GLOBAL_DATA +{ + ScreenSaverItem g_ScreenSaverItems[MAX_SCREENSAVERS]; + int ImageListSelection; + HMENU g_hPopupMenu; +} GLOBAL_DATA, *PGLOBAL_DATA; + + + +static VOID +ListViewItemAreChanged(HWND hwndDlg, PGLOBAL_DATA pGlobalData, int itemIndex) { BOOL bEnable; LV_ITEM lvItem; @@ -41,7 +43,7 @@ if (!ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES), &lvItem)) return; - ImageListSelection = lvItem.lParam; + pGlobalData->ImageListSelection = lvItem.lParam; bEnable = (lvItem.lParam != 0); @@ -52,8 +54,9 @@ EnableWindow(GetDlgItem(hwndDlg, IDC_SCREENS_TIME), bEnable); } -VOID -ScreensaverConfig(HWND hwndDlg) + +static VOID +ScreensaverConfig(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { /* /p:<hwnd> Run in preview @@ -66,25 +69,26 @@ STARTUPINFO si; PROCESS_INFORMATION pi; - if (ImageListSelection < 1) + if (pGlobalData->ImageListSelection < 1) return; swprintf(szCmdline, L"%s /c:%u", - g_ScreenSaverItems[ImageListSelection].szFilename, + pGlobalData->g_ScreenSaverItems[pGlobalData->ImageListSelection].szFilename, hwndDlg); - ZeroMemory( &si, sizeof(si) ); + ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } -} - -VOID -ScreensaverPreview(HWND hwndDlg) + ZeroMemory(&pi, sizeof(pi)); + if(CreateProcess(NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } +} + + +static VOID +ScreensaverPreview(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { /* /p:<hwnd> Run in preview @@ -97,151 +101,42 @@ STARTUPINFO si; PROCESS_INFORMATION pi; - if (ImageListSelection < 1) + if (pGlobalData->ImageListSelection < 1) return; - swprintf(szCmdline, L"%s /p", g_ScreenSaverItems[ImageListSelection].szFilename); - - ZeroMemory( &si, sizeof(si) ); + swprintf(szCmdline, L"%s /p", + pGlobalData->g_ScreenSaverItems[pGlobalData->ImageListSelection].szFilename); + + ZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcess( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } -} - -VOID -ScreensaverDelete(HWND hwndDlg) + ZeroMemory(&pi, sizeof(pi)); + if(CreateProcess(NULL, szCmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } +} + + +static VOID +ScreensaverDelete(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { SHFILEOPSTRUCT fos; - if (ImageListSelection < 1) // Can NOT delete anything :-) + if (pGlobalData->ImageListSelection < 1) // Can NOT delete anything :-) return; fos.hwnd = hwndDlg; fos.wFunc = FO_DELETE; fos.fFlags = 0; - fos.pFrom = g_ScreenSaverItems[ImageListSelection].szFilename; + fos.pFrom = pGlobalData->g_ScreenSaverItems[pGlobalData->ImageListSelection].szFilename; SHFileOperationW(&fos); } -INT_PTR -CALLBACK -ScreenSaverPageProc(HWND hwndDlg, - UINT uMsg, - WPARAM wParam, - LPARAM lParam) -{ - switch (uMsg) - { - case WM_DESTROY: - { - DestroyMenu(g_hPopupMenu); - break; - } - case WM_INITDIALOG: - { - SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, UDM_SETRANGE, 0, MAKELONG ((short) 240, (short) 0)); - AddListViewItems(hwndDlg); - - g_hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_POPUP_MENU)); - g_hPopupMenu = GetSubMenu(g_hPopupMenu, 0); - - CheckRegScreenSaverIsSecure(hwndDlg); - } break; - - case WM_COMMAND: - { - DWORD controlId = LOWORD(wParam); - DWORD command = HIWORD(wParam); - - switch(controlId) { - case IDC_SCREENS_POWER_BUTTON: // Start Powercfg.Cpl - { - if (command == BN_CLICKED) - WinExec("rundll32 shell32.dll,Control_RunDLL powercfg.cpl,,",SW_SHOWNORMAL); - } break; - case IDC_SCREENS_TESTSC: // Screensaver Preview - { - if(command == BN_CLICKED) - ScreensaverPreview(hwndDlg); - break; - } - case ID_MENU_PREVIEW: - { - ScreensaverPreview(hwndDlg); - break; - } - case ID_MENU_CONFIG: - { - ScreensaverConfig(hwndDlg); - break; - } - case ID_MENU_DELETE: // Delete Screensaver - { - if(command == BN_CLICKED) { - ScreensaverDelete(hwndDlg); - } - } break; - case IDC_SCREENS_SETTINGS: // Screensaver Settings - { - if(command == BN_CLICKED) - ScreensaverConfig(hwndDlg); - break; - } - case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure - { - if(command == BN_CLICKED) - MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); - } break; - case IDC_SCREENS_TIME: // Delay before show screensaver - { - } - default: - break; - } break; - } - case WM_NOTIFY: - { - LPNMHDR lpnm = (LPNMHDR)lParam; - LPNMITEMACTIVATE nmia = (LPNMITEMACTIVATE) lParam; - RECT rc; - - switch(lpnm->code) - { - case PSN_APPLY: - { - SetScreenSaver(); - return TRUE; - } break; - case NM_RCLICK: - { - GetWindowRect(GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES), &rc); - TrackPopupMenuEx(g_hPopupMenu, TPM_RIGHTBUTTON, - rc.left + nmia->ptAction.x, rc.top + nmia->ptAction.y, hwndDlg, NULL); - break; - } - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; - if ((nm->uNewState & LVIS_SELECTED) == 0) - return FALSE; - ListViewItemAreChanged(hwndDlg, nm->iItem); - break; - } - default: - break; - } - } break; - } - - return FALSE; -} - -VOID CheckRegScreenSaverIsSecure(HWND hwndDlg) + +static VOID +CheckRegScreenSaverIsSecure(HWND hwndDlg) { HKEY hKey; TCHAR szBuffer[2]; @@ -255,7 +150,7 @@ if (result == ERROR_SUCCESS) { - if(_ttoi(szBuffer) == 1) + if (_ttoi(szBuffer) == 1) { SendDlgItemMessage(hwndDlg, IDC_SCREENS_USEPASSCHK, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); return; @@ -266,7 +161,8 @@ } -VOID AddListViewItems(HWND hwndDlg) +static VOID +AddListViewItems(HWND hwndDlg, PGLOBAL_DATA pGlobalData) { HWND hwndScreenSaverList = GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES); WIN32_FIND_DATA fd; @@ -298,7 +194,7 @@ (void)ListView_InsertColumn(hwndScreenSaverList, 0, &dummy); /* Add the "None" item */ - ScreenSaverItem = &g_ScreenSaverItems[ScreenlistViewItemCount]; + ScreenSaverItem = &pGlobalData->g_ScreenSaverItems[ScreenlistViewItemCount]; ScreenSaverItem->bIsScreenSaver = FALSE; @@ -326,7 +222,7 @@ result = RegQueryValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, &varType, (LPBYTE)wallpaperFilename, &bufferSize); - if((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) + if ((result == ERROR_SUCCESS) && (_tcslen(wallpaperFilename) > 0)) { himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, 0, @@ -335,9 +231,9 @@ SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_DISPLAYNAME); - if(himl != NULL) + if (himl != NULL) { - if(i++ == 0) + if (i++ == 0) { g_hScreenShellImageList = himl; (void)ListView_SetImageList(g_hScreengroundList, himl, LVSIL_SMALL); @@ -406,7 +302,7 @@ (VOID)ListView_SetImageList(hwndScreenSaverList, himl, LVSIL_SMALL); } - ScreenSaverItem = &g_ScreenSaverItems[ScreenlistViewItemCount]; + ScreenSaverItem = &pGlobalData->g_ScreenSaverItems[ScreenlistViewItemCount]; ScreenSaverItem->bIsScreenSaver = TRUE; @@ -445,14 +341,16 @@ } } -VOID SetScreenSaver(VOID) + +static VOID +SetScreenSaver(PGLOBAL_DATA pGlobalData) { HKEY regKey; RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, KEY_ALL_ACCESS, &regKey); - RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, (BYTE *)g_ScreenSaverItems[ImageListSelection].szFilename, _tcslen(g_ScreenSaverItems[ImageListSelection].szFilename)*sizeof(TCHAR)); - // RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, g_ScreenSaverItems[ImageListSelection].szFilename, sizeof(TCHAR) * 2); - + RegSetValueEx(regKey, TEXT("SCRNSAVE.EXE"), 0, REG_SZ, + (BYTE *)pGlobalData->g_ScreenSaverItems[pGlobalData->ImageListSelection].szFilename, + _tcslen(pGlobalData->g_ScreenSaverItems[pGlobalData->ImageListSelection].szFilename) * sizeof(TCHAR)); RegCloseKey(regKey); @@ -468,3 +366,122 @@ // SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, TEXT(""), SPIF_UPDATEINIFILE); //} } + + +INT_PTR CALLBACK +ScreenSaverPageProc(HWND hwndDlg, + UINT uMsg, + WPARAM wParam, + LPARAM lParam) +{ + PGLOBAL_DATA pGlobalData; + + pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); + + switch (uMsg) + { + case WM_INITDIALOG: + pGlobalData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); + + pGlobalData->ImageListSelection = -1; + + SendDlgItemMessage(hwndDlg, IDC_SCREENS_TIME, UDM_SETRANGE, 0, MAKELONG ((short) 240, (short) 0)); + AddListViewItems(hwndDlg, pGlobalData); + + pGlobalData->g_hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDR_POPUP_MENU)); + pGlobalData->g_hPopupMenu = GetSubMenu(pGlobalData->g_hPopupMenu, 0); + + CheckRegScreenSaverIsSecure(hwndDlg); + break; + + case WM_DESTROY: + DestroyMenu(pGlobalData->g_hPopupMenu); + HeapFree(GetProcessHeap(), 0, pGlobalData); + break; + + case WM_COMMAND: + { + DWORD controlId = LOWORD(wParam); + DWORD command = HIWORD(wParam); + + switch (controlId) + { + case IDC_SCREENS_POWER_BUTTON: // Start Powercfg.Cpl + if (command == BN_CLICKED) + WinExec("rundll32 shell32.dll,Control_RunDLL powercfg.cpl,,",SW_SHOWNORMAL); + break; + + case IDC_SCREENS_TESTSC: // Screensaver Preview + if(command == BN_CLICKED) + ScreensaverPreview(hwndDlg, pGlobalData); + break; + + case ID_MENU_PREVIEW: + ScreensaverPreview(hwndDlg, pGlobalData); + break; + + case ID_MENU_CONFIG: + ScreensaverConfig(hwndDlg, pGlobalData); + break; + + case ID_MENU_DELETE: // Delete Screensaver + if (command == BN_CLICKED) + ScreensaverDelete(hwndDlg, pGlobalData); + break; + + case IDC_SCREENS_SETTINGS: // Screensaver Settings + if (command == BN_CLICKED) + ScreensaverConfig(hwndDlg, pGlobalData); + break; + + case IDC_SCREENS_USEPASSCHK: // Screensaver Is Secure + if (command == BN_CLICKED) + MessageBox(NULL, TEXT("That button doesn't do anything yet"), TEXT("Whoops"), MB_OK); + break; + + case IDC_SCREENS_TIME: // Delay before show screensaver + break; + + default: + break; + } + break; + } + + case WM_NOTIFY: + { + LPNMHDR lpnm = (LPNMHDR)lParam; + LPNMITEMACTIVATE nmia = (LPNMITEMACTIVATE) lParam; + RECT rc; + + switch(lpnm->code) + { + case PSN_APPLY: + SetScreenSaver(pGlobalData); + return TRUE; + + case NM_RCLICK: + GetWindowRect(GetDlgItem(hwndDlg, IDC_SCREENS_CHOICES), &rc); + TrackPopupMenuEx(pGlobalData->g_hPopupMenu, TPM_RIGHTBUTTON, + rc.left + nmia->ptAction.x, rc.top + nmia->ptAction.y, hwndDlg, NULL); + break; + + case LVN_ITEMCHANGED: + { + LPNMLISTVIEW nm = (LPNMLISTVIEW)lParam; + if ((nm->uNewState & LVIS_SELECTED) == 0) + return FALSE; + ListViewItemAreChanged(hwndDlg, pGlobalData, nm->iItem); + break; + } + + default: + break; + } + } + break; + } + + return FALSE; +}

1 0

[greatlrd] 24835: Patch from hto@mail dot cnt dot ru was commited in r24834 for the mouse.c changes. I incress the counter to 500 so I manger getting his patch working even on my old p3 I got the mouse back on my p3 now. See issue #1837 for more details.
by greatlrd＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: greatlrd Date: Sun Nov 26 13:56:02 2006 New Revision: 24835 URL: http://svn.reactos.org/svn/reactos?rev=24835&view=rev Log: Patch from hto@mail dot cnt dot ru was commited in r24834 for the mouse.c changes. I incress the counter to 500 so I manger getting his patch working even on my old p3 I got the mouse back on my p3 now. See issue #1837 for more details. Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Sun Nov 26 13:56:02 2006 @@ -918,7 +918,7 @@ ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; ReplyByte++) { - Counter = 200; + Counter = 500; do { Status = I8042ReadDataWait(DevExt, &Value);

1 0

[greatlrd] 24834: 1. revers 24831 to 24833 userenv.h does not exists in ms psdk and shall move to folder include/ndk or include/reactos 2. do not create new private header, we already have one, but it is in wrong folder. 3. This header should have been move long time ago. 4. do not doing #include "userenv-priv.h" it will not found the header in syssetup/install
by greatlrd＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: greatlrd Date: Sun Nov 26 13:39:50 2006 New Revision: 24834 URL: http://svn.reactos.org/svn/reactos?rev=24834&view=rev Log: 1. revers 24831 to 24833 userenv.h does not exists in ms psdk and shall move to folder include/ndk or include/reactos 2. do not create new private header, we already have one, but it is in wrong folder. 3. This header should have been move long time ago. 4. do not doing #include "userenv-priv.h" it will not found the header in syssetup/install Removed: trunk/reactos/dll/win32/userenv/userenv-priv.h Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/userenv/userenv.rbuild trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/include/psdk/userenv.h Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sun Nov 26 13:39:50 2006 @@ -40,8 +40,6 @@ #include <samlib/samlib.h> #include <syssetup/syssetup.h> #include <userenv.h> -#include "userenv-priv.h" - #include <setupapi.h> #include <shlobj.h> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild Sun Nov 26 13:39:50 2006 @@ -1,7 +1,6 @@ <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> - <include base="userenv">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" /> Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h (original) +++ trunk/reactos/dll/win32/userenv/precomp.h Sun Nov 26 13:39:50 2006 @@ -9,4 +9,3 @@ #include "internal.h" #include "resources.h" -#include "userenv-priv.h" Removed: trunk/reactos/dll/win32/userenv/userenv-priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv-… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv-priv.h (original) +++ trunk/reactos/dll/win32/userenv/userenv-priv.h (removed) @@ -1,176 +1,0 @@ -#ifndef USERENV_PRIV_H__ -#define USERENV_PRIV_H__ - -// -// Private ReactOS only userenv functions -// -// - -BOOL -USERENVAPI -WINAPI -InitializeProfiles( - VOID -); - -BOOL -USERENVAPI -WINAPI -CreateUserProfileA ( - PSID, - LPCSTR -); - -BOOL -USERENVAPI -WINAPI -CreateUserProfileW( - PSID, - LPCWSTR -); - -BOOL -USERENVAPI -WINAPI -AddDesktopItemA( - BOOL, - LPCSTR, - LPCSTR, - LPCSTR, - INT, - LPCSTR, - WORD, - INT -); - -BOOL -USERENVAPI -WINAPI -AddDesktopItemW( - BOOL, - LPCWSTR, - LPCWSTR, - LPCWSTR, - INT, - LPCWSTR, - WORD, - INT -); - -BOOL -USERENVAPI -WINAPI -DeleteDesktopItemA ( - BOOL, - LPCSTR -); - -BOOL -USERENVAPI -WINAPI -DeleteDesktopItemW ( - BOOL, - LPCWSTR -); - -BOOL -USERENVAPI -WINAPI -CreateGroupA ( - LPCSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -CreateGroupW ( - LPCWSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -DeleteGroupA ( - LPCSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -DeleteGroupW ( - LPCWSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -AddItemA( - LPCSTR, - BOOL, - LPCSTR, - LPCSTR, - LPCSTR, - INT, - LPCSTR, - WORD, - INT -); - -BOOL -USERENVAPI -WINAPI -AddItemW ( - LPCWSTR, - BOOL, - LPCWSTR, - LPCWSTR, - LPCWSTR, - INT, - LPCWSTR, - WORD, - INT -); - -BOOL -USERENVAPI -WINAPI -DeleteItemA ( - LPCSTR, - BOOL, - LPCSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -DeleteItemW( - LPCWSTR, - BOOL, - LPCWSTR, - BOOL -); - -BOOL -USERENVAPI -WINAPI -CopyProfileDirectoryA( - LPCSTR, - LPCSTR, - DWORD -); - -BOOL -USERENVAPI -WINAPI -CopyProfileDirectoryW( - LPCWSTR, - LPCWSTR, - DWORD -); - -#endif Modified: trunk/reactos/dll/win32/userenv/userenv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rbuild (original) +++ trunk/reactos/dll/win32/userenv/userenv.rbuild Sun Nov 26 13:39:50 2006 @@ -5,7 +5,6 @@ <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> - <define name="_USERENV_" /> <library>uuid</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Sun Nov 26 13:39:50 2006 @@ -903,6 +903,9 @@ UCHAR Value; UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 }; unsigned ReplyByte; + ULONG Counter; + + I8042Flush(); if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) || ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF)) @@ -915,7 +918,12 @@ ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; ReplyByte++) { - Status = I8042ReadDataWait(DevExt, &Value); + Counter = 200; + + do { + Status = I8042ReadDataWait(DevExt, &Value); + } while (Status == STATUS_IO_TIMEOUT && Counter--); + if (! NT_SUCCESS(Status)) { DPRINT1("No ACK after mouse reset, status 0x%08x\n", Modified: trunk/reactos/include/psdk/userenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/userenv.h?rev… ============================================================================== --- trunk/reactos/include/psdk/userenv.h (original) +++ trunk/reactos/include/psdk/userenv.h Sun Nov 26 13:39:50 2006 @@ -15,13 +15,6 @@ #if (WINVER >= 0x0500) #define RP_FORCE (1) #endif - -#if defined(_USERENV_) -#define USERENVAPI -#else -#define USERENVAPI DECLSPEC_IMPORT -#endif - typedef struct _PROFILEINFOA { @@ -47,34 +40,53 @@ HANDLE hProfile; } PROFILEINFOW, *LPPROFILEINFOW; -BOOL USERENVAPI WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); -BOOL USERENVAPI WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); -BOOL USERENVAPI WINAPI UnloadUserProfile (HANDLE, HANDLE); +/* begin private */ +BOOL WINAPI InitializeProfiles (VOID); +BOOL WINAPI CreateUserProfileA (PSID, LPCSTR); +BOOL WINAPI CreateUserProfileW (PSID, LPCWSTR); +BOOL WINAPI AddDesktopItemA (BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT); +BOOL WINAPI AddDesktopItemW (BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT); +BOOL WINAPI DeleteDesktopItemA (BOOL, LPCSTR); +BOOL WINAPI DeleteDesktopItemW (BOOL, LPCWSTR); +BOOL WINAPI CreateGroupA (LPCSTR, BOOL); +BOOL WINAPI CreateGroupW (LPCWSTR, BOOL); +BOOL WINAPI DeleteGroupA (LPCSTR, BOOL); +BOOL WINAPI DeleteGroupW (LPCWSTR, BOOL); +BOOL WINAPI AddItemA (LPCSTR, BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT); +BOOL WINAPI AddItemW (LPCWSTR, BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT); +BOOL WINAPI DeleteItemA (LPCSTR, BOOL, LPCSTR, BOOL); +BOOL WINAPI DeleteItemW (LPCWSTR, BOOL, LPCWSTR, BOOL); +BOOL WINAPI CopyProfileDirectoryA(LPCSTR, LPCSTR, DWORD); +BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD); +/* end private */ +BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); +BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); +BOOL WINAPI UnloadUserProfile (HANDLE, HANDLE); -BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD); -BOOL USERENVAPI WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD); +BOOL WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD); +BOOL WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD); +BOOL WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD); +BOOL WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD); +BOOL WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD); +BOOL WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD); +BOOL WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD); +BOOL WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD); -BOOL USERENVAPI WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); -BOOL USERENVAPI WINAPI DestroyEnvironmentBlock(LPVOID); +BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); +BOOL WINAPI DestroyEnvironmentBlock(LPVOID); #if (WINVER >= 0x0500) -BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); -BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); +BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); +BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); #endif -HANDLE USERENVAPI WINAPI EnterCriticalPolicySection (BOOL); -BOOL USERENVAPI WINAPI LeaveCriticalPolicySection (HANDLE); -BOOL USERENVAPI WINAPI RefreshPolicy (BOOL); +HANDLE WINAPI EnterCriticalPolicySection (BOOL); +BOOL WINAPI LeaveCriticalPolicySection (HANDLE); +BOOL WINAPI RefreshPolicy (BOOL); #if (WINVER >= 0x0500) -BOOL USERENVAPI WINAPI RefreshPolicyEx (BOOL, DWORD); +BOOL WINAPI RefreshPolicyEx (BOOL, DWORD); #endif -BOOL USERENVAPI WINAPI RegisterGPNotification (HANDLE, BOOL); -BOOL USERENVAPI WINAPI UnregisterGPNotification (HANDLE); +BOOL WINAPI RegisterGPNotification (HANDLE, BOOL); +BOOL WINAPI UnregisterGPNotification (HANDLE); #ifdef UNICODE typedef PROFILEINFOW PROFILEINFO;

1 0

[janderwald] 24833: - finally clean up userenv.h header
by janderwald＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: janderwald Date: Sun Nov 26 13:10:29 2006 New Revision: 24833 URL: http://svn.reactos.org/svn/reactos?rev=24833&view=rev Log: - finally clean up userenv.h header Modified: trunk/reactos/include/psdk/userenv.h Modified: trunk/reactos/include/psdk/userenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/userenv.h?rev… ============================================================================== --- trunk/reactos/include/psdk/userenv.h (original) +++ trunk/reactos/include/psdk/userenv.h Sun Nov 26 13:10:29 2006 @@ -15,6 +15,13 @@ #if (WINVER >= 0x0500) #define RP_FORCE (1) #endif + +#if defined(_USERENV_) +#define USERENVAPI +#else +#define USERENVAPI DECLSPEC_IMPORT +#endif + typedef struct _PROFILEINFOA { @@ -40,53 +47,34 @@ HANDLE hProfile; } PROFILEINFOW, *LPPROFILEINFOW; -/* begin private */ -BOOL WINAPI InitializeProfiles (VOID); -BOOL WINAPI CreateUserProfileA (PSID, LPCSTR); -BOOL WINAPI CreateUserProfileW (PSID, LPCWSTR); -BOOL WINAPI AddDesktopItemA (BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT); -BOOL WINAPI AddDesktopItemW (BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT); -BOOL WINAPI DeleteDesktopItemA (BOOL, LPCSTR); -BOOL WINAPI DeleteDesktopItemW (BOOL, LPCWSTR); -BOOL WINAPI CreateGroupA (LPCSTR, BOOL); -BOOL WINAPI CreateGroupW (LPCWSTR, BOOL); -BOOL WINAPI DeleteGroupA (LPCSTR, BOOL); -BOOL WINAPI DeleteGroupW (LPCWSTR, BOOL); -BOOL WINAPI AddItemA (LPCSTR, BOOL, LPCSTR, LPCSTR, LPCSTR, INT, LPCSTR, WORD, INT); -BOOL WINAPI AddItemW (LPCWSTR, BOOL, LPCWSTR, LPCWSTR, LPCWSTR, INT, LPCWSTR, WORD, INT); -BOOL WINAPI DeleteItemA (LPCSTR, BOOL, LPCSTR, BOOL); -BOOL WINAPI DeleteItemW (LPCWSTR, BOOL, LPCWSTR, BOOL); -BOOL WINAPI CopyProfileDirectoryA(LPCSTR, LPCSTR, DWORD); -BOOL WINAPI CopyProfileDirectoryW(LPCWSTR, LPCWSTR, DWORD); -/* end private */ -BOOL WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); -BOOL WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); -BOOL WINAPI UnloadUserProfile (HANDLE, HANDLE); +BOOL USERENVAPI WINAPI LoadUserProfileA (HANDLE, LPPROFILEINFOA); +BOOL USERENVAPI WINAPI LoadUserProfileW (HANDLE, LPPROFILEINFOW); +BOOL USERENVAPI WINAPI UnloadUserProfile (HANDLE, HANDLE); -BOOL WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD); -BOOL WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD); -BOOL WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD); -BOOL WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD); -BOOL WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD); -BOOL WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD); -BOOL WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD); -BOOL WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryA (LPSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetAllUsersProfileDirectoryW (LPWSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryA (LPSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetDefaultUserProfileDirectoryW (LPWSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetProfilesDirectoryA(LPSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetProfilesDirectoryW(LPWSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetUserProfileDirectoryA(HANDLE, LPSTR, LPDWORD); +BOOL USERENVAPI WINAPI GetUserProfileDirectoryW(HANDLE, LPWSTR, LPDWORD); -BOOL WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); -BOOL WINAPI DestroyEnvironmentBlock(LPVOID); +BOOL USERENVAPI WINAPI CreateEnvironmentBlock(LPVOID*, HANDLE, BOOL); +BOOL USERENVAPI WINAPI DestroyEnvironmentBlock(LPVOID); #if (WINVER >= 0x0500) -BOOL WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); -BOOL WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); +BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserA (HANDLE, LPCSTR, LPSTR, DWORD); +BOOL USERENVAPI WINAPI ExpandEnvironmentStringsForUserW (HANDLE, LPCWSTR, LPWSTR, DWORD); #endif -HANDLE WINAPI EnterCriticalPolicySection (BOOL); -BOOL WINAPI LeaveCriticalPolicySection (HANDLE); -BOOL WINAPI RefreshPolicy (BOOL); +HANDLE USERENVAPI WINAPI EnterCriticalPolicySection (BOOL); +BOOL USERENVAPI WINAPI LeaveCriticalPolicySection (HANDLE); +BOOL USERENVAPI WINAPI RefreshPolicy (BOOL); #if (WINVER >= 0x0500) -BOOL WINAPI RefreshPolicyEx (BOOL, DWORD); +BOOL USERENVAPI WINAPI RefreshPolicyEx (BOOL, DWORD); #endif -BOOL WINAPI RegisterGPNotification (HANDLE, BOOL); -BOOL WINAPI UnregisterGPNotification (HANDLE); +BOOL USERENVAPI WINAPI RegisterGPNotification (HANDLE, BOOL); +BOOL USERENVAPI WINAPI UnregisterGPNotification (HANDLE); #ifdef UNICODE typedef PROFILEINFOW PROFILEINFO;

1 0

[janderwald] 24832: - include userenv base in order to use private userenv functions
by janderwald＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: janderwald Date: Sun Nov 26 13:09:14 2006 New Revision: 24832 URL: http://svn.reactos.org/svn/reactos?rev=24832&view=rev Log: - include userenv base in order to use private userenv functions Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/syssetup.rbuild Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Sun Nov 26 13:09:14 2006 @@ -40,6 +40,8 @@ #include <samlib/samlib.h> #include <syssetup/syssetup.h> #include <userenv.h> +#include "userenv-priv.h" + #include <setupapi.h> #include <shlobj.h> Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rbuild (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild Sun Nov 26 13:09:14 2006 @@ -1,6 +1,7 @@ <module name="syssetup" type="win32dll" baseaddress="${BASEADDRESS_SYSSETUP}" installbase="system32" installname="syssetup.dll"> <importlibrary definition="syssetup.def" /> <include base="syssetup">.</include> + <include base="userenv">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> <define name="_UNICODE" />

1 0

[janderwald] 24831: - move ReactOS userenv only functions to userenv-priv.h - set _USERENV_ when building
by janderwald＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: janderwald Date: Sun Nov 26 13:08:11 2006 New Revision: 24831 URL: http://svn.reactos.org/svn/reactos?rev=24831&view=rev Log: - move ReactOS userenv only functions to userenv-priv.h - set _USERENV_ when building Added: trunk/reactos/dll/win32/userenv/userenv-priv.h (with props) Modified: trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/userenv/userenv.rbuild Modified: trunk/reactos/dll/win32/userenv/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/precomp.… ============================================================================== --- trunk/reactos/dll/win32/userenv/precomp.h (original) +++ trunk/reactos/dll/win32/userenv/precomp.h Sun Nov 26 13:08:11 2006 @@ -9,3 +9,4 @@ #include "internal.h" #include "resources.h" +#include "userenv-priv.h" Added: trunk/reactos/dll/win32/userenv/userenv-priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv-… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv-priv.h (added) +++ trunk/reactos/dll/win32/userenv/userenv-priv.h Sun Nov 26 13:08:11 2006 @@ -1,0 +1,176 @@ +#ifndef USERENV_PRIV_H__ +#define USERENV_PRIV_H__ + +// +// Private ReactOS only userenv functions +// +// + +BOOL +USERENVAPI +WINAPI +InitializeProfiles( + VOID +); + +BOOL +USERENVAPI +WINAPI +CreateUserProfileA ( + PSID, + LPCSTR +); + +BOOL +USERENVAPI +WINAPI +CreateUserProfileW( + PSID, + LPCWSTR +); + +BOOL +USERENVAPI +WINAPI +AddDesktopItemA( + BOOL, + LPCSTR, + LPCSTR, + LPCSTR, + INT, + LPCSTR, + WORD, + INT +); + +BOOL +USERENVAPI +WINAPI +AddDesktopItemW( + BOOL, + LPCWSTR, + LPCWSTR, + LPCWSTR, + INT, + LPCWSTR, + WORD, + INT +); + +BOOL +USERENVAPI +WINAPI +DeleteDesktopItemA ( + BOOL, + LPCSTR +); + +BOOL +USERENVAPI +WINAPI +DeleteDesktopItemW ( + BOOL, + LPCWSTR +); + +BOOL +USERENVAPI +WINAPI +CreateGroupA ( + LPCSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +CreateGroupW ( + LPCWSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +DeleteGroupA ( + LPCSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +DeleteGroupW ( + LPCWSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +AddItemA( + LPCSTR, + BOOL, + LPCSTR, + LPCSTR, + LPCSTR, + INT, + LPCSTR, + WORD, + INT +); + +BOOL +USERENVAPI +WINAPI +AddItemW ( + LPCWSTR, + BOOL, + LPCWSTR, + LPCWSTR, + LPCWSTR, + INT, + LPCWSTR, + WORD, + INT +); + +BOOL +USERENVAPI +WINAPI +DeleteItemA ( + LPCSTR, + BOOL, + LPCSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +DeleteItemW( + LPCWSTR, + BOOL, + LPCWSTR, + BOOL +); + +BOOL +USERENVAPI +WINAPI +CopyProfileDirectoryA( + LPCSTR, + LPCSTR, + DWORD +); + +BOOL +USERENVAPI +WINAPI +CopyProfileDirectoryW( + LPCWSTR, + LPCWSTR, + DWORD +); + +#endif Propchange: trunk/reactos/dll/win32/userenv/userenv-priv.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/userenv/userenv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… ============================================================================== --- trunk/reactos/dll/win32/userenv/userenv.rbuild (original) +++ trunk/reactos/dll/win32/userenv/userenv.rbuild Sun Nov 26 13:08:11 2006 @@ -5,6 +5,7 @@ <define name="_WIN32_IE">0x0500</define> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0600</define> + <define name="_USERENV_" /> <library>uuid</library> <library>ntdll</library> <library>kernel32</library>

1 0

[greatlrd] 24830: [AUDIT] No suspicious code detected in mouse.c, the code is quite understandable and have comments compare it also with ms ddk and no code was taken from it.
by greatlrd＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: greatlrd Date: Sun Nov 26 11:55:05 2006 New Revision: 24830 URL: http://svn.reactos.org/svn/reactos?rev=24830&view=rev Log: [AUDIT] No suspicious code detected in mouse.c, the code is quite understandable and have comments compare it also with ms ddk and no code was taken from it. Modified: trunk/reactos/drivers/input/i8042prt/mouse.c (props changed) Propchange: trunk/reactos/drivers/input/i8042prt/mouse.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 24829: Fixed iType for non and file meta dc.
by jimtabor＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: jimtabor Date: Sun Nov 26 03:53:07 2006 New Revision: 24829 URL: http://svn.reactos.org/svn/reactos?rev=24829&view=rev Log: Fixed iType for non and file meta dc. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h trunk/reactos/dll/win32/gdi32/objects/metafile.c Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sun Nov 26 03:53:07 2006 @@ -50,6 +50,7 @@ PVOID pvMetaBuffer; HANDLE hFile; /* Handle for disk based MetaFile */ DWORD Size; + INT iType; PENHMETAHEADER emf; UINT handles_size, cur_handles; HGDIOBJ *handles; Modified: trunk/reactos/dll/win32/gdi32/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/me… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/metafile.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/metafile.c Sun Nov 26 03:53:07 2006 @@ -254,10 +254,10 @@ return NULL; } EmfDC.hFile = hFile; - EmfDC->emf.iType = 2; + EmfDC.iType = 2; } else - EmfDC->emf.iType = 1; + EmfDC.iType = 1; return mDC; }

1 0

[jimtabor] 24828: Add the Enhmetafile and Metafiledc structs.
by jimtabor＠svn.reactos.org 26 Nov '06

26 Nov '06

Author: jimtabor Date: Sun Nov 26 03:37:40 2006 New Revision: 24828 URL: http://svn.reactos.org/svn/reactos?rev=24828&view=rev Log: Add the Enhmetafile and Metafiledc structs. Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h Modified: trunk/reactos/dll/win32/gdi32/include/gdi32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/include/gd… ============================================================================== --- trunk/reactos/dll/win32/gdi32/include/gdi32p.h (original) +++ trunk/reactos/dll/win32/gdi32/include/gdi32p.h Sun Nov 26 03:37:40 2006 @@ -21,6 +21,47 @@ INT iFunction, HANDLE hPageQuery ); + +/* DEFINES *******************************************************************/ + +#define HANDLE_LIST_INC 20 + +/* TYPES *********************************************************************/ + +// Based on wmfapi.h and Wine. This is the DC_ATTR for a MetaDC file. +typedef struct tagMETAFILEDC { + PVOID pvMetaBuffer; + HANDLE hFile; + DWORD Size; + PMETAHEADER mf; + UINT handles_size, cur_handles; + HGDIOBJ *handles; + + // more DC object stuff. + HGDIOBJ Pen; + HGDIOBJ Brush; + HGDIOBJ Palette; + HGDIOBJ Font; + // Add more later. +} METAFILEDC,*PMETAFILEDC; + + +typedef struct tagENHMETAFILE { + PVOID pvMetaBuffer; + HANDLE hFile; /* Handle for disk based MetaFile */ + DWORD Size; + PENHMETAHEADER emf; + UINT handles_size, cur_handles; + HGDIOBJ *handles; + INT horzres, vertres; + INT horzsize, vertsize; + INT logpixelsx, logpixelsy; + INT bitspixel; + INT textcaps; + INT rastercaps; + INT technology; + INT planes; +} ENHMETAFILE,*PENHMETAFILE; /* FUNCTIONS *****************************************************************/ @@ -107,3 +148,4 @@ UserRealizePalette(HDC hDC); /* EOF */ +

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2006