Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 69761: [MSCONFIG_NEW] - Reimplement the SYSTEM.INI/WIN.INI tabs (they should be seen as 2 different instances of the same window; this would be cleaner to do in C++) with all the expecte...
by hbelusca＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: hbelusca Date: Sat Oct 31 21:00:32 2015 New Revision: 69761 URL: http://svn.reactos.org/svn/reactos?rev=69761&view=rev Log: [MSCONFIG_NEW] - Reimplement the SYSTEM.INI/WIN.INI tabs (they should be seen as 2 different instances of the same window; this would be cleaner to do in C++) with all the expected functionality working. - Add TreeView helpers for moving/deleting branches. - Add TreeView helpers for 3-state checkboxes, with support for Windows 2k3 and Vista+ with and without manifest, depending on the comctl32.dll version used by msconfig at runtime. In particular, take advantage of the TVS_EX_PARTIALCHECKBOXES extended style introduced on Windows Vista+. - Just initialize once the uxtheme function pointers. - Create the msconfig dialog box hidden and center it on screen before showing it (removes the flickering caused by the quick move). - Use the correct 16x16 icon for the dialog title icon, adapted from a patch by Jared Smudde with suggestions by Ismael Ferreras Morezuelas. CORE-9333 Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.c (with props) trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.h - copied, changed from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.c - copied, changed from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.h - copied, changed from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.c (with props) trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.h (with props) trunk/reactos/base/applications/msconfig_new/res/2k3check.bmp (with props) trunk/reactos/base/applications/msconfig_new/res/v7check.bmp (with props) trunk/reactos/base/applications/msconfig_new/systempage.cpp (with props) Removed: trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c trunk/reactos/base/applications/msconfig_new/fileextractdialog.c trunk/reactos/base/applications/msconfig_new/freeldrpage.c trunk/reactos/base/applications/msconfig_new/generalpage.c trunk/reactos/base/applications/msconfig_new/msconfig.c trunk/reactos/base/applications/msconfig_new/msconfig.rc trunk/reactos/base/applications/msconfig_new/resource.h trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/msconfig_new/systempage.h trunk/reactos/base/applications/msconfig_new/toolspage.cpp Modified: trunk/reactos/base/applications/msconfig_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/CMakeLists.txt [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -10,7 +10,9 @@ ${REACTOS_SOURCE_DIR}/lib/atl) list(APPEND C_SOURCE - comctl32ex/listviewfuncs.c + comctl32ex/comctl32supp.c + comctl32ex/listview.c + comctl32ex/treeview.c comctl32ex/uxthemesupp.c fileextractdialog.c fileutils.c @@ -18,12 +20,12 @@ generalpage.c msconfig.c regutils.c - # systempage.c # startuppage.c stringutils.c utils.c) list(APPEND CPP_SOURCE + systempage.cpp srvpage.cpp toolspage.cpp xmldomparser.cpp Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.c (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -0,0 +1,76 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/comctl32ex/comctl32supp.c + * PURPOSE: Common Controls helper functions. + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" + +HRESULT GetComCtl32Version(OUT PDWORD pdwMajor, OUT PDWORD pdwMinor, OUT PDWORD pdwBuild) +{ + HRESULT hr = S_OK; + HINSTANCE hDll; + DLLGETVERSIONPROC pDllGetVersion; + DLLVERSIONINFO dvi; + + *pdwMajor = 0; + *pdwMinor = 0; + *pdwBuild = 0; + + /* + * WARNING! DISCLAIMER! + * + * This method of retrieving a handle to an already loaded comctl32.dll + * is known to not be reliable in case the program is using SxS, or if + * this code is used from inside a DLL. + */ + + /* + * See: https://msdn.microsoft.com/en-us/library/windows/desktop/hh298349(v=vs.85).… + * and: http://www.geoffchappell.com/studies/windows/shell/comctl32/history/ + * for the possible version values to be returned. + */ + + /* Get a handle to comctl32.dll that must already be loaded */ + hDll = GetModuleHandleW(L"comctl32.dll"); // NOTE: We must not call FreeLibrary on the returned handle! + if (!hDll) return E_FAIL; + + pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hDll, "DllGetVersion"); + if (pDllGetVersion) + { + ZeroMemory(&dvi, sizeof(dvi)); + dvi.cbSize = sizeof(dvi); + + hr = (*pDllGetVersion)(&dvi); + if (SUCCEEDED(hr)) + { + *pdwMajor = dvi.dwMajorVersion; + *pdwMinor = dvi.dwMinorVersion; + *pdwBuild = dvi.dwBuildNumber; + +#if 0 +// #include "stringutils.h" + + LPWSTR strVersion = + FormatString(L"ComCtl32 version %d.%d, Build %d, Platform %d", + dvi.dwMajorVersion, dvi.dwMinorVersion, dvi.dwBuildNumber, dvi.dwPlatformID); + MessageBoxW(NULL, strVersion, L"ComCtl32 version", MB_OK); + MemFree(strVersion); +#endif + } + } + else + { + /* + * If GetProcAddress failed, the DLL is a version + * previous to the one shipped with IE 3.x. + */ + *pdwMajor = 4; + *pdwMinor = 0; + *pdwBuild = 0; + } + + return hr; +} Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.c ------------------------------------------------------------------------------ svn:eol-style = native Copied: trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.h (from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/comctl32supp.h [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/commctrldefs.h + * FILE: base/applications/msconfig_new/comctl32ex/comctl32supp.h * PURPOSE: Common Controls helper functions. * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */ -#ifndef __COMMCTRLDEFS_H__ -#define __COMMCTRLDEFS_H__ +#ifndef __COMCTL32SUPP_H__ +#define __COMCTL32SUPP_H__ #include <windowsx.h> /* @@ -15,6 +15,25 @@ #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) */ +#define Button_IsEnabled(hwndCtl) IsWindowEnabled((hwndCtl)) + #define UM_CHECKSTATECHANGE (WM_USER + 100) -#endif // __COMMCTRLDEFS_H__ +#if 0 +// this typedef, present in newer include files, +// supports the building tokenmon on older systems +typedef struct _DLLVERSIONINFO +{ + DWORD cbSize; + DWORD dwMajorVersion; + DWORD dwMinorVersion; + DWORD dwBuildNumber; + DWORD dwPlatformID; +} DLLVERSIONINFO, *PDLLVERSIONINFO; +// Version information function +typedef HRESULT (WINAPI* DLLGETVERSIONPROC)(PDLLVERSIONINFO); +#endif + +HRESULT GetComCtl32Version(OUT PDWORD pdwMajor, OUT PDWORD pdwMinor, OUT PDWORD pdwBuild); + +#endif // __COMCTL32SUPP_H__ Removed: trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/commctrldefs.h (removed) @@ -1,20 +0,0 @@ -/* - * PROJECT: ReactOS Applications - * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/commctrldefs.h - * PURPOSE: Common Controls helper functions. - * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> - */ - -#ifndef __COMMCTRLDEFS_H__ -#define __COMMCTRLDEFS_H__ - -#include <windowsx.h> -/* -#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp)) -#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp)) -*/ - -#define UM_CHECKSTATECHANGE (WM_USER + 100) - -#endif // __COMMCTRLDEFS_H__ Copied: trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.c (from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/listviewfuncs.c + * FILE: base/applications/msconfig_new/comctl32ex/listview.c * PURPOSE: List-View helper functions. * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */ #include "precomp.h" -#include "listviewfuncs.h" +#include "listview.h" ///////////// ListView Sorting ///////////// Copied: trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.h (from r69759, trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/listview.h [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -1,13 +1,13 @@ /* * PROJECT: ReactOS Applications * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/listviewfuncs.h + * FILE: base/applications/msconfig_new/comctl32ex/listview.h * PURPOSE: List-View helper functions. * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> */ -#ifndef __LISTVIEWFUNCS_H__ -#define __LISTVIEWFUNCS_H__ +#ifndef __LISTVIEW_H__ +#define __LISTVIEW_H__ #pragma once @@ -15,7 +15,7 @@ extern "C" { #endif -#include "commctrldefs.h" +#include "comctl32supp.h" ///////////// ListView Sorting ///////////// @@ -38,6 +38,6 @@ } // extern "C" #endif -#endif // __LISTVIEWFUNCS_H__ +#endif // __LISTVIEW_H__ /* EOF */ Removed: trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.c (removed) @@ -1,86 +0,0 @@ -/* - * PROJECT: ReactOS Applications - * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/listviewfuncs.c - * PURPOSE: List-View helper functions. - * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> - */ - -#include "precomp.h" -#include "listviewfuncs.h" - -///////////// ListView Sorting ///////////// - -typedef struct __tagSort -{ - HWND hList; - int nClickedColumn; - BOOL bSortAsc; -} Sort, *PSort; - -int CALLBACK -SortListView(LPARAM lItemParam1, - LPARAM lItemParam2, - LPARAM lPSort_S) -{ - PSort pSort = (PSort)lPSort_S; - - int iItem1 = (int)lItemParam1; - int iItem2 = (int)lItemParam2; - - WCHAR strItem1[MAX_VALUE_NAME]; - WCHAR strItem2[MAX_VALUE_NAME]; - - ListView_GetItemText(pSort->hList, iItem1, pSort->nClickedColumn, strItem1, MAX_VALUE_NAME); - ListView_GetItemText(pSort->hList, iItem2, pSort->nClickedColumn, strItem2, MAX_VALUE_NAME); - - // StrCmpLogicalW helps in comparing numbers intelligently, 10 is greater that 2, other - // wise string comparison will always return 2 is greater that 10... - return ( pSort->bSortAsc ? StrCmpLogicalW(strItem1, strItem2) : StrCmpLogicalW(strItem2, strItem1) ); -} - -BOOL -ListView_SortEx(HWND hListView, - int iSortingColumn, - int iSortedColumn) -{ - HWND hHeader; - HDITEM hColumn; - BOOL bSortAsc; - Sort sort; - - if ((GetWindowLongPtr(hListView, GWL_STYLE) & ~LVS_NOSORTHEADER) == 0) - return TRUE; - - hHeader = ListView_GetHeader(hListView); - SecureZeroMemory(&hColumn, sizeof(hColumn)); - - if ( (iSortedColumn != -1) && (iSortedColumn != iSortingColumn) ) - { - hColumn.mask = HDI_FORMAT | HDI_LPARAM; - Header_GetItem(hHeader, iSortedColumn, &hColumn); - hColumn.fmt &= ~HDF_SORTUP & ~HDF_SORTDOWN; - hColumn.lParam = 0; // 0: deactivated, 1: false, 2: true. - Header_SetItem(hHeader, iSortedColumn, &hColumn); - } - - hColumn.mask = HDI_FORMAT | HDI_LPARAM; - Header_GetItem(hHeader, iSortingColumn, &hColumn); - - bSortAsc = !(hColumn.lParam == 2); // 0: deactivated, 1: false, 2: true. - - hColumn.fmt &= (bSortAsc ? ~HDF_SORTDOWN : ~HDF_SORTUP ); - hColumn.fmt |= (bSortAsc ? HDF_SORTUP : HDF_SORTDOWN); - hColumn.lParam = (LPARAM)(bSortAsc ? 2 : 1); - Header_SetItem(hHeader, iSortingColumn, &hColumn); - - /* Sort the list */ - sort.bSortAsc = bSortAsc; - sort.hList = hListView; - sort.nClickedColumn = iSortingColumn; - return ListView_SortItemsEx(hListView, SortListView, (LPARAM)&sort); -} - -////////////////////////////////////////////// - -/* EOF */ Removed: trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/listviewfuncs.h (removed) @@ -1,43 +0,0 @@ -/* - * PROJECT: ReactOS Applications - * LICENSE: LGPL - See COPYING in the top level directory - * FILE: base/applications/msconfig_new/comctl32ex/listviewfuncs.h - * PURPOSE: List-View helper functions. - * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> - */ - -#ifndef __LISTVIEWFUNCS_H__ -#define __LISTVIEWFUNCS_H__ - -#pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#include "commctrldefs.h" - -///////////// ListView Sorting ///////////// - -int CALLBACK -SortListView(LPARAM lItemParam1, - LPARAM lItemParam2, - LPARAM lPSort_S); - -BOOL -ListView_SortEx(HWND hListView, - int iSortingColumn, - int iSortedColumn); - -#define ListView_Sort(hListView, iSortingColumn) \ - ListView_SortEx((hListView), (iSortingColumn), -1) - -////////////////////////////////////////////// - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif // __LISTVIEWFUNCS_H__ - -/* EOF */ Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.c (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -0,0 +1,281 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig/treeview.c + * PURPOSE: Tree-View helper functions. + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +// For TVIF_EXPANDEDIMAGE and TVIF_STATEEX (are they really useful ?) +#if !defined(_WIN32_IE) || (_WIN32_IE < 0x0600) + #define _WIN32_IE 0x0600 +#endif + +// Fake _WIN32_WINNT to 0x0600 in order to get Vista+ style flags +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + +#include "precomp.h" +#include "treeview.h" + +#include <wingdi.h> // For RGB macro + + +void TreeView_Set3StateCheck(HWND hTree) +{ + LONG_PTR lStyle; + DWORD dwExStyle; + + DWORD Major, Minor, Build; + GetComCtl32Version(&Major, &Minor, &Build); + + /* + * Choose the best way to handle 3-state TreeView checkboxes + * according to the version of comctl32.dll we are running against. + * + * Starting version comctl32 version 6.10 (Vista+, via SxS) + * we have native 3-state checkboxes available. + * Only when comctl32 version 5.82 (no SxS) is available, + * use its build number to know whether we should use 2k3-style + * or Vista+ style check-boxes. + */ + if (Major > 6 || (Major == 6 && Minor >= 10)) + { + /* + * NOTE: As explained in the following link: + * http://stackoverflow.com/questions/31488233/treeview-setextendedstyle-does-… + * the TreeView control should have the extended check-box style set + * *BEFORE* actually setting the check-box window style, because it is + * only at that step that the TreeView control builds its image list + * containing the three check-box states. Indeed, if the extended + * check-box style was applied after setting the window style, then + * the image list would be already built with the default two states + * and would not be updated. + * + * The MSDN documentation is not very clear on that point. + * + * Let me also take this opportunity to document what those + * extended check-box state styles look like on Windows Vista+ : + * + * - TVS_EX_DIMMEDCHECKBOXES creates a grey tone version of the normal checked box state. + * - TVS_EX_EXCLUSIONCHECKBOXES creates a red 'X'-style cross check-box state. + * - TVS_EX_PARTIALCHECKBOXES creates a filled box. + */ + dwExStyle = TreeView_GetExtendedStyle(hTree); + TreeView_SetExtendedStyle(hTree, dwExStyle | TVS_EX_PARTIALCHECKBOXES, 0); + + lStyle = GetWindowLongPtr(hTree, GWL_STYLE); + SetWindowLongPtr(hTree, GWL_STYLE, lStyle | TVS_CHECKBOXES); + } + else + { + lStyle = GetWindowLongPtr(hTree, GWL_STYLE); + SetWindowLongPtr(hTree, GWL_STYLE, lStyle | TVS_CHECKBOXES); + + // TODO: Implement this function which should build at runtime + // the image list with either two or three check-box states + // (as it is done by the real common control TreeView), instead + // of storing resource bitmaps. + // + // hCheckImageList = CreateCheckBoxImagelist(NULL, TRUE, TRUE, FALSE); + TreeView_SetImageList(hTree, + ImageList_LoadBitmap(hInst, (Build >= 6000 ? MAKEINTRESOURCEW(IDB_V7CHECK) : MAKEINTRESOURCEW(IDB_2K3CHECK)), 16, 4, RGB(255, 255, 255)), + TVSIL_STATE); + } +} + +void TreeView_Cleanup(HWND hTree) +{ + // FIXME: Should we do it always, or only when the custom image list was set? + ImageList_Destroy(TreeView_GetImageList(hTree, TVSIL_STATE)); +} + + +HTREEITEM +InsertItem(HWND hTree, + LPCWSTR szName, + HTREEITEM hParent, + HTREEITEM hInsertAfter) +{ + TVINSERTSTRUCTW tvis; + SecureZeroMemory(&tvis, sizeof(tvis)); + + tvis.hParent = hParent; + tvis.hInsertAfter = hInsertAfter; + tvis.itemex.mask = TVIF_TEXT; + tvis.itemex.pszText = (LPWSTR)szName; + + return (tvis.itemex.hItem = TreeView_InsertItem(hTree, &tvis)); +} + +UINT TreeView_GetRealSubtreeState(HWND hTree, HTREEITEM htiSubtreeItem) +{ +#define OP(a, b) ((a) == (b) ? (a) : 2) + + HTREEITEM htiIterator = TreeView_GetChild(hTree, htiSubtreeItem); + UINT uRealSubtreeState = TreeView_GetCheckState(hTree, htiIterator); + /* + while (htiIterator) + { + UINT temp = TreeView_GetCheckState(hTree, htiIterator); + uRealSubtreeState = OP(uRealSubtreeState, temp); + + htiIterator = TreeView_GetNextSibling(hTree, htiIterator); + } + */ + while ( htiIterator && ( (htiIterator = TreeView_GetNextSibling(hTree, htiIterator)) != NULL ) ) + { + UINT temp = TreeView_GetCheckState(hTree, htiIterator); + uRealSubtreeState = OP(uRealSubtreeState, temp); + } + + return uRealSubtreeState; +} + +void TreeView_PropagateStateOfItemToParent(HWND hTree, HTREEITEM htiItem) +{ + HTREEITEM htiParent; + UINT uGlobalSiblingsCheckState; + + if (!hTree || !htiItem /* || htiItem == TVI_ROOT */) + return; + + htiParent = TreeView_GetParent(hTree, htiItem); + if (!htiParent) + return; + + uGlobalSiblingsCheckState = TreeView_GetRealSubtreeState(hTree, htiParent); + TreeView_SetItemState(hTree, htiParent, INDEXTOSTATEIMAGEMASK(uGlobalSiblingsCheckState + 1), TVIS_STATEIMAGEMASK); + TreeView_PropagateStateOfItemToParent(hTree, htiParent); + + return; +} + +HTREEITEM Tree_Item_Copy(HWND hTree, HTREEITEM hSourceItem, HTREEITEM hParent, HTREEITEM hInsertAfter) +{ + HTREEITEM htiIterator; + TVINSERTSTRUCTW tvis; + WCHAR label[MAX_VALUE_NAME] = L""; + + if (!hTree || !hSourceItem || !hInsertAfter) + return NULL; + + // 1- Retrieve properties. + SecureZeroMemory(&tvis, sizeof(tvis)); + + tvis.itemex.hItem = hSourceItem; // Handle of the item to be retrieved. + tvis.itemex.mask = TVIF_HANDLE | TVIF_TEXT | TVIF_STATE | + TVIF_CHILDREN | TVIF_DI_SETITEM | TVIF_EXPANDEDIMAGE | + TVIF_IMAGE | TVIF_INTEGRAL | TVIF_PARAM | TVIF_SELECTEDIMAGE | TVIF_STATEEX; + tvis.itemex.pszText = label; + tvis.itemex.cchTextMax = MAX_VALUE_NAME; + TreeView_GetItem(hTree, &tvis.itemex); + + // 2- Now, copy to destination. + tvis.hParent = hParent; + tvis.hInsertAfter = hInsertAfter; + tvis.itemex.stateMask = tvis.itemex.state; + tvis.itemex.hItem = TreeView_InsertItem(hTree, &tvis); + + for (htiIterator = TreeView_GetChild(hTree, hSourceItem) ; htiIterator ; htiIterator = TreeView_GetNextSibling(hTree, htiIterator)) + Tree_Item_Copy(hTree, htiIterator, tvis.itemex.hItem, TVI_LAST); + + return tvis.itemex.hItem; +} + +void TreeView_DownItem(HWND hTree, HTREEITEM htiItemToDown) +{ + HTREEITEM htiNextItem, htiNewItem; + + if (!hTree || !htiItemToDown) + return; + + htiNextItem = TreeView_GetNextSibling(hTree, htiItemToDown); + if (!htiNextItem) + htiNextItem = TVI_LAST; + + htiNewItem = Tree_Item_Copy(hTree, htiItemToDown, TreeView_GetParent(hTree, htiItemToDown), htiNextItem); + TreeView_DeleteItem(hTree, htiItemToDown); // Delete the item and ALL its children. + TreeView_SelectItem(hTree, htiNewItem); + + return; +} + +void TreeView_UpItem(HWND hTree, HTREEITEM htiItemToUp) +{ + HTREEITEM htiPrevItem, htiPrevPrevItem, htiNewItem; + + if (!hTree || !htiItemToUp) + return; + + htiPrevItem = TreeView_GetPrevSibling(hTree, htiItemToUp); + htiPrevPrevItem = TreeView_GetPrevSibling(hTree, htiPrevItem); + if (!htiPrevPrevItem) + htiPrevPrevItem = TVI_FIRST; + // if htiPrevItem == NULL , htiPrevPrevItem == NULL. + + htiNewItem = Tree_Item_Copy(hTree, htiItemToUp, TreeView_GetParent(hTree, htiItemToUp), htiPrevPrevItem); + TreeView_DeleteItem(hTree, htiItemToUp); // Delete the item and ALL its children. + TreeView_SelectItem(hTree, htiNewItem); + + return; +} + +HTREEITEM TreeView_GetFirst(HWND hTree) +{ + return TreeView_GetRoot(hTree); +} + +HTREEITEM TreeView_GetLastFromItem(HWND hTree, HTREEITEM hItem) +{ + HTREEITEM htiRet = NULL; + HTREEITEM htiIterator; + + for (htiIterator = hItem ; htiIterator ; htiIterator = TreeView_GetNextSibling(hTree, htiIterator)) + htiRet = htiIterator; + + return htiRet; +} + +HTREEITEM TreeView_GetLast(HWND hTree) +{ + return TreeView_GetLastFromItem(hTree, TreeView_GetRoot(hTree)); +} + +HTREEITEM TreeView_GetPrev(HWND hTree, HTREEITEM hItem) +{ + HTREEITEM hPrev, hTmp; + + if (!hTree) + return NULL; + + hPrev = TreeView_GetPrevSibling(hTree, hItem); + if (!hPrev) + return TreeView_GetParent(hTree, hItem); + + hTmp = TreeView_GetChild(hTree, hPrev); + if (hTmp) + return TreeView_GetLastFromItem(hTree, hTmp); + else + return hPrev; +} + +HTREEITEM TreeView_GetNext(HWND hTree, HTREEITEM hItem) +{ + HTREEITEM hNext; + + if (!hTree) + return NULL; + + hNext = TreeView_GetChild(hTree, hItem); + if (hNext) + return hNext; + + hNext = TreeView_GetNextSibling(hTree, hItem); + if (hNext) + return hNext; + else + return TreeView_GetNextSibling(hTree, TreeView_GetParent(hTree, hItem)); +} + +/* EOF */ Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.h (added) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.h [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -0,0 +1,81 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig/treeview.h + * PURPOSE: Tree-View helper functions. + * COPYRIGHT: Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#ifndef __TREEVIEW_H__ +#define __TREEVIEW_H__ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#include "comctl32supp.h" + + +// +// Should be present in commctrl.h +// defined for Windows Vista+ +// + +#if (_WIN32_WINNT >= 0x0600) + +#define TVS_EX_MULTISELECT 0x0002 +#define TVS_EX_DOUBLEBUFFER 0x0004 +#define TVS_EX_NOINDENTSTATE 0x0008 +#define TVS_EX_RICHTOOLTIP 0x0010 +#define TVS_EX_AUTOHSCROLL 0x0020 +#define TVS_EX_FADEINOUTEXPANDOS 0x0040 +#define TVS_EX_PARTIALCHECKBOXES 0x0080 +#define TVS_EX_EXCLUSIONCHECKBOXES 0x0100 +#define TVS_EX_DIMMEDCHECKBOXES 0x0200 +#define TVS_EX_DRAWIMAGEASYNC 0x0400 + +#endif + + +#if (_WIN32_WINNT >= 0x0501) + +#define TVM_SETEXTENDEDSTYLE (TV_FIRST + 44) +#define TreeView_SetExtendedStyle(hwnd, dw, mask) \ + (DWORD)SNDMSG((hwnd), TVM_SETEXTENDEDSTYLE, mask, dw) + +#define TVM_GETEXTENDEDSTYLE (TV_FIRST + 45) +#define TreeView_GetExtendedStyle(hwnd) \ + (DWORD)SNDMSG((hwnd), TVM_GETEXTENDEDSTYLE, 0, 0) + +#endif + + +void TreeView_Set3StateCheck(HWND hTree); + +void TreeView_Cleanup(HWND hTree); + +HTREEITEM +InsertItem(HWND hTree, + LPCWSTR szName, + HTREEITEM hParent, + HTREEITEM hInsertAfter); + +UINT TreeView_GetRealSubtreeState(HWND hTree, HTREEITEM htiSubtreeItem); +void TreeView_PropagateStateOfItemToParent(HWND hTree, HTREEITEM htiItem); +void TreeView_DownItem(HWND hTree, HTREEITEM htiItemToDown); +void TreeView_UpItem(HWND hTree, HTREEITEM htiItemToUp); +HTREEITEM TreeView_GetFirst(HWND hTree); +HTREEITEM TreeView_GetLastFromItem(HWND hTree, HTREEITEM hItem); +HTREEITEM TreeView_GetLast(HWND hTree); +HTREEITEM TreeView_GetPrev(HWND hTree, HTREEITEM hItem); +HTREEITEM TreeView_GetNext(HWND hTree, HTREEITEM hItem); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // __TREEVIEW_H__ + +/* EOF */ Propchange: trunk/reactos/base/applications/msconfig_new/comctl32ex/treeview.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/comctl32ex/uxthemesupp.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -11,17 +11,26 @@ static HMODULE hUxTheme = NULL; +typedef HRESULT (WINAPI* ETDTProc)(HWND, DWORD); +static ETDTProc fnEnableThemeDialogTexture = NULL; + +typedef HRESULT (WINAPI* SWTProc)(HWND, LPCWSTR, LPCWSTR); +static SWTProc fnSetWindowTheme = NULL; + + static BOOL InitUxTheme(VOID) { - static BOOL Initialized = FALSE; - - if (Initialized) return TRUE; + if (hUxTheme) return TRUE; hUxTheme = LoadLibraryW(L"uxtheme.dll"); if (hUxTheme == NULL) return FALSE; - Initialized = TRUE; + fnEnableThemeDialogTexture = + (ETDTProc)GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); + fnSetWindowTheme = + (SWTProc)GetProcAddress(hUxTheme, "SetWindowTheme"); + return TRUE; } @@ -31,7 +40,6 @@ { FreeLibrary(hUxTheme); hUxTheme = NULL; - // Initialized = FALSE; } #endif @@ -42,28 +50,19 @@ // Copyright (c) 2002 by J Brown // -typedef HRESULT (WINAPI* ETDTProc)(HWND, DWORD); - HRESULT WINAPI EnableThemeDialogTexture(_In_ HWND hwnd, _In_ DWORD dwFlags) { - ETDTProc fnEnableThemeDialogTexture; - if (!InitUxTheme()) return HRESULT_FROM_WIN32(GetLastError()); - fnEnableThemeDialogTexture = - (ETDTProc)GetProcAddress(hUxTheme, "EnableThemeDialogTexture"); if (!fnEnableThemeDialogTexture) return HRESULT_FROM_WIN32(GetLastError()); return fnEnableThemeDialogTexture(hwnd, dwFlags); } - - -typedef HRESULT (WINAPI* SWTProc)(HWND, LPCWSTR, LPCWSTR); HRESULT WINAPI @@ -71,13 +70,9 @@ _In_ LPCWSTR pszSubAppName, _In_ LPCWSTR pszSubIdList) { - SWTProc fnSetWindowTheme; - if (!InitUxTheme()) return HRESULT_FROM_WIN32(GetLastError()); - fnSetWindowTheme = - (SWTProc)GetProcAddress(hUxTheme, "SetWindowTheme"); if (!fnSetWindowTheme) return HRESULT_FROM_WIN32(GetLastError()); Modified: trunk/reactos/base/applications/msconfig_new/fileextractdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/fileextractdialog.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/fileextractdialog.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -17,7 +17,7 @@ // #include <setupapi.h> #include "fileextractdialog.h" -#include "commctrldefs.h" +#include "comctl32supp.h" #include "utils.h" // #include "callbacks.h" Modified: trunk/reactos/base/applications/msconfig_new/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/freeldrpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/freeldrpage.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -12,7 +12,7 @@ #include <share.h> #include <wingdi.h> -#include "commctrldefs.h" +#include "comctl32supp.h" #include "utils.h" @@ -70,41 +70,38 @@ hFont = (HFONT)SendMessageW(hDlgCtrl, WM_GETFONT, 0, 0); hOldFont = (HFONT)SelectObject(hDC, hFont); - while (!feof(file)) + while (!feof(file) && fgetws(szBuffer, ARRAYSIZE(szBuffer), file)) { - if (fgetws(szBuffer, ARRAYSIZE(szBuffer), file)) + length = wcslen(szBuffer); + if (length > 1) { - length = wcslen(szBuffer); - if (length > 1) + /* Remove \r\n */ + szBuffer[length-1] = szBuffer[length] = L'\0'; + + pos = ListBox_AddString(hDlgCtrl, szBuffer); + + GetTextExtentPoint32W(hDC, szBuffer, (int)wcslen(szBuffer), &size); + horzExt = max((LONG)ListBox_GetHorizontalExtent(hDlgCtrl), size.cx + 5); // 5 to have a little room between the text and the end of the list box. + ListBox_SetHorizontalExtent(hDlgCtrl, horzExt); + + if (szBuffer[0] == L'[') + continue; + + if (!_wcsnicmp(szBuffer, L"timeout=", 8)) { - /* Remove \r\n */ - szBuffer[length-1] = szBuffer[length] = L'\0'; + Settings.TimeOut = _wtoi(&szBuffer[8]); + continue; + } - pos = ListBox_AddString(hDlgCtrl, szBuffer); + if (!_wcsnicmp(szBuffer, L"default=", 8)) + { + wcscpy(Settings.szDefaultOS, &szBuffer[8]); + continue; + } + if (pos != LB_ERR) + ListBox_SetItemData(hDlgCtrl, pos, 1); // indicate that this item is a boot entry - GetTextExtentPoint32W(hDC, szBuffer, (int)wcslen(szBuffer), &size); - horzExt = max((LONG)ListBox_GetHorizontalExtent(hDlgCtrl), size.cx + 5); // 5 to have a little room between the text and the end of the list box. - ListBox_SetHorizontalExtent(hDlgCtrl, horzExt); - - if (szBuffer[0] == L'[') - continue; - - if (!_wcsnicmp(szBuffer, L"timeout=", 8)) - { - Settings.TimeOut = _wtoi(&szBuffer[8]); - continue; - } - - if (!_wcsnicmp(szBuffer, L"default=", 8)) - { - wcscpy(Settings.szDefaultOS, &szBuffer[8]); - continue; - } - if (pos != LB_ERR) - ListBox_SetItemData(hDlgCtrl, pos, 1); // indicate that this item is a boot entry - - Settings.OSConfigurationCount++; - } + Settings.OSConfigurationCount++; } } Modified: trunk/reactos/base/applications/msconfig_new/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/generalpage.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -10,7 +10,7 @@ #include "precomp.h" #include "fileutils.h" #include "utils.h" -#include "commctrldefs.h" +#include "comctl32supp.h" #include "fileextractdialog.h" static LPCWSTR lpszRestoreProgPath1 = L"%SystemRoot%\\System32\\rstrui.exe"; Modified: trunk/reactos/base/applications/msconfig_new/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.c [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -11,7 +11,7 @@ #include "utils.h" #include "generalpage.h" -// #include "systempage.h" +#include "systempage.h" #include "freeldrpage.h" #include "srvpage.h" // #include "startuppage.h" @@ -40,9 +40,8 @@ LPWSTR szAppName = NULL; HWND hMainWnd; /* Main Window */ -HWND hTabWnd; /* Tab Control Window */ -// HICON hDialogIcon = NULL; -HICON hIcon = NULL; +HWND hTabWnd; /* Tab Control Window */ +HICON hIcon = NULL, hIconSm = NULL; WNDPROC wpOrigEditProc = NULL; @@ -100,22 +99,13 @@ // return FALSE; } -#if 0 - case WM_SYSCOLORCHANGE: - /* Forward WM_SYSCOLORCHANGE to common controls */ - SendMessage(hServicesListCtrl, WM_SYSCOLORCHANGE, 0, 0); - SendMessage(hStartupListCtrl, WM_SYSCOLORCHANGE, 0, 0); - SendMessage(hToolsListCtrl, WM_SYSCOLORCHANGE, 0, 0); - break; -#endif - case WM_DESTROY: { - if (hIcon) - DestroyIcon(hIcon); - if (wpOrigEditProc) SetWindowLongPtr(hWnd, DWLP_DLGPROC, (LONG_PTR)wpOrigEditProc); + + if (hIcon) DestroyIcon(hIcon); + if (hIconSm) DestroyIcon(hIconSm); } default: @@ -146,31 +136,6 @@ } DLGTEMPLATEEX, *LPDLGTEMPLATEEX; #include <poppack.h> - -VOID ModifySystemMenu(HWND hWnd) -{ - WCHAR szMenuString[255]; - - /* Customize the window's system menu, add items before the "Close" item */ - HMENU hSysMenu = GetSystemMenu(hWnd, FALSE); - assert(hSysMenu); - - /* New entries... */ - if (LoadStringW(hInst, - IDS_ABOUT, - szMenuString, - ARRAYSIZE(szMenuString)) > 0) - { - /* "About" menu */ - InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED | MF_STRING, IDM_ABOUT, szMenuString); - /* Separator */ - InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR , 0 , NULL); - } - - DrawMenuBar(hWnd); - return; -} - int CALLBACK PropSheetCallback(HWND hDlg, UINT message, LPARAM lParam) { switch (message) @@ -180,20 +145,24 @@ LPDLGTEMPLATE dlgTemplate = (LPDLGTEMPLATE)lParam; LPDLGTEMPLATEEX dlgTemplateEx = (LPDLGTEMPLATEEX)lParam; + // MFC : DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION; + DWORD style = DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU; + // DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; + DWORD exStyle = WS_EX_CONTROLPARENT | WS_EX_APPWINDOW; + + /* Hide the dialog by default; we will center it on screen later, and then show it */ + style &= ~WS_VISIBLE; + /* Set the styles of the property sheet dialog */ if (dlgTemplateEx->signature == 0xFFFF) { - //// MFC : DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION; - - dlgTemplateEx->style = DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU; - // dlgTemplateEx->style = DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; - dlgTemplateEx->exStyle = WS_EX_CONTROLPARENT | WS_EX_APPWINDOW; + dlgTemplateEx->style = style; + dlgTemplateEx->exStyle = exStyle; } else { - dlgTemplate->style = DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU; - // dlgTemplate->style = DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; - dlgTemplate->dwExtendedStyle = WS_EX_CONTROLPARENT | WS_EX_APPWINDOW; + dlgTemplate->style = style; + dlgTemplate->dwExtendedStyle = exStyle; } break; @@ -201,13 +170,28 @@ case PSCB_INITIALIZED: { - /* Modify the system menu of the property sheet dialog */ - ModifySystemMenu(hDlg); + /* Customize the window's system menu, add items before the "Close" item */ + LPWSTR szMenuString; + HMENU hSysMenu = GetSystemMenu(hDlg, FALSE); + assert(hSysMenu); + + szMenuString = LoadResourceString(hInst, IDS_ABOUT); + if (szMenuString) + { + /* "About" menu */ + InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_ENABLED | MF_STRING, IDM_ABOUT, szMenuString); + /* Separator */ + InsertMenuW(hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_SEPARATOR , 0 , NULL); + + MemFree(szMenuString); + } + DrawMenuBar(hDlg); /* Set the dialog icons */ - hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_APPICON), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE); + hIcon = (HICON)LoadImageW(hInst, MAKEINTRESOURCEW(IDI_APPICON), IMAGE_ICON, 0, 0, LR_SHARED | LR_DEFAULTSIZE); + hIconSm = (HICON)CopyImage(hIcon, IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_COPYFROMRESOURCE); SendMessage(hDlg, WM_SETICON, ICON_BIG, (LPARAM)hIcon); - SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSm); /* Sub-class the property sheet window procedure */ wpOrigEditProc = (WNDPROC)SetWindowLongPtr(hDlg, DWLP_DLGPROC, (LONG_PTR)MainWndProc); @@ -234,22 +218,21 @@ psh.dwFlags = PSH_PROPSHEETPAGE | PSH_MODELESS | /*PSH_USEICONID |*/ PSH_HASHELP | /*PSH_NOCONTEXTHELP |*/ PSH_USECALLBACK; psh.hInstance = hInstance; psh.hwndParent = hwndOwner; - //psh.pszIcon = MAKEINTRESOURCE(IDI_APPICON); // It's crap... Only works for the small icon and not the big... + // psh.pszIcon = MAKEINTRESOURCEW(IDI_APPICON); // Disabled because it only sets the small icon; the big icon is a stretched version of the small one. psh.pszCaption = lpszTitle; psh.nStartPage = 0; psh.ppsp = psp; - psh.pfnCallback = (PFNPROPSHEETCALLBACK)PropSheetCallback; + psh.pfnCallback = PropSheetCallback; /* General page */ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP; psp[nPages].hInstance = hInstance; - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_GENERAL_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)GeneralPageWndProc; + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_GENERAL_PAGE); + psp[nPages].pfnDlgProc = GeneralPageWndProc; ++nPages; -#if 0 - if (bIsWindows && bIsOSVersionLessThanVista) + // if (bIsOSVersionLessThanVista) { /* SYSTEM.INI page */ if (MyFileExists(lpszSystemIni, NULL)) @@ -257,9 +240,9 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; psp[nPages].hInstance = hInstance; - psp[nPages].pszTitle = MAKEINTRESOURCE(IDS_TAB_SYSTEM); - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SYSTEM_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)SystemPageWndProc; + psp[nPages].pszTitle = MAKEINTRESOURCEW(IDS_TAB_SYSTEM); + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_SYSTEM_PAGE); + psp[nPages].pfnDlgProc = SystemPageWndProc; psp[nPages].lParam = (LPARAM)lpszSystemIni; ++nPages; @@ -272,16 +255,15 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; psp[nPages].hInstance = hInstance; - psp[nPages].pszTitle = MAKEINTRESOURCE(IDS_TAB_WIN); - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SYSTEM_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)WinPageWndProc; + psp[nPages].pszTitle = MAKEINTRESOURCEW(IDS_TAB_WIN); + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_SYSTEM_PAGE); + psp[nPages].pfnDlgProc = WinPageWndProc; psp[nPages].lParam = (LPARAM)lpszWinIni; ++nPages; BackupIniFile(lpszWinIni); } } -#endif /* FreeLdr page */ // TODO: Program the interface for Vista: "light" BCD editor... @@ -305,9 +287,9 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP | PSP_USETITLE; psp[nPages].hInstance = hInstance; - psp[nPages].pszTitle = MAKEINTRESOURCE(dwTabNameId); - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_FREELDR_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)FreeLdrPageWndProc; + psp[nPages].pszTitle = MAKEINTRESOURCEW(dwTabNameId); + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_FREELDR_PAGE); + psp[nPages].pfnDlgProc = FreeLdrPageWndProc; psp[nPages].lParam = (LPARAM)lpszLoaderIniFile; ++nPages; @@ -319,8 +301,8 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP; psp[nPages].hInstance = hInstance; - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_SERVICES_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)ServicesPageWndProc; + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_SERVICES_PAGE); + psp[nPages].pfnDlgProc = ServicesPageWndProc; ++nPages; #if 0 @@ -328,8 +310,8 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP; psp[nPages].hInstance = hInstance; - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_STARTUP_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)StartupPageWndProc; + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_STARTUP_PAGE); + psp[nPages].pfnDlgProc = StartupPageWndProc; ++nPages; #endif @@ -337,21 +319,20 @@ psp[nPages].dwSize = sizeof(PROPSHEETPAGEW); psp[nPages].dwFlags = PSP_HASHELP; psp[nPages].hInstance = hInstance; - psp[nPages].pszTemplate = MAKEINTRESOURCE(IDD_TOOLS_PAGE); - psp[nPages].pfnDlgProc = (DLGPROC)ToolsPageWndProc; + psp[nPages].pszTemplate = MAKEINTRESOURCEW(IDD_TOOLS_PAGE); + psp[nPages].pfnDlgProc = ToolsPageWndProc; ++nPages; /* Set the total number of created pages */ psh.nPages = nPages; /* Create the property sheet */ - hPropSheet = (HWND)PropertySheet(&psh); + hPropSheet = (HWND)PropertySheetW(&psh); if (hPropSheet) { - /* Center the property sheet on the desktop */ - //ShowWindow(hPropSheet, SW_HIDE); + /* Center the property sheet on the desktop and show it */ ClipOrCenterWindowToMonitor(hPropSheet, MONITOR_WORKAREA | MONITOR_CENTER); - //ShowWindow(hPropSheet, SW_SHOWNORMAL); + ShowWindow(hPropSheet, SW_SHOWNORMAL); } return hPropSheet; @@ -452,10 +433,10 @@ return -1; } - hAccelTable = LoadAccelerators(hInstance, MAKEINTRESOURCE(IDR_MSCONFIG)); + hAccelTable = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(IDR_MSCONFIG)); /* Message loop */ - while (IsWindow(hMainWnd) && GetMessage(&msg, NULL, 0, 0)) + while (IsWindow(hMainWnd) && GetMessageW(&msg, NULL, 0, 0)) { /* * PropSheet_GetCurrentPageHwnd returns NULL when the user clicks the OK or Cancel button @@ -466,7 +447,7 @@ break; /* Process the accelerator table */ - if (!TranslateAccelerator(hMainWnd, hAccelTable, &msg)) + if (!TranslateAcceleratorW(hMainWnd, hAccelTable, &msg)) { /* * If e.g. an item on the tree view is being edited, @@ -477,7 +458,7 @@ if (/*g_bDisableDialogDispatch ||*/ !PropSheet_IsDialogMessage(hMainWnd, &msg)) { TranslateMessage(&msg); - DispatchMessage(&msg); + DispatchMessageW(&msg); } } } Modified: trunk/reactos/base/applications/msconfig_new/msconfig.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/msconfig.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/msconfig.rc [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -13,7 +13,9 @@ #define REACTOS_STR_ORIGINAL_FILENAME "msconfig.exe" #include <reactos/version.rc> -IDI_APPICON ICON "res/msconfig.ico" +IDI_APPICON ICON "res/msconfig.ico" +IDB_2K3CHECK BITMAP "res/2k3check.bmp" +IDB_V7CHECK BITMAP "res/v7check.bmp" IDR_MSCONFIG ACCELERATORS BEGIN Added: trunk/reactos/base/applications/msconfig_new/res/2k3check.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/msconfig_new/res/2k3check.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/base/applications/msconfig_new/res/v7check.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/msconfig_new/res/v7check.bmp ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/msconfig_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/resource.h [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -148,6 +148,9 @@ #define IDS_MSCONFIG_2 3001 #define IDI_APPICON 3010 +#define IDB_2K3CHECK 3011 +#define IDB_V7CHECK 3012 + #define IDR_MSCONFIG 3020 #define IDM_ABOUT 3030 Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/srvpage.cpp [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -13,7 +13,7 @@ #include "regutils.h" #include "stringutils.h" // #include "CmdLineParser.h" -#include "listviewfuncs.h" +#include "listview.h" #include "uxthemesupp.h" #include <winsvc.h> Added: trunk/reactos/base/applications/msconfig_new/systempage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/systempage.cpp (added) +++ trunk/reactos/base/applications/msconfig_new/systempage.cpp [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -0,0 +1,895 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/systempage.c + * PURPOSE: System page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * 2011 Gregor Schneider <Gregor.Schneider(a)reactos.org> + * Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + +#include "precomp.h" +#include <share.h> + +#include "treeview.h" +#include "uxthemesupp.h" + +#include "regutils.h" +#include "utils.h" + + +extern "C" { + +LPCWSTR lpszSystemIni = L"%SystemRoot%\\system.ini"; // or: %windir%\\... ? +LPCWSTR lpszWinIni = L"%SystemRoot%\\win.ini"; // or: %windir%\\... ? + +} + +static LPCWSTR szMSConfigTok = L";msconfig "; // Note the trailing whitespace +static const size_t MSConfigTokLen = 10; + + +extern "C" { + +DWORD GetSystemIniActivation(VOID) +{ + DWORD dwSystemIni = 0; + RegGetDWORDValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\state", L"system.ini", &dwSystemIni); + return dwSystemIni; +} + +DWORD GetWinIniActivation(VOID) +{ + DWORD dwWinIni = 0; + RegGetDWORDValue(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Shared Tools\\MSConfig\\state", L"win.ini", &dwWinIni); + return dwWinIni; +} + +} + + + +static HWND hTree = NULL; +static WCHAR szSearchString[MAX_VALUE_NAME] = L""; +static BOOL bMatchExactText = FALSE; +static BOOL bSearchSense = TRUE; // TRUE == down, FALSE == up. +static BOOL bCaseSensitive = FALSE; + +static void +ToLower(LPWSTR lpszString) +{ + if (!lpszString) + return; + + while (*lpszString) + { + *lpszString = towlower(*lpszString); + ++lpszString; + } +} + +INT_PTR CALLBACK +FindDialogWndProc(HWND hDlg, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + + switch (message) + { + case WM_INITDIALOG: + { + hTree = (HWND)lParam; + + Button_SetCheck(GetDlgItem(hDlg, IDC_CBX_FIND_WHOLE_WORD_ONLY), (bMatchExactText ? BST_CHECKED : BST_UNCHECKED)); + Button_SetCheck(GetDlgItem(hDlg, IDC_RB_FIND_DOWN), (bSearchSense ? BST_CHECKED : BST_UNCHECKED)); // TRUE == down, FALSE == up. + Button_SetCheck(GetDlgItem(hDlg, IDC_RB_FIND_UP ), (bSearchSense ? BST_UNCHECKED : BST_CHECKED )); // TRUE == down, FALSE == up. + Button_SetCheck(GetDlgItem(hDlg, IDC_CBX_FIND_MATCH_CASE), (bCaseSensitive ? BST_CHECKED : BST_UNCHECKED)); + + Edit_SetText(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT), szSearchString); + SetFocus(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT)); + Edit_SetSel(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT), 0, -1); + + return TRUE; + } + + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case IDOK: + { + TVITEMEXW tvItemEx; + HTREEITEM htiIterator; + WCHAR label[MAX_VALUE_NAME] = L""; + WCHAR szTemp[MAX_VALUE_NAME]; + + bMatchExactText = (Button_GetCheck(GetDlgItem(hDlg, IDC_CBX_FIND_WHOLE_WORD_ONLY)) == BST_CHECKED); + bSearchSense = ((Button_GetCheck(GetDlgItem(hDlg, IDC_RB_FIND_DOWN)) == BST_CHECKED) && + (Button_GetCheck(GetDlgItem(hDlg, IDC_RB_FIND_UP )) == BST_UNCHECKED)); // TRUE == down, FALSE == up. + bCaseSensitive = (Button_GetCheck(GetDlgItem(hDlg, IDC_CBX_FIND_MATCH_CASE)) == BST_CHECKED); + + Edit_GetText(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT), szSearchString, _ARRAYSIZE(szSearchString)); + wcscpy(szTemp, szSearchString); + if (!bCaseSensitive) + ToLower(szTemp); + + for (htiIterator = ((Button_GetCheck(GetDlgItem(hDlg, IDC_CBX_FIND_FROM_BEGINNING)) == BST_CHECKED) ? (bSearchSense ? TreeView_GetFirst(hTree) + : TreeView_GetLast(hTree)) + : (bSearchSense ? TreeView_GetNext(hTree, TreeView_GetSelection(hTree)) + : TreeView_GetPrev(hTree, TreeView_GetSelection(hTree)))); + htiIterator ; + htiIterator = (bSearchSense ? TreeView_GetNext(hTree, htiIterator) + : TreeView_GetPrev(hTree, htiIterator))) + { + SecureZeroMemory(&tvItemEx, sizeof(tvItemEx)); + + tvItemEx.hItem = htiIterator; // Handle of the item to be retrieved + tvItemEx.mask = TVIF_HANDLE | TVIF_TEXT; + tvItemEx.pszText = label; + tvItemEx.cchTextMax = MAX_VALUE_NAME; + TreeView_GetItem(hTree, &tvItemEx); + if (!bCaseSensitive) + ToLower(label); + + if (bMatchExactText ? (_tcscmp(label, szTemp) == 0) : !!_tcsstr(label, szTemp)) // <-- hackish. A arranger. + { + TreeView_SelectItem(hTree, htiIterator); + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + //MessageBox(NULL, label, _T("Info"), MB_ICONINFORMATION | MB_OK); + } + + // FIXME: Localize! + MessageBoxW(hDlg, L"No correspondence found.", szAppName, MB_ICONINFORMATION | MB_OK); + SetFocus(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT)); + Edit_SetSel(GetDlgItem(hDlg, IDC_TXT_FIND_TEXT), 0, -1); + //EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + + case IDCANCEL: + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + + default: + //break; + return FALSE; + } + } + } + + return FALSE; +} + + + +static void +TreeView_SetBOOLCheck(HWND hTree, HTREEITEM htiItem, BOOL bState, BOOL bPropagateStateToParent) +{ + if (!hTree || !htiItem) + return; + + TreeView_SetCheckState(hTree, htiItem, bState); + + /* + * Add or remove the token for tree leaves only. + */ + if (!TreeView_GetChild(hTree, htiItem)) + { + /* 1- Retrieve properties */ + TVITEMEXW tvItemEx; + SecureZeroMemory(&tvItemEx, sizeof(tvItemEx)); + + tvItemEx.hItem = htiItem; // Handle of the item to be retrieved. + tvItemEx.mask = TVIF_HANDLE | TVIF_TEXT; + WCHAR label[MAX_VALUE_NAME] = L""; + tvItemEx.pszText = label; + tvItemEx.cchTextMax = MAX_VALUE_NAME; + TreeView_GetItem(hTree, &tvItemEx); + + if (!bState) + { + /* 2- Add the token IF NEEDED */ + if ((wcslen(tvItemEx.pszText) < MSConfigTokLen) || (_wcsnicmp(tvItemEx.pszText, szMSConfigTok, MSConfigTokLen) != 0)) + { + LPWSTR newLabel = (LPWSTR)MemAlloc(0, (_tcslen(tvItemEx.pszText) + MSConfigTokLen + 1) * sizeof(WCHAR)); + wcscpy(newLabel, szMSConfigTok); + wcscat(newLabel, tvItemEx.pszText); + tvItemEx.pszText = newLabel; + + TreeView_SetItem(hTree, &tvItemEx); + + MemFree(newLabel); + } + } + else + { + /* 2- Remove the token IF NEEDED */ + if ((wcslen(tvItemEx.pszText) >= MSConfigTokLen) && (_wcsnicmp(tvItemEx.pszText, szMSConfigTok, MSConfigTokLen) == 0)) + { + LPWSTR newLabel = (LPWSTR)MemAlloc(0, (_tcslen(tvItemEx.pszText) - MSConfigTokLen + 1) * sizeof(WCHAR)); + wcscpy(newLabel, tvItemEx.pszText + MSConfigTokLen); + tvItemEx.pszText = newLabel; + + TreeView_SetItem(hTree, &tvItemEx); + + // TODO: if one finds tvItemEx.pszText == L"", one can + // directly remove the item (cf. message TVN_ENDLABELEDIT). + + MemFree(newLabel); + } + } + } + //////////////////////// + + for (HTREEITEM htiIterator = TreeView_GetChild(hTree, htiItem) ; htiIterator ; htiIterator = TreeView_GetNextSibling(hTree, htiIterator)) + TreeView_SetBOOLCheck(hTree, htiIterator, bState, FALSE); + + if (bPropagateStateToParent) + TreeView_PropagateStateOfItemToParent(hTree, htiItem); + + return; +} + +static void +LoadIniFile(HWND hTree, LPCWSTR lpszIniFile) +{ + // Ouverture en lecture (sans création de fichier si celui-ci n'esistait pas déjà) + // d'un flux en mode texte, avec permission de lecture seule. + DWORD dwNumOfChars = ExpandEnvironmentStringsW(lpszIniFile, NULL, 0); + LPWSTR lpszFileName = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR)); + ExpandEnvironmentStringsW(lpszIniFile, lpszFileName, dwNumOfChars); + + FILE* ini_file = _wfsopen(lpszFileName, L"rt", _SH_DENYWR); // r+t <-- read write text ; rt <-- read text + MemFree(lpszFileName); + + if (!ini_file) + return; // error + + WCHAR szLine[MAX_VALUE_NAME] = L""; + TVINSERTSTRUCT tvis; + HTREEITEM hParent = TVI_ROOT; + BOOL bIsSection = FALSE; + LPWSTR lpsz1 = NULL; + LPWSTR lpsz2 = NULL; + + while (!feof(ini_file) && fgetws(szLine, _ARRAYSIZE(szLine), ini_file)) + { + /* Skip hypothetical starting spaces or newline characters */ + lpsz1 = szLine; + while (*lpsz1 == L' ' || *lpsz1 == L'\r' || *lpsz1 == L'\n') + ++lpsz1; + + /* Skip empty lines */ + if (!*lpsz1) + continue; + + /* Find the last newline character (if exists) and replace it by the NULL terminator */ + lpsz2 = lpsz1; + while (*lpsz2) + { + if (*lpsz2 == L'\r' || *lpsz2 == L'\n') + { + *lpsz2 = L'\0'; + break; + } + + ++lpsz2; + } + + /* Check for new sections. They should be parent of ROOT. */ + if (*lpsz1 == L'[') + { + bIsSection = TRUE; + hParent = TVI_ROOT; + } + + SecureZeroMemory(&tvis, sizeof(tvis)); + tvis.hParent = hParent; + tvis.hInsertAfter = TVI_LAST; + tvis.itemex.mask = TVIF_TEXT; // TVIF_HANDLE | TVIF_TEXT; + tvis.itemex.pszText = lpsz1; + tvis.itemex.hItem = TreeView_InsertItem(hTree, &tvis); + + /* The special ";msconfig " token disables the line */ + if (!bIsSection && _wcsnicmp(lpsz1, szMSConfigTok, MSConfigTokLen) == 0) + TreeView_SetBOOLCheck(hTree, tvis.itemex.hItem, FALSE, TRUE); + else + TreeView_SetBOOLCheck(hTree, tvis.itemex.hItem, TRUE, TRUE); + + /* + * Now, all the elements will be children of this section, + * until we create a new one. + */ + if (bIsSection) + { + bIsSection = FALSE; + hParent = tvis.itemex.hItem; + } + } + + fclose(ini_file); + return; + + //// Test code for the TreeView //// + /* + HTREEITEM hItem[16]; + + hItem[0] = InsertItem(hTree, _T("B"),TVI_ROOT,TVI_LAST); + hItem[1] = InsertItem(hTree, _T("C"),TVI_ROOT,TVI_LAST); + hItem[2] = InsertItem(hTree, _T("A"),TVI_ROOT,TVI_LAST); + hItem[3] = InsertItem(hTree, _T("D"),TVI_ROOT,TVI_LAST); + hItem[4] = InsertItem(hTree, _T("D-1"),hItem[3] ,TVI_LAST); + hItem[5] = InsertItem(hTree, _T("D-2"),hItem[3] ,TVI_LAST); + hItem[9] = InsertItem(hTree, _T("D-2-1"),hItem[5],TVI_LAST); + hItem[6] = InsertItem(hTree, _T("D-3"),hItem[3] ,TVI_LAST); + hItem[7] = InsertItem(hTree, _T("D-3-1"),hItem[6],TVI_LAST); + hItem[10] = InsertItem(hTree, _T("D-3-1-1"),hItem[7],TVI_LAST); + hItem[11] = InsertItem(hTree, _T("D-3-1-2"),hItem[7],TVI_LAST); + hItem[12] = InsertItem(hTree, _T("D-3-1-3"),hItem[7],TVI_LAST); + hItem[13] = InsertItem(hTree, _T("D-3-1-4"),hItem[7],TVI_LAST); + hItem[14] = InsertItem(hTree, _T("D-3-1-5"),hItem[7],TVI_LAST); + hItem[15] = InsertItem(hTree, _T("D-3-1-6"),hItem[7],TVI_LAST); + hItem[13] = InsertItem(hTree, _T("E"),TVI_ROOT,TVI_LAST); + */ + //////////////////////////////////// + +} + +static void +WriteIniFile(HWND hTree, LPCWSTR lpszIniFile) +{ + // Ouverture en écriture (avec création de fichier si celui-ci n'esistait pas déjà) + // d'un flux en mode texte, avec permission de lecture seule. +#if 0 + DWORD dwNumOfChars = ExpandEnvironmentStringsW(lpszIniFile, NULL, 0); + LPWSTR lpszFileName = MemAlloc(0, dwNumOfChars * sizeof(WCHAR)); + ExpandEnvironmentStringsW(lpszIniFile, lpszFileName, dwNumOfChars); +#else + // HACK: delete these following lines when the program will be ready. + DWORD dwNumOfChars = ExpandEnvironmentStringsW(lpszIniFile, NULL, 0) + 11; + LPWSTR lpszFileName = (LPWSTR)MemAlloc(0, dwNumOfChars * sizeof(WCHAR)); + ExpandEnvironmentStringsW(lpszIniFile, lpszFileName, dwNumOfChars); + wcscat(lpszFileName, L"__tests.ini"); + // END HACK. +#endif + + FILE* ini_file = _wfsopen(lpszFileName, L"wt", _SH_DENYRW); // w+t <-- write read text ; wt <-- write text + MemFree(lpszFileName); + + if (!ini_file) + return; // error + + + TVITEMEXW tvItemEx; + WCHAR label[MAX_VALUE_NAME] = L""; + // WCHAR szLine[MAX_VALUE_NAME] = L""; + + // for (HTREEITEM htiIterator = TreeView_GetRoot(hTree) ; htiIterator ; htiIterator = TreeView_GetNextSibling(hTree, htiIterator)) + for (HTREEITEM htiIterator = TreeView_GetFirst(hTree) ; htiIterator ; htiIterator = TreeView_GetNext(hTree, htiIterator)) + { + SecureZeroMemory(&tvItemEx, sizeof(tvItemEx)); + + tvItemEx.hItem = htiIterator; // Handle of the item to be retrieved. + tvItemEx.mask = TVIF_HANDLE | TVIF_TEXT; + tvItemEx.pszText = label; + tvItemEx.cchTextMax = MAX_VALUE_NAME; + TreeView_GetItem(hTree, &tvItemEx); + + // Write into the file. + wcscat(label, L"\n"); + fputws(label, ini_file); + } + + fclose(ini_file); + return; +} + +static void +Update_Btn_States(HWND hDlg) +{ + HWND hTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + HTREEITEM hti = TreeView_GetSelection(hTree); + HTREEITEM htiPrev = TreeView_GetPrevSibling(hTree, hti); + HTREEITEM htiNext = TreeView_GetNextSibling(hTree, hti); + + // + // "Up" / "Down" buttons. + // + if (htiPrev) + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_UP), TRUE); + else + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_UP), FALSE); + + if (htiNext) + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DOWN), TRUE); + else + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DOWN), FALSE); + + // + // "Enable" / "Disable" buttons. + // + UINT uCheckState = TreeView_GetCheckState(hTree, hti); + if (uCheckState == 0) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE), FALSE); + } + else if (uCheckState == 1) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE), TRUE); + } + else if (uCheckState == 2) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE), TRUE); + } + else + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE), FALSE); + } + + // + // "Enable all" / "Disable all" buttons. + // + UINT uRootCheckState = TreeView_GetRealSubtreeState(hTree, TVI_ROOT); + if (uRootCheckState == 0) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE_ALL) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE_ALL), FALSE); + } + else if (uRootCheckState == 1) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE_ALL) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE_ALL), TRUE); + } + else if (uRootCheckState == 2) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE_ALL) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE_ALL), TRUE); + } + else + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_ENABLE_ALL) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DISABLE_ALL), FALSE); + } + + // + // "Search" / "Edit" / "Delete" buttons. + // + if (TreeView_GetRoot(hTree)) + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_FIND) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_EDIT) , TRUE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DELETE), TRUE); + } + else + { + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_FIND) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_EDIT) , FALSE); + EnableWindow(GetDlgItem(hDlg, IDC_BTN_SYSTEM_DELETE), FALSE); + } + + return; +} + + +INT_PTR +CommonWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch (message) + { + case WM_INITDIALOG: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + // + // Initialize the styles. + // + TreeView_Set3StateCheck(hSystemTree); + SetWindowTheme(hSystemTree, L"Explorer", NULL); + + TreeView_SetIndent(hSystemTree, TreeView_GetIndent(hSystemTree) + 2); + + /* Load data */ + LoadIniFile(hSystemTree, (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam); + + /* Select the first item */ + TreeView_SelectItem(hSystemTree, TreeView_GetRoot(hSystemTree)); // Is it really necessary? + SetFocus(hSystemTree); + + Update_Btn_States(hDlg); + + return TRUE; + } + + case WM_DESTROY: + { + TreeView_Cleanup(GetDlgItem(hDlg, IDC_SYSTEM_TREE)); + return FALSE; + } + + case WM_COMMAND: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + switch (LOWORD(wParam)) + { + case IDC_BTN_SYSTEM_UP: + { + TreeView_UpItem(hSystemTree, TreeView_GetSelection(hSystemTree)); + PropSheet_Changed(GetParent(hDlg), hDlg); + return TRUE; + } + + case IDC_BTN_SYSTEM_DOWN: + { + TreeView_DownItem(hSystemTree, TreeView_GetSelection(hSystemTree)); + PropSheet_Changed(GetParent(hDlg), hDlg); + return TRUE; + } + + case IDC_BTN_SYSTEM_ENABLE: + { + HTREEITEM hItem = TreeView_GetSelection(hSystemTree); + TreeView_SetBOOLCheck(hSystemTree, hItem, TRUE, TRUE); + TreeView_SelectItem(hSystemTree, hItem); + Update_Btn_States(hDlg); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case IDC_BTN_SYSTEM_ENABLE_ALL: + { + for (HTREEITEM htiIterator = TreeView_GetRoot(hSystemTree) ; htiIterator ; htiIterator = TreeView_GetNextSibling(hSystemTree, htiIterator)) + TreeView_SetBOOLCheck(hSystemTree, htiIterator, TRUE, TRUE); + + Update_Btn_States(hDlg); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case IDC_BTN_SYSTEM_DISABLE: + { + HTREEITEM hItem = TreeView_GetSelection(hSystemTree); + TreeView_SetBOOLCheck(hSystemTree, hItem, FALSE, TRUE); + TreeView_SelectItem(hSystemTree, hItem); + + Update_Btn_States(hDlg); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case IDC_BTN_SYSTEM_DISABLE_ALL: + { + for (HTREEITEM htiIterator = TreeView_GetRoot(hSystemTree) ; htiIterator ; htiIterator = TreeView_GetNextSibling(hSystemTree, htiIterator)) + TreeView_SetBOOLCheck(hSystemTree, htiIterator, FALSE, TRUE); + + Update_Btn_States(hDlg); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case IDC_BTN_SYSTEM_FIND: + { + DialogBoxParamW(hInst, MAKEINTRESOURCEW(IDD_FIND_DIALOG), hDlg /* hMainWnd */, FindDialogWndProc, (LPARAM)hSystemTree); + return TRUE; + } + + case IDC_BTN_SYSTEM_NEW: + { + HTREEITEM hInsertAfter = TreeView_GetSelection(hSystemTree); + HTREEITEM hNewItem = InsertItem(hSystemTree, L"", TreeView_GetParent(hSystemTree, hInsertAfter), hInsertAfter); + TreeView_EditLabel(hSystemTree, hNewItem); + TreeView_SelectItem(hSystemTree, hNewItem); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case IDC_BTN_SYSTEM_EDIT: + { + TreeView_EditLabel(hSystemTree, TreeView_GetSelection(hSystemTree)); + return TRUE; + } + + case IDC_BTN_SYSTEM_DELETE: + { + TreeView_DeleteItem(hSystemTree, TreeView_GetSelection(hSystemTree)); + Update_Btn_States(hDlg); + PropSheet_Changed(GetParent(hDlg), hDlg); + return TRUE; + } + + default: + return FALSE; + } + // return FALSE; + } + + case UM_CHECKSTATECHANGE: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + /* Retrieve the new checked state of the item and handle the notification */ + HTREEITEM hItemChanged = (HTREEITEM)lParam; + + // + // State before | State after + // ------------------------------- + // 0 (unchecked) | 1 (checked) + // 1 (checked) | 0 (unchecked) + // 2 (grayed) | 1 (checked) --> this case corresponds to the former + // | with 0 == 2 mod 2. + // + UINT uiCheckState = TreeView_GetCheckState(hSystemTree, hItemChanged) % 2; + TreeView_SetBOOLCheck(hSystemTree, hItemChanged, uiCheckState ? FALSE : TRUE, TRUE); + TreeView_SelectItem(hSystemTree, hItemChanged); + Update_Btn_States(hDlg); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + return TRUE; + } + + case WM_NOTIFY: + { + if (((LPNMHDR)lParam)->idFrom == IDC_SYSTEM_TREE) + { + switch (((LPNMHDR)lParam)->code) + { + case NM_CLICK: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + DWORD dwpos = GetMessagePos(); + TVHITTESTINFO ht = {}; + ht.pt.x = GET_X_LPARAM(dwpos); + ht.pt.y = GET_Y_LPARAM(dwpos); + MapWindowPoints(HWND_DESKTOP /*NULL*/, hSystemTree, &ht.pt, 1); + + TreeView_HitTest(hSystemTree, &ht); + + if (TVHT_ONITEMSTATEICON & ht.flags) + { + PostMessage(hDlg, UM_CHECKSTATECHANGE, 0, (LPARAM)ht.hItem); + + // Disable default behaviour. Needed for the UM_CHECKSTATECHANGE + // custom notification to work as expected. + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, TRUE); + } + /* + else + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + */ + + return TRUE; + } + + case TVN_KEYDOWN: + { + if (((LPNMTVKEYDOWN)lParam)->wVKey == VK_SPACE) + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + HTREEITEM hti = TreeView_GetSelection(hSystemTree); + + // Hack the tree item state. This is needed because whether or not + // TRUE is being returned, the default implementation of SysTreeView32 + // is always being processed for a key down ! + if (GetWindowLongPtr(hSystemTree, GWL_STYLE) & TVS_CHECKBOXES) + { + TreeView_SetItemState(hSystemTree, hti, INDEXTOSTATEIMAGEMASK(TreeView_GetCheckState(hSystemTree, hti)), TVIS_STATEIMAGEMASK); + } + + PostMessage(hDlg, UM_CHECKSTATECHANGE, 0, (LPARAM)hti); + + // Disable default behaviour. Needed for the UM_CHECKSTATECHANGE + // custom notification to work as expected. + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, TRUE); + } + + return TRUE; + } + + case TVN_ENDLABELEDIT: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + /* + * Ehh yes, we have to deal with a "dialog proc", which is quite different from a "window proc": + * + * (excerpt from: MSDN library http://msdn.microsoft.com/en-us/library/ms645469(VS.85).aspx) + * + * Return Value + * ============ + * INT_PTR + * + * Typically, the dialog box procedure should return TRUE if it processed the message, and FALSE if it did not. + * If the dialog box procedure returns FALSE, the dialog manager performs the default dialog operation in response + * to the message. + * + * If the dialog box procedure processes a message that requires a specific return value, the dialog box procedure + * should set the desired return value by calling SetWindowLong(hwndDlg, DWL_MSGRESULT, lResult) immediately before + * returning TRUE. Note that you must call SetWindowLong immediately before returning TRUE; doing so earlier may result + * in the DWL_MSGRESULT value being overwritten by a nested dialog box message. + * + * [...] + * + * Remarks + * ======= + * You should use the dialog box procedure only if you use the dialog box class for the dialog box. This is the default + * class and is used when no explicit class is specified in the dialog box template. Although the dialog box procedure + * is similar to a window procedure, it must not call the DefWindowProc function to process unwanted messages. Unwanted + * messages are processed internally by the dialog box window procedure. + * + */ + + // A arranger un peu ???? Certainement. + TVITEMW truc = ((LPNMTVDISPINFO)lParam)->item; + if (truc.pszText) + { + if (!*truc.pszText) + TreeView_DeleteItem(hSystemTree, truc.hItem); + + PropSheet_Changed(GetParent(hDlg), hDlg); + + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, TRUE); + } + else + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + + Update_Btn_States(hDlg); + return TRUE; + } + + case TVN_SELCHANGED: + Update_Btn_States(hDlg); + return TRUE; + + default: + return FALSE; + } + } + else + { + switch (((LPNMHDR)lParam)->code) + { + case PSN_APPLY: + { + // TODO: Enum the items. + // HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + // + PropSheet_CancelToClose(GetParent(hDlg)); + + /* TODO: see : + * + * dll/win32/devmgr/advprop.c: PropSheet_RebootSystem(hwndDlg); + * include/psdk/prsht.h:#define PropSheet_RebootSystem(d) SendMessage(d,PSM_REBOOTSYSTEM,0,0) + * + * dll/shellext/deskadp/deskadp.c: PropSheet_RestartWindows(GetParent(This->hwndDlg)); + * dll/shellext/deskmon/deskmon.c: PropSheet_RestartWindows(GetParent(This->hwndDlg)); + * include/psdk/prsht.h:#define PropSheet_RestartWindows(d) SendMessage(d,PSM_RESTARTWINDOWS,0,0) + * + * for their usage. + */ + PropSheet_RebootSystem(GetParent(hDlg)); + //PropSheet_RestartWindows(GetParent(hDlg)); + + WriteIniFile(GetDlgItem(hDlg, IDC_SYSTEM_TREE), (LPCWSTR)wParam); + + // Since there are nothing to modify, applying modifications + // cannot return any error. + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, PSNRET_NOERROR); + //PropSheet_UnChanged(GetParent(hDlg) /*hMainWnd*/, hDlg); + return TRUE; + } + + case PSN_HELP: + { + MessageBox(hDlg, _T("Help not implemented yet!"), _T("Help"), MB_ICONINFORMATION | MB_OK); + return TRUE; + } + + case PSN_KILLACTIVE: // Is going to lose activation. + { + // Changes are always valid of course. + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + return TRUE; + } + + case PSN_QUERYCANCEL: + { + // Allows cancellation since there are nothing to cancel... + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, FALSE); + return TRUE; + } + + case PSN_QUERYINITIALFOCUS: + { + HWND hSystemTree = GetDlgItem(hDlg, IDC_SYSTEM_TREE); + + // Give the focus on and select the first item. + ListView_SetItemState(hSystemTree, 0, LVIS_FOCUSED | LVIS_SELECTED, LVIS_FOCUSED | LVIS_SELECTED); + + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, (LONG_PTR)hSystemTree); + return TRUE; + } + + // + // DO NOT TOUCH THESE NEXT MESSAGES, THEY ARE OK LIKE THIS... + // + case PSN_RESET: // Perform final cleaning, called before WM_DESTROY. + return TRUE; + + case PSN_SETACTIVE: // Is going to gain activation. + { + SetWindowLongPtr(hDlg, DWLP_MSGRESULT, 0); + return TRUE; + } + + default: + break; + } + } + + return FALSE; + } + + default: + return FALSE; + } + + // return FALSE; +} + + +extern "C" { + +INT_PTR CALLBACK +SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LPCWSTR lpszIniFile = NULL; + + if (message == WM_INITDIALOG) + lpszIniFile = (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam; + + if ( (message == WM_NOTIFY) && (((LPNMHDR)lParam)->code == PSN_APPLY) ) + wParam = (WPARAM)lpszIniFile; + + return CommonWndProc(hDlg, message, wParam, lParam); +} + +INT_PTR CALLBACK +WinPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LPCWSTR lpszIniFile = NULL; + + if (message == WM_INITDIALOG) + lpszIniFile = (LPCWSTR)((LPPROPSHEETPAGE)lParam)->lParam; + + if ( (message == WM_NOTIFY) && (((LPNMHDR)lParam)->code == PSN_APPLY) ) + wParam = (WPARAM)lpszIniFile; + + return CommonWndProc(hDlg, message, wParam, lParam); +} + +} Propchange: trunk/reactos/base/applications/msconfig_new/systempage.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig_new/systempage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/systempage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/systempage.h [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -1,8 +1,23 @@ +/* + * PROJECT: ReactOS Applications + * LICENSE: LGPL - See COPYING in the top level directory + * FILE: base/applications/msconfig_new/systempage.h + * PURPOSE: System page message handler + * COPYRIGHT: Copyright 2005-2006 Christoph von Wittich <Christoph(a)ApiViewer.de> + * 2011 Gregor Schneider <Gregor.Schneider(a)reactos.org> + * Copyright 2011-2012 Hermes BELUSCA - MAITO <hermes.belusca(a)sfr.fr> + */ + #ifndef _SYSTEMPAGE_H_ #define _SYSTEMPAGE_H_ -extern HWND hSystemPage; +extern LPCWSTR lpszSystemIni; +extern LPCWSTR lpszWinIni; + +DWORD GetSystemIniActivation(VOID); +DWORD GetWinIniActivation(VOID); INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK WinPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); -#endif /* _SYSTEMPAGE_H_ */ +#endif Modified: trunk/reactos/base/applications/msconfig_new/toolspage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig_new/toolspage.cpp [iso-8859-1] Sat Oct 31 21:00:32 2015 @@ -10,7 +10,7 @@ #include "precomp.h" #include "xmldomparser.hpp" #include "utils.h" -#include "listviewfuncs.h" +#include "listview.h" #include "uxthemesupp.h" static HWND hToolsPage = NULL; @@ -229,8 +229,6 @@ return numOfChars; } - -#define Button_IsEnabled(hwndCtl) IsWindowEnabled((hwndCtl)) static void Update_States(int iSelectedItem) {

1 0

[tkreuzer] 69760: [WIN32K] Check the size of RLE bitmaps, while decompressing. Fixes possible buffer overrun. Patch by Kamil Hornicek CORE-8735 #resolve
by tkreuzer＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: tkreuzer Date: Sat Oct 31 20:37:20 2015 New Revision: 69760 URL: http://svn.reactos.org/svn/reactos?rev=69760&view=rev Log: [WIN32K] Check the size of RLE bitmaps, while decompressing. Fixes possible buffer overrun. Patch by Kamil Hornicek CORE-8735 #resolve Modified: trunk/reactos/win32ss/gdi/eng/eng.h trunk/reactos/win32ss/gdi/eng/rlecomp.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c Modified: trunk/reactos/win32ss/gdi/eng/eng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/eng.h?rev=… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/eng.h [iso-8859-1] Sat Oct 31 20:37:20 2015 @@ -52,4 +52,5 @@ BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, - ULONG iFormat); + ULONG iFormat, + ULONG cjSizeImage); Modified: trunk/reactos/win32ss/gdi/eng/rlecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/rlecomp.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/rlecomp.c [iso-8859-1] Sat Oct 31 20:37:20 2015 @@ -18,14 +18,14 @@ RLE_DELTA = 2 /* Delta */ }; -VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format) +VOID DecompressBitmap(SIZEL Size, BYTE *CompressedBits, BYTE *UncompressedBits, LONG Delta, ULONG Format, ULONG cjSizeImage) { INT x = 0; INT y = Size.cy - 1; INT c; INT length; INT width; - INT height = Size.cy - 1; + INT height = y; BYTE *begin = CompressedBits; BYTE *bits = CompressedBits; BYTE *temp; @@ -40,7 +40,7 @@ _SEH2_TRY { - while (y >= 0) + while (y >= 0 && (bits - begin) <= cjSizeImage) { length = (*bits++) >> shift; if (length) Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.c [iso-8859-1] Sat Oct 31 20:37:20 2015 @@ -107,7 +107,6 @@ pvCompressedBits = pvBits; pvBits = NULL; iFormat = (iFormat == BMF_4RLE) ? BMF_4BPP : BMF_8BPP; - cjSizeImage = 0; } /* Allocate a surface */ @@ -117,7 +116,7 @@ iFormat, fjBitmap, cjWidthBytes, - cjSizeImage, + pvCompressedBits ? 0 : cjSizeImage, pvBits); if (!psurf) { @@ -136,7 +135,7 @@ lDelta = WIDTH_BYTES_ALIGN32(nWidth, gajBitsPerFormat[iFormat]); pvBits = psurf->SurfObj.pvBits; - DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat); + DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat, cjSizeImage); } /* Get the handle for the bitmap */

1 0

[tkreuzer] 69759: [WIN32K] Restore saved DCs, when changing the DC owner. Otherwise there could be saved DCs with references to process owned resources, causing GDI object leaks. Fixes assertion wh...
by tkreuzer＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: tkreuzer Date: Sat Oct 31 19:37:36 2015 New Revision: 69759 URL: http://svn.reactos.org/svn/reactos?rev=69759&view=rev Log: [WIN32K] Restore saved DCs, when changing the DC owner. Otherwise there could be saved DCs with references to process owned resources, causing GDI object leaks. Fixes assertion when closing iWisoft Video Converter Also don't copy lSaveDepth and hdcSafe in DC_vCopyState, those must be handled manually. CORE-10435 #resolve Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c trunk/reactos/win32ss/gdi/ntgdi/dcstate.c Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Sat Oct 31 19:37:36 2015 @@ -392,13 +392,16 @@ if(pdc->dclevel.pSurface) SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface); - PDEVOBJ_vRelease(pdc->ppdev) ; + PDEVOBJ_vRelease(pdc->ppdev); } VOID NTAPI DC_vSetOwner(PDC pdc, ULONG ulOwner) { + /* Delete saved DCs */ + DC_vRestoreDC(pdc, 1); + if (pdc->dclevel.hPath) { GreSetObjectOwner(pdc->dclevel.hPath, ulOwner); Modified: trunk/reactos/win32ss/gdi/ntgdi/dcstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcstate.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dcstate.c [iso-8859-1] Sat Oct 31 19:37:36 2015 @@ -28,8 +28,6 @@ /* Copy DC level */ pdcDst->dclevel.pColorSpace = pdcSrc->dclevel.pColorSpace; - pdcDst->dclevel.lSaveDepth = pdcSrc->dclevel.lSaveDepth; - pdcDst->dclevel.hdcSave = pdcSrc->dclevel.hdcSave; pdcDst->dclevel.laPath = pdcSrc->dclevel.laPath; pdcDst->dclevel.ca = pdcSrc->dclevel.ca; pdcDst->dclevel.mxWorldToDevice = pdcSrc->dclevel.mxWorldToDevice; @@ -131,7 +129,7 @@ HDC hdcSave; PDC pdcSave; - ASSERT(iSaveLevel > 0); + NT_ASSERT(iSaveLevel > 0); DPRINT("DC_vRestoreDC(%p, %ld)\n", pdc->BaseObject.hHmgr, iSaveLevel); /* Loop the save levels */ @@ -146,6 +144,7 @@ /* Could not get ownership. That's bad! */ DPRINT1("Could not get ownership of saved DC (%p) for hdc %p!\n", hdcSave, pdc->BaseObject.hHmgr); + NT_ASSERT(FALSE); return;// FALSE; } @@ -156,6 +155,7 @@ /* WTF? Internal error! */ DPRINT1("Could not lock the saved DC (%p) for dc %p!\n", hdcSave, pdc->BaseObject.hHmgr); + NT_ASSERT(FALSE); return;// FALSE; } @@ -300,6 +300,7 @@ if (pdcSave->dclevel.hPath) pdcSave->dclevel.flPath |= DCPATH_SAVE; /* Set new dc as save dc */ + pdcSave->dclevel.hdcSave = pdc->dclevel.hdcSave; pdc->dclevel.hdcSave = hdcSave; /* Increase save depth, return old value */

1 0

[jimtabor] 69758: [User32_wineTest] - Enable skipped menu tests.
by jimtabor＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: jimtabor Date: Sat Oct 31 18:40:44 2015 New Revision: 69758 URL: http://svn.reactos.org/svn/reactos?rev=69758&view=rev Log: [User32_wineTest] - Enable skipped menu tests. Modified: trunk/rostests/winetests/user32/msg.c Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… ============================================================================== --- trunk/rostests/winetests/user32/msg.c [iso-8859-1] (original) +++ trunk/rostests/winetests/user32/msg.c [iso-8859-1] Sat Oct 31 18:40:44 2015 @@ -15116,13 +15116,8 @@ init_tests(); test_sys_menu(); test_menu_messages(); - if(!winetest_interactive) - skip("CORE-8299 : Skip Tracking popup menu tests.\n"); - else - { test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); - } cleanup_tests(); }

1 0

[akhaldi] 69757: [PSDK] Comment commctrl.h preprocessor conditions in an attempt to make this maze readable.
by akhaldi＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: akhaldi Date: Sat Oct 31 18:37:34 2015 New Revision: 69757 URL: http://svn.reactos.org/svn/reactos?rev=69757&view=rev Log: [PSDK] Comment commctrl.h preprocessor conditions in an attempt to make this maze readable. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Oct 31 18:37:34 2015 @@ -17,8 +17,8 @@ #if (_WIN32_IE < 0x0500) #error _WIN32_IE setting conflicts #endif -#endif -#endif +#endif /* !_WIN32_IE */ +#endif /* !_WINRESRC_ */ #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED @@ -26,13 +26,14 @@ #endif #ifndef NOUSER + #ifndef WINCOMMCTRLAPI #ifndef _COMCTL32_ #define WINCOMMCTRLAPI DECLSPEC_IMPORT #else #define WINCOMMCTRLAPI #endif -#endif +#endif /* !WINCOMMCTRLAPI */ #ifdef __cplusplus extern "C" { @@ -46,7 +47,7 @@ #else #define SNDMSG SendMessage #endif -#endif +#endif /* !SNDMSG */ WINCOMMCTRLAPI void WINAPI InitCommonControls(void); @@ -103,6 +104,7 @@ } COLORSCHEME,*LPCOLORSCHEME; #if (_WIN32_IE >= 0x0500) + #if (_WIN32_WINNT >= 0x0501) #define COMCTL32_VERSION 6 #else @@ -116,7 +118,8 @@ #define CCM_SETWINDOWTHEME (CCM_FIRST+0xb) #define CCM_DPISCALE (CCM_FIRST+0xc) #endif -#endif + +#endif /* _WIN32_IE >= 0x0500 */ #define INFOTIPSIZE 1024 @@ -596,7 +599,7 @@ WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Duplicate(_In_ HIMAGELIST himl); -#endif +#endif /* !NOIMAGEAPIS */ #ifndef NOHEADER @@ -900,7 +903,8 @@ INT iItem; RECT rc; } NMHDFILTERBTNCLICK,*LPNMHDFILTERBTNCLICK; -#endif + +#endif /* !NOHEADER */ #ifndef NOTOOLBAR @@ -1417,7 +1421,7 @@ #define NMTOOLBAR __MINGW_NAME_AW(NMTOOLBAR) #define LPNMTOOLBAR __MINGW_NAME_AW(LPNMTOOLBAR) -#endif +#endif /* !NOTOOLBAR */ #ifndef NOREBAR @@ -1660,7 +1664,8 @@ UINT flags; int iBand; } RBHITTESTINFO,*LPRBHITTESTINFO; -#endif + +#endif /* !NOREBAR */ #ifndef NOTOOLTIPS @@ -1875,7 +1880,8 @@ #define LPNMTTDISPINFO __MINGW_NAME_AW(LPNMTTDISPINFO) #define NMTTDISPINFO_V1_SIZE __MINGW_NAME_AW_EXT(NMTTDISPINFO,_V1_SIZE) -#endif + +#endif /* !NOTOOLTIPS */ #ifndef NOSTATUSBAR @@ -1937,7 +1943,8 @@ #define SBN_SIMPLEMODECHANGE (SBN_FIRST - 0) #define SB_SIMPLEID 0xff -#endif + +#endif /* !NOSTATUSBAR */ #ifndef NOMENUHELP @@ -1960,7 +1967,8 @@ _In_z_ const INT *lpInfo); #define MINSYSCOMMAND SC_SIZE -#endif + +#endif /* !NOMENUHELP */ #ifndef NOTRACKBAR @@ -2040,7 +2048,8 @@ #define TBCD_TICS 0x1 #define TBCD_THUMB 0x2 #define TBCD_CHANNEL 0x3 -#endif + +#endif /* !NOTRACKBAR */ #ifndef NODRAGLIST @@ -2066,7 +2075,8 @@ WINCOMMCTRLAPI void WINAPI DrawInsert(HWND handParent,HWND hLB,int nItem); WINCOMMCTRLAPI int WINAPI LBItemFromPt(HWND hLB,POINT pt,BOOL bAutoScroll); -#endif + +#endif /* !NODRAGLIST */ #ifndef NOUPDOWN @@ -2122,7 +2132,8 @@ } NMUPDOWN,*LPNMUPDOWN; #define UDN_DELTAPOS (UDN_FIRST - 1) -#endif + +#endif /* !NOUPDOWN */ #ifndef NOPROGRESS @@ -2190,7 +2201,8 @@ #define HOTKEY_CLASSW L"msctls_hotkey32" #define HOTKEY_CLASS __MINGW_NAME_AW(HOTKEY_CLASS) -#endif + +#endif /* !NOHOTKEY */ #define CCS_TOP 0x1L #define CCS_NOMOVEY 0x2L @@ -3184,7 +3196,8 @@ #define LVN_BEGINSCROLL (LVN_FIRST-80) #define LVN_ENDSCROLL (LVN_FIRST-81) -#endif + +#endif /* !NOLISTVIEW */ #ifndef NOTREEVIEW @@ -3722,7 +3735,8 @@ #define LPNMTVGETINFOTIP __MINGW_NAME_AW(LPNMTVGETINFOTIP) #define TVCDRF_NOIMAGES 0x10000 -#endif + +#endif /* !NOTREEVIEW */ #ifndef NOUSEREXCONTROLS @@ -3875,7 +3889,7 @@ #define LPNMCBEENDEDIT __MINGW_NAME_AW(LPNMCBEENDEDIT) #define PNMCBEENDEDIT __MINGW_NAME_AW(PNMCBEENDEDIT) -#endif +#endif /* !NOUSEREXCONTROLS */ #ifndef NOTABCONTROL @@ -4081,7 +4095,8 @@ #define TCN_SELCHANGING (TCN_FIRST - 2) #define TCN_GETOBJECT (TCN_FIRST - 3) #define TCN_FOCUSCHANGE (TCN_FIRST - 4) -#endif + +#endif /* !NOTABCONTROL */ #ifndef NOANIMATE @@ -4114,9 +4129,11 @@ #define Animate_Stop(hwnd) (BOOL)SNDMSG(hwnd,ACM_STOP,0,0) #define Animate_Close(hwnd) Animate_Open(hwnd,NULL) #define Animate_Seek(hwnd,frame) Animate_Play(hwnd,frame,frame,1) -#endif + +#endif /* !NOANIMATE */ #ifndef NOMONTHCAL + #define MONTHCAL_CLASSW L"SysMonthCal32" #define MONTHCAL_CLASSA "SysMonthCal32" @@ -4258,9 +4275,11 @@ #define GMR_VISIBLE 0 #define GMR_DAYSTATE 1 -#endif + +#endif /* !NOMONTHCAL */ #ifndef NODATETIMEPICK + #define DATETIMEPICK_CLASSW L"SysDateTimePick32" #define DATETIMEPICK_CLASSA "SysDateTimePick32" @@ -4401,6 +4420,7 @@ #define GDT_NONE 1 #ifndef NOIPADDRESS + #define IPM_CLEARADDRESS (WM_USER+100) #define IPM_SETADDRESS (WM_USER+101) #define IPM_GETADDRESS (WM_USER+102) @@ -4428,9 +4448,11 @@ #define SECOND_IPADDRESS(x) ((x>>16) & 0xff) #define THIRD_IPADDRESS(x) ((x>>8) & 0xff) #define FOURTH_IPADDRESS(x) (x & 0xff) -#endif + +#endif /* !NOIPADDRESS */ #ifndef NOPAGESCROLLER + #define WC_PAGESCROLLERW L"SysPager" #define WC_PAGESCROLLERA "SysPager" @@ -4535,7 +4557,8 @@ int idNew; DWORD dwFlags; } NMPGHOTITEM,*LPNMPGHOTITEM; -#endif + +#endif /* !NOPAGESCROLLER */ #ifndef NONATIVEFONTCTL @@ -4550,9 +4573,11 @@ #define NFS_BUTTON 0x8 #define NFS_ALL 0x10 #define NFS_USEFONTASSOC 0x20 -#endif + +#endif /* !NONATIVEFONTCTL */ #ifndef NOBUTTON + #define WC_BUTTONA "Button" #define WC_BUTTONW L"Button" @@ -4593,15 +4618,17 @@ #define BST_HOT 0x200 -#endif +#endif /* !NOBUTTON */ #ifndef NOSTATIC + #define WC_STATICA "Static" #define WC_STATICW L"Static" #define WC_STATIC __MINGW_NAME_AW(WC_STATIC) #ifndef NOEDIT + #define WC_EDITA "Edit" #define WC_EDITW L"Edit" @@ -4622,23 +4649,20 @@ #define Edit_ShowBalloonTip(hwnd,peditballoontip) (BOOL)SNDMSG((hwnd),EM_SHOWBALLOONTIP,0,(LPARAM)(peditballoontip)) #define EM_HIDEBALLOONTIP (ECM_FIRST+4) #define Edit_HideBalloonTip(hwnd) (BOOL)SNDMSG((hwnd),EM_HIDEBALLOONTIP,0,0) -#endif + +#endif /* !NOEDIT */ #ifndef NOLISTBOX #define WC_LISTBOXA "ListBox" #define WC_LISTBOXW L"ListBox" - #define WC_LISTBOX __MINGW_NAME_AW(WC_LISTBOX) - -#endif +#endif /* !NOLISTBOX */ #ifndef NOCOMBOBOX #define WC_COMBOBOXA "ComboBox" #define WC_COMBOBOXW L"ComboBox" - #define WC_COMBOBOX __MINGW_NAME_AW(WC_COMBOBOX) - -#endif +#endif /* !NOCOMBOBOX */ #define CB_SETMINVISIBLE (CBM_FIRST+1) #define CB_GETMINVISIBLE (CBM_FIRST+2) @@ -4649,10 +4673,8 @@ #ifndef NOSCROLLBAR #define WC_SCROLLBARA "ScrollBar" #define WC_SCROLLBARW L"ScrollBar" - #define WC_SCROLLBAR __MINGW_NAME_AW(WC_SCROLLBAR) - -#endif +#endif /* !NOSCROLLBAR */ #define INVALID_LINK_INDEX (-1) #define MAX_LINKID_TEXT 48 @@ -4700,7 +4722,8 @@ void WINAPI InitMUILanguage(LANGID uiLang); LANGID WINAPI GetMUILanguage(void); #endif -#endif + +#endif /* !NOSTATIC */ #define DA_LAST (0x7fffffff) #define DPA_APPEND (0x7fffffff) @@ -4910,7 +4933,8 @@ HWND hwndTrack; DWORD dwHoverTime; } TRACKMOUSEEVENT,*LPTRACKMOUSEEVENT; -#endif + +#endif /* !TME_HOVER */ WINCOMMCTRLAPI BOOL @@ -4918,7 +4942,7 @@ _TrackMouseEvent( _Inout_ LPTRACKMOUSEEVENT lpEventTrack); -#endif +#endif /* !NOTRACKMOUSEEVENT */ #ifndef NOFLATSBAPIS @@ -4959,8 +4983,10 @@ #define FlatSB_SetScrollPropPtr FlatSB_SetScrollProp WINCOMMCTRLAPI BOOL WINAPI InitializeFlatSB(HWND); WINCOMMCTRLAPI HRESULT WINAPI UninitializeFlatSB(HWND); -#endif -#endif + +#endif /* !NOFLATSBAPIS */ + +#endif /* !NODATETIMEPICK */ typedef LRESULT (CALLBACK *SUBCLASSPROC)(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam,UINT_PTR uIdSubclass,DWORD_PTR dwRefData); @@ -5101,7 +5127,7 @@ #include <poppack.h> -#endif /* NOTASKDIALOG */ +#endif /* !NOTASKDIALOG */ #if (NTDDI_VERSION >= NTDDI_VISTA) enum _LI_METRIC @@ -5115,5 +5141,6 @@ } #endif -#endif -#endif +#endif /* !NOUSER */ + +#endif /* _INC_COMMCTRL */

1 0

[hbelusca] 69756: Fix build.
by hbelusca＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: hbelusca Date: Sat Oct 31 17:28:37 2015 New Revision: 69756 URL: http://svn.reactos.org/svn/reactos?rev=69756&view=rev Log: Fix build. Modified: trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Oct 31 17:28:37 2015 @@ -112,8 +112,11 @@ #define CCM_SETVERSION (CCM_FIRST+0x7) #define CCM_GETVERSION (CCM_FIRST+0x8) #define CCM_SETNOTIFYWINDOW (CCM_FIRST+0x9) +#if (_WIN32_WINNT >= 0x0501) #define CCM_SETWINDOWTHEME (CCM_FIRST+0xb) #define CCM_DPISCALE (CCM_FIRST+0xc) +#endif +#endif #define INFOTIPSIZE 1024

1 0

[hbelusca] 69755: [PSDK] Fix COMCTL32_VERSION definition. [COMCTL32] The comctl32 we currently have in trunk cannot pretend to be version 6+ (it was currently reporting version 6.82, aka something ...
by hbelusca＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: hbelusca Date: Sat Oct 31 17:25:32 2015 New Revision: 69755 URL: http://svn.reactos.org/svn/reactos?rev=69755&view=rev Log: [PSDK] Fix COMCTL32_VERSION definition. [COMCTL32] The comctl32 we currently have in trunk cannot pretend to be version 6+ (it was currently reporting version 6.82, aka something for Windows 20? ) Fix it and make it report 5.82 instead. CORE-10457 Modified: trunk/reactos/dll/win32/comctl32/resource.h trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/include/psdk/commctrl.h Modified: trunk/reactos/dll/win32/comctl32/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/resourc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/resource.h [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -59,4 +59,7 @@ #define IDI_TT_WARN_SM 25 #define IDI_TT_ERROR_SM 28 -#define COMCTL32_VERSION_MINOR 81 +// This is really ComCtl32 v5.82, the last one not supporting SxS +#undef COMCTL32_VERSION // Undefines what the PSDK gave to us +#define COMCTL32_VERSION 5 +#define COMCTL32_VERSION_MINOR 82 Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rsrc.rc [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -30,7 +30,7 @@ #define WINE_FILEDESCRIPTION_STR "Wine Common Controls" #define WINE_FILENAME_STR "comctl32.dll" #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100 -#define WINE_FILEVERSION_STR "5.81" +#define WINE_FILEVERSION_STR "5.82" #define WINE_PRODUCTVERSION WINE_FILEVERSION #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/commctrl.h [iso-8859-1] Sat Oct 31 17:25:32 2015 @@ -102,7 +102,12 @@ COLORREF clrBtnShadow; } COLORSCHEME,*LPCOLORSCHEME; -#define COMCTL32_VERSION 6 +#if (_WIN32_IE >= 0x0500) +#if (_WIN32_WINNT >= 0x0501) +#define COMCTL32_VERSION 6 +#else +#define COMCTL32_VERSION 5 +#endif #define CCM_SETVERSION (CCM_FIRST+0x7) #define CCM_GETVERSION (CCM_FIRST+0x8)

1 0

[tkreuzer] 69754: [GDI32_APITEST] Formatting: tabs -> spaces
by tkreuzer＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: tkreuzer Date: Sat Oct 31 15:24:09 2015 New Revision: 69754 URL: http://svn.reactos.org/svn/reactos?rev=69754&view=rev Log: [GDI32_APITEST] Formatting: tabs -> spaces Modified: trunk/rostests/apitests/gdi32/GetObject.c Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sat Oct 31 15:24:09 2015 @@ -16,338 +16,338 @@ void Test_General(void) { - struct - { - LOGBRUSH logbrush; - BYTE additional[600]; - } TestStruct; - PLOGBRUSH plogbrush; - HBRUSH hBrush; - HPEN hpen; - INT ret; - - /* Test null pointer and invalid handles */ - SetLastError(ERROR_SUCCESS); - ok(GetObjectA(0, 0, NULL) == 0, "\n"); - ok(GetObjectA((HANDLE)-1, 0, NULL) == 0, "\n"); - - /* Test invalid habdles of different types */ - ok(GetObjectA((HANDLE)0x00380000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObjectA((HANDLE)0x00380000, 10, &TestStruct) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00010000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00020000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00030000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00040000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00060000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00070000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x000B0000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x000C0000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x000D0000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x000E0000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x000F0000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00110000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00120000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00130000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00140000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00150000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)0x00160000, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_DC, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_DC, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_REGION, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_REGION, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EMF, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EMF, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METAFILE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_METAFILE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - - /* Test need of alignment */ - SetLastError(ERROR_SUCCESS); - hBrush = GetStockObject(WHITE_BRUSH); - plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush); - ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH), "\n"); - plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 2); - ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH), "\n"); - plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 1); - //ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0, "\n"); // fails on win7 - - /* Test invalid buffer */ - SetLastError(0xbadbad00); - ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); + struct + { + LOGBRUSH logbrush; + BYTE additional[600]; + } TestStruct; + PLOGBRUSH plogbrush; + HBRUSH hBrush; + HPEN hpen; + INT ret; + + /* Test null pointer and invalid handles */ + SetLastError(ERROR_SUCCESS); + ok(GetObjectA(0, 0, NULL) == 0, "\n"); + ok(GetObjectA((HANDLE)-1, 0, NULL) == 0, "\n"); + + /* Test invalid habdles of different types */ + ok(GetObjectA((HANDLE)0x00380000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObjectA((HANDLE)0x00380000, 10, &TestStruct) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00010000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00020000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00030000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00040000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00060000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00070000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x000B0000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x000C0000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x000D0000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x000E0000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x000F0000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00110000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00120000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00130000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00140000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00150000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)0x00160000, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_DC, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_DC, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_REGION, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_REGION, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EMF, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EMF, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METAFILE, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_METAFILE, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_ENHMETAFILE, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + + /* Test need of alignment */ + SetLastError(ERROR_SUCCESS); + hBrush = GetStockObject(WHITE_BRUSH); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush); + ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH), "\n"); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 2); + ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == sizeof(LOGBRUSH), "\n"); + plogbrush = (PVOID)((ULONG_PTR)&TestStruct.logbrush + 1); + //ok(GetObject(hBrush, sizeof(LOGBRUSH), plogbrush) == 0, "\n"); // fails on win7 + + /* Test invalid buffer */ + SetLastError(0xbadbad00); + ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); + SetLastError(0xbadbad00); + ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); + SetLastError(0xbadbad00); + ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == 0xbadbad00, "wrong error: %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); - _SEH2_TRY - { + SetLastError(0xbadbad00); + ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); + ok(GetLastError() == 0xbadbad00, "wrong error: %ld\n", GetLastError()); + SetLastError(ERROR_SUCCESS); + _SEH2_TRY + { ret = GetObjectA(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - ret = -1; - } - _SEH2_END - ok(ret == -1, "should have got an exception\n"); - - ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0x50000000, &TestStruct) == 356, "\n"); - ok(GetObjectW(GetStockObject(WHITE_BRUSH), 0x50000000, &TestStruct) == sizeof(LOGBRUSH), "\n"); - - - /* Test buffer size of 0 */ - SetLastError(0xbadbad00); - hBrush = CreateSolidBrush(123); - ok(hBrush != NULL, "Failed to create brush\n"); - ok_long(GetObjectA(hBrush, 0, &TestStruct), sizeof(LOGBRUSH)); - ok_err(0xbadbad00); - DeleteObject(hBrush); - SetLastError(0xbadbad00); - hpen = CreatePen(PS_SOLID, 1, 123); - ok(hpen != NULL, "Failed to create pen\n"); - ok_long(GetObjectA(hpen, 0, &TestStruct), 0); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + ret = -1; + } + _SEH2_END + ok(ret == -1, "should have got an exception\n"); + + ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0x50000000, &TestStruct) == 356, "\n"); + ok(GetObjectW(GetStockObject(WHITE_BRUSH), 0x50000000, &TestStruct) == sizeof(LOGBRUSH), "\n"); + + + /* Test buffer size of 0 */ + SetLastError(0xbadbad00); + hBrush = CreateSolidBrush(123); + ok(hBrush != NULL, "Failed to create brush\n"); + ok_long(GetObjectA(hBrush, 0, &TestStruct), sizeof(LOGBRUSH)); + ok_err(0xbadbad00); + DeleteObject(hBrush); + SetLastError(0xbadbad00); + hpen = CreatePen(PS_SOLID, 1, 123); + ok(hpen != NULL, "Failed to create pen\n"); + ok_long(GetObjectA(hpen, 0, &TestStruct), 0); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(0xbadbad00); - TestStruct.logbrush.lbStyle = BS_SOLID; - TestStruct.logbrush.lbColor = RGB(1,2,3); - TestStruct.logbrush.lbHatch = 0; - hpen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID, 1, &TestStruct.logbrush, 0, NULL); - ok(hpen != NULL, "Failed to create pen\n"); - ok_long(GetObjectA(hpen, 0, &TestStruct), 0); + SetLastError(0xbadbad00); + TestStruct.logbrush.lbStyle = BS_SOLID; + TestStruct.logbrush.lbColor = RGB(1,2,3); + TestStruct.logbrush.lbHatch = 0; + hpen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID, 1, &TestStruct.logbrush, 0, NULL); + ok(hpen != NULL, "Failed to create pen\n"); + ok_long(GetObjectA(hpen, 0, &TestStruct), 0); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0, &TestStruct) == 0, "\n"); - ok_err(0xbadbad00); - SetLastError(0xbadbad00); - ok(GetObjectW(GetStockObject(21), 0, &TestStruct) == 0, "\n"); - ok_err(0xbadbad00); + SetLastError(0xbadbad00); + ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0, &TestStruct) == 0, "\n"); + ok_err(0xbadbad00); + SetLastError(0xbadbad00); + ok(GetObjectW(GetStockObject(21), 0, &TestStruct) == 0, "\n"); + ok_err(0xbadbad00); } void Test_Bitmap(void) { - HBITMAP hBitmap; - BITMAP bitmap; - DIBSECTION dibsection; - BYTE bData[100] = {0}; - BYTE Buffer[100] = {48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,0}; - - FillMemory(&bitmap, sizeof(BITMAP), 0x77); - hBitmap = CreateBitmap(10,10,1,8,bData); - ok(hBitmap != 0, "CreateBitmap failed, skipping tests.\n"); - if (!hBitmap) return; - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BITMAP, 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), NULL) == sizeof(BITMAP), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObjectA(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectW((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObjectA(hBitmap, 5, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, -5, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, 0, Buffer) == 0, "\n"); - ok(GetObjectA(hBitmap, 5, Buffer) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObjectA(hBitmap, sizeof(BITMAP), &bitmap) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, sizeof(BITMAP)+2, &bitmap) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, sizeof(DIBSECTION), &dibsection) == sizeof(BITMAP), "\n"); - ok(GetObjectA(hBitmap, -5, &bitmap) == sizeof(BITMAP), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), &bitmap) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); - - // todo: test invalid handle + buffer - - DeleteObject(hBitmap); + HBITMAP hBitmap; + BITMAP bitmap; + DIBSECTION dibsection; + BYTE bData[100] = {0}; + BYTE Buffer[100] = {48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,0}; + + FillMemory(&bitmap, sizeof(BITMAP), 0x77); + hBitmap = CreateBitmap(10,10,1,8,bData); + ok(hBitmap != 0, "CreateBitmap failed, skipping tests.\n"); + if (!hBitmap) return; + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BITMAP, 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), NULL) == sizeof(BITMAP), "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObjectA(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectW((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObjectA(hBitmap, 5, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, -5, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, 0, Buffer) == 0, "\n"); + ok(GetObjectA(hBitmap, 5, Buffer) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObjectA(hBitmap, sizeof(BITMAP), &bitmap) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, sizeof(BITMAP)+2, &bitmap) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, sizeof(DIBSECTION), &dibsection) == sizeof(BITMAP), "\n"); + ok(GetObjectA(hBitmap, -5, &bitmap) == sizeof(BITMAP), "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BITMAP, sizeof(BITMAP), &bitmap) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); + + // todo: test invalid handle + buffer + + DeleteObject(hBitmap); } void Test_Dibsection(void) { - BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 9, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; - HBITMAP hBitmap; - BITMAP bitmap; - DIBSECTION dibsection; - PVOID pData; - HDC hDC; - - FillMemory(&dibsection, sizeof(DIBSECTION), 0x77); - hDC = GetDC(0); - hBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &pData, NULL, 0); - ok(hBitmap != 0, "CreateDIBSection failed with %ld, skipping tests.\n", GetLastError()); - if (!hBitmap) return; - - ok(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObjectW((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); - - SetLastError(ERROR_SUCCESS); - ok_long(GetObject(hBitmap, sizeof(DIBSECTION), NULL), sizeof(BITMAP)); - ok_long(GetObject(hBitmap, 0, NULL), sizeof(BITMAP)); - ok_long(GetObject(hBitmap, 5, NULL), sizeof(BITMAP)); - ok_long(GetObject(hBitmap, -5, NULL), sizeof(BITMAP)); - ok_long(GetObject(hBitmap, 0, &dibsection), 0); - ok_long(GetObject(hBitmap, 5, &dibsection), 0); - ok_long(GetObject(hBitmap, sizeof(BITMAP), &bitmap), sizeof(BITMAP)); - ok_long(GetObject(hBitmap, sizeof(BITMAP)+2, &bitmap), sizeof(BITMAP)); - ok_long(bitmap.bmType, 0); - ok_long(bitmap.bmWidth, 10); - ok_long(bitmap.bmHeight, 9); - ok_long(bitmap.bmWidthBytes, 20); - ok_long(bitmap.bmPlanes, 1); - ok_long(bitmap.bmBitsPixel, 16); - ok(bitmap.bmBits == pData, "\n"); - ok_long(GetObject(hBitmap, sizeof(DIBSECTION), &dibsection), sizeof(DIBSECTION)); - ok_long(GetObject(hBitmap, sizeof(DIBSECTION)+2, &dibsection), sizeof(DIBSECTION)); - ok_long(GetObject(hBitmap, -5, &dibsection), sizeof(DIBSECTION)); - ok_err(ERROR_SUCCESS); - DeleteObject(hBitmap); - ReleaseDC(0, hDC); + BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 9, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; + HBITMAP hBitmap; + BITMAP bitmap; + DIBSECTION dibsection; + PVOID pData; + HDC hDC; + + FillMemory(&dibsection, sizeof(DIBSECTION), 0x77); + hDC = GetDC(0); + hBitmap = CreateDIBSection(hDC, &bmi, DIB_RGB_COLORS, &pData, NULL, 0); + ok(hBitmap != 0, "CreateDIBSection failed with %ld, skipping tests.\n", GetLastError()); + if (!hBitmap) return; + + ok(GetObjectA((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); + ok(GetObjectW((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); + + SetLastError(ERROR_SUCCESS); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION), NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 0, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 5, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, -5, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 0, &dibsection), 0); + ok_long(GetObject(hBitmap, 5, &dibsection), 0); + ok_long(GetObject(hBitmap, sizeof(BITMAP), &bitmap), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, sizeof(BITMAP)+2, &bitmap), sizeof(BITMAP)); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 10); + ok_long(bitmap.bmHeight, 9); + ok_long(bitmap.bmWidthBytes, 20); + ok_long(bitmap.bmPlanes, 1); + ok_long(bitmap.bmBitsPixel, 16); + ok(bitmap.bmBits == pData, "\n"); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION), &dibsection), sizeof(DIBSECTION)); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION)+2, &dibsection), sizeof(DIBSECTION)); + ok_long(GetObject(hBitmap, -5, &dibsection), sizeof(DIBSECTION)); + ok_err(ERROR_SUCCESS); + DeleteObject(hBitmap); + ReleaseDC(0, hDC); } void Test_Palette(void) { - LOGPALETTE logpal; - HPALETTE hPalette; - WORD wPalette; - - FillMemory(&wPalette, sizeof(WORD), 0x77); - logpal.palVersion = 0x0300; - logpal.palNumEntries = 1; - logpal.palPalEntry[0].peRed = 0; - logpal.palPalEntry[0].peGreen = 0; - logpal.palPalEntry[0].peBlue = 0; - logpal.palPalEntry[0].peFlags = PC_EXPLICIT; - hPalette = CreatePalette(&logpal); - ok(hPalette != 0, "CreatePalette failed, skipping tests.\n"); - if (!hPalette) return; - - ok(GetObjectA((HANDLE)((UINT_PTR)hPalette & 0x0000ffff), 0, NULL) == sizeof(WORD), "\n"); - ok(GetObjectW((HANDLE)((UINT_PTR)hPalette & 0x0000ffff), 0, NULL) == sizeof(WORD), "\n"); - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PALETTE, 0, NULL) == sizeof(WORD), "\n"); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PALETTE, 0, NULL) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, sizeof(WORD), NULL) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, 0, NULL) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, 5, NULL) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, -5, NULL) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, sizeof(WORD), &wPalette) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, sizeof(WORD)+2, &wPalette) == sizeof(WORD), "\n"); - ok(GetObject(hPalette, 0, &wPalette) == 0, "\n"); - ok(GetObject(hPalette, 1, &wPalette) == 0, "\n"); - ok(GetObject(hPalette, -1, &wPalette) == sizeof(WORD), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - DeleteObject(hPalette); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PALETTE, sizeof(WORD), &wPalette) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); + LOGPALETTE logpal; + HPALETTE hPalette; + WORD wPalette; + + FillMemory(&wPalette, sizeof(WORD), 0x77); + logpal.palVersion = 0x0300; + logpal.palNumEntries = 1; + logpal.palPalEntry[0].peRed = 0; + logpal.palPalEntry[0].peGreen = 0; + logpal.palPalEntry[0].peBlue = 0; + logpal.palPalEntry[0].peFlags = PC_EXPLICIT; + hPalette = CreatePalette(&logpal); + ok(hPalette != 0, "CreatePalette failed, skipping tests.\n"); + if (!hPalette) return; + + ok(GetObjectA((HANDLE)((UINT_PTR)hPalette & 0x0000ffff), 0, NULL) == sizeof(WORD), "\n"); + ok(GetObjectW((HANDLE)((UINT_PTR)hPalette & 0x0000ffff), 0, NULL) == sizeof(WORD), "\n"); + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PALETTE, 0, NULL) == sizeof(WORD), "\n"); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PALETTE, 0, NULL) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, sizeof(WORD), NULL) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, 0, NULL) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, 5, NULL) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, -5, NULL) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, sizeof(WORD), &wPalette) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, sizeof(WORD)+2, &wPalette) == sizeof(WORD), "\n"); + ok(GetObject(hPalette, 0, &wPalette) == 0, "\n"); + ok(GetObject(hPalette, 1, &wPalette) == 0, "\n"); + ok(GetObject(hPalette, -1, &wPalette) == sizeof(WORD), "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + DeleteObject(hPalette); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PALETTE, sizeof(WORD), &wPalette) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); } void Test_Brush(void) { - LOGBRUSH logbrush; - HBRUSH hBrush; - - FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); - hBrush = CreateSolidBrush(RGB(1,2,3)); - ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); - if (!hBrush) return; - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH), "\n"); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, sizeof(WORD), NULL) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, 0, NULL) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH), "\n"); - - //ok(GetObject(hBrush, 0, &logbrush) == 0, "\n"); fails on win7 - ok(logbrush.lbStyle == 0x77777777, "\n"); - ok(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH), "\n"); - ok(logbrush.lbStyle == 0, "\n"); - ok(logbrush.lbColor == 0x77777701, "\n"); - - ok(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, sizeof(LOGBRUSH) - 1, &logbrush) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, 1, &logbrush) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH), "\n"); - ok(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH), "\n"); - // TODO: test all members - - ok(GetLastError() == ERROR_SUCCESS, "\n"); - DeleteObject(hBrush); - - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, sizeof(LOGBRUSH), &logbrush) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + LOGBRUSH logbrush; + HBRUSH hBrush; + + FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); + hBrush = CreateSolidBrush(RGB(1,2,3)); + ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hBrush) return; + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH), "\n"); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, 0, NULL) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, sizeof(WORD), NULL) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, 0, NULL) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, 5, NULL) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, -5, NULL) == sizeof(LOGBRUSH), "\n"); + + //ok(GetObject(hBrush, 0, &logbrush) == 0, "\n"); fails on win7 + ok(logbrush.lbStyle == 0x77777777, "\n"); + ok(GetObject(hBrush, 5, &logbrush) == sizeof(LOGBRUSH), "\n"); + ok(logbrush.lbStyle == 0, "\n"); + ok(logbrush.lbColor == 0x77777701, "\n"); + + ok(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, sizeof(LOGBRUSH) - 1, &logbrush) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, 1, &logbrush) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, sizeof(LOGBRUSH)+2, &logbrush) == sizeof(LOGBRUSH), "\n"); + ok(GetObject(hBrush, -1, &logbrush) == sizeof(LOGBRUSH), "\n"); + // TODO: test all members + + ok(GetLastError() == ERROR_SUCCESS, "\n"); + DeleteObject(hBrush); + + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, sizeof(LOGBRUSH), &logbrush) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); } void @@ -364,164 +364,164 @@ {1, 7, 3, 1}, {0,1,2,3, 1,2,3,0, 2,3,0,1, 3,0,1,2}, }; - LOGBRUSH logbrush; - HBRUSH hBrush; + LOGBRUSH logbrush; + HBRUSH hBrush; /* Create a DIB brush */ hBrush = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); - ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); - if (!hBrush) return; - - FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); - SetLastError(ERROR_SUCCESS); - - ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); - ok_long(logbrush.lbStyle, BS_DIBPATTERN); - ok_long(logbrush.lbColor, 0); - ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); - - ok_err(ERROR_SUCCESS); - DeleteObject(hBrush); + ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hBrush) return; + + FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); + SetLastError(ERROR_SUCCESS); + + ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); + ok_long(logbrush.lbStyle, BS_DIBPATTERN); + ok_long(logbrush.lbColor, 0); + ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); + + ok_err(ERROR_SUCCESS); + DeleteObject(hBrush); /* Create a DIB brush with undocumented iUsage 2 */ hBrush = CreateDIBPatternBrushPt(&PackedDIB, 2); - ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); - if (!hBrush) return; - - FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); - SetLastError(ERROR_SUCCESS); - - ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); - ok_long(logbrush.lbStyle, BS_DIBPATTERN); - ok_long(logbrush.lbColor, 0); - ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); - - ok_err(ERROR_SUCCESS); - DeleteObject(hBrush); + ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hBrush) return; + + FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); + SetLastError(ERROR_SUCCESS); + + ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); + ok_long(logbrush.lbStyle, BS_DIBPATTERN); + ok_long(logbrush.lbColor, 0); + ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); + + ok_err(ERROR_SUCCESS); + DeleteObject(hBrush); } void Test_Pen(void) { - LOGPEN logpen; - HPEN hPen; - - FillMemory(&logpen, sizeof(LOGPEN), 0x77); - hPen = CreatePen(PS_SOLID, 3, RGB(4,5,6)); - ok(hPen != 0, "CreatePen failed, skipping tests.\n"); - if (!hPen) return; - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN), "\n"); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, 0, NULL) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, 5, NULL) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, -5, NULL) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0, "\n"); - ok(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN), "\n"); - ok(GetObject(hPen, 0, &logpen) == 0, "\n"); - ok(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN), "\n"); - //ok(GetLastError() == ERROR_SUCCESS, "\n"); fails on win7 - - /* test if the fields are filled correctly */ - ok(logpen.lopnStyle == PS_SOLID, "\n"); - - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, sizeof(LOGPEN), &logpen) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); - - DeleteObject(hPen); + LOGPEN logpen; + HPEN hPen; + + FillMemory(&logpen, sizeof(LOGPEN), 0x77); + hPen = CreatePen(PS_SOLID, 3, RGB(4,5,6)); + ok(hPen != 0, "CreatePen failed, skipping tests.\n"); + if (!hPen) return; + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN), "\n"); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, 0, NULL) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, sizeof(BITMAP), NULL) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, 0, NULL) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, 5, NULL) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, -5, NULL) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, sizeof(LOGPEN), &logpen) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, sizeof(LOGPEN)-1, &logpen) == 0, "\n"); + ok(GetObject(hPen, sizeof(LOGPEN)+2, &logpen) == sizeof(LOGPEN), "\n"); + ok(GetObject(hPen, 0, &logpen) == 0, "\n"); + ok(GetObject(hPen, -5, &logpen) == sizeof(LOGPEN), "\n"); + //ok(GetLastError() == ERROR_SUCCESS, "\n"); fails on win7 + + /* test if the fields are filled correctly */ + ok(logpen.lopnStyle == PS_SOLID, "\n"); + + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_PEN, sizeof(LOGPEN), &logpen) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); + + DeleteObject(hPen); } void Test_ExtPen(void) { - HPEN hPen; - EXTLOGPEN extlogpen; - LOGBRUSH logbrush; - DWORD dwStyles[17] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; - struct - { - EXTLOGPEN extlogpen; - DWORD dwStyles[50]; - } elpUserStyle; - int i; - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "\n"); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "\n"); - - FillMemory(&extlogpen, sizeof(EXTLOGPEN), 0x77); - logbrush.lbStyle = BS_SOLID; - logbrush.lbColor = RGB(1,2,3); - logbrush.lbHatch = 22; - hPen = ExtCreatePen(PS_GEOMETRIC | PS_DASH, 5, &logbrush, 0, NULL); - - SetLastError(ERROR_SUCCESS); - ok(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN, "\n"); - ok(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); - ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); - SetLastError(0xbadbad00); - ok(GetObject(hPen, 0, &extlogpen) == 0, "\n"); + HPEN hPen; + EXTLOGPEN extlogpen; + LOGBRUSH logbrush; + DWORD dwStyles[17] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16}; + struct + { + EXTLOGPEN extlogpen; + DWORD dwStyles[50]; + } elpUserStyle; + int i; + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "\n"); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "\n"); + + FillMemory(&extlogpen, sizeof(EXTLOGPEN), 0x77); + logbrush.lbStyle = BS_SOLID; + logbrush.lbColor = RGB(1,2,3); + logbrush.lbHatch = 22; + hPen = ExtCreatePen(PS_GEOMETRIC | PS_DASH, 5, &logbrush, 0, NULL); + + SetLastError(ERROR_SUCCESS); + ok(GDI_HANDLE_GET_TYPE(hPen) == GDI_OBJECT_TYPE_EXTPEN, "\n"); + ok(GetObject(hPen, sizeof(EXTLOGPEN), NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject((HANDLE)GDI_HANDLE_GET_INDEX(hPen), 0, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, 5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, -5, NULL) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); + SetLastError(0xbadbad00); + ok(GetObject(hPen, 0, &extlogpen) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); - ok(GetObject(hPen, 4, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); - ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); - ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 4, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); - ok(GetObject(hPen, sizeof(EXTLOGPEN) - 5, &extlogpen) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); - - /* Nothing should be filled */ - ok(extlogpen.elpPenStyle == 0x77777777, "\n"); - ok(extlogpen.elpWidth == 0x77777777, "\n"); - - ok(GetObject(hPen, sizeof(EXTLOGPEN), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD)-1, &extlogpen) == 0, "\n"); - ok(GetObject(hPen, sizeof(EXTLOGPEN)+2, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - ok(GetObject(hPen, -5, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); - - /* test if the fields are filled correctly */ - ok(extlogpen.elpPenStyle == (PS_GEOMETRIC | PS_DASH), "\n"); - ok(extlogpen.elpWidth == 5, "\n"); - ok(extlogpen.elpBrushStyle == 0, "\n"); - ok(extlogpen.elpColor == RGB(1,2,3), "\n"); - ok(extlogpen.elpHatch == 22, "\n"); - ok(extlogpen.elpNumEntries == 0, "\n"); - DeleteObject(hPen); - - /* A maximum of 16 Styles is allowed */ - hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); - ok(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); - ok(GetObject(hPen, sizeof(EXTLOGPEN) + 15*sizeof(DWORD), &elpUserStyle) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); - for (i = 0; i <= 15; i++) - ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[i] == i, "%d\n", i); - DeleteObject(hPen); + ok(GetObject(hPen, 4, &extlogpen) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); + SetLastError(ERROR_SUCCESS); + ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, &extlogpen) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); + SetLastError(ERROR_SUCCESS); + ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 4, &extlogpen) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); + SetLastError(ERROR_SUCCESS); + ok(GetObject(hPen, sizeof(EXTLOGPEN) - 5, &extlogpen) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); + + /* Nothing should be filled */ + ok(extlogpen.elpPenStyle == 0x77777777, "\n"); + ok(extlogpen.elpWidth == 0x77777777, "\n"); + + ok(GetObject(hPen, sizeof(EXTLOGPEN), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD), &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, sizeof(EXTLOGPEN)-sizeof(DWORD)-1, &extlogpen) == 0, "\n"); + ok(GetObject(hPen, sizeof(EXTLOGPEN)+2, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + ok(GetObject(hPen, -5, &extlogpen) == sizeof(EXTLOGPEN)-sizeof(DWORD), "\n"); + + /* test if the fields are filled correctly */ + ok(extlogpen.elpPenStyle == (PS_GEOMETRIC | PS_DASH), "\n"); + ok(extlogpen.elpWidth == 5, "\n"); + ok(extlogpen.elpBrushStyle == 0, "\n"); + ok(extlogpen.elpColor == RGB(1,2,3), "\n"); + ok(extlogpen.elpHatch == 22, "\n"); + ok(extlogpen.elpNumEntries == 0, "\n"); + DeleteObject(hPen); + + /* A maximum of 16 Styles is allowed */ + hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); + ok(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); + ok(GetObject(hPen, sizeof(EXTLOGPEN) + 15*sizeof(DWORD), &elpUserStyle) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); + for (i = 0; i <= 15; i++) + ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[i] == i, "%d\n", i); + DeleteObject(hPen); } void Test_Font(void) { - HFONT hFont; - union - { + HFONT hFont; + union + { LOGFONTA logfonta; LOGFONTW logfontw; EXTLOGFONTA extlogfonta; @@ -533,105 +533,105 @@ ENUMLOGFONTA enumlogfonta; ENUMLOGFONTW enumlogfontw; BYTE bData[270]; - } u; - int ret; - - FillMemory(&u, sizeof(u), 0x77); - hFont = CreateFontA(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_CHARACTER_PRECIS, CLIP_CHARACTER_PRECIS, - ANTIALIASED_QUALITY, DEFAULT_PITCH, "testfont"); - ok(hFont != 0, "\n"); - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, 0, NULL) == sizeof(LOGFONTA), "\n"); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, 0, NULL) == sizeof(LOGFONTW), "\n"); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(LOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 60 - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 156 - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXA), NULL) == sizeof(LOGFONTA), "\n"); // 188 - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(EXTLOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 192 - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVA), NULL) == sizeof(LOGFONTA), "\n"); // 260 - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVA)+1, NULL) == sizeof(LOGFONTA), "\n"); // 260 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(LOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 92 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 284 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(EXTLOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 320 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXW), NULL) == sizeof(LOGFONTW), "\n"); // 348 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVW), NULL) == sizeof(LOGFONTW), "\n"); // 420 - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVW)+1, NULL) == sizeof(LOGFONTW), "\n"); // 356! - ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); - - ok(GetObjectA(hFont, sizeof(LOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); - ok(GetObjectA(hFont, 0, NULL) == sizeof(LOGFONTA), "\n"); - ok(GetObjectA(hFont, 5, NULL) == sizeof(LOGFONTA), "\n"); - ok(GetObjectA(hFont, -5, NULL) == sizeof(LOGFONTA), "\n"); - ok(GetObjectA(hFont, 0, &u.logfonta) == 0, "\n"); - ok(u.logfonta.lfHeight == 0x77777777, "\n"); - - ok(GetObjectA(hFont, 5, &u.logfonta) == 5, "\n"); - ok(u.logfonta.lfHeight == 8, "\n"); - ok(u.logfonta.lfWidth == 0x77777708, "\n"); - - ok(GetObjectA(hFont, 0, &u.logfonta) == 0, "\n"); - ok(GetObjectA(hFont, -1, &u.logfonta) == sizeof(ENUMLOGFONTEXDVA), "\n"); - ok(GetObjectA(hFont, 1, &u.logfonta) == 1, "\n"); // 1 -> 1 - ok(GetObjectA(hFont, sizeof(LOGFONTA) - 1, &u.logfonta) == sizeof(LOGFONTA) - 1, "\n"); // 59 -> 59 - ok(GetObjectA(hFont, sizeof(LOGFONTA), &u.logfonta) == sizeof(LOGFONTA), "\n"); // 60 -> 60 - ok(GetObjectA(hFont, sizeof(LOGFONTA) + 1, &u.logfonta) == sizeof(LOGFONTA) + 1, "\n"); // 61 -> 61 - ok(GetObjectA(hFont, sizeof(LOGFONTW) - 1, &u.logfontw) == sizeof(LOGFONTW) - 1, "\n"); // 91 -> 91 - ok(GetObjectA(hFont, sizeof(LOGFONTW), &u.logfontw) == sizeof(LOGFONTA), "\n"); // 92 -> 60 - ok(GetObjectA(hFont, sizeof(LOGFONTW) + 1, &u.logfontw) == sizeof(LOGFONTW) + 1, "\n"); // 93 -> 93 - ok(GetObjectA(hFont, sizeof(EXTLOGFONTA), &u.extlogfonta) == sizeof(EXTLOGFONTA), "\n"); // 192 -> 192 - ok(GetObjectA(hFont, sizeof(EXTLOGFONTA)+1, &u.extlogfonta) == sizeof(EXTLOGFONTA)+1, "\n"); // 192+1 -> 192+1 - ok(GetObjectA(hFont, sizeof(EXTLOGFONTA)+16*4, &u.extlogfonta) == sizeof(EXTLOGFONTA)+16*4, "\n"); // 192+1 -> 192+1 - ok(GetObjectA(hFont, sizeof(EXTLOGFONTW), &u.extlogfontw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 320 -> 260 - ok(GetObjectA(hFont, 261, &u.bData) == 260, "\n"); // no - - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA) - 1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA) - 1, "\n"); // 419 - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA), &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 420 - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA)+1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 356! - - /* LOGFONT / GetObjectW */ - FillMemory(&u.logfontw, sizeof(LOGFONTW), 0x77); - - ok(GetObjectW(hFont, sizeof(LOGFONTW), NULL) == sizeof(LOGFONTW), "1\n"); - ok(GetObjectW(hFont, 0, NULL) == sizeof(LOGFONTW), "\n"); - ok(GetObjectW(hFont, 5, NULL) == sizeof(LOGFONTW), "\n"); - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXA), NULL) == sizeof(LOGFONTW), "\n"); - ok(GetObjectW(hFont, -5, NULL) == sizeof(LOGFONTW), "\n"); - ok(GetObjectW(hFont, 0, &u.logfontw) == 0, "\n"); - ok(u.logfontw.lfHeight == 0x77777777, "\n"); - - ok(GetObjectW(hFont, 5, &u.logfontw) == 5, "\n"); - ok(u.logfontw.lfHeight == 8, "\n"); - ok(u.logfontw.lfWidth == 0x77777708, "\n"); - - ok(GetObjectA(hFont, sizeof(LOGFONTA), &u.logfonta) == sizeof(LOGFONTA), "\n"); // 60 - ok(u.logfonta.lfHeight == 8, "\n"); - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTA), &u.enumlogfonta) == sizeof(ENUMLOGFONTA), "\n"); // 156 - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXA), &u.enumlogfontexa) == sizeof(ENUMLOGFONTEXA), "\n"); // 188 - ok(GetObjectA(hFont, sizeof(EXTLOGFONTA), &u.extlogfonta) == sizeof(EXTLOGFONTA), "\n"); // 192 - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA), &u.enumlogfontexdva) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 260 - ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA)+1, &u.enumlogfontexdva) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 260 - - ok(GetObjectW(hFont, sizeof(LOGFONTW), &u.logfontw) == sizeof(LOGFONTW), "\n"); // 92 - ok(GetObjectW(hFont, sizeof(LOGFONTW) + 1, &u.logfontw) == sizeof(LOGFONTW) + 1, "\n"); // 92 - ok(GetObjectW(hFont, sizeof(LOGFONTW) - 1, &u.logfontw) == sizeof(LOGFONTW) - 1, "\n"); // 92 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTW), &u.enumlogfontw) == sizeof(ENUMLOGFONTW), "\n"); // 284 - ok(GetObjectW(hFont, sizeof(EXTLOGFONTW), &u.extlogfontw) == sizeof(EXTLOGFONTW), "\n"); // 320 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXW), &u.enumlogfontexw) == sizeof(ENUMLOGFONTEXW), "\n"); // 348 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXW) + 1, &u.enumlogfontexw) == sizeof(ENUMLOGFONTEXW) + 1, "\n"); // 348 - ok(GetObjectW(hFont, 355, &u.enumlogfontexdvw) == 355, "\n"); // 419 - - ok(GetObjectW(hFont, 356, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 - ret = sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD); - ret = GetObjectW(hFont, 357, &u.enumlogfontexdvw); - ok(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); - ok(GetObjectW(hFont, 357, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW) - 1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW), &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 420 - ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW)+1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 356! - ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); - - DeleteObject(hFont); + } u; + int ret; + + FillMemory(&u, sizeof(u), 0x77); + hFont = CreateFontA(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_CHARACTER_PRECIS, CLIP_CHARACTER_PRECIS, + ANTIALIASED_QUALITY, DEFAULT_PITCH, "testfont"); + ok(hFont != 0, "\n"); + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, 0, NULL) == sizeof(LOGFONTA), "\n"); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, 0, NULL) == sizeof(LOGFONTW), "\n"); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(LOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 60 + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 156 + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXA), NULL) == sizeof(LOGFONTA), "\n"); // 188 + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(EXTLOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); // 192 + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVA), NULL) == sizeof(LOGFONTA), "\n"); // 260 + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVA)+1, NULL) == sizeof(LOGFONTA), "\n"); // 260 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(LOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 92 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 284 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(EXTLOGFONTW), NULL) == sizeof(LOGFONTW), "\n"); // 320 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXW), NULL) == sizeof(LOGFONTW), "\n"); // 348 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVW), NULL) == sizeof(LOGFONTW), "\n"); // 420 + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_FONT, sizeof(ENUMLOGFONTEXDVW)+1, NULL) == sizeof(LOGFONTW), "\n"); // 356! + ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); + + ok(GetObjectA(hFont, sizeof(LOGFONTA), NULL) == sizeof(LOGFONTA), "\n"); + ok(GetObjectA(hFont, 0, NULL) == sizeof(LOGFONTA), "\n"); + ok(GetObjectA(hFont, 5, NULL) == sizeof(LOGFONTA), "\n"); + ok(GetObjectA(hFont, -5, NULL) == sizeof(LOGFONTA), "\n"); + ok(GetObjectA(hFont, 0, &u.logfonta) == 0, "\n"); + ok(u.logfonta.lfHeight == 0x77777777, "\n"); + + ok(GetObjectA(hFont, 5, &u.logfonta) == 5, "\n"); + ok(u.logfonta.lfHeight == 8, "\n"); + ok(u.logfonta.lfWidth == 0x77777708, "\n"); + + ok(GetObjectA(hFont, 0, &u.logfonta) == 0, "\n"); + ok(GetObjectA(hFont, -1, &u.logfonta) == sizeof(ENUMLOGFONTEXDVA), "\n"); + ok(GetObjectA(hFont, 1, &u.logfonta) == 1, "\n"); // 1 -> 1 + ok(GetObjectA(hFont, sizeof(LOGFONTA) - 1, &u.logfonta) == sizeof(LOGFONTA) - 1, "\n"); // 59 -> 59 + ok(GetObjectA(hFont, sizeof(LOGFONTA), &u.logfonta) == sizeof(LOGFONTA), "\n"); // 60 -> 60 + ok(GetObjectA(hFont, sizeof(LOGFONTA) + 1, &u.logfonta) == sizeof(LOGFONTA) + 1, "\n"); // 61 -> 61 + ok(GetObjectA(hFont, sizeof(LOGFONTW) - 1, &u.logfontw) == sizeof(LOGFONTW) - 1, "\n"); // 91 -> 91 + ok(GetObjectA(hFont, sizeof(LOGFONTW), &u.logfontw) == sizeof(LOGFONTA), "\n"); // 92 -> 60 + ok(GetObjectA(hFont, sizeof(LOGFONTW) + 1, &u.logfontw) == sizeof(LOGFONTW) + 1, "\n"); // 93 -> 93 + ok(GetObjectA(hFont, sizeof(EXTLOGFONTA), &u.extlogfonta) == sizeof(EXTLOGFONTA), "\n"); // 192 -> 192 + ok(GetObjectA(hFont, sizeof(EXTLOGFONTA)+1, &u.extlogfonta) == sizeof(EXTLOGFONTA)+1, "\n"); // 192+1 -> 192+1 + ok(GetObjectA(hFont, sizeof(EXTLOGFONTA)+16*4, &u.extlogfonta) == sizeof(EXTLOGFONTA)+16*4, "\n"); // 192+1 -> 192+1 + ok(GetObjectA(hFont, sizeof(EXTLOGFONTW), &u.extlogfontw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 320 -> 260 + ok(GetObjectA(hFont, 261, &u.bData) == 260, "\n"); // no + + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA) - 1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA) - 1, "\n"); // 419 + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA), &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 420 + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA)+1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 356! + + /* LOGFONT / GetObjectW */ + FillMemory(&u.logfontw, sizeof(LOGFONTW), 0x77); + + ok(GetObjectW(hFont, sizeof(LOGFONTW), NULL) == sizeof(LOGFONTW), "1\n"); + ok(GetObjectW(hFont, 0, NULL) == sizeof(LOGFONTW), "\n"); + ok(GetObjectW(hFont, 5, NULL) == sizeof(LOGFONTW), "\n"); + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXA), NULL) == sizeof(LOGFONTW), "\n"); + ok(GetObjectW(hFont, -5, NULL) == sizeof(LOGFONTW), "\n"); + ok(GetObjectW(hFont, 0, &u.logfontw) == 0, "\n"); + ok(u.logfontw.lfHeight == 0x77777777, "\n"); + + ok(GetObjectW(hFont, 5, &u.logfontw) == 5, "\n"); + ok(u.logfontw.lfHeight == 8, "\n"); + ok(u.logfontw.lfWidth == 0x77777708, "\n"); + + ok(GetObjectA(hFont, sizeof(LOGFONTA), &u.logfonta) == sizeof(LOGFONTA), "\n"); // 60 + ok(u.logfonta.lfHeight == 8, "\n"); + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTA), &u.enumlogfonta) == sizeof(ENUMLOGFONTA), "\n"); // 156 + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXA), &u.enumlogfontexa) == sizeof(ENUMLOGFONTEXA), "\n"); // 188 + ok(GetObjectA(hFont, sizeof(EXTLOGFONTA), &u.extlogfonta) == sizeof(EXTLOGFONTA), "\n"); // 192 + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA), &u.enumlogfontexdva) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 260 + ok(GetObjectA(hFont, sizeof(ENUMLOGFONTEXDVA)+1, &u.enumlogfontexdva) == sizeof(ENUMLOGFONTEXDVA), "\n"); // 260 + + ok(GetObjectW(hFont, sizeof(LOGFONTW), &u.logfontw) == sizeof(LOGFONTW), "\n"); // 92 + ok(GetObjectW(hFont, sizeof(LOGFONTW) + 1, &u.logfontw) == sizeof(LOGFONTW) + 1, "\n"); // 92 + ok(GetObjectW(hFont, sizeof(LOGFONTW) - 1, &u.logfontw) == sizeof(LOGFONTW) - 1, "\n"); // 92 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTW), &u.enumlogfontw) == sizeof(ENUMLOGFONTW), "\n"); // 284 + ok(GetObjectW(hFont, sizeof(EXTLOGFONTW), &u.extlogfontw) == sizeof(EXTLOGFONTW), "\n"); // 320 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXW), &u.enumlogfontexw) == sizeof(ENUMLOGFONTEXW), "\n"); // 348 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXW) + 1, &u.enumlogfontexw) == sizeof(ENUMLOGFONTEXW) + 1, "\n"); // 348 + ok(GetObjectW(hFont, 355, &u.enumlogfontexdvw) == 355, "\n"); // 419 + + ok(GetObjectW(hFont, 356, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 + ret = sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD); + ret = GetObjectW(hFont, 357, &u.enumlogfontexdvw); + ok(ret == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); + ok(GetObjectW(hFont, 357, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW) - 1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 419 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW), &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 420 + ok(GetObjectW(hFont, sizeof(ENUMLOGFONTEXDVW)+1, &u.enumlogfontexdvw) == sizeof(ENUMLOGFONTEXW) + 2*sizeof(DWORD), "\n"); // 356! + ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); + + DeleteObject(hFont); } void @@ -639,69 +639,69 @@ { UCHAR buffer[1000]; - SetLastError(ERROR_SUCCESS); - GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL); - //ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 60, "\n");// FIXME: what structure? fails on win7 - ok_err(ERROR_INSUFFICIENT_BUFFER); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 0, "\n"); - ok_err(ERROR_INSUFFICIENT_BUFFER); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 327, buffer) == 0, "\n"); - ok_err(ERROR_INSUFFICIENT_BUFFER); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, buffer) == 0, "\n"); - ok_err(ERROR_INVALID_PARAMETER); - - //ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); // FIXME: fails on WHS - //ok_err(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_SUCCESS); + GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL); + //ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 60, "\n");// FIXME: what structure? fails on win7 + ok_err(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 0, NULL) == 0, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 327, buffer) == 0, "\n"); + ok_err(ERROR_INSUFFICIENT_BUFFER); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, buffer) == 0, "\n"); + ok_err(ERROR_INVALID_PARAMETER); + + //ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); // FIXME: fails on WHS + //ok_err(ERROR_INSUFFICIENT_BUFFER); } void Test_MetaDC(void) { - /* Windows does not SetLastError() on a metadc, but it doesn't seem to do anything with it */ - HDC hMetaDC; - BYTE buffer[1000]; - - hMetaDC = CreateMetaFile(NULL); - ok(hMetaDC != 0, "CreateMetaFile failed, skipping tests.\n"); - if(!hMetaDC) return; - - ok(((UINT_PTR)hMetaDC & GDI_HANDLE_TYPE_MASK) == GDI_OBJECT_TYPE_METADC, "\n"); - - SetLastError(ERROR_SUCCESS); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 0, NULL) == 0, "\n"); - ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 100, &buffer) == 0, "\n"); - ok(GetObjectA(hMetaDC, 0, NULL) == 0, "\n"); - ok(GetObjectA(hMetaDC, 1000, &buffer) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); + /* Windows does not SetLastError() on a metadc, but it doesn't seem to do anything with it */ + HDC hMetaDC; + BYTE buffer[1000]; + + hMetaDC = CreateMetaFile(NULL); + ok(hMetaDC != 0, "CreateMetaFile failed, skipping tests.\n"); + if(!hMetaDC) return; + + ok(((UINT_PTR)hMetaDC & GDI_HANDLE_TYPE_MASK) == GDI_OBJECT_TYPE_METADC, "\n"); + + SetLastError(ERROR_SUCCESS); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 0, NULL) == 0, "\n"); + ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_METADC, 100, &buffer) == 0, "\n"); + ok(GetObjectA(hMetaDC, 0, NULL) == 0, "\n"); + ok(GetObjectA(hMetaDC, 1000, &buffer) == 0, "\n"); + ok(GetLastError() == ERROR_SUCCESS, "got %ld\n", GetLastError()); } void Test_Region(void) { HRGN hRgn; - hRgn = CreateRectRgn(0,0,5,5); - SetLastError(ERROR_SUCCESS); - ok(GetObjectW(hRgn, 0, NULL) == 0, "\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); - DeleteObject(hRgn); + hRgn = CreateRectRgn(0,0,5,5); + SetLastError(ERROR_SUCCESS); + ok(GetObjectW(hRgn, 0, NULL) == 0, "\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "\n"); + DeleteObject(hRgn); } START_TEST(GetObject) { - Test_Font(); - Test_Colorspace(); - Test_General(); - Test_Bitmap(); - Test_Dibsection(); - Test_Palette(); - Test_Brush(); - Test_DIBBrush(); - Test_Pen(); - Test_ExtPen(); // not implemented yet in ROS - Test_MetaDC(); - Test_Region(); -} - + Test_Font(); + Test_Colorspace(); + Test_General(); + Test_Bitmap(); + Test_Dibsection(); + Test_Palette(); + Test_Brush(); + Test_DIBBrush(); + Test_Pen(); + Test_ExtPen(); // not implemented yet in ROS + Test_MetaDC(); + Test_Region(); +} +

1 0

[ekohl] 69753: [NTOSKRNL] DPRINT1 --> DPRINT
by ekohl＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: ekohl Date: Sat Oct 31 15:16:57 2015 New Revision: 69753 URL: http://svn.reactos.org/svn/reactos?rev=69753&view=rev Log: [NTOSKRNL] DPRINT1 --> DPRINT Modified: trunk/reactos/ntoskrnl/se/srm.c trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/srm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/srm.c?rev=6975… ============================================================================== --- trunk/reactos/ntoskrnl/se/srm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/srm.c [iso-8859-1] Sat Oct 31 15:16:57 2015 @@ -392,7 +392,7 @@ { /* Reference the session */ CurrentSession->ReferenceCount += 1; - DPRINT1("ReferenceCount: %lu\n", CurrentSession->ReferenceCount); + DPRINT("ReferenceCount: %lu\n", CurrentSession->ReferenceCount); /* Release the database lock */ KeReleaseGuardedMutex(&SepRmDbLock); @@ -430,7 +430,7 @@ { /* Dereference the session */ CurrentSession->ReferenceCount -= 1; - DPRINT1("ReferenceCount: %lu\n", CurrentSession->ReferenceCount); + DPRINT("ReferenceCount: %lu\n", CurrentSession->ReferenceCount); /* Release the database lock */ KeReleaseGuardedMutex(&SepRmDbLock); Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=69… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Sat Oct 31 15:16:57 2015 @@ -615,7 +615,7 @@ { PTOKEN AccessToken = (PTOKEN)ObjectBody; - DPRINT1("SepDeleteToken()\n"); + DPRINT("SepDeleteToken()\n"); /* Dereference the logon session */ SepRmDereferenceLogonSession(&AccessToken->AuthenticationId);

1 0

[tkreuzer] 69752: [GDI32_APITEST] Fix tests for GetObject
by tkreuzer＠svn.reactos.org 31 Oct '15

31 Oct '15

Author: tkreuzer Date: Sat Oct 31 14:59:08 2015 New Revision: 69752 URL: http://svn.reactos.org/svn/reactos?rev=69752&view=rev Log: [GDI32_APITEST] Fix tests for GetObject Modified: trunk/rostests/apitests/gdi32/GetObject.c Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Sat Oct 31 14:59:08 2015 @@ -23,6 +23,7 @@ } TestStruct; PLOGBRUSH plogbrush; HBRUSH hBrush; + HPEN hpen; INT ret; /* Test null pointer and invalid handles */ @@ -131,15 +132,15 @@ SetLastError(0xbadbad00); ok(GetObjectA(GetStockObject(WHITE_BRUSH), sizeof(LOGBRUSH), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObjectW(GetStockObject(BLACK_PEN), sizeof(LOGPEN), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObjectW(GetStockObject(21), sizeof(BITMAP), (PVOID)0xc0000000) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObjectW(GetStockObject(SYSTEM_FONT), sizeof(LOGFONT), (PVOID)0xc0000000) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok(GetLastError() == 0xbadbad00, "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); _SEH2_TRY { @@ -157,18 +158,31 @@ /* Test buffer size of 0 */ - SetLastError(ERROR_SUCCESS); - ok_long(GetObjectA(GetStockObject(WHITE_BRUSH), 0, &TestStruct), sizeof(LOGBRUSH)); - ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); - ok(GetObjectA(GetStockObject(BLACK_PEN), 0, &TestStruct) == 0, "\n"); + SetLastError(0xbadbad00); + hBrush = CreateSolidBrush(123); + ok(hBrush != NULL, "Failed to create brush\n"); + ok_long(GetObjectA(hBrush, 0, &TestStruct), sizeof(LOGBRUSH)); + ok_err(0xbadbad00); + DeleteObject(hBrush); + SetLastError(0xbadbad00); + hpen = CreatePen(PS_SOLID, 1, 123); + ok(hpen != NULL, "Failed to create pen\n"); + ok_long(GetObjectA(hpen, 0, &TestStruct), 0); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); + TestStruct.logbrush.lbStyle = BS_SOLID; + TestStruct.logbrush.lbColor = RGB(1,2,3); + TestStruct.logbrush.lbHatch = 0; + hpen = ExtCreatePen(PS_GEOMETRIC | PS_SOLID, 1, &TestStruct.logbrush, 0, NULL); + ok(hpen != NULL, "Failed to create pen\n"); + ok_long(GetObjectA(hpen, 0, &TestStruct), 0); + ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); + SetLastError(0xbadbad00); ok(GetObjectW(GetStockObject(SYSTEM_FONT), 0, &TestStruct) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + ok_err(0xbadbad00); + SetLastError(0xbadbad00); ok(GetObjectW(GetStockObject(21), 0, &TestStruct) == 0, "\n"); - ok(GetLastError() == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %ld\n", GetLastError()); + ok_err(0xbadbad00); } @@ -458,7 +472,7 @@ ok(GetLastError() == ERROR_SUCCESS, "\n"); ok(GetObject((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %ld\n", GetLastError()); - SetLastError(ERROR_SUCCESS); + SetLastError(0xbadbad00); ok(GetObject(hPen, 0, &extlogpen) == 0, "\n"); ok((GetLastError() == 0xbadbad00) || (GetLastError() == ERROR_NOACCESS), "wrong error: %ld\n", GetLastError()); SetLastError(ERROR_SUCCESS); @@ -638,8 +652,8 @@ ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, buffer) == 0, "\n"); ok_err(ERROR_INVALID_PARAMETER); - ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); - ok_err(ERROR_INSUFFICIENT_BUFFER); + //ok_long(GetObjectA((HANDLE)GDI_OBJECT_TYPE_COLORSPACE, 328, NULL), 0); // FIXME: fails on WHS + //ok_err(ERROR_INSUFFICIENT_BUFFER); } void

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs