Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[tkreuzer] 67784: [NTOSKRNL] Convert StartingAddress and EndingAddress members in MEMORY_AREA to ULONG_PTR. Remove unused MmFindGapAtAddress.
by tkreuzer＠svn.reactos.org 16 May '15

16 May '15

Author: tkreuzer Date: Sat May 16 20:09:40 2015 New Revision: 67784 URL: http://svn.reactos.org/svn/reactos?rev=67784&view=rev Log: [NTOSKRNL] Convert StartingAddress and EndingAddress members in MEMORY_AREA to ULONG_PTR. Remove unused MmFindGapAtAddress. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat May 16 20:09:40 2015 @@ -201,8 +201,8 @@ typedef struct _MEMORY_AREA { - PVOID StartingAddress; - PVOID EndingAddress; + ULONG_PTR StartingAddress; + ULONG_PTR EndingAddress; struct _MEMORY_AREA *Parent; struct _MEMORY_AREA *LeftChild; struct _MEMORY_AREA *RightChild; @@ -495,14 +495,6 @@ PVOID Address ); -// fixme: unused? -ULONG_PTR -NTAPI -MmFindGapAtAddress_( - PMMSUPPORT AddressSpace, - PVOID Address -); - NTSTATUS NTAPI MmFreeMemoryArea( Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat May 16 20:09:40 2015 @@ -5317,10 +5317,10 @@ Vad->u.VadFlags.CommitCharge -= CommitReduction; // For ReactOS: shrink the corresponding memory area MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)StartingAddress); - ASSERT(Vad->StartingVpn << PAGE_SHIFT == (ULONG_PTR)MemoryArea->StartingAddress); - ASSERT((Vad->EndingVpn + 1) << PAGE_SHIFT == (ULONG_PTR)MemoryArea->EndingAddress); - Vad->EndingVpn = ((ULONG_PTR)StartingAddress - 1) >> PAGE_SHIFT; - MemoryArea->EndingAddress = (PVOID)(StartingAddress); + ASSERT(Vad->StartingVpn << PAGE_SHIFT == MemoryArea->StartingAddress); + ASSERT((Vad->EndingVpn + 1) << PAGE_SHIFT == MemoryArea->EndingAddress); + Vad->EndingVpn = (StartingAddress - 1) >> PAGE_SHIFT; + MemoryArea->EndingAddress = StartingAddress; } else { Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=67… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sat May 16 20:09:40 2015 @@ -162,9 +162,10 @@ PMEMORY_AREA NTAPI MmLocateMemoryAreaByAddress( PMMSUPPORT AddressSpace, - PVOID Address) + PVOID Address_) { PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + ULONG_PTR Address = (ULONG_PTR)Address_; DPRINT("MmLocateMemoryAreaByAddress(AddressSpace %p, Address %p)\n", AddressSpace, Address); @@ -190,11 +191,12 @@ PMEMORY_AREA NTAPI MmLocateMemoryAreaByRegion( PMMSUPPORT AddressSpace, - PVOID Address, + PVOID Address_, ULONG_PTR Length) { PMEMORY_AREA Node; - PVOID Extent = (PVOID)((ULONG_PTR)Address + Length); + ULONG_PTR Address = (ULONG_PTR)Address_; + ULONG_PTR Extent = Address + Length; /* Special case for empty tree. */ if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) @@ -376,7 +378,8 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); /* Build a lame VAD if this is a user-space allocation */ - if ((marea->EndingAddress < MmSystemRangeStart) && (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) + if ((marea->EndingAddress < (ULONG_PTR)MmSystemRangeStart) && + (marea->Type != MEMORY_AREA_OWNED_BY_ARM3)) { PMMVAD Vad; @@ -610,66 +613,6 @@ return MmFindGapBottomUp(AddressSpace, Length, Granularity); } -ULONG_PTR NTAPI -MmFindGapAtAddress( - PMMSUPPORT AddressSpace, - PVOID Address) -{ - PMEMORY_AREA Node = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; - PMEMORY_AREA RightNeighbour = NULL; - PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? - (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; - - Address = MM_ROUND_DOWN(Address, PAGE_SIZE); - - if (LowestAddress < MmSystemRangeStart) - { - if (Address >= MmSystemRangeStart) - { - return 0; - } - } - else - { - if (Address < LowestAddress) - { - return 0; - } - } - - while (Node != NULL) - { - if (Address < Node->StartingAddress) - { - RightNeighbour = Node; - Node = Node->LeftChild; - } - else if (Address >= Node->EndingAddress) - { - Node = Node->RightChild; - } - else - { - DPRINT("MmFindGapAtAddress: 0\n"); - return 0; - } - } - - if (RightNeighbour) - { - DPRINT("MmFindGapAtAddress: %p [%p]\n", Address, - (ULONG_PTR)RightNeighbour->StartingAddress - (ULONG_PTR)Address); - return (ULONG_PTR)RightNeighbour->StartingAddress - (ULONG_PTR)Address; - } - else - { - DPRINT("MmFindGapAtAddress: %p [%p]\n", Address, - (ULONG_PTR)HighestAddress - (ULONG_PTR)Address); - return (ULONG_PTR)HighestAddress - (ULONG_PTR)Address; - } -} - VOID NTAPI MiRemoveNode(IN PMMADDRESS_NODE Node, @@ -687,10 +630,10 @@ /* Check some fields */ ASSERT(Node->Magic == 'erAM'); - ASSERT(PAGE_ALIGN(Node->StartingAddress) == Node->StartingAddress); - ASSERT(Node->EndingAddress != NULL); - ASSERT(PAGE_ALIGN(Node->EndingAddress) == Node->EndingAddress); - ASSERT((ULONG_PTR)Node->StartingAddress < (ULONG_PTR)Node->EndingAddress); + ASSERT(PAGE_ALIGN(Node->StartingAddress) == (PVOID)Node->StartingAddress); + ASSERT(Node->EndingAddress != 0); + ASSERT(PAGE_ALIGN(Node->EndingAddress) == (PVOID)Node->EndingAddress); + ASSERT(Node->StartingAddress < Node->EndingAddress); ASSERT((Node->Type == 0) || (Node->Type == MEMORY_AREA_CACHE) || // (Node->Type == MEMORY_AREA_CACHE_SEGMENT) || @@ -872,7 +815,7 @@ if (MemoryArea->Vad) { - ASSERT(MemoryArea->EndingAddress < MmSystemRangeStart); + ASSERT(MemoryArea->EndingAddress < (ULONG_PTR)MmSystemRangeStart); ASSERT(MemoryArea->Type == MEMORY_AREA_SECTION_VIEW || MemoryArea->Type == MEMORY_AREA_CACHE); /* MmCleanProcessAddressSpace might have removed it (and this would be MmDeleteProcessAdressSpace) */ @@ -1065,8 +1008,8 @@ RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type; - MemoryArea->StartingAddress = *BaseAddress; - MemoryArea->EndingAddress = (PVOID)((ULONG_PTR)*BaseAddress + tmpLength); + MemoryArea->StartingAddress = (ULONG_PTR)*BaseAddress; + MemoryArea->EndingAddress = ((ULONG_PTR)*BaseAddress + tmpLength); MemoryArea->Protect = Protect; MemoryArea->Flags = AllocationFlags; //MemoryArea->LockCount = 0; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sat May 16 20:09:40 2015 @@ -1328,7 +1328,7 @@ Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; - Region = MmFindRegion(MemoryArea->StartingAddress, + Region = MmFindRegion((PVOID)MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); ASSERT(Region != NULL); @@ -1705,7 +1705,7 @@ Segment = MemoryArea->Data.SectionData.Segment; Section = MemoryArea->Data.SectionData.Section; - Region = MmFindRegion(MemoryArea->StartingAddress, + Region = MmFindRegion((PVOID)MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); ASSERT(Region != NULL); @@ -2520,11 +2520,11 @@ NTSTATUS Status; ULONG_PTR MaxLength; - MaxLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)BaseAddress; + MaxLength = MemoryArea->EndingAddress - (ULONG_PTR)BaseAddress; if (Length > MaxLength) Length = (ULONG)MaxLength; - Region = MmFindRegion(MemoryArea->StartingAddress, + Region = MmFindRegion((PVOID)MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, BaseAddress, NULL); ASSERT(Region != NULL); @@ -2536,7 +2536,7 @@ } *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, + Status = MmAlterRegion(AddressSpace, (PVOID)MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, BaseAddress, Length, Region->Type, Protect, MmAlterViewAttributes); @@ -2572,7 +2572,7 @@ } else { - Info->AllocationBase = MemoryArea->StartingAddress; + Info->AllocationBase = (PVOID)MemoryArea->StartingAddress; Info->Type = MEM_MAPPED; } Info->BaseAddress = RegionBaseAddress;

1 0

[aandrejevic] 67783: [NTVDM] Drivers that have no I/O status routine should be treated as "ready".
by aandrejevic＠svn.reactos.org 16 May '15

16 May '15

Author: aandrejevic Date: Sat May 16 20:06:28 2015 New Revision: 67783 URL: http://svn.reactos.org/svn/reactos?rev=67783&view=rev Log: [NTVDM] Drivers that have no I/O status routine should be treated as "ready". Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Sat May 16 20:06:28 2015 @@ -944,7 +944,7 @@ { /* Device*/ - if (Node->InputStatusRoutine && Node->InputStatusRoutine(Node)) + if (!Node->InputStatusRoutine || Node->InputStatusRoutine(Node)) { /* Set the length to 0xFF to mark that it's ready */ *Length = 0xFF; @@ -982,7 +982,7 @@ { /* Device*/ - if (Node->OutputStatusRoutine && Node->OutputStatusRoutine(Node)) + if (!Node->OutputStatusRoutine || Node->OutputStatusRoutine(Node)) { /* Set the length to 0xFF to mark that it's ready */ *Length = 0xFF;

1 0

[pschweitzer] 67782: [NTOSKRNL] Stub support for IOCTL_WMI_SET_MARK CORE-9699
by pschweitzer＠svn.reactos.org 16 May '15

16 May '15

Author: pschweitzer Date: Sat May 16 20:00:34 2015 New Revision: 67782 URL: http://svn.reactos.org/svn/reactos?rev=67782&view=rev Log: [NTOSKRNL] Stub support for IOCTL_WMI_SET_MARK CORE-9699 Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c Modified: trunk/reactos/ntoskrnl/wmi/wmidrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmidrv.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/wmi/wmidrv.c [iso-8859-1] Sat May 16 20:00:34 2015 @@ -62,6 +62,12 @@ ULONG Unknown14; WMI_GUID_OBJECT_ENTRY GuidObjects[0]; } WMI_NOTIFICATION, *PWMI_NOTIFICATION; + +typedef struct _WMI_SET_MARK +{ + ULONG Flags; + WCHAR Mark[1]; +} WMI_SET_MARK, *PWMI_SET_MARK; PDEVICE_OBJECT WmipServiceDeviceObject; PDEVICE_OBJECT WmipAdminDeviceObject; @@ -427,6 +433,14 @@ return STATUS_SUCCESS; } +static +NTSTATUS +WmiSetMark(PWMI_SET_MARK Buffer, ULONG Length) +{ + UNIMPLEMENTED_DBGBREAK(); + return STATUS_SUCCESS; +} + NTSTATUS NTAPI WmipIoControl( @@ -488,6 +502,18 @@ case IOCTL_WMI_OPEN_GUID_FOR_EVENTS: { Status = WmipOpenGuidForEvents(Buffer, InputLength, &OutputLength); + break; + } + + case IOCTL_WMI_SET_MARK: + { + if (InputLength < FIELD_OFFSET(WMI_SET_MARK, Mark)) + { + Status = STATUS_UNSUCCESSFUL; + break; + } + + Status = WmiSetMark(Buffer, InputLength); break; }

1 0

[dreimer] 67781: [MAZESCR] Made mazescr use screensaver.lib for multi screen support Add symbol to make things look more... mature in C:\ReactOS Fixes of my two problems (app does not really termin...
by dreimer＠svn.reactos.org 16 May '15

16 May '15

Author: dreimer Date: Sat May 16 19:16:40 2015 New Revision: 67781 URL: http://svn.reactos.org/svn/reactos?rev=67781&view=rev Log: [MAZESCR] Made mazescr use screensaver.lib for multi screen support Add symbol to make things look more... mature in C:\ReactOS Fixes of my two problems (app does not really terminate and maze is not generated completely) and tidy up (-200 lines of code!) of my mess and the mess we had in there before by David Quintana. Thx man :-D Added: trunk/rosapps/applications/screensavers/mazescr/maze.rc (with props) trunk/rosapps/applications/screensavers/mazescr/res/ trunk/rosapps/applications/screensavers/mazescr/res/icon_mazescr.ico (with props) Removed: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt trunk/rosapps/applications/screensavers/mazescr/maze.c trunk/rosapps/applications/screensavers/mazescr/resource.h Modified: trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/CMakeLists.txt [iso-8859-1] Sat May 16 19:16:40 2015 @@ -1,10 +1,8 @@ -add_executable(mazescr - scrnsave.c - maze.c - scrnsave.rc) +add_executable(mazescr maze.c maze.rc) -set_module_type(mazescr win32gui) +set_module_type(mazescr win32gui UNICODE) set_target_properties(mazescr PROPERTIES SUFFIX ".scr") +target_link_libraries(mazescr scrnsave) add_importlibs(mazescr user32 gdi32 msvcrt kernel32) add_cd_file(TARGET mazescr DESTINATION reactos/system32 FOR all) Modified: trunk/rosapps/applications/screensavers/mazescr/maze.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/maze.c [iso-8859-1] Sat May 16 19:16:40 2015 @@ -2,17 +2,17 @@ * [ maze ] ... * * modified: [ 03-08-15 ] Ge van Geldorp <ge(a)gse.nl> - * ported to ReactOS + * ported to ReactOS * modified: [ 94-10-8 ] Ge van Geldorp <Ge.vanGeldorp(a)lr.tudelft.nl> - * ported to MS Windows + * 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. + * 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. + * 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()... @@ -52,70 +52,64 @@ #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.*/ +#include <windows.h> /* required for all Windows applications */ +#include <scrnsave.h> +#include "resource.h" + +#define APPNAME _T("Maze") + +static BOOL InitInstance(HWND hParent); +LRESULT CALLBACK ScreenSaverProc(HWND hWnd, UINT message, WPARAM uParam, LPARAM lParam); +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); + +extern HINSTANCE hMainInstance; /* current instance */ 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 MAX_MAZE_SIZE_X ((unsigned long) 1000) // Dynamic detection? +#define MAX_MAZE_SIZE_Y ((unsigned long) 1000) // Dynamic detection? #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)) +#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; + unsigned int x; + unsigned int y; + unsigned int dir; } move_list[MOVE_LIST_SIZE], save_path[MOVE_LIST_SIZE], path[MOVE_LIST_SIZE]; static int maze_size_x, maze_size_y; @@ -123,746 +117,555 @@ 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 bw; 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)); +static void set_maze_sizes(width, height) +int width, height; +{ + maze_size_x = (width -1)/ grid_width; + maze_size_y = (height-1) / grid_height; + if (maze_size_x > MAX_MAZE_SIZE_X) + maze_size_x = MAX_MAZE_SIZE_X; + if (maze_size_y > MAX_MAZE_SIZE_Y) + maze_size_y = MAX_MAZE_SIZE_Y; +} + +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 void create_maze(HWND hWnd) /* create a maze layout given the initialized maze */ +{ + register int i, newdoor = 0; + + 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 */ + 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; +} + +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) /* 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 */ +register 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(HWND hWnd) /* solve it with graphical feedback */ +{ + /* 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(HWND hWnd) /* 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) { + + 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) +{ + SetTimer(hWnd, 1, iTimeout, NULL); +} + +static BOOL OnCreate(HWND hWnd, LPCREATESTRUCT lpCreateStruct) +{ + int size; + + srand((unsigned) time(NULL)); + #if 0 - /* FIXME Pattern brushes not yet implemented in ReactOS */ - hBrushDead = CreateDIBPatternBrushPt(pbmi, DIB_RGB_COLORS); + /* 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 - hBrushDead = CreateSolidBrush(RGB(255, 0, 0)); + size = 10; + pre_solve_delay = 5000; + post_solve_delay = 5000; + solve_delay = 1; #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 (size < 2) { + size = 7 + (rand() % 30); + } + grid_width = grid_height = size; + bw = (size > 6 ? 3 : (size - 1) / 2); + #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 */ - ); + /* FIXME Pattern brushes not yet implemented in ReactOS */ + { + static long grayPattern [] = { + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa, + 0x55555555, + 0xaaaaaaaa + }; + static RGBQUAD argbq [] = { + { 0, 0, 255, 0 }, + { 255, 255, 255, 0 } + }; + BITMAPINFO *pbmi; + + 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)); + hBrushDead = CreateDIBPatternBrushPt(pbmi, DIB_RGB_COLORS); + // hBrushDead = CreateHatchBrush(HS_DIAGCROSS, RGB(255, 0, 0)); + free(pbmi); + } +#else + hBrushDead = CreateSolidBrush(RGB(255, 0, 0)); #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 - SetCursor(NULL); - 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); -} + hBrushLiving = CreateSolidBrush(RGB(0, 255, 0)); + hPenWall = CreatePen(PS_SOLID, 3, RGB(150, 150, 150)); + + hDC = GetDC(hWnd); + + start_timer(hWnd, 1); + + return TRUE; +} + +LRESULT CALLBACK ScreenSaverProc( + HWND hWnd, // window handle + UINT message, // type of message + WPARAM wParam, // additional information + LPARAM lParam) // additional information +{ + switch (message) + { + case WM_CREATE: + OnCreate(hWnd, (LPCREATESTRUCT) lParam); + break; + case WM_SIZE: + set_maze_sizes(LOWORD(lParam), HIWORD(lParam)); + break; + case WM_TIMER: + switch (state) + { + case 2: + begin_solve_maze(hWnd); + + state = 3; + + start_timer(hWnd, solve_delay); + break; + + case 3: + if (!solve_maze(hWnd)) + { + start_timer(hWnd, solve_delay); + } + else + { + state = 1; + start_timer(hWnd, post_solve_delay); + } + break; + + default: + initialize_maze(); + + SendMessage(hWnd, WM_ERASEBKGND, (WPARAM) hDC, (LPARAM) 0); + draw_maze_border(hWnd); + + create_maze(hWnd); + + state = 2; + + start_timer(hWnd, pre_solve_delay); + break; + } + break; + + case WM_DESTROY: // message: window being destroyed + DeleteObject(hBrushLiving); + DeleteObject(hBrushDead); + ReleaseDC(hWnd, hDC); + break; + + default: // Passes it on if unproccessed + return DefScreenSaverProc(hWnd, message, wParam, lParam); + } + return 0; +} + +BOOL WINAPI ScreenSaverConfigureDialog(HWND hWnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + return TRUE; +} + +BOOL WINAPI RegisterDialogClasses(HANDLE hmodule) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hmodule, IDS_TITLE, szTitle, 256); + + LoadString(hmodule, IDS_TEXT, szText, 256); + + MessageBox(0, szText, szTitle, MB_OK | MB_ICONWARNING); + return TRUE; +} Added: trunk/rosapps/applications/screensavers/mazescr/maze.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/maze.rc (added) +++ trunk/rosapps/applications/screensavers/mazescr/maze.rc [iso-8859-1] Sat May 16 19:16:40 2015 @@ -0,0 +1,53 @@ +#include <windows.h> +#include <scrnsave.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_mazescr.ico" + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "Maze ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "maze\0" +#define REACTOS_STR_ORIGINAL_FILENAME "maze.scr\0" + +#include <reactos/version.rc> + +#include <reactos/manifest_exe.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_BG_BG + #include "lang/bg-BG.rc" +#endif +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif +#ifdef LANGUAGE_FR_FR + #include "lang/fr-FR.rc" +#endif +#ifdef LANGUAGE_LT_LT + #include "lang/lt-LT.rc" +#endif +#ifdef LANGUAGE_NO_NO + #include "lang/no-NO.rc" +#endif +#ifdef LANGUAGE_PL_PL + #include "lang/pl-PL.rc" +#endif +#ifdef LANGUAGE_RO_RO + #include "lang/ro-RO.rc" +#endif +#ifdef LANGUAGE_SK_SK + #include "lang/sk-SK.rc" +#endif +#ifdef LANGUAGE_UK_UA + #include "lang/uk-UA.rc" +#endif Propchange: trunk/rosapps/applications/screensavers/mazescr/maze.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/screensavers/mazescr/res/icon_mazescr.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/mazescr/res/icon_mazescr.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/mazescr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/resource.h [iso-8859-1] Sat May 16 19:16:40 2015 @@ -1,4 +1,6 @@ +#pragma once #define IDS_DESCRIPTION 1 #define IDS_TITLE 2 #define IDS_TEXT 3 +#define IDI_ICON 101 Removed: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.c [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.c (removed) @@ -1,234 +0,0 @@ -/* - * 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> -#include "resource.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: - if (fullscreen) - ShowCursor(TRUE); - 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 = CreateWindowEx(WS_EX_TOPMOST, - APPNAME, - APPNAME, - WS_VISIBLE | WS_POPUP, - 0, - 0, - GetSystemMetrics(SM_CXSCREEN), - GetSystemMetrics(SM_CYSCREEN), - HWND_DESKTOP, - 0, - hInstance, - NULL); - - SetWindowPos(hwnd, - 0, - 0, - 0, - 0, - 0, - SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOSIZE | SWP_SHOWWINDOW); - - 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; -} - -void Configure(void) -{ - TCHAR szTitle[256]; - TCHAR szText[256]; - - LoadString(hInstance, - IDS_TITLE, - szTitle, - 256); - - LoadString(hInstance, - IDS_TEXT, - szText, - 256); - - MessageBox(0, - szText, - szTitle, - MB_OK | MB_ICONWARNING); -} - -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: - Configure(); - return 0; - } - - MazeMain(hInst, hPrev, lpCmdLine, hwndChild); - - SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); - - return 0; -} Removed: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (removed) @@ -1,26 +0,0 @@ -#include <windows.h> -#include "resource.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Maze ScreenSaver\0" -#define REACTOS_STR_INTERNAL_NAME "maze\0" -#define REACTOS_STR_ORIGINAL_FILENAME "maze.scr\0" - -#include <reactos/version.rc> - -/* UTF-8 */ -#pragma code_page(65001) - -#include "lang/bg-BG.rc" -#include "lang/de-DE.rc" -#include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/lt-LT.rc" -#include "lang/no-NO.rc" -#include "lang/pl-PL.rc" -#include "lang/ro-RO.rc" -#include "lang/sk-SK.rc" -#include "lang/uk-UA.rc"

1 0

[hbelusca] 67780: [NTVDM]: Reload the new PIT count as soon as we have finished to set it. Tested by V. q; ^D
by hbelusca＠svn.reactos.org 16 May '15

16 May '15

Author: hbelusca Date: Sat May 16 19:15:25 2015 New Revision: 67780 URL: http://svn.reactos.org/svn/reactos?rev=67780&view=rev Log: [NTVDM]: Reload the new PIT count as soon as we have finished to set it. Tested by V. q;^D Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Sat May 16 19:15:25 2015 @@ -275,6 +275,9 @@ PitChannels[Channel].CountRegister = WRITE_PIT_VALUE(PitChannels[Channel], PitChannels[Channel].CountRegister); PitChannels[Channel].ReloadValue = PitChannels[Channel].CountRegister; + + /* Reload now the new count */ + PitChannels[Channel].CurrentValue = PitChannels[Channel].ReloadValue; } }

1 0

[dreimer] 67779: [ROSAPPS] Add symbols to make things look more... mature in C:\ReactOS
by dreimer＠svn.reactos.org 16 May '15

16 May '15

Author: dreimer Date: Sat May 16 19:12:30 2015 New Revision: 67779 URL: http://svn.reactos.org/svn/reactos?rev=67779&view=rev Log: [ROSAPPS] Add symbols to make things look more... mature in C:\ReactOS Added: trunk/rosapps/applications/screensavers/blankscr/res/ trunk/rosapps/applications/screensavers/blankscr/res/icon_blankscr.ico (with props) trunk/rosapps/applications/screensavers/butterflies/res/icon_butterflies.ico (with props) trunk/rosapps/applications/screensavers/circles/res/ trunk/rosapps/applications/screensavers/circles/res/icon_circles.ico (with props) trunk/rosapps/applications/screensavers/cylfrac/res/ trunk/rosapps/applications/screensavers/cylfrac/res/icon_cylfrac.ico (with props) trunk/rosapps/applications/screensavers/starfield/res/ trunk/rosapps/applications/screensavers/starfield/res/icon_starfield.ico (with props) Modified: trunk/rosapps/applications/screensavers/blankscr/resource.h trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc trunk/rosapps/applications/screensavers/butterflies/butterflies.rc trunk/rosapps/applications/screensavers/butterflies/resource.h trunk/rosapps/applications/screensavers/circles/circles.rc trunk/rosapps/applications/screensavers/circles/resource.h trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc trunk/rosapps/applications/screensavers/cylfrac/resource.h trunk/rosapps/applications/screensavers/starfield/resource.h trunk/rosapps/applications/screensavers/starfield/starfield.rc Added: trunk/rosapps/applications/screensavers/blankscr/res/icon_blankscr.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/blankscr/res/icon_blankscr.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/blankscr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/resource.h [iso-8859-1] Sat May 16 19:12:30 2015 @@ -1 +1,4 @@ +#pragma once + #define IDS_TEXT 3 +#define IDI_ICON 101 Modified: trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/blankscr/scrnsave.rc [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,6 +3,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_blankscr.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Default ScreenSaver\0" Modified: trunk/rosapps/applications/screensavers/butterflies/butterflies.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/butterflies.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/butterflies.rc [iso-8859-1] Sat May 16 19:12:30 2015 @@ -9,6 +9,7 @@ #define REACTOS_STR_ORIGINAL_FILENAME "butterflies.scr\0" #include <reactos/version.rc> +IDI_ICON ICON "res/icon_butterflies.ico" IDB_BUTTERFLY1 BITMAP "res/butterfly1.bmp" IDB_BUTTERFLY2 BITMAP "res/butterfly2.bmp" IDB_BUTTERFLY3 BITMAP "res/butterfly3.bmp" Added: trunk/rosapps/applications/screensavers/butterflies/res/icon_butterflies.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/butterflies/res/icon_butterflies.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/butterflies/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/butterflies/resource.h [iso-8859-1] Sat May 16 19:12:30 2015 @@ -1,5 +1,6 @@ +#pragma once + #define IDC_STATIC -1 - #define IDS_DESCRIPTION 1 #define IDABOUT 3 #define IDI_ICON_SCREEN 100 Modified: trunk/rosapps/applications/screensavers/circles/circles.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/circles.rc [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,6 +3,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_circles.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Circles ScreenSaver\0" Added: trunk/rosapps/applications/screensavers/circles/res/icon_circles.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/circles/res/icon_circles.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/circles/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/circles/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/circles/resource.h [iso-8859-1] Sat May 16 19:12:30 2015 @@ -1,3 +1,6 @@ +#pragma once + #define IDS_TEXT 3 -#define IDB_WORKSTATION 0x100 -#define IDB_SERVER 0x200 +#define IDB_WORKSTATION 100 +#define IDB_SERVER 200 +#define IDI_ICON 101 Modified: trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/cylfrac.rc [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,6 +3,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_cylfrac.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Cylinders fractal ScreenSaver\0" Added: trunk/rosapps/applications/screensavers/cylfrac/res/icon_cylfrac.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/cylfrac/res/icon_cylfrac.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/cylfrac/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/cylfrac/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/cylfrac/resource.h [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,3 +3,4 @@ #define IDS_DESCRIPTION 1 #define IDS_TITLE 2 #define IDS_TEXT 3 +#define IDI_ICON 101 Added: trunk/rosapps/applications/screensavers/starfield/res/icon_starfield.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== Binary file - no diff available. Propchange: trunk/rosapps/applications/screensavers/starfield/res/icon_starfield.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/rosapps/applications/screensavers/starfield/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/resource.h [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/resource.h [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,3 +3,4 @@ #define IDS_DESCRIPTION 1 #define IDS_TITLE 2 #define IDS_TEXT 3 +#define IDI_ICON 101 Modified: trunk/rosapps/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/… ============================================================================== --- trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] (original) +++ trunk/rosapps/applications/screensavers/starfield/starfield.rc [iso-8859-1] Sat May 16 19:12:30 2015 @@ -3,6 +3,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_starfield.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "ReactOS Starfield ScreenSaver\0"

1 0

[dreimer] 67778: [3DTEXT] Add symbol to make things look more... mature in C:\ReactOS
by dreimer＠svn.reactos.org 16 May '15

16 May '15

Author: dreimer Date: Sat May 16 19:11:03 2015 New Revision: 67778 URL: http://svn.reactos.org/svn/reactos?rev=67778&view=rev Log: [3DTEXT] Add symbol to make things look more... mature in C:\ReactOS Added: trunk/reactos/base/applications/screensavers/3dtext/res/ trunk/reactos/base/applications/screensavers/3dtext/res/icon_3dtext.ico (with props) Modified: trunk/reactos/base/applications/screensavers/3dtext/resource.h trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc Added: trunk/reactos/base/applications/screensavers/3dtext/res/icon_3dtext.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/base/applications/screensavers/3dtext/res/icon_3dtext.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/base/applications/screensavers/3dtext/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/resource.h [iso-8859-1] Sat May 16 19:11:03 2015 @@ -1,4 +1,5 @@ #pragma once #define IDC_STATIC -1 +#define IDI_ICON 101 #define IDC_MESSAGE_TEXT 1001 Modified: trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/3dtext/rsrc.rc [iso-8859-1] Sat May 16 19:11:03 2015 @@ -5,6 +5,8 @@ #include "resource.h" LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_ICON ICON DISCARDABLE "res/icon_3dtext.ico" #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "OpenGL 3DText ScreenSaver"

1 0

[tkreuzer] 67777: [KMIXER] YDEBUG -> NDEBUG
by tkreuzer＠svn.reactos.org 16 May '15

16 May '15

Author: tkreuzer Date: Sat May 16 18:50:27 2015 New Revision: 67777 URL: http://svn.reactos.org/svn/reactos?rev=67777&view=rev Log: [KMIXER] YDEBUG -> NDEBUG Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Sat May 16 18:50:27 2015 @@ -10,7 +10,7 @@ #include <samplerate.h> -#define YDEBUG +#define NDEBUG #include <debug.h> const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};

1 0

[pschweitzer] 67776: [NTOSKRNL] IOCTL_WMI_29 is IOCTL_WMI_SET_MARK CORE-9699
by pschweitzer＠svn.reactos.org 16 May '15

16 May '15

Author: pschweitzer Date: Sat May 16 18:25:48 2015 New Revision: 67776 URL: http://svn.reactos.org/svn/reactos?rev=67776&view=rev Log: [NTOSKRNL] IOCTL_WMI_29 is IOCTL_WMI_SET_MARK CORE-9699 Modified: trunk/reactos/include/reactos/wmiioctl.h Modified: trunk/reactos/include/reactos/wmiioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wmiioctl.h… ============================================================================== --- trunk/reactos/include/reactos/wmiioctl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wmiioctl.h [iso-8859-1] Sat May 16 18:25:48 2015 @@ -13,7 +13,7 @@ #define IOCTL_WMI_24 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x24, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220090 #define IOCTL_WMI_25 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x25, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x220094 #define IOCTL_WMI_TRACE_USER_MESSAGE CTL_CODE(FILE_DEVICE_UNKNOWN, 0x28, METHOD_NEITHER, FILE_WRITE_ACCESS) // 0x2280A3 -#define IOCTL_WMI_29 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x29, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200A4 +#define IOCTL_WMI_SET_MARK CTL_CODE(FILE_DEVICE_UNKNOWN, 0x29, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200A4 #define IOCTL_WMI_2a CTL_CODE(FILE_DEVICE_UNKNOWN, 0x2a, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200A8 #define IOCTL_WMI_2b CTL_CODE(FILE_DEVICE_UNKNOWN, 0x2b, METHOD_BUFFERED, FILE_ANY_ACCESS) // 0x2200AC #define IOCTL_WMI_42 CTL_CODE(FILE_DEVICE_UNKNOWN, 0x42, METHOD_BUFFERED, FILE_READ_ACCESS) // 0x224108

1 0

[tkreuzer] 67775: [CRT] Fix ceilf and floorf. Spotted by Thomas.
by tkreuzer＠svn.reactos.org 16 May '15

16 May '15

Author: tkreuzer Date: Sat May 16 17:25:45 2015 New Revision: 67775 URL: http://svn.reactos.org/svn/reactos?rev=67775&view=rev Log: [CRT] Fix ceilf and floorf. Spotted by Thomas. Modified: trunk/reactos/lib/sdk/crt/math/ceilf.c trunk/reactos/lib/sdk/crt/math/floorf.c Modified: trunk/reactos/lib/sdk/crt/math/ceilf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/ceilf.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/ceilf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/ceilf.c [iso-8859-1] Sat May 16 17:25:45 2015 @@ -7,5 +7,5 @@ ceilf( _In_ float x) { - return (float)ceilf((double)x); + return (float)ceil((double)x); } Modified: trunk/reactos/lib/sdk/crt/math/floorf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/floorf.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/floorf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/floorf.c [iso-8859-1] Sat May 16 17:25:45 2015 @@ -7,5 +7,5 @@ floorf( _In_ float x) { - return (float)floorf((double)x); + return (float)floor((double)x); }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015