Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56505: [POWRPROF_WINETEST] - This test is not from Wine! Move to apitests.
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 10:09:38 2012 New Revision: 56505 URL: http://svn.reactos.org/svn/reactos?rev=56505&view=rev Log: [POWRPROF_WINETEST] - This test is not from Wine! Move to apitests. Added: trunk/rostests/apitests/powrprof/ - copied from r56502, trunk/rostests/winetests/powrprof/ trunk/rostests/apitests/powrprof/power.c - copied unchanged from r56502, trunk/rostests/winetests/powrprof/pwrprof.c Removed: trunk/rostests/apitests/powrprof/pwrprof.c trunk/rostests/winetests/powrprof/ Modified: trunk/rostests/apitests/CMakeLists.txt trunk/rostests/apitests/powrprof/CMakeLists.txt trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/CMakeLists.txt?r… Modified: trunk/rostests/apitests/powrprof/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/powrprof/CMakeLi… Removed: trunk/rostests/apitests/powrprof/pwrprof.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/powrprof/pwrpro… Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?…

1 0

[osiejka] 56504: [TRANSLATION] - italian translation update by Paolo Devoti (bug no. 7012);
by osiejka＠svn.reactos.org 05 May '12

05 May '12

Author: osiejka Date: Sat May 5 09:23:27 2012 New Revision: 56504 URL: http://svn.reactos.org/svn/reactos?rev=56504&view=rev Log: [TRANSLATION] - italian translation update by Paolo Devoti (bug no. 7012); Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/it-I… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/it-IT.rc [iso-8859-1] Sat May 5 09:23:27 2012 @@ -134,7 +134,7 @@ STRINGTABLE BEGIN - IDS_CPLNAME_1 "Opzioni di gestione dell'energia" + IDS_CPLNAME_1 "Opzioni di risparmio energetico" IDS_CPLDESCRIPTION_1 "Configura le impostazioni per il risparmio enegetico su questo computer." IDS_PROCENT "%i%%" IDS_SOUND "Suoni" Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Sat May 5 09:23:27 2012 @@ -420,19 +420,19 @@ BEGIN GROUPBOX "AttivitÃ ", -1, 7, 10, 249, 45 ICON "", 30109, 14, 25, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Mostrare le attivitÃ comuni nelle cartelle", 14001, 40, 25, 120, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", 14002, 40, 37, 120, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Mostrare le attivitÃ comuni nelle cartelle", 14001, 40, 25, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Utilizzare le cartelle nella forma 'ReactOS class&ic' ", 14002, 40, 37, 200, 10, WS_TABSTOP | WS_GROUP GROUPBOX "Sfoglia cartelle", -1, 7, 60, 249, 45, WS_TABSTOP ICON "", 30110, 14, 70, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", 14004, 40, 70, 140, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", 14005, 40, 82, 140, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Aprire ogni cartella nella stessa finestra", 14004, 40, 70, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Aprire ogni cartella in una nuova finestra", 14005, 40, 82, 200, 10, WS_TABSTOP | WS_GROUP GROUPBOX "Click sugli elementi come segue", -1, 7, 110, 249, 60 ICON "", 30111, 14, 120, 21, 20, SS_REALSIZECONTROL - AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", 14007, 40, 120, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", 14008, 50, 132, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", 14009, 50, 144, 170, 10, WS_TABSTOP | WS_GROUP - AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", 14010, 40, 156, 170, 10, WS_TABSTOP | WS_GROUP - PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 180, 180, 60, 14, WS_TABSTOP + AUTORADIOBUTTON "&Click singolo per aprire un elemento (seleziona ed apre)", 14007, 40, 120, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sottolinea i titoli delle icone in modo coerente con il &browser", 14008, 50, 132, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "Sottolinea i titoli delle icone solo se &selezionate", 14009, 50, 144, 200, 10, WS_TABSTOP | WS_GROUP + AUTORADIOBUTTON "&Doppio click per aprire un elemento (click singolo per selezionare)", 14010, 40, 156, 200, 10, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&Ripristina le impostazioni predefinite", 14011, 120, 180, 120, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_VIEW DIALOGEX 0, 0, 264, 256 @@ -443,11 +443,11 @@ GROUPBOX "Vista delle cartelle", -1, 7, 10, 249, 60 //ICON LTEXT "Potete applicare la modalitÃ di visualizzazione attuale\na tutte le cartelle.", -1, 60, 20, 180, 20 -PUSHBUTTON "Applicare a &tutte le cartelle", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Ripristina tutte le cartelle", 14002, 150, 50, 80, 14, WS_TABSTOP +PUSHBUTTON "Applicare a &tutte le cartelle", 14001, 40, 50, 100, 14, WS_TABSTOP +PUSHBUTTON "&Ripristina tutte le cartelle", 14002, 150, 50, 100, 14, WS_TABSTOP LTEXT "Impostazioni avanzate:", -1, 7, 80, 100, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "Ripristina come predefinite", 14004, 180, 210, 80, 14, WS_TABSTOP +PUSHBUTTON "Ripristina come predefinite", 14004, 160, 210, 100, 14, WS_TABSTOP END IDD_FOLDER_OPTIONS_FILETYPES DIALOGEX 0, 0, 264, 256

1 0

[tfaber] 56503: [NTOSKRNL] - Give more useful debug output on BAD_POOL_HEADER bug checks
by tfaber＠svn.reactos.org 05 May '12

05 May '12

Author: tfaber Date: Sat May 5 08:49:45 2012 New Revision: 56503 URL: http://svn.reactos.org/svn/reactos?rev=56503&view=rev Log: [NTOSKRNL] - Give more useful debug output on BAD_POOL_HEADER bug checks Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sat May 5 08:49:45 2012 @@ -205,6 +205,9 @@ if (PreviousEntry->BlockSize != Entry->PreviousSize) { /* Otherwise, someone corrupted one of the sizes */ + DPRINT1("PreviousEntry BlockSize %lu, tag %.4s. Entry PreviousSize %lu, tag %.4s\n", + PreviousEntry->BlockSize, (char *)&PreviousEntry->PoolTag, + Entry->PreviousSize, (char *)&Entry->PoolTag); KeBugCheckEx(BAD_POOL_HEADER, 5, (ULONG_PTR)PreviousEntry, @@ -226,6 +229,18 @@ if (!Entry->BlockSize) { /* Someone must've corrupted this field */ + if (Entry->PreviousSize) + { + PreviousEntry = POOL_PREV_BLOCK(Entry); + DPRINT1("PreviousEntry tag %.4s. Entry tag %.4s\n", + (char *)&PreviousEntry->PoolTag, + (char *)&Entry->PoolTag); + } + else + { + DPRINT1("Entry tag %.4s\n", + (char *)&Entry->PoolTag); + } KeBugCheckEx(BAD_POOL_HEADER, 8, 0, @@ -254,6 +269,9 @@ if (NextEntry->PreviousSize != Entry->BlockSize) { /* Otherwise, someone corrupted the field */ + DPRINT1("Entry BlockSize %lu, tag %.4s. NextEntry PreviousSize %lu, tag %.4s\n", + Entry->BlockSize, (char *)&Entry->PoolTag, + NextEntry->PreviousSize, (char *)&NextEntry->PoolTag); KeBugCheckEx(BAD_POOL_HEADER, 5, (ULONG_PTR)NextEntry,

1 0

[jimtabor] 56502: [Win32k] - Add alerts and set window state to message box windows. Expands bug 5281.
by jimtabor＠svn.reactos.org 05 May '12

05 May '12

Author: jimtabor Date: Sat May 5 02:49:17 2012 New Revision: 56502 URL: http://svn.reactos.org/svn/reactos?rev=56502&view=rev Log: [Win32k] - Add alerts and set window state to message box windows. Expands bug 5281. Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/user32/include/ntwrapper.h trunk/reactos/win32ss/user/user32/windows/dialog.c trunk/reactos/win32ss/user/user32/windows/messagebox.c Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -648,6 +648,17 @@ if (IntIsWindow(hWnd)) return IntDeRegisterShellHookWindow(hWnd); return FALSE; + case HWND_ROUTINE_SETMSGBOX: + { + PWND Window; + UserEnterExclusive(); + if ((Window = UserGetWindowObject(hWnd))) + { + Window->state |= WNDS_MSGBOX; + } + UserLeave(); + return FALSE; + } } STUB; Modified: trunk/reactos/win32ss/user/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/includ… ============================================================================== --- trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/include/ntwrapper.h [iso-8859-1] Sat May 5 02:49:17 2012 @@ -727,6 +727,11 @@ return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW); } +EXTINLINE BOOL NtUserxSetMessageBox(HWND hWnd) +{ + return NtUserCallHwnd(hWnd, HWND_ROUTINE_SETMSGBOX); +} + EXTINLINE HWND NtUserxSetTaskmanWindow(HWND hWnd) { return NtUserCallHwndOpt(hWnd, HWNDOPT_ROUTINE_SETTASKMANWINDOW); Modified: trunk/reactos/win32ss/user/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/dialog.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -549,6 +549,10 @@ INT retval; HWND ownerMsg = GetAncestor( owner, GA_ROOT ); BOOL bFirstEmpty; + PWND pWnd; + + pWnd = ValidateHwnd(hwnd); + if (!pWnd) return -1; if (!(dlgInfo = GETDLGINFO(hwnd))) return -1; @@ -582,9 +586,10 @@ /* * If the user is pressing Ctrl+C, send a WM_COPY message. - * TODO: Is there another way to check if the Dialog it's a MessageBox?. + * Guido Pola, Bug 5281, Is there another way to check if the Dialog it's a MessageBox? */ - if( msg.message == WM_KEYDOWN && GetPropW(hwnd, L"ROS_MSGBOX") != NULL && + if( msg.message == WM_KEYDOWN && + pWnd->state & WNDS_MSGBOX && // Yes! GetForegroundWindow() == hwnd ) { if( msg.wParam == L'C' && GetKeyState(VK_CONTROL) < 0 ) Modified: trunk/reactos/win32ss/user/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/messagebox.c [iso-8859-1] Sat May 5 02:49:17 2012 @@ -63,11 +63,10 @@ #define MSGBOXEX_MAXBTNS (4) typedef struct _MSGBOXINFO { + MSGBOXPARAMSW; // Wine passes this too. + // ReactOS HICON Icon; HFONT Font; - DWORD ContextHelpId; - MSGBOXCALLBACK Callback; - DWORD Style; int DefBtn; int nButtons; LONG *Btns; @@ -187,7 +186,7 @@ static INT_PTR CALLBACK MessageBoxProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ) { - int i; + int i, Alert; PMSGBOXINFO mbi; HELPINFO hi; HWND owner; @@ -195,12 +194,42 @@ switch(message) { case WM_INITDIALOG: mbi = (PMSGBOXINFO)lParam; + + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)mbi); + NtUserxSetMessageBox(hwnd); + if(!GetPropW(hwnd, L"ROS_MSGBOX")) { SetPropW(hwnd, L"ROS_MSGBOX", (HANDLE)lParam); - if(mbi->Icon) + + if (mbi->dwContextHelpId) + SetWindowContextHelpId(hwnd, mbi->dwContextHelpId); + + if (mbi->Icon) + { SendDlgItemMessageW(hwnd, MSGBOX_IDICON, STM_SETICON, (WPARAM)mbi->Icon, 0); - SetWindowContextHelpId(hwnd, mbi->ContextHelpId); + Alert = ALERT_SYSTEM_WARNING; + } + else // Setup the rest of the alerts. + { + switch(mbi->dwStyle & MB_ICONMASK) + { + case MB_ICONWARNING: + Alert = ALERT_SYSTEM_WARNING; + break; + case MB_ICONERROR: + Alert = ALERT_SYSTEM_ERROR; + break; + case MB_ICONQUESTION: + Alert = ALERT_SYSTEM_QUERY; + break; + default: + Alert = ALERT_SYSTEM_INFORMATIONAL; + /* fall through */ + } + } + /* Send out the alert notifications. */ + NotifyWinEvent(EVENT_SYSTEM_ALERT, hwnd, OBJID_ALERT, Alert); /* set control fonts */ SendDlgItemMessageW(hwnd, MSGBOX_IDTEXT, WM_SETFONT, (WPARAM)mbi->Font, 0); @@ -208,7 +237,7 @@ { SendDlgItemMessageW(hwnd, mbi->Btns[i], WM_SETFONT, (WPARAM)mbi->Font, 0); } - switch(mbi->Style & MB_TYPEMASK) + switch(mbi->dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: @@ -259,8 +288,8 @@ memcpy(&hi, (void *)lParam, sizeof(hi)); hi.dwContextId = GetWindowContextHelpId(hwnd); - if (mbi->Callback) - mbi->Callback(&hi); + if (mbi->lpfnMsgBoxCallback) + mbi->lpfnMsgBoxCallback(&hi); else { owner = GetWindow(hwnd, GW_OWNER); @@ -273,7 +302,7 @@ mbi = (PMSGBOXINFO)GetPropW(hwnd, L"ROS_MSGBOX"); if(!mbi) return 0; - switch(mbi->Style & MB_TYPEMASK) + switch(mbi->dwStyle & MB_TYPEMASK) { case MB_ABORTRETRYIGNORE: case MB_YESNO: @@ -703,12 +732,21 @@ /* finally show the messagebox */ mbi.Icon = Icon; mbi.Font = hFont; - mbi.ContextHelpId = lpMsgBoxParams->dwContextHelpId; - mbi.Callback = lpMsgBoxParams->lpfnMsgBoxCallback; - mbi.Style = lpMsgBoxParams->dwStyle; + mbi.dwContextHelpId = lpMsgBoxParams->dwContextHelpId; + mbi.lpfnMsgBoxCallback = lpMsgBoxParams->lpfnMsgBoxCallback; + mbi.dwStyle = lpMsgBoxParams->dwStyle; mbi.nButtons = nButtons; mbi.Btns = &Buttons[0]; mbi.Timeout = Timeout; + + /* Pass on to Justin Case so he can peek the message? */ + mbi.cbSize = lpMsgBoxParams->cbSize; + mbi.hwndOwner = lpMsgBoxParams->hwndOwner; + mbi.hInstance = lpMsgBoxParams->hInstance; + mbi.lpszText = lpMsgBoxParams->lpszText; + mbi.lpszCaption = lpMsgBoxParams->lpszCaption; + mbi.lpszIcon = lpMsgBoxParams->lpszIcon; + mbi.dwLanguageId = lpMsgBoxParams->dwLanguageId; if(hDC) DeleteDC(hDC);

1 0

[jimtabor] 56501: - Add notification alerts.
by jimtabor＠svn.reactos.org 05 May '12

05 May '12

Author: jimtabor Date: Sat May 5 00:03:50 2012 New Revision: 56501 URL: http://svn.reactos.org/svn/reactos?rev=56501&view=rev Log: - Add notification alerts. Modified: trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sat May 5 00:03:50 2012 @@ -2669,6 +2669,12 @@ #define EVENT_OBJECT_HELPCHANGE 0x00008010 #define EVENT_OBJECT_DEFACTIONCHANGE 0x00008011 #define EVENT_OBJECT_ACCELERATORCHANGE 0x00008012 +#define ALERT_SYSTEM_INFORMATIONAL 1 /* MB_INFORMATION */ +#define ALERT_SYSTEM_WARNING 2 /* MB_WARNING */ +#define ALERT_SYSTEM_ERROR 3 /* MB_ERROR */ +#define ALERT_SYSTEM_QUERY 4 /* MB_QUESTION */ +#define ALERT_SYSTEM_CRITICAL 5 /* HardSysErrBox */ +#define CALERT_SYSTEM 6 #if (_WIN32_WINNT >= 0x0501) #define EVENT_CONSOLE_CARET 0x00004001 #define CONSOLE_CARET_SELECTION 0x00000001

1 0

[tkreuzer] 56500: [TESTS] Add missing definition
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 19:06:15 2012 New Revision: 56500 URL: http://svn.reactos.org/svn/reactos?rev=56500&view=rev Log: [TESTS] Add missing definition Modified: trunk/reactos/include/reactos/wine/test.h 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] Fri May 4 19:06:15 2012 @@ -639,6 +639,13 @@ #expression, (int)(result), _value); \ } +#define ok_ptr(expression, result) \ + { \ + void *_value = (expression); \ + ok(_value == (result), "Wrong value for '%s', expected: " #result " (%p), got: %p\n", \ + #expression, (void*)(result), _value); \ + } + #define ok_err(error) \ ok(GetLastError() == (error), "Wrong last error. Expected " #error ", got %d\n", (int)GetLastError()) @@ -648,5 +655,6 @@ #define ok_long(expression, result) ok_hex(expression, result) #define ok_int(expression, result) ok_dec(expression, result) #define ok_ntstatus(status, expected) ok_hex(status, expected) +#define ok_hdl ok_ptr #endif /* __WINE_WINE_TEST_H */

1 0

[tkreuzer] 56499: [GDI32_APITEST] Fix warnings
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 19:06:12 2012 New Revision: 56499 URL: http://svn.reactos.org/svn/reactos?rev=56499&view=rev Log: [GDI32_APITEST] Fix warnings Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/init.c Modified: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Fri May 4 19:06:12 2012 @@ -29,7 +29,6 @@ {0, 1, 2, 7}, {0,1,2,3, 1,2,3,0, 2,3,0,1, 3,0,1,2}, }; - PBITMAPINFO pbmi = (PBITMAPINFO)&PackedDIB; HBRUSH hbr, hbrOld; HPALETTE hpalOld; Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Fri May 4 19:06:12 2012 @@ -349,7 +349,6 @@ {1, 7, 3, 1}, {0,1,2,3, 1,2,3,0, 2,3,0,1, 3,0,1,2}, }; - PBITMAPINFO pbmi = (PBITMAPINFO)&PackedDIB; LOGBRUSH logbrush; HBRUSH hBrush; Modified: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Fri May 4 19:06:12 2012 @@ -30,7 +30,7 @@ BOOL InitStuff(void) { BITMAPINFO bmi32 = - {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 32, BI_RGB, 0, 1, 1, 0, 0}, {0}}; + {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 32, BI_RGB, 0, 1, 1, 0, 0}}; ghdcDIB32 = CreateCompatibleDC(0);

1 0

[tkreuzer] 56498: [GDI32_APITEST] - Add tests for CreateDIBPatternBrush(Pt) - Add some helper code to initialize a dibsection and a palette, which can be reused by other tests - Add tests for DIB b...
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 18:56:43 2012 New Revision: 56498 URL: http://svn.reactos.org/svn/reactos?rev=56498&view=rev Log: [GDI32_APITEST] - Add tests for CreateDIBPatternBrush(Pt) - Add some helper code to initialize a dibsection and a palette, which can be reused by other tests - Add tests for DIB brush in GetObject Added: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c (with props) trunk/rostests/apitests/gdi32/init.c (with props) trunk/rostests/apitests/gdi32/init.h (with props) Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/gdi32/testlist.c Modified: trunk/rostests/apitests/gdi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CMakeLists… ============================================================================== --- trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CMakeLists.txt [iso-8859-1] Fri May 4 18:56:43 2012 @@ -12,6 +12,7 @@ CreateBitmapIndirect.c CreateCompatibleDC.c CreateDIBitmap.c + CreateDIBPatternBrush CreateFont.c CreateFontIndirect.c CreateIconIndirect.c @@ -57,6 +58,7 @@ SetSysColors.c SetWindowExtEx.c SetWorldTransform.c + init.c testlist.c) add_executable(gdi32_apitest ${SOURCE}) Added: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBP… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c (added) +++ trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c [iso-8859-1] Fri May 4 18:56:43 2012 @@ -1,0 +1,147 @@ +/* + * PROJECT: ReactOS api tests + * LICENSE: GPL - See COPYING in the top level directory + * PURPOSE: Test for CreateDIBPatternBrush + * PROGRAMMERS: Timo Kreuzer + */ + +#include <stdio.h> +#include <wine/test.h> +#include <windows.h> +#include "init.h" + + +void Test_CreateDIBPatternBrush() +{ + +} + +void Test_CreateDIBPatternBrushPt() +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE ajBuffer[16]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, -4, 1, 8, BI_RGB, 0, 1, 1, 4, 0}, + {0, 1, 2, 7}, + {0,1,2,3, 1,2,3,0, 2,3,0,1, 3,0,1,2}, + }; + PBITMAPINFO pbmi = (PBITMAPINFO)&PackedDIB; + HBRUSH hbr, hbrOld; + HPALETTE hpalOld; + + SetLastError(0); + ok_hdl(CreateDIBPatternBrushPt(NULL, 0), NULL); + ok_hdl(CreateDIBPatternBrushPt(NULL, DIB_PAL_COLORS), NULL); + ok_hdl(CreateDIBPatternBrushPt(NULL, 2), NULL); + ok_hdl(CreateDIBPatternBrushPt(NULL, 3), NULL); + ok_err(0); + + hbr = CreateDIBPatternBrushPt(&PackedDIB, 0); + ok(hbr != 0, "Expected success\n"); + DeleteObject(hbr); + hbr = CreateDIBPatternBrushPt(&PackedDIB, 2); + ok(hbr != 0, "Expected success\n"); + DeleteObject(hbr); + + SetLastError(0); + hbr = CreateDIBPatternBrushPt(&PackedDIB, 3); + ok(hbr == 0, "Expected failure\n"); + ok_err(ERROR_INVALID_PARAMETER); + SetLastError(0); + hbr = CreateDIBPatternBrushPt(&PackedDIB, 10); + ok(hbr == 0, "Expected failure\n"); + ok_err(ERROR_INVALID_PARAMETER); + + /* Create a DIB brush with palette indices */ + hbr = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); + ok(hbr != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hbr) return; + + /* Select the brush into the dc */ + hbrOld = SelectObject(ghdcDIB32, hbr); + + /* Copy it on the dib section */ + ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); + ok_long(pulDIB32Bits[0], 0x000000); // 0 + ok_long(pulDIB32Bits[1], 0x800000); // 1 + ok_long(pulDIB32Bits[2], 0x008000); // 2 + ok_long(pulDIB32Bits[3], 0xc0c0c0); // 7 + + /* Select a logical palette into the DC */ + hpalOld = SelectPalette(ghdcDIB32, ghpal, FALSE); + ok(hpalOld != 0, "Expected success, error %ld\n", GetLastError()); + + /* Copy it on the dib section */ + ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); + ok_long(pulDIB32Bits[0], 0x102030); // 0 + ok_long(pulDIB32Bits[1], 0x203040); // 1 + ok_long(pulDIB32Bits[2], 0x304050); // 2 + ok_long(pulDIB32Bits[3], 0x8090a0); // 7 + + /* Select back old palette and destroy the DIB data */ + SelectPalette(ghdcDIB32, hpalOld, FALSE); + memset(&PackedDIB.ajBuffer, 0x77, 4); + + /* Copy it on the dib section */ + ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); + ok_long(pulDIB32Bits[0], 0x000000); // 0 + ok_long(pulDIB32Bits[1], 0x800000); // 1 + ok_long(pulDIB32Bits[2], 0x008000); // 2 + ok_long(pulDIB32Bits[3], 0xc0c0c0); // 7 + + SelectObject(ghdcDIB32, hbrOld); + DeleteObject(hbr); + + /* Set some different values */ + PackedDIB.ajBuffer[0] = 3; + PackedDIB.ajBuffer[1] = 2; + PackedDIB.ajBuffer[2] = 1; + PackedDIB.ajBuffer[3] = 0; + + /* Create a DIB brush with unkdocumented iUsage == 2 */ + hbr = CreateDIBPatternBrushPt(&PackedDIB, 2); + ok(hbr != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hbr) return; + + /* Select the brush into the dc */ + hbrOld = SelectObject(ghdcDIB32, hbr); + ok(hbrOld != 0, "CreateSolidBrush failed, skipping tests.\n"); + + /* Copy it on a dib section */ + memset(pulDIB32Bits, 0x77, 64); + ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); + ok_long(pulDIB32Bits[0], 0x77777777); + ok_long(pulDIB32Bits[1], 0x77777777); + ok_long(pulDIB32Bits[2], 0x77777777); + ok_long(pulDIB32Bits[3], 0x77777777); + + /* Select a logical palette into the DC */ + hpalOld = SelectPalette(ghdcDIB32, ghpal, FALSE); + ok(hpalOld != 0, "Expected success, error %ld\n", GetLastError()); + + /* Copy it on a dib section */ + ok_long(PatBlt(ghdcDIB32, 0, 0, 4, 4, PATCOPY), 1); + ok_long(pulDIB32Bits[0], 0x77777777); + ok_long(pulDIB32Bits[1], 0x77777777); + ok_long(pulDIB32Bits[2], 0x77777777); + ok_long(pulDIB32Bits[3], 0x77777777); + + SelectPalette(ghdcDIB32, hpalOld, FALSE); + SelectObject(ghdcDIB32, hbrOld); + DeleteObject(hbr); + +} + + +START_TEST(CreateDIBPatternBrush) +{ + InitStuff(); + + Test_CreateDIBPatternBrush(); + Test_CreateDIBPatternBrushPt(); +} + Propchange: trunk/rostests/apitests/gdi32/CreateDIBPatternBrush.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Fri May 4 18:56:43 2012 @@ -216,7 +216,7 @@ void Test_Dibsection(void) { - BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 9, 1, 8, BI_RGB, 0, 10, 10, 0,0}}; + BITMAPINFO bmi = {{sizeof(BITMAPINFOHEADER), 10, 9, 1, 16, BI_RGB, 0, 10, 10, 0,0}}; HBITMAP hBitmap; BITMAP bitmap; DIBSECTION dibsection; @@ -233,25 +233,25 @@ ok(GetObjectW((HANDLE)((UINT_PTR)hBitmap & 0x0000ffff), 0, NULL) == sizeof(BITMAP), "\n"); SetLastError(ERROR_SUCCESS); - ok(GetObject(hBitmap, sizeof(DIBSECTION), NULL) == sizeof(BITMAP), "\n"); - ok(GetObject(hBitmap, 0, NULL) == sizeof(BITMAP), "\n"); - ok(GetObject(hBitmap, 5, NULL) == sizeof(BITMAP), "\n"); - ok(GetObject(hBitmap, -5, NULL) == sizeof(BITMAP), "\n"); - ok(GetObject(hBitmap, 0, &dibsection) == 0, "\n"); - ok(GetObject(hBitmap, 5, &dibsection) == 0, "\n"); - ok(GetObject(hBitmap, sizeof(BITMAP), &bitmap) == sizeof(BITMAP), "\n"); - ok(GetObject(hBitmap, sizeof(BITMAP)+2, &bitmap) == sizeof(BITMAP), "\n"); - ok(bitmap.bmType == 0, "\n"); - ok(bitmap.bmWidth == 10, "\n"); - ok(bitmap.bmHeight == 9, "\n"); - ok(bitmap.bmWidthBytes == 12, "\n"); - ok(bitmap.bmPlanes == 1, "\n"); - ok(bitmap.bmBitsPixel == 8, "\n"); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION), NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 0, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 5, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, -5, NULL), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, 0, &dibsection), 0); + ok_long(GetObject(hBitmap, 5, &dibsection), 0); + ok_long(GetObject(hBitmap, sizeof(BITMAP), &bitmap), sizeof(BITMAP)); + ok_long(GetObject(hBitmap, sizeof(BITMAP)+2, &bitmap), sizeof(BITMAP)); + ok_long(bitmap.bmType, 0); + ok_long(bitmap.bmWidth, 10); + ok_long(bitmap.bmHeight, 9); + ok_long(bitmap.bmWidthBytes, 20); + ok_long(bitmap.bmPlanes, 1); + ok_long(bitmap.bmBitsPixel, 16); ok(bitmap.bmBits == pData, "\n"); - ok(GetObject(hBitmap, sizeof(DIBSECTION), &dibsection) == sizeof(DIBSECTION), "\n"); - ok(GetObject(hBitmap, sizeof(DIBSECTION)+2, &dibsection) == sizeof(DIBSECTION), "\n"); - ok(GetObject(hBitmap, -5, &dibsection) == sizeof(DIBSECTION), "\n"); - ok(GetLastError() == ERROR_SUCCESS, "\n"); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION), &dibsection), sizeof(DIBSECTION)); + ok_long(GetObject(hBitmap, sizeof(DIBSECTION)+2, &dibsection), sizeof(DIBSECTION)); + ok_long(GetObject(hBitmap, -5, &dibsection), sizeof(DIBSECTION)); + ok_err(ERROR_SUCCESS); DeleteObject(hBitmap); ReleaseDC(0, hDC); } @@ -333,6 +333,59 @@ ok(GetObjectW((HANDLE)GDI_OBJECT_TYPE_BRUSH, sizeof(LOGBRUSH), &logbrush) == 0, "\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %ld\n", GetLastError()); +} + +void +Test_DIBBrush(void) +{ + struct + { + BITMAPINFOHEADER bmiHeader; + WORD wColors[4]; + BYTE jBuffer[16]; + } PackedDIB = + { + {sizeof(BITMAPINFOHEADER), 4, 4, 1, 8, BI_RGB, 0, 1, 1, 4, 0}, + {1, 7, 3, 1}, + {0,1,2,3, 1,2,3,0, 2,3,0,1, 3,0,1,2}, + }; + PBITMAPINFO pbmi = (PBITMAPINFO)&PackedDIB; + LOGBRUSH logbrush; + HBRUSH hBrush; + + /* Create a DIB brush */ + hBrush = CreateDIBPatternBrushPt(&PackedDIB, DIB_PAL_COLORS); + ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hBrush) return; + + FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); + SetLastError(ERROR_SUCCESS); + + ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); + ok_long(logbrush.lbStyle, BS_DIBPATTERN); + ok_long(logbrush.lbColor, 0); + ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); + + ok_err(ERROR_SUCCESS); + DeleteObject(hBrush); + + + /* Create a DIB brush with undocumented iUsage 2 */ + hBrush = CreateDIBPatternBrushPt(&PackedDIB, 2); + ok(hBrush != 0, "CreateSolidBrush failed, skipping tests.\n"); + if (!hBrush) return; + + FillMemory(&logbrush, sizeof(LOGBRUSH), 0x77); + SetLastError(ERROR_SUCCESS); + + ok_long(GetObject(hBrush, sizeof(LOGBRUSH), &logbrush), sizeof(LOGBRUSH)); + ok_long(logbrush.lbStyle, BS_DIBPATTERN); + ok_long(logbrush.lbColor, 0); + ok_long(logbrush.lbHatch, (ULONG_PTR)&PackedDIB); + + ok_err(ERROR_SUCCESS); + DeleteObject(hBrush); + } void @@ -632,6 +685,7 @@ Test_Dibsection(); Test_Palette(); Test_Brush(); + Test_DIBBrush(); Test_Pen(); Test_ExtPen(); // not implemented yet in ROS Test_MetaDC(); Added: trunk/rostests/apitests/gdi32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.c?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.c (added) +++ trunk/rostests/apitests/gdi32/init.c [iso-8859-1] Fri May 4 18:56:43 2012 @@ -1,0 +1,51 @@ + +#include <stdio.h> +#include <windows.h> + +HBITMAP ghbmpDIB32; +HDC ghdcDIB32; +PULONG pulDIB32Bits; +HPALETTE ghpal; + +struct +{ + WORD palVersion; + WORD palNumEntries; + PALETTEENTRY logpalettedata[8]; +} gpal = +{ + 0x300, 8, + { + { 0x10, 0x20, 0x30, PC_NOCOLLAPSE }, + { 0x20, 0x30, 0x40, PC_NOCOLLAPSE }, + { 0x30, 0x40, 0x50, PC_NOCOLLAPSE }, + { 0x40, 0x50, 0x60, PC_NOCOLLAPSE }, + { 0x50, 0x60, 0x70, PC_NOCOLLAPSE }, + { 0x60, 0x70, 0x80, PC_NOCOLLAPSE }, + { 0x70, 0x80, 0x90, PC_NOCOLLAPSE }, + { 0x80, 0x90, 0xA0, PC_NOCOLLAPSE }, + } +}; + +BOOL InitStuff(void) +{ + BITMAPINFO bmi32 = + {{sizeof(BITMAPINFOHEADER), 4, -4, 1, 32, BI_RGB, 0, 1, 1, 0, 0}, {0}}; + + ghdcDIB32 = CreateCompatibleDC(0); + + ghbmpDIB32 = CreateDIBSection(ghdcDIB32, &bmi32, DIB_PAL_COLORS, (PVOID*)&pulDIB32Bits, 0, 0 ); + if (!ghbmpDIB32) return FALSE; + + SelectObject(ghdcDIB32, ghbmpDIB32); + + /* Initialize a logical palette */ + ghpal = CreatePalette((LOGPALETTE*)&gpal); + if (!ghpal) + { + printf("failed to create a palette \n"); + return FALSE; + } + + return TRUE; +} Propchange: trunk/rostests/apitests/gdi32/init.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/apitests/gdi32/init.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/init.h?rev… ============================================================================== --- trunk/rostests/apitests/gdi32/init.h (added) +++ trunk/rostests/apitests/gdi32/init.h [iso-8859-1] Fri May 4 18:56:43 2012 @@ -1,0 +1,13 @@ + +extern HBITMAP ghbmpDIB32; +extern HDC ghdcDIB32; +extern PULONG pulDIB32Bits; +extern HPALETTE ghpal; +extern struct +{ + LOGPALETTE logpal; + PALETTEENTRY logpalettedata[8]; +} gpal; + +BOOL InitStuff(void); + Propchange: trunk/rostests/apitests/gdi32/init.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/testlist.c… ============================================================================== --- trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/testlist.c [iso-8859-1] Fri May 4 18:56:43 2012 @@ -14,6 +14,7 @@ extern void func_CreateBitmapIndirect(void); extern void func_CreateCompatibleDC(void); extern void func_CreateDIBitmap(void); +extern void func_CreateDIBPatternBrush(void); extern void func_CreateFont(void); extern void func_CreateFontIndirect(void); extern void func_CreateIconIndirect(void); @@ -71,6 +72,7 @@ { "CreateBitmapIndirect", func_CreateBitmapIndirect }, { "CreateCompatibleDC", func_CreateCompatibleDC }, { "CreateDIBitmap", func_CreateDIBitmap }, + { "CreateDIBPatternBrush", func_CreateDIBPatternBrush }, { "CreateFont", func_CreateFont }, { "CreateFontIndirect", func_CreateFontIndirect }, { "CreateIconIndirect", func_CreateFontIndirect },

1 0

[tkreuzer] 56497: [WIN32K] Commit what I forgot
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 17:39:00 2012 New Revision: 56497 URL: http://svn.reactos.org/svn/reactos?rev=56497&view=rev Log: [WIN32K] Commit what I forgot Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c trunk/reactos/win32ss/user/ntuser/misc/file.c Modified: trunk/reactos/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/clipbo… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/clipboard.c [iso-8859-1] Fri May 4 17:39:00 2012 @@ -225,6 +225,7 @@ pConvertedBmi, DIB_RGB_COLORS, 0, + pMemObj->cbData - Offset, 0); if (hBm) Modified: trunk/reactos/win32ss/user/ntuser/misc/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/misc/f… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/misc/file.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/misc/file.c [iso-8859-1] Fri May 4 17:39:00 2012 @@ -229,6 +229,7 @@ pConvertedInfo, DIB_RGB_COLORS, 0, + pbmfh->bfSize - pbmfh->bfOffBits, 0); NtGdiDeleteObjectApp(hdc);

1 0

[tkreuzer] 56496: [WIN32K] - Add cjMaxBits parameter to GreCreateDIBitmapInternal - Rename GDIBRUSH_* constants to BR_*, as they are named in gdikdx
by tkreuzer＠svn.reactos.org 04 May '12

04 May '12

Author: tkreuzer Date: Fri May 4 17:37:07 2012 New Revision: 56496 URL: http://svn.reactos.org/svn/reactos?rev=56496&view=rev Log: [WIN32K] - Add cjMaxBits parameter to GreCreateDIBitmapInternal - Rename GDIBRUSH_* constants to BR_*, as they are named in gdikdx Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c trunk/reactos/win32ss/gdi/eng/lineto.c trunk/reactos/win32ss/gdi/ntgdi/bitblt.c trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h trunk/reactos/win32ss/gdi/ntgdi/brush.c trunk/reactos/win32ss/gdi/ntgdi/brush.h trunk/reactos/win32ss/gdi/ntgdi/dibobj.c trunk/reactos/win32ss/gdi/ntgdi/drawing.c trunk/reactos/win32ss/gdi/ntgdi/fillshap.c trunk/reactos/win32ss/gdi/ntgdi/line.c trunk/reactos/win32ss/gdi/ntgdi/pen.c trunk/reactos/win32ss/gdi/ntgdi/stockobj.c Modified: trunk/reactos/win32ss/gdi/eng/engbrush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/engbrush.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/engbrush.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -40,12 +40,12 @@ GDIOBJ_vReferenceObjectByPointer(&pebo->ppalSurf->BaseObject); //pebo->ppalDC = pdc->dclevel.ppal; - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + if (pbrush->flAttrs & BR_IS_NULL) { /* NULL brushes don't need a color */ pebo->BrushObject.iSolidColor = 0; } - else if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + else if (pbrush->flAttrs & BR_IS_SOLID) { /* Set the RGB color */ EBRUSHOBJ_vSetSolidRGBColor(pebo, pbrush->BrushAttr.lbColor); @@ -56,7 +56,7 @@ pebo->BrushObject.iSolidColor = 0xFFFFFFFF; /* Use foreground color of hatch brushes */ - if (pbrush->flAttrs & GDIBRUSH_IS_HATCH) + if (pbrush->flAttrs & BR_IS_HATCH) pebo->crCurrentText = pbrush->BrushAttr.lbColor; } } @@ -69,7 +69,7 @@ EXLATEOBJ exlo; /* Never use with non-solid brushes */ - ASSERT(pebo->flattrs & GDIBRUSH_IS_SOLID); + ASSERT(pebo->flattrs & BR_IS_SOLID); /* Set the RGB color */ pebo->crRealize = crColor; @@ -217,7 +217,7 @@ psurfMask = NULL; /* DIB brushes with DIB_PAL_COLORS usage need a new palette */ - if (pebo->pbrush->flAttrs & GDIBRUSH_IS_DIBPALCOLORS) + if (pebo->pbrush->flAttrs & BR_IS_DIBPALCOLORS) { ASSERT(FALSE); ppalPattern = 0; //CreateDIBPalette(psurfPattern->ppal, pebo->ppalDC); Modified: trunk/reactos/win32ss/gdi/eng/lineto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/lineto.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/lineto.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -519,7 +519,7 @@ ASSERT(GdiBrush); ASSERT(GdiBrush->pbrush); - if (GdiBrush->pbrush->flAttrs & GDIBRUSH_IS_NULL) + if (GdiBrush->pbrush->flAttrs & BR_IS_NULL) return TRUE; /* No success yet */ Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -831,7 +831,7 @@ FIXUP_ROP(dwRop); - if (pbrush->flAttrs & GDIBRUSH_IS_NULL) + if (pbrush->flAttrs & BR_IS_NULL) { return TRUE; } Modified: trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitmaps.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitmaps.h [iso-8859-1] Fri May 4 17:37:07 2012 @@ -25,7 +25,7 @@ _In_ FLONG flags); HBITMAP -FASTCALL +NTAPI GreCreateDIBitmapInternal( IN HDC hDc, IN INT cx, @@ -35,4 +35,5 @@ IN OPTIONAL PBITMAPINFO pbmi, IN DWORD iUsage, IN FLONG fl, + IN UINT cjMaxBits, IN HANDLE hcmXform); Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.c?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -40,7 +40,7 @@ IntGdiSetBrushOwner(PBRUSH pbr, ULONG ulOwner) { // FIXME: - if (pbr->flAttrs & GDIBRUSH_IS_GLOBAL) return TRUE; + if (pbr->flAttrs & BR_IS_GLOBAL) return TRUE; if ((ulOwner == GDI_OBJ_HMGR_PUBLIC) || ulOwner == GDI_OBJ_HMGR_NONE) { @@ -129,7 +129,7 @@ BRUSH_Cleanup(PVOID ObjectBody) { PBRUSH pbrush = (PBRUSH)ObjectBody; - if (pbrush->flAttrs & (GDIBRUSH_IS_HATCH | GDIBRUSH_IS_BITMAP)) + if (pbrush->flAttrs & (BR_IS_HATCH | BR_IS_BITMAP)) { ASSERT(pbrush->hbmPattern); GreSetObjectOwner(pbrush->hbmPattern, GDI_OBJ_HMGR_POWNED); @@ -162,7 +162,7 @@ Buffer->lbColor = pbrush->BrushAttr.lbColor; /* Set Hatch */ - if ((pbrush->flAttrs & GDIBRUSH_IS_HATCH)!=0) + if ((pbrush->flAttrs & BR_IS_HATCH)!=0) { /* FIXME: This is not the right value */ Buffer->lbHatch = (LONG)pbrush->hbmPattern; @@ -175,23 +175,23 @@ Buffer->lbStyle = 0; /* Get the type of style */ - if ((pbrush->flAttrs & GDIBRUSH_IS_SOLID)!=0) + if ((pbrush->flAttrs & BR_IS_SOLID)!=0) { Buffer->lbStyle = BS_SOLID; } - else if ((pbrush->flAttrs & GDIBRUSH_IS_NULL)!=0) + else if ((pbrush->flAttrs & BR_IS_NULL)!=0) { Buffer->lbStyle = BS_NULL; // BS_HOLLOW } - else if ((pbrush->flAttrs & GDIBRUSH_IS_HATCH)!=0) + else if ((pbrush->flAttrs & BR_IS_HATCH)!=0) { Buffer->lbStyle = BS_HATCHED; } - else if ((pbrush->flAttrs & GDIBRUSH_IS_BITMAP)!=0) + else if ((pbrush->flAttrs & BR_IS_BITMAP)!=0) { Buffer->lbStyle = BS_PATTERN; } - else if ((pbrush->flAttrs & GDIBRUSH_IS_DIB)!=0) + else if ((pbrush->flAttrs & BR_IS_DIB)!=0) { Buffer->lbStyle = BS_DIBPATTERN; } @@ -254,7 +254,7 @@ } hBrush = pbrush->BaseObject.hHmgr; - pbrush->flAttrs |= GDIBRUSH_IS_BITMAP | GDIBRUSH_IS_DIB; + pbrush->flAttrs |= BR_IS_BITMAP | BR_IS_DIB; pbrush->hbmPattern = hPattern; /* FIXME: Fill in the rest of fields!!! */ @@ -296,7 +296,7 @@ } hBrush = pbrush->BaseObject.hHmgr; - pbrush->flAttrs |= GDIBRUSH_IS_HATCH; + pbrush->flAttrs |= BR_IS_HATCH; pbrush->hbmPattern = hPattern; pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; @@ -332,7 +332,7 @@ } hBrush = pbrush->BaseObject.hHmgr; - pbrush->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrush->flAttrs |= BR_IS_BITMAP; pbrush->hbmPattern = hPattern; /* FIXME: Fill in the rest of fields!!! */ @@ -359,7 +359,7 @@ } hBrush = pbrush->BaseObject.hHmgr; - pbrush->flAttrs |= GDIBRUSH_IS_SOLID; + pbrush->flAttrs |= BR_IS_SOLID; pbrush->BrushAttr.lbColor = Color & 0x00FFFFFF; /* FIXME: Fill in the rest of fields!!! */ @@ -384,7 +384,7 @@ } hBrush = pbrush->BaseObject.hHmgr; - pbrush->flAttrs |= GDIBRUSH_IS_NULL; + pbrush->flAttrs |= BR_IS_NULL; GDIOBJ_vUnlockObject(&pbrush->BaseObject); return hBrush; @@ -397,7 +397,7 @@ PBRUSH pbrush; pbrush = BRUSH_ShareLockBrush(hBrush); - if (pbrush->flAttrs & GDIBRUSH_IS_SOLID) + if (pbrush->flAttrs & BR_IS_SOLID) { pbrush->BrushAttr.lbColor = Color & 0xFFFFFF; } Modified: trunk/reactos/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/brush.h?… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/brush.h [iso-8859-1] Fri May 4 17:37:07 2012 @@ -19,7 +19,7 @@ ULONG ulStyle; HBITMAP hbmPattern; - HANDLE hbmClient; + HBITMAP hbmClient; ULONG flAttrs; ULONG ulBrushUnique; @@ -67,24 +67,24 @@ } EBRUSHOBJ, *PEBRUSHOBJ; /* GDI Brush Attributes */ -#define GDIBRUSH_NEED_FG_CLR 0x0001 -#define GDIBRUSH_NEED_BK_CLR 0x0002 /* Background color is needed */ -#define GDIBRUSH_DITHER_OK 0x0004 /* Allow color dithering */ -#define GDIBRUSH_IS_SOLID 0x0010 /* Solid brush */ -#define GDIBRUSH_IS_HATCH 0x0020 /* Hatch brush */ -#define GDIBRUSH_IS_BITMAP 0x0040 /* DDB pattern brush */ -#define GDIBRUSH_IS_DIB 0x0080 /* DIB pattern brush */ -#define GDIBRUSH_IS_NULL 0x0100 /* Null/hollow brush */ -#define GDIBRUSH_IS_GLOBAL 0x0200 /* Stock objects */ -#define GDIBRUSH_IS_PEN 0x0400 /* Pen */ -#define GDIBRUSH_IS_OLDSTYLEPEN 0x0800 /* Geometric pen */ -#define GDIBRUSH_IS_DIBPALCOLORS 0x1000 -#define GDIBRUSH_IS_DIBPALINDICE 0x2000 -#define GDIBRUSH_IS_DEFAULTSTYLE 0x4000 -#define GDIBRUSH_IS_MASKING 0x8000 /* Pattern bitmap is used as transparent mask (?) */ -#define GDIBRUSH_IS_INSIDEFRAME 0x00010000 -#define GDIBRUSH_CACHED_ENGINE 0x00040000 -#define GDIBRUSH_CACHED_IS_SOLID 0x80000000 +#define BR_NEED_FG_CLR 0x00000001 +#define BR_NEED_BK_CLR 0x00000002 /* Background color is needed */ +#define BR_DITHER_OK 0x00000004 /* Allow color dithering */ +#define BR_IS_SOLID 0x00000010 /* Solid brush */ +#define BR_IS_HATCH 0x00000020 /* Hatch brush */ +#define BR_IS_BITMAP 0x00000040 /* DDB pattern brush */ +#define BR_IS_DIB 0x00000080 /* DIB pattern brush */ +#define BR_IS_NULL 0x00000100 /* Null/hollow brush */ +#define BR_IS_GLOBAL 0x00000200 /* Stock objects */ +#define BR_IS_PEN 0x00000400 /* Pen */ +#define BR_IS_OLDSTYLEPEN 0x00000800 /* Geometric pen */ +#define BR_IS_DIBPALCOLORS 0x00001000 +#define BR_IS_DIBPALINDICE 0x00002000 +#define BR_IS_DEFAULTSTYLE 0x00004000 +#define BR_IS_MASKING 0x00008000 /* Pattern bitmap is used as transparent mask (?) */ +#define BR_IS_INSIDEFRAME 0x00010000 +#define BR_CACHED_ENGINE 0x00040000 +#define BR_CACHED_IS_SOLID 0x80000000 #define BRUSH_AllocBrush() ((PBRUSH) GDIOBJ_AllocObj(GDIObjType_BRUSH_TYPE)) #define BRUSH_AllocBrushWithHandle() ((PBRUSH) GDIOBJ_AllocObjWithHandle(GDI_OBJECT_TYPE_BRUSH, sizeof(BRUSH))) Modified: trunk/reactos/win32ss/gdi/ntgdi/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dibobj.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/dibobj.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -1294,6 +1294,7 @@ pbmi, iUsage, fl, + cjMaxBits, hcmXform); cleanup: @@ -1302,7 +1303,7 @@ } HBITMAP -FASTCALL +NTAPI GreCreateDIBitmapInternal( IN HDC hDc, IN INT cx, @@ -1312,6 +1313,7 @@ IN OPTIONAL PBITMAPINFO pbmi, IN DWORD iUsage, IN FLONG fl, + IN UINT cjMaxBits, IN HANDLE hcmXform) { PDC Dc; Modified: trunk/reactos/win32ss/gdi/ntgdi/drawing.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/drawing.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/drawing.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -1263,7 +1263,7 @@ return 0; } - if (!(pbrush->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrush->flAttrs & BR_IS_NULL)) { pdcattr = dc->pdcattr; Modified: trunk/reactos/win32ss/gdi/ntgdi/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/fillshap… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/fillshap.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -85,7 +85,7 @@ ASSERT(psurf); /* Now fill the polygon with the current fill brush. */ - if (!(pbrFill->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrFill->flAttrs & BR_IS_NULL)) { BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); BrushOrigin.x += dc->ptlDCOrig.x; @@ -100,7 +100,7 @@ } // Draw the Polygon Edges with the current pen ( if not a NULL pen ) - if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrLine->flAttrs & BR_IS_NULL)) { int i; @@ -574,7 +574,7 @@ if (pbrFill) { - if (!(pbrFill->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrFill->flAttrs & BR_IS_NULL)) { BrushOrigin = *((PPOINTL)&pbrFill->ptOrigin); BrushOrigin.x += dc->ptlDCOrig.x; @@ -597,7 +597,7 @@ ret = TRUE; // Change default to success - if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrLine->flAttrs & BR_IS_NULL)) { Mix = ROP2_TO_MIX(pdcattr->jROP2); ret = ret && IntEngLineTo(&psurf->SurfObj, Modified: trunk/reactos/win32ss/gdi/ntgdi/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/line.c?r… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/line.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -131,7 +131,7 @@ pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); - if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrLine->flAttrs & BR_IS_NULL)) { Ret = IntEngLineTo(&psurf->SurfObj, dc->rosdc.CombinedClip, @@ -249,7 +249,7 @@ pbrLine = dc->dclevel.pbrLine; ASSERT(pbrLine); - if (!(pbrLine->flAttrs & GDIBRUSH_IS_NULL)) + if (!(pbrLine->flAttrs & BR_IS_NULL)) { Points = EngAllocMem(0, Count * sizeof(POINT), GDITAG_TEMP); if (Points != NULL) Modified: trunk/reactos/win32ss/gdi/ntgdi/pen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/pen.c?re… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/pen.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -86,7 +86,7 @@ pbrushPen->dwStyleCount = dwStyleCount; pbrushPen->pStyle = pStyle; - pbrushPen->flAttrs = bOldStylePen? GDIBRUSH_IS_OLDSTYLEPEN : GDIBRUSH_IS_PEN; + pbrushPen->flAttrs = bOldStylePen? BR_IS_OLDSTYLEPEN : BR_IS_PEN; // If dwPenStyle is PS_COSMETIC, the width must be set to 1. if ( !(bOldStylePen) && ((dwPenStyle & PS_TYPE_MASK) == PS_COSMETIC) && ( dwWidth != 1) ) @@ -95,40 +95,40 @@ switch (dwPenStyle & PS_STYLE_MASK) { case PS_NULL: - pbrushPen->flAttrs |= GDIBRUSH_IS_NULL; + pbrushPen->flAttrs |= BR_IS_NULL; break; case PS_SOLID: - pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID; break; case PS_ALTERNATE: - pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrushPen->flAttrs |= BR_IS_BITMAP; pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternAlternate); break; case PS_DOT: - pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrushPen->flAttrs |= BR_IS_BITMAP; pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDot); break; case PS_DASH: - pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrushPen->flAttrs |= BR_IS_BITMAP; pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDash); break; case PS_DASHDOT: - pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrushPen->flAttrs |= BR_IS_BITMAP; pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDot); break; case PS_DASHDOTDOT: - pbrushPen->flAttrs |= GDIBRUSH_IS_BITMAP; + pbrushPen->flAttrs |= BR_IS_BITMAP; pbrushPen->hbmPattern = GreCreateBitmap(24, 1, 1, 1, (LPBYTE)PatternDashDotDot); break; case PS_INSIDEFRAME: - pbrushPen->flAttrs |= (GDIBRUSH_IS_SOLID|GDIBRUSH_IS_INSIDEFRAME); + pbrushPen->flAttrs |= (BR_IS_SOLID|BR_IS_INSIDEFRAME); break; case PS_USERSTYLE: @@ -136,7 +136,7 @@ { /* FIXME: PS_USERSTYLE workaround */ DPRINT1("PS_COSMETIC | PS_USERSTYLE not handled\n"); - pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID; break; } else @@ -180,7 +180,7 @@ pbrPen = PEN_ShareLockPen(hPen); if (pbrPen) { - if (pbrPen->flAttrs & GDIBRUSH_IS_SOLID) + if (pbrPen->flAttrs & BR_IS_SOLID) { pbrPen->BrushAttr.lbColor = Color & 0xFFFFFF; } @@ -195,7 +195,7 @@ PEXTLOGPEN pExtLogPen; INT cbRetCount; - if (pbrushPen->flAttrs & GDIBRUSH_IS_OLDSTYLEPEN) + if (pbrushPen->flAttrs & BR_IS_OLDSTYLEPEN) { cbRetCount = sizeof(LOGPEN); if (pBuffer) Modified: trunk/reactos/win32ss/gdi/ntgdi/stockobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/stockobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/stockobj.c [iso-8859-1] Fri May 4 17:37:07 2012 @@ -120,16 +120,16 @@ pbrushPen->hbmClient = (HANDLE)NULL; pbrushPen->dwStyleCount = 0; pbrushPen->pStyle = 0; - pbrushPen->flAttrs = GDIBRUSH_IS_OLDSTYLEPEN; + pbrushPen->flAttrs = BR_IS_OLDSTYLEPEN; switch (dwPenStyle & PS_STYLE_MASK) { case PS_NULL: - pbrushPen->flAttrs |= GDIBRUSH_IS_NULL; + pbrushPen->flAttrs |= BR_IS_NULL; break; case PS_SOLID: - pbrushPen->flAttrs |= GDIBRUSH_IS_SOLID; + pbrushPen->flAttrs |= BR_IS_SOLID; break; } hPen = pbrushPen->BaseObject.hHmgr;

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