Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[akhaldi] 69757: [PSDK] Comment commctrl.h preprocessor conditions in an attempt to make this maze readable.

by akhaldi＠svn.reactos.org

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 */

9 years, 1 month

[hbelusca] 69756: Fix build.

by hbelusca＠svn.reactos.org

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

9 years, 1 month

[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

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)

9 years, 1 month

[tkreuzer] 69754: [GDI32_APITEST] Formatting: tabs -> spaces

by tkreuzer＠svn.reactos.org

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(); +} +

9 years, 1 month

[ekohl] 69753: [NTOSKRNL] DPRINT1 --> DPRINT

by ekohl＠svn.reactos.org

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);

9 years, 1 month

[tkreuzer] 69752: [GDI32_APITEST] Fix tests for GetObject

by tkreuzer＠svn.reactos.org

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

9 years, 1 month

[tfaber] 69751: [SHDOCVW] - Add missing parameter to RunInstallUninstallStubs2 CORE-5189

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Oct 31 14:15:09 2015 New Revision: 69751 URL: http://svn.reactos.org/svn/reactos?rev=69751&view=rev Log: [SHDOCVW] - Add missing parameter to RunInstallUninstallStubs2 CORE-5189 Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec trunk/reactos/dll/win32/shdocvw/shdocvw_main.c Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.spec [iso-8859-1] Sat Oct 31 14:15:09 2015 @@ -27,7 +27,7 @@ 127 stub DoAddToFavDlgW 128 stdcall DoFileDownload(wstr) 129 stub DoFileDownloadEx -130 stdcall -noname RunInstallUninstallStubs2() +130 stdcall -noname RunInstallUninstallStubs2(long) 131 stub -noname SHCreateSplashScreen 132 stub DoOrganizeFavDlg 133 stub DoOrganizeFavDlgW Modified: trunk/reactos/dll/win32/shdocvw/shdocvw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw_… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw_main.c [iso-8859-1] Sat Oct 31 14:15:09 2015 @@ -244,9 +244,9 @@ * * Called by Emerge Desktop (alternative Windows Shell). */ -DWORD WINAPI RunInstallUninstallStubs2(void) -{ - FIXME("(), stub!\n"); +DWORD WINAPI RunInstallUninstallStubs2(int arg) +{ + FIXME("(%d), stub!\n", arg); return 0x0deadbee; }

9 years, 1 month

[pschweitzer] 69750: [NTOSKNRL] Comment out for now in MCB the assert hit when attempting to write on an extX volume. Aleksey, could you have a look at it? CORE-10407 #comment Can you retry with r6...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sat Oct 31 13:50:23 2015 New Revision: 69750 URL: http://svn.reactos.org/svn/reactos?rev=69750&view=rev Log: [NTOSKNRL] Comment out for now in MCB the assert hit when attempting to write on an extX volume. Aleksey, could you have a look at it? CORE-10407 #comment Can you retry with r69750? Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c [iso-8859-1] Sat Oct 31 13:50:23 2015 @@ -867,7 +867,7 @@ } else { - ASSERT(NeedleRun.RunStartVbn.QuadPart >= HaystackRun->RunStartVbn.QuadPart); + //ASSERT(NeedleRun.RunStartVbn.QuadPart >= HaystackRun->RunStartVbn.QuadPart); //ASSERT(NeedleRun.RunEndVbn.QuadPart <= HaystackRun->RunEndVbn.QuadPart); Mcb->Mapping->Table.CompareRoutine = McbMappingCompare; RtlDeleteElementGenericTable(&Mcb->Mapping->Table, HaystackRun);

9 years, 1 month

[ekohl] 69749: [NTOSKRNL] Dereference the primary access token in SeDeassignPrimaryToken.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Oct 31 13:32:12 2015 New Revision: 69749 URL: http://svn.reactos.org/svn/reactos?rev=69749&view=rev Log: [NTOSKRNL] Dereference the primary access token in SeDeassignPrimaryToken. Modified: trunk/reactos/ntoskrnl/se/token.c 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 13:32:12 2015 @@ -294,6 +294,9 @@ /* Mark the Old Token as free */ OldToken->TokenInUse = 0; + + /* Dereference the Token */ + ObDereferenceObject(OldToken); } static ULONG

9 years, 1 month

[tkreuzer] 69748: [WIN32K] Fix parameter handling in NtGdiDoPalette CORE-9435 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Oct 31 12:52:01 2015 New Revision: 69748 URL: http://svn.reactos.org/svn/reactos?rev=69748&view=rev Log: [WIN32K] Fix parameter handling in NtGdiDoPalette CORE-9435 #resolve Modified: trunk/reactos/include/psdk/ntgdi.h trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Sat Oct 31 12:52:01 2015 @@ -439,8 +439,8 @@ _In_ HGDIOBJ hObj, _In_ WORD iStart, _In_ WORD cEntries, - _When_((iFunc == GdiPalGetEntries) || (iFunc == GdiPalGetSystemEntries), _Out_writes_bytes_(cEntries*sizeof(PALETTEENTRY))) - _When_((iFunc != GdiPalGetEntries) && (iFunc != GdiPalGetSystemEntries), _In_reads_bytes_(cEntries*sizeof(PALETTEENTRY))) LPVOID pEntries, + _When_(bInbound!=0, _In_reads_bytes_(cEntries*sizeof(PALETTEENTRY))) + _When_(bInbound==0, _Out_writes_bytes_(cEntries*sizeof(PALETTEENTRY))) LPVOID pEntries, _In_ DWORD iFunc, _In_ BOOL bInbound); Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Sat Oct 31 12:52:01 2015 @@ -1055,39 +1055,38 @@ return iResult; } -W32KAPI +__kernel_entry LONG APIENTRY NtGdiDoPalette( - IN HGDIOBJ hObj, - IN WORD iStart, - IN WORD cEntries, - IN LPVOID pUnsafeEntries, - IN DWORD iFunc, - IN BOOL bInbound) + _In_ HGDIOBJ hObj, + _In_ WORD iStart, + _In_ WORD cEntries, + _When_(bInbound!=0, _In_reads_bytes_(cEntries*sizeof(PALETTEENTRY))) + _When_(bInbound==0, _Out_writes_bytes_(cEntries*sizeof(PALETTEENTRY))) LPVOID pUnsafeEntries, + _In_ DWORD iFunc, + _In_ BOOL bInbound) { LONG ret; LPVOID pEntries = NULL; - - /* FIXME: Handle bInbound correctly */ - - if (bInbound && - (pUnsafeEntries == NULL || cEntries == 0)) - { - return 0; - } + SIZE_T cjSize; if (pUnsafeEntries) { - pEntries = ExAllocatePoolWithTag(PagedPool, cEntries * sizeof(PALETTEENTRY), TAG_PALETTE); + if (cEntries == 0) + return 0; + + cjSize = cEntries * sizeof(PALETTEENTRY); + pEntries = ExAllocatePoolWithTag(PagedPool, cjSize, TAG_PALETTE); if (!pEntries) return 0; + if (bInbound) { _SEH2_TRY { - ProbeForRead(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); - memcpy(pEntries, pUnsafeEntries, cEntries * sizeof(PALETTEENTRY)); + ProbeForRead(pUnsafeEntries, cjSize, 1); + memcpy(pEntries, pUnsafeEntries, cjSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1099,7 +1098,7 @@ else { /* Zero it out, so we don't accidentally leak kernel data */ - RtlZeroMemory(pEntries, cEntries * sizeof(PALETTEENTRY)); + RtlZeroMemory(pEntries, cjSize); } } @@ -1137,12 +1136,13 @@ if (pEntries) { - if (!bInbound) + if (!bInbound && (ret > 0)) { + cjSize = min(cEntries, ret) * sizeof(PALETTEENTRY); _SEH2_TRY { - ProbeForWrite(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); - memcpy(pUnsafeEntries, pEntries, cEntries * sizeof(PALETTEENTRY)); + ProbeForWrite(pUnsafeEntries, cjSize, 1); + memcpy(pUnsafeEntries, pEntries, cjSize); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

9 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015