Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 28460: maze as a screensaver ;-)
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 04:43:25 2007 New Revision: 28460 URL: http://svn.reactos.org/svn/reactos?rev=28460&view=rev Log: maze as a screensaver ;-) Added: trunk/rosapps/demos/mazescr/ trunk/rosapps/demos/mazescr/maze.c trunk/rosapps/demos/mazescr/maze.rc trunk/rosapps/demos/mazescr/mazescr.rbuild trunk/rosapps/demos/mazescr/resource.h trunk/rosapps/demos/mazescr/scrnsave.c trunk/rosapps/demos/mazescr/scrnsave.rc Modified: trunk/rosapps/demos/directory.rbuild Modified: trunk/rosapps/demos/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/directory.rbuild?rev… ============================================================================== --- trunk/rosapps/demos/directory.rbuild (original) +++ trunk/rosapps/demos/directory.rbuild Thu Aug 23 04:43:25 2007 @@ -1,5 +1,9 @@ <directory name="maze"> <xi:include href="maze/maze.rbuild" /> +</directory> + +<directory name="mazescr"> + <xi:include href="mazescr/mazescr.rbuild" /> </directory> <directory name="ddraw"> Added: trunk/rosapps/demos/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/maze.c?rev=2… ============================================================================== --- trunk/rosapps/demos/mazescr/maze.c (added) +++ trunk/rosapps/demos/mazescr/maze.c Thu Aug 23 04:43:25 2007 @@ -1,0 +1,867 @@ +/****************************************************************************** + * [ maze ] ... + * + * modified: [ 03-08-15 ] Ge van Geldorp <ge(a)gse.nl> + * ported to Reactos + * modified: [ 94-10-8 ] Ge van Geldorp <Ge.vanGeldorp(a)lr.tudelft.nl> + * ported to MS Windows + * modified: [ 3-7-93 ] Jamie Zawinski <jwz(a)lucid.com> + * added the XRoger logo, cleaned up resources, made + * grid size a parameter. + * modified: [ 3-3-93 ] Jim Randell <jmr(a)mddjmr.fc.hp.com> + * Added the colour stuff and integrated it with jwz's + * screenhack stuff. There's still some work that could + * be done on this, particularly allowing a resource to + * specify how big the squares are. + * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess + * [ Revised primary execution loop within main()... + * [ Extended X event handler, check_events()... + * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com + * [ Hacked for X11... + * [ Note the word "hacked" -- this is extremely ugly, but at + * [ least it does the job. NOT a good programming example + * [ for X. + * original: [ 6/21/85 ] Martin Weiss Sun Microsystems [ SunView ] + * + ****************************************************************************** + Copyright 1988 by Sun Microsystems, Inc. Mountain View, CA. + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the names of Sun or MIT not be + used in advertising or publicity pertaining to distribution of the + software without specific prior written permission. Sun and M.I.T. + make no representations about the suitability of this software for + any purpose. It is provided "as is" without any express or implied warranty. + + SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING + ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + PURPOSE. IN NO EVENT SHALL SUN BE LIABLE FOR ANY SPECIAL, INDIRECT + OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE. + *****************************************************************************/ + +#define STRICT + +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <windows.h> /* required for all Windows applications */ + +#if !defined (APIENTRY) /* Windows NT defines APIENTRY, but 3.x doesn't */ +#define APIENTRY far pascal +#endif + +#if !defined(WIN32) /* Windows 3.x uses a FARPROC for dialogs */ +#define DLGPROC FARPROC +#endif + +static BOOL InitInstance(HINSTANCE hInstance, HWND hParent); +LRESULT CALLBACK MazeWndProc(HWND hWnd, UINT message, WPARAM uParam, + LPARAM lParam); + +HINSTANCE hInst; /* current instance */ +HWND hWnd; /* Main window handle.*/ +HBRUSH hBrushDead; +HBRUSH hBrushLiving; +HPEN hPenWall; +HDC hDC; +static BOOL waiting; + + +WCHAR szAppName[] = L"Maze"; /* The name of this application */ +WCHAR szTitle[] = L"Maze"; /* The title bar text */ + +static int solve_delay, pre_solve_delay, post_solve_delay; + +#define MAX_MAZE_SIZE_X ((unsigned long) 250) +#define MAX_MAZE_SIZE_Y ((unsigned long) 250) + +#define MOVE_LIST_SIZE (MAX_MAZE_SIZE_X * MAX_MAZE_SIZE_Y) + +#define WALL_TOP 0x8000 +#define WALL_RIGHT 0x4000 +#define WALL_BOTTOM 0x2000 +#define WALL_LEFT 0x1000 + +#define DOOR_IN_TOP 0x800 +#define DOOR_IN_RIGHT 0x400 +#define DOOR_IN_BOTTOM 0x200 +#define DOOR_IN_LEFT 0x100 +#define DOOR_IN_ANY 0xF00 + +#define DOOR_OUT_TOP 0x80 +#define DOOR_OUT_RIGHT 0x40 +#define DOOR_OUT_BOTTOM 0x20 +#define DOOR_OUT_LEFT 0x10 + +#define START_SQUARE 0x2 +#define END_SQUARE 0x1 + +#define border_x (0) +#define border_y (0) + +#define get_random(x) (rand() % (x)) + +static unsigned short maze[MAX_MAZE_SIZE_X][MAX_MAZE_SIZE_Y]; + +static struct { + unsigned char x; + unsigned char y; + unsigned char dir; + unsigned char dummy; +} move_list[MOVE_LIST_SIZE], save_path[MOVE_LIST_SIZE], path[MOVE_LIST_SIZE]; + +static int maze_size_x, maze_size_y; +static long sqnum, path_length; +static int cur_sq_x, cur_sq_y; +static int start_x, start_y, start_dir, end_x, end_y, end_dir; +static int grid_width, grid_height; + +static int state = 1, pathi = 0; + +static void +set_maze_sizes (width, height) + int width, height; +{ + maze_size_x = width / grid_width; + maze_size_y = height / grid_height; +} + + +static void +initialize_maze() /* draw the surrounding wall and start/end squares */ +{ + register int i, j, wall; + + /* initialize all squares */ + for ( i=0; i<maze_size_x; i++) { + for ( j=0; j<maze_size_y; j++) { + maze[i][j] = 0; + } + } + + /* top wall */ + for ( i=0; i<maze_size_x; i++ ) { + maze[i][0] |= WALL_TOP; + } + + /* right wall */ + for ( j=0; j<maze_size_y; j++ ) { + maze[maze_size_x-1][j] |= WALL_RIGHT; + } + + /* bottom wall */ + for ( i=0; i<maze_size_x; i++ ) { + maze[i][maze_size_y-1] |= WALL_BOTTOM; + } + + /* left wall */ + for ( j=0; j<maze_size_y; j++ ) { + maze[0][j] |= WALL_LEFT; + } + + /* set start square */ + wall = get_random(4); + switch (wall) { + case 0: + i = get_random(maze_size_x); + j = 0; + break; + case 1: + i = maze_size_x - 1; + j = get_random(maze_size_y); + break; + case 2: + i = get_random(maze_size_x); + j = maze_size_y - 1; + break; + case 3: + i = 0; + j = get_random(maze_size_y); + break; + } + maze[i][j] |= START_SQUARE; + maze[i][j] |= ( DOOR_IN_TOP >> wall ); + maze[i][j] &= ~( WALL_TOP >> wall ); + cur_sq_x = i; + cur_sq_y = j; + start_x = i; + start_y = j; + start_dir = wall; + sqnum = 0; + + /* set end square */ + wall = (wall + 2)%4; + switch (wall) { + case 0: + i = get_random(maze_size_x); + j = 0; + break; + case 1: + i = maze_size_x - 1; + j = get_random(maze_size_y); + break; + case 2: + i = get_random(maze_size_x); + j = maze_size_y - 1; + break; + case 3: + i = 0; + j = get_random(maze_size_y); + break; + } + maze[i][j] |= END_SQUARE; + maze[i][j] |= ( DOOR_OUT_TOP >> wall ); + maze[i][j] &= ~( WALL_TOP >> wall ); + end_x = i; + end_y = j; + end_dir = wall; +} + +static int choose_door (); +static long backup (); +static void draw_wall (); +static void draw_solid_square(int, int, int, HDC, HBRUSH); +static void enter_square(int, HDC, HBRUSH); + +static void +create_maze() /* create a maze layout given the intiialized maze */ +{ + register int i, newdoor = 0; + HDC hDC; + + hDC = GetDC(hWnd); + do { + move_list[sqnum].x = cur_sq_x; + move_list[sqnum].y = cur_sq_y; + move_list[sqnum].dir = newdoor; + while ( ( newdoor = choose_door(hDC) ) == -1 ) { /* pick a door */ + if ( backup() == -1 ) { /* no more doors ... backup */ + ReleaseDC(hWnd, hDC); + return; /* done ... return */ + } + } + + /* mark the out door */ + maze[cur_sq_x][cur_sq_y] |= ( DOOR_OUT_TOP >> newdoor ); + + switch (newdoor) { + case 0: cur_sq_y--; + break; + case 1: cur_sq_x++; + break; + case 2: cur_sq_y++; + break; + case 3: cur_sq_x--; + break; + } + sqnum++; + + /* mark the in door */ + maze[cur_sq_x][cur_sq_y] |= ( DOOR_IN_TOP >> ((newdoor+2)%4) ); + + /* if end square set path length and save path */ + if ( maze[cur_sq_x][cur_sq_y] & END_SQUARE ) { + path_length = sqnum; + for ( i=0; i<path_length; i++) { + save_path[i].x = move_list[i].x; + save_path[i].y = move_list[i].y; + save_path[i].dir = move_list[i].dir; + } + } + + } while (1); + +} + + +static int +choose_door(HDC hDC) /* pick a new path */ +{ + int candidates[3]; + register int num_candidates; + + num_candidates = 0; + + /* top wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_TOP ) + goto rightwall; + if ( maze[cur_sq_x][cur_sq_y - 1] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_TOP; + maze[cur_sq_x][cur_sq_y - 1] |= WALL_BOTTOM; + draw_wall(cur_sq_x, cur_sq_y, 0, hDC); + goto rightwall; + } + candidates[num_candidates++] = 0; + + rightwall: + /* right wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_RIGHT ) + goto bottomwall; + if ( maze[cur_sq_x + 1][cur_sq_y] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_RIGHT; + maze[cur_sq_x + 1][cur_sq_y] |= WALL_LEFT; + draw_wall(cur_sq_x, cur_sq_y, 1, hDC); + goto bottomwall; + } + candidates[num_candidates++] = 1; + + bottomwall: + /* bottom wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_BOTTOM ) + goto leftwall; + if ( maze[cur_sq_x][cur_sq_y + 1] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_BOTTOM; + maze[cur_sq_x][cur_sq_y + 1] |= WALL_TOP; + draw_wall(cur_sq_x, cur_sq_y, 2, hDC); + goto leftwall; + } + candidates[num_candidates++] = 2; + + leftwall: + /* left wall */ + if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_LEFT ) + goto donewall; + if ( maze[cur_sq_x][cur_sq_y] & DOOR_OUT_LEFT ) + goto donewall; + if ( maze[cur_sq_x][cur_sq_y] & WALL_LEFT ) + goto donewall; + if ( maze[cur_sq_x - 1][cur_sq_y] & DOOR_IN_ANY ) { + maze[cur_sq_x][cur_sq_y] |= WALL_LEFT; + maze[cur_sq_x - 1][cur_sq_y] |= WALL_RIGHT; + draw_wall(cur_sq_x, cur_sq_y, 3, hDC); + goto donewall; + } + candidates[num_candidates++] = 3; + + donewall: + if (num_candidates == 0) + return ( -1 ); + if (num_candidates == 1) + return ( candidates[0] ); + return ( candidates[ get_random(num_candidates) ] ); + +} + + +static long +backup() /* back up a move */ +{ + sqnum--; + if (0 <= sqnum) { + cur_sq_x = move_list[sqnum].x; + cur_sq_y = move_list[sqnum].y; + } + return ( sqnum ); +} + +int bw; + +static void +draw_solid_square(i, j, dir, hDC, hBrush) /* draw a solid square in a square */ + register int i, j, dir; + HDC hDC; + HBRUSH hBrush; +{ + RECT rc; + + switch (dir) { + case 0: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width - (bw + bw); + rc.top = border_y - bw + grid_height * j; + rc.bottom = rc.top + grid_height; + break; + case 1: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width; + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height - (bw + bw); + break; + case 2: + rc.left = border_x + bw + grid_width * i; + rc.right = rc.left + grid_width - (bw + bw); + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height; + break; + case 3: + rc.left = border_x - bw + grid_width * i; + rc.right = rc.left + grid_width; + rc.top = border_y + bw + grid_height * j; + rc.bottom = rc.top + grid_height - (bw + bw); + break; + } + (void) FillRect(hDC, &rc, hBrush); +} + +static void +draw_maze_border(HWND hWnd, HDC hDC) /* draw the maze outline */ +{ + register int i, j; + HBRUSH hBrush; + + SelectObject(hDC, hPenWall); + + for ( i=0; i<maze_size_x; i++) { + if ( maze[i][0] & WALL_TOP ) { + MoveToEx(hDC, border_x + grid_width * i, border_y, NULL); + (void) LineTo(hDC, border_x + grid_width * (i + 1) - 1, border_y); + } + if ((maze[i][maze_size_y - 1] & WALL_BOTTOM)) { + MoveToEx(hDC, border_x + grid_width * i, + border_y + grid_height * (maze_size_y) - 1, NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1) - 1, + border_y + grid_height * (maze_size_y) - 1); + } + } + for ( j=0; j<maze_size_y; j++) { + if ( maze[maze_size_x - 1][j] & WALL_RIGHT ) { + MoveToEx(hDC, border_x + grid_width * maze_size_x - 1, + border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x + grid_width * maze_size_x - 1, + border_y + grid_height * (j+1) - 1); + } + if ( maze[0][j] & WALL_LEFT ) { + MoveToEx(hDC, border_x, border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x, border_y + grid_height * (j+1) - 1); + } + } + + hBrush = GetStockObject(WHITE_BRUSH); // FIXME: do not hardcode + draw_solid_square (start_x, start_y, start_dir, hDC, hBrush); + draw_solid_square (end_x, end_y, end_dir, hDC, hBrush); +} + + +static void +draw_wall(i, j, dir, hDC) /* draw a single wall */ + int i, j, dir; + HDC hDC; +{ + SelectObject(hDC, hPenWall); + + switch (dir) { + case 0: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * j); + break; + case 1: + MoveToEx(hDC, border_x + grid_width * (i+1), border_y + grid_height * j, + NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * (j+1)); + break; + case 2: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * (j+1), + NULL); + (void) LineTo(hDC, border_x + grid_width * (i+1), + border_y + grid_height * (j+1)); + break; + case 3: + MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, + NULL); + (void) LineTo(hDC, border_x + grid_width * i, + border_y + grid_height * (j+1)); + break; + } +} + +static void +begin_solve_maze() /* solve it with graphical feedback */ +{ + static long grayPattern[] = { + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa + }; + static RGBQUAD argbq[] = { + { 0, 0, 255, 0 }, + { 255, 255, 255, 0 } + }; + BITMAPINFO *pbmi; + + hDC = GetDC(hWnd); + pbmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(argbq) + sizeof(grayPattern)); + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = 8; + pbmi->bmiHeader.biHeight = 8; + pbmi->bmiHeader.biPlanes = 1; + pbmi->bmiHeader.biBitCount = 1; + pbmi->bmiHeader.biCompression = BI_RGB; + (void) memcpy(pbmi->bmiColors, argbq, sizeof(argbq)); + (void) memcpy(pbmi->bmiColors + 2, grayPattern, sizeof(grayPattern)); +#if 0 + /* FIXME Pattern brushes not yet implemented in ReactOS */ + hBrushDead = CreateDIBPatternBrushPt(pbmi, DIB_RGB_COLORS); +#else + hBrushDead = CreateSolidBrush(RGB(255, 0, 0)); +#endif +// hBrushDead = CreateHatchBrush(HS_DIAGCROSS, RGB(255, 0, 0)); + free(pbmi); + hBrushLiving = CreateSolidBrush(RGB(0, 255, 0)); + + /* plug up the surrounding wall */ + maze[start_x][start_y] |= (WALL_TOP >> start_dir); + maze[end_x][end_y] |= (WALL_TOP >> end_dir); + + /* initialize search path */ + pathi = 0; + path[pathi].x = end_x; + path[pathi].y = end_y; + path[pathi].dir = -1; +} + +static int +solve_maze() /* solve it with graphical feedback */ +{ + int ret; + int action_done; + + do { + action_done = 1; + if ( ++path[pathi].dir >= 4 ) { + pathi--; + draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), + (int)(path[pathi].dir), hDC, hBrushDead); + ret = 0; + } + else if ( ! (maze[path[pathi].x][path[pathi].y] & + (WALL_TOP >> path[pathi].dir)) && + ( (pathi == 0) || ( (path[pathi].dir != + (int)(path[pathi-1].dir+2)%4) ) ) ) { + enter_square(pathi, hDC, hBrushLiving); + pathi++; + if ( maze[path[pathi].x][path[pathi].y] & START_SQUARE ) { + DeleteObject(hBrushLiving); + DeleteObject(hBrushDead); + ReleaseDC(hWnd, hDC); + ret = 1; + } else { + ret = 0; + } + } else { + action_done = 0; + } + } while (! action_done); + + return ret; +} + + +static void +enter_square(int n, HDC hDC, HBRUSH hBrush) /* move into a neighboring square */ +{ + draw_solid_square( (int)path[n].x, (int)path[n].y, + (int)path[n].dir, hDC, hBrush); + + path[n+1].dir = -1; + switch (path[n].dir) { + case 0: path[n+1].x = path[n].x; + path[n+1].y = path[n].y - 1; + break; + case 1: path[n+1].x = path[n].x + 1; + path[n+1].y = path[n].y; + break; + case 2: path[n+1].x = path[n].x; + path[n+1].y = path[n].y + 1; + break; + case 3: path[n+1].x = path[n].x - 1; + path[n+1].y = path[n].y; + break; + } +} + +static void +start_timer(HWND hWnd, int iTimeout) +{ + waiting = TRUE; + SetTimer(hWnd, 1, iTimeout, NULL); +} + +/**************************************************************************** + + FUNCTION: WinMain(HINSTANCE, HINSTANCE, LPSTR, int) + + PURPOSE: calls initialization function, processes message loop + + COMMENTS: + + Windows recognizes this function by name as the initial entry point + for the program. This function calls the application initialization + routine, if no other instance of the program is running, and always + calls the instance initialization routine. It then executes a message + retrieval and dispatch loop that is the top-level control structure + for the remainder of execution. The loop is terminated when a WM_QUIT + message is received, at which time this function exits the application + instance by returning the value passed by PostQuitMessage(). + + If this function must abort before entering the message loop, it + returns the conventional value NULL. + +****************************************************************************/ + +int APIENTRY MazeMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + HWND hParent) +{ + MSG msg; + HDC hDC; + + /* Perform initializations that apply to a specific instance */ + + if (!InitInstance(hInstance, hParent)) { + return (FALSE); + } + + waiting = FALSE; + state = 1; + + /* Acquire and dispatch messages until a WM_QUIT message is received. */ + + while (0 != state) { + if (waiting) { + (void) WaitMessage(); + } + while (0 != state && PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + if (WM_QUIT == msg.message) { + state = 0; + } else { + DispatchMessage(&msg); /* Dispatches message to window */ + } + } + switch (state) { + case 1: + initialize_maze(); + state = 2; + break; + case 2: + hDC = GetDC(hWnd); + SendMessage(hWnd, WM_ERASEBKGND, (WPARAM) hDC, (LPARAM) 0); + draw_maze_border(hWnd, hDC); + ReleaseDC(hWnd, hDC); + state = 3; + break; + case 3: + create_maze(); + state = 4; + break; + case 4: + start_timer(hWnd, pre_solve_delay); + state = 5; + break; + case 5: + if (! waiting) { + state = 6; + } + break; + case 6: + begin_solve_maze(); + if (0 != solve_delay) { + start_timer(hWnd, solve_delay); + state = 7; + } else { + state = 8; + } + break; + case 7: + if (! waiting) { + state = 8; + } + break; + case 8: + if (! solve_maze()) { + if (0 != solve_delay) { + start_timer(hWnd, solve_delay); + state = 7; + } + } else { + state = 9; + } + break; + case 9: + start_timer(hWnd, post_solve_delay); + state = 10; + break; + case 10: + if (! waiting) { + state = 11; + } + break; + case 11: + state = 1; + break; + } + } + + return (msg.wParam); /* Returns the value from PostQuitMessage */ +} + + +/**************************************************************************** + + FUNCTION: InitInstance(HINSTANCE, int) + + PURPOSE: Saves instance handle and creates main window + + COMMENTS: + + This function is called at initialization time for every instance of + this application. This function performs initialization tasks that + cannot be shared by multiple instances. + + In this case, we save the instance handle in a static variable and + create and display the main program window. + +****************************************************************************/ + +static BOOL InitInstance( + HINSTANCE hInstance, + HWND hParent) +{ + RECT rect; + + /* Save the instance handle in static variable, which will be used in + many subsequence calls from this application to Windows. */ + + hInst = hInstance; /* Store instance handle in our global variable */ + + GetClientRect(hParent, &rect); +#if 0 + /* Create a main window for this application instance. */ + hWnd = CreateWindow( + szAppName, /* See RegisterClass() call. */ + szTitle, /* Text for window title bar. */ + WS_CHILD,/* Window style. */ + 0, 0, rect.right/2, rect.bottom/2, /* Use default positioning */ + hParent, /* We use a Parent. */ + NULL, /* Use the window class menu. */ + hInstance, /* This instance owns this window. */ + NULL /* We don't use any data in our WM_CREATE */ + ); +#endif +hWnd = hParent; + // If window could not be created, return "failure" + if (!hWnd) { + return (FALSE); + } + + // Make the window visible; update its client area; and return "success" + ShowWindow(hWnd, SW_SHOW); // Show the window + UpdateWindow(hWnd); // Sends WM_PAINT message + + hPenWall = CreatePen(PS_SOLID, 3, RGB(150,150,150)); + + return (TRUE); // We succeeded... + +} + +static BOOL +OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct) +{ + RECT rc; + int size; + + srand((unsigned) time(NULL)); + +#if 0 + /* FIXME GetPrivateProfileInt not yet implemented in ReactOS */ + size = GetPrivateProfileInt("maze", "gridsize", 0, "maze.ini"); + pre_solve_delay = GetPrivateProfileInt("maze", "predelay", 5000, + "maze.ini"); + post_solve_delay = GetPrivateProfileInt("maze", "postdelay", 5000, + "maze.ini"); + solve_delay = GetPrivateProfileInt("maze", "solvedelay", 10, + "maze.ini"); +#else + size = 10; + pre_solve_delay = 5000; + post_solve_delay = 5000; + solve_delay = 1; +#endif + + if (size < 2) { + size = 7 + (rand() % 30); + } + grid_width = grid_height = size; + bw = (size > 6 ? 3 : (size-1)/2); + + GetClientRect(hWnd, &rc); + set_maze_sizes(rc.right - rc.left, rc.bottom - rc.top); + + return TRUE; +} + +void OnTimer(HWND hwnd, UINT id) +{ + waiting = FALSE; +} + +/**************************************************************************** + + FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM) + + PURPOSE: Processes messages + + MESSAGES: + + WM_DESTROY - destroy window + + COMMENTS: + +****************************************************************************/ + +LRESULT CALLBACK MazeWndProc( + HWND hWnd, // window handle + UINT message, // type of message + WPARAM wParam, // additional information + LPARAM lParam) // additional information +{ + PAINTSTRUCT ps; + + switch (message) { + case WM_CREATE: + OnCreate(hWnd, (LPCREATESTRUCT) lParam); + break; + case WM_PAINT: + BeginPaint(hWnd, &ps); + state = 1; + EndPaint(hWnd, &ps); + case WM_TIMER: + OnTimer(hWnd, wParam); + break; + case WM_DESTROY: // message: window being destroyed + PostQuitMessage(0); + break; + + default: // Passes it on if unproccessed + return (DefWindowProc(hWnd, message, wParam, lParam)); + } + return (0); +} Added: trunk/rosapps/demos/mazescr/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/maze.rc?rev=… ============================================================================== --- trunk/rosapps/demos/mazescr/maze.rc (added) +++ trunk/rosapps/demos/mazescr/maze.rc Thu Aug 23 04:43:25 2007 @@ -1,0 +1,60 @@ +//Microsoft App Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <scrnsave.h> +///////////////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + + +////////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + idsAppName "Screen Saver.Maze" +END + +#ifdef APSTUDIO_INVOKED +////////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include <scrnsave.h>\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +///////////////////////////////////////////////////////////////////////////////////// +#endif // APSTUDIO_INVOKED + + +#ifndef APSTUDIO_INVOKED +//////////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Added: trunk/rosapps/demos/mazescr/mazescr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/mazescr.rbui… ============================================================================== --- trunk/rosapps/demos/mazescr/mazescr.rbuild (added) +++ trunk/rosapps/demos/mazescr/mazescr.rbuild Thu Aug 23 04:43:25 2007 @@ -1,0 +1,17 @@ +<module name="mazescr" type="win32scr" installbase="system32" installname="maze.scr"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <file>scrnsave.c</file> + <file>scrnsave.rc</file> + <file>maze.c</file> + <file>maze.rc</file> +</module> Added: trunk/rosapps/demos/mazescr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/resource.h?r… ============================================================================== --- trunk/rosapps/demos/mazescr/resource.h (added) +++ trunk/rosapps/demos/mazescr/resource.h Thu Aug 23 04:43:25 2007 @@ -1,0 +1,18 @@ +//{{NO_DEPENDENCIES}} +// App Studio generated include file. +// Used by MAZE.RC +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS + +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 101 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif + +#define IDS_DESCRIPTION 1 Added: trunk/rosapps/demos/mazescr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/scrnsave.c?r… ============================================================================== --- trunk/rosapps/demos/mazescr/scrnsave.c (added) +++ trunk/rosapps/demos/mazescr/scrnsave.c Thu Aug 23 04:43:25 2007 @@ -1,0 +1,199 @@ +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> + +#define APPNAME _T("Scrnsave") + +LRESULT CALLBACK MazeWndProc( + HWND hWnd, // window handle + UINT message, // type of message + WPARAM wParam, // additional information + LPARAM lParam); // additional information + +int APIENTRY MazeMain( + HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + HWND hParent); + +HINSTANCE hInstance; + +BOOL fullscreen = FALSE; + + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + + switch (msg) + { + case WM_DESTROY: + PostQuitMessage(0); + break; + + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if(abs(ptCursor.x - ptLast.x) >= 3 || abs(ptCursor.y - ptLast.y) >= 3) + PostMessage(hwnd, WM_CLOSE, 0, 0); + + ptLast = ptCursor; + + return 0; + } + + return MazeWndProc(hwnd, msg, wParam, lParam); +} + +HWND InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + HWND hwnd; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ShowCursor(FALSE); + fullscreen = TRUE; + } + return hwnd; +} + +void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +{ + int ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = atoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = 0; +} + +int WINAPI WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + HWND hwndChild; + UINT nPreviousState; + int chOption; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + hwndChild = InitSaver(0); + break; + + case 'p': + hwndChild = InitSaver(hwndParent); + break; + + case 'c': + default: + MessageBox(0, + _T("No options need to be set."), + _T("About"), + MB_OK | MB_ICONWARNING); + return 0; + } + + MazeMain(hInst, hPrev, lpCmdLine, hwndChild); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return 0; +} Added: trunk/rosapps/demos/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/mazescr/scrnsave.rc?… ============================================================================== --- trunk/rosapps/demos/mazescr/scrnsave.rc (added) +++ trunk/rosapps/demos/mazescr/scrnsave.rc Thu Aug 23 04:43:25 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Default ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "scrnsave\0" +#define REACTOS_STR_ORIGINAL_FILENAME "scrnsave.scr\0" + +#include <reactos/version.rc> + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Default ScreenSaver" +END

1 0

[tkreuzer] 28459: - NtGdiAnimatePalette, NtGdiGe/SetPaletteEntries, NtGdiGetSystemPaletteEntries, NtGdiGet/SetDIBColorTable: rename into IntXxx, remove SEH and remove functions from w32ksvc.db - implement NtGdiDoPalette calling the Int functions using SEH & ProbeForXxx and add it to w32ksvc.db - change parameters of NtGdiDoPalette: HPALETTE -> HGDIOBJ, as it also accepts HDC, LPPALETTENTRY -> LPVOID as it also accepts RGBQUAD* - implement stub functions in gdi32.dll calling NtGdiDoPalette instea
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 04:31:26 2007 New Revision: 28459 URL: http://svn.reactos.org/svn/reactos?rev=28459&view=rev Log: - NtGdiAnimatePalette, NtGdiGe/SetPaletteEntries, NtGdiGetSystemPaletteEntries, NtGdiGet/SetDIBColorTable: rename into IntXxx, remove SEH and remove functions from w32ksvc.db - implement NtGdiDoPalette calling the Int functions using SEH & ProbeForXxx and add it to w32ksvc.db - change parameters of NtGdiDoPalette: HPALETTE -> HGDIOBJ, as it also accepts HDC, LPPALETTENTRY -> LPVOID as it also accepts RGBQUAD* - implement stub functions in gdi32.dll calling NtGdiDoPalette instead of redirecting to the old NtGdixxx functions - update ntgdibad.h Added: trunk/reactos/dll/win32/gdi32/objects/palette.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/include/psdk/ntgdi.h trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/objects/color.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Thu Aug 23 04:31:26 2007 @@ -17,7 +17,7 @@ AddFontResourceW@4 AddFontResourceTracking@8 AngleArc@24 -AnimatePalette@16=NtGdiAnimatePalette@16 +AnimatePalette@16 AnyLinkedFonts@0 Arc@36 ArcTo@36 @@ -368,7 +368,7 @@ GetDCBrushColor@4 GetDCOrgEx@8 GetDCPenColor@4 -GetDIBColorTable@16=NtGdiGetDIBColorTable@16 +GetDIBColorTable@16 GetDIBits@28 GetDeviceCaps@8=NtGdiGetDeviceCaps@8 GetDeviceGammaRamp@8 @@ -417,7 +417,7 @@ GetObjectW@12 GetOutlineTextMetricsA@12 GetOutlineTextMetricsW@12 -GetPaletteEntries@16=NtGdiGetPaletteEntries@16 +GetPaletteEntries@16 GetPath@16 GetPixel@12=NtGdiGetPixel@12 GetPixelFormat@4 @@ -432,7 +432,7 @@ GetStretchBltMode@4=NtGdiGetStretchBltMode@4 GetStringBitmapA@20 GetStringBitmapW@20 -GetSystemPaletteEntries@16=NtGdiGetSystemPaletteEntries@16 +GetSystemPaletteEntries@16 GetSystemPaletteUse@4 GetTextAlign@4=NtGdiGetTextAlign@4 GetTextCharacterExtra@4 @@ -542,7 +542,7 @@ SetColorSpace@8 SetDCBrushColor@8 SetDCPenColor@8 -SetDIBColorTable@16=NtGdiSetDIBColorTable@16 +SetDIBColorTable@16 SetDIBits@28=NtGdiSetDIBits@28 SetDIBitsToDevice@48 SetDeviceGammaRamp@8 @@ -560,7 +560,7 @@ SetMetaFileBitsEx@8 SetMetaRgn@4 SetMiterLimit@12 -SetPaletteEntries@16=NtGdiSetPaletteEntries@16 +SetPaletteEntries@16 SetPixel@16=NtGdiSetPixel@16 SetPixelFormat@12 SetPixelV@16=NtGdiSetPixelV@16 Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Thu Aug 23 04:31:26 2007 @@ -37,6 +37,7 @@ <file>linedda.c</file> <file>metafile.c</file> <file>painting.c</file> + <file>palette.c</file> <file>pen.c</file> <file>region.c</file> <file>text.c</file> Added: trunk/reactos/dll/win32/gdi32/objects/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/pa… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/palette.c (added) +++ trunk/reactos/dll/win32/gdi32/objects/palette.c Thu Aug 23 04:31:26 2007 @@ -1,0 +1,66 @@ +#include "precomp.h" + +#define NDEBUG +#include <debug.h> + +BOOL +WINAPI +AnimatePalette(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + const PALETTEENTRY *ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe, GdiPalAnimate, TRUE); +} + +UINT +WINAPI +GetPaletteEntries(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + LPPALETTEENTRY ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, ppe, GdiPalGetEntries, FALSE); +} + +UINT +WINAPI +SetPaletteEntries(HPALETTE hpal, + UINT iStartIndex, + UINT cEntries, + const PALETTEENTRY *ppe) +{ + return NtGdiDoPalette(hpal, iStartIndex, cEntries, (PALETTEENTRY*)ppe, GdiPalSetEntries, TRUE); +} + +UINT +WINAPI +GetSystemPaletteEntries(HDC hDC, + UINT iStartIndex, + UINT cEntries, + LPPALETTEENTRY ppe) +{ + return NtGdiDoPalette(hDC, iStartIndex, cEntries, ppe, GdiPalGetSystemEntries, FALSE); +} + +UINT +WINAPI +GetDIBColorTable(HDC hDC, + UINT iStartIndex, + UINT cEntries, + RGBQUAD *pColors) +{ + return NtGdiDoPalette(hDC, iStartIndex, cEntries, pColors, GdiPalGetColorTable, FALSE); +} + +UINT +WINAPI +SetDIBColorTable(HDC hDC, + UINT iStartIndex, + UINT cEntries, + const RGBQUAD *pColors) +{ + return NtGdiDoPalette(hDC, iStartIndex, cEntries, (RGBQUAD*)pColors, GdiPalSetColorTable, TRUE); +} + +/* EOF */ Modified: trunk/reactos/include/psdk/ntgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/ntgdi.h (original) +++ trunk/reactos/include/psdk/ntgdi.h Thu Aug 23 04:31:26 2007 @@ -385,10 +385,10 @@ LONG APIENTRY NtGdiDoPalette( - IN HPALETTE hpal, + IN HGDIOBJ hObj, IN WORD iStart, IN WORD cEntries, - IN PALETTEENTRY *pPalEntries, + IN LPVOID pEntries, IN DWORD iFunc, IN BOOL bInbound ); Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Thu Aug 23 04:31:26 2007 @@ -103,16 +103,6 @@ NtGdiAddFontResource(PUNICODE_STRING Filename, DWORD fl); -/* Use NtGdiDoPalette with GdiPalAnimate */ -BOOL -STDCALL -NtGdiAnimatePalette ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - CONST PPALETTEENTRY ppe - ); - /* Metafiles are user mode */ HENHMETAFILE STDCALL @@ -307,16 +297,6 @@ /* Use NtGdiGetDCPoint with GdiGetDCOrg. */ BOOL STDCALL NtGdiGetDCOrgEx(HDC hDC, LPPOINT Point); -/* Use NtGdiDoPalette with GdiPalGetColorTable. */ -UINT -STDCALL -NtGdiGetDIBColorTable ( - HDC hDC, - UINT StartIndex, - UINT Entries, - RGBQUAD * Colors - ); - /* Meta are user-mode. */ HENHMETAFILE STDCALL @@ -394,16 +374,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetMapMode(HDC hDC); -/* Use NtGdiDoPalette with GdiPalGetEntries. */ -UINT -STDCALL -NtGdiGetPaletteEntries ( - HPALETTE hpal, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); - /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL @@ -417,16 +387,6 @@ /* Should be done in user-mode using shared GDI Objects. */ INT STDCALL NtGdiGetStretchBltMode(HDC hDC); - -/* Use NtGdiDoPalette with GdiPalSetSystemEntries. */ -UINT -STDCALL -NtGdiGetSystemPaletteEntries ( - HDC hDC, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe - ); /* Should be done in user-mode using shared GDI Objects. */ UINT STDCALL NtGdiGetTextAlign(HDC hDC); @@ -582,16 +542,6 @@ /* Needs to be done in user-mode, using shared GDI Object Attributes. */ INT STDCALL NtGdiSetBkMode(HDC hDC, INT backgroundMode); - -/* Use NtGdiDoPalette with GdiPalSetColorTable, TRUE. */ -UINT -STDCALL -NtGdiSetDIBColorTable ( - HDC hDC, - UINT StartIndex, - UINT Entries, - CONST RGBQUAD * Colors - ); /* Use SetDIBitsToDevice in gdi32. */ INT @@ -633,17 +583,6 @@ STDCALL NtGdiSetMapperFlags(HDC hDC, DWORD Flag); - - -/* Use NtGdiDoPalette with GdiPalSetEntries, TRUE. */ -UINT -STDCALL -NtGdiSetPaletteEntries ( - HPALETTE hpal, - UINT Start, - UINT Entries, - CONST LPPALETTEENTRY pe - ); /* Use NtGdiSetPixel(hdc, x, y, color) != CLR_INVALID; */ BOOL Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h Thu Aug 23 04:31:26 2007 @@ -271,5 +271,36 @@ LONG STDCALL IntGetBitmapBits(PBITMAPOBJ bmp, DWORD Bytes, OUT PBYTE Bits); +UINT STDCALL IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors); + +UINT STDCALL IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors); + +UINT STDCALL +IntAnimatePalette(HPALETTE hPal, UINT StartIndex, + UINT NumEntries, CONST PPALETTEENTRY PaletteColors); + +UINT STDCALL +IntGetPaletteEntries(HPALETTE hpal, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe); + +UINT STDCALL +IntSetPaletteEntries(HPALETTE hpal, + UINT Start, + UINT Entries, + CONST LPPALETTEENTRY pe); + +UINT STDCALL +IntGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe); +UINT STDCALL +IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors); + +UINT STDCALL +IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors); + #endif /* _WIN32K_INTGDI_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/color.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/color.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/color.c Thu Aug 23 04:31:26 2007 @@ -74,16 +74,21 @@ return (const PALETTEENTRY*)&COLOR_sysPalTemplate; } -BOOL STDCALL NtGdiAnimatePalette(HPALETTE hPal, UINT StartIndex, - UINT NumEntries, CONST PPALETTEENTRY PaletteColors) -{ +UINT STDCALL +IntAnimatePalette(HPALETTE hPal, + UINT StartIndex, + UINT NumEntries, + CONST PPALETTEENTRY PaletteColors) +{ + UINT ret = 0; + if( hPal != NtGdiGetStockObject(DEFAULT_PALETTE) ) { PPALGDI palPtr; UINT pal_entries; HDC hDC; PDC dc; - PWINDOW_OBJECT Wnd; + PWINDOW_OBJECT Wnd; const PALETTEENTRY *pptr = PaletteColors; palPtr = (PPALGDI)PALETTE_LockPalette(hPal); @@ -92,39 +97,42 @@ pal_entries = palPtr->NumColors; if (StartIndex >= pal_entries) { - PALETTE_UnlockPalette(palPtr); - return FALSE; + PALETTE_UnlockPalette(palPtr); + return FALSE; } if (StartIndex+NumEntries > pal_entries) NumEntries = pal_entries - StartIndex; - for (NumEntries += StartIndex; StartIndex < NumEntries; StartIndex++, pptr++) { - /* According to MSDN, only animate PC_RESERVED colours */ - if (palPtr->IndexedColors[StartIndex].peFlags & PC_RESERVED) { - memcpy( &palPtr->IndexedColors[StartIndex], pptr, - sizeof(PALETTEENTRY) ); - PALETTE_ValidateFlags(&palPtr->IndexedColors[StartIndex], 1); - } + for (NumEntries += StartIndex; StartIndex < NumEntries; StartIndex++, pptr++) + { + /* According to MSDN, only animate PC_RESERVED colours */ + if (palPtr->IndexedColors[StartIndex].peFlags & PC_RESERVED) + { + memcpy( &palPtr->IndexedColors[StartIndex], pptr, + sizeof(PALETTEENTRY) ); + ret++; + PALETTE_ValidateFlags(&palPtr->IndexedColors[StartIndex], 1); + } } PALETTE_UnlockPalette(palPtr); /* Immediately apply the new palette if current window uses it */ - Wnd = UserGetDesktopWindow(); + Wnd = UserGetDesktopWindow(); hDC = (HDC)UserGetWindowDC(Wnd); dc = DC_LockDc(hDC); if (NULL != dc) { - if (dc->w.hPalette == hPal) - { - DC_UnlockDc(dc); - NtGdiRealizePalette(hDC); - } - else - DC_UnlockDc(dc); + if (dc->w.hPalette == hPal) + { + DC_UnlockDc(dc); + NtGdiRealizePalette(hDC); + } + else + DC_UnlockDc(dc); } - UserReleaseDC(Wnd,hDC, FALSE); - } - return TRUE; + UserReleaseDC(Wnd,hDC, FALSE); + } + return ret; } HPALETTE STDCALL NtGdiCreateHalftonePalette(HDC hDC) @@ -138,7 +146,7 @@ Palette.Version = 0x300; Palette.NumberOfEntries = 256; - if (NtGdiGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) + if (IntGetSystemPaletteEntries(hDC, 0, 256, Palette.aEntries) == 0) { /* from wine, more that 256 color math */ Palette.NumberOfEntries = 20; @@ -337,50 +345,56 @@ return index; } -UINT STDCALL NtGdiGetPaletteEntries(HPALETTE hpal, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe) -{ - PPALGDI palGDI; - UINT numEntries; - - palGDI = (PPALGDI) PALETTE_LockPalette(hpal); - if (NULL == palGDI) - { - return 0; - } - - numEntries = palGDI->NumColors; - if (numEntries < StartIndex + Entries) - { - Entries = numEntries - StartIndex; - } - if (NULL != pe) - { - if (numEntries <= StartIndex) - { - PALETTE_UnlockPalette(palGDI); - return 0; - } - memcpy(pe, palGDI->IndexedColors + StartIndex, Entries * sizeof(PALETTEENTRY)); - for (numEntries = 0; numEntries < Entries; numEntries++) - { - if (pe[numEntries].peFlags & 0xF0) - { - pe[numEntries].peFlags = 0; - } - } - } - - PALETTE_UnlockPalette(palGDI); - return Entries; -} - -UINT STDCALL NtGdiGetSystemPaletteEntries(HDC hDC, - UINT StartIndex, - UINT Entries, - LPPALETTEENTRY pe) +UINT STDCALL +IntGetPaletteEntries(HPALETTE hpal, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe) +{ + PPALGDI palGDI; + UINT numEntries; + + palGDI = (PPALGDI) PALETTE_LockPalette(hpal); + if (NULL == palGDI) + { + return 0; + } + + numEntries = palGDI->NumColors; + if (NULL != pe) + { + if (numEntries < StartIndex + Entries) + { + Entries = numEntries - StartIndex; + } + if (numEntries <= StartIndex) + { + PALETTE_UnlockPalette(palGDI); + return 0; + } + memcpy(pe, palGDI->IndexedColors + StartIndex, Entries * sizeof(PALETTEENTRY)); + for (numEntries = 0; numEntries < Entries; numEntries++) + { + if (pe[numEntries].peFlags & 0xF0) + { + pe[numEntries].peFlags = 0; + } + } + } + else + { + Entries = numEntries; + } + + PALETTE_UnlockPalette(palGDI); + return Entries; +} + +UINT STDCALL +IntGetSystemPaletteEntries(HDC hDC, + UINT StartIndex, + UINT Entries, + LPPALETTEENTRY pe) { PPALGDI palGDI = NULL; PDC dc = NULL; @@ -393,58 +407,46 @@ return 0; } - _SEH_TRY + if (pe != NULL) + { + EntriesSize = Entries * sizeof(pe[0]); + if (Entries != EntriesSize / sizeof(pe[0])) + { + /* Integer overflow! */ + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return 0; + } + } + + if (!(dc = DC_LockDc(hDC))) + { + SetLastWin32Error(ERROR_INVALID_HANDLE); + return 0; + } + + palGDI = PALETTE_LockPalette(dc->w.hPalette); + if (palGDI != NULL) { if (pe != NULL) { - EntriesSize = Entries * sizeof(pe[0]); - if (Entries != EntriesSize / sizeof(pe[0])) - { - /* Integer overflow! */ - SetLastWin32Error(ERROR_INVALID_PARAMETER); - _SEH_LEAVE; - } - - ProbeForWrite(pe, - EntriesSize, - sizeof(UINT)); - } - - if (!(dc = DC_LockDc(hDC))) - { - SetLastWin32Error(ERROR_INVALID_HANDLE); - _SEH_LEAVE; - } - - palGDI = PALETTE_LockPalette(dc->w.hPalette); - if (palGDI != NULL) - { - if (pe != NULL) - { - UINT CopyEntries; - - if (StartIndex + Entries < palGDI->NumColors) - CopyEntries = StartIndex + Entries; - else - CopyEntries = palGDI->NumColors - StartIndex; - - memcpy(pe, - palGDI->IndexedColors + StartIndex, - CopyEntries * sizeof(pe[0])); - - Ret = CopyEntries; - } + UINT CopyEntries; + + if (StartIndex + Entries < palGDI->NumColors) + CopyEntries = StartIndex + Entries; else - { - Ret = dc->GDIInfo->ulNumPalReg; - } - } - } - _SEH_HANDLE - { - SetLastNtError(_SEH_GetExceptionCode()); - } - _SEH_END; + CopyEntries = palGDI->NumColors - StartIndex; + + memcpy(pe, + palGDI->IndexedColors + StartIndex, + CopyEntries * sizeof(pe[0])); + + Ret = CopyEntries; + } + else + { + Ret = dc->GDIInfo->ulNumPalReg; + } + } if (palGDI != NULL) PALETTE_UnlockPalette(palGDI); @@ -624,34 +626,40 @@ return FALSE; } -UINT STDCALL NtGdiSetPaletteEntries(HPALETTE hpal, - UINT Start, - UINT Entries, - CONST LPPALETTEENTRY pe) -{ - PPALGDI palGDI; - WORD numEntries; - - palGDI = PALETTE_LockPalette(hpal); - if (!palGDI) return 0; - - numEntries = palGDI->NumColors; - if (Start >= numEntries) - { - PALETTE_UnlockPalette(palGDI); - return 0; - } - if (numEntries < Start + Entries) - { - Entries = numEntries - Start; - } - memcpy(palGDI->IndexedColors + Start, pe, Entries * sizeof(PALETTEENTRY)); - PALETTE_ValidateFlags(palGDI->IndexedColors, palGDI->NumColors); - ExFreePool(palGDI->logicalToSystem); - palGDI->logicalToSystem = NULL; - PALETTE_UnlockPalette(palGDI); - - return Entries; +UINT STDCALL +IntSetPaletteEntries(HPALETTE hpal, + UINT Start, + UINT Entries, + CONST LPPALETTEENTRY pe) +{ + PPALGDI palGDI; + WORD numEntries; + + if ((UINT)hpal & GDI_HANDLE_STOCK_MASK) + { + return 0; + } + + palGDI = PALETTE_LockPalette(hpal); + if (!palGDI) return 0; + + numEntries = palGDI->NumColors; + if (Start >= numEntries) + { + PALETTE_UnlockPalette(palGDI); + return 0; + } + if (numEntries < Start + Entries) + { + Entries = numEntries - Start; + } + memcpy(palGDI->IndexedColors + Start, pe, Entries * sizeof(PALETTEENTRY)); + PALETTE_ValidateFlags(palGDI->IndexedColors, palGDI->NumColors); + ExFreePool(palGDI->logicalToSystem); + palGDI->logicalToSystem = NULL; + PALETTE_UnlockPalette(palGDI); + + return Entries; } UINT STDCALL @@ -816,4 +824,83 @@ } return -1; } + + +W32KAPI +LONG +APIENTRY +NtGdiDoPalette( + IN HGDIOBJ hObj, + IN WORD iStart, + IN WORD cEntries, + IN LPVOID pUnsafeEntries, + IN DWORD iFunc, + IN BOOL bInbound) +{ + LONG ret; + + /* FIXME: Handle bInbound correctly */ + + if (bInbound && + (pUnsafeEntries == NULL || cEntries == 0)) + { + return 0; + } + + _SEH_TRY + { + switch(iFunc) + { + case GdiPalAnimate: + ProbeForRead(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + ret = IntAnimatePalette((HPALETTE)hObj, iStart, cEntries, pUnsafeEntries); + break; + + case GdiPalSetEntries: + ProbeForRead(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + ret = IntSetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pUnsafeEntries); + break; + + case GdiPalGetEntries: + if (pUnsafeEntries) + { + ProbeForWrite(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + } + ret = IntGetPaletteEntries((HPALETTE)hObj, iStart, cEntries, pUnsafeEntries); + break; + + case GdiPalGetSystemEntries: + if (pUnsafeEntries) + { + ProbeForWrite(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + } + ret = IntGetSystemPaletteEntries((HDC)hObj, iStart, cEntries, pUnsafeEntries); + break; + + case GdiPalSetColorTable: + ProbeForRead(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + ret = IntSetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pUnsafeEntries); + break; + + case GdiPalGetColorTable: + if (pUnsafeEntries) + { + ProbeForWrite(pUnsafeEntries, cEntries * sizeof(PALETTEENTRY), 1); + } + ret = IntGetDIBColorTable((HDC)hObj, iStart, cEntries, (RGBQUAD*)pUnsafeEntries); + break; + + default: + ret = 0; + } + } + _SEH_HANDLE + { + ret = 0; + } + _SEH_END + + return ret; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Thu Aug 23 04:31:26 2007 @@ -25,7 +25,7 @@ #include <debug.h> UINT STDCALL -NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors) +IntSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST RGBQUAD *Colors) { PDC dc; PBITMAPOBJ BitmapObj; @@ -62,22 +62,15 @@ Entries = (1 << BitmapObj->dib->dsBmih.biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(BitmapObj->hDIBPalette); - _SEH_TRY + + for (Index = StartIndex; + Index < StartIndex + Entries && Index < PalGDI->NumColors; + Index++) { - for (Index = StartIndex; - Index < StartIndex + Entries && Index < PalGDI->NumColors; - Index++) - { - PalGDI->IndexedColors[Index].peRed = Colors[Index - StartIndex].rgbRed; - PalGDI->IndexedColors[Index].peGreen = Colors[Index - StartIndex].rgbGreen; - PalGDI->IndexedColors[Index].peBlue = Colors[Index - StartIndex].rgbBlue; - } + PalGDI->IndexedColors[Index].peRed = Colors[Index - StartIndex].rgbRed; + PalGDI->IndexedColors[Index].peGreen = Colors[Index - StartIndex].rgbGreen; + PalGDI->IndexedColors[Index].peBlue = Colors[Index - StartIndex].rgbBlue; } - _SEH_HANDLE - { - Entries = 0; - } - _SEH_END PALETTE_UnlockPalette(PalGDI); } else @@ -90,7 +83,7 @@ } UINT STDCALL -NtGdiGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors) +IntGetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, RGBQUAD *Colors) { PDC dc; PBITMAPOBJ BitmapObj; @@ -127,22 +120,15 @@ Entries = (1 << BitmapObj->dib->dsBmih.biBitCount) - StartIndex; PalGDI = PALETTE_LockPalette(BitmapObj->hDIBPalette); - _SEH_TRY + + for (Index = StartIndex; + Index < StartIndex + Entries && Index < PalGDI->NumColors; + Index++) { - for (Index = StartIndex; - Index < StartIndex + Entries && Index < PalGDI->NumColors; - Index++) - { - Colors[Index - StartIndex].rgbRed = PalGDI->IndexedColors[Index].peRed; - Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen; - Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue; - } + Colors[Index - StartIndex].rgbRed = PalGDI->IndexedColors[Index].peRed; + Colors[Index - StartIndex].rgbGreen = PalGDI->IndexedColors[Index].peGreen; + Colors[Index - StartIndex].rgbBlue = PalGDI->IndexedColors[Index].peBlue; } - _SEH_HANDLE - { - Entries = 0; - } - _SEH_END PALETTE_UnlockPalette(PalGDI); } else Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Aug 23 04:31:26 2007 @@ -132,7 +132,7 @@ NtGdiDescribePixelFormat 4 # NtGdiGetPerBandInfo 2 # NtGdiDoBanding 4 -# NtGdiDoPalette 6 +NtGdiDoPalette 6 NtGdiDrawEscape 4 NtGdiEllipse 5 # NtGdiEnableEudc 1 @@ -513,7 +513,7 @@ # NtUserSetAppImeLevel 2 NtUserSetCapture 1 NtUserSetClassLong 4 -# NtUserSetClassWord 1 Wrong number of param ? +NtUserSetClassWord 3 NtUserSetClipboardData 3 NtUserSetClipboardViewer 1 NtUserSetConsoleReserveKeys 2 @@ -558,7 +558,7 @@ NtUserSetWindowsHookEx 6 NtUserSetWindowStationUser 4 NtUserSetWindowWord 3 -# NtUserSetWinEventHook 4 Wrong number of param ? +NtUserSetWinEventHook 8 NtUserShowCaret 1 NtUserShowScrollBar 3 NtUserShowWindow 2 @@ -683,9 +683,7 @@ NtUserFindWindowEx 4 NtUserGetClassInfo 4 NtUserInitTask 11 -NtUserSetClassWord 3 NtUserSetCursorIconData 6 -NtUserSetWinEventHook 8 NtUserUnregisterClass 2 NtUserValidateHandleSecure 1 # @@ -693,13 +691,11 @@ NtGdiSelectObject 2 NtGdiSetBkColor 2 NtGdiSetBkMode 2 -NtGdiSetDIBColorTable 4 NtGdiSetDIBits 7 NtGdiSetEnhMetaFileBits 2 NtGdiSetGraphicsMode 2 NtGdiSetICMProfile 2 NtGdiSetMapperFlags 2 -NtGdiSetPaletteEntries 4 NtGdiSetPixelV 4 NtGdiSetPolyFillMode 2 NtGdiSetROP2 2 @@ -751,7 +747,6 @@ NtUserSetScrollBarInfo 3 NtUserGetDesktopWindow 0 NtGdiAddFontResource 2 -NtGdiAnimatePalette 4 NtGdiCloseEnhMetaFile 1 NtGdiColorMatchToTarget 3 NtGdiCopyEnhMetaFile 2 @@ -781,7 +776,6 @@ NtGdiGetColorSpace 1 NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2 -NtGdiGetDIBColorTable 4 NtGdiGetEnhMetaFile 1 NtGdiGetEnhMetaFileBits 3 NtGdiGetEnhMetaFileDescription 3 @@ -794,12 +788,10 @@ NtGdiGetICMProfile 3 NtGdiGetLogColorSpace 3 NtGdiGetMapMode 1 -NtGdiGetPaletteEntries 4 NtGdiGetPixelFormat 1 NtGdiGetPolyFillMode 1 NtGdiGetROP2 1 NtGdiGetStretchBltMode 1 -NtGdiGetSystemPaletteEntries 4 NtGdiGetTextAlign 1 NtGdiGetTextColor 1 NtGdiGetTextExtentPoint32 4

1 0

[tkreuzer] 28458: one more TEST -> RTEST for NtGdiGetRandomRgn
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 04:20:30 2007 New Revision: 28458 URL: http://svn.reactos.org/svn/reactos?rev=28458&view=rev Log: one more TEST -> RTEST for NtGdiGetRandomRgn Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Modified: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c (original) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiGetRandomRgn.c Thu Aug 23 04:20:30 2007 @@ -66,7 +66,7 @@ RTEST(GetLastError() == ERROR_SUCCESS); SelectClipRgn(hDC, hrgn2); - TEST(NtGdiGetRandomRgn(hDC, 0, 1) == -1); + RTEST(NtGdiGetRandomRgn(hDC, 0, 1) == -1); RTEST(GetLastError() == ERROR_SUCCESS); RTEST(NtGdiGetRandomRgn(hDC, hrgn, 1) == 1); RTEST(CombineRgn(hrgn, hrgn, hrgn, RGN_OR) == SIMPLEREGION);

1 0

[tkreuzer] 28457: some tests for NtGdiDoPalette
by tkreuzer＠svn.reactos.org 23 Aug '07

23 Aug '07

Author: tkreuzer Date: Thu Aug 23 04:19:00 2007 New Revision: 28457 URL: http://svn.reactos.org/svn/reactos?rev=28457&view=rev Log: some tests for NtGdiDoPalette Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Modified: trunk/rostests/apitests/w32knapi/testlist.c Added: trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/ntgdi/N… ============================================================================== --- trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c (added) +++ trunk/rostests/apitests/w32knapi/ntgdi/NtGdiDoPalette.c Thu Aug 23 04:19:00 2007 @@ -1,0 +1,264 @@ +#include "../w32knapi.h" + +W32KAPI +LONG +APIENTRY +NtGdiDoPalette( + IN HPALETTE hpal, + IN WORD iStart, + IN WORD cEntries, + IN PALETTEENTRY *pPalEntries, + IN DWORD iFunc, + IN BOOL bInbound +) +{ + return (LONG)Syscall(L"NtGdiDoPalette", 6, &hpal); +} + +HPALETTE +CreateTestPalette() +{ + struct + { + LOGPALETTE logpal; + PALETTEENTRY entry[5]; + } palstruct = + { {0x300,5, + { {1,2,3,0} }}, + { {22,33,44,PC_RESERVED}, + {11,55,77,PC_EXPLICIT}, + {00,77,66,PC_RESERVED | PC_NOCOLLAPSE}, + {12,34,56,78}} }; + + return CreatePalette((LOGPALETTE*)&palstruct); +} + +INT +Test_NtGdiDoPalette_GdiPalAnimate(PTESTINFO pti) +{ + HPALETTE hPal; + PALETTEENTRY palEntries[5] = { + {0,0,0,0}, + {0xff,0xff,0xff,0}, + {0x33,0x66,0x99,0}, + {0x25,0x84,0x14,0}, + {0x12,0x34,0x56,0x11}}; + PALETTEENTRY palEntries2[5]; + + /* Test stock palette */ + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiDoPalette(GetStockObject(DEFAULT_PALETTE), 0, 1, palEntries, GdiPalAnimate, FALSE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + + /* Test pEntries = NULL */ + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalAnimate, TRUE) == 0); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalAnimate, FALSE) == 0); + DeleteObject(hPal); + + /* Test PC_RESERVED */ + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, TRUE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 1, 5, palEntries, GdiPalAnimate, TRUE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 2, 5, palEntries, GdiPalAnimate, TRUE) == 1); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 3, 5, palEntries, GdiPalAnimate, TRUE) == 1); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 4, 5, palEntries, GdiPalAnimate, TRUE) == 0); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 5, 5, palEntries, GdiPalAnimate, TRUE) == 0); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, FALSE) == 2); + DeleteObject(hPal); + + hPal = CreateTestPalette(); + RTEST(NtGdiDoPalette(hPal, 3, 5, palEntries, GdiPalAnimate, FALSE) == 1); + DeleteObject(hPal); + + /* Test if entries are set correctly */ + hPal = CreateTestPalette(); + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalAnimate, TRUE); + NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE); + RTEST(palEntries2[0].peRed == 1); + RTEST(palEntries2[0].peGreen == 2); + RTEST(palEntries2[0].peBlue == 3); + RTEST(palEntries2[0].peFlags == 0); + RTEST(palEntries2[1].peRed == palEntries[1].peRed); + RTEST(palEntries2[1].peGreen == palEntries[1].peGreen); + RTEST(palEntries2[1].peBlue == palEntries[1].peBlue); + RTEST(palEntries2[1].peFlags == palEntries[1].peFlags); + RTEST(palEntries2[2].peRed == 11); + RTEST(palEntries2[2].peGreen == 55); + RTEST(palEntries2[2].peBlue == 77); + TEST(palEntries2[2].peFlags == PC_EXPLICIT); + RTEST(palEntries2[3].peRed == palEntries[3].peRed); + RTEST(palEntries2[3].peGreen == palEntries[3].peGreen); + RTEST(palEntries2[3].peBlue == palEntries[3].peBlue); + RTEST(palEntries2[3].peFlags == palEntries[3].peFlags); + DeleteObject(hPal); + + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GdiPalSetEntries(PTESTINFO pti) +{ + HPALETTE hPal; + PALETTEENTRY palEntries[5] = { + {0,0,0,0}, + {0xff,0xff,0xff,0}, + {0x33,0x66,0x99,0}, + {0x25,0x84,0x14,0}, + {0x12,0x34,0x56,0x11}}; + PALETTEENTRY palEntries2[5]; + + hPal = CreateTestPalette(); + + /* Test invalid handle */ + SetLastError(ERROR_SUCCESS); + RTEST(NtGdiDoPalette((HPALETTE)23, 0, 1, palEntries, GdiPalSetEntries, TRUE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* Test system palette */ + RTEST(NtGdiDoPalette(GetStockObject(DEFAULT_PALETTE), 0, 1, palEntries, GdiPalSetEntries, TRUE) == 0); + RTEST(GetLastError() == ERROR_SUCCESS); + + RTEST(NtGdiDoPalette(hPal, 0, 1, palEntries, GdiPalSetEntries, TRUE) == 1); + RTEST(NtGdiDoPalette(hPal, 0, 2, palEntries, GdiPalSetEntries, TRUE) == 2); + RTEST(NtGdiDoPalette(hPal, 0, 3, palEntries, GdiPalSetEntries, TRUE) == 3); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE) == 5); + RTEST(NtGdiDoPalette(hPal, 0, 6, palEntries, GdiPalSetEntries, TRUE) == 5); + RTEST(NtGdiDoPalette(hPal, 3, 6, palEntries, GdiPalSetEntries, TRUE) == 2); +// TEST(NtGdiDoPalette(hPal, 4, 23247, palEntries, GdiPalSetEntries, TRUE) == 0); + + /* Test bInbound == FALSE */ + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE); + ZeroMemory(palEntries2, sizeof(palEntries2)); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalSetEntries, FALSE) == 5); + /* we should get the old values returned in our buffer! */ + TEST(memcmp(palEntries2, palEntries, sizeof(palEntries)) == 0); + + /* check what we have in our palette now */ + ZeroMemory(palEntries2, sizeof(palEntries2)); + RTEST(NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE) == 5); + TEST(memcmp(palEntries2, palEntries, sizeof(palEntries)) == 0); + + RTEST(NtGdiDoPalette(hPal, 0, 4, palEntries2, GdiPalSetEntries, TRUE) == 4); + RTEST(GetLastError() == ERROR_SUCCESS); + + /* Test if entries are set correctly */ + hPal = CreateTestPalette(); + NtGdiDoPalette(hPal, 0, 5, palEntries, GdiPalSetEntries, TRUE); + NtGdiDoPalette(hPal, 0, 5, palEntries2, GdiPalGetEntries, FALSE); + RTEST(palEntries2[0].peRed == 0); + RTEST(palEntries2[0].peGreen == 0); + RTEST(palEntries2[0].peBlue == 0); + RTEST(palEntries2[0].peFlags == 0); + + /* Test that the buffer was not changed */ + + /* Test pEntries = NULL */ + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, TRUE) == 0); + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GdiPalGetEntries(PTESTINFO pti) +{ + HPALETTE hPal; + + hPal = CreateTestPalette(); + + /* Test pEntries = NULL */ + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, TRUE) == 0); + RTEST(NtGdiDoPalette(hPal, 0, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 2, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 20, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, -20, 1, NULL, GdiPalGetEntries, FALSE) == 5); + RTEST(NtGdiDoPalette(hPal, 2, 0, NULL, GdiPalGetEntries, FALSE) == 5); + + +// Test flags 0xf0 + + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GetSystemPalette(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_GetBIBColorTable(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + +INT +Test_NtGdiDoPalette_SetDIBColorTable(PTESTINFO pti) +{ + return APISTATUS_NORMAL; +} + + +INT +Test_NtGdiDoPalette(PTESTINFO pti) +{ + INT ret; + + ret = Test_NtGdiDoPalette_GdiPalAnimate(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GdiPalSetEntries(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GdiPalGetEntries(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GetSystemPalette(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_GetBIBColorTable(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + ret = Test_NtGdiDoPalette_SetDIBColorTable(pti); + if (ret != APISTATUS_NORMAL) + { + return ret; + } + + return APISTATUS_NORMAL; +} Modified: trunk/rostests/apitests/w32knapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/testlis… ============================================================================== --- trunk/rostests/apitests/w32knapi/testlist.c (original) +++ trunk/rostests/apitests/w32knapi/testlist.c Thu Aug 23 04:19:00 2007 @@ -9,7 +9,7 @@ #include "ntgdi/NtGdiArcInternal.c" #include "ntgdi/NtGdiCreateBitmap.c" #include "ntgdi/NtGdiCreateCompatibleBitmap.c" -//#include "ntgdi/NtGdiDoPalette.c" +#include "ntgdi/NtGdiDoPalette.c" #include "ntgdi/NtGdiGetBitmapBits.c" #include "ntgdi/NtGdiGetRandomRgn.c" #include "ntgdi/NtGdiSetBitmapBits.c" @@ -29,7 +29,7 @@ { L"NtGdiArcInternal", Test_NtGdiArcInternal }, { L"NtGdiCreateBitmap", Test_NtGdiCreateBitmap }, { L"NtGdiCreateCompatibleBitmap", Test_NtGdiCreateCompatibleBitmap }, -// { L"NtGdiDoPalette", Test_NtGdiDoPalette }, + { L"NtGdiDoPalette", Test_NtGdiDoPalette }, { L"NtGdiGetBitmapBits", Test_NtGdiGetBitmapBits }, { L"NtGdiGetRandomRgn", Test_NtGdiGetRandomRgn }, { L"NtGdiSetBitmapBits", Test_NtGdiSetBitmapBits },

1 0

[tkreuzer] 28456: win32k syscall dlls for win xp and 2k
by tkreuzer＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: tkreuzer Date: Thu Aug 23 01:49:49 2007 New Revision: 28456 URL: http://svn.reactos.org/svn/reactos?rev=28456&view=rev Log: win32k syscall dlls for win xp and 2k Added: trunk/rostests/apitests/w32kdll/directory.rbuild trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/ trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild trunk/rostests/apitests/w32kdll/w32kdll_ros/ trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/ trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.S trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild Removed: trunk/rostests/apitests/w32kdll/main.c trunk/rostests/apitests/w32kdll/w32kdll.def trunk/rostests/apitests/w32kdll/w32kdll.rbuild Modified: trunk/rostests/apitests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… Added: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… Removed: trunk/rostests/apitests/w32kdll/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/main.c?r… Removed: trunk/rostests/apitests/w32kdll/w32kdll.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll.… Removed: trunk/rostests/apitests/w32kdll/w32kdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll.… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…

1 0

[jimtabor] 28455: - Removed NtGdiGetDIBits from w32ksvc.db and updated ntgdibad.h. - Created support function for GetDIBits when calling NtGdiGetDIBitsInternal. - Connected the gdi32 parts.
by jimtabor＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: jimtabor Date: Wed Aug 22 23:45:06 2007 New Revision: 28455 URL: http://svn.reactos.org/svn/reactos?rev=28455&view=rev Log: - Removed NtGdiGetDIBits from w32ksvc.db and updated ntgdibad.h. - Created support function for GetDIBits when calling NtGdiGetDIBitsInternal. - Connected the gdi32 parts. Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/objects/bitmap.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/objects/dibobj.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Wed Aug 22 23:45:06 2007 @@ -369,7 +369,7 @@ GetDCOrgEx@8 GetDCPenColor@4 GetDIBColorTable@16=NtGdiGetDIBColorTable@16 -GetDIBits@28=NtGdiGetDIBits@28 +GetDIBits@28 GetDeviceCaps@8=NtGdiGetDeviceCaps@8 GetDeviceGammaRamp@8 GetEnhMetaFileA@4 Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c Wed Aug 22 23:45:06 2007 @@ -1,4 +1,31 @@ #include "precomp.h" + +/* + * Return the full scan size for a bitmap. + * + * Based on Wine and Windows Graphics Prog pg 595 + */ +UINT +FASTCALL +DIB_BitmapMaxBitsSize( PBITMAPINFO Info, UINT ScanLines ) +{ + UINT MaxBits = 0; + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + PBITMAPCOREHEADER Core = (PBITMAPCOREHEADER)Info; + MaxBits = Core->bcBitCount * Core->bcPlanes * Core->bcWidth; + } + else /* assume BITMAPINFOHEADER */ + { + if ((Info->bmiHeader.biCompression) && (Info->bmiHeader.biCompression != BI_BITFIELDS)) + return Info->bmiHeader.biSizeImage; + MaxBits = Info->bmiHeader.biBitCount * Info->bmiHeader.biPlanes * Info->bmiHeader.biWidth; + } + // Planes are over looked by Yuan. I guess assumed always 1. + MaxBits = (MaxBits + 31) / 32; // ScanLineSize = (Width * bitcount + 31)/32 + return (MaxBits * ScanLines); // ret the full Size. +} /* * @implemented @@ -144,3 +171,27 @@ FALSE, NULL); } + + +INT +STDCALL +GetDIBits( + HDC hDC, + HBITMAP hbmp, + UINT uStartScan, + UINT cScanLines, + LPVOID lpvBits, + LPBITMAPINFO lpbmi, + UINT uUsage + ) +{ + return NtGdiGetDIBitsInternal(hDC, + hbmp, + uStartScan, + cScanLines, + lpvBits, + lpbmi, + uUsage, + DIB_BitmapMaxBitsSize( lpbmi, cScanLines ), + 0); +} Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Wed Aug 22 23:45:06 2007 @@ -317,20 +317,6 @@ RGBQUAD * Colors ); -/* Use NtGdiGetDIBitsInternal. */ -INT -STDCALL -NtGdiGetDIBits ( - HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO bi, - UINT Usage - ); - - /* Meta are user-mode. */ HENHMETAFILE STDCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c Wed Aug 22 23:45:06 2007 @@ -1007,14 +1007,14 @@ bi.bmiHeader.biYPelsPerMeter = 0; bi.bmiHeader.biClrUsed = 0; - ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS); + ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, NULL, &bi, DIB_RGB_COLORS, 0, 0); size = bi.bmiHeader.biSizeImage + sizeof(BITMAPINFOHEADER); hCBData = ExAllocatePool(PagedPool, size); memcpy(hCBData, &bi, sizeof(BITMAPINFOHEADER)); - ret = NtGdiGetDIBits(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS); + ret = NtGdiGetDIBitsInternal(hdc, hMem, 0, bm.bmHeight, (LPBYTE)hCBData + sizeof(BITMAPINFOHEADER), &bi, DIB_RGB_COLORS, 0, 0); UserReleaseDC(NULL, hdc, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Wed Aug 22 23:45:06 2007 @@ -352,13 +352,15 @@ /* Converts a device-dependent bitmap to a DIB */ INT STDCALL -NtGdiGetDIBits(HDC hDC, - HBITMAP hBitmap, - UINT StartScan, - UINT ScanLines, - LPVOID Bits, - LPBITMAPINFO Info, - UINT Usage) +NtGdiGetDIBitsInternal(HDC hDC, + HBITMAP hBitmap, + UINT StartScan, + UINT ScanLines, + LPBYTE Bits, + LPBITMAPINFO Info, + UINT Usage, + UINT MaxBits, + UINT MaxInfo) { BITMAPOBJ *BitmapObj; SURFOBJ *DestSurfObj; Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 22 23:45:06 2007 @@ -180,7 +180,7 @@ NtGdiGetDeviceCaps 2 NtGdiGetDeviceGammaRamp 2 # NtGdiGetDeviceCapsAll 2 -# NtGdiGetDIBitsInternal 9 +NtGdiGetDIBitsInternal 9 # NtGdiGetETM 2 # NtGdiGetEudcTimeStampEx 3 NtGdiGetFontData 5 @@ -782,7 +782,6 @@ NtGdiGetCurrentObject 2 NtGdiGetCurrentPositionEx 2 NtGdiGetDIBColorTable 4 -NtGdiGetDIBits 7 NtGdiGetEnhMetaFile 1 NtGdiGetEnhMetaFileBits 3 NtGdiGetEnhMetaFileDescription 3

1 0

[janderwald] 28454: - fix description by Pierre Schweitzer (heis spiter at hotmail com)
by janderwald＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: janderwald Date: Wed Aug 22 22:29:20 2007 New Revision: 28454 URL: http://svn.reactos.org/svn/reactos?rev=28454&view=rev Log: - fix description by Pierre Schweitzer (heis spiter at hotmail com) Modified: trunk/rosapps/downloader/downloader.xml Modified: trunk/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/downloader.xml?… ============================================================================== --- trunk/rosapps/downloader/downloader.xml (original) +++ trunk/rosapps/downloader/downloader.xml Wed Aug 22 22:29:20 2007 @@ -14,7 +14,7 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://ftp-mozilla.netscape.com/pub/mozilla.org/firefox/releases/latest/win…</location> </application> - <application name="Thunderbird"> + <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> <version>1.5.0.9</version>

1 0

[hpoussin] 28453: Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild
by hpoussin＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: hpoussin Date: Wed Aug 22 19:06:43 2007 New Revision: 28453 URL: http://svn.reactos.org/svn/reactos?rev=28453&view=rev Log: Move generic part of ReactOS-$(ARCH).rbuild to ReactOS-generic.rbuild Added: trunk/reactos/ReactOS-generic.rbuild - copied, changed from r28429, trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild Copied: trunk/reactos/ReactOS-generic.rbuild (from r28429, trunk/reactos/ReactOS-i386.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?p2=… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-generic.rbuild Wed Aug 22 19:06:43 2007 @@ -1,59 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="config.rbuild"> - <xi:fallback> - <xi:include href="config.template.rbuild" /> - </xi:fallback> - </xi:include> - +<project name="ReactOS" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="baseaddress.rbuild" /> - <define name="_M_IX86" /> - <define name="_X86_" /> - <define name="__i386__" /> <define name="_REACTOS_" /> <if property="MP" value="1"> <define name="CONFIG_SMP" value="1" /> </if> <if property="DBG" value="1"> <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> + <define name="_SEH_ENABLE_TRACE" /> <property name="DBG_OR_KDBG" value="true" /> </if> <if property="KDBG" value="1"> <define name="KDBG" value="1" /> <property name="DBG_OR_KDBG" value="true" /> </if> - - <if property="GDB" value="0"> - <if property="OPTIMIZE" value="1"> - <compilerflag>-Os</compilerflag> - <compilerflag>-ftracer</compilerflag> - <compilerflag>-momit-leaf-frame-pointer</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="2"> - <compilerflag>-Os</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> - <compilerflag>-mpreferred-stack-boundary=2</compilerflag> - </if> - </if> - - <compilerflag>-Wno-strict-aliasing</compilerflag> - <compilerflag>-Wpointer-arith</compilerflag> - <linkerflag>-enable-stdcall-fixup</linkerflag> <include>.</include> <include>include</include> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=28… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild (original) +++ trunk/reactos/ReactOS-i386.rbuild Wed Aug 22 19:06:43 2007 @@ -7,24 +7,11 @@ </xi:fallback> </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> <define name="_M_IX86" /> <define name="_X86_" /> <define name="__i386__" /> - <define name="_REACTOS_" /> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <define name="_SEH_ENABLE_TRACE" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> <if property="GDB" value="0"> <if property="OPTIMIZE" value="1"> @@ -55,52 +42,4 @@ <compilerflag>-Wpointer-arith</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - <include>.</include> - <include>include</include> - <include root="intermediate">include</include> - <include>include/psdk</include> - <include root="intermediate">include/psdk</include> - <include>include/dxsdk</include> - <include>include/crt</include> - <include>include/ddk</include> - <include>include/GL</include> - <include>include/ndk</include> - <include>include/reactos</include> - <include root="intermediate">include/reactos</include> - <include>include/reactos/libs</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - </project> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=284… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild (original) +++ trunk/reactos/ReactOS-ppc.rbuild Wed Aug 22 19:06:43 2007 @@ -7,7 +7,7 @@ </xi:fallback> </xi:include> - <xi:include href="baseaddress.rbuild" /> + <xi:include href="ReactOS-generic.rbuild" /> <property name="BOOTPROG_PREPARE" value="ppc-le2be" /> <property name="BOOTPROG_FLATFORMAT" value="-O elf32-powerpc -B powerpc:common" /> @@ -17,7 +17,6 @@ <define name="_M_PPC" /> <define name="_PPC_" /> <define name="__PowerPC__" /> - <define name="_REACTOS_" /> <define name="__MINGW_IMPORT" empty="true" /> <define name="stdcall" empty="true" /> <define name="__stdcall__" empty="true" /> @@ -26,69 +25,6 @@ <define name="__cdecl__" empty="true" /> <define name="dllimport" empty="true" /> <compilerflag>-v</compilerflag> - <if property="MP" value="1"> - <define name="CONFIG_SMP" value="1" /> - </if> - <if property="DBG" value="1"> - <define name="DBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> - <if property="DBG" value="0"> - <compilerflag>-Os</compilerflag> - <compilerflag>-Wno-strict-aliasing</compilerflag> - </if> - <if property="KDBG" value="1"> - <define name="KDBG" value="1" /> - <property name="DBG_OR_KDBG" value="true" /> - </if> <compilerflag>-Wpointer-arith</compilerflag> - <include>.</include> - <include>include</include> - <include>include/reactos</include> - <include>include/libs</include> - <include>include/drivers</include> - <include>include/subsys</include> - <include>include/ndk</include> - <include>include</include> - <include>include/crt</include> - <include>include/ddk</include> - - <directory name="base"> - <xi:include href="base/base.rbuild" /> - </directory> - <directory name="boot"> - <xi:include href="boot/boot.rbuild" /> - </directory> - <directory name="dll"> - <xi:include href="dll/dll.rbuild" /> - </directory> - <directory name="drivers"> - <xi:include href="drivers/drivers.rbuild" /> - </directory> - <directory name="hal"> - <xi:include href="hal/hal.rbuild" /> - </directory> - <directory name="include"> - <xi:include href="include/directory.rbuild" /> - </directory> - <directory name="lib"> - <xi:include href="lib/lib.rbuild" /> - </directory> - <directory name="media"> - <xi:include href="media/media.rbuild" /> - </directory> - <directory name="modules"> - <xi:include href="modules/directory.rbuild" /> - </directory> - <directory name="ntoskrnl"> - <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> - </directory> - <directory name="regtests"> - <xi:include href="regtests/directory.rbuild" /> - </directory> - <directory name="subsystems"> - <xi:include href="subsystems/subsystems.rbuild" /> - </directory> - </project>

1 0

[jimtabor] 28452: Removed NtUserReleaseDC, replaced it with CallOneParam.
by jimtabor＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: jimtabor Date: Wed Aug 22 18:12:55 2007 New Revision: 28452 URL: http://svn.reactos.org/svn/reactos?rev=28452&view=rev Log: Removed NtUserReleaseDC, replaced it with CallOneParam. Modified: trunk/reactos/dll/win32/user32/windows/dc.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c Wed Aug 22 18:12:55 2007 @@ -89,9 +89,8 @@ if (!hDC) return FALSE; // Null hDC return zero. GdiReleaseDC ( hDC ); // Release locals. - // Win 3.1 throw back, hWnd should be ignored and not used. - // Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); - return NtUserReleaseDC(hWnd, hDC); + // Win 3.1 throw back, hWnd is ignored and not used. + return NtUserCallOneParam( (DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Wed Aug 22 18:12:55 2007 @@ -280,9 +280,6 @@ LONG NTAPI NtUserGetWindowLong(HWND hWnd, DWORD Index, BOOL Ansi); - -INT NTAPI -NtUserReleaseDC(HWND hWnd, HDC hDc); BOOL NTAPI NtUserGetWindowRect(HWND hWnd, LPRECT Rect); @@ -460,6 +457,7 @@ #define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 #define ONEPARAM_ROUTINE_SHOWCURSOR 0x30 #define ONEPARAM_ROUTINE_REGISTERUSERMODULE 0x31 +#define ONEPARAM_ROUTINE_RELEASEDC 0x39 DWORD NTAPI NtUserCallOneParam( Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Wed Aug 22 18:12:55 2007 @@ -427,6 +427,8 @@ RETURN(TRUE); } } + case ONEPARAM_ROUTINE_RELEASEDC: + RETURN (UserReleaseDC(NULL, (HDC) Param, FALSE)); } DPRINT1("Calling invalid routine number 0x%x in NtUserCallOneParam(), Param=0x%x\n", Routine, Param); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Wed Aug 22 18:12:55 2007 @@ -632,24 +632,6 @@ } -// Win 3.1 throw back, hWnd should be ignored and not used. -// Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); -INT STDCALL -NtUserReleaseDC(HWND hWnd, HDC hDc) -{ - DECLARE_RETURN(INT); - - DPRINT("Enter NtUserReleaseDC\n"); - UserEnterExclusive(); - - RETURN(UserReleaseDC(NULL, hDc, FALSE)); - -CLEANUP: - DPRINT("Leave NtUserReleaseDC, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - /*********************************************************************** * DceFreeDCE */ Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Wed Aug 22 18:12:55 2007 @@ -741,7 +741,6 @@ NtUserMonitorFromPoint 3 NtUserMonitorFromRect 2 NtUserMonitorFromWindow 2 -NtUserReleaseDC 2 NtUserRegisterClassEx 6 NtUserRegisterClipboardFormat 1 NtUserSendMessage 5

1 0

[arty] 28451: Bug found by arty, thanks to alex for helping fix it: Process termination fixes part 1: don't suicide our process when we're killing a sibling. - Clarify the use of KillByHandle. It does *not* mean "suicide". - In fact, we had considered the use of KillByHandle backward, that is, our process would commit suicide if it was killing a sibling process. - Make suicide contingent on killing the same process. - Properly handle DBG_TERMINATE_PROCESS semidocumented debugger hack.
by arty＠svn.reactos.org 22 Aug '07

22 Aug '07

Author: arty Date: Wed Aug 22 11:28:45 2007 New Revision: 28451 URL: http://svn.reactos.org/svn/reactos?rev=28451&view=rev Log: Bug found by arty, thanks to alex for helping fix it: Process termination fixes part 1: don't suicide our process when we're killing a sibling. - Clarify the use of KillByHandle. It does *not* mean "suicide". - In fact, we had considered the use of KillByHandle backward, that is, our process would commit suicide if it was killing a sibling process. - Make suicide contingent on killing the same process. - Properly handle DBG_TERMINATE_PROCESS semidocumented debugger hack. Modified: trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Wed Aug 22 11:28:45 2007 @@ -57,6 +57,10 @@ #define PSTRACE(x, ...) DPRINT(__VA_ARGS__); #define PSREFTRACE(x) #endif + +#define PspSetProcessFlag(Process, Flag) \ + InterlockedOr((PLONG)&Process->Flags, Flag) + // // Maximum Count of Notification Routines Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=284… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c (original) +++ trunk/reactos/ntoskrnl/ps/kill.c Wed Aug 22 11:28:45 2007 @@ -1108,12 +1108,21 @@ PSTRACE(PS_KILL_DEBUG, "ProcessHandle: %p ExitStatus: %p\n", ProcessHandle, ExitStatus); - /* Remember how we will kill it */ - KillByHandle = (ProcessHandle != NULL); + /* Were we passed a process handle? */ + if (ProcessHandle) + { + /* Yes we were, use it */ + KillByHandle = TRUE; + } + else + { + /* We weren't... we assume this is suicide */ + KillByHandle = FALSE; + ProcessHandle = NtCurrentProcess(); + } /* Get the Process Object */ - Status = ObReferenceObjectByHandle((KillByHandle) ? - ProcessHandle : NtCurrentProcess(), + Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_TERMINATE, PsProcessType, KeGetPreviousMode(), @@ -1138,9 +1147,8 @@ return STATUS_PROCESS_IS_TERMINATING; } - /* Set the delete flag */ - if (!KillByHandle) InterlockedOr((PLONG)&Process->Flags, - PSF_PROCESS_DELETE_BIT); + /* Set the delete flag, unless the process is comitting suicide */ + if (KillByHandle) PspSetProcessFlag(Process, PSF_PROCESS_DELETE_BIT); /* Get the first thread */ Status = STATUS_NOTHING_TO_TERMINATE; @@ -1169,23 +1177,22 @@ ExReleaseRundownProtection(&Process->RundownProtect); /* Check if we are killing ourselves */ - if (Process != CurrentProcess) - { - /* Check for the DBG_TERMINATE_PROCESS exit code */ - if (ExitStatus == DBG_TERMINATE_PROCESS) - { - /* Disable debugging on this process */ - DbgkClearProcessDebugObject(Process, NULL); - } - } - /* Make sure that we got a handle */ - else if (KillByHandle) - { - /* Dereference the project */ - ObDereferenceObject(Process); - - /* Terminate ourselves */ - PspTerminateThreadByPointer(CurrentThread, ExitStatus, TRUE); + if (Process == CurrentProcess) + { + /* Also make sure the caller gave us our handle */ + if (KillByHandle) + { + /* Dereference the project */ + ObDereferenceObject(Process); + + /* Terminate ourselves */ + PspTerminateThreadByPointer(CurrentThread, ExitStatus, TRUE); + } + } + else if (ExitStatus == DBG_TERMINATE_PROCESS) + { + /* Disable debugging on this process */ + DbgkClearProcessDebugObject(Process, NULL); } /* Check if there was nothing to terminate, or if we have a Debug Port */

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