Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mnordell] 29635: proper PSEH return usage (thanks janderwald)
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 13:19:09 2007 New Revision: 29635 URL: http://svn.reactos.org/svn/reactos?rev=29635&view=rev Log: proper PSEH return usage (thanks janderwald) Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Wed Oct 17 13:19:09 2007 @@ -649,7 +649,7 @@ { /* Get the exception code */ Status = _SEH_GetExceptionCode(); - return(Status); /* Correct? NT5 returns STATUS_ACCESS_VIOLATION ? */ + _SEH_YIELD(return Status); } _SEH_END;

1 0

[hpoussin] 29634: Add missing WINAPI keyword
by hpoussin＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: hpoussin Date: Wed Oct 17 13:10:02 2007 New Revision: 29634 URL: http://svn.reactos.org/svn/reactos?rev=29634&view=rev Log: Add missing WINAPI keyword Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c trunk/reactos/include/psdk/shlobj.h Modified: trunk/reactos/dll/win32/shell32/shv_item_cmenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shv_item… ============================================================================== --- trunk/reactos/dll/win32/shell32/shv_item_cmenu.c (original) +++ trunk/reactos/dll/win32/shell32/shv_item_cmenu.c Wed Oct 17 13:10:02 2007 @@ -605,14 +605,11 @@ * */ -HRESULT SHCreateDefaultContextMenu( +HRESULT WINAPI SHCreateDefaultContextMenu( const DEFCONTEXTMENU *pdcm, REFIID riid, void **ppv) { - - - return E_FAIL; } Modified: trunk/reactos/include/psdk/shlobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlobj.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/shlobj.h (original) +++ trunk/reactos/include/psdk/shlobj.h Wed Oct 17 13:10:02 2007 @@ -1389,7 +1389,7 @@ const HKEY *aKeys; }DEFCONTEXTMENU; -HRESULT SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); +HRESULT WINAPI SHCreateDefaultContextMenu(const DEFCONTEXTMENU *,REFIID,void **ppv); typedef HRESULT (CALLBACK * LPFNDFMCALLBACK)(IShellFolder*,HWND,IDataObject*,UINT,WPARAM,LPARAM); INT CDefFolderMenu_Create2(LPCITEMIDLIST,HWND,UINT,LPCITEMIDLIST*,IShellFolder*,LPFNDFMCALLBACK,UINT,HKEY *,IContextMenu **);

1 0

[mnordell] 29633: Fix PAGE_ROUND_DOWN, PAGE_ROUND_UP, and a user of them (correctness and speedup)
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 12:31:02 2007 New Revision: 29633 URL: http://svn.reactos.org/svn/reactos?rev=29633&view=rev Log: Fix PAGE_ROUND_DOWN, PAGE_ROUND_UP, and a user of them (correctness and speedup) Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/include/reactos/helper.h trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h (original) +++ trunk/reactos/include/ndk/mmtypes.h Wed Oct 17 12:31:02 2007 @@ -30,11 +30,9 @@ // Page-Rounding Macros // #define PAGE_ROUND_DOWN(x) \ - (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) + (((ULONG_PTR)(x))&(~(PAGE_SIZE-1))) #define PAGE_ROUND_UP(x) \ - ( (((ULONG_PTR)x)%PAGE_SIZE) ? \ - ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : \ - ((ULONG_PTR)x) ) + ( (((ULONG_PTR)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)) ) #ifdef NTOS_MODE_USER #define ROUND_TO_PAGES(Size) \ (((ULONG_PTR)(Size) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) Modified: trunk/reactos/include/reactos/helper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/helper.h?r… ============================================================================== --- trunk/reactos/include/reactos/helper.h (original) +++ trunk/reactos/include/reactos/helper.h Wed Oct 17 12:31:02 2007 @@ -20,11 +20,11 @@ #endif #ifndef PAGE_ROUND_DOWN -#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)x)&(~(PAGE_SIZE-1))) +#define PAGE_ROUND_DOWN(x) (((ULONG_PTR)(x))&(~(PAGE_SIZE-1))) #endif #ifndef PAGE_ROUND_UP -#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)(x)) + PAGE_SIZE-1) & (~(PAGE_SIZE-1)) ) #endif #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) Modified: trunk/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/virtual.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/virtual.c (original) +++ trunk/reactos/ntoskrnl/mm/virtual.c Wed Oct 17 12:31:02 2007 @@ -390,7 +390,7 @@ NTSTATUS Status; *NumberOfBytesToProtect = - PAGE_ROUND_UP((*BaseAddress) + (*NumberOfBytesToProtect)) - + PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) - PAGE_ROUND_DOWN(*BaseAddress); *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress);

1 0

[mnordell] 29632: Probe arguments if coming from usermode. Use previous mode when referencing process handle. Actually specify PsProcessType for process handle. Some minor cleanup (less compiled code and some speedup).
by mnordell＠svn.reactos.org 17 Oct '07

17 Oct '07

Author: mnordell Date: Wed Oct 17 12:16:20 2007 New Revision: 29632 URL: http://svn.reactos.org/svn/reactos?rev=29632&view=rev Log: Probe arguments if coming from usermode. Use previous mode when referencing process handle. Actually specify PsProcessType for process handle. Some minor cleanup (less compiled code and some speedup). Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c Wed Oct 17 12:16:20 2007 @@ -516,12 +516,12 @@ * @implemented */ NTSTATUS STDCALL -NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG ZeroBits, +NtAllocateVirtualMemory(IN HANDLE ProcessHandle, + IN OUT PVOID* UBaseAddress, + IN ULONG ZeroBits, IN OUT PULONG URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN ULONG AllocationType, + IN ULONG Protect) /* * FUNCTION: Allocates a block of virtual memory in the process address space * ARGUMENTS: @@ -542,6 +542,10 @@ * PAGE_EXECUTE_READ, PAGE_EXECUTE_READWRITE, PAGE_GUARD, * PAGE_NOACCESS * RETURNS: Status + * NOTES: Must run at IRQL PASSIVE_LEVEL? (or is APC_LEVEL cool too?) + * MSDN states that ZwAllocateVirtualMemory IRQL must be PASSIVE_LEVEL, + * but why wouldn't APC_LEVEL be valid (or is that only for the Zw* version + * and Nt* can indeed run at APC_LEVEL?) */ { PEPROCESS Process; @@ -555,6 +559,12 @@ PVOID PBaseAddress; ULONG PRegionSize; PHYSICAL_ADDRESS BoundaryAddressMultiple; + KPROCESSOR_MODE PreviousMode; + + // TMN: Someone Pick one of these. Until it's clear which + // level is allowed, I play it safe and check for <= APC_LEVEL + PAGED_CODE(); +// ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); DPRINT("NtAllocateVirtualMemory(*UBaseAddress %x, " "ZeroBits %d, *URegionSize %x, AllocationType %x, Protect %x)\n", @@ -576,7 +586,7 @@ } /* Check for valid Allocation Types */ - if ((AllocationType &~ (MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | + if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); @@ -593,7 +603,7 @@ /* MEM_RESET is an exclusive flag, make sure that is valid too */ if ((AllocationType & MEM_RESET) && (AllocationType != MEM_RESET)) { - DPRINT1("MEM_RESET used illegaly\n"); + DPRINT1("Invalid use of MEM_RESET\n"); return STATUS_INVALID_PARAMETER_5; } @@ -623,12 +633,30 @@ } } - PBaseAddress = *UBaseAddress; - PRegionSize = *URegionSize; + PreviousMode = KeGetPreviousMode(); + + _SEH_TRY + { + if (PreviousMode != KernelMode) + { + ProbeForWritePointer(UBaseAddress); + ProbeForWriteUlong(URegionSize); + } + PBaseAddress = *UBaseAddress; + PRegionSize = *URegionSize; + } + _SEH_HANDLE + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + return(Status); /* Correct? NT5 returns STATUS_ACCESS_VIOLATION ? */ + } + _SEH_END; + BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP(PBaseAddress + PRegionSize) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - PAGE_ROUND_DOWN(PBaseAddress); /* @@ -638,12 +666,12 @@ */ if (BaseAddress >= MM_HIGHEST_USER_ADDRESS) { - DPRINT1("Virtual allocation above User Space\n"); + DPRINT1("Virtual allocation base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } if (!RegionSize) { - DPRINT1("Region size is invalid\n"); + DPRINT1("Region size is invalid (zero)\n"); return STATUS_INVALID_PARAMETER_4; } if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)BaseAddress) < RegionSize) @@ -657,7 +685,7 @@ * but there may be other cases...needs more testing */ if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - ((Protect & PAGE_WRITECOPY) || (Protect & PAGE_EXECUTE_WRITECOPY))) + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) { DPRINT1("Copy on write is not supported by VirtualAlloc\n"); return STATUS_INVALID_PAGE_PROTECTION; @@ -666,8 +694,8 @@ Status = ObReferenceObjectByHandle(ProcessHandle, PROCESS_VM_OPERATION, - NULL, - UserMode, + PsProcessType, + PreviousMode, (PVOID*)(&Process), NULL); if (!NT_SUCCESS(Status)) @@ -750,10 +778,10 @@ MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && - ((Protect & PAGE_READWRITE) || - (Protect & PAGE_EXECUTE_READWRITE))) - { - MmReserveSwapPages(MemoryAreaLength); + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); } *UBaseAddress = BaseAddress; @@ -816,17 +844,11 @@ { ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - - /* FiN TODO: Optimize loop counter! */ - for (i = 0; i < PAGE_ROUND_UP(MemoryAreaLength) / PAGE_SIZE; i++) + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) { PMM_PAGEOP PageOp; - - if (MemoryArea->PageOpCount == 0) - { - break; - } - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), NULL, 0); @@ -899,7 +921,7 @@ *PRegionSize,FreeType); BaseAddress = (PVOID)PAGE_ROUND_DOWN((*PBaseAddress)); - RegionSize = PAGE_ROUND_UP((*PBaseAddress) + (*PRegionSize)) - + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(*PBaseAddress) + (*PRegionSize)) - PAGE_ROUND_DOWN((*PBaseAddress)); Status = ObReferenceObjectByHandle(ProcessHandle, @@ -919,9 +941,8 @@ MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); if (MemoryArea == NULL) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } switch (FreeType) @@ -931,14 +952,13 @@ if (MemoryArea->StartingAddress != BaseAddress || MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) { - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; } + MmFreeVirtualMemory(Process, MemoryArea); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(STATUS_SUCCESS); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; case MEM_DECOMMIT: Status = @@ -950,13 +970,17 @@ MEM_RESERVE, PAGE_NOACCESS, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - ObDereferenceObject(Process); - return(Status); - } + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + +unlock_deref_and_return: + MmUnlockAddressSpace(AddressSpace); ObDereferenceObject(Process); - return(STATUS_NOT_IMPLEMENTED); + + return(Status); } NTSTATUS

1 0

[cfinck] 29631: Get the language for the top and left menu of the Wiki from the RosCMS Cookie. Fixes a part of bug 1590. See issue #1590 for more details.
by cfinck＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: cfinck Date: Tue Oct 16 23:54:15 2007 New Revision: 29631 URL: http://svn.reactos.org/svn/reactos?rev=29631&view=rev Log: Get the language for the top and left menu of the Wiki from the RosCMS Cookie. Fixes a part of bug 1590. See issue #1590 for more details. Modified: trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Modified: trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/wiki/skins/… ============================================================================== --- trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php (original) +++ trunk/web/reactos.org/htdocs/wiki/skins/RosCMS.php Tue Oct 16 23:54:15 2007 @@ -97,8 +97,12 @@ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>"> <?php - readfile("http://www.reactos.org/en/subsys_extern_menu_top.html"); - readfile("http://www.reactos.org/en/subsys_extern_menu_left.html"); + $userlang = $_COOKIE["roscms_usrset_lang"]; + if(strlen($userlang) != 2) + $userlang = "en"; + + readfile("http://www.reactos.org/$userlang/subsys_extern_menu_top.html"); + readfile("http://www.reactos.org/$userlang/subsys_extern_menu_left.html"); ?> <div class="navTitle">Wiki</div>

1 0

[cfinck] 29630: Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild. This change obsoletes the old cardsbav.dll, so I removed it.
by cfinck＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: cfinck Date: Tue Oct 16 22:33:03 2007 New Revision: 29630 URL: http://svn.reactos.org/svn/reactos?rev=29630&view=rev Log: Merge the cards of "cardsbav" to our cards.dll and specify, which cards shall be compiled into the cards.dll, with preprocessor definitions in cards.rbuild. This change obsoletes the old cardsbav.dll, so I removed it. Added: trunk/reactos/dll/win32/cards/res/bavarian/ trunk/reactos/dll/win32/cards/res/bavarian/Eichel10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Eichel9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Eichel9.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/EichelUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/EichelUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/FreeCard.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Gras9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Gras9.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/GrasUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/GrasUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Herz9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Herz9.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/HerzUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/HerzUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/Joker.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Joker.bmp trunk/reactos/dll/win32/cards/res/bavarian/OSign.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/OSign.bmp trunk/reactos/dll/win32/cards/res/bavarian/Ruecken.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Ruecken.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen10.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen10.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen2.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen2.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen3.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen3.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen4.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen4.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen5.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen5.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen6.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen6.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen7.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen7.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen8.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen8.bmp trunk/reactos/dll/win32/cards/res/bavarian/Schellen9.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/Schellen9.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenAs.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenAs.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenKoenig.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenKoenig.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenOber.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenOber.bmp trunk/reactos/dll/win32/cards/res/bavarian/SchellenUnter.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/SchellenUnter.bmp trunk/reactos/dll/win32/cards/res/bavarian/XSign.bmp - copied unchanged from r29607, trunk/rosapps/cardsbav/res/XSign.bmp trunk/reactos/dll/win32/cards/res/default/ trunk/reactos/dll/win32/cards/res/default/Background_1.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_1.bmp trunk/reactos/dll/win32/cards/res/default/Background_10.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_10.bmp trunk/reactos/dll/win32/cards/res/default/Background_11.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_11.bmp trunk/reactos/dll/win32/cards/res/default/Background_12.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_12.bmp trunk/reactos/dll/win32/cards/res/default/Background_2.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_2.bmp trunk/reactos/dll/win32/cards/res/default/Background_3.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_3.bmp trunk/reactos/dll/win32/cards/res/default/Background_4.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_4.bmp trunk/reactos/dll/win32/cards/res/default/Background_5.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_5.bmp trunk/reactos/dll/win32/cards/res/default/Background_6.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_6.bmp trunk/reactos/dll/win32/cards/res/default/Background_7.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_7.bmp trunk/reactos/dll/win32/cards/res/default/Background_8.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_8.bmp trunk/reactos/dll/win32/cards/res/default/Background_9.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Background_9.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_King.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp trunk/reactos/dll/win32/cards/res/default/Clubs_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp trunk/reactos/dll/win32/cards/res/default/Diamonds_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp trunk/reactos/dll/win32/cards/res/default/FreeCard.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_King.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp trunk/reactos/dll/win32/cards/res/default/Hearts_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp trunk/reactos/dll/win32/cards/res/default/Joker.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Joker.bmp trunk/reactos/dll/win32/cards/res/default/OSign.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/OSign.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ace.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Eight.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Five.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Five.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Four.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Four.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Jack.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp trunk/reactos/dll/win32/cards/res/default/Spades_King.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_King.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Nine.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Queen.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Seven.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Six.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Six.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Ten.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Three.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Three.bmp trunk/reactos/dll/win32/cards/res/default/Spades_Two.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/Spades_Two.bmp trunk/reactos/dll/win32/cards/res/default/XSign.bmp - copied unchanged from r29614, trunk/reactos/dll/win32/cards/res/XSign.bmp Removed: trunk/reactos/dll/win32/cards/res/Background_1.bmp trunk/reactos/dll/win32/cards/res/Background_10.bmp trunk/reactos/dll/win32/cards/res/Background_11.bmp trunk/reactos/dll/win32/cards/res/Background_12.bmp trunk/reactos/dll/win32/cards/res/Background_2.bmp trunk/reactos/dll/win32/cards/res/Background_3.bmp trunk/reactos/dll/win32/cards/res/Background_4.bmp trunk/reactos/dll/win32/cards/res/Background_5.bmp trunk/reactos/dll/win32/cards/res/Background_6.bmp trunk/reactos/dll/win32/cards/res/Background_7.bmp trunk/reactos/dll/win32/cards/res/Background_8.bmp trunk/reactos/dll/win32/cards/res/Background_9.bmp trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp trunk/reactos/dll/win32/cards/res/Clubs_King.bmp trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp trunk/reactos/dll/win32/cards/res/FreeCard.bmp trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp trunk/reactos/dll/win32/cards/res/Hearts_King.bmp trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp trunk/reactos/dll/win32/cards/res/Joker.bmp trunk/reactos/dll/win32/cards/res/OSign.bmp trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp trunk/reactos/dll/win32/cards/res/Spades_Five.bmp trunk/reactos/dll/win32/cards/res/Spades_Four.bmp trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp trunk/reactos/dll/win32/cards/res/Spades_King.bmp trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp trunk/reactos/dll/win32/cards/res/Spades_Six.bmp trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp trunk/reactos/dll/win32/cards/res/Spades_Three.bmp trunk/reactos/dll/win32/cards/res/Spades_Two.bmp trunk/reactos/dll/win32/cards/res/XSign.bmp trunk/rosapps/cardsbav/ Modified: trunk/reactos/dll/win32/cards/cards.h trunk/reactos/dll/win32/cards/cards.rbuild trunk/reactos/dll/win32/cards/cards.rc trunk/rosapps/directory.rbuild Modified: trunk/reactos/dll/win32/cards/cards.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.h?re… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.h (original) +++ trunk/reactos/dll/win32/cards/cards.h Tue Oct 16 22:33:03 2007 @@ -41,14 +41,15 @@ #define ectGREENO 7 #define ectSAVEEDGESMASK 0x80000000 -/* Microsoft card dimensions */ -/* -#define CARD_WIDTH 71 -#define CARD_HEIGHT 96 -*/ -/* MacSolitaireX's card dimensions */ -#define CARD_WIDTH 72 -#define CARD_HEIGHT 96 +#if defined(CARDSTYLE_DEFAULT) +# define CARD_WIDTH 72 // The original Microsoft cards are 71px wide, but ours are taken from MacSolitaireX +# define CARD_HEIGHT 96 +#elif defined(CARDSTYLE_BAVARIAN) +# define CARD_WIDTH 110 +# define CARD_HEIGHT 198 +#else +# error No or unsupported cardstyle defined +#endif #define ISREDCARD(x) (x >= 13 && x <= 39) Modified: trunk/reactos/dll/win32/cards/cards.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rbui… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rbuild (original) +++ trunk/reactos/dll/win32/cards/cards.rbuild Tue Oct 16 22:33:03 2007 @@ -4,6 +4,10 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> + +  + <define name="CARDSTYLE_DEFAULT" /> + <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/dll/win32/cards/cards.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/cards.rc?r… ============================================================================== --- trunk/reactos/dll/win32/cards/cards.rc (original) +++ trunk/reactos/dll/win32/cards/cards.rc Tue Oct 16 22:33:03 2007 @@ -28,71 +28,146 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -1 BITMAP "res/Clubs_Ace.bmp" -2 BITMAP "res/Clubs_Two.bmp" -3 BITMAP "res/Clubs_Three.bmp" -4 BITMAP "res/Clubs_Four.bmp" -5 BITMAP "res/Clubs_Five.bmp" -6 BITMAP "res/Clubs_Six.bmp" -7 BITMAP "res/Clubs_Seven.bmp" -8 BITMAP "res/Clubs_Eight.bmp" -9 BITMAP "res/Clubs_Nine.bmp" -10 BITMAP "res/Clubs_Ten.bmp" -11 BITMAP "res/Clubs_Jack.bmp" -12 BITMAP "res/Clubs_Queen.bmp" -13 BITMAP "res/Clubs_King.bmp" -14 BITMAP "res/Diamonds_Ace.bmp" -15 BITMAP "res/Diamonds_Two.bmp" -16 BITMAP "res/Diamonds_Three.bmp" -17 BITMAP "res/Diamonds_Four.bmp" -18 BITMAP "res/Diamonds_Five.bmp" -19 BITMAP "res/Diamonds_Six.bmp" -20 BITMAP "res/Diamonds_Seven.bmp" -21 BITMAP "res/Diamonds_Eight.bmp" -22 BITMAP "res/Diamonds_Nine.bmp" -23 BITMAP "res/Diamonds_Ten.bmp" -24 BITMAP "res/Diamonds_Jack.bmp" -25 BITMAP "res/Diamonds_Queen.bmp" -26 BITMAP "res/Diamonds_King.bmp" -27 BITMAP "res/Hearts_Ace.bmp" -28 BITMAP "res/Hearts_Two.bmp" -29 BITMAP "res/Hearts_Three.bmp" -30 BITMAP "res/Hearts_Four.bmp" -31 BITMAP "res/Hearts_Five.bmp" -32 BITMAP "res/Hearts_Six.bmp" -33 BITMAP "res/Hearts_Seven.bmp" -34 BITMAP "res/Hearts_Eight.bmp" -35 BITMAP "res/Hearts_Nine.bmp" -36 BITMAP "res/Hearts_Ten.bmp" -37 BITMAP "res/Hearts_Jack.bmp" -38 BITMAP "res/Hearts_Queen.bmp" -39 BITMAP "res/Hearts_King.bmp" -40 BITMAP "res/Spades_Ace.bmp" -41 BITMAP "res/Spades_Two.bmp" -42 BITMAP "res/Spades_Three.bmp" -43 BITMAP "res/Spades_Four.bmp" -44 BITMAP "res/Spades_Five.bmp" -45 BITMAP "res/Spades_Six.bmp" -46 BITMAP "res/Spades_Seven.bmp" -47 BITMAP "res/Spades_Eight.bmp" -48 BITMAP "res/Spades_Nine.bmp" -49 BITMAP "res/Spades_Ten.bmp" -50 BITMAP "res/Spades_Jack.bmp" -51 BITMAP "res/Spades_Queen.bmp" -52 BITMAP "res/Spades_King.bmp" -53 BITMAP "res/FreeCard.bmp" -54 BITMAP "res/Background_1.bmp" -55 BITMAP "res/Background_2.bmp" -56 BITMAP "res/Background_3.bmp" -57 BITMAP "res/Background_4.bmp" -58 BITMAP "res/Background_5.bmp" -59 BITMAP "res/Background_6.bmp" -60 BITMAP "res/Background_7.bmp" -61 BITMAP "res/Background_8.bmp" -62 BITMAP "res/Background_9.bmp" -63 BITMAP "res/Background_10.bmp" -64 BITMAP "res/Background_11.bmp" -65 BITMAP "res/Background_12.bmp" -66 BITMAP "res/Joker.bmp" -67 BITMAP "res/XSign.bmp" -68 BITMAP "res/OSign.bmp" +#if defined(CARDSTYLE_DEFAULT) + 1 BITMAP "res/default/Clubs_Ace.bmp" + 2 BITMAP "res/default/Clubs_Two.bmp" + 3 BITMAP "res/default/Clubs_Three.bmp" + 4 BITMAP "res/default/Clubs_Four.bmp" + 5 BITMAP "res/default/Clubs_Five.bmp" + 6 BITMAP "res/default/Clubs_Six.bmp" + 7 BITMAP "res/default/Clubs_Seven.bmp" + 8 BITMAP "res/default/Clubs_Eight.bmp" + 9 BITMAP "res/default/Clubs_Nine.bmp" + 10 BITMAP "res/default/Clubs_Ten.bmp" + 11 BITMAP "res/default/Clubs_Jack.bmp" + 12 BITMAP "res/default/Clubs_Queen.bmp" + 13 BITMAP "res/default/Clubs_King.bmp" + 14 BITMAP "res/default/Diamonds_Ace.bmp" + 15 BITMAP "res/default/Diamonds_Two.bmp" + 16 BITMAP "res/default/Diamonds_Three.bmp" + 17 BITMAP "res/default/Diamonds_Four.bmp" + 18 BITMAP "res/default/Diamonds_Five.bmp" + 19 BITMAP "res/default/Diamonds_Six.bmp" + 20 BITMAP "res/default/Diamonds_Seven.bmp" + 21 BITMAP "res/default/Diamonds_Eight.bmp" + 22 BITMAP "res/default/Diamonds_Nine.bmp" + 23 BITMAP "res/default/Diamonds_Ten.bmp" + 24 BITMAP "res/default/Diamonds_Jack.bmp" + 25 BITMAP "res/default/Diamonds_Queen.bmp" + 26 BITMAP "res/default/Diamonds_King.bmp" + 27 BITMAP "res/default/Hearts_Ace.bmp" + 28 BITMAP "res/default/Hearts_Two.bmp" + 29 BITMAP "res/default/Hearts_Three.bmp" + 30 BITMAP "res/default/Hearts_Four.bmp" + 31 BITMAP "res/default/Hearts_Five.bmp" + 32 BITMAP "res/default/Hearts_Six.bmp" + 33 BITMAP "res/default/Hearts_Seven.bmp" + 34 BITMAP "res/default/Hearts_Eight.bmp" + 35 BITMAP "res/default/Hearts_Nine.bmp" + 36 BITMAP "res/default/Hearts_Ten.bmp" + 37 BITMAP "res/default/Hearts_Jack.bmp" + 38 BITMAP "res/default/Hearts_Queen.bmp" + 39 BITMAP "res/default/Hearts_King.bmp" + 40 BITMAP "res/default/Spades_Ace.bmp" + 41 BITMAP "res/default/Spades_Two.bmp" + 42 BITMAP "res/default/Spades_Three.bmp" + 43 BITMAP "res/default/Spades_Four.bmp" + 44 BITMAP "res/default/Spades_Five.bmp" + 45 BITMAP "res/default/Spades_Six.bmp" + 46 BITMAP "res/default/Spades_Seven.bmp" + 47 BITMAP "res/default/Spades_Eight.bmp" + 48 BITMAP "res/default/Spades_Nine.bmp" + 49 BITMAP "res/default/Spades_Ten.bmp" + 50 BITMAP "res/default/Spades_Jack.bmp" + 51 BITMAP "res/default/Spades_Queen.bmp" + 52 BITMAP "res/default/Spades_King.bmp" + 53 BITMAP "res/default/FreeCard.bmp" + 54 BITMAP "res/default/Background_1.bmp" + 55 BITMAP "res/default/Background_2.bmp" + 56 BITMAP "res/default/Background_3.bmp" + 57 BITMAP "res/default/Background_4.bmp" + 58 BITMAP "res/default/Background_5.bmp" + 59 BITMAP "res/default/Background_6.bmp" + 60 BITMAP "res/default/Background_7.bmp" + 61 BITMAP "res/default/Background_8.bmp" + 62 BITMAP "res/default/Background_9.bmp" + 63 BITMAP "res/default/Background_10.bmp" + 64 BITMAP "res/default/Background_11.bmp" + 65 BITMAP "res/default/Background_12.bmp" + 66 BITMAP "res/default/Joker.bmp" + 67 BITMAP "res/default/XSign.bmp" + 68 BITMAP "res/default/OSign.bmp" + +#elif defined(CARDSTYLE_BAVARIAN) + 1 BITMAP "res/bavarian/EichelAs.bmp" + 2 BITMAP "res/bavarian/Eichel2.bmp" + 3 BITMAP "res/bavarian/Eichel3.bmp" + 4 BITMAP "res/bavarian/Eichel4.bmp" + 5 BITMAP "res/bavarian/Eichel5.bmp" + 6 BITMAP "res/bavarian/Eichel6.bmp" + 7 BITMAP "res/bavarian/Eichel7.bmp" + 8 BITMAP "res/bavarian/Eichel8.bmp" + 9 BITMAP "res/bavarian/Eichel9.bmp" + 10 BITMAP "res/bavarian/Eichel10.bmp" + 11 BITMAP "res/bavarian/EichelUnter.bmp" + 12 BITMAP "res/bavarian/EichelOber.bmp" + 13 BITMAP "res/bavarian/EichelKoenig.bmp" + 14 BITMAP "res/bavarian/SchellenAs.bmp" + 15 BITMAP "res/bavarian/Schellen2.bmp" + 16 BITMAP "res/bavarian/Schellen3.bmp" + 17 BITMAP "res/bavarian/Schellen4.bmp" + 18 BITMAP "res/bavarian/Schellen5.bmp" + 19 BITMAP "res/bavarian/Schellen6.bmp" + 20 BITMAP "res/bavarian/Schellen7.bmp" + 21 BITMAP "res/bavarian/Schellen8.bmp" + 22 BITMAP "res/bavarian/Schellen9.bmp" + 23 BITMAP "res/bavarian/Schellen10.bmp" + 24 BITMAP "res/bavarian/SchellenUnter.bmp" + 25 BITMAP "res/bavarian/SchellenOber.bmp" + 26 BITMAP "res/bavarian/SchellenKoenig.bmp" + 27 BITMAP "res/bavarian/HerzAs.bmp" + 28 BITMAP "res/bavarian/Herz2.bmp" + 29 BITMAP "res/bavarian/Herz3.bmp" + 30 BITMAP "res/bavarian/Herz4.bmp" + 31 BITMAP "res/bavarian/Herz5.bmp" + 32 BITMAP "res/bavarian/Herz6.bmp" + 33 BITMAP "res/bavarian/Herz7.bmp" + 34 BITMAP "res/bavarian/Herz8.bmp" + 35 BITMAP "res/bavarian/Herz9.bmp" + 36 BITMAP "res/bavarian/Herz10.bmp" + 37 BITMAP "res/bavarian/HerzUnter.bmp" + 38 BITMAP "res/bavarian/HerzOber.bmp" + 39 BITMAP "res/bavarian/HerzKoenig.bmp" + 40 BITMAP "res/bavarian/GrasAs.bmp" + 41 BITMAP "res/bavarian/Gras2.bmp" + 42 BITMAP "res/bavarian/Gras3.bmp" + 43 BITMAP "res/bavarian/Gras4.bmp" + 44 BITMAP "res/bavarian/Gras5.bmp" + 45 BITMAP "res/bavarian/Gras6.bmp" + 46 BITMAP "res/bavarian/Gras7.bmp" + 47 BITMAP "res/bavarian/Gras8.bmp" + 48 BITMAP "res/bavarian/Gras9.bmp" + 49 BITMAP "res/bavarian/Gras10.bmp" + 50 BITMAP "res/bavarian/GrasUnter.bmp" + 51 BITMAP "res/bavarian/GrasOber.bmp" + 52 BITMAP "res/bavarian/GrasKoenig.bmp" + 53 BITMAP "res/bavarian/FreeCard.bmp" + 54 BITMAP "res/bavarian/Ruecken.bmp" + 55 BITMAP "res/bavarian/Ruecken.bmp" + 56 BITMAP "res/bavarian/Ruecken.bmp" + 57 BITMAP "res/bavarian/Ruecken.bmp" + 58 BITMAP "res/bavarian/Ruecken.bmp" + 59 BITMAP "res/bavarian/Ruecken.bmp" + 60 BITMAP "res/bavarian/Ruecken.bmp" + 61 BITMAP "res/bavarian/Ruecken.bmp" + 62 BITMAP "res/bavarian/Ruecken.bmp" + 63 BITMAP "res/bavarian/Ruecken.bmp" + 64 BITMAP "res/bavarian/Ruecken.bmp" + 65 BITMAP "res/bavarian/Ruecken.bmp" + 66 BITMAP "res/bavarian/Joker.bmp" + 67 BITMAP "res/bavarian/XSign.bmp" + 68 BITMAP "res/bavarian/OSign.bmp" + +#else +# error No or unsupported cardstyle defined +#endif Removed: trunk/reactos/dll/win32/cards/res/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Clubs_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Clubs_… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Diamonds_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Diamon… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/FreeCa… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Hearts_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Hearts… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Joker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Joker.… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/OSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/OSign.… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Ace.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Eight.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Five.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Four.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Jack.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_King.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Nine.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Queen.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Seven.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Six.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Ten.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Three.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/Spades_Two.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Spades… ============================================================================== Binary file - no diff available. Removed: trunk/reactos/dll/win32/cards/res/XSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/XSign.… ============================================================================== Binary file - no diff available. Modified: trunk/rosapps/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/directory.rbuild?rev=29630… ============================================================================== --- trunk/rosapps/directory.rbuild (original) +++ trunk/rosapps/directory.rbuild Tue Oct 16 22:33:03 2007 @@ -6,10 +6,6 @@ <xi:include href="avtest/avtest.rbuild" /> </directory> --> - - <directory name="cardsbav"> - <xi:include href="cardsbav/cardsbav.rbuild" /> - </directory> <directory name="cmdutils"> <xi:include href="cmdutils/cmdutils.rbuild" />

1 0

[fireball] 29629: Dmitry Gorbachev <hs26332@mail.cnt.ru> - NtSetInformationFile() could be done before asynchronously called NtWriteFile is completed. Fix this by sending the synchronous flag. - Check return status of the second NtSetInformationFile() call. See issue #2071 for more details.
by fireball＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: fireball Date: Tue Oct 16 18:59:09 2007 New Revision: 29629 URL: http://svn.reactos.org/svn/reactos?rev=29629&view=rev Log: Dmitry Gorbachev <hs26332(a)mail.cnt.ru> - NtSetInformationFile() could be done before asynchronously called NtWriteFile is completed. Fix this by sending the synchronous flag. - Check return status of the second NtSetInformationFile() call. See issue #2071 for more details. Modified: trunk/reactos/base/setup/usetup/filesup.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c (original) +++ trunk/reactos/base/setup/usetup/filesup.c Tue Oct 16 18:59:09 2007 @@ -204,7 +204,9 @@ FILE_ATTRIBUTE_NORMAL, 0, FILE_OVERWRITE_IF, - FILE_NO_INTERMEDIATE_BUFFERING | FILE_SEQUENTIAL_ONLY, + FILE_NO_INTERMEDIATE_BUFFERING | + FILE_SEQUENTIAL_ONLY | + FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0); if(!NT_SUCCESS(Status)) @@ -243,11 +245,17 @@ } /* shorten the file back to it's real size after completing the write */ - NtSetInformationFile(FileHandleDest, + Status = NtSetInformationFile(FileHandleDest, &IoStatusBlock, &FileStandard.EndOfFile, sizeof(FILE_END_OF_FILE_INFORMATION), FileEndOfFileInformation); + + if(!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed: %x\n", Status); + } + closedest: NtClose(FileHandleDest); unmapsrcsec:

1 0

[hpoussin] 29628: Display a simple bootlogo, instead of a black screen if /SOS option is not provided
by hpoussin＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: hpoussin Date: Tue Oct 16 14:40:17 2007 New Revision: 29628 URL: http://svn.reactos.org/svn/reactos?rev=29628&view=rev Log: Display a simple bootlogo, instead of a black screen if /SOS option is not provided Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Tue Oct 16 14:40:17 2007 @@ -4,6 +4,24 @@ #define NDEBUG #include <debug.h> #include "bootvid/bootvid.h" + +// +// Bitmap Header +// +typedef struct tagBITMAPINFOHEADER +{ + ULONG biSize; + LONG biWidth; + LONG biHeight; + USHORT biPlanes; + USHORT biBitCount; + ULONG biCompression; + ULONG biSizeImage; + LONG biXPelsPerMeter; + LONG biYPelsPerMeter; + ULONG biClrUsed; + ULONG biClrImportant; +} BITMAPINFOHEADER, *PBITMAPINFOHEADER; /* GLOBALS *******************************************************************/ @@ -593,6 +611,19 @@ if (!InbvBootDriverInstalled) return; /* FIXME: TODO, display full-screen bitmap */ + Bitmap = InbvGetResourceAddress(5); + if (Bitmap) + { + PBITMAPINFOHEADER BitmapInfoHeader = (PBITMAPINFOHEADER)Bitmap; + ULONG Top, Left; + + Left = (640 - BitmapInfoHeader->biWidth) / 2; + if (BitmapInfoHeader->biHeight < 0) + Top = (480 + BitmapInfoHeader->biHeight) / 2; + else + Top = (480 - BitmapInfoHeader->biHeight) / 2; + InbvBitBlt(Bitmap, Left, Top); + } } /* Do we have a system thread? */

1 0

[greatlrd] 29627: all redirect are done, for syscall and export api to dxg.sys left todo fix compiling issue and fix all stub for dxeng.c
by greatlrd＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: greatlrd Date: Tue Oct 16 13:11:22 2007 New Revision: 29627 URL: http://svn.reactos.org/svn/reactos?rev=29627&view=rev Log: all redirect are done, for syscall and export api to dxg.sys left todo fix compiling issue and fix all stub for dxeng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32… ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/eng.c Tue Oct 16 13:11:22 2007 @@ -14,6 +14,9 @@ #include <w32k.h> #include <debug.h> +/************************************************************************/ +/* HeapVidMemAllocAligned */ +/************************************************************************/ FLATPTR STDCALL HeapVidMemAllocAligned(LPVIDMEM lpVidMem, @@ -22,10 +25,10 @@ LPSURFACEALIGNMENT lpAlignment, LPLONG lpNewPitch) { - pfnHeapVidMemAllocAligned = NULL; + PGD_HEAPVIDMEMALLOCALIGNED pfnHeapVidMemAllocAligned = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnHeapVidMemAllocAligned); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemAllocAligned, pfnHeapVidMemAllocAligned); if (pfnHeapVidMemAllocAligned == NULL) { @@ -37,15 +40,18 @@ return pfnHeapVidMemAllocAligned(lpVidMem, dwWidth, dwHeight, lpAlignment, lpNewPitch); } +/************************************************************************/ +/* VidMemFree */ +/************************************************************************/ VOID STDCALL VidMemFree(LPVMEMHEAP pvmh, FLATPTR ptr) { - pfnVidMemFree = NULL; + PGD_VIDMEMFREE pfnVidMemFree = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnVidMemFree); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdHeapVidMemFree, pfnVidMemFree); if (pfnVidMemFree == NULL) { @@ -57,16 +63,19 @@ return pfnVidMemFree(pvmh, ptr); } +/************************************************************************/ +/* EngAllocPrivateUserMem */ +/************************************************************************/ PVOID STDCALL EngAllocPrivateUserMem(PDD_SURFACE_LOCAL psl, SIZE_T cj, ULONG tag) { - pfnEngAllocPrivateUserMem = NULL; + PGD_ENGALLOCPRIVATEUSERMEM pfnEngAllocPrivateUserMem = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngAllocPrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdAllocPrivateUserMem, pfnEngAllocPrivateUserMem); if (pfnEngAllocPrivateUserMem == NULL) { @@ -78,15 +87,18 @@ return pfnEngAllocPrivateUserMem(psl, cj, tag); } +/************************************************************************/ +/* EngFreePrivateUserMem */ +/************************************************************************/ VOID STDCALL EngFreePrivateUserMem(PDD_SURFACE_LOCAL psl, PVOID pv) { - pfnEngFreePrivateUserMem = NULL; + PGD_ENGFREEPRIVATEUSERMEM pfnEngFreePrivateUserMem = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFreePrivateUserMem, pfnEngFreePrivateUserMem); if (pfnEngFreePrivateUserMem == NULL) { @@ -98,35 +110,41 @@ return pfnEngFreePrivateUserMem(psl, pv); } +/************************************************************************/ +/* EngDxIoctl */ +/************************************************************************/ DWORD STDCALL EngDxIoctl(ULONG ulIoctl, PVOID pBuffer, ULONG ulBufferSize) { - pfnEngFreePrivateUserMem = NULL; + PGD_ENGDXIOCTL pfnEngDxIoctl = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngFreePrivateUserMem); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdIoctl, pfnEngDxIoctl); - if (pfnEngFreePrivateUserMem == NULL) + if (pfnEngDxIoctl == NULL) { - DPRINT1("Warring no pfnEngFreePrivateUserMem"); + DPRINT1("Warring no pfnEngDxIoctl"); return DDHAL_DRIVER_NOTHANDLED; } - DPRINT1("Calling on dxg.sys pfnEngFreePrivateUserMem"); + DPRINT1("Calling on dxg.sys pfnEngDxIoctl"); return pfnEngFreePrivateUserMem(psl, pv); } +/************************************************************************/ +/* EngLockDirectDrawSurface */ +/************************************************************************/ PDD_SURFACE_LOCAL STDCALL EngLockDirectDrawSurface(HANDLE hSurface) { - pfnEngLockDirectDrawSurface = NULL; + PGD_ENGLOCKDIRECTDRAWSURFACE pfnEngLockDirectDrawSurface = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngLockDirectDrawSurface); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdLockDirectDrawSurface, pfnEngLockDirectDrawSurface); if (pfnEngLockDirectDrawSurface == NULL) { @@ -138,14 +156,17 @@ return pfnEngLockDirectDrawSurface(hSurface); } +/************************************************************************/ +/* EngUnlockDirectDrawSurface */ +/************************************************************************/ BOOL STDCALL EngUnlockDirectDrawSurface(PDD_SURFACE_LOCAL pSurface) { - pfnEngUnlockDirectDrawSurface = NULL; + PGD_ENGUNLOCKDIRECTDRAWSURFACE pfnEngUnlockDirectDrawSurface = NULL; INT i; - DXG_GET_INDEX_FUNCTION(, pfnEngUnlockDirectDrawSurface); + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdUnlockDirectDrawSurface, pfnEngUnlockDirectDrawSurface); if (pfnEngUnlockDirectDrawSurface == NULL) {

1 0

[mnordell] 29626: const-correctness cleanup. 'CONST UNICODE_STRING*' -> PCUNICODE_STRING
by mnordell＠svn.reactos.org 16 Oct '07

16 Oct '07

Author: mnordell Date: Tue Oct 16 12:52:09 2007 New Revision: 29626 URL: http://svn.reactos.org/svn/reactos?rev=29626&view=rev Log: const-correctness cleanup. 'CONST UNICODE_STRING*' -> PCUNICODE_STRING Modified: trunk/reactos/lib/cmlib/hiveinit.c trunk/reactos/ntoskrnl/cm/cm.h trunk/reactos/ntoskrnl/cm/regfile.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmindex.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmname.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/cmvalche.c Modified: trunk/reactos/lib/cmlib/hiveinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2… ============================================================================== --- trunk/reactos/lib/cmlib/hiveinit.c (original) +++ trunk/reactos/lib/cmlib/hiveinit.c Tue Oct 16 12:52:09 2007 @@ -440,7 +440,7 @@ PFILE_WRITE_ROUTINE FileWrite, PFILE_SET_SIZE_ROUTINE FileSetSize, PFILE_FLUSH_ROUTINE FileFlush, - IN const UNICODE_STRING* FileName) + IN PCUNICODE_STRING FileName) { NTSTATUS Status; PHHIVE Hive = RegistryHive; Modified: trunk/reactos/ntoskrnl/cm/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/cm.h?rev=29626… ============================================================================== --- trunk/reactos/ntoskrnl/cm/cm.h (original) +++ trunk/reactos/ntoskrnl/cm/cm.h Tue Oct 16 12:52:09 2007 @@ -169,13 +169,13 @@ NTSTATUS CmiScanKeyList(IN PKEY_OBJECT Parent, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ULONG Attributes, PKEY_OBJECT* ReturnedObject); NTSTATUS CmiLoadHive(POBJECT_ATTRIBUTES KeyObjectAttributes, - CONST UNICODE_STRING* FileName, + PCUNICODE_STRING FileName, ULONG Flags); NTSTATUS @@ -200,7 +200,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes); @@ -324,7 +324,7 @@ CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName + IN PCUNICODE_STRING SearchName ); VOID @@ -346,7 +346,7 @@ /* cm/cm.h and config/cm.h. TODO: Pick one single place to declare it. */ NTSTATUS NTAPI -CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, +CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, @@ -359,7 +359,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, +CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, IN ULONG HiveFlags, OUT PEREGISTRY_HIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Tue Oct 16 12:52:09 2007 @@ -24,7 +24,7 @@ NTSTATUS CmiLoadHive(IN POBJECT_ATTRIBUTES KeyObjectAttributes, - IN CONST UNICODE_STRING* FileName, + IN PCUNICODE_STRING FileName, IN ULONG Flags) { PEREGISTRY_HIVE Hive = NULL; @@ -280,7 +280,7 @@ IN PCM_KEY_NODE KeyCell, OUT PCM_KEY_NODE *SubKeyCell, OUT HCELL_INDEX *BlockOffset, - IN CONST UNICODE_STRING* KeyName, + IN PCUNICODE_STRING KeyName, IN ACCESS_MASK DesiredAccess, IN ULONG Attributes) { Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Tue Oct 16 12:52:09 2007 @@ -756,7 +756,7 @@ /* Preconditions: Must be called with CmpRegistryLock held. */ NTSTATUS CmiScanKeyList(PKEY_OBJECT Parent, - CONST UNICODE_STRING* KeyName, + PCUNICODE_STRING KeyName, ULONG Attributes, PKEY_OBJECT* ReturnedObject) { Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Tue Oct 16 12:52:09 2007 @@ -762,7 +762,7 @@ NTAPI CmpFindValueByNameFromCache( IN PKEY_OBJECT KeyObject, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value, @@ -933,7 +933,7 @@ IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN CONST UNICODE_STRING* FileName OPTIONAL, + IN PCUNICODE_STRING FileName OPTIONAL, IN ULONG CheckFlags ); @@ -958,7 +958,7 @@ NTSTATUS NTAPI CmpOpenHiveFiles( - IN CONST UNICODE_STRING* BaseName, + IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, @@ -1049,7 +1049,7 @@ LONG NTAPI CmpCompareCompressedName( - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength ); @@ -1126,7 +1126,7 @@ CmpFindSubKeyByName( IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName + IN PCUNICODE_STRING SearchName ); HCELL_INDEX @@ -1141,7 +1141,7 @@ NTAPI CmpComputeHashKey( IN ULONG Hash, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, IN BOOLEAN AllowSeparators ); Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c Tue Oct 16 12:52:09 2007 @@ -30,7 +30,7 @@ static LONG NTAPI CmpDoCompareKeyName(IN PHHIVE Hive, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN HCELL_INDEX Cell) { PCM_KEY_NODE Node; @@ -66,7 +66,7 @@ static LONG NTAPI CmpCompareInIndex(IN PHHIVE Hive, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN ULONG Count, IN PCM_KEY_INDEX Index, IN PHCELL_INDEX SubKey) @@ -143,7 +143,7 @@ NTAPI CmpFindSubKeyInRoot(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i, ReturnIndex; @@ -359,7 +359,7 @@ NTAPI CmpFindSubKeyInLeaf(IN PHHIVE Hive, IN PCM_KEY_INDEX Index, - IN CONST UNICODE_STRING* SearchName, + IN PCUNICODE_STRING SearchName, IN PHCELL_INDEX SubKey) { ULONG High, Low = 0, i; @@ -473,7 +473,7 @@ ULONG NTAPI CmpComputeHashKey(IN ULONG Hash, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, IN BOOLEAN AllowSeparators) { LPWSTR Cp; @@ -661,7 +661,7 @@ NTAPI CmpFindSubKeyByHash(IN PHHIVE Hive, IN PCM_KEY_FAST_INDEX FastIndex, - IN CONST UNICODE_STRING* SearchName) + IN PCUNICODE_STRING SearchName) { ULONG HashKey, i; PCM_INDEX FastEntry; @@ -698,7 +698,7 @@ NTAPI CmpFindSubKeyByName(IN PHHIVE Hive, IN PCM_KEY_NODE Parent, - IN CONST UNICODE_STRING* SearchName) + IN PCUNICODE_STRING SearchName) { ULONG i; PCM_KEY_INDEX IndexRoot; Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c (original) +++ trunk/reactos/ntoskrnl/config/cminit.c Tue Oct 16 12:52:09 2007 @@ -25,7 +25,7 @@ IN HANDLE Primary, IN HANDLE Log, IN HANDLE External, - IN CONST UNICODE_STRING* FileName OPTIONAL, + IN PCUNICODE_STRING FileName OPTIONAL, IN ULONG CheckFlags) { #if 0 @@ -240,7 +240,7 @@ NTSTATUS NTAPI -CmpOpenHiveFiles(IN CONST UNICODE_STRING* BaseName, +CmpOpenHiveFiles(IN PCUNICODE_STRING BaseName, IN PCWSTR Extension OPTIONAL, IN PHANDLE Primary, IN PHANDLE Log, Modified: trunk/reactos/ntoskrnl/config/cmname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmname.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmname.c (original) +++ trunk/reactos/ntoskrnl/config/cmname.c Tue Oct 16 12:52:09 2007 @@ -107,7 +107,7 @@ LONG NTAPI -CmpCompareCompressedName(IN CONST UNICODE_STRING* SearchName, +CmpCompareCompressedName(IN PCUNICODE_STRING SearchName, IN PWCHAR CompressedName, IN ULONG NameLength) { Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Tue Oct 16 12:52:09 2007 @@ -22,7 +22,7 @@ NTSTATUS NTAPI -CmpInitHiveFromFile(IN CONST UNICODE_STRING* HiveName, +CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, IN ULONG HiveFlags, OUT PCMHIVE *Hive, IN OUT PBOOLEAN New, Modified: trunk/reactos/ntoskrnl/config/cmvalche.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmvalche.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmvalche.c (original) +++ trunk/reactos/ntoskrnl/config/cmvalche.c Tue Oct 16 12:52:09 2007 @@ -186,7 +186,7 @@ VALUE_SEARCH_RETURN_TYPE NTAPI CmpFindValueByNameFromCache(IN PKEY_OBJECT KeyObject, - IN CONST UNICODE_STRING* Name, + IN PCUNICODE_STRING Name, OUT PCM_CACHED_VALUE **CachedValue, OUT ULONG *Index, OUT PCM_KEY_VALUE *Value,

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