Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gadamopoulos] 48397: [hal] - define REGISTERCALL in order to replace __attribute__((regparm(3))) and fix compilation with msvc. It was used only as an optimization so it is safe to be defined as FASTCALL for msvc. For gcc it is still defined as __attribute__((regparm(3)))
by gadamopoulos＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: gadamopoulos Date: Sun Aug 1 16:27:48 2010 New Revision: 48397 URL: http://svn.reactos.org/svn/reactos?rev=48397&view=rev Log: [hal] - define REGISTERCALL in order to replace __attribute__((regparm(3))) and fix compilation with msvc. It was used only as an optimization so it is safe to be defined as FASTCALL for msvc. For gcc it is still defined as __attribute__((regparm(3))) Modified: trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/up/pic.c Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sun Aug 1 16:27:48 2010 @@ -3,6 +3,13 @@ */ #pragma once + + +#ifdef _MSC_VER +#define REGISTERCALL FASTCALL +#else +#define REGISTERCALL __attribute__((regparm(3))) +#endif typedef struct _HAL_BIOS_FRAME { @@ -408,15 +415,14 @@ typedef BOOLEAN -__attribute__((regparm(3))) -(*PHAL_DISMISS_INTERRUPT)( +( REGISTERCALL *PHAL_DISMISS_INTERRUPT)( IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqGeneric( IN KIRQL Irql, IN ULONG Irq, @@ -424,7 +430,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15( IN KIRQL Irql, IN ULONG Irq, @@ -432,7 +438,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13( IN KIRQL Irql, IN ULONG Irq, @@ -440,7 +446,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07( IN KIRQL Irql, IN ULONG Irq, @@ -448,7 +454,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqLevel( IN KIRQL Irql, IN ULONG Irq, @@ -456,7 +462,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15Level( IN KIRQL Irql, IN ULONG Irq, @@ -464,7 +470,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13Level( IN KIRQL Irql, IN ULONG Irq, @@ -472,7 +478,7 @@ ); BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07Level( IN KIRQL Irql, IN ULONG Irq, Modified: trunk/reactos/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/pic.c?rev=48… ============================================================================== --- trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/up/pic.c [iso-8859-1] Sun Aug 1 16:27:48 2010 @@ -813,7 +813,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqGeneric(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -823,7 +823,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -859,7 +859,7 @@ BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -872,7 +872,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -956,7 +956,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrqLevel(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -966,7 +966,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq15Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1001,7 +1001,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq13Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1014,7 +1014,7 @@ } BOOLEAN -__attribute__((regparm(3))) +REGISTERCALL HalpDismissIrq07Level(IN KIRQL Irql, IN ULONG Irq, OUT PKIRQL OldIrql) @@ -1252,8 +1252,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpApcInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) { /* Do the work */ @@ -1261,8 +1261,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpApcInterruptHandler(IN PKTRAP_FRAME TrapFrame) { /* Set up a fake INT Stack */ @@ -1301,8 +1301,8 @@ } VOID +DECLSPEC_NORETURN FASTCALL -DECLSPEC_NORETURN HalpDispatchInterrupt2ndEntry(IN PKTRAP_FRAME TrapFrame) { KIRQL CurrentIrql;

1 0

[khornicek] 48396: [WIN32K] Comply with the 32 bit alignment rule. Fixes hatch brushes.
by khornicek＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: khornicek Date: Sun Aug 1 13:29:22 2010 New Revision: 48396 URL: http://svn.reactos.org/svn/reactos?rev=48396&view=rev Log: [WIN32K] Comply with the 32 bit alignment rule. Fixes hatch brushes. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Aug 1 13:29:22 2010 @@ -25,7 +25,7 @@ RGN_ATTR Attr[GDIOBJATTRFREE]; } GDI_OBJ_ATTR_ENTRY, *PGDI_OBJ_ATTR_ENTRY; -static const USHORT HatchBrushes[NB_HATCH_STYLES][8] = +static const ULONG HatchBrushes[NB_HATCH_STYLES][8] = { {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF}, /* HS_HORIZONTAL */ {0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7, 0xF7}, /* HS_VERTICAL */

1 0

[fireball] 48395: - Fix user32 build by merging header updates (44999-48394).
by fireball＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: fireball Date: Sun Aug 1 13:20:30 2010 New Revision: 48395 URL: http://svn.reactos.org/svn/reactos?rev=48395&view=rev Log: - Fix user32 build by merging header updates (44999-48394). Modified: branches/arwinss/reactos/dll/win32/version/ (props changed) branches/arwinss/reactos/dll/win32/version/resource.c branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/psdk/winuser.h (contents, props changed) Propchange: branches/arwinss/reactos/dll/win32/version/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Aug 1 13:20:30 2010 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/dll/win32/version:34711-34712,34743,34780-34782,34812,34839,34842,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35683,35739,35746,35762,35771,35777,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36172,36360,36388-36389,36445,36502-36503,36505,36570,36614,36899,36930,36936,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38148-38151,38264-38265,38268,38355,39151,39333,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43838-43840,43857-43858,43860,43905-43907,43969,44002,44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338,44389,44391,44426,44460,44530,44540,44601 +/trunk/reactos/dll/win32/version:42000-44999,45011,45097-45099,45319,45418-45419,45535-45539,45687-45688,47605,48386 Modified: branches/arwinss/reactos/dll/win32/version/resource.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/versi… ============================================================================== --- branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/version/resource.c [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -66,9 +66,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) + if (entry[pos].u1.Id == id) return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winnt.h [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -4001,26 +4001,24 @@ WORD NumberOfNamedEntries; WORD NumberOfIdEntries; } IMAGE_RESOURCE_DIRECTORY,*PIMAGE_RESOURCE_DIRECTORY; -_ANONYMOUS_STRUCT typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { - _ANONYMOUS_UNION union { - _ANONYMOUS_STRUCT struct { - DWORD NameOffset:31; - DWORD NameIsString:1; - }DUMMYSTRUCTNAME1; - DWORD Name; - _ANONYMOUS_STRUCT struct { - WORD Id; - WORD __pad; - }DUMMYSTRUCTNAME2; - } DUMMYUNIONNAME1; - _ANONYMOUS_UNION union { - DWORD OffsetToData; - _ANONYMOUS_STRUCT struct { - DWORD OffsetToDirectory:31; - DWORD DataIsDirectory:1; - } DUMMYSTRUCTNAME3; - } DUMMYUNIONNAME2; -} IMAGE_RESOURCE_DIRECTORY_ENTRY,*PIMAGE_RESOURCE_DIRECTORY_ENTRY; + +typedef struct _IMAGE_RESOURCE_DIRECTORY_ENTRY { + _ANONYMOUS_UNION union { + _ANONYMOUS_STRUCT struct { + DWORD NameOffset:31; + DWORD NameIsString:1; + } DUMMYSTRUCTNAME1; + DWORD Name; + WORD Id; + } DUMMYUNIONNAME1; + _ANONYMOUS_UNION union { + DWORD OffsetToData; + _ANONYMOUS_STRUCT struct { + DWORD OffsetToDirectory:31; + DWORD DataIsDirectory:1; + } DUMMYSTRUCTNAME3; + } DUMMYUNIONNAME2; +} IMAGE_RESOURCE_DIRECTORY_ENTRY, *PIMAGE_RESOURCE_DIRECTORY_ENTRY; typedef struct _IMAGE_RESOURCE_DIRECTORY_STRING { WORD Length; Modified: branches/arwinss/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… ============================================================================== --- branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/winuser.h [iso-8859-1] Sun Aug 1 13:20:30 2010 @@ -299,6 +299,9 @@ #define ES_LOWERCASE 16 #define ES_MULTILINE 4 #define ES_NOHIDESEL 256 +#ifdef _WINE +#define ES_COMBO 0x200 /* Undocumented. Parent is a combobox */ +#endif #define ES_NUMBER 0x2000 #define ES_OEMCONVERT 0x400 #define ES_PASSWORD 32 @@ -306,7 +309,6 @@ #define ES_RIGHT 2 #define ES_UPPERCASE 8 #define ES_WANTRETURN 4096 -#define ES_COMBO 0x00000200 /* Undocumented. Parent is a combobox */ #define LBS_DISABLENOSCROLL 4096 #define LBS_EXTENDEDSEL 0x800 #define LBS_HASSTRINGS 64 @@ -868,7 +870,7 @@ #define QS_SENDMESSAGE 64 #define QS_TIMER 16 /* Extra (undocumented) queue wake bits - see "Undoc. Windows" */ -#define QS_SMRESULT 0x8000 +#define QS_SMRESULT 0x8000 #define USER_TIMER_MAXIMUM 2147483647 #define USER_TIMER_MINIMUM 10 @@ -1148,8 +1150,8 @@ #define MOUSEEVENTF_RIGHTUP 16 #define MOUSEEVENTF_MIDDLEDOWN 32 #define MOUSEEVENTF_MIDDLEUP 64 -#define MOUSEEVENTF_XDOWN 0x0080 -#define MOUSEEVENTF_XUP 0x0100 +#define MOUSEEVENTF_XDOWN 128 +#define MOUSEEVENTF_XUP 256 #define MOUSEEVENTF_WHEEL 0x0800 #define MOUSEEVENTF_ABSOLUTE 32768 #define PM_NOREMOVE 0 @@ -1211,9 +1213,9 @@ #define SWP_DEFERERASE 8192 #define SWP_ASYNCWINDOWPOS 16384 /* undocumented SWP flags - from SDK 3.1 */ -#define SWP_NOCLIENTSIZE 0x0800 -#define SWP_NOCLIENTMOVE 0x1000 -#define SWP_STATECHANGED 0x8000 +#define SWP_NOCLIENTSIZE 0x0800 +#define SWP_NOCLIENTMOVE 0x1000 +#define SWP_STATECHANGED 0x8000 #define HSHELL_WINDOWCREATED 1 #define HSHELL_WINDOWDESTROYED 2 @@ -1572,7 +1574,9 @@ #define WM_ACTIVATE 6 #define WM_SETFOCUS 7 #define WM_KILLFOCUS 8 +#ifdef _WINE #define WM_SETVISIBLE 9 +#endif #define WM_ENABLE 10 #define WM_SETREDRAW 11 #define WM_SETTEXT 12 @@ -1612,6 +1616,7 @@ #define WM_GETFONT 49 #define WM_SETHOTKEY 50 #define WM_GETHOTKEY 51 +#define WM_ISACTIVEICON 53 #define WM_QUERYPARKICON 54 #define WM_QUERYDRAGICON 55 #define WM_COMPAREITEM 57 @@ -1630,7 +1635,6 @@ #define WM_NOTIFY 78 #define WM_INPUTLANGCHANGEREQUEST 80 #define WM_INPUTLANGCHANGE 81 -#define WM_ISACTIVEICON 0x0035 #define WM_TCARD 82 #define WM_HELP 83 #define WM_USERCHANGED 84 @@ -1722,7 +1726,7 @@ #endif /* _WIN32_WCE */ #endif /* (WINVER >= 0x0500) */ - /* D&D messages */ +/* D&D messages */ #define WM_DROPOBJECT 0x022A #define WM_QUERYDROPOBJECT 0x022B #define WM_BEGINDRAG 0x022C @@ -1730,6 +1734,7 @@ #define WM_DRAGSELECT 0x022E #define WM_DRAGMOVE 0x022F +#define WM_CTLCOLOR 25 #define WM_CTLCOLORMSGBOX 306 #define WM_CTLCOLOREDIT 307 #define WM_CTLCOLORLISTBOX 308 @@ -1738,7 +1743,6 @@ #define WM_CTLCOLORSCROLLBAR 311 #define WM_CTLCOLORSTATIC 312 #define MN_GETHMENU 481 -#define WM_CTLCOLOR 25 #define WM_MOUSEFIRST 512 #define WM_MOUSEMOVE 512 #define WM_LBTRACKPOINT 0x0131 @@ -1831,6 +1835,12 @@ #define WM_PRINT 791 #define WM_PRINTCLIENT 792 #define WM_APPCOMMAND 793 + +#define WM_DWMCOMPOSITIONCHANGED 0x031E +#define WM_DWMNCRENDERINGCHANGED 0x031F +#define WM_DWMCOLORIZATIONCOLORCHANGED 0x0320 +#define WM_DWMWINDOWMAXIMIZEDCHANGE 0x0321 + #define WM_HANDHELDFIRST 856 #define WM_HANDHELDLAST 863 #define WM_AFXFIRST 864 @@ -1906,7 +1916,7 @@ #define CB_SETLOCALE 345 #define CB_SETTOPINDEX 348 #define CB_SHOWDROPDOWN 335 -#define CB_MSGMAX 0x0165 +#define CB_MSGMAX 357 #define CBN_CLOSEUP 8 #define CBN_DBLCLK 2 #define CBN_DROPDOWN 7 @@ -1967,8 +1977,10 @@ #define EN_VSCROLL 1538 #define LB_ADDFILE 406 #define LB_ADDSTRING 384 -#define LB_CARETON 0x01a3 -#define LB_CARETOFF 0x01a4 +#ifdef _WINE +#define LB_CARETON 419 +#define LB_CARETOFF 420 +#endif #define LB_DELETESTRING 386 #define LB_DIR 397 #define LB_FINDSTRING 399 @@ -2017,12 +2029,16 @@ #define SBM_ENABLE_ARROWS 228 #define SBM_GETPOS 225 #define SBM_GETRANGE 227 -#define SBM_SETSCROLLINFO 233 -#define SBM_GETSCROLLINFO 234 -#define SBM_GETSCROLLBARINFO 235 #define SBM_SETPOS 224 #define SBM_SETRANGE 226 #define SBM_SETRANGEREDRAW 230 +#if (_WIN32_WINNT >= 0x0400) +#define SBM_GETSCROLLINFO 234 +#define SBM_SETSCROLLINFO 233 +#endif +#if (_WIN32_WINNT >= 0x0501) +#define SBM_GETSCROLLBARINFO 235 +#endif #define STM_GETICON 369 #define STM_GETIMAGE 371 #define STM_SETICON 368 @@ -2467,8 +2483,18 @@ #define ODS_DISABLED 4 #define ODS_CHECKED 8 #define ODS_FOCUS 16 +#if(WINVER >= 0x0400) #define ODS_DEFAULT 32 #define ODS_COMBOBOXEDIT 4096 +#endif +#if(WINVER >= 0x0500) +#define ODS_HOTLIGHT 0x0040 +#define ODS_INACTIVE 0x0080 +#if(_WIN32_WINNT >= 0x0500) +#define ODS_NOACCEL 0x0100 +#define ODS_NOFOCUSRECT 0x0200 +#endif +#endif #define IDHOT_SNAPWINDOW (-1) #define IDHOT_SNAPDESKTOP (-2) #define DBWF_LPARAMPOINTER 0x8000 @@ -3227,7 +3253,7 @@ int iVertSpacing; int iTitleWrap; LOGFONTA lfFont; -} ICONMETRICSA,*LPICONMETRICSA; +} ICONMETRICSA, *PICONMETRICSA, *LPICONMETRICSA; typedef struct tagICONMETRICSW { UINT cbSize; @@ -3235,7 +3261,7 @@ int iVertSpacing; int iTitleWrap; LOGFONTW lfFont; -} ICONMETRICSW,*LPICONMETRICSW; +} ICONMETRICSW, *PICONMETRICSW, *LPICONMETRICSW; #ifdef UNICODE typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS; @@ -3891,7 +3917,7 @@ HACCEL WINAPI CreateAcceleratorTableA(LPACCEL,int); HACCEL WINAPI CreateAcceleratorTableW(LPACCEL,int); BOOL WINAPI CreateCaret(HWND,HBITMAP,int,int); -HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,PCVOID,PCVOID); +HCURSOR WINAPI CreateCursor(HINSTANCE,int,int,int,int,CONST VOID*,CONST VOID*); #if defined(_WINGDI_) && !defined(NOGDI) HDESK WINAPI CreateDesktopA(LPCSTR,LPCSTR,LPDEVMODEA,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); HDESK WINAPI CreateDesktopW(LPCWSTR,LPCWSTR,LPDEVMODEW,DWORD,ACCESS_MASK,LPSECURITY_ATTRIBUTES); @@ -3904,7 +3930,7 @@ HWND WINAPI CreateDialogIndirectParamW(HINSTANCE,LPCDLGTEMPLATE,HWND,DLGPROC,LPARAM); HWND WINAPI CreateDialogParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); HWND WINAPI CreateDialogParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); -HICON WINAPI CreateIcon(HINSTANCE,INT,INT,BYTE,BYTE,LPCVOID,LPCVOID); +HICON WINAPI CreateIcon(HINSTANCE,int,int,BYTE,BYTE,const BYTE*,const BYTE*); HICON WINAPI CreateIconFromResource(PBYTE,DWORD,BOOL,DWORD); HICON WINAPI CreateIconFromResourceEx(PBYTE,DWORD,BOOL,DWORD,int,int,UINT); HICON WINAPI CreateIconIndirect(PICONINFO); @@ -3994,7 +4020,7 @@ BOOL WINAPI EnumDesktopsA(HWINSTA,DESKTOPENUMPROCA,LPARAM); BOOL WINAPI EnumDesktopsW(HWINSTA,DESKTOPENUMPROCW,LPARAM); BOOL WINAPI EnumDesktopWindows(HDESK,WNDENUMPROC,LPARAM); -BOOL WINAPI EnumDisplayMonitors(HDC,LPRECT,MONITORENUMPROC,LPARAM); +BOOL WINAPI EnumDisplayMonitors(HDC,LPCRECT,MONITORENUMPROC,LPARAM); #if defined(_WINGDI_) && !defined(NOGDI) BOOL WINAPI EnumDisplaySettingsA(LPCSTR,DWORD,PDEVMODEA); BOOL WINAPI EnumDisplaySettingsW(LPCWSTR,DWORD,PDEVMODEW); @@ -4063,7 +4089,7 @@ HDC WINAPI GetDC(HWND); HDC WINAPI GetDCEx(HWND,HRGN,DWORD); HWND WINAPI GetDesktopWindow(void); -DWORD WINAPI GetDialogBaseUnits(void); +LONG WINAPI GetDialogBaseUnits(void); int WINAPI GetDlgCtrlID(HWND); HWND WINAPI GetDlgItem(HWND,int); UINT WINAPI GetDlgItemInt(HWND,int,PBOOL,BOOL); @@ -4137,8 +4163,8 @@ #define GetSysModalWindow() (NULL) HMENU WINAPI GetSystemMenu(HWND,BOOL); int WINAPI GetSystemMetrics(int); -DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,const INT *); -DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,const INT *); +DWORD WINAPI GetTabbedTextExtentA(HDC,LPCSTR,int,int,CONST INT*); +DWORD WINAPI GetTabbedTextExtentW(HDC,LPCWSTR,int,int,CONST INT*); LONG WINAPI GetWindowLongA(HWND,int); LONG WINAPI GetWindowLongW(HWND,int); #ifdef _WIN64 @@ -4278,8 +4304,8 @@ int WINAPI MessageBoxW(HWND,LPCWSTR,LPCWSTR,UINT); int WINAPI MessageBoxExA(HWND,LPCSTR,LPCSTR,UINT,WORD); int WINAPI MessageBoxExW(HWND,LPCWSTR,LPCWSTR,UINT,WORD); -INT WINAPI MessageBoxIndirectA(LPMSGBOXPARAMSA); -INT WINAPI MessageBoxIndirectW(LPMSGBOXPARAMSW); +int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*); +int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*); BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT_PTR,LPCSTR); BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT_PTR,LPCWSTR); HMONITOR WINAPI MonitorFromPoint(POINT,DWORD); @@ -4320,6 +4346,8 @@ #endif UINT WINAPI PrivateExtractIconsA(LPCSTR,int,int,int,HICON*,UINT*,UINT,UINT); UINT WINAPI PrivateExtractIconsW(LPCWSTR,int,int,int,HICON*,UINT*,UINT,UINT); +UINT WINAPI WINAPI PrivateExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT); +UINT WINAPI WINAPI PrivateExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); BOOL WINAPI PtInRect(LPCRECT,POINT); HWND WINAPI RealChildWindowFromPoint(HWND,POINT); UINT WINAPI RealGetWindowClassA(HWND,LPSTR,UINT); @@ -4338,7 +4366,7 @@ BOOL WINAPI RegisterHotKey(HWND,int,UINT,UINT); BOOL WINAPI RegisterLogonProcess(DWORD,BOOL); #if (_WIN32_WINNT >= 0x0501) -BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE,UINT,UINT); +BOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE,UINT,UINT); #endif BOOL WINAPI RegisterShellHookWindow(HWND); UINT WINAPI RegisterWindowMessageA(LPCSTR); @@ -4463,13 +4491,13 @@ #endif /* (_WIN32_WINNT >= 0x0500) */ BOOL WINAPI SystemParametersInfoA(UINT,UINT,PVOID,UINT); BOOL WINAPI SystemParametersInfoW(UINT,UINT,PVOID,UINT); -LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,const INT *,int); -LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,const INT *,int); +LONG WINAPI TabbedTextOutA(HDC,int,int,LPCSTR,int,int,CONST INT*,int); +LONG WINAPI TabbedTextOutW(HDC,int,int,LPCWSTR,int,int,CONST INT*,int); WORD WINAPI TileWindows(HWND,UINT,LPCRECT,UINT,const HWND *); -int WINAPI ToAscii(UINT,UINT,const BYTE *,LPWORD,UINT); -int WINAPI ToAsciiEx(UINT,UINT,const BYTE *,LPWORD,UINT,HKL); -INT WINAPI ToUnicode(UINT,UINT,const BYTE *,LPWSTR,int,UINT); -INT WINAPI ToUnicodeEx(UINT,UINT,const BYTE *,LPWSTR,int,UINT,HKL); +int WINAPI ToAscii(UINT,UINT,CONST BYTE*,LPWORD,UINT); +int WINAPI ToAsciiEx(UINT,UINT,CONST BYTE*,LPWORD,UINT,HKL); +int WINAPI ToUnicode(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT); +int WINAPI ToUnicodeEx(UINT,UINT,CONST BYTE*,LPWSTR,int,UINT,HKL); BOOL WINAPI TrackMouseEvent(LPTRACKMOUSEEVENT); BOOL WINAPI TrackPopupMenu(HMENU,UINT,int,int,int,HWND,LPCRECT); BOOL WINAPI TrackPopupMenuEx(HMENU,UINT,int,int,HWND,LPTPMPARAMS); @@ -4494,8 +4522,8 @@ BOOL WINAPI ValidateRect(HWND,LPCRECT); BOOL WINAPI ValidateRgn(HWND,HRGN); SHORT WINAPI VkKeyScanA(CHAR); -WORD WINAPI VkKeyScanExA(CHAR,HKL); -WORD WINAPI VkKeyScanExW(WCHAR,HKL); +SHORT WINAPI VkKeyScanExA(CHAR,HKL); +SHORT WINAPI VkKeyScanExW(WCHAR,HKL); SHORT WINAPI VkKeyScanW(WCHAR); DWORD WINAPI WaitForInputIdle(HANDLE,DWORD); BOOL WINAPI WaitMessage(void); Propchange: branches/arwinss/reactos/include/psdk/winuser.h ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Aug 1 13:20:30 2010 @@ -1,0 +1,2 @@ +/branches/ros-amd64-bringup/reactos/include/psdk/winuser.h:34711-34712,34743,34812,34839,34842,34917,35323-35324,35347-35348,35361,35436,35509,35515,35588,35739,35746,35771,35789,35823,35902,35904-35906,35942,35947-35949,35952-35953,35966,36013,36360,36388-36389,36570,36614,36930,37323,37434,37472,37475,37536,37820-37821,37869,37873,37990-37991,38013-38014,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080,43426,43454 +/trunk/reactos/include/psdk/winuser.h:42000-48394

1 0

[fireball] 48394: - winent.drv: Fix include paths. - winent.drv: Remove unnecessary included winuser16.h.
by fireball＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: fireball Date: Sun Aug 1 12:52:23 2010 New Revision: 48394 URL: http://svn.reactos.org/svn/reactos?rev=48394&view=rev Log: - winent.drv: Fix include paths. - winent.drv: Remove unnecessary included winuser16.h. Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c branches/arwinss/reactos/dll/win32/winent.drv/main.c branches/arwinss/reactos/dll/win32/winent.drv/mouse.c branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c branches/arwinss/reactos/dll/win32/winent.drv/wnd.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/clipboard.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -24,7 +24,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/unicode.h" #include "wine/server.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/main.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -21,7 +21,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/mouse.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -28,11 +28,10 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> -#include "winuser16.h" #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -17,11 +17,10 @@ #include "wingdi.h" #define NTOS_USER_MODE #include <ndk/ntndk.h> -#include "winuser16.h" #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h" Modified: branches/arwinss/reactos/dll/win32/winent.drv/wnd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/wnd.c [iso-8859-1] Sun Aug 1 12:52:23 2010 @@ -20,7 +20,7 @@ #include <winddi.h> #include <win32k/ntgdityp.h> #include "ntrosgdi.h" -#include "win32k/rosuser.h" +#include "wine/rosuser.h" #include "winent.h" #include "wine/server.h" #include "wine/debug.h"

1 0

[fireball] 48393: - user32: Fix function definitions to match MS PSDK. To be submitted upstream.
by fireball＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: fireball Date: Sun Aug 1 12:50:40 2010 New Revision: 48393 URL: http://svn.reactos.org/svn/reactos?rev=48393&view=rev Log: - user32: Fix function definitions to match MS PSDK. To be submitted upstream. Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c branches/arwinss/reactos/dll/win32/user32/dialog.c branches/arwinss/reactos/dll/win32/user32/exticon.c branches/arwinss/reactos/dll/win32/user32/input.c branches/arwinss/reactos/dll/win32/user32/legacy.c branches/arwinss/reactos/dll/win32/user32/misc.c branches/arwinss/reactos/dll/win32/user32/msgbox.c Modified: branches/arwinss/reactos/dll/win32/user32/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/cursoricon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1496,8 +1496,8 @@ INT nHeight, /* [in] the height of the provided bitmaps */ BYTE bPlanes, /* [in] the number of planes in the provided bitmaps */ BYTE bBitsPixel, /* [in] the number of bits per pixel of the lpXORbits bitmap */ - LPCVOID lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ - LPCVOID lpXORbits) /* [in] the icon's 'color' bitmap */ + CONST BYTE *lpANDbits, /* [in] a monochrome bitmap representing the icon's mask */ + CONST BYTE *lpXORbits) /* [in] the icon's 'color' bitmap */ { ICONINFO iinfo; HICON hIcon; Modified: branches/arwinss/reactos/dll/win32/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/dialog.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -1466,9 +1466,9 @@ * GetDialogBaseUnits (USER.243) * GetDialogBaseUnits (USER32.@) */ -DWORD WINAPI GetDialogBaseUnits(void) -{ - static DWORD units; +LONG WINAPI GetDialogBaseUnits(void) +{ + static LONG units; if (!units) { Modified: branches/arwinss/reactos/dll/win32/user32/exticon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/exticon.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -119,9 +119,9 @@ while (min <= max) { pos = (min + max) / 2; - if (entry[pos].u1.s2.Id == id) + if (entry[pos].u1.Id == id) return (const IMAGE_RESOURCE_DIRECTORY *)((const char *)root + entry[pos].u2.s3.OffsetToDirectory); - if (entry[pos].u1.s2.Id > id) max = pos - 1; + if (entry[pos].u1.Id > id) max = pos - 1; else min = pos + 1; } return NULL; @@ -488,7 +488,7 @@ while(n<iconDirCount && xprdeTmp) { - if(xprdeTmp->u1.s2.Id == iId) + if(xprdeTmp->u1.Id == iId) { nIconIndex = n; break; Modified: branches/arwinss/reactos/dll/win32/user32/input.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/input.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -384,7 +384,7 @@ /****************************************************************** * RegisterRawInputDevices (USER32.@) */ -BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) +BOOL WINAPI DECLSPEC_HOTPATCH RegisterRawInputDevices(PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize) { FIXME("(pRawInputDevices=%p, uiNumDevices=%d, cbSize=%d) stub!\n", pRawInputDevices, uiNumDevices, cbSize); @@ -582,7 +582,7 @@ /********************************************************************** * VkKeyScanExA (USER32.@) */ -WORD WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExA(CHAR cChar, HKL dwhkl) { WCHAR wChar; @@ -595,7 +595,7 @@ /****************************************************************************** * VkKeyScanExW (USER32.@) */ -WORD WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) +SHORT WINAPI VkKeyScanExW(WCHAR cChar, HKL dwhkl) { return USER_Driver->pVkKeyScanEx(cChar, dwhkl); } Modified: branches/arwinss/reactos/dll/win32/user32/legacy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/legacy.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -7,7 +7,6 @@ #include "wingdi.h" #include "winerror.h" #include "wine/winbase16.h" -#include "wine/winuser16.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(userlegacy); Modified: branches/arwinss/reactos/dll/win32/user32/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/misc.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -472,7 +472,7 @@ /*********************************************************************** * EnumDisplayMonitors (USER32.@) */ -BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC proc, LPARAM lp ) +BOOL WINAPI EnumDisplayMonitors( HDC hdc, LPCRECT rect, MONITORENUMPROC proc, LPARAM lp ) { return USER_Driver->pEnumDisplayMonitors( hdc, rect, proc, lp ); } Modified: branches/arwinss/reactos/dll/win32/user32/msgbox.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/msgbox.c [iso-8859-1] Sun Aug 1 12:50:40 2010 @@ -454,7 +454,7 @@ /************************************************************************** * MessageBoxIndirectA (USER32.@) */ -INT WINAPI MessageBoxIndirectA( LPMSGBOXPARAMSA msgbox ) +INT WINAPI MessageBoxIndirectA( CONST MSGBOXPARAMSA *msgbox ) { MSGBOXPARAMSW msgboxW; UNICODE_STRING textW, captionW, iconW; @@ -501,7 +501,7 @@ /************************************************************************** * MessageBoxIndirectW (USER32.@) */ -INT WINAPI MessageBoxIndirectW( LPMSGBOXPARAMSW msgbox ) +INT WINAPI MessageBoxIndirectW( CONST MSGBOXPARAMSW *msgbox ) { LPVOID tmplate; HRSRC hRes;

1 0

[fireball] 48392: - Fix include paths.
by fireball＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: fireball Date: Sun Aug 1 12:44:24 2010 New Revision: 48392 URL: http://svn.reactos.org/svn/reactos?rev=48392&view=rev Log: - Fix include paths. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/win32kp.h [iso-8859-1] Sun Aug 1 12:44:24 2010 @@ -24,8 +24,8 @@ #include <wine/list.h> /* RosGdi syscalls */ -#include <ntrosgdi.h> -#include <win32k/rosuser.h> +#include <wine/ntrosgdi.h> +#include <wine/rosuser.h> /* CSR interaction */ #include <csr.h>

1 0

[fireball] 48391: - Move arwinss-specific headers into reactos/wine include directory.
by fireball＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: fireball Date: Sun Aug 1 12:42:07 2010 New Revision: 48391 URL: http://svn.reactos.org/svn/reactos?rev=48391&view=rev Log: - Move arwinss-specific headers into reactos/wine include directory. Added: branches/arwinss/reactos/include/reactos/wine/ntrosgdi.h - copied unchanged from r48380, branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/include/reactos/wine/rosuser.h - copied unchanged from r48380, branches/arwinss/reactos/include/reactos/win32k/rosuser.h Removed: branches/arwinss/reactos/include/psdk/ntrosgdi.h branches/arwinss/reactos/include/reactos/win32k/rosuser.h Removed: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h (removed) @@ -1,173 +1,0 @@ -/* - * NtRosGdi Entrypoints - */ -#ifndef _NTROSGDI_ -#define _NTROSGDI_ - -#ifndef W32KAPI -#define W32KAPI DECLSPEC_ADDRSAFE -#endif - -typedef struct _NTDRV_PDEVICE -{ - HDC hUserDC; - HDC hKernelDC; - HRGN region; /* Device region (visible region & clip region) */ - int cache_index; /* cache of a currently selected font */ -} NTDRV_PDEVICE, *PNTDRV_PDEVICE; - -typedef struct _ROS_DCINFO -{ - WORD dwType; - SIZE szVportExt; - POINT ptVportOrg; - SIZE szWndExt; - POINT ptWndOrg; - XFORM xfWorld2Wnd; - XFORM xfWnd2Vport; -} ROS_DCINFO, *PROS_DCINFO; - -typedef struct -{ - LOGFONTW lf; - XFORM xform; - SIZE devsize; /* size in device coords */ - DWORD hash; -} LFANDSIZE; - -typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVALUE } AA_Type; - -typedef struct -{ - int xOff; - int yOff; - int width; - int height; - int x; - int y; -} GlyphInfo; - -typedef struct -{ - //GlyphSet glyphset; - //XRenderPictFormat *font_format; - int nrealized; - BOOL *realized; - void **bitmaps; - GlyphInfo *gis; -} gsCacheEntryFormat; - -typedef struct -{ - LFANDSIZE lfsz; - AA_Type aa_default; - gsCacheEntryFormat * format[AA_MAXVALUE]; - INT count; - INT next; -} gsCacheEntry; - -/* bitmap.c */ - -BOOL APIENTRY RosGdiAlphaBlend(HDC devDst, INT xDst, INT yDst, INT widthDst, INT heightDst, - HDC devSrc, INT xSrc, INT ySrc, INT widthSrc, INT heightSrc, - BLENDFUNCTION blendfn); -BOOL APIENTRY RosGdiBitBlt( HDC physDevDst, INT xDst, INT yDst, - INT width, INT height, HDC physDevSrc, - INT xSrc, INT ySrc, DWORD rop ); -BOOL APIENTRY RosGdiCreateBitmap( HDC physDev, HBITMAP hBitmap, BITMAP *pBitmap, LPVOID bmBits ); -HBITMAP APIENTRY RosGdiCreateDIBSection( HDC physDev, HBITMAP hbitmap, - const BITMAPINFO *bmi, UINT usage, DIBSECTION *dib ); -BOOL APIENTRY RosGdiDeleteBitmap( HBITMAP hbitmap ); -LONG APIENTRY RosGdiGetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count ); -INT APIENTRY RosGdiGetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, UINT lines, - LPVOID bits, BITMAPINFO *info, UINT coloruse, DIBSECTION *dib ); -COLORREF APIENTRY RosGdiGetPixel( HDC physDev, INT x, INT y ); -BOOL APIENTRY RosGdiPatBlt( HDC physDev, INT left, INT top, INT width, INT height, DWORD rop ); -LONG APIENTRY RosGdiSetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count ); -UINT APIENTRY RosGdiSetDIBColorTable( HDC physDev, UINT start, UINT count, const RGBQUAD *colors ); -INT APIENTRY RosGdiSetDIBits( HDC physDev, HBITMAP hbitmap, UINT startscan, - UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse ); -INT APIENTRY RosGdiSetDIBitsToDevice( HDC physDev, INT xDest, INT yDest, DWORD cx, - DWORD cy, INT xSrc, INT ySrc, - UINT startscan, UINT lines, LPCVOID bits, - const BITMAPINFO *info, UINT coloruse ); -BOOL APIENTRY RosGdiStretchBlt( HDC physDevDst, INT xDst, INT yDst, - INT widthDst, INT heightDst, - HDC physDevSrc, INT xSrc, INT ySrc, - INT widthSrc, INT heightSrc, DWORD rop ); - -/* dc.c */ -BOOL APIENTRY RosGdiCreateDC( PROS_DCINFO dc, HDC *pdev, LPCWSTR driver, LPCWSTR device, - LPCWSTR output, const DEVMODEW* initData ); -BOOL APIENTRY RosGdiDeleteDC( HDC physDev ); -BOOL APIENTRY RosGdiGetDCOrgEx( HDC physDev, LPPOINT lpp ); -BOOL APIENTRY RosGdiPaintRgn( HDC physDev, HRGN hrgn ); -BOOL APIENTRY RosGdiSelectBitmap( HDC physDev, HBITMAP hbitmap, BOOL stock ); -VOID APIENTRY RosGdiSelectBrush( HDC physDev, LOGBRUSH *pLogBrush ); -HFONT APIENTRY RosGdiSelectFont( HDC physDev, HFONT hfont, HANDLE gdiFont ); -VOID APIENTRY RosGdiSelectPen( HDC physDev, LOGPEN *pLogPen, EXTLOGPEN *pExtLogPen ); -COLORREF APIENTRY RosGdiSetBkColor( HDC physDev, COLORREF color ); -COLORREF APIENTRY RosGdiSetDCBrushColor( HDC physDev, COLORREF crColor ); -DWORD APIENTRY RosGdiSetDCOrg( HDC physDev, INT x, INT y ); -VOID APIENTRY RosGdiSetBrushOrg( HDC physDev, INT x, INT y ); -COLORREF APIENTRY RosGdiSetDCPenColor( HDC physDev, COLORREF crColor ); -void APIENTRY RosGdiSetDeviceClipping( HDC physDev, UINT count, PRECTL pRects, PRECTL rcBounds ); -BOOL APIENTRY RosGdiSetDeviceGammaRamp(HDC physDev, LPVOID ramp); -COLORREF APIENTRY RosGdiSetPixel( HDC physDev, INT x, INT y, COLORREF color ); -BOOL APIENTRY RosGdiSetPixelFormat(HDC physDev, - int iPixelFormat, - const PIXELFORMATDESCRIPTOR *ppfd); -COLORREF APIENTRY RosGdiSetTextColor( HDC physDev, COLORREF color ); -VOID APIENTRY RosGdiSetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDcRects( HDC physDev, RECT *rcDcRect, RECT *rcVport ); -VOID APIENTRY RosGdiGetDC( HDC physDev, HWND hwnd, BOOL clipChildren ); -VOID APIENTRY RosGdiReleaseDC( HDC physDev ); - -/* enum.c */ -int APIENTRY RosGdiChoosePixelFormat(HDC physDev, - const PIXELFORMATDESCRIPTOR *ppfd); -int APIENTRY RosGdiDescribePixelFormat(HDC physDev, - int iPixelFormat, - UINT nBytes, - PIXELFORMATDESCRIPTOR *ppfd); -BOOL APIENTRY RosGdiEnumDeviceFonts( HDC physDev, LPLOGFONTW plf, - FONTENUMPROCW proc, LPARAM lp ); -BOOL APIENTRY RosGdiGetCharWidth( HDC physDev, UINT firstChar, UINT lastChar, - LPINT buffer ); -INT APIENTRY RosGdiGetDeviceCaps( HDC physDev, INT cap ); -BOOL APIENTRY RosGdiGetDeviceGammaRamp(HDC physDev, LPVOID ramp); -BOOL APIENTRY RosGdiGetICMProfile( HDC physDev, LPDWORD size, LPWSTR filename ); -COLORREF APIENTRY RosGdiGetNearestColor( HDC physDev, COLORREF color ); -int APIENTRY RosGdiGetPixelFormat(HDC physDev); -UINT APIENTRY RosGdiGetSystemPaletteEntries( HDC physDev, UINT start, UINT count, - LPPALETTEENTRY entries ); -BOOL APIENTRY RosGdiGetTextExtentExPoint( HDC physDev, LPCWSTR str, INT count, - INT maxExt, LPINT lpnFit, LPINT alpDx, LPSIZE size ); -BOOL APIENTRY RosGdiGetTextMetrics(HDC physDev, TEXTMETRICW *metrics); - -/* misc.c */ -BOOL APIENTRY RosGdiArc( HDC physDev, INT left, INT top, INT right, INT bottom, - INT xstart, INT ystart, INT xend, INT yend, ARCTYPE arc ); -BOOL APIENTRY RosGdiEllipse( HDC physDev, INT left, INT top, INT right, INT bottom ); -INT APIENTRY RosGdiExtEscape( HDC physDev, INT escape, INT in_count, LPCVOID in_data, - INT out_count, LPVOID out_data ); -BOOL APIENTRY RosGdiExtFloodFill( HDC physDev, INT x, INT y, COLORREF color, - UINT fillType ); -BOOL APIENTRY RosGdiExtTextOut( HDC physDev, INT x, INT y, UINT flags, - const RECT *lprect, LPCWSTR wstr, UINT count, - const INT *lpDx, gsCacheEntryFormat *formatEntry, - AA_Type aa_type ); -BOOL APIENTRY RosGdiLineTo( HDC physDev, INT x1, INT y1, INT x2, INT y2 ); -BOOL APIENTRY RosGdiPolyPolygon( HDC physDev, const POINT* pt, const INT* counts, UINT polygons); -BOOL APIENTRY RosGdiPolyPolyline( HDC physDev, const POINT* pt, const DWORD* counts, DWORD polylines ); -BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pt, INT count ); -BOOL APIENTRY RosGdiPolyline( HDC physDev, const POINT* pt, INT count ); -UINT APIENTRY RosGdiRealizeDefaultPalette( HDC physDev ); -UINT APIENTRY RosGdiRealizePalette( HDC physDev, HPALETTE hpal, BOOL primary ); -BOOL APIENTRY RosGdiRectangle(HDC physDev, PRECT rc); -BOOL APIENTRY RosGdiRoundRect( HDC physDev, INT left, INT top, INT right, - INT bottom, INT ell_width, INT ell_height ); -BOOL APIENTRY RosGdiSwapBuffers(HDC physDev); -BOOL APIENTRY RosGdiUnrealizePalette( HPALETTE hpal ); - -#endif Removed: branches/arwinss/reactos/include/reactos/win32k/rosuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… ============================================================================== --- branches/arwinss/reactos/include/reactos/win32k/rosuser.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/reactos/win32k/rosuser.h (removed) @@ -1,191 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Win32 Graphical Subsystem (WIN32K) - * FILE: include/win32k/rosuser.h - * PURPOSE: Win32 Shared USER Types for RosUser* - * PROGRAMMER: Aleksey Bragin <aleksey(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#ifndef __WIN32K_ROSUSER_H -#define __WIN32K_ROSUSER_H - -/* DEFINES *******************************************************************/ - -/* ENUMERATIONS **************************************************************/ - -/* TYPES *********************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -#if 0 -BOOL -NTAPI -RosUserEnumDisplayMonitors( - HDC hdc, - LPRECT rect, - MONITORENUMPROC proc, - LPARAM lp -); - -BOOL -NTAPI -RosUserGetMonitorInfo( - HMONITOR handle, - LPMONITORINFO info -); -#endif - -BOOL NTAPI -RosUserGetCursorPos( LPPOINT pt ); - -BOOL NTAPI -RosUserSetCursorPos( INT x, INT y ); - -BOOL NTAPI -RosUserClipCursor( LPCRECT clip ); - -#if 0 -void NTAPI -RosUserSetCursor( ICONINFO* IconInfo ); - -VOID APIENTRY -RosUserCreateCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle); - -VOID APIENTRY -RosUserDestroyCursorIcon(ICONINFO* IconInfoUnsafe, - HCURSOR Handle); -#endif - -VOID -APIENTRY -RosUserSetCursor( ICONINFO* IconInfoUnsafe ); - -LONG -APIENTRY -RosUserChangeDisplaySettings( - PUNICODE_STRING lpszDeviceName, - LPDEVMODEW lpDevMode, - HWND hwnd, - DWORD dwflags, - LPVOID lParam); - -INT -APIENTRY -RosUserEnumDisplayMonitors( - OPTIONAL OUT HMONITOR *hMonitorList, - OPTIONAL OUT PRECTL monitorRectList, - OPTIONAL IN DWORD listSize); - -NTSTATUS -APIENTRY -RosUserEnumDisplaySettings( - PUNICODE_STRING pusDeviceName, - DWORD iModeNum, - LPDEVMODEW lpDevMode, - DWORD dwFlags ); - -BOOL -APIENTRY -RosUserGetMonitorInfo( - IN HMONITOR hMonitor, - OUT LPMONITORINFO pMonitorInfo); - -HKL -APIENTRY -RosUserGetKeyboardLayout( - DWORD dwThreadId); - -BOOL -APIENTRY -RosUserGetKeyboardLayoutName( - LPWSTR lpszName); - -HKL -APIENTRY -RosUserLoadKeyboardLayoutEx( - IN HANDLE Handle, - IN DWORD offTable, - IN PUNICODE_STRING puszKeyboardName, - IN HKL hKL, - IN PUNICODE_STRING puszKLID, - IN DWORD dwKLID, - IN UINT Flags); - -HKL -APIENTRY -RosUserActivateKeyboardLayout( - HKL hKl, - ULONG Flags); - -BOOL -APIENTRY -RosUserUnloadKeyboardLayout( - HKL hKl); - -DWORD -APIENTRY -RosUserVkKeyScanEx( - WCHAR wChar, - HKL hKeyboardLayout, - BOOL UsehKL ); - -DWORD -APIENTRY -RosUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); - -int -APIENTRY -RosUserToUnicodeEx( - UINT wVirtKey, - UINT wScanCode, - PBYTE lpKeyState, - LPWSTR pwszBuff, - int cchBuff, - UINT wFlags, - HKL dwhkl ); - -UINT -APIENTRY -RosUserMapVirtualKeyEx( UINT Code, UINT Type, DWORD keyboardId, HKL dwhkl ); - -SHORT -APIENTRY -RosUserGetAsyncKeyState( - INT key); - -BOOL -APIENTRY -RosUserSetAsyncKeyboardState(BYTE key_state_table[]); - -BOOL -APIENTRY -RosUserGetAsyncKeyboardState(BYTE key_state_table[]); - -VOID NTAPI -SwmAddWindow(HWND hWnd, RECT *WindowRect, DWORD style, DWORD ex_style); - -VOID NTAPI -SwmAddDesktopWindow(HWND hWnd, UINT Width, UINT Height); - -VOID NTAPI -SwmRemoveWindow(HWND hWnd); - -VOID NTAPI -SwmSetForeground(HWND hWnd); - -VOID NTAPI -SwmPosChanging(HWND hWnd, const RECT *WindowRect); - -VOID NTAPI -SwmPosChanged(HWND hWnd, const RECT *WindowRect, const RECT *OldRect, HWND hWndAfter, UINT SwpFlags); - -HWND NTAPI -SwmGetWindowFromPoint(LONG x, LONG y); - -VOID NTAPI -SwmShowWindow(HWND hWnd, BOOLEAN Show, UINT SwpFlags); - -#endif /* __WIN32K_NTUSER_H */

1 0

[jgardou] 48390: [WIN32K] - Revert unwanted change and get back to PAL_BGR for default DIB palette mode. Now yarotows looks like an OS again.
by jgardou＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: jgardou Date: Sun Aug 1 12:24:04 2010 New Revision: 48390 URL: http://svn.reactos.org/svn/reactos?rev=48390&view=rev Log: [WIN32K] - Revert unwanted change and get back to PAL_BGR for default DIB palette mode. Now yarotows looks like an OS again. Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Aug 1 12:24:04 2010 @@ -1741,16 +1741,7 @@ } else { - if((pdwColors[0] == 0x0000FF) /* R */ - && (pdwColors[1] == 0x00FF00) /* G */ - && (pdwColors[2] == 0xFF0000))/* B */ - { - paletteType = PAL_BGR; - } - else - { - paletteType == PAL_RGB; - } + paletteType = PAL_BGR; } if (bmi->bmiHeader.biClrUsed == 0)

1 0

[jgardou] 48389: [WIN32K] - Finally get rid of ProbeAndConvertToBitmapV5Info - Rewrite renderBITMAPfromDIB, and a good bunch of DIB related functions accordingly. - Rewrite BITMAP_CopyBitmap into something simpler. - Use already existing DIB functions in IntGdiCreateDIBBrush - Use DIB sections in NtGdiStretchDIBitsInternal and NtGdiSetDIBits. - Use Bitmap hdc for NtGdiGetDIBitsInternal if there is one.
by jgardou＠svn.reactos.org 01 Aug '10

01 Aug '10

Author: jgardou Date: Sun Aug 1 12:17:35 2010 New Revision: 48389 URL: http://svn.reactos.org/svn/reactos?rev=48389&view=rev Log: [WIN32K] - Finally get rid of ProbeAndConvertToBitmapV5Info - Rewrite renderBITMAPfromDIB, and a good bunch of DIB related functions accordingly. - Rewrite BITMAP_CopyBitmap into something simpler. - Use already existing DIB functions in IntGdiCreateDIBBrush - Use DIB sections in NtGdiStretchDIBitsInternal and NtGdiSetDIBits. - Use Bitmap hdc for NtGdiGetDIBitsInternal if there is one. Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -13,7 +13,6 @@ HBITMAP FASTCALL BITMAP_CopyBitmap (HBITMAP hBitmap); UINT FASTCALL BITMAP_GetRealBitsPixel(UINT nBitsPixel); INT FASTCALL BITMAP_GetWidthBytes (INT bmWidth, INT bpp); -NTSTATUS FASTCALL ProbeAndConvertToBitmapV5Info( OUT PBITMAPV5INFO pbmiDst, IN CONST BITMAPINFO* pbmiUnsafe, IN DWORD dwUse, UINT MaxSize); HBITMAP APIENTRY @@ -43,7 +42,7 @@ IN INT cy, IN DWORD fInit, IN OPTIONAL LPBYTE pjInit, - IN OPTIONAL PBITMAPV5INFO pbmi, + IN OPTIONAL PBITMAPINFO pbmi, IN DWORD iUsage, IN FLONG fl, IN HANDLE hcmXform); Modified: branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/include/dib.h [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -13,11 +13,11 @@ DIB_GetDIBImageBytes (INT width, INT height, INT depth); INT FASTCALL DIB_GetDIBWidthBytes (INT width, INT depth); -RGBQUAD * FASTCALL -DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi); +HPALETTE FASTCALL +DIB_MapPaletteColors(PPALETTE ppal, CONST BITMAPINFO* lpbmi); HPALETTE FASTCALL -BuildDIBPalette (CONST BITMAPINFO *bmi, PINT paletteType); +BuildDIBPalette (CONST BITMAPINFO *bmi); BITMAPINFO* FASTCALL DIB_ConvertBitmapInfo(CONST BITMAPINFO* bmi, DWORD Usage); VOID FASTCALL DIB_FreeConvertedBitmapInfo(BITMAPINFO* converted, BITMAPINFO* orig); Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -247,9 +247,11 @@ { HDC hdc; HBITMAP hbitmap; - unsigned int offset = 0; /* Stupid compiler */ - BITMAPV5INFO bmi; + PBITMAPINFO pBmi, pConvertedBmi = NULL; NTSTATUS Status ; + UINT offset = 0; /* Stupid compiler */ + + pBmi = (BITMAPINFO*)pDIB; //hdc = UserGetDCEx(NULL, NULL, DCX_USESTYLE); hdc = UserGetDCEx(ClipboardWindow, NULL, DCX_USESTYLE); @@ -257,9 +259,19 @@ /* Probe it */ _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmi, (BITMAPINFO*)pDIB, DIB_RGB_COLORS, 0); - offset = DIB_BitmapInfoSize((BITMAPINFO*)pDIB, DIB_RGB_COLORS); - ProbeForRead(pDIB + offset, bmi.bmiHeader.bV5SizeImage, 1); + ProbeForRead(&pBmi->bmiHeader.biSize, sizeof(DWORD), 1); + ProbeForRead(pBmi, pBmi->bmiHeader.biSize, 1); + ProbeForRead(pBmi, DIB_BitmapInfoSize(pBmi, DIB_RGB_COLORS), 1); + pConvertedBmi = DIB_ConvertBitmapInfo(pBmi, DIB_RGB_COLORS); + if(!pConvertedBmi) + { + Status = STATUS_INVALID_PARAMETER; + } + else + { + offset = DIB_BitmapInfoSize((BITMAPINFO*)pBmi, DIB_RGB_COLORS); + ProbeForRead(pDIB + offset, pConvertedBmi->bmiHeader.biSizeImage, 1); + } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -274,16 +286,18 @@ } hbitmap = GreCreateDIBitmapInternal(hdc, - bmi.bmiHeader.bV5Width, - bmi.bmiHeader.bV5Height, + pConvertedBmi->bmiHeader.biWidth, + pConvertedBmi->bmiHeader.biHeight, CBM_INIT, pDIB+offset, - &bmi, + pConvertedBmi, DIB_RGB_COLORS, 0, 0); //UserReleaseDC(NULL, hdc, FALSE); UserReleaseDC(ClipboardWindow, hdc, FALSE); + + DIB_FreeConvertedBitmapInfo(pConvertedBmi, pBmi); return hbitmap; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -1325,12 +1325,10 @@ if(bAlpha && (diFlags & DI_IMAGE)) { BLENDFUNCTION pixelblend = { AC_SRC_OVER, 0, 255, AC_SRC_ALPHA }; - DWORD Pixel; - BYTE Red, Green, Blue, Alpha; - DWORD Count = 0; + BYTE Alpha; INT i, j; PSURFACE psurf; - PBYTE pBits ; + PBYTE pBits, ptr ; HBITMAP hMemBmp = NULL; pBits = ExAllocatePoolWithTag(PagedPool, @@ -1363,20 +1361,15 @@ /* premultiply with the alpha channel value */ for (i = 0; i < abs(bmpColor.bmHeight); i++) { - Count = i*bmpColor.bmWidthBytes; + ptr = pBits + i*bmpColor.bmWidthBytes; for (j = 0; j < bmpColor.bmWidth; j++) { - Pixel = *(DWORD *)(pBits + Count); - - Alpha = ((BYTE)(Pixel >> 24) & 0xff); - - Red = (((BYTE)(Pixel >> 0)) * Alpha) / 0xff; - Green = (((BYTE)(Pixel >> 8)) * Alpha) / 0xff; - Blue = (((BYTE)(Pixel >> 16)) * Alpha) / 0xff; - - *(DWORD *)(pBits + Count) = (DWORD)(Red | (Green << 8) | (Blue << 16) | (Alpha << 24)); - - Count += sizeof(DWORD); + Alpha = ptr[3]; + ptr[0] *= Alpha / 0xff; + ptr[1] *= Alpha / 0xff; + ptr[2] *= Alpha / 0xff; + + ptr += 4; } } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -912,7 +912,7 @@ return 0; } - Bitmap = GDIOBJ_LockObj(hBitmap, GDI_OBJECT_TYPE_BITMAP); + Bitmap = SURFACE_LockSurface(hBitmap); if (Bitmap == NULL) { return 0; @@ -925,40 +925,22 @@ Size.cx = abs(bm.bmWidth); Size.cy = abs(bm.bmHeight); - res = GreCreateBitmap(abs(bm.bmWidth), - abs(bm.bmHeight), - 1, - bm.bmBitsPixel, - NULL); + res = GreCreateBitmapEx(Size.cx, + Size.cy, + bm.bmWidthBytes, + Bitmap->SurfObj.iBitmapFormat, + Bitmap->SurfObj.fjBitmap, + Bitmap->SurfObj.cjBits, + NULL); + if (res) { - PBYTE buf; - - resBitmap = GDIOBJ_LockObj(res, GDI_OBJECT_TYPE_BITMAP); + resBitmap = SURFACE_LockSurface(res); if (resBitmap) { - buf = ExAllocatePoolWithTag(PagedPool, - bm.bmWidthBytes * abs(bm.bmHeight), - TAG_BITMAP); - if (buf == NULL) - { - GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); - GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); - GreDeleteObject(res); - return 0; - } - IntGetBitmapBits(Bitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - IntSetBitmapBits(resBitmap, bm.bmWidthBytes * abs(bm.bmHeight), buf); - ExFreePoolWithTag(buf,TAG_BITMAP); - resBitmap->flags = Bitmap->flags; - /* Copy palette */ - if (Bitmap->ppal) - { - resBitmap->ppal = Bitmap->ppal ; - GDIOBJ_IncrementShareCount(&Bitmap->ppal->BaseObject); - } - GDIOBJ_UnlockObjByPtr((POBJ)resBitmap); + IntSetBitmapBits(resBitmap, Bitmap->SurfObj.cjBits, Bitmap->SurfObj.pvBits); + SURFACE_UnlockSurface(resBitmap); } else { @@ -967,7 +949,7 @@ } } - GDIOBJ_UnlockObjByPtr((POBJ)Bitmap); + SURFACE_UnlockSurface(Bitmap); return res; } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/brush.c [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -244,129 +244,6 @@ return sizeof(LOGBRUSH); } -/** - * @name CalculateColorTableSize - * - * Internal routine to calculate the number of color table entries. - * - * @param BitmapInfoHeader - * Input bitmap information header, can be any version of - * BITMAPINFOHEADER or BITMAPCOREHEADER. - * - * @param ColorSpec - * Pointer to variable which specifiing the color mode (DIB_RGB_COLORS - * or DIB_RGB_COLORS). On successful return this value is normalized - * according to the bitmap info. - * - * @param ColorTableSize - * On successful return this variable is filled with number of - * entries in color table for the image with specified parameters. - * - * @return - * TRUE if the input values together form a valid image, FALSE otherwise. - */ -BOOL -APIENTRY -CalculateColorTableSize( - CONST BITMAPINFOHEADER *BitmapInfoHeader, - UINT *ColorSpec, - UINT *ColorTableSize) -{ - WORD BitCount; - DWORD ClrUsed; - DWORD Compression; - - /* - * At first get some basic parameters from the passed BitmapInfoHeader - * structure. It can have one of the following formats: - * - BITMAPCOREHEADER (the oldest one with totally different layout - * from the others) - * - BITMAPINFOHEADER (the standard and most common header) - * - BITMAPV4HEADER (extension of BITMAPINFOHEADER) - * - BITMAPV5HEADER (extension of BITMAPV4HEADER) - */ - if (BitmapInfoHeader->biSize == sizeof(BITMAPCOREHEADER)) - { - BitCount = ((LPBITMAPCOREHEADER)BitmapInfoHeader)->bcBitCount; - ClrUsed = 0; - Compression = BI_RGB; - } - else - { - BitCount = BitmapInfoHeader->biBitCount; - ClrUsed = BitmapInfoHeader->biClrUsed; - Compression = BitmapInfoHeader->biCompression; - } - - switch (Compression) - { - case BI_BITFIELDS: - if (*ColorSpec == DIB_PAL_COLORS) - *ColorSpec = DIB_RGB_COLORS; - - if (BitCount != 16 && BitCount != 32) - return FALSE; - - /* For BITMAPV4HEADER/BITMAPV5HEADER the masks are included in - * the structure itself (bV4RedMask, bV4GreenMask, and bV4BlueMask). - * For BITMAPINFOHEADER the color masks are stored in the palette. */ - if (BitmapInfoHeader->biSize > sizeof(BITMAPINFOHEADER)) - *ColorTableSize = 0; - else - *ColorTableSize = 3; - - return TRUE; - - case BI_RGB: - switch (BitCount) - { - case 1: - *ColorTableSize = ClrUsed ? min(ClrUsed, 2) : 2; - return TRUE; - - case 4: - *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; - return TRUE; - - case 8: - *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; - return TRUE; - - default: - if (*ColorSpec == DIB_PAL_COLORS) - *ColorSpec = DIB_RGB_COLORS; - if (BitCount != 16 && BitCount != 24 && BitCount != 32) - return FALSE; - *ColorTableSize = ClrUsed; - return TRUE; - } - - case BI_RLE4: - if (BitCount == 4) - { - *ColorTableSize = ClrUsed ? min(ClrUsed, 16) : 16; - return TRUE; - } - return FALSE; - - case BI_RLE8: - if (BitCount == 8) - { - *ColorTableSize = ClrUsed ? min(ClrUsed, 256) : 256; - return TRUE; - } - return FALSE; - - case BI_JPEG: - case BI_PNG: - *ColorTableSize = ClrUsed; - return TRUE; - - default: - return FALSE; - } -} - HBRUSH APIENTRY IntGdiCreateDIBBrush( @@ -379,9 +256,7 @@ PBRUSH pbrush; HBITMAP hPattern; ULONG_PTR DataPtr; - UINT PaletteEntryCount; PSURFACE psurfPattern; - INT PaletteType; HPALETTE hpal ; if (BitmapInfo->bmiHeader.biSize < sizeof(BITMAPINFOHEADER)) @@ -390,20 +265,7 @@ return NULL; } - if (!CalculateColorTableSize(&BitmapInfo->bmiHeader, - &ColorSpec, - &PaletteEntryCount)) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return NULL; - } - - // FIXME: What about BI_BITFIELDS - DataPtr = (ULONG_PTR)BitmapInfo + BitmapInfo->bmiHeader.biSize; - if (ColorSpec == DIB_RGB_COLORS) - DataPtr += PaletteEntryCount * sizeof(RGBQUAD); - else - DataPtr += PaletteEntryCount * sizeof(USHORT); + DataPtr = (ULONG_PTR)BitmapInfo + DIB_BitmapInfoSize(BitmapInfo, ColorSpec); hPattern = GreCreateBitmap(BitmapInfo->bmiHeader.biWidth, BitmapInfo->bmiHeader.biHeight, @@ -418,7 +280,8 @@ psurfPattern = SURFACE_LockSurface(hPattern); ASSERT(psurfPattern != NULL); - hpal = BuildDIBPalette(BitmapInfo, &PaletteType); + if(ColorSpec == DIB_PAL_COLORS) DPRINT1("FIXME, unsupported color spec!\n"); + hpal = BuildDIBPalette(BitmapInfo); psurfPattern->ppal = PALETTE_ShareLockPalette(hpal); /* Lazy delete palette, it will be freed when its shared reference is zeroed */ GreDeleteObject(hpal); Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Sun Aug 1 12:17:35 2010 @@ -262,115 +262,62 @@ UINT StartScan, UINT ScanLines, CONST VOID *Bits, - CONST BITMAPV5INFO *bmi, + CONST BITMAPINFO *bmi, UINT ColorUse) { - SURFACE *bitmap; - HBITMAP SourceBitmap; + HBITMAP SourceBitmap, hOldSrcBmp = NULL, hOldDstBmp = NULL; + HDC hdcSrc, hdcDst; INT result = 0; - BOOL copyBitsResult; - SURFOBJ *DestSurf, *SourceSurf; - SIZEL SourceSize; - POINTL ZeroPoint; - RECTL DestRect; - EXLATEOBJ exlo; - PPALETTE ppalDIB; - //RGBQUAD *lpRGB; - HPALETTE DIB_Palette; - ULONG DIB_Palette_Type; - INT DIBWidth; - - // Check parameters - if (!(bitmap = SURFACE_LockSurface(hBitmap))) - { - return 0; - } - - // Get RGB values - //if (ColorUse == DIB_PAL_COLORS) - // lpRGB = DIB_MapPaletteColors(hDC, bmi); - //else - // lpRGB = &bmi->bmiColors; - - DestSurf = &bitmap->SurfObj; - - // Create source surface - SourceSize.cx = bmi->bmiHeader.bV5Width; - SourceSize.cy = ScanLines; - - // Determine width of DIB - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.bV5BitCount); - - SourceBitmap = EngCreateBitmap(SourceSize, - DIBWidth, - BitmapFormat(bmi->bmiHeader.bV5BitCount, bmi->bmiHeader.bV5Compression), - bmi->bmiHeader.bV5Height < 0 ? BMF_TOPDOWN : 0, - (PVOID) Bits); - if (0 == SourceBitmap) - { - SURFACE_UnlockSurface(bitmap); + PVOID pvBits; + + SourceBitmap = DIB_CreateDIBSection(DC, bmi, ColorUse, &pvBits, NULL, 0, 0); + if (0 == SourceBitmap) + { + DPRINT1("Error : Could not create a DIBSection.\n"); SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return 0; } - SourceSurf = EngLockSurface((HSURF)SourceBitmap); - if (NULL == SourceSurf) - { - EngDeleteSurface((HSURF)SourceBitmap); - SURFACE_UnlockSurface(bitmap); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return 0; - } - - ASSERT(bitmap->ppal); - - // Source palette obtained from the BITMAPINFO - DIB_Palette = BuildDIBPalette((BITMAPINFO*)bmi, (PINT)&DIB_Palette_Type); - if (NULL == DIB_Palette) - { - EngUnlockSurface(SourceSurf); - EngDeleteSurface((HSURF)SourceBitmap); - SURFACE_UnlockSurface(bitmap); - SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); - return 0; - } - - ppalDIB = PALETTE_LockPalette(DIB_Palette); - - /* Initialize XLATEOBJ for color translation */ - EXLATEOBJ_vInitialize(&exlo, ppalDIB, bitmap->ppal, 0, 0, 0); - - // Zero point - ZeroPoint.x = 0; - ZeroPoint.y = 0; - - // Determine destination rectangle - DestRect.left = 0; - DestRect.top = abs(bmi->bmiHeader.bV5Height) - StartScan - ScanLines; - DestRect.right = SourceSize.cx; - DestRect.bottom = DestRect.top + ScanLines; - - copyBitsResult = IntEngCopyBits(DestSurf, SourceSurf, NULL, &exlo.xlo, &DestRect, &ZeroPoint); - - // If it succeeded, return number of scanlines copies - if (copyBitsResult == TRUE) - { - result = SourceSize.cy; -// or -// result = abs(bmi->bmiHeader.biHeight) - StartScan; - } - - // Clean up - EXLATEOBJ_vCleanup(&exlo); - PALETTE_UnlockPalette(ppalDIB); - PALETTE_FreePaletteByHandle(DIB_Palette); - EngUnlockSurface(SourceSurf); - EngDeleteSurface((HSURF)SourceBitmap); - -// if (ColorUse == DIB_PAL_COLORS) -// WinFree((LPSTR)lpRGB); - - SURFACE_UnlockSurface(bitmap); + RtlCopyMemory(pvBits, Bits, DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + bmi->bmiHeader.biHeight, + bmi->bmiHeader.biBitCount)); + + hdcSrc = NtGdiCreateCompatibleDC(0); + hdcDst = NtGdiCreateCompatibleDC(0); + + if(!(hdcSrc && hdcDst)) + { + DPRINT1("Error, could not create memory DCs.\n"); + goto cleanup; + } + + hOldSrcBmp = NtGdiSelectBitmap(hdcSrc, SourceBitmap); + hOldDstBmp = NtGdiSelectBitmap(hdcDst, hBitmap); + + if(!(hOldSrcBmp && hOldDstBmp)) + { + DPRINT1("Error : Could not select bitmaps into DCs\n"); + goto cleanup; + } + + result = NtGdiBitBlt(hdcDst, 0, 0, bmi->bmiHeader.biWidth, ScanLines, hdcSrc, 0, StartScan, + SRCCOPY, 0, 0); + + if(result) + result = ScanLines; + +cleanup: + if(hdcSrc) + { + if(hOldSrcBmp) NtGdiSelectBitmap(hdcSrc, hOldSrcBmp); + NtGdiDeleteObjectApp(hdcSrc); + } + if(hdcDst) + { + if(hOldDstBmp) NtGdiSelectBitmap(hdcDst, hOldDstBmp); + NtGdiDeleteObjectApp(hdcDst); + } + GreDeleteObject(SourceBitmap); return result; } @@ -392,14 +339,19 @@ PDC Dc; INT Ret; NTSTATUS Status = STATUS_SUCCESS; - BITMAPV5INFO bmiLocal; if (!Bits) return 0; _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, 0); - ProbeForRead(Bits, bmiLocal.bmiHeader.bV5SizeImage, 1); + ProbeForRead(&bmi->bmiHeader.biSize, sizeof(DWORD), 1); + ProbeForRead(bmi, bmi->bmiHeader.biSize, 1); + ProbeForRead(bmi, DIB_BitmapInfoSize(bmi, ColorUse), 1); + ProbeForRead(Bits, + DIB_GetDIBImageBytes(bmi->bmiHeader.biWidth, + ScanLines, + bmi->bmiHeader.biBitCount), + 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -424,7 +376,7 @@ return 0; } - Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, &bmiLocal, ColorUse); + Ret = IntSetDIBits(Dc, hBitmap, StartScan, ScanLines, Bits, bmi, ColorUse); DC_UnlockDc(Dc); @@ -465,14 +417,12 @@ EXLATEOBJ exlo; PPALETTE ppalDIB = NULL; HPALETTE hpalDIB = NULL; - ULONG DIBPaletteType; - BITMAPV5INFO bmiLocal ; if (!Bits) return 0; _SEH2_TRY { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, bmi, ColorUse, cjMaxInfo); + ProbeForRead(bmi, cjMaxInfo, 1); ProbeForRead(Bits, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -502,7 +452,7 @@ pDestSurf = pSurf ? &pSurf->SurfObj : NULL; - ScanLines = min(ScanLines, abs(bmiLocal.bmiHeader.bV5Height) - StartScan); + ScanLines = min(ScanLines, abs(bmi->bmiHeader.biHeight) - StartScan); rcDest.left = XDest; rcDest.top = YDest; @@ -519,16 +469,16 @@ ptSource.x = XSrc; ptSource.y = YSrc; - SourceSize.cx = bmiLocal.bmiHeader.bV5Width; + SourceSize.cx = bmi->bmiHeader.biWidth; SourceSize.cy = ScanLines; - DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmiLocal.bmiHeader.bV5BitCount); + DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); hSourceBitmap = EngCreateBitmap(SourceSize, DIBWidth, - BitmapFormat(bmiLocal.bmiHeader.bV5BitCount, - bmiLocal.bmiHeader.bV5Compression), - bmiLocal.bmiHeader.bV5Height < 0 ? BMF_TOPDOWN : 0, + BitmapFormat(bmi->bmiHeader.biBitCount, + bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, (PVOID) Bits); if (!hSourceBitmap) { @@ -547,7 +497,7 @@ ASSERT(pSurf->ppal); /* Create a palette for the DIB */ - hpalDIB = BuildDIBPalette((PBITMAPINFO)&bmiLocal, (PINT)&DIBPaletteType); + hpalDIB = BuildDIBPalette(bmi); if (!hpalDIB) { SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); @@ -697,13 +647,6 @@ ScanLines = 0; goto done; } - /* Must not be selected */ - if(psurf->hdc != NULL) - { - ScanLines = 0; - SetLastWin32Error(ERROR_INVALID_PARAMETER); - goto done; - } /* Fill in the structure */ switch(bpp) @@ -948,13 +891,14 @@ } break; } + Info->bmiHeader.biSizeImage = DIB_GetDIBImageBytes(width, height, bpp); if(Bits && ScanLines) { /* Create a DIBSECTION, blt it, profit */ PVOID pDIBits ; HBITMAP hBmpDest, hOldDest = NULL, hOldSrc = NULL; - HDC hdcDest, hdcSrc; + HDC hdcDest = NULL, hdcSrc; BOOL ret ; if (StartScan > psurf->SurfObj.sizlBitmap.cy) @@ -977,22 +921,38 @@ goto done ; } + if(psurf->hdc) + hdcSrc = psurf->hdc; + else + { + hdcSrc = NtGdiCreateCompatibleDC(0); + if(!hdcSrc) + { + DPRINT1("Error: could not create HDC!\n"); + ScanLines = 0; + goto cleanup_blt; + } + hOldSrc = NtGdiSelectBitmap(hdcSrc, hBitmap); + if(!hOldSrc) + { + DPRINT1("Error : Could not Select bitmap\n"); + ScanLines = 0; + goto cleanup_blt; + } + } + hdcDest = NtGdiCreateCompatibleDC(0); - hdcSrc = NtGdiCreateCompatibleDC(0); - - if(!(hdcSrc && hdcDest)) + if(!hdcDest) { - DPRINT1("Error: could not create HDCs!\n"); + DPRINT1("Error: could not create HDC!\n"); ScanLines = 0; goto cleanup_blt; } - hOldDest = NtGdiSelectBitmap(hdcDest, hBmpDest); - hOldSrc = NtGdiSelectBitmap(hdcSrc, hBitmap); - - if(!(hOldDest && hOldSrc)) + if(!hOldDest) { - DPRINT1("Error : Could not Select bitmaps\n"); + DPRINT1("Error : Could not Select bitmap\n"); + ScanLines = 0; goto cleanup_blt; } @@ -1035,7 +995,7 @@ } cleanup_blt: - if(hdcSrc) + if(hdcSrc && (hdcSrc != psurf->hdc)) { if(hOldSrc) NtGdiSelectBitmap(hdcSrc, hOldSrc); NtGdiDeleteObjectApp(hdcSrc); @@ -1079,11 +1039,10 @@ HANDLE hcmXform) { HBITMAP hBitmap, hOldBitmap = NULL; - HDC hdcMem; - HPALETTE hPal = NULL; - PDC pDC; - NTSTATUS Status; - BITMAPV5INFO bmiLocal ; + HDC hdcMem = NULL; + NTSTATUS Status = STATUS_SUCCESS; + PVOID pvDIBits; + INT Ret = 0; if (!Bits || !BitsInfo) { @@ -1091,101 +1050,82 @@ return 0; } - _SEH2_TRY - { - Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, BitsInfo, Usage, cjMaxInfo); - ProbeForRead(Bits, cjMaxBits, 1); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END - - if (!NT_SUCCESS(Status)) - { - DPRINT1("NtGdiStretchDIBitsInternal fail to read BitMapInfo: %x or Bits: %x\n",BitsInfo,Bits); - return 0; - } - - hdcMem = NtGdiCreateCompatibleDC(hDC); - if (hdcMem == NULL) - { - DPRINT1("NtGdiCreateCompatibleDC fail create hdc\n"); - return 0; - } - - hBitmap = NtGdiCreateCompatibleBitmap(hDC, - abs(bmiLocal.bmiHeader.bV5Width), - abs(bmiLocal.bmiHeader.bV5Height)); - if (hBitmap == NULL) - { - DPRINT1("NtGdiCreateCompatibleBitmap fail create bitmap\n"); - DPRINT1("hDC : 0x%08x \n", hDC); - DPRINT1("BitsInfo->bmiHeader.biWidth : 0x%08x \n", BitsInfo->bmiHeader.biWidth); - DPRINT1("BitsInfo->bmiHeader.biHeight : 0x%08x \n", BitsInfo->bmiHeader.biHeight); - return 0; - } - - /* Select the bitmap into hdcMem, and save a handle to the old bitmap */ - hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); - - if (Usage == DIB_PAL_COLORS) - { - hPal = NtGdiGetDCObject(hDC, GDI_OBJECT_TYPE_PALETTE); - hPal = GdiSelectPalette(hdcMem, hPal, FALSE); - } - - if (bmiLocal.bmiHeader.bV5Compression == BI_RLE4 || - bmiLocal.bmiHeader.bV5Compression == BI_RLE8) - { - /* copy existing bitmap from destination dc */ - if (SrcWidth == DestWidth && SrcHeight == DestHeight) - NtGdiBitBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, - SrcWidth, SrcHeight, hDC, XDest, YDest, ROP, 0, 0); - else - NtGdiStretchBlt(hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, - SrcWidth, SrcHeight, hDC, XDest, YDest, DestWidth, DestHeight, - ROP, 0); - } - - pDC = DC_LockDc(hdcMem); - if (pDC != NULL) - { - /* Note BitsInfo->bmiHeader.biHeight is the number of scanline, - * if it negitve we getting to many scanline for scanline is UINT not - * a INT, so we need make the negtive value to positve and that make the - * count correct for negtive bitmap, TODO : we need testcase for this api */ - IntSetDIBits(pDC, hBitmap, 0, abs(bmiLocal.bmiHeader.bV5Height), Bits, - &bmiLocal, Usage); - - DC_UnlockDc(pDC); - } - - - /* Origin for DIBitmap may be bottom left (positive biHeight) or top - left (negative biHeight) */ - if (SrcWidth == DestWidth && SrcHeight == DestHeight) - NtGdiBitBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, - ROP, 0, 0); - else - NtGdiStretchBlt(hDC, XDest, YDest, DestWidth, DestHeight, - hdcMem, XSrc, abs(bmiLocal.bmiHeader.bV5Height) - SrcHeight - YSrc, - SrcWidth, SrcHeight, ROP, 0); - - /* cleanup */ - if (hPal) - GdiSelectPalette(hdcMem, hPal, FALSE); - - if (hOldBitmap) - NtGdiSelectBitmap(hdcMem, hOldBitmap); - - NtGdiDeleteObjectApp(hdcMem); - - GreDeleteObject(hBitmap); - - return SrcHeight; + /* Create a DIB Section, data will be probed there */ + hBitmap = NtGdiCreateDIBSection(hDC, + NULL, + 0, + BitsInfo, + Usage, + 0, + 0, + 0, + &pvDIBits); + + if(!hBitmap) + { + DPRINT1("Failed to create a DIB.\n"); + return 0; + } + + _SEH2_TRY + { + ProbeForRead(Bits, cjMaxBits, 1); + RtlCopyMemory(pvDIBits, Bits, DIB_GetDIBImageBytes(BitsInfo->bmiHeader.biWidth, + BitsInfo->bmiHeader.biHeight, + BitsInfo->bmiHeader.biBitCount)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END + + if(!NT_SUCCESS(Status)) + { + DPRINT1("Error : Could not read DIB bits\n"); + SetLastNtError(Status); + goto cleanup; + } + + hdcMem = NtGdiCreateCompatibleDC(0); + if(!hdcMem) + { + DPRINT1("Failed to create a memory DC!"); + goto cleanup; + } + + hOldBitmap = NtGdiSelectBitmap(hdcMem, hBitmap); + if(!hOldBitmap) + { + DPRINT1("Could not select the DIB into the memory DC\n"); + goto cleanup; + } + + /* Do we want to stretch ? */ + if((SrcWidth == DestWidth) && (SrcHeight == DestHeight)) + { + Ret = NtGdiBitBlt(hDC, XDest, YDest, XDest + DestWidth, YDest + DestHeight, + hdcMem, XSrc, YSrc, ROP, 0, 0); + } + else + { + Ret = NtGdiStretchBlt(hDC, XDest, YDest, XDest + DestWidth, YDest + DestHeight, + hdcMem, XSrc, YSrc, XSrc + SrcWidth, YSrc + SrcHeight, + ROP, 0); + } + + if(Ret) + Ret = SrcHeight ; + +cleanup: + if(hdcMem) + { + if(hOldBitmap) NtGdiSelectBitmap(hdcMem, hOldBitmap); + NtGdiDeleteObjectApp(hdcMem); + } + GreDeleteObject(hBitmap); + + return Ret; } @@ -1198,7 +1138,7 @@ UINT bpp, DWORD init, LPBYTE bits, - PBITMAPV5INFO data, + PBITMAPINFO data, DWORD coloruse) { HBITMAP handle; @@ -1211,7 +1151,7 @@ else if ((coloruse != DIB_RGB_COLORS) || (init != CBM_INIT) || !data) fColor = FALSE; else { - const RGBQUAD *rgb = data->bmiColors; + const RGBQUAD *rgb = (RGBQUAD*)((PBYTE)data + data->bmiHeader.biSize); DWORD col = RGB(rgb->rgbRed, rgb->rgbGreen, rgb->rgbBlue); // Check if the first color of the colormap is black @@ -1268,12 +1208,11 @@ IN FLONG fl, IN HANDLE hcmXform) { - BITMAPV5INFO bmiLocal ; NTSTATUS Status = STATUS_SUCCESS; _SEH2_TRY { - if(pbmi) Status = ProbeAndConvertToBitmapV5Info(&bmiLocal, pbmi, iUsage, cjMaxInitInfo); + if(pbmi) ProbeForRead(pbmi, cjMaxInitInfo, 1); if(pjInit && (fInit == CBM_INIT)) ProbeForRead(pjInit, cjMaxBits, 1); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) @@ -1293,7 +1232,7 @@ cy, fInit, pjInit, - pbmi ? &bmiLocal : NULL, + pbmi, iUsage, fl, hcmXform); @@ -1307,7 +1246,7 @@ IN INT cy, IN DWORD fInit, IN OPTIONAL LPBYTE pjInit, - IN OPTIONAL PBITMAPV5INFO pbmi, + IN OPTIONAL PBITMAPINFO pbmi, IN DWORD iUsage, IN FLONG fl, IN HANDLE hcmXform) @@ -1339,7 +1278,7 @@ /* It's OK to set bpp=0 here, as IntCreateDIBitmap will create a compatible Bitmap * if bpp != 1 and ignore the real value that was passed */ if (pbmi) - bpp = pbmi->bmiHeader.bV5BitCount; + bpp = pbmi->bmiHeader.biBitCount; else bpp = 0; Bmp = IntCreateDIBitmap(Dc, cx, cy, bpp, fInit, pjInit, pbmi, iUsage); @@ -1435,7 +1374,6 @@ SURFACE *bmp = NULL; void *mapBits = NULL; HPALETTE hpal ; - INT palMode = PAL_INDEXED; // Fill BITMAP32 structure with DIB data CONST BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1527,24 +1465,18 @@ { PPALETTE pdcPal ; pdcPal = PALETTE_LockPalette(dc->dclevel.hpal); - if(!pdcPal) - { - DPRINT1("Unable to lock DC palette?!\n"); - goto cleanup; - } - if(pdcPal->Mode != PAL_INDEXED) - { - DPRINT1("Not indexed palette selected in the DC?!\n"); - PALETTE_UnlockPalette(pdcPal); - } - hpal = PALETTE_AllocPalette(PAL_INDEXED, - pdcPal->NumColors, - (ULONG*)pdcPal->IndexedColors, 0, 0, 0); + hpal = DIB_MapPaletteColors(pdcPal, bmi); PALETTE_UnlockPalette(pdcPal); } else { - hpal = BuildDIBPalette(bmi, &palMode); + hpal = BuildDIBPalette(bmi); + } + + if(!hpal) + { + DPRINT1("Error : Could not create a aplette for the DIB.\n"); + goto cleanup; } // Create Device Dependent Bitmap and add DIB pointer @@ -1716,25 +1648,17 @@ } } -RGBQUAD * +HPALETTE FASTCALL -DIB_MapPaletteColors(PDC dc, CONST BITMAPINFO* lpbmi) -{ - RGBQUAD *lpRGB; +DIB_MapPaletteColors(PPALETTE ppal, CONST BITMAPINFO* lpbmi) +{ + PALETTEENTRY* ppalEntries; ULONG nNumColors,i; USHORT *lpIndex; - PPALETTE palGDI; - - palGDI = PALETTE_LockPalette(dc->dclevel.hpal); - - if (NULL == palGDI) - { - return NULL; - } - - if (palGDI->Mode != PAL_INDEXED) - { - PALETTE_UnlockPalette(palGDI); + HPALETTE hpal; + + if (ppal->Mode != PAL_INDEXED) + { return NULL; } @@ -1744,46 +1668,52 @@ nNumColors = min(nNumColors, lpbmi->bmiHeader.biClrUsed); } - lpRGB = (RGBQUAD *)ExAllocatePoolWithTag(PagedPool, sizeof(RGBQUAD) * nNumColors, TAG_COLORMAP); - if (lpRGB == NULL) - { - PALETTE_UnlockPalette(palGDI); + /* Don't have more colors than we need */ + nNumColors = min(ppal->NumColors, nNumColors); + + ppalEntries = ExAllocatePoolWithTag(PagedPool, sizeof(PALETTEENTRY) * nNumColors, TAG_COLORMAP); + if (ppalEntries == NULL) + { + DPRINT1("Could not allocate palette entries\n"); return NULL; } - lpIndex = (USHORT *)&lpbmi->bmiColors[0]; + lpIndex = (USHORT *)((PBYTE)lpbmi + lpbmi->bmiHeader.biSize); for (i = 0; i < nNumColors; i++) { - if (*lpIndex < palGDI->NumColors) + if (*lpIndex < ppal->NumColors) { - lpRGB[i].rgbRed = palGDI->IndexedColors[*lpIndex].peRed; - lpRGB[i].rgbGreen = palGDI->IndexedColors[*lpIndex].peGreen; - lpRGB[i].rgbBlue = palGDI->IndexedColors[*lpIndex].peBlue; + ppalEntries[i] = ppal->IndexedColors[*lpIndex]; } else { - lpRGB[i].rgbRed = 0; - lpRGB[i].rgbGreen = 0; - lpRGB[i].rgbBlue = 0; + ppalEntries[i].peRed = 0; + ppalEntries[i].peGreen = 0; + ppalEntries[i].peBlue = 0; + ppalEntries[i].peFlags = 0; } - lpRGB[i].rgbReserved = 0; + lpIndex++; } - PALETTE_UnlockPalette(palGDI); - - return lpRGB; + + hpal = PALETTE_AllocPalette(PAL_INDEXED, nNumColors, (ULONG*)ppalEntries, 0, 0, 0); + + ExFreePoolWithTag(ppalEntries, TAG_COLORMAP); + + return hpal; } HPALETTE FASTCALL -BuildDIBPalette(CONST BITMAPINFO *bmi, PINT paletteType) +BuildDIBPalette(CONST BITMAPINFO *bmi) { BYTE bits; ULONG ColorCount; HPALETTE hPal; - ULONG RedMask, GreenMask, BlueMask; + ULONG RedMask = 0, GreenMask = 0, BlueMask = 0; PDWORD pdwColors = (PDWORD)((PBYTE)bmi + bmi->bmiHeader.biSize); + INT paletteType; // Determine Bits Per Pixel bits = bmi->bmiHeader.biBitCount; @@ -1791,36 +1721,36 @@ // Determine paletteType from Bits Per Pixel if (bits <= 8) { - *paletteType = PAL_INDEXED; + paletteType = PAL_INDEXED; RedMask = GreenMask = BlueMask = 0; } else if (bmi->bmiHeader.biCompression == BI_BITFIELDS) { - *paletteType = PAL_BITFIELDS; + paletteType = PAL_BITFIELDS; RedMask = pdwColors[0]; GreenMask = pdwColors[1]; BlueMask = pdwColors[2]; } else if (bits == 15) { - *paletteType = PAL_BITFIELDS; - RedMask = 0x7c00; - GreenMask = 0x03e0; - BlueMask = 0x001f; + paletteType = PAL_RGB16_555; } else if (bits == 16) { - *paletteType = PAL_BITFIELDS; - RedMask = 0xF800; - GreenMask = 0x07e0; - BlueMask = 0x001f; + paletteType = PAL_RGB16_565; } else { - *paletteType = PAL_RGB; - RedMask = 0xff0000; - GreenMask = 0x00ff00; - BlueMask = 0x0000ff; + if((pdwColors[0] == 0x0000FF) /* R */ + && (pdwColors[1] == 0x00FF00) /* G */ + && (pdwColors[2] == 0xFF0000))/* B */ + { + paletteType = PAL_BGR; + } + else + { + paletteType == PAL_RGB; + } } if (bmi->bmiHeader.biClrUsed == 0) @@ -1832,207 +1762,18 @@ ColorCount = bmi->bmiHeader.biClrUsed; } - if (PAL_INDEXED == *paletteType) + if (PAL_INDEXED == paletteType) { hPal = PALETTE_AllocPaletteIndexedRGB(ColorCount, (RGBQUAD*)pdwColors); } else { - hPal = PALETTE_AllocPalette(*paletteType, 0, + hPal = PALETTE_AllocPalette(paletteType, 0, NULL, RedMask, GreenMask, BlueMask); } return hPal; -} - -FORCEINLINE -DWORD -GetBMIColor(CONST BITMAPINFO* pbmi, INT i) -{ - DWORD dwRet = 0; - INT size; - if(pbmi->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) - { - /* BITMAPCOREINFO holds RGBTRIPLE values */ - size = sizeof(RGBTRIPLE); - } - else - { - size = sizeof(RGBQUAD); - } - memcpy(&dwRet, (PBYTE)pbmi + pbmi->bmiHeader.biSize + i*size, size); - return dwRet; -} - -NTSTATUS -FASTCALL -ProbeAndConvertToBitmapV5Info( - OUT PBITMAPV5INFO pbmiDst, - IN CONST BITMAPINFO* pbmiUnsafe, - IN DWORD dwColorUse, - IN UINT MaxSize) -{ - DWORD dwSize; - ULONG ulWidthBytes; - PBITMAPV5HEADER pbmhDst = &pbmiDst->bmiHeader; - - /* Get the size and probe */ - ProbeForRead(&pbmiUnsafe->bmiHeader.biSize, sizeof(DWORD), 1); - dwSize = pbmiUnsafe->bmiHeader.biSize; - /* At least dwSize bytes must be valids */ - ProbeForRead(pbmiUnsafe, max(dwSize, MaxSize), 1); - if(!MaxSize) - ProbeForRead(pbmiUnsafe, DIB_BitmapInfoSize(pbmiUnsafe, dwColorUse), 1); - - /* Check the size */ - // FIXME: are intermediate sizes allowed? As what are they interpreted? - // make sure we don't use a too big dwSize later - if (dwSize != sizeof(BITMAPCOREHEADER) && - dwSize != sizeof(BITMAPINFOHEADER) && - dwSize != sizeof(BITMAPV4HEADER) && - dwSize != sizeof(BITMAPV5HEADER)) - { - return STATUS_INVALID_PARAMETER; - } - - if (dwSize == sizeof(BITMAPCOREHEADER)) - { - PBITMAPCOREHEADER pbch = (PBITMAPCOREHEADER)pbmiUnsafe; - - /* Manually copy the fields that are present */ - pbmhDst->bV5Width = pbch->bcWidth; - pbmhDst->bV5Height = pbch->bcHeight; - pbmhDst->bV5Planes = pbch->bcPlanes; - pbmhDst->bV5BitCount = pbch->bcBitCount; - - /* Set some default values */ - pbmhDst->bV5Compression = BI_RGB; - pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbch->bcWidth, - pbch->bcHeight, - pbch->bcPlanes*pbch->bcBitCount) ; - pbmhDst->bV5XPelsPerMeter = 72; - pbmhDst->bV5YPelsPerMeter = 72; - pbmhDst->bV5ClrUsed = 0; - pbmhDst->bV5ClrImportant = 0; - } - else - { - /* Copy valid fields */ - memcpy(pbmiDst, pbmiUnsafe, dwSize); - if(!pbmhDst->bV5SizeImage) - pbmhDst->bV5SizeImage = DIB_GetDIBImageBytes(pbmhDst->bV5Width, - pbmhDst->bV5Height, - pbmhDst->bV5Planes*pbmhDst->bV5BitCount) ; - - if(dwSize < sizeof(BITMAPV5HEADER)) - { - /* Zero out the rest of the V5 header */ - memset((char*)pbmiDst + dwSize, 0, sizeof(BITMAPV5HEADER) - dwSize); - } - } - pbmhDst->bV5Size = sizeof(BITMAPV5HEADER); - - - if (dwSize < sizeof(BITMAPV4HEADER)) - { - if (pbmhDst->bV5Compression == BI_BITFIELDS) - { - pbmhDst->bV5RedMask = GetBMIColor(pbmiUnsafe, 0); - pbmhDst->bV5GreenMask = GetBMIColor(pbmiUnsafe, 1); - pbmhDst->bV5BlueMask = GetBMIColor(pbmiUnsafe, 2); - pbmhDst->bV5AlphaMask = 0; - pbmhDst->bV5ClrUsed = 0; - } - -// pbmhDst->bV5CSType; -// pbmhDst->bV5Endpoints; -// pbmhDst->bV5GammaRed; -// pbmhDst->bV5GammaGreen; -// pbmhDst->bV5GammaBlue; - } - - if (dwSize < sizeof(BITMAPV5HEADER)) - { -// pbmhDst->bV5Intent; -// pbmhDst->bV5ProfileData; -// pbmhDst->bV5ProfileSize; -// pbmhDst->bV5Reserved; - } - - ulWidthBytes = ((pbmhDst->bV5Width * pbmhDst->bV5Planes * - pbmhDst->bV5BitCount + 31) & ~31) / 8; - - if (pbmhDst->bV5SizeImage == 0) - pbmhDst->bV5SizeImage = abs(ulWidthBytes * pbmhDst->bV5Height); - - if (pbmhDst->bV5ClrUsed == 0) - { - switch(pbmhDst->bV5BitCount) - { - case 1: - pbmhDst->bV5ClrUsed = 2; - break; - case 4: - pbmhDst->bV5ClrUsed = 16; - break; - case 8: - pbmhDst->bV5ClrUsed = 256; - break; - default: - pbmhDst->bV5ClrUsed = 0; - break; - } - } - - if (pbmhDst->bV5Planes != 1) - { - return STATUS_INVALID_PARAMETER; - } - - if (pbmhDst->bV5BitCount != 0 && pbmhDst->bV5BitCount != 1 && - pbmhDst->bV5BitCount != 4 && pbmhDst->bV5BitCount != 8 && - pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 24 && - pbmhDst->bV5BitCount != 32) - { - DPRINT("Invalid bit count: %d\n", pbmhDst->bV5BitCount); - return STATUS_INVALID_PARAMETER; - } - - if ((pbmhDst->bV5BitCount == 0 && - pbmhDst->bV5Compression != BI_JPEG && pbmhDst->bV5Compression != BI_PNG)) - { - DPRINT("Bit count 0 is invalid for compression %d.\n", pbmhDst->bV5Compression); - return STATUS_INVALID_PARAMETER; - } - - if (pbmhDst->bV5Compression == BI_BITFIELDS && - pbmhDst->bV5BitCount != 16 && pbmhDst->bV5BitCount != 32) - { - DPRINT("Bit count %d is invalid for compression BI_BITFIELDS.\n", pbmhDst->bV5BitCount); - return STATUS_INVALID_PARAMETER; - } - - /* Copy Colors */ - if(pbmhDst->bV5ClrUsed) - { - INT i; - if(dwColorUse == DIB_PAL_COLORS) - { - RtlCopyMemory(pbmiDst->bmiColors, - pbmiUnsafe->bmiColors, - pbmhDst->bV5ClrUsed * sizeof(WORD)); - } - else - { - for(i = 0; i < pbmhDst->bV5ClrUsed; i++) - { - ((DWORD*)pbmiDst->bmiColors)[i] = GetBMIColor(pbmiUnsafe, i); - } - } - } - - return STATUS_SUCCESS; } /* Converts a BITMAPCOREINFO to a BITMAPINFO structure,

1 0

[fireball] 48388: [INCLUDE/WINE] - Update Wine-specific headers to Wine-1.3. - Remove unneeded 16 bit header, and add a bit of stuff into another legacy header. - Indicate in config.h that there is a freetype library present.
by fireball＠svn.reactos.org 31 Jul '10

31 Jul '10

Author: fireball Date: Sat Jul 31 22:39:22 2010 New Revision: 48388 URL: http://svn.reactos.org/svn/reactos?rev=48388&view=rev Log: [INCLUDE/WINE] - Update Wine-specific headers to Wine-1.3. - Remove unneeded 16 bit header, and add a bit of stuff into another legacy header. - Indicate in config.h that there is a freetype library present. Removed: trunk/reactos/include/reactos/wine/winuser16.h Modified: trunk/reactos/include/reactos/wine/config.h trunk/reactos/include/reactos/wine/test.h trunk/reactos/include/reactos/wine/windef16.h trunk/reactos/include/reactos/wine/wingdi16.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -99,37 +99,43 @@ #define HAVE_FPCLASS 1 /* Define if FreeType 2 is installed */ -/* #undef HAVE_FREETYPE */ +#define HAVE_FREETYPE 1 /* Define to 1 if you have the <freetype/freetype.h> header file. */ -/* #undef HAVE_FREETYPE_FREETYPE_H */ +#define HAVE_FREETYPE_FREETYPE_H 1 /* Define to 1 if you have the <freetype/ftglyph.h> header file. */ -/* #undef HAVE_FREETYPE_FTGLYPH_H */ +#define HAVE_FREETYPE_FTGLYPH_H 1 + +/* Define to 1 if you have the <freetype/ftlcdfil.h> header file. */ +#define HAVE_FREETYPE_FTLCDFIL_H 1 + +/* Define to 1 if you have the <freetype/ftmodapi.h> header file. */ +#define HAVE_FREETYPE_FTMODAPI_H 1 /* Define to 1 if you have the <freetype/ftnames.h> header file. */ /* #undef HAVE_FREETYPE_FTNAMES_H */ /* Define to 1 if you have the <freetype/ftoutln.h> header file. */ -/* #undef HAVE_FREETYPE_FTOUTLN_H */ +#define HAVE_FREETYPE_FTOUTLN_H 1 /* Define to 1 if you have the <freetype/ftsnames.h> header file. */ -/* #undef HAVE_FREETYPE_FTSNAMES_H */ +#define HAVE_FREETYPE_FTSNAMES_H 1 /* Define if you have the <freetype/fttrigon.h> header file. */ -/* #undef HAVE_FREETYPE_FTTRIGON_H */ +#define HAVE_FREETYPE_FTTRIGON_H 1 /* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */ -/* #undef HAVE_FREETYPE_FTWINFNT_H */ +#define HAVE_FREETYPE_FTWINFNT_H 1 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */ /* #undef HAVE_FREETYPE_INTERNAL_SFNT_H */ /* Define to 1 if you have the <freetype/ttnameid.h> header file. */ -/* #undef HAVE_FREETYPE_TTNAMEID_H */ +#define HAVE_FREETYPE_TTNAMEID_H 1 /* Define to 1 if you have the <freetype/tttables.h> header file. */ -/* #undef HAVE_FREETYPE_TTTABLES_H */ +#define HAVE_FREETYPE_TTTABLES_H 1 /* Define to 1 if the system has the type `fsblkcnt_t'. */ /* #undef HAVE_FSBLKCNT_T */ @@ -144,7 +150,13 @@ /* #undef HAVE_FSTATVFS */ /* Define to 1 if you have the <ft2build.h> header file. */ -/* #undef HAVE_FT2BUILD_H */ +#define HAVE_FT2BUILD_H 1 + +/* Define to 1 if you have the `FT_Load_Sfnt_Table' function. */ +/* #undef HAVE_FT_LOAD_SFNT_TABLE */ + +/* Define to 1 if the system has the type `FT_TrueTypeEngineType'. */ +#define HAVE_FT_TRUETYPEENGINETYPE 1 /* Define to 1 if you have the `ftruncate' function. */ #define HAVE_FTRUNCATE 1 Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -237,8 +237,7 @@ data=TlsGetValue(tls_index); if (!data) { - data=HeapAlloc(GetProcessHeap(), 0, sizeof(tls_data)); - data->todo_level = 0; + data=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(tls_data)); data->str_pos = data->strings; TlsSetValue(tls_index,data); } @@ -593,6 +592,8 @@ if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) report_success = atoi(p); + if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); + if (!argv[1]) { if (winetest_testlist[0].name && !winetest_testlist[1].name) /* only one test */ Modified: trunk/reactos/include/reactos/wine/windef16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winde… ============================================================================== --- trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/windef16.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -28,7 +28,9 @@ #endif #include <windef.h> #include <winbase.h> -#include <wine/exception.h> +#ifndef _NTNDK_ +#include <exception.h> // ROS Hack +#endif /* Standard data types */ typedef unsigned short BOOL16; Modified: trunk/reactos/include/reactos/wine/wingdi16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wingd… ============================================================================== --- trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/wingdi16.h [iso-8859-1] Sat Jul 31 22:39:22 2010 @@ -29,6 +29,24 @@ typedef struct { + INT16 lfHeight; + INT16 lfWidth; + INT16 lfEscapement; + INT16 lfOrientation; + INT16 lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + CHAR lfFaceName[LF_FACESIZE]; +} LOGFONT16, *LPLOGFONT16; + +typedef struct +{ INT16 mm; INT16 xExt; INT16 yExt; Removed: trunk/reactos/include/reactos/wine/winuser16.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winus… ============================================================================== --- trunk/reactos/include/reactos/wine/winuser16.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/winuser16.h (removed) @@ -1,26 +1,0 @@ -/* - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __WINE_WINE_WINUSER16_H -#define __WINE_WINE_WINUSER16_H - -#ifndef CB_SETITEMDATA16 -#define CB_SETITEMDATA16 (WM_USER+17) -#endif - -#endif /* __WINE_WINE_WINUSER16_H */

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