Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[greatlrd] 32032: revert codepage 862 changes from rev 31935 Now swedish should work again in usetup

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 27 22:21:53 2008 New Revision: 32032 URL: http://svn.reactos.org/svn/reactos?rev=32032&view=rev Log: revert codepage 862 changes from rev 31935 Now swedish should work again in usetup Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h Sun Jan 27 22:21:53 2008 @@ -58,7 +58,7 @@ { 6, 8, - "Vlkommen till ReactOS Setup!", + "Välkommen till ReactOS Setup!", TEXT_HIGHLIGHT }, { @@ -70,37 +70,37 @@ { 6, 12, - "dator och frbereder den andra delen av installationen.", + "dator och förbereder den andra delen av installationen.", TEXT_NORMAL }, { 8, 15, - "\x07 Tryck p ENTER fr att installera ReactOS.", + "\x07 Tryck på ENTER för att installera ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Tryck p R fr att reparera ReactOS.", + "\x07 Tryck på R för att reparera ReactOS.", TEXT_NORMAL }, { 8, 19, - "\x07 Tryck p L fr att lsa licensavtalet till ReactOS.", + "\x07 Tryck på L för att läsa licensavtalet till ReactOS.", TEXT_NORMAL }, { 8, 21, - "\x07 Tryck p F3 fr att avbryta installationen av ReactOS.", + "\x07 Tryck på F3 för att avbryta installationen av ReactOS.", TEXT_NORMAL }, { 6, 23, - "Fr mer information om ReactOS, besk:", + "För mer information om ReactOS, besök:", TEXT_NORMAL }, { @@ -112,7 +112,7 @@ { 0, 0, - " ENTER = Fortstt R = Reparera F3 = Avbryt", + " ENTER = Fortsätt R = Reparera F3 = Avbryt", TEXT_STATUS }, { @@ -134,79 +134,79 @@ { 6, 8, - "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", TEXT_NORMAL }, { 6, 9, - "funktioner som kan frvntas av ett fullt anvndbart setup-program.", + "funktioner som kan förväntas av ett fullt användbart setup-program.", TEXT_NORMAL }, { 6, 12, - "Fljande begrnsningar gller:", + "Följande begränsningar gäller:", TEXT_NORMAL }, { 8, 13, - "- Setup kan ej hantera mer n 1 primr partition per hrddisk.", + "- Setup kan ej hantera mer än 1 primär partition per hårddisk.", TEXT_NORMAL }, { 8, 14, - "- Setup kan ej radera en primr partition frn en hrddisk", + "- Setup kan ej radera en primär partition från en hårddisk", TEXT_NORMAL }, { 8, 15, - " om utkade partitioner existerar p hrddisken.", + " om utökade partitioner existerar på hårddisken.", TEXT_NORMAL }, { 8, 16, - "- Setup kan ej radera den frsta utkade partitionen frn en hrddisk", + "- Setup kan ej radera den första utökade partitionen från en hårddisk", TEXT_NORMAL }, { 8, 17, - " om andra utkade partitioner existerar p hrddisken.", + " om andra utökade partitioner existerar på hårddisken.", TEXT_NORMAL }, { 8, 18, - "- Setup stder endast filsystem av typen FAT.", + "- Setup stöder endast filsystem av typen FAT.", TEXT_NORMAL }, { 8, 19, - "- Kontrollering av hrddiskens filsystem stds (nnu) ej.", + "- Kontrollering av hårddiskens filsystem stöds (ännu) ej.", TEXT_NORMAL }, { 8, 23, - "\x07 Tryck p ENTER fr att installera ReactOS.", + "\x07 Tryck på ENTER för att installera ReactOS.", TEXT_NORMAL }, { 8, 25, - "\x07 Tryck p F3 fr att avbryta installationen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt F3 = Avbryt", + "\x07 Tryck på F3 för att avbryta installationen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, { @@ -234,67 +234,67 @@ { 8, 8, - "ReactOS r licenserad under GNU GPL med delar", + "ReactOS är licenserad under GNU GPL med delar", TEXT_NORMAL }, { 8, 9, - "av den medfljande koden licenserad under GPL-frenliga", - TEXT_NORMAL - }, - { - 8, - 10, - "licenser ssom X11-, BSD- och GNU LGPL-licenserna.", + "av den medföljande koden licenserad under GPL-förenliga", + TEXT_NORMAL + }, + { + 8, + 10, + "licenser såsom X11-, BSD- och GNU LGPL-licenserna.", TEXT_NORMAL }, { 8, 11, - "All mjukvara som r del av ReactOS r publicerad", + "All mjukvara som är del av ReactOS är publicerad", TEXT_NORMAL }, { 8, 12, - "under GNU GPL, men ven den ursprungliga", + "under GNU GPL, men även den ursprungliga", TEXT_NORMAL }, { 8, 13, - "licensen r upprtthllen.", + "licensen är upprätthållen.", TEXT_NORMAL }, { 8, 15, - "Denna mjukvara har INGEN GARANTI eller begrnsing p anvndning", + "Denna mjukvara har INGEN GARANTI eller begränsing på användning", TEXT_NORMAL }, { 8, 16, - "bortsett frn tillmplig lokal och internationell lag. Licenseringen av", + "bortsett från tillämplig lokal och internationell lag. Licenseringen av", TEXT_NORMAL }, { 8, 17, - "ReactOS tcker endast distrubering till tredje part.", + "ReactOS täcker endast distrubering till tredje part.", TEXT_NORMAL }, { 8, 18, - "Om Ni av ngon anledning ej ftt en kopia av", + "Om Ni av någon anledning ej fått en kopia av", TEXT_NORMAL }, { 8, 19, - "GNU General Public License med ReactOS, besk", + "GNU General Public License med ReactOS, besök", TEXT_NORMAL }, { @@ -312,25 +312,25 @@ { 8, 24, - "Detta r gratis mjukvara; se kllkoden fr restriktioner angende kopiering.", + "Detta är gratis mjukvara; se källkoden för restriktioner angående kopiering.", TEXT_NORMAL }, { 8, 25, - "INGEN GARANTI ges; inte ens fr SLJBARHET eller PASSANDE FR ETT", + "INGEN GARANTI ges; inte ens för SÄLJBARHET eller PASSANDE FÖR ETT", TEXT_NORMAL }, { 8, 26, - "SPECIELLT SYFTE. ALL ANVNDNING SKER P EGEN RISK!", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = tervnd", + "SPECIELLT SYFTE. ALL ANVÄNDNING SKER PÅ EGEN RISK!", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Återvänd", TEXT_STATUS }, { @@ -352,7 +352,7 @@ { 6, 8, - "Listan nedanfr visar instllningarna fr maskinvaran.", + "Listan nedanför visar inställningarna för maskinvaran.", TEXT_NORMAL }, { @@ -364,7 +364,7 @@ { 8, 12, - " Bildskrm:", + " Bildskärm:", TEXT_NORMAL, }, { @@ -387,43 +387,43 @@ }, { 25, - 16, "Acceptera dessa maskinvaruinstllningar", + 16, "Acceptera dessa maskinvaruinställningar", TEXT_NORMAL }, { 6, 19, - "ndra instllningarna genom att trycka p UPP- och NED-piltangenterna", + "Ändra inställningarna genom att trycka på UPP- och NED-piltangenterna", TEXT_NORMAL }, { 6, 20, - "fr att markera en instllning, och tryck p ENTER fr att vlja", + "för att markera en inställning, och tryck på ENTER för att välja", TEXT_NORMAL }, { 6, 21, - "instllningen.", + "inställningen.", TEXT_NORMAL }, { 6, 23, - "Nr alla instllningar r korrekta, vlj \"Acceptera dessa maskinvaruinstllningar\"", + "När alla inställningar är korrekta, välj \"Acceptera dessa maskinvaruinställningar\"", TEXT_NORMAL }, { 6, 24, - "och tryck p ENTER.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt F3 = Avbryt", + "och tryck på ENTER.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, { @@ -445,13 +445,13 @@ { 6, 8, - "ReactOS Setup r i en tidig utvecklingsfas och saknar drfr ett antal", + "ReactOS Setup är i en tidig utvecklingsfas och saknar därför ett antal", TEXT_NORMAL }, { 6, 9, - "funktioner som kan frvntas av ett fullt anvndbart setup-program.", + "funktioner som kan förväntas av ett fullt användbart setup-program.", TEXT_NORMAL }, { @@ -463,31 +463,31 @@ { 8, 15, - "\x07 Tryck p U fr att uppdatera ReactOS.", + "\x07 Tryck på U för att uppdatera ReactOS.", TEXT_NORMAL }, { 8, 17, - "\x07 Tryck p R fr terstllningskonsolen.", + "\x07 Tryck på R för Återställningskonsolen.", TEXT_NORMAL }, { 8, 19, - "\x07 Tryck p ESC fr att tervnda till fregende sida.", + "\x07 Tryck på ESC för att återvända till föregående sida.", TEXT_NORMAL }, { 8, 21, - "\x07 Tryck p ENTER fr att starta om datorn.", - TEXT_NORMAL - }, - { - 0, - 0, - " ESC = G till fregende sida ENTER = Starta om datorn", + "\x07 Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " ESC = Gå till föregående sida ENTER = Starta om datorn", TEXT_STATUS }, { @@ -508,37 +508,37 @@ { 6, 8, - "ndra vilken typ av dator som ska installeras.", - TEXT_NORMAL - }, - { - 8, - 10, - "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad datortyp.", + "Ändra vilken typ av dator som ska installeras.", + TEXT_NORMAL + }, + { + 8, + 10, + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad datortyp.", TEXT_NORMAL }, { 8, 11, - " Tryck sen p ENTER.", + " Tryck sen på ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", TEXT_NORMAL }, { 8, 14, - " att ndra datortypen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt ESC = tervnd F3 = Avbryt", + " att ändra datortypen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", TEXT_STATUS }, { @@ -560,7 +560,7 @@ { 10, 6, - "Datorn frskrar sig om att all data r lagrad p hrdisken.", + "Datorn försäkrar sig om att all data är lagrad på hårdisken.", TEXT_NORMAL }, { @@ -572,7 +572,7 @@ { 10, 9, - "Nr detta r frdigt kommer datorn att startas om automatiskt.", + "När detta är färdigt kommer datorn att startas om automatiskt.", TEXT_NORMAL }, { @@ -600,31 +600,31 @@ { 10, 6, - "Installationen av ReactOS har inte slutfrts.", - TEXT_NORMAL - }, - { - 10, - 8, - "Se till att ingen floppy-disk finns i floppy-lsare A:", + "Installationen av ReactOS har inte slutförts.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", TEXT_NORMAL }, { 10, 9, - "och tag ur alla skivor frn CD/DVD-lsarna.", + "och tag ur alla skivor från CD/DVD-läsarna.", TEXT_NORMAL }, { 10, 11, - "Tryck p ENTER fr att starta om datorn.", - TEXT_NORMAL - }, - { - 0, - 0, - " Var god vnta ...", + "Tryck på ENTER för att starta om datorn.", + TEXT_NORMAL + }, + { + 0, + 0, + " Var god vänta ...", TEXT_STATUS, }, { @@ -646,36 +646,36 @@ { 6, 8, - "ndra vilken typ av bildskrmsinstllning som ska installeras.", + "Ändra vilken typ av bildskärmsinställning som ska installeras.", TEXT_NORMAL }, { 8, 10, - "\x07 Anvnd UPP- och NED-piltangenterna fr att vlja nskad instllning.", + "\x07 Använd UPP- och NED-piltangenterna för att välja önskad inställning.", TEXT_NORMAL }, { 8, 11, - " Tryck sedan p ENTER.", + " Tryck sedan på ENTER.", TEXT_NORMAL }, { 8, 13, - "\x07 Tryck p ESC fr att tervnda till den fregende sidan utan", + "\x07 Tryck på ESC för att återvända till den föregående sidan utan", TEXT_NORMAL }, { 8, 14, - " att ndra bildskrmsinstllningen.", - TEXT_NORMAL - }, - { - 0, - 0, - " ENTER = Fortstt ESC = tervnd F3 = Avbryt", + " att ändra bildskärmsinställningen.", + TEXT_NORMAL + }, + { + 0, + 0, + " ENTER = Fortsätt ESC = Återvänd F3 = Avbryt", TEXT_STATUS }, { @@ -697,25 +697,25 @@ { 10, 6, - "ReactOS har nu installerats p datorn.", - TEXT_NORMAL - }, - { - 10, - 8, - "Se till att ingen floppy-disk finns i floppy-lsare A:", + "ReactOS har nu installerats på datorn.", + TEXT_NORMAL + }, + { + 10, + 8, + "Se till att ingen floppy-disk finns i floppy-läsare A:", TEXT_NORMAL }, { 10, 9, - "och tag ur alla skivor frn CD/DVD-lsarna.", + "och tag ur alla skivor från CD/DVD-läsarna.", TEXT_NORMAL }, { 10, 11, - "Tryck p ENTER fr att starta om datorn.", + "Tryck på ENTER för att starta om datorn.", TEXT_NORMAL }, { @@ -743,31 +743,31 @@ { 6, 8, - "Setup misslyckades med att installera bootloadern p datorns", + "Setup misslyckades med att installera bootloadern på datorns", TEXT_NORMAL }, { 6, 9, - "hrddisk", + "hårddisk", TEXT_NORMAL }, { 6, 13, - "Var god stt in en formatterad floppy-disk i lsare A: och", + "Var god sätt in en formatterad floppy-disk i läsare A: och", TEXT_NORMAL }, { 6, 14, - "tryck p ENTER.", + "tryck på ENTER.", TEXT_NORMAL, }, { 0, 0, - " ENTER = Fortstt F3 = Avbryt", + " ENTER = Fortsätt F3 = Avbryt", TEXT_STATUS }, {

16 years, 7 months

[fireball] 32031: - Finally switch to the new memory manager, which is compatible both with ReactOS and NT-style boot types. - Added: memory types for each allocation request, ability to alloc and free memory from the heap, ability to use 1 megabyte of low memory too (which was just wasted previously). - Removed: a bunch of hacky stuff.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 27 20:38:15 2008 New Revision: 32031 URL: http://svn.reactos.org/svn/reactos?rev=32031&view=rev Log: - Finally switch to the new memory manager, which is compatible both with ReactOS and NT-style boot types. - Added: memory types for each allocation request, ability to alloc and free memory from the heap, ability to use 1 megabyte of low memory too (which was just wasted previously). - Removed: a bunch of hacky stuff. Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c trunk/reactos/boot/freeldr/freeldr/mm/mm.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/me… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c Sun Jan 27 20:38:15 2008 @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> * * 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 @@ -43,6 +43,9 @@ ULONG FreePagesInLookupTable = 0; ULONG LastFreePageHint = 0; +extern ULONG_PTR MmHeapPointer; +extern ULONG_PTR MmHeapStart; + BOOLEAN MmInitializeMemoryManager(VOID) { BIOS_MEMORY_MAP BiosMemoryMap[32]; @@ -93,10 +96,56 @@ MmInitPageLookupTable(PageLookupTableAddress, TotalPagesInLookupTable, BiosMemoryMap, BiosMemoryMapEntryCount); MmUpdateLastFreePageHint(PageLookupTableAddress, TotalPagesInLookupTable); + // Add machine-dependent stuff + // FIXME: this is only for i386 + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x00, 1, LoaderFirmwarePermanent); // realmode int vectors + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x01, 7, LoaderFirmwareTemporary); // freeldr stack + cmdline + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x08, 0x70, LoaderLoadedProgram); // freeldr image (roughly max. 0x64 pages) + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x78, 8, LoaderOsloaderStack); // prot mode stack. BIOSCALLBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x80, 0x10, LoaderOsloaderHeap); // File system read buffer. FILESYSBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x90, 0x10, LoaderOsloaderHeap); // Disk read buffer for int 13h. DISKREADBUFFER + MmMarkPagesInLookupTable(PageLookupTableAddress, 0xA0, 0x60, LoaderFirmwarePermanent); // ROM / Video + MmMarkPagesInLookupTable(PageLookupTableAddress, 0xFFF, 1, LoaderSpecialMemory); // unusable memory + + // This one is strange, without it WinNT crashes with PHASE0_EXCEPTION + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x59, 0x5, LoaderFirmwarePermanent); + FreePagesInLookupTable = MmCountFreePagesInLookupTable(PageLookupTableAddress, TotalPagesInLookupTable); + + MmInitializeHeap(PageLookupTableAddress); DbgPrint((DPRINT_MEMORY, "Memory Manager initialized. %d pages available.\n", FreePagesInLookupTable)); return TRUE; +} + +VOID MmInitializeHeap(PVOID PageLookupTable) +{ + ULONG PagesNeeded; + ULONG HeapStart; + + // HACK: Make it so it doesn't overlap kernel space + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderSystemCode); + + // Find contigious memory block for HEAP:STACK + PagesNeeded = HEAP_PAGES + STACK_PAGES; + HeapStart = MmFindAvailablePages(PageLookupTable, TotalPagesInLookupTable, PagesNeeded, FALSE); + + // Unapply the hack + MmMarkPagesInLookupTable(PageLookupTableAddress, 0x100, 0xFF, LoaderFree); + + if (HeapStart == 0) + { + UiMessageBox("Critical error: Can't allocate heap!"); + return; + } + + // Initialize BGET + bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT); + + // Mark those pages as used + MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap); + + DbgPrint((DPRINT_MEMORY, "Heap initialized, base 0x%08x, pages %d\n", (HeapStart << MM_PAGE_SHIFT), PagesNeeded)); } #ifdef DBG @@ -188,13 +237,21 @@ RtlCopyMemory(TempBiosMemoryMap, BiosMemoryMap, sizeof(BIOS_MEMORY_MAP) * 32); MmSortBiosMemoryMap(TempBiosMemoryMap, MapCount); + // Find a place, starting from the highest memory + // (thus leaving low memory for kernel/drivers) for (Index=(MapCount-1); Index>=0; Index--) { // If this is usable memory with a big enough length // then we'll put our page lookup table here - if (TempBiosMemoryMap[Index].Type == BiosMemoryUsable && TempBiosMemoryMap[Index].Length >= PageLookupTableSize) - { - PageLookupTableMemAddress = (PVOID)(ULONG)(TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); + + // skip if this is not usable region + if (TempBiosMemoryMap[Index].Type != BiosMemoryUsable) + continue; + + if (TempBiosMemoryMap[Index].Length >= PageLookupTableSize) + { + PageLookupTableMemAddress = (PVOID)(ULONG) + (TempBiosMemoryMap[Index].BaseAddress + (TempBiosMemoryMap[Index].Length - PageLookupTableSize)); break; } } @@ -241,7 +298,7 @@ // Mark every page as allocated initially // We will go through and mark pages again according to the memory map // But this will mark any holes not described in the map as allocated - MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, 1); + MmMarkPagesInLookupTable(PageLookupTable, 0, TotalPageCount, LoaderFirmwarePermanent); for (Index=0; Index<MapCount; Index++) { @@ -254,8 +311,9 @@ } // Mark the low memory region below 1MB as reserved (256 pages in region) - DbgPrint((DPRINT_MEMORY, "Marking the low 1MB region as reserved.\n")); - MmMarkPagesInLookupTable(PageLookupTable, 0, 256, LoaderFirmwarePermanent); + //FIXME: Not needed now since we mark low 1Mb with really used and free areas + //DbgPrint((DPRINT_MEMORY, "Marking the low 1MB region as reserved.\n")); + //MmMarkPagesInLookupTable(PageLookupTable, 0, 256, LoaderFirmwarePermanent); // Mark the pages that the lookup table occupies as reserved PageLookupTableStartPage = MmGetPageNumberFromAddress(PageLookupTable); @@ -271,10 +329,12 @@ for (Index=StartPage; Index<(StartPage+PageCount); Index++) { +#if 0 if ((Index <= (StartPage + 16)) || (Index >= (StartPage+PageCount-16))) { DbgPrint((DPRINT_MEMORY, "Index = %d StartPage = %d PageCount = %d\n", Index, StartPage, PageCount)); } +#endif RealPageLookupTable[Index].PageAllocated = PageAllocated; RealPageLookupTable[Index].PageAllocationLength = (PageAllocated != LoaderFree) ? 1 : 0; } @@ -288,7 +348,7 @@ for (Index=StartPage; Index<(StartPage+PageCount); Index++) { - RealPageLookupTable[Index].PageAllocated = LoaderSystemCode; + RealPageLookupTable[Index].PageAllocated = MemoryType; RealPageLookupTable[Index].PageAllocationLength = (Index == StartPage) ? PageCount : 0; } } @@ -326,7 +386,8 @@ if (FromEnd) { /* Allocate "high" (from end) pages */ - for (Index=LastFreePageHint-1; Index>0; Index--) + for (Index=/*LastFreePageHint-1*/LOADER_HIGH_ZONE-1; Index>0; Index--) + //for (Index=LastFreePageHint-1; Index>0; Index--) { if (RealPageLookupTable[Index].PageAllocated != LoaderFree) { Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/mm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c Sun Jan 27 20:38:15 2008 @@ -1,6 +1,6 @@ /* * FreeLoader - * Copyright (C) 1998-2003 Brian Palmer <brianp(a)sginet.com> + * Copyright (C) 2006-2008 Aleksey Bragin <aleksey(a)reactos.org> * * 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 @@ -20,35 +20,10 @@ #include <freeldr.h> #include <debug.h> -ULONG AllocationCount = 0; - -#ifdef DBG -VOID VerifyHeap(VOID); +#ifdef DBG VOID DumpMemoryAllocMap(VOID); -VOID IncrementAllocationCount(VOID); -VOID DecrementAllocationCount(VOID); VOID MemAllocTest(VOID); #endif // DBG - -/* - * Hack alert - * Normally, we allocate whole pages. This is ofcourse wastefull for small - * allocations (a few bytes). So, for small allocations (smaller than a page) - * we sub-allocate. When the first small allocation is done, a page is - * requested. We keep a pointer to that page in SubAllocationPage. The alloc - * is satisfied by returning a pointer to the beginning of the page. We also - * keep track of how many bytes are still available in the page in SubAllocationRest. - * When the next small request comes in, we try to allocate it just after the - * memory previously allocated. If it won't fit, we allocate a new page and - * the whole process starts again. - * Note that suballocations are done back-to-back, there's no bookkeeping at all. - * That also means that we cannot really free suballocations. So, when a free is - * done and it is determined that this might be a free of a sub-allocation, we - * just no-op the free. - * Perhaps we should use the heap routines from ntdll here. - */ -static PVOID SubAllocationPage = NULL; -static unsigned SubAllocationRest = 0; BOOLEAN AllocateFromEnd = TRUE; @@ -71,12 +46,6 @@ } MemorySize = ROUND_UP(MemorySize, 4); - if (MemorySize <= SubAllocationRest) - { - MemPointer = (PVOID)((ULONG_PTR)SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest); - SubAllocationRest -= MemorySize; - return MemPointer; - } // Find out how many blocks it will take to // satisfy this allocation @@ -86,7 +55,7 @@ // then return NULL if (FreePagesInLookupTable < PagesNeeded) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -95,7 +64,7 @@ if (FirstFreePageFromEnd == (ULONG)-1) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemory(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -105,22 +74,47 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); - if (MemorySize < MM_PAGE_SIZE) - { - SubAllocationPage = MemPointer; - SubAllocationRest = MM_PAGE_SIZE - MemorySize; - } - - -#ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); +#ifdef DBG + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG // Now return the pointer return MemPointer; +} + +PVOID MmHeapAlloc(ULONG MemorySize) +{ + PVOID Result; + LONG CurAlloc, TotalFree, MaxFree, NumberOfGets, NumberOfRels; + + if (MemorySize > MM_PAGE_SIZE) + { + DbgPrint((DPRINT_MEMORY, "Consider using other functions to allocate %d bytes of memory!\n", MemorySize)); + } + + // Get the buffer from BGET pool + Result = bget(MemorySize); + + if (Result == NULL) + { + DbgPrint((DPRINT_MEMORY, "Heap allocation for %d bytes failed\n", MemorySize)); + } + + // Gather some stats + bstats(&CurAlloc, &TotalFree, &MaxFree, &NumberOfGets, &NumberOfRels); + + DbgPrint((DPRINT_MEMORY, "Current alloced %d bytes, free %d bytes, allocs %d, frees %d\n", + CurAlloc, TotalFree, NumberOfGets, NumberOfRels)); + + return Result; +} + +VOID MmHeapFree(PVOID MemoryPointer) +{ + // Release the buffer to the pool + brel(MemoryPointer); } PVOID MmAllocateMemory(ULONG MemorySize) @@ -155,7 +149,7 @@ { DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemoryAtAddress(). " "Not enough free memory to allocate %d bytes (requesting %d pages but have only %d). " - "AllocationCount: %d\n", MemorySize, PagesNeeded, FreePagesInLookupTable, AllocationCount)); + "\n", MemorySize, PagesNeeded, FreePagesInLookupTable)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -163,8 +157,8 @@ if (MmAreMemoryPagesAvailable(PageLookupTableAddress, TotalPagesInLookupTable, DesiredAddress, PagesNeeded) == FALSE) { DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateMemoryAtAddress(). " - "Not enough free memory to allocate %d bytes at address %p. AllocationCount: %d\n", - MemorySize, DesiredAddress, AllocationCount)); + "Not enough free memory to allocate %d bytes at address %p.\n", + MemorySize, DesiredAddress)); // Don't tell this to user since caller should try to alloc this memory // at a different address @@ -178,8 +172,7 @@ MemPointer = (PVOID)(StartPageNumber * MM_PAGE_SIZE); #ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, StartPageNumber, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, StartPageNumber)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG @@ -213,7 +206,7 @@ // then return NULL if (FreePagesInLookupTable < PagesNeeded) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -222,7 +215,7 @@ if (FirstFreePageFromEnd == 0) { - DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes. AllocationCount: %d\n", MemorySize, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Memory allocation failed in MmAllocateHighestMemoryBelowAddress(). Not enough free memory to allocate %d bytes.\n", MemorySize)); UiMessageBoxCritical("Memory allocation failed: out of memory."); return NULL; } @@ -233,8 +226,7 @@ MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); #ifdef DBG - IncrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); + DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d.\n", MemorySize, PagesNeeded, FirstFreePageFromEnd)); DbgPrint((DPRINT_MEMORY, "Memory allocation pointer: 0x%x\n", MemPointer)); //VerifyHeap(); #endif // DBG @@ -245,141 +237,9 @@ VOID MmFreeMemory(PVOID MemoryPointer) { - ULONG PageNumber; - ULONG PageCount; - ULONG Idx; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - -#ifdef DBG - - // Make sure we didn't get a bogus pointer - if (MemoryPointer >= (PVOID)(TotalPagesInLookupTable * MM_PAGE_SIZE)) - { - BugCheck((DPRINT_MEMORY, "Bogus memory pointer (0x%x) passed to MmFreeMemory()\n", MemoryPointer)); - } -#endif // DBG - - // Find out the page number of the first - // page of memory they allocated - PageNumber = MmGetPageNumberFromAddress(MemoryPointer); - PageCount = RealPageLookupTable[PageNumber].PageAllocationLength; - -#ifdef DBG - // Make sure we didn't get a bogus pointer - if ((PageCount < 1) || (PageCount > (TotalPagesInLookupTable - PageNumber))) - { - BugCheck((DPRINT_MEMORY, "Invalid page count in lookup table. PageLookupTable[%d].PageAllocationLength = %d\n", PageNumber, RealPageLookupTable[PageNumber].PageAllocationLength)); - } - - // Loop through our array check all the pages - // to make sure they are allocated with a length of 0 - for (Idx=PageNumber+1; Idx<(PageNumber + PageCount); Idx++) - { - if ((RealPageLookupTable[Idx].PageAllocated == LoaderFree) || - (RealPageLookupTable[Idx].PageAllocationLength != 0)) - { - BugCheck((DPRINT_MEMORY, "Invalid page entry in lookup table, PageAllocated should = 1 and PageAllocationLength should = 0 because this is not the first block in the run. PageLookupTable[%d].PageAllocated = %d PageLookupTable[%d].PageAllocationLength = %d\n", PageNumber, RealPageLookupTable[PageNumber].PageAllocated, PageNumber, RealPageLookupTable[PageNumber].PageAllocationLength)); - } - } - -#endif - - /* If this allocation is only a single page, it could be a sub-allocated page. - * Just don't free it */ - if (1 == PageCount) - { - return; - } - - // Loop through our array and mark all the - // blocks as free - for (Idx=PageNumber; Idx<(PageNumber + PageCount); Idx++) - { - RealPageLookupTable[Idx].PageAllocated = LoaderFree; - RealPageLookupTable[Idx].PageAllocationLength = 0; - } - - FreePagesInLookupTable += PageCount; - -#ifdef DBG - DecrementAllocationCount(); - DbgPrint((DPRINT_MEMORY, "Freed %d pages of memory starting at page %d. AllocationCount: %d\n", PageCount, PageNumber, AllocationCount)); - //VerifyHeap(); -#endif // DBG -} - -PVOID MmHeapAlloc(ULONG MemorySize) -{ - // Temporary forwarder... - return MmAllocateMemoryWithType(MemorySize, LoaderOsloaderHeap); -} - -VOID MmHeapFree(PVOID MemoryPointer) -{ - // Stub for WinLdr -} - - -#ifdef DBG -VOID VerifyHeap(VOID) -{ - ULONG Idx; - ULONG Idx2; - ULONG Count; - PPAGE_LOOKUP_TABLE_ITEM RealPageLookupTable = (PPAGE_LOOKUP_TABLE_ITEM)PageLookupTableAddress; - - if (DUMP_MEM_MAP_ON_VERIFY) - { - DumpMemoryAllocMap(); - } - - // Loop through the array and verify that - // everything is kosher - for (Idx=0; Idx<TotalPagesInLookupTable; Idx++) - { - // Check if this block is allocated - if (RealPageLookupTable[Idx].PageAllocated != LoaderFree) - { - // This is the first block in the run so it - // had better have a length that is within range - if ((RealPageLookupTable[Idx].PageAllocationLength < 1) || (RealPageLookupTable[Idx].PageAllocationLength > (TotalPagesInLookupTable - Idx))) - { - BugCheck((DPRINT_MEMORY, "Allocation length out of range in heap table. PageLookupTable[Idx].PageAllocationLength = %d\n", RealPageLookupTable[Idx].PageAllocationLength)); - } - - // Now go through and verify that the rest of - // this run has the blocks marked allocated - // with a length of zero but don't check the - // first one because we already did - Count = RealPageLookupTable[Idx].PageAllocationLength; - for (Idx2=1; Idx2<Count; Idx2++) - { - // Make sure it's allocated - if (RealPageLookupTable[Idx + Idx2].PageAllocated == LoaderFree) - { - BugCheck((DPRINT_MEMORY, "Lookup table indicates hole in memory allocation. RealPageLookupTable[Idx + Idx2].PageAllocated == 0\n")); - } - - // Make sure the length is zero - if (RealPageLookupTable[Idx + Idx2].PageAllocationLength != 0) - { - BugCheck((DPRINT_MEMORY, "Allocation chain has non-zero value in non-first block in lookup table. RealPageLookupTable[Idx + Idx2].PageAllocationLength != 0\n")); - } - } - - // Move on to the next run - Idx += (Count - 1); - } - else - { - // Nope, not allocated so make sure the length is zero - if (RealPageLookupTable[Idx].PageAllocationLength != 0) - { - BugCheck((DPRINT_MEMORY, "Free block is start of memory allocation. RealPageLookupTable[Idx].PageAllocationLength != 0\n")); - } - } - } -} +} + +#ifdef DBG VOID DumpMemoryAllocMap(VOID) { @@ -393,7 +253,7 @@ if ((Idx % 32) == 0) { DbgPrint((DPRINT_MEMORY, "\n")); - DbgPrint((DPRINT_MEMORY, "%x:\t", (Idx * MM_PAGE_SIZE))); + DbgPrint((DPRINT_MEMORY, "%08x:\t", (Idx * MM_PAGE_SIZE))); } else if ((Idx % 4) == 0) { @@ -455,47 +315,6 @@ DbgPrint((DPRINT_MEMORY, "\n")); } - -VOID IncrementAllocationCount(VOID) -{ - AllocationCount++; -} - -VOID DecrementAllocationCount(VOID) -{ - AllocationCount--; -} - -VOID MemAllocTest(VOID) -{ - PVOID MemPtr1; - PVOID MemPtr2; - PVOID MemPtr3; - PVOID MemPtr4; - PVOID MemPtr5; - - MemPtr1 = MmAllocateMemory(4096); - printf("MemPtr1: 0x%x\n", (int)MemPtr1); - MachConsGetCh(); - MemPtr2 = MmAllocateMemory(4096); - printf("MemPtr2: 0x%x\n", (int)MemPtr2); - MachConsGetCh(); - MemPtr3 = MmAllocateMemory(4096); - printf("MemPtr3: 0x%x\n", (int)MemPtr3); - DumpMemoryAllocMap(); - VerifyHeap(); - MachConsGetCh(); - - MmFreeMemory(MemPtr2); - MachConsGetCh(); - - MemPtr4 = MmAllocateMemory(2048); - printf("MemPtr4: 0x%x\n", (int)MemPtr4); - MachConsGetCh(); - MemPtr5 = MmAllocateMemory(4096); - printf("MemPtr5: 0x%x\n", (int)MemPtr5); - MachConsGetCh(); -} #endif // DBG ULONG GetSystemMemorySize(VOID)

16 years, 7 months

[fireball] 32030: - Map APIC pages, if they are present. - Set the size of the memory new MM uses to 24Mb. - Set heap size to 4Mb. - Misc code cleanup.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 27 20:22:57 2008 New Revision: 32030 URL: http://svn.reactos.org/svn/reactos?rev=32030&view=rev Log: - Map APIC pages, if they are present. - Set the size of the memory new MM uses to 24Mb. - Set heap size to 4Mb. - Misc code cleanup. Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/include/reactos.h trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h Sun Jan 27 20:22:57 2008 @@ -50,10 +50,10 @@ // // This is the zone which is used by the OS loader // -#define LOADER_HIGH_ZONE ((16*1024*1024) >> MM_PAGE_SHIFT) //16Mb page +#define LOADER_HIGH_ZONE ((24*1024*1024) >> MM_PAGE_SHIFT) // 24Mb // HEAP and STACK size -#define HEAP_PAGES 0x100//0x18 +#define HEAP_PAGES 0x400 #define STACK_PAGES 0x00 typedef struct Modified: trunk/reactos/boot/freeldr/freeldr/include/reactos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/reactos.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/reactos.h Sun Jan 27 20:22:57 2008 @@ -41,6 +41,7 @@ #define STARTUP_BASE 0xC0000000 #define HYPERSPACE_BASE 0xC0400000 #define HAL_BASE 0xFFC00000 +#define APIC_BASE 0xFFFE0000 #define LowMemPageTableIndex 0 #define StartupPageTableIndex (STARTUP_BASE >> 22) Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sun Jan 27 20:22:57 2008 @@ -100,7 +100,7 @@ /* GLOBALS ***************************************************************/ PHARDWARE_PTE PDE; -PHARDWARE_PTE HalPT; +PHARDWARE_PTE HalPageTable; PUCHAR PhysicalPageTablesBuffer; PUCHAR KernelPageTablesBuffer; @@ -151,10 +151,10 @@ PDE[HYPER_SPACE_ENTRY].Write = 1; // The last PDE slot is allocated for HAL's memory mapping (Virtual Addresses 0xFFC00000 - 0xFFFFFFFF) - HalPT = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; + HalPageTable = (PHARDWARE_PTE)&Buffer[MM_PAGE_SIZE*1]; // Map it - PDE[1023].PageFrameNumber = (ULONG)HalPT >> MM_PAGE_SHIFT; + PDE[1023].PageFrameNumber = (ULONG)HalPageTable >> MM_PAGE_SHIFT; PDE[1023].Valid = 1; PDE[1023].Write = 1; @@ -387,6 +387,52 @@ } } } + +#ifdef _M_IX86 + +BOOLEAN LocalAPIC = FALSE; +ULONG_PTR APICAddress = 0; + +VOID +WinLdrpMapApic() +{ + /* Check if we have a local APIC */ + asm(".intel_syntax noprefix\n"); + asm("mov eax, 1\n"); + asm("cpuid\n"); + asm("shr edx, 9\n"); + asm("and edx, 0x1\n"); + asm("mov _LocalAPIC, edx\n"); + asm(".att_syntax\n"); + + /* If there is no APIC, just return */ + if (!LocalAPIC) + return; + + asm(".intel_syntax noprefix\n"); + asm("mov ecx, 0x1B\n"); + asm("rdmsr\n"); + asm("mov edx, eax\n"); + asm("and edx, 0xFFFFF000\n"); + asm("mov _APICAddress, edx"); + asm(".att_syntax\n"); + + DbgPrint((DPRINT_WINDOWS, "Local APIC detected at address 0x%x\n", + APICAddress)); + + /* Map it */ + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber + = APICAddress >> MM_PAGE_SHIFT; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; +} +#else +VOID +WinLdrpMapApic() +{ + /* Implement it for another arch */ +} +#endif BOOLEAN WinLdrTurnOnPaging(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, @@ -525,17 +571,20 @@ }*/ //VideoDisplayString(L"Hello from VGA, going into the kernel\n"); - DbgPrint((DPRINT_WINDOWS, "HalPT: 0x%X\n", HalPT)); + DbgPrint((DPRINT_WINDOWS, "HalPageTable: 0x%X\n", HalPageTable)); // Page Tables have been setup, make special handling for PCR and TSS // (which is done in BlSetupFotNt in usual ntldr) - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; - - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; - HalPT[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage+1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(KI_USER_SHARED_DATA - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].PageFrameNumber = PcrBasePage; + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; + HalPageTable[(KIP0PCRADDRESS - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + + // Map APIC + WinLdrpMapApic(); // Map VGA memory //VideoMemoryBase = MmMapIoSpace(0xb8000, 4000, MmNonCached); @@ -775,7 +824,7 @@ pGdt[7].HighWord.Bytes.BaseHi = 0; // - // Some BIOS fuck (0x40) + // Some BIOS stuff (0x40) // pGdt[8].LimitLow = 0xFFFF; pGdt[8].BaseLow = 0x400; @@ -828,7 +877,7 @@ // Video buffer Selector (0x68) // pGdt[13].LimitLow = 0x3FFF; - pGdt[13].BaseLow = 0x8000; //FIXME: I guess not correct for UGA + pGdt[13].BaseLow = 0x8000; pGdt[13].HighWord.Bytes.BaseMid = 0x0B; pGdt[13].HighWord.Bytes.Flags1 = 0x92; pGdt[13].HighWord.Bytes.Flags2 = 0; @@ -846,7 +895,7 @@ // // Some unused descriptors should go here - // ... + // // Copy the old IDT RtlCopyMemory(pIdt, (PVOID)OldIdt.Base, OldIdt.Limit);

16 years, 7 months

[fireball] 32029: - Make small allocations from the heap.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 27 17:18:30 2008 New Revision: 32029 URL: http://svn.reactos.org/svn/reactos?rev=32029&view=rev Log: - Make small allocations from the heap. Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c trunk/reactos/boot/freeldr/freeldr/cache/cache.c Modified: trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/blocklist.c Sun Jan 27 17:18:30 2008 @@ -98,7 +98,7 @@ // We will need to add the block to the // drive's list of cached blocks. So allocate // the block memory. - CacheBlock = MmAllocateMemory(sizeof(CACHE_BLOCK)); + CacheBlock = MmHeapAlloc(sizeof(CACHE_BLOCK)); if (CacheBlock == NULL) { return NULL; @@ -111,7 +111,7 @@ CacheBlock->BlockData = MmAllocateMemory(CacheDrive->BlockSize * CacheDrive->BytesPerSector); if (CacheBlock->BlockData ==NULL) { - MmFreeMemory(CacheBlock); + MmHeapFree(CacheBlock); return NULL; } @@ -119,7 +119,7 @@ if (!MachDiskReadLogicalSectors(CacheDrive->DriveNumber, (BlockNumber * CacheDrive->BlockSize), CacheDrive->BlockSize, (PVOID)DISKREADBUFFER)) { MmFreeMemory(CacheBlock->BlockData); - MmFreeMemory(CacheBlock); + MmHeapFree(CacheBlock); return NULL; } RtlCopyMemory(CacheBlock->BlockData, (PVOID)DISKREADBUFFER, CacheDrive->BlockSize * CacheDrive->BytesPerSector); @@ -162,7 +162,7 @@ // Free the block memory and the block structure MmFreeMemory(CacheBlockToFree->BlockData); - MmFreeMemory(CacheBlockToFree); + MmHeapFree(CacheBlockToFree); // Update the cache data CacheBlockCount--; Modified: trunk/reactos/boot/freeldr/freeldr/cache/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/cache… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/cache/cache.c (original) +++ trunk/reactos/boot/freeldr/freeldr/cache/cache.c Sun Jan 27 17:18:30 2008 @@ -71,7 +71,7 @@ ListEntry); MmFreeMemory(NextCacheBlock->BlockData); - MmFreeMemory(NextCacheBlock); + MmHeapFree(NextCacheBlock); } }

16 years, 7 months

[fireball] 32028: - Add cache enable switch to fat.c. Comment out #define CACHE_ENABLED if you don't want freeldr to cache peripheral devices access.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 27 17:13:20 2008 New Revision: 32028 URL: http://svn.reactos.org/svn/reactos?rev=32028&view=rev Log: - Add cache enable switch to fat.c. Comment out #define CACHE_ENABLED if you don't want freeldr to cache peripheral devices access. Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c Sun Jan 27 17:13:20 2008 @@ -21,6 +21,8 @@ #define NDEBUG #include <debug.h> + +#define CACHE_ENABLED ULONG BytesPerSector; /* Number of bytes per sector */ ULONG SectorsPerCluster; /* Number of sectors per cluster */ @@ -334,6 +336,7 @@ } MmHeapFree(FatVolumeBootSector); +#ifdef CACHE_ENABLED // // Initialize the disk cache for this drive // @@ -354,6 +357,20 @@ return FALSE; } } +#else + { + GEOMETRY DriveGeometry; + ULONG BlockSize; + + // Initialize drive by getting its geometry + if (!MachDiskGetDriveGeometry(DriveNumber, &DriveGeometry)) + { + return FALSE; + } + + BlockSize = MachDiskGetCacheableBlockCount(DriveNumber); + } +#endif return TRUE; } @@ -1405,7 +1422,21 @@ BOOLEAN FatReadVolumeSectors(ULONG DriveNumber, ULONG SectorNumber, ULONG SectorCount, PVOID Buffer) { +#ifdef CACHE_ENABLED return CacheReadDiskSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, Buffer); +#else + // Now try to read in the block + if (!MachDiskReadLogicalSectors(DriveNumber, SectorNumber + FatVolumeStartSector, SectorCount, (PVOID)DISKREADBUFFER)) + { + return FALSE; + } + + // Copy data to the caller + RtlCopyMemory(Buffer, (PVOID)DISKREADBUFFER, SectorCount * BytesPerSector); + + // Return success + return TRUE; +#endif } const FS_VTBL FatVtbl = {

16 years, 7 months

[pschweitzer] 32027: Get back DO_DIRECT_IO flag that has been removed in r31747

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jan 27 16:51:48 2008 New Revision: 32027 URL: http://svn.reactos.org/svn/reactos?rev=32027&view=rev Log: Get back DO_DIRECT_IO flag that has been removed in r31747 Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c Sun Jan 27 16:51:48 2008 @@ -89,6 +89,8 @@ WARN_(NTFS, "IoCreateDevice failed with status: %lx\n", Status); goto ErrorEnd; } + + NtfsGlobalData->DeviceObject->Flags |= DO_DIRECT_IO; /* Register file system */ IoRegisterFileSystem(NtfsGlobalData->DeviceObject);

16 years, 7 months

[fireball] 32026: Paolo Devoti <devotip@tiscali.it> - Separated the structure definition from the instance of it. See issue #2037 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 27 16:37:40 2008 New Revision: 32026 URL: http://svn.reactos.org/svn/reactos?rev=32026&view=rev Log: Paolo Devoti <devotip(a)tiscali.it> - Separated the structure definition from the instance of it. See issue #2037 for more details. Modified: trunk/reactos/include/ddk/atm.h Modified: trunk/reactos/include/ddk/atm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/atm.h?rev=3202… ============================================================================== --- trunk/reactos/include/ddk/atm.h (original) +++ trunk/reactos/include/ddk/atm.h Sun Jan 27 16:37:40 2008 @@ -130,10 +130,18 @@ } AALSpecificParameters; } AAL_PARAMETERS_IE, *PAAL_PARAMETERS_IE; - -/* FIXME: Should the union be anonymous in C++ too? If so, - can't define named types _ATM_AAL5_INFO and _ATM_AAL0_INFO - within anonymous union for C++. */ +struct _ATM_AAL5_INFO { + BOOLEAN CellLossPriority; + UCHAR UserToUserIndication; + UCHAR CommonPartIndicator; +}; + +struct _ATM_AAL0_INFO { + BOOLEAN CellLossPriority; + UCHAR PayLoadTypeIdentifier; +}; + +/* FIXME: Should the union be anonymous in C++ too? */ typedef struct _ATM_AAL_OOB_INFO { ATM_AAL_TYPE AalType; @@ -141,16 +149,8 @@ _ANONYMOUS_UNION #endif union { - struct _ATM_AAL5_INFO { - BOOLEAN CellLossPriority; - UCHAR UserToUserIndication; - UCHAR CommonPartIndicator; - } ATM_AAL5_INFO; - - struct _ATM_AAL0_INFO { - BOOLEAN CellLossPriority; - UCHAR PayLoadTypeIdentifier; - } ATM_AAL0_INFO; + struct _ATM_AAL5_INFO ATM_AAL5_INFO; + struct _ATM_AAL0_INFO ATM_AAL0_INFO; #ifndef __cplusplus } DUMMYUNIONNAME; #else

16 years, 7 months

[pschweitzer] 32025: [FORMATTING] Fix indentation

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jan 27 16:16:52 2008 New Revision: 32025 URL: http://svn.reactos.org/svn/reactos?rev=32025&view=rev Log: [FORMATTING] Fix indentation Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c Sun Jan 27 16:16:52 2008 @@ -39,9 +39,9 @@ static NTSTATUS NtfsGetStandardInformation(PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_STANDARD_INFORMATION StandardInfo, - PULONG BufferLength) + PDEVICE_OBJECT DeviceObject, + PFILE_STANDARD_INFORMATION StandardInfo, + PULONG BufferLength) /* * FUNCTION: Retrieve the standard file information */ @@ -56,7 +56,7 @@ ASSERT(Fcb != NULL); RtlZeroMemory(StandardInfo, - sizeof(FILE_STANDARD_INFORMATION)); + sizeof(FILE_STANDARD_INFORMATION)); StandardInfo->AllocationSize = Fcb->RFCB.AllocationSize; StandardInfo->EndOfFile = Fcb->RFCB.FileSize; @@ -71,8 +71,8 @@ static NTSTATUS NtfsGetPositionInformation(PFILE_OBJECT FileObject, - PFILE_POSITION_INFORMATION PositionInfo, - PULONG BufferLength) + PFILE_POSITION_INFORMATION PositionInfo, + PULONG BufferLength) { DPRINT("NtfsGetPositionInformation() called\n"); @@ -84,7 +84,7 @@ // FileObject->CurrentByteOffset.QuadPart; DPRINT("Getting position %I64x\n", - PositionInfo->CurrentByteOffset.QuadPart); + PositionInfo->CurrentByteOffset.QuadPart); *BufferLength -= sizeof(FILE_POSITION_INFORMATION); return(STATUS_SUCCESS); @@ -93,10 +93,10 @@ static NTSTATUS NtfsGetBasicInformation(PFILE_OBJECT FileObject, - PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_BASIC_INFORMATION BasicInfo, - PULONG BufferLength) + PFCB Fcb, + PDEVICE_OBJECT DeviceObject, + PFILE_BASIC_INFORMATION BasicInfo, + PULONG BufferLength) { DPRINT("NtfsGetBasicInformation() called\n"); @@ -125,10 +125,10 @@ static NTSTATUS NtfsGetNameInformation(PFILE_OBJECT FileObject, - PFCB Fcb, - PDEVICE_OBJECT DeviceObject, - PFILE_NAME_INFORMATION NameInfo, - PULONG BufferLength) + PFCB Fcb, + PDEVICE_OBJECT DeviceObject, + PFILE_NAME_INFORMATION NameInfo, + PULONG BufferLength) /* * FUNCTION: Retrieve the file name information */ @@ -147,8 +147,8 @@ NameInfo->FileNameLength = NameLength; memcpy(NameInfo->FileName, - Fcb->PathName, - NameLength + sizeof(WCHAR)); + Fcb->PathName, + NameLength + sizeof(WCHAR)); // wcscpy(NameInfo->FileName, L"\\"); *BufferLength -= @@ -160,8 +160,8 @@ static NTSTATUS NtfsGetInternalInformation(PFCB Fcb, - PFILE_INTERNAL_INFORMATION InternalInfo, - PULONG BufferLength) + PFILE_INTERNAL_INFORMATION InternalInfo, + PULONG BufferLength) { DPRINT("NtfsGetInternalInformation() called\n"); @@ -182,7 +182,7 @@ NTSTATUS STDCALL NtfsQueryInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + PIRP Irp) /* * FUNCTION: Retrieve the specified file information */ @@ -207,51 +207,51 @@ BufferLength = Stack->Parameters.QueryFile.Length; switch (FileInformationClass) - { - case FileStandardInformation: - Status = NtfsGetStandardInformation(Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FilePositionInformation: - Status = NtfsGetPositionInformation(FileObject, - SystemBuffer, - &BufferLength); - break; - - case FileBasicInformation: - Status = NtfsGetBasicInformation(FileObject, - Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileNameInformation: - Status = NtfsGetNameInformation(FileObject, - Fcb, - DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileInternalInformation: - Status = NtfsGetInternalInformation(Fcb, - SystemBuffer, - &BufferLength); - break; - - case FileAlternateNameInformation: - case FileAllInformation: - Status = STATUS_NOT_IMPLEMENTED; - break; - - default: - DPRINT("Unimplemented information class %u\n", FileInformationClass); - Status = STATUS_NOT_SUPPORTED; - } + { + case FileStandardInformation: + Status = NtfsGetStandardInformation(Fcb, + DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FilePositionInformation: + Status = NtfsGetPositionInformation(FileObject, + SystemBuffer, + &BufferLength); + break; + + case FileBasicInformation: + Status = NtfsGetBasicInformation(FileObject, + Fcb, + DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileNameInformation: + Status = NtfsGetNameInformation(FileObject, + Fcb, + DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileInternalInformation: + Status = NtfsGetInternalInformation(Fcb, + SystemBuffer, + &BufferLength); + break; + + case FileAlternateNameInformation: + case FileAllInformation: + Status = STATUS_NOT_IMPLEMENTED; + break; + + default: + DPRINT("Unimplemented information class %u\n", FileInformationClass); + Status = STATUS_NOT_SUPPORTED; + } Irp->IoStatus.Status = Status; if (NT_SUCCESS(Status))

16 years, 7 months

[gbrunmar] 32024: * Replaced d3d9 debug helper function with native call * Fixed adapter info overwrite and possible memory overwrite in d3d init code

by gbrunmar＠svn.reactos.org

Author: gbrunmar Date: Sun Jan 27 12:53:46 2008 New Revision: 32024 URL: http://svn.reactos.org/svn/reactos?rev=32024&view=rev Log: * Replaced d3d9 debug helper function with native call * Fixed adapter info overwrite and possible memory overwrite in d3d init code Modified: trunk/reactos/dll/directx/d3d9/d3d9.c trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_create.c trunk/reactos/dll/directx/d3d9/d3d9_create.h trunk/reactos/dll/directx/d3d9/d3d9_helpers.c trunk/reactos/dll/directx/d3d9/d3d9_helpers.h trunk/reactos/dll/directx/d3d9/d3d9_private.h Modified: trunk/reactos/dll/directx/d3d9/d3d9.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.c?re… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.c Sun Jan 27 12:53:46 2008 @@ -10,8 +10,8 @@ #include <d3d9.h> #include "d3d9_helpers.h" #include "d3d9_create.h" - #include <debug.h> +#include <strsafe.h> #define DEBUG_MESSAGE_BUFFER_SIZE 512 @@ -87,14 +87,16 @@ { if (SDKVersion & DX_D3D9_DEBUG) { - FormatDebugString(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, NoDebugSDKVersion, D3D_SDK_VERSION); - OutputDebugStringA(DebugMessageBuffer); + HRESULT hResult; + hResult = StringCbPrintfA(DebugMessageBuffer, DEBUG_MESSAGE_BUFFER_SIZE, D3dError_WrongSdkVersion, NoDebugSDKVersion, D3D_SDK_VERSION); + if (SUCCEEDED(hResult)) + OutputDebugStringA(DebugMessageBuffer); } return NULL; } - CreateD3D9(&D3D9Obj); + CreateD3D9(&D3D9Obj, SDKVersion); return D3D9Obj; } Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9.rbuild (original) +++ trunk/reactos/dll/directx/d3d9/d3d9.rbuild Sun Jan 27 12:53:46 2008 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll"> +<module name="d3d9" type="win32dll" entrypoint="0" installbase="system32" installname="d3d9.dll" baseaddress="0x4fdd0000"> <importlibrary definition="d3d9.def" /> <library>advapi32</library> @@ -9,6 +9,7 @@ <library>gdi32</library> <library>uuid</library> <library>dxguid</library> + <library>strsafe</library> <file>d3d9.c</file> <file>d3d9_helpers.c</file> Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.c Sun Jan 27 12:53:46 2008 @@ -12,17 +12,44 @@ #include "d3d9_helpers.h" #include <debug.h> #include <ddrawi.h> +#include <ddrawgdi.h> +#include <strsafe.h> static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } }; static CHAR D3D9_PrimaryDeviceName[CCHDEVICENAME]; +static BOOL IsDirectDrawSupported() +{ + HDC hDC; + DWORD Planes; + DWORD Bpp; + + hDC = GetDC(NULL); + Planes = GetDeviceCaps(hDC, PLANES); + Bpp = GetDeviceCaps(hDC, BITSPIXEL); + ReleaseDC(NULL, hDC); + + if (Planes * Bpp < 8) + return FALSE; + + return TRUE; +} + +static VOID SetAdapterInfo(IN OUT LPDIRECT3D9_DISPLAYADAPTER_INT pDisplayAdapter, IN LPDISPLAY_DEVICEA pDisplayDevice) +{ + memcpy(&pDisplayAdapter->DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); + + lstrcpynA(pDisplayAdapter->szDeviceName, pDisplayDevice->DeviceName, MAX_PATH); + + pDisplayAdapter->dwStateFlags = pDisplayDevice->StateFlags; + pDisplayAdapter->bInUseFlag = TRUE; +} + static BOOL GetDisplayDeviceInfo(IN OUT LPDIRECT3D9_INT pDirect3D9) { DISPLAY_DEVICEA DisplayDevice; DWORD AdapterIndex; - DWORD Planes; - DWORD Bpp; HDC hDC; memset(&DisplayDevice, 0, sizeof(DISPLAY_DEVICEA)); @@ -32,60 +59,52 @@ D3D9_PrimaryDeviceName[0] = '\0'; AdapterIndex = 0; - while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE && + pDirect3D9->dwNumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & (DISPLAY_DEVICE_DISCONNECT | DISPLAY_DEVICE_MIRRORING_DRIVER)) == 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) != 0) { - memcpy(&pDirect3D9->DisplayAdapters[0].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); - - lstrcpynA(pDirect3D9->DisplayAdapters[0].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); + SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters], &DisplayDevice); if (pDirect3D9->dwNumDisplayAdapters == 0) lstrcpynA(D3D9_PrimaryDeviceName, DisplayDevice.DeviceName, sizeof(D3D9_PrimaryDeviceName)); - pDirect3D9->DisplayAdapters[0].dwStateFlags = DisplayDevice.StateFlags; - pDirect3D9->DisplayAdapters[0].bInUseFlag = TRUE; - ++pDirect3D9->dwNumDisplayAdapters; break; } + + ++AdapterIndex; } AdapterIndex = 0; - while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE) + while (EnumDisplayDevicesA(NULL, AdapterIndex, &DisplayDevice, 0) == TRUE && + pDirect3D9->dwNumDisplayAdapters < DX_D3D9_MAX_NUM_ADAPTERS) { if ((DisplayDevice.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) != 0 && (DisplayDevice.StateFlags & (DISPLAY_DEVICE_MIRRORING_DRIVER | DISPLAY_DEVICE_PRIMARY_DEVICE)) == 0) { - memcpy(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].DisplayGuid, &DISPLAY_GUID, sizeof(GUID)); - - lstrcpynA(pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].szDeviceName, DisplayDevice.DeviceName, MAX_PATH); - - pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].dwStateFlags = DisplayDevice.StateFlags; - pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters].bInUseFlag = TRUE; - + SetAdapterInfo(&pDirect3D9->DisplayAdapters[pDirect3D9->dwNumDisplayAdapters], &DisplayDevice); ++pDirect3D9->dwNumDisplayAdapters; } + + ++AdapterIndex; } - hDC = GetDC(NULL); - Planes = GetDeviceCaps(hDC, PLANES); - Bpp = GetDeviceCaps(hDC, BITSPIXEL); - ReleaseDC(NULL, hDC); - - if (Planes * Bpp < 8) + /* Check if minimum DirectDraw is supported */ + if (IsDirectDrawSupported() == FALSE) return FALSE; - hDC = CreateDCA(NULL, D3D9_PrimaryDeviceName, NULL, NULL); + /* Test DC creation for primary display device */ + if (NULL == (hDC = CreateDCA(NULL, D3D9_PrimaryDeviceName, NULL, NULL))) + return FALSE; - if (hDC == NULL) - return FALSE; + DeleteDC(hDC); return TRUE; } -HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9) +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9, UINT SDKVersion) { LPDIRECT3D9_INT pDirect3D9; @@ -102,7 +121,7 @@ pDirect3D9->lpInt = 0; pDirect3D9->lpVtbl = &Direct3D9_Vtbl; - //pDirect3D9->dwProcessId = GetCurrentThreadId(); + pDirect3D9->dwProcessId = GetCurrentThreadId(); pDirect3D9->dwRefCnt = 1; pDirect3D9->unknown004576 = 0; @@ -112,14 +131,14 @@ pDirect3D9->unknown004581 = 0; pDirect3D9->unknown004582 = 0; pDirect3D9->unknown004583 = 0; - pDirect3D9->unknown004589 = 0x20; + pDirect3D9->SDKVersion = SDKVersion; pDirect3D9->lpInt = pDirect3D9; pDirect3D9->unknown000007 = 1; - //InitializeCriticalSection(&pDirect3D9->d3d9_cs); + InitializeCriticalSection(&pDirect3D9->d3d9_cs); - //memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapters)); + memset(pDirect3D9->DisplayAdapters, 0, sizeof(pDirect3D9->DisplayAdapters)); GetDisplayDeviceInfo(pDirect3D9); *ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl; Modified: trunk/reactos/dll/directx/d3d9/d3d9_create.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_crea… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_create.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_create.h Sun Jan 27 12:53:46 2008 @@ -11,6 +11,6 @@ #include "d3d9_private.h" /* Creates a Direct3D9 object */ -HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9); +HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9, UINT SDKVersion); #endif // _D3D9_CREATE_H_ Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.c (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.c Sun Jan 27 12:53:46 2008 @@ -41,25 +41,6 @@ return FALSE; return TRUE; -} - -HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ) -{ - int BytesWritten; - va_list vargs; - - if (BufferSize == 0) - return DDERR_INVALIDPARAMS; - - va_start(vargs, FormatString); - BytesWritten = _vsnprintf(Buffer, BufferSize-1, FormatString, vargs); - - if (BytesWritten < BufferSize) - return DDERR_GENERIC; - - Buffer[BufferSize-1] = '\0'; - - return 0; } HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize) Modified: trunk/reactos/dll/directx/d3d9/d3d9_helpers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_help… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_helpers.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_helpers.h Sun Jan 27 12:53:46 2008 @@ -17,9 +17,6 @@ /* Reads a registry value if it's of the correct value type */ BOOL ReadRegistryValue(IN DWORD ValueType, IN LPCSTR ValueName, OUT LPBYTE DataBuffer, IN OUT LPDWORD DataBufferSize); -/* Formats debug strings */ -HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR FormatString, ... ); - /* Allocates memory and returns an aligned pointer */ HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize); Modified: trunk/reactos/dll/directx/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_priv… ============================================================================== --- trunk/reactos/dll/directx/d3d9/d3d9_private.h (original) +++ trunk/reactos/dll/directx/d3d9/d3d9_private.h Sun Jan 27 12:53:46 2008 @@ -9,6 +9,8 @@ #define _D3D9_PRIVATE_H_ #include <windows.h> + +#define DX_D3D9_MAX_NUM_ADAPTERS 12 typedef struct _tagDIRECT3D9DisplayAdapterInfo_ { @@ -120,7 +122,7 @@ /* 0x02b0 */ DWORD unknown000103; /*? 0x001552A0 */ /* 0x02b4 */ DWORD unknown000104; /* 0x02b8 */ DWORD unknown000105; -} Direct3D9DisplayAdapterInfo_INT; +} Direct3D9DisplayAdapterInfo_INT, *LPDIRECT3D9_DISPLAYADAPTER_INT; typedef struct _tagDIRECT3D9_INT_ { @@ -131,1582 +133,7 @@ /* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt; /* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */ /* 0x002c */ DWORD dwNumDisplayAdapters; -/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[3]; -/* 0x0864 */ DWORD unknown000537; -/* 0x0868 */ DWORD unknown000538; -/* 0x086c */ DWORD unknown000539; -/* 0x0870 */ DWORD unknown000540; -/* 0x0874 */ DWORD unknown000541; -/* 0x0878 */ DWORD unknown000542; -/* 0x087c */ DWORD unknown000543; -/* 0x0880 */ DWORD unknown000544; -/* 0x0884 */ DWORD unknown000545; -/* 0x0888 */ DWORD unknown000546; -/* 0x088c */ DWORD unknown000547; -/* 0x0890 */ DWORD unknown000548; -/* 0x0894 */ DWORD unknown000549; -/* 0x0898 */ DWORD unknown000550; -/* 0x089c */ DWORD unknown000551; -/* 0x08a0 */ DWORD unknown000552; -/* 0x08a4 */ DWORD unknown000553; -/* 0x08a8 */ DWORD unknown000554; -/* 0x08ac */ DWORD unknown000555; -/* 0x08b0 */ DWORD unknown000556; -/* 0x08b4 */ DWORD unknown000557; -/* 0x08b8 */ DWORD unknown000558; -/* 0x08bc */ DWORD unknown000559; -/* 0x08c0 */ DWORD unknown000560; -/* 0x08c4 */ DWORD unknown000561; -/* 0x08c8 */ DWORD unknown000562; -/* 0x08cc */ DWORD unknown000563; -/* 0x08d0 */ DWORD unknown000564; -/* 0x08d4 */ DWORD unknown000565; -/* 0x08d8 */ DWORD unknown000566; -/* 0x08dc */ DWORD unknown000567; -/* 0x08e0 */ DWORD unknown000568; -/* 0x08e4 */ DWORD unknown000569; -/* 0x08e8 */ DWORD unknown000570; -/* 0x08ec */ DWORD unknown000571; -/* 0x08f0 */ DWORD unknown000572; -/* 0x08f4 */ DWORD unknown000573; -/* 0x08f8 */ DWORD unknown000574; -/* 0x08fc */ DWORD unknown000575; -/* 0x0900 */ DWORD unknown000576; -/* 0x0904 */ DWORD unknown000577; -/* 0x0908 */ DWORD unknown000578; -/* 0x090c */ DWORD unknown000579; -/* 0x0910 */ DWORD unknown000580; -/* 0x0914 */ DWORD unknown000581; -/* 0x0918 */ DWORD unknown000582; -/* 0x091c */ DWORD unknown000583; -/* 0x0920 */ DWORD unknown000584; -/* 0x0924 */ DWORD unknown000585; -/* 0x0928 */ DWORD unknown000586; -/* 0x092c */ DWORD unknown000587; -/* 0x0930 */ DWORD unknown000588; -/* 0x0934 */ DWORD unknown000589; -/* 0x0938 */ DWORD unknown000590; -/* 0x093c */ DWORD unknown000591; -/* 0x0940 */ DWORD unknown000592; -/* 0x0944 */ DWORD unknown000593; -/* 0x0948 */ DWORD unknown000594; -/* 0x094c */ DWORD unknown000595; -/* 0x0950 */ DWORD unknown000596; -/* 0x0954 */ DWORD unknown000597; -/* 0x0958 */ DWORD unknown000598; -/* 0x095c */ DWORD unknown000599; -/* 0x0960 */ DWORD unknown000600; -/* 0x0964 */ DWORD unknown000601; -/* 0x0968 */ DWORD unknown000602; -/* 0x096c */ DWORD unknown000603; -/* 0x0970 */ DWORD unknown000604; -/* 0x0974 */ DWORD unknown000605; -/* 0x0978 */ DWORD unknown000606; -/* 0x097c */ DWORD unknown000607; -/* 0x0980 */ DWORD unknown000608; -/* 0x0984 */ DWORD unknown000609; -/* 0x0988 */ DWORD unknown000610; -/* 0x098c */ DWORD unknown000611; -/* 0x0990 */ DWORD unknown000612; -/* 0x0994 */ DWORD unknown000613; -/* 0x0998 */ DWORD unknown000614; -/* 0x099c */ DWORD unknown000615; -/* 0x09a0 */ DWORD unknown000616; -/* 0x09a4 */ DWORD unknown000617; -/* 0x09a8 */ DWORD unknown000618; -/* 0x09ac */ DWORD unknown000619; -/* 0x09b0 */ DWORD unknown000620; -/* 0x09b4 */ DWORD unknown000621; -/* 0x09b8 */ DWORD unknown000622; -/* 0x09bc */ DWORD unknown000623; -/* 0x09c0 */ DWORD unknown000624; -/* 0x09c4 */ DWORD unknown000625; -/* 0x09c8 */ DWORD unknown000626; -/* 0x09cc */ DWORD unknown000627; -/* 0x09d0 */ DWORD unknown000628; -/* 0x09d4 */ DWORD unknown000629; -/* 0x09d8 */ DWORD unknown000630; -/* 0x09dc */ DWORD unknown000631; -/* 0x09e0 */ DWORD unknown000632; -/* 0x09e4 */ DWORD unknown000633; -/* 0x09e8 */ DWORD unknown000634; -/* 0x09ec */ DWORD unknown000635; -/* 0x09f0 */ DWORD unknown000636; -/* 0x09f4 */ DWORD unknown000637; -/* 0x09f8 */ DWORD unknown000638; -/* 0x09fc */ DWORD unknown000639; -/* 0x0a00 */ DWORD unknown000640; -/* 0x0a04 */ DWORD unknown000641; -/* 0x0a08 */ DWORD unknown000642; -/* 0x0a0c */ DWORD unknown000643; -/* 0x0a10 */ DWORD unknown000644; -/* 0x0a14 */ DWORD unknown000645; -/* 0x0a18 */ DWORD unknown000646; -/* 0x0a1c */ DWORD unknown000647; -/* 0x0a20 */ DWORD unknown000648; -/* 0x0a24 */ DWORD unknown000649; -/* 0x0a28 */ DWORD unknown000650; -/* 0x0a2c */ DWORD unknown000651; -/* 0x0a30 */ DWORD unknown000652; -/* 0x0a34 */ DWORD unknown000653; -/* 0x0a38 */ DWORD unknown000654; -/* 0x0a3c */ DWORD unknown000655; -/* 0x0a40 */ DWORD unknown000656; -/* 0x0a44 */ DWORD unknown000657; -/* 0x0a48 */ DWORD unknown000658; -/* 0x0a4c */ DWORD unknown000659; -/* 0x0a50 */ DWORD unknown000660; -/* 0x0a54 */ DWORD unknown000661; -/* 0x0a58 */ DWORD unknown000662; -/* 0x0a5c */ DWORD unknown000663; -/* 0x0a60 */ DWORD unknown000664; -/* 0x0a64 */ DWORD unknown000665; -/* 0x0a68 */ DWORD unknown000666; -/* 0x0a6c */ DWORD unknown000667; -/* 0x0a70 */ DWORD unknown000668; -/* 0x0a74 */ DWORD unknown000669; -/* 0x0a78 */ DWORD unknown000670; -/* 0x0a7c */ DWORD unknown000671; -/* 0x0a80 */ DWORD unknown000672; -/* 0x0a84 */ DWORD unknown000673; -/* 0x0a88 */ DWORD unknown000674; -/* 0x0a8c */ DWORD unknown000675; -/* 0x0a90 */ DWORD unknown000676; -/* 0x0a94 */ DWORD unknown000677; -/* 0x0a98 */ DWORD unknown000678; -/* 0x0a9c */ DWORD unknown000679; -/* 0x0aa0 */ DWORD unknown000680; -/* 0x0aa4 */ DWORD unknown000681; -/* 0x0aa8 */ DWORD unknown000682; -/* 0x0aac */ DWORD unknown000683; -/* 0x0ab0 */ DWORD unknown000684; -/* 0x0ab4 */ DWORD unknown000685; -/* 0x0ab8 */ DWORD unknown000686; -/* 0x0abc */ DWORD unknown000687; -/* 0x0ac0 */ DWORD unknown000688; -/* 0x0ac4 */ DWORD unknown000689; -/* 0x0ac8 */ DWORD unknown000690; -/* 0x0acc */ DWORD unknown000691; -/* 0x0ad0 */ DWORD unknown000692; -/* 0x0ad4 */ DWORD unknown000693; -/* 0x0ad8 */ DWORD unknown000694; -/* 0x0adc */ DWORD unknown000695; -/* 0x0ae0 */ DWORD unknown000696; -/* 0x0ae4 */ DWORD unknown000697; -/* 0x0ae8 */ DWORD unknown000698; -/* 0x0aec */ DWORD unknown000699; -/* 0x0af0 */ DWORD unknown000700; -/* 0x0af4 */ DWORD unknown000701; -/* 0x0af8 */ DWORD unknown000702; -/* 0x0afc */ DWORD unknown000703; -/* 0x0b00 */ DWORD unknown000704; -/* 0x0b04 */ DWORD unknown000705; -/* 0x0b08 */ DWORD unknown000706; -/* 0x0b0c */ DWORD unknown000707; -/* 0x0b10 */ DWORD unknown000708; -/* 0x0b14 */ DWORD unknown000709; -/* 0x0b18 */ DWORD unknown000710; -/* 0x0b1c */ DWORD unknown000711; -/* 0x0b20 */ DWORD unknown000712; -/* 0x0b24 */ DWORD unknown000713; -/* 0x0b28 */ DWORD unknown000714; -/* 0x0b2c */ DWORD unknown000715; -/* 0x0b30 */ DWORD unknown000716; -/* 0x0b34 */ DWORD unknown000717; -/* 0x0b38 */ DWORD unknown000718; -/* 0x0b3c */ DWORD unknown000719; -/* 0x0b40 */ DWORD unknown000720; -/* 0x0b44 */ DWORD unknown000721; -/* 0x0b48 */ DWORD unknown000722; -/* 0x0b4c */ DWORD unknown000723; -/* 0x0b50 */ DWORD unknown000724; -/* 0x0b54 */ DWORD unknown000725; -/* 0x0b58 */ DWORD unknown000726; -/* 0x0b5c */ DWORD unknown000727; -/* 0x0b60 */ DWORD unknown000728; -/* 0x0b64 */ DWORD unknown000729; -/* 0x0b68 */ DWORD unknown000730; -/* 0x0b6c */ DWORD unknown000731; -/* 0x0b70 */ DWORD unknown000732; -/* 0x0b74 */ DWORD unknown000733; -/* 0x0b78 */ DWORD unknown000734; -/* 0x0b7c */ DWORD unknown000735; -/* 0x0b80 */ DWORD unknown000736; -/* 0x0b84 */ DWORD unknown000737; -/* 0x0b88 */ DWORD unknown000738; -/* 0x0b8c */ DWORD unknown000739; -/* 0x0b90 */ DWORD unknown000740; -/* 0x0b94 */ DWORD unknown000741; -/* 0x0b98 */ DWORD unknown000742; -/* 0x0b9c */ DWORD unknown000743; -/* 0x0ba0 */ DWORD unknown000744; -/* 0x0ba4 */ DWORD unknown000745; -/* 0x0ba8 */ DWORD unknown000746; -/* 0x0bac */ DWORD unknown000747; -/* 0x0bb0 */ DWORD unknown000748; -/* 0x0bb4 */ DWORD unknown000749; -/* 0x0bb8 */ DWORD unknown000750; -/* 0x0bbc */ DWORD unknown000751; -/* 0x0bc0 */ DWORD unknown000752; -/* 0x0bc4 */ DWORD unknown000753; -/* 0x0bc8 */ DWORD unknown000754; -/* 0x0bcc */ DWORD unknown000755; -/* 0x0bd0 */ DWORD unknown000756; -/* 0x0bd4 */ DWORD unknown000757; -/* 0x0bd8 */ DWORD unknown000758; -/* 0x0bdc */ DWORD unknown000759; -/* 0x0be0 */ DWORD unknown000760; -/* 0x0be4 */ DWORD unknown000761; -/* 0x0be8 */ DWORD unknown000762; -/* 0x0bec */ DWORD unknown000763; -/* 0x0bf0 */ DWORD unknown000764; -/* 0x0bf4 */ DWORD unknown000765; -/* 0x0bf8 */ DWORD unknown000766; -/* 0x0bfc */ DWORD unknown000767; -/* 0x0c00 */ DWORD unknown000768; -/* 0x0c04 */ DWORD unknown000769; -/* 0x0c08 */ DWORD unknown000770; -/* 0x0c0c */ DWORD unknown000771; -/* 0x0c10 */ DWORD unknown000772; -/* 0x0c14 */ DWORD unknown000773; -/* 0x0c18 */ DWORD unknown000774; -/* 0x0c1c */ DWORD unknown000775; -/* 0x0c20 */ DWORD unknown000776; -/* 0x0c24 */ DWORD unknown000777; -/* 0x0c28 */ DWORD unknown000778; -/* 0x0c2c */ DWORD unknown000779; -/* 0x0c30 */ DWORD unknown000780; -/* 0x0c34 */ DWORD unknown000781; -/* 0x0c38 */ DWORD unknown000782; -/* 0x0c3c */ DWORD unknown000783; -/* 0x0c40 */ DWORD unknown000784; -/* 0x0c44 */ DWORD unknown000785; -/* 0x0c48 */ DWORD unknown000786; -/* 0x0c4c */ DWORD unknown000787; -/* 0x0c50 */ DWORD unknown000788; -/* 0x0c54 */ DWORD unknown000789; -/* 0x0c58 */ DWORD unknown000790; -/* 0x0c5c */ DWORD unknown000791; -/* 0x0c60 */ DWORD unknown000792; -/* 0x0c64 */ DWORD unknown000793; -/* 0x0c68 */ DWORD unknown000794; -/* 0x0c6c */ DWORD unknown000795; -/* 0x0c70 */ DWORD unknown000796; -/* 0x0c74 */ DWORD unknown000797; -/* 0x0c78 */ DWORD unknown000798; -/* 0x0c7c */ DWORD unknown000799; -/* 0x0c80 */ DWORD unknown000800; -/* 0x0c84 */ DWORD unknown000801; -/* 0x0c88 */ DWORD unknown000802; -/* 0x0c8c */ DWORD unknown000803; -/* 0x0c90 */ DWORD unknown000804; -/* 0x0c94 */ DWORD unknown000805; -/* 0x0c98 */ DWORD unknown000806; -/* 0x0c9c */ DWORD unknown000807; -/* 0x0ca0 */ DWORD unknown000808; -/* 0x0ca4 */ DWORD unknown000809; -/* 0x0ca8 */ DWORD unknown000810; -/* 0x0cac */ DWORD unknown000811; -/* 0x0cb0 */ DWORD unknown000812; -/* 0x0cb4 */ DWORD unknown000813; -/* 0x0cb8 */ DWORD unknown000814; -/* 0x0cbc */ DWORD unknown000815; -/* 0x0cc0 */ DWORD unknown000816; -/* 0x0cc4 */ DWORD unknown000817; -/* 0x0cc8 */ DWORD unknown000818; -/* 0x0ccc */ DWORD unknown000819; -/* 0x0cd0 */ DWORD unknown000820; -/* 0x0cd4 */ DWORD unknown000821; -/* 0x0cd8 */ DWORD unknown000822; -/* 0x0cdc */ DWORD unknown000823; -/* 0x0ce0 */ DWORD unknown000824; -/* 0x0ce4 */ DWORD unknown000825; -/* 0x0ce8 */ DWORD unknown000826; -/* 0x0cec */ DWORD unknown000827; -/* 0x0cf0 */ DWORD unknown000828; -/* 0x0cf4 */ DWORD unknown000829; -/* 0x0cf8 */ DWORD unknown000830; -/* 0x0cfc */ DWORD unknown000831; -/* 0x0d00 */ DWORD unknown000832; -/* 0x0d04 */ DWORD unknown000833; -/* 0x0d08 */ DWORD unknown000834; -/* 0x0d0c */ DWORD unknown000835; -/* 0x0d10 */ DWORD unknown000836; -/* 0x0d14 */ DWORD unknown000837; -/* 0x0d18 */ DWORD unknown000838; -/* 0x0d1c */ DWORD unknown000839; -/* 0x0d20 */ DWORD unknown000840; -/* 0x0d24 */ DWORD unknown000841; -/* 0x0d28 */ DWORD unknown000842; -/* 0x0d2c */ DWORD unknown000843; -/* 0x0d30 */ DWORD unknown000844; -/* 0x0d34 */ DWORD unknown000845; -/* 0x0d38 */ DWORD unknown000846; -/* 0x0d3c */ DWORD unknown000847; -/* 0x0d40 */ DWORD unknown000848; -/* 0x0d44 */ DWORD unknown000849; -/* 0x0d48 */ DWORD unknown000850; -/* 0x0d4c */ DWORD unknown000851; -/* 0x0d50 */ DWORD unknown000852; -/* 0x0d54 */ DWORD unknown000853; -/* 0x0d58 */ DWORD unknown000854; -/* 0x0d5c */ DWORD unknown000855; -/* 0x0d60 */ DWORD unknown000856; -/* 0x0d64 */ DWORD unknown000857; -/* 0x0d68 */ DWORD unknown000858; -/* 0x0d6c */ DWORD unknown000859; -/* 0x0d70 */ DWORD unknown000860; -/* 0x0d74 */ DWORD unknown000861; -/* 0x0d78 */ DWORD unknown000862; -/* 0x0d7c */ DWORD unknown000863; -/* 0x0d80 */ DWORD unknown000864; -/* 0x0d84 */ DWORD unknown000865; -/* 0x0d88 */ DWORD unknown000866; -/* 0x0d8c */ DWORD unknown000867; -/* 0x0d90 */ DWORD unknown000868; -/* 0x0d94 */ DWORD unknown000869; -/* 0x0d98 */ DWORD unknown000870; -/* 0x0d9c */ DWORD unknown000871; -/* 0x0da0 */ DWORD unknown000872; -/* 0x0da4 */ DWORD unknown000873; -/* 0x0da8 */ DWORD unknown000874; -/* 0x0dac */ DWORD unknown000875; -/* 0x0db0 */ DWORD unknown000876; -/* 0x0db4 */ DWORD unknown000877; -/* 0x0db8 */ DWORD unknown000878; -/* 0x0dbc */ DWORD unknown000879; -/* 0x0dc0 */ DWORD unknown000880; -/* 0x0dc4 */ DWORD unknown000881; -/* 0x0dc8 */ DWORD unknown000882; -/* 0x0dcc */ DWORD unknown000883; -/* 0x0dd0 */ DWORD unknown000884; -/* 0x0dd4 */ DWORD unknown000885; -/* 0x0dd8 */ DWORD unknown000886; -/* 0x0ddc */ DWORD unknown000887; -/* 0x0de0 */ DWORD unknown000888; -/* 0x0de4 */ DWORD unknown000889; -/* 0x0de8 */ DWORD unknown000890; -/* 0x0dec */ DWORD unknown000891; -/* 0x0df0 */ DWORD unknown000892; -/* 0x0df4 */ DWORD unknown000893; -/* 0x0df8 */ DWORD unknown000894; -/* 0x0dfc */ DWORD unknown000895; -/* 0x0e00 */ DWORD unknown000896; -/* 0x0e04 */ DWORD unknown000897; -/* 0x0e08 */ DWORD unknown000898; -/* 0x0e0c */ DWORD unknown000899; -/* 0x0e10 */ DWORD unknown000900; -/* 0x0e14 */ DWORD unknown000901; -/* 0x0e18 */ DWORD unknown000902; -/* 0x0e1c */ DWORD unknown000903; -/* 0x0e20 */ DWORD unknown000904; -/* 0x0e24 */ DWORD unknown000905; -/* 0x0e28 */ DWORD unknown000906; -/* 0x0e2c */ DWORD unknown000907; -/* 0x0e30 */ DWORD unknown000908; -/* 0x0e34 */ DWORD unknown000909; -/* 0x0e38 */ DWORD unknown000910; -/* 0x0e3c */ DWORD unknown000911; -/* 0x0e40 */ DWORD unknown000912; -/* 0x0e44 */ DWORD unknown000913; -/* 0x0e48 */ DWORD unknown000914; -/* 0x0e4c */ DWORD unknown000915; -/* 0x0e50 */ DWORD unknown000916; -/* 0x0e54 */ DWORD unknown000917; -/* 0x0e58 */ DWORD unknown000918; -/* 0x0e5c */ DWORD unknown000919; -/* 0x0e60 */ DWORD unknown000920; -/* 0x0e64 */ DWORD unknown000921; -/* 0x0e68 */ DWORD unknown000922; -/* 0x0e6c */ DWORD unknown000923; -/* 0x0e70 */ DWORD unknown000924; -/* 0x0e74 */ DWORD unknown000925; -/* 0x0e78 */ DWORD unknown000926; -/* 0x0e7c */ DWORD unknown000927; -/* 0x0e80 */ DWORD unknown000928; -/* 0x0e84 */ DWORD unknown000929; -/* 0x0e88 */ DWORD unknown000930; -/* 0x0e8c */ DWORD unknown000931; -/* 0x0e90 */ DWORD unknown000932; -/* 0x0e94 */ DWORD unknown000933; -/* 0x0e98 */ DWORD unknown000934; -/* 0x0e9c */ DWORD unknown000935; -/* 0x0ea0 */ DWORD unknown000936; -/* 0x0ea4 */ DWORD unknown000937; -/* 0x0ea8 */ DWORD unknown000938; -/* 0x0eac */ DWORD unknown000939; -/* 0x0eb0 */ DWORD unknown000940; -/* 0x0eb4 */ DWORD unknown000941; -/* 0x0eb8 */ DWORD unknown000942; -/* 0x0ebc */ DWORD unknown000943; -/* 0x0ec0 */ DWORD unknown000944; -/* 0x0ec4 */ DWORD unknown000945; -/* 0x0ec8 */ DWORD unknown000946; -/* 0x0ecc */ DWORD unknown000947; -/* 0x0ed0 */ DWORD unknown000948; -/* 0x0ed4 */ DWORD unknown000949; -/* 0x0ed8 */ DWORD unknown000950; -/* 0x0edc */ DWORD unknown000951; -/* 0x0ee0 */ DWORD unknown000952; -/* 0x0ee4 */ DWORD unknown000953; -/* 0x0ee8 */ DWORD unknown000954; -/* 0x0eec */ DWORD unknown000955; -/* 0x0ef0 */ DWORD unknown000956; -/* 0x0ef4 */ DWORD unknown000957; -/* 0x0ef8 */ DWORD unknown000958; -/* 0x0efc */ DWORD unknown000959; -/* 0x0f00 */ DWORD unknown000960; -/* 0x0f04 */ DWORD unknown000961; -/* 0x0f08 */ DWORD unknown000962; -/* 0x0f0c */ DWORD unknown000963; -/* 0x0f10 */ DWORD unknown000964; -/* 0x0f14 */ DWORD unknown000965; -/* 0x0f18 */ DWORD unknown000966; -/* 0x0f1c */ DWORD unknown000967; -/* 0x0f20 */ DWORD unknown000968; -/* 0x0f24 */ DWORD unknown000969; -/* 0x0f28 */ DWORD unknown000970; -/* 0x0f2c */ DWORD unknown000971; -/* 0x0f30 */ DWORD unknown000972; -/* 0x0f34 */ DWORD unknown000973; -/* 0x0f38 */ DWORD unknown000974; -/* 0x0f3c */ DWORD unknown000975; -/* 0x0f40 */ DWORD unknown000976; -/* 0x0f44 */ DWORD unknown000977; -/* 0x0f48 */ DWORD unknown000978; -/* 0x0f4c */ DWORD unknown000979; -/* 0x0f50 */ DWORD unknown000980; -/* 0x0f54 */ DWORD unknown000981; -/* 0x0f58 */ DWORD unknown000982; -/* 0x0f5c */ DWORD unknown000983; -/* 0x0f60 */ DWORD unknown000984; -/* 0x0f64 */ DWORD unknown000985; -/* 0x0f68 */ DWORD unknown000986; -/* 0x0f6c */ DWORD unknown000987; -/* 0x0f70 */ DWORD unknown000988; -/* 0x0f74 */ DWORD unknown000989; -/* 0x0f78 */ DWORD unknown000990; -/* 0x0f7c */ DWORD unknown000991; -/* 0x0f80 */ DWORD unknown000992; -/* 0x0f84 */ DWORD unknown000993; -/* 0x0f88 */ DWORD unknown000994; -/* 0x0f8c */ DWORD unknown000995; -/* 0x0f90 */ DWORD unknown000996; -/* 0x0f94 */ DWORD unknown000997; -/* 0x0f98 */ DWORD unknown000998; -/* 0x0f9c */ DWORD unknown000999; -/* 0x0fa0 */ DWORD unknown001000; -/* 0x0fa4 */ DWORD unknown001001; -/* 0x0fa8 */ DWORD unknown001002; -/* 0x0fac */ DWORD unknown001003; -/* 0x0fb0 */ DWORD unknown001004; -/* 0x0fb4 */ DWORD unknown001005; -/* 0x0fb8 */ DWORD unknown001006; -/* 0x0fbc */ DWORD unknown001007; -/* 0x0fc0 */ DWORD unknown001008; -/* 0x0fc4 */ DWORD unknown001009; -/* 0x0fc8 */ DWORD unknown001010; -/* 0x0fcc */ DWORD unknown001011; -/* 0x0fd0 */ DWORD unknown001012; -/* 0x0fd4 */ DWORD unknown001013; -/* 0x0fd8 */ DWORD unknown001014; -/* 0x0fdc */ DWORD unknown001015; -/* 0x0fe0 */ DWORD unknown001016; -/* 0x0fe4 */ DWORD unknown001017; -/* 0x0fe8 */ DWORD unknown001018; -/* 0x0fec */ DWORD unknown001019; -/* 0x0ff0 */ DWORD unknown001020; -/* 0x0ff4 */ DWORD unknown001021; -/* 0x0ff8 */ DWORD unknown001022; -/* 0x0ffc */ DWORD unknown001023; -/* 0x1000 */ DWORD unknown001024; -/* 0x1004 */ DWORD unknown001025; -/* 0x1008 */ DWORD unknown001026; -/* 0x100c */ DWORD unknown001027; -/* 0x1010 */ DWORD unknown001028; -/* 0x1014 */ DWORD unknown001029; -/* 0x1018 */ DWORD unknown001030; -/* 0x101c */ DWORD unknown001031; -/* 0x1020 */ DWORD unknown001032; -/* 0x1024 */ DWORD unknown001033; -/* 0x1028 */ DWORD unknown001034; -/* 0x102c */ DWORD unknown001035; -/* 0x1030 */ DWORD unknown001036; -/* 0x1034 */ DWORD unknown001037; -/* 0x1038 */ DWORD unknown001038; -/* 0x103c */ DWORD unknown001039; -/* 0x1040 */ DWORD unknown001040; -/* 0x1044 */ DWORD unknown001041; -/* 0x1048 */ DWORD unknown001042; -/* 0x104c */ DWORD unknown001043; -/* 0x1050 */ DWORD unknown001044; -/* 0x1054 */ DWORD unknown001045; -/* 0x1058 */ DWORD unknown001046; -/* 0x105c */ DWORD unknown001047; -/* 0x1060 */ DWORD unknown001048; -/* 0x1064 */ DWORD unknown001049; -/* 0x1068 */ DWORD unknown001050; -/* 0x106c */ DWORD unknown001051; -/* 0x1070 */ DWORD unknown001052; -/* 0x1074 */ DWORD unknown001053; -/* 0x1078 */ DWORD unknown001054; -/* 0x107c */ DWORD unknown001055; -/* 0x1080 */ DWORD unknown001056; -/* 0x1084 */ DWORD unknown001057; -/* 0x1088 */ DWORD unknown001058; -/* 0x108c */ DWORD unknown001059; -/* 0x1090 */ DWORD unknown001060; -/* 0x1094 */ DWORD unknown001061; -/* 0x1098 */ DWORD unknown001062; -/* 0x109c */ DWORD unknown001063; -/* 0x10a0 */ DWORD unknown001064; -/* 0x10a4 */ DWORD unknown001065; -/* 0x10a8 */ DWORD unknown001066; -/* 0x10ac */ DWORD unknown001067; -/* 0x10b0 */ DWORD unknown001068; -/* 0x10b4 */ DWORD unknown001069; -/* 0x10b8 */ DWORD unknown001070; -/* 0x10bc */ DWORD unknown001071; -/* 0x10c0 */ DWORD unknown001072; -/* 0x10c4 */ DWORD unknown001073; -/* 0x10c8 */ DWORD unknown001074; -/* 0x10cc */ DWORD unknown001075; -/* 0x10d0 */ DWORD unknown001076; -/* 0x10d4 */ DWORD unknown001077; -/* 0x10d8 */ DWORD unknown001078; -/* 0x10dc */ DWORD unknown001079; -/* 0x10e0 */ DWORD unknown001080; -/* 0x10e4 */ DWORD unknown001081; -/* 0x10e8 */ DWORD unknown001082; -/* 0x10ec */ DWORD unknown001083; -/* 0x10f0 */ DWORD unknown001084; -/* 0x10f4 */ DWORD unknown001085; -/* 0x10f8 */ DWORD unknown001086; -/* 0x10fc */ DWORD unknown001087; -/* 0x1100 */ DWORD unknown001088; -/* 0x1104 */ DWORD unknown001089; -/* 0x1108 */ DWORD unknown001090; -/* 0x110c */ DWORD unknown001091; -/* 0x1110 */ DWORD unknown001092; -/* 0x1114 */ DWORD unknown001093; -/* 0x1118 */ DWORD unknown001094; -/* 0x111c */ DWORD unknown001095; -/* 0x1120 */ DWORD unknown001096; -/* 0x1124 */ DWORD unknown001097; -/* 0x1128 */ DWORD unknown001098; -/* 0x112c */ DWORD unknown001099; -/* 0x1130 */ DWORD unknown001100; -/* 0x1134 */ DWORD unknown001101; -/* 0x1138 */ DWORD unknown001102; -/* 0x113c */ DWORD unknown001103; -/* 0x1140 */ DWORD unknown001104; -/* 0x1144 */ DWORD unknown001105; -/* 0x1148 */ DWORD unknown001106; -/* 0x114c */ DWORD unknown001107; -/* 0x1150 */ DWORD unknown001108; -/* 0x1154 */ DWORD unknown001109; -/* 0x1158 */ DWORD unknown001110; -/* 0x115c */ DWORD unknown001111; -/* 0x1160 */ DWORD unknown001112; -/* 0x1164 */ DWORD unknown001113; -/* 0x1168 */ DWORD unknown001114; -/* 0x116c */ DWORD unknown001115; -/* 0x1170 */ DWORD unknown001116; -/* 0x1174 */ DWORD unknown001117; -/* 0x1178 */ DWORD unknown001118; -/* 0x117c */ DWORD unknown001119; -/* 0x1180 */ DWORD unknown001120; -/* 0x1184 */ DWORD unknown001121; -/* 0x1188 */ DWORD unknown001122; -/* 0x118c */ DWORD unknown001123; -/* 0x1190 */ DWORD unknown001124; -/* 0x1194 */ DWORD unknown001125; -/* 0x1198 */ DWORD unknown001126; -/* 0x119c */ DWORD unknown001127; -/* 0x11a0 */ DWORD unknown001128; -/* 0x11a4 */ DWORD unknown001129; -/* 0x11a8 */ DWORD unknown001130; -/* 0x11ac */ DWORD unknown001131; -/* 0x11b0 */ DWORD unknown001132; -/* 0x11b4 */ DWORD unknown001133; -/* 0x11b8 */ DWORD unknown001134; -/* 0x11bc */ DWORD unknown001135; -/* 0x11c0 */ DWORD unknown001136; -/* 0x11c4 */ DWORD unknown001137; -/* 0x11c8 */ DWORD unknown001138; -/* 0x11cc */ DWORD unknown001139; -/* 0x11d0 */ DWORD unknown001140; -/* 0x11d4 */ DWORD unknown001141; -/* 0x11d8 */ DWORD unknown001142; -/* 0x11dc */ DWORD unknown001143; -/* 0x11e0 */ DWORD unknown001144; -/* 0x11e4 */ DWORD unknown001145; -/* 0x11e8 */ DWORD unknown001146; -/* 0x11ec */ DWORD unknown001147; -/* 0x11f0 */ DWORD unknown001148; -/* 0x11f4 */ DWORD unknown001149; -/* 0x11f8 */ DWORD unknown001150; -/* 0x11fc */ DWORD unknown001151; -/* 0x1200 */ DWORD unknown001152; -/* 0x1204 */ DWORD unknown001153; -/* 0x1208 */ DWORD unknown001154; -/* 0x120c */ DWORD unknown001155; -/* 0x1210 */ DWORD unknown001156; -/* 0x1214 */ DWORD unknown001157; -/* 0x1218 */ DWORD unknown001158; -/* 0x121c */ DWORD unknown001159; -/* 0x1220 */ DWORD unknown001160; -/* 0x1224 */ DWORD unknown001161; -/* 0x1228 */ DWORD unknown001162; -/* 0x122c */ DWORD unknown001163; -/* 0x1230 */ DWORD unknown001164; -/* 0x1234 */ DWORD unknown001165; -/* 0x1238 */ DWORD unknown001166; -/* 0x123c */ DWORD unknown001167; -/* 0x1240 */ DWORD unknown001168; -/* 0x1244 */ DWORD unknown001169; -/* 0x1248 */ DWORD unknown001170; -/* 0x124c */ DWORD unknown001171; -/* 0x1250 */ DWORD unknown001172; -/* 0x1254 */ DWORD unknown001173; -/* 0x1258 */ DWORD unknown001174; -/* 0x125c */ DWORD unknown001175; -/* 0x1260 */ DWORD unknown001176; -/* 0x1264 */ DWORD unknown001177; -/* 0x1268 */ DWORD unknown001178; -/* 0x126c */ DWORD unknown001179; -/* 0x1270 */ DWORD unknown001180; -/* 0x1274 */ DWORD unknown001181; -/* 0x1278 */ DWORD unknown001182; -/* 0x127c */ DWORD unknown001183; -/* 0x1280 */ DWORD unknown001184; -/* 0x1284 */ DWORD unknown001185; -/* 0x1288 */ DWORD unknown001186; -/* 0x128c */ DWORD unknown001187; -/* 0x1290 */ DWORD unknown001188; -/* 0x1294 */ DWORD unknown001189; -/* 0x1298 */ DWORD unknown001190; -/* 0x129c */ DWORD unknown001191; -/* 0x12a0 */ DWORD unknown001192; -/* 0x12a4 */ DWORD unknown001193; -/* 0x12a8 */ DWORD unknown001194; -/* 0x12ac */ DWORD unknown001195; -/* 0x12b0 */ DWORD unknown001196; -/* 0x12b4 */ DWORD unknown001197; -/* 0x12b8 */ DWORD unknown001198; -/* 0x12bc */ DWORD unknown001199; -/* 0x12c0 */ DWORD unknown001200; -/* 0x12c4 */ DWORD unknown001201; -/* 0x12c8 */ DWORD unknown001202; -/* 0x12cc */ DWORD unknown001203; -/* 0x12d0 */ DWORD unknown001204; -/* 0x12d4 */ DWORD unknown001205; -/* 0x12d8 */ DWORD unknown001206; -/* 0x12dc */ DWORD unknown001207; -/* 0x12e0 */ DWORD unknown001208; -/* 0x12e4 */ DWORD unknown001209; -/* 0x12e8 */ DWORD unknown001210; -/* 0x12ec */ DWORD unknown001211; -/* 0x12f0 */ DWORD unknown001212; -/* 0x12f4 */ DWORD unknown001213; -/* 0x12f8 */ DWORD unknown001214; -/* 0x12fc */ DWORD unknown001215; -/* 0x1300 */ DWORD unknown001216; -/* 0x1304 */ DWORD unknown001217; -/* 0x1308 */ DWORD unknown001218; -/* 0x130c */ DWORD unknown001219; -/* 0x1310 */ DWORD unknown001220; -/* 0x1314 */ DWORD unknown001221; -/* 0x1318 */ DWORD unknown001222; -/* 0x131c */ DWORD unknown001223; -/* 0x1320 */ DWORD unknown001224; -/* 0x1324 */ DWORD unknown001225; -/* 0x1328 */ DWORD unknown001226; -/* 0x132c */ DWORD unknown001227; -/* 0x1330 */ DWORD unknown001228; -/* 0x1334 */ DWORD unknown001229; -/* 0x1338 */ DWORD unknown001230; -/* 0x133c */ DWORD unknown001231; -/* 0x1340 */ DWORD unknown001232; -/* 0x1344 */ DWORD unknown001233; -/* 0x1348 */ DWORD unknown001234; -/* 0x134c */ DWORD unknown001235; -/* 0x1350 */ DWORD unknown001236; -/* 0x1354 */ DWORD unknown001237; -/* 0x1358 */ DWORD unknown001238; -/* 0x135c */ DWORD unknown001239; -/* 0x1360 */ DWORD unknown001240; -/* 0x1364 */ DWORD unknown001241; -/* 0x1368 */ DWORD unknown001242; -/* 0x136c */ DWORD unknown001243; -/* 0x1370 */ DWORD unknown001244; -/* 0x1374 */ DWORD unknown001245; -/* 0x1378 */ DWORD unknown001246; -/* 0x137c */ DWORD unknown001247; -/* 0x1380 */ DWORD unknown001248; -/* 0x1384 */ DWORD unknown001249; -/* 0x1388 */ DWORD unknown001250; -/* 0x138c */ DWORD unknown001251; -/* 0x1390 */ DWORD unknown001252; -/* 0x1394 */ DWORD unknown001253; -/* 0x1398 */ DWORD unknown001254; -/* 0x139c */ DWORD unknown001255; -/* 0x13a0 */ DWORD unknown001256; -/* 0x13a4 */ DWORD unknown001257; -/* 0x13a8 */ DWORD unknown001258; -/* 0x13ac */ DWORD unknown001259; -/* 0x13b0 */ DWORD unknown001260; -/* 0x13b4 */ DWORD unknown001261; -/* 0x13b8 */ DWORD unknown001262; -/* 0x13bc */ DWORD unknown001263; -/* 0x13c0 */ DWORD unknown001264; -/* 0x13c4 */ DWORD unknown001265; -/* 0x13c8 */ DWORD unknown001266; -/* 0x13cc */ DWORD unknown001267; -/* 0x13d0 */ DWORD unknown001268; -/* 0x13d4 */ DWORD unknown001269; -/* 0x13d8 */ DWORD unknown001270; -/* 0x13dc */ DWORD unknown001271; -/* 0x13e0 */ DWORD unknown001272; -/* 0x13e4 */ DWORD unknown001273; -/* 0x13e8 */ DWORD unknown001274; -/* 0x13ec */ DWORD unknown001275; -/* 0x13f0 */ DWORD unknown001276; -/* 0x13f4 */ DWORD unknown001277; -/* 0x13f8 */ DWORD unknown001278; -/* 0x13fc */ DWORD unknown001279; -/* 0x1400 */ DWORD unknown001280; -/* 0x1404 */ DWORD unknown001281; -/* 0x1408 */ DWORD unknown001282; -/* 0x140c */ DWORD unknown001283; -/* 0x1410 */ DWORD unknown001284; -/* 0x1414 */ DWORD unknown001285; -/* 0x1418 */ DWORD unknown001286; -/* 0x141c */ DWORD unknown001287; -/* 0x1420 */ DWORD unknown001288; -/* 0x1424 */ DWORD unknown001289; -/* 0x1428 */ DWORD unknown001290; -/* 0x142c */ DWORD unknown001291; -/* 0x1430 */ DWORD unknown001292; -/* 0x1434 */ DWORD unknown001293; -/* 0x1438 */ DWORD unknown001294; -/* 0x143c */ DWORD unknown001295; -/* 0x1440 */ DWORD unknown001296; -/* 0x1444 */ DWORD unknown001297; -/* 0x1448 */ DWORD unknown001298; -/* 0x144c */ DWORD unknown001299; -/* 0x1450 */ DWORD unknown001300; -/* 0x1454 */ DWORD unknown001301; -/* 0x1458 */ DWORD unknown001302; -/* 0x145c */ DWORD unknown001303; -/* 0x1460 */ DWORD unknown001304; -/* 0x1464 */ DWORD unknown001305; -/* 0x1468 */ DWORD unknown001306; -/* 0x146c */ DWORD unknown001307; -/* 0x1470 */ DWORD unknown001308; -/* 0x1474 */ DWORD unknown001309; -/* 0x1478 */ DWORD unknown001310; -/* 0x147c */ DWORD unknown001311; -/* 0x1480 */ DWORD unknown001312; -/* 0x1484 */ DWORD unknown001313; -/* 0x1488 */ DWORD unknown001314; -/* 0x148c */ DWORD unknown001315; -/* 0x1490 */ DWORD unknown001316; -/* 0x1494 */ DWORD unknown001317; -/* 0x1498 */ DWORD unknown001318; -/* 0x149c */ DWORD unknown001319; -/* 0x14a0 */ DWORD unknown001320; -/* 0x14a4 */ DWORD unknown001321; -/* 0x14a8 */ DWORD unknown001322; -/* 0x14ac */ DWORD unknown001323; -/* 0x14b0 */ DWORD unknown001324; -/* 0x14b4 */ DWORD unknown001325; -/* 0x14b8 */ DWORD unknown001326; -/* 0x14bc */ DWORD unknown001327; -/* 0x14c0 */ DWORD unknown001328; -/* 0x14c4 */ DWORD unknown001329; -/* 0x14c8 */ DWORD unknown001330; -/* 0x14cc */ DWORD unknown001331; -/* 0x14d0 */ DWORD unknown001332; -/* 0x14d4 */ DWORD unknown001333; -/* 0x14d8 */ DWORD unknown001334; -/* 0x14dc */ DWORD unknown001335; -/* 0x14e0 */ DWORD unknown001336; -/* 0x14e4 */ DWORD unknown001337; -/* 0x14e8 */ DWORD unknown001338; -/* 0x14ec */ DWORD unknown001339; -/* 0x14f0 */ DWORD unknown001340; -/* 0x14f4 */ DWORD unknown001341; -/* 0x14f8 */ DWORD unknown001342; -/* 0x14fc */ DWORD unknown001343; -/* 0x1500 */ DWORD unknown001344; -/* 0x1504 */ DWORD unknown001345; -/* 0x1508 */ DWORD unknown001346; -/* 0x150c */ DWORD unknown001347; -/* 0x1510 */ DWORD unknown001348; -/* 0x1514 */ DWORD unknown001349; -/* 0x1518 */ DWORD unknown001350; -/* 0x151c */ DWORD unknown001351; -/* 0x1520 */ DWORD unknown001352; -/* 0x1524 */ DWORD unknown001353; -/* 0x1528 */ DWORD unknown001354; -/* 0x152c */ DWORD unknown001355; -/* 0x1530 */ DWORD unknown001356; -/* 0x1534 */ DWORD unknown001357; -/* 0x1538 */ DWORD unknown001358; -/* 0x153c */ DWORD unknown001359; -/* 0x1540 */ DWORD unknown001360; -/* 0x1544 */ DWORD unknown001361; -/* 0x1548 */ DWORD unknown001362; -/* 0x154c */ DWORD unknown001363; -/* 0x1550 */ DWORD unknown001364; -/* 0x1554 */ DWORD unknown001365; -/* 0x1558 */ DWORD unknown001366; -/* 0x155c */ DWORD unknown001367; -/* 0x1560 */ DWORD unknown001368; -/* 0x1564 */ DWORD unknown001369; -/* 0x1568 */ DWORD unknown001370; -/* 0x156c */ DWORD unknown001371; -/* 0x1570 */ DWORD unknown001372; -/* 0x1574 */ DWORD unknown001373; -/* 0x1578 */ DWORD unknown001374; -/* 0x157c */ DWORD unknown001375; -/* 0x1580 */ DWORD unknown001376; -/* 0x1584 */ DWORD unknown001377; -/* 0x1588 */ DWORD unknown001378; -/* 0x158c */ DWORD unknown001379; -/* 0x1590 */ DWORD unknown001380; -/* 0x1594 */ DWORD unknown001381; -/* 0x1598 */ DWORD unknown001382; -/* 0x159c */ DWORD unknown001383; -/* 0x15a0 */ DWORD unknown001384; -/* 0x15a4 */ DWORD unknown001385; -/* 0x15a8 */ DWORD unknown001386; -/* 0x15ac */ DWORD unknown001387; -/* 0x15b0 */ DWORD unknown001388; -/* 0x15b4 */ DWORD unknown001389; -/* 0x15b8 */ DWORD unknown001390; -/* 0x15bc */ DWORD unknown001391; -/* 0x15c0 */ DWORD unknown001392; -/* 0x15c4 */ DWORD unknown001393; -/* 0x15c8 */ DWORD unknown001394; -/* 0x15cc */ DWORD unknown001395; -/* 0x15d0 */ DWORD unknown001396; -/* 0x15d4 */ DWORD unknown001397; -/* 0x15d8 */ DWORD unknown001398; -/* 0x15dc */ DWORD unknown001399; -/* 0x15e0 */ DWORD unknown001400; -/* 0x15e4 */ DWORD unknown001401; -/* 0x15e8 */ DWORD unknown001402; -/* 0x15ec */ DWORD unknown001403; -/* 0x15f0 */ DWORD unknown001404; -/* 0x15f4 */ DWORD unknown001405; -/* 0x15f8 */ DWORD unknown001406; -/* 0x15fc */ DWORD unknown001407; -/* 0x1600 */ DWORD unknown001408; -/* 0x1604 */ DWORD unknown001409; -/* 0x1608 */ DWORD unknown001410; -/* 0x160c */ DWORD unknown001411; -/* 0x1610 */ DWORD unknown001412; -/* 0x1614 */ DWORD unknown001413; -/* 0x1618 */ DWORD unknown001414; -/* 0x161c */ DWORD unknown001415; -/* 0x1620 */ DWORD unknown001416; -/* 0x1624 */ DWORD unknown001417; -/* 0x1628 */ DWORD unknown001418; -/* 0x162c */ DWORD unknown001419; -/* 0x1630 */ DWORD unknown001420; -/* 0x1634 */ DWORD unknown001421; -/* 0x1638 */ DWORD unknown001422; -/* 0x163c */ DWORD unknown001423; -/* 0x1640 */ DWORD unknown001424; -/* 0x1644 */ DWORD unknown001425; -/* 0x1648 */ DWORD unknown001426; -/* 0x164c */ DWORD unknown001427; -/* 0x1650 */ DWORD unknown001428; -/* 0x1654 */ DWORD unknown001429; -/* 0x1658 */ DWORD unknown001430; -/* 0x165c */ DWORD unknown001431; -/* 0x1660 */ DWORD unknown001432; -/* 0x1664 */ DWORD unknown001433; -/* 0x1668 */ DWORD unknown001434; -/* 0x166c */ DWORD unknown001435; -/* 0x1670 */ DWORD unknown001436; -/* 0x1674 */ DWORD unknown001437; -/* 0x1678 */ DWORD unknown001438; -/* 0x167c */ DWORD unknown001439; -/* 0x1680 */ DWORD unknown001440; -/* 0x1684 */ DWORD unknown001441; -/* 0x1688 */ DWORD unknown001442; -/* 0x168c */ DWORD unknown001443; -/* 0x1690 */ DWORD unknown001444; -/* 0x1694 */ DWORD unknown001445; -/* 0x1698 */ DWORD unknown001446; -/* 0x169c */ DWORD unknown001447; -/* 0x16a0 */ DWORD unknown001448; -/* 0x16a4 */ DWORD unknown001449; -/* 0x16a8 */ DWORD unknown001450; -/* 0x16ac */ DWORD unknown001451; -/* 0x16b0 */ DWORD unknown001452; -/* 0x16b4 */ DWORD unknown001453; -/* 0x16b8 */ DWORD unknown001454; -/* 0x16bc */ DWORD unknown001455; -/* 0x16c0 */ DWORD unknown001456; -/* 0x16c4 */ DWORD unknown001457; -/* 0x16c8 */ DWORD unknown001458; -/* 0x16cc */ DWORD unknown001459; -/* 0x16d0 */ DWORD unknown001460; -/* 0x16d4 */ DWORD unknown001461; -/* 0x16d8 */ DWORD unknown001462; -/* 0x16dc */ DWORD unknown001463; -/* 0x16e0 */ DWORD unknown001464; -/* 0x16e4 */ DWORD unknown001465; -/* 0x16e8 */ DWORD unknown001466; -/* 0x16ec */ DWORD unknown001467; -/* 0x16f0 */ DWORD unknown001468; -/* 0x16f4 */ DWORD unknown001469; -/* 0x16f8 */ DWORD unknown001470; -/* 0x16fc */ DWORD unknown001471; -/* 0x1700 */ DWORD unknown001472; -/* 0x1704 */ DWORD unknown001473; -/* 0x1708 */ DWORD unknown001474; -/* 0x170c */ DWORD unknown001475; -/* 0x1710 */ DWORD unknown001476; -/* 0x1714 */ DWORD unknown001477; -/* 0x1718 */ DWORD unknown001478; -/* 0x171c */ DWORD unknown001479; -/* 0x1720 */ DWORD unknown001480; -/* 0x1724 */ DWORD unknown001481; -/* 0x1728 */ DWORD unknown001482; -/* 0x172c */ DWORD unknown001483; -/* 0x1730 */ DWORD unknown001484; -/* 0x1734 */ DWORD unknown001485; -/* 0x1738 */ DWORD unknown001486; -/* 0x173c */ DWORD unknown001487; -/* 0x1740 */ DWORD unknown001488; -/* 0x1744 */ DWORD unknown001489; -/* 0x1748 */ DWORD unknown001490; -/* 0x174c */ DWORD unknown001491; -/* 0x1750 */ DWORD unknown001492; -/* 0x1754 */ DWORD unknown001493; -/* 0x1758 */ DWORD unknown001494; -/* 0x175c */ DWORD unknown001495; -/* 0x1760 */ DWORD unknown001496; -/* 0x1764 */ DWORD unknown001497; -/* 0x1768 */ DWORD unknown001498; -/* 0x176c */ DWORD unknown001499; -/* 0x1770 */ DWORD unknown001500; -/* 0x1774 */ DWORD unknown001501; -/* 0x1778 */ DWORD unknown001502; -/* 0x177c */ DWORD unknown001503; -/* 0x1780 */ DWORD unknown001504; -/* 0x1784 */ DWORD unknown001505; -/* 0x1788 */ DWORD unknown001506; -/* 0x178c */ DWORD unknown001507; -/* 0x1790 */ DWORD unknown001508; -/* 0x1794 */ DWORD unknown001509; -/* 0x1798 */ DWORD unknown001510; -/* 0x179c */ DWORD unknown001511; -/* 0x17a0 */ DWORD unknown001512; -/* 0x17a4 */ DWORD unknown001513; -/* 0x17a8 */ DWORD unknown001514; -/* 0x17ac */ DWORD unknown001515; -/* 0x17b0 */ DWORD unknown001516; -/* 0x17b4 */ DWORD unknown001517; -/* 0x17b8 */ DWORD unknown001518; -/* 0x17bc */ DWORD unknown001519; -/* 0x17c0 */ DWORD unknown001520; -/* 0x17c4 */ DWORD unknown001521; -/* 0x17c8 */ DWORD unknown001522; -/* 0x17cc */ DWORD unknown001523; -/* 0x17d0 */ DWORD unknown001524; -/* 0x17d4 */ DWORD unknown001525; -/* 0x17d8 */ DWORD unknown001526; -/* 0x17dc */ DWORD unknown001527; -/* 0x17e0 */ DWORD unknown001528; -/* 0x17e4 */ DWORD unknown001529; -/* 0x17e8 */ DWORD unknown001530; -/* 0x17ec */ DWORD unknown001531; -/* 0x17f0 */ DWORD unknown001532; -/* 0x17f4 */ DWORD unknown001533; -/* 0x17f8 */ DWORD unknown001534; -/* 0x17fc */ DWORD unknown001535; -/* 0x1800 */ DWORD unknown001536; -/* 0x1804 */ DWORD unknown001537; -/* 0x1808 */ DWORD unknown001538; -/* 0x180c */ DWORD unknown001539; -/* 0x1810 */ DWORD unknown001540; -/* 0x1814 */ DWORD unknown001541; -/* 0x1818 */ DWORD unknown001542; -/* 0x181c */ DWORD unknown001543; -/* 0x1820 */ DWORD unknown001544; -/* 0x1824 */ DWORD unknown001545; -/* 0x1828 */ DWORD unknown001546; -/* 0x182c */ DWORD unknown001547; -/* 0x1830 */ DWORD unknown001548; -/* 0x1834 */ DWORD unknown001549; -/* 0x1838 */ DWORD unknown001550; -/* 0x183c */ DWORD unknown001551; -/* 0x1840 */ DWORD unknown001552; -/* 0x1844 */ DWORD unknown001553; -/* 0x1848 */ DWORD unknown001554; -/* 0x184c */ DWORD unknown001555; -/* 0x1850 */ DWORD unknown001556; -/* 0x1854 */ DWORD unknown001557; -/* 0x1858 */ DWORD unknown001558; -/* 0x185c */ DWORD unknown001559; -/* 0x1860 */ DWORD unknown001560; -/* 0x1864 */ DWORD unknown001561; -/* 0x1868 */ DWORD unknown001562; -/* 0x186c */ DWORD unknown001563; -/* 0x1870 */ DWORD unknown001564; -/* 0x1874 */ DWORD unknown001565; -/* 0x1878 */ DWORD unknown001566; -/* 0x187c */ DWORD unknown001567; -/* 0x1880 */ DWORD unknown001568; -/* 0x1884 */ DWORD unknown001569; -/* 0x1888 */ DWORD unknown001570; -/* 0x188c */ DWORD unknown001571; -/* 0x1890 */ DWORD unknown001572; -/* 0x1894 */ DWORD unknown001573; -/* 0x1898 */ DWORD unknown001574; -/* 0x189c */ DWORD unknown001575; -/* 0x18a0 */ DWORD unknown001576; -/* 0x18a4 */ DWORD unknown001577; -/* 0x18a8 */ DWORD unknown001578; -/* 0x18ac */ DWORD unknown001579; -/* 0x18b0 */ DWORD unknown001580; -/* 0x18b4 */ DWORD unknown001581; -/* 0x18b8 */ DWORD unknown001582; -/* 0x18bc */ DWORD unknown001583; -/* 0x18c0 */ DWORD unknown001584; -/* 0x18c4 */ DWORD unknown001585; -/* 0x18c8 */ DWORD unknown001586; -/* 0x18cc */ DWORD unknown001587; -/* 0x18d0 */ DWORD unknown001588; -/* 0x18d4 */ DWORD unknown001589; -/* 0x18d8 */ DWORD unknown001590; -/* 0x18dc */ DWORD unknown001591; -/* 0x18e0 */ DWORD unknown001592; -/* 0x18e4 */ DWORD unknown001593; -/* 0x18e8 */ DWORD unknown001594; -/* 0x18ec */ DWORD unknown001595; -/* 0x18f0 */ DWORD unknown001596; -/* 0x18f4 */ DWORD unknown001597; -/* 0x18f8 */ DWORD unknown001598; -/* 0x18fc */ DWORD unknown001599; -/* 0x1900 */ DWORD unknown001600; -/* 0x1904 */ DWORD unknown001601; -/* 0x1908 */ DWORD unknown001602; -/* 0x190c */ DWORD unknown001603; -/* 0x1910 */ DWORD unknown001604; -/* 0x1914 */ DWORD unknown001605; -/* 0x1918 */ DWORD unknown001606; -/* 0x191c */ DWORD unknown001607; -/* 0x1920 */ DWORD unknown001608; -/* 0x1924 */ DWORD unknown001609; -/* 0x1928 */ DWORD unknown001610; -/* 0x192c */ DWORD unknown001611; -/* 0x1930 */ DWORD unknown001612; -/* 0x1934 */ DWORD unknown001613; -/* 0x1938 */ DWORD unknown001614; -/* 0x193c */ DWORD unknown001615; -/* 0x1940 */ DWORD unknown001616; -/* 0x1944 */ DWORD unknown001617; -/* 0x1948 */ DWORD unknown001618; -/* 0x194c */ DWORD unknown001619; -/* 0x1950 */ DWORD unknown001620; -/* 0x1954 */ DWORD unknown001621; -/* 0x1958 */ DWORD unknown001622; -/* 0x195c */ DWORD unknown001623; -/* 0x1960 */ DWORD unknown001624; -/* 0x1964 */ DWORD unknown001625; -/* 0x1968 */ DWORD unknown001626; -/* 0x196c */ DWORD unknown001627; -/* 0x1970 */ DWORD unknown001628; -/* 0x1974 */ DWORD unknown001629; -/* 0x1978 */ DWORD unknown001630; -/* 0x197c */ DWORD unknown001631; -/* 0x1980 */ DWORD unknown001632; -/* 0x1984 */ DWORD unknown001633; -/* 0x1988 */ DWORD unknown001634; -/* 0x198c */ DWORD unknown001635; -/* 0x1990 */ DWORD unknown001636; -/* 0x1994 */ DWORD unknown001637; -/* 0x1998 */ DWORD unknown001638; -/* 0x199c */ DWORD unknown001639; -/* 0x19a0 */ DWORD unknown001640; -/* 0x19a4 */ DWORD unknown001641; -/* 0x19a8 */ DWORD unknown001642; -/* 0x19ac */ DWORD unknown001643; -/* 0x19b0 */ DWORD unknown001644; -/* 0x19b4 */ DWORD unknown001645; -/* 0x19b8 */ DWORD unknown001646; -/* 0x19bc */ DWORD unknown001647; -/* 0x19c0 */ DWORD unknown001648; -/* 0x19c4 */ DWORD unknown001649; -/* 0x19c8 */ DWORD unknown001650; -/* 0x19cc */ DWORD unknown001651; -/* 0x19d0 */ DWORD unknown001652; -/* 0x19d4 */ DWORD unknown001653; -/* 0x19d8 */ DWORD unknown001654; -/* 0x19dc */ DWORD unknown001655; -/* 0x19e0 */ DWORD unknown001656; -/* 0x19e4 */ DWORD unknown001657; -/* 0x19e8 */ DWORD unknown001658; -/* 0x19ec */ DWORD unknown001659; -/* 0x19f0 */ DWORD unknown001660; -/* 0x19f4 */ DWORD unknown001661; -/* 0x19f8 */ DWORD unknown001662; -/* 0x19fc */ DWORD unknown001663; -/* 0x1a00 */ DWORD unknown001664; -/* 0x1a04 */ DWORD unknown001665; -/* 0x1a08 */ DWORD unknown001666; -/* 0x1a0c */ DWORD unknown001667; -/* 0x1a10 */ DWORD unknown001668; -/* 0x1a14 */ DWORD unknown001669; -/* 0x1a18 */ DWORD unknown001670; -/* 0x1a1c */ DWORD unknown001671; -/* 0x1a20 */ DWORD unknown001672; -/* 0x1a24 */ DWORD unknown001673; -/* 0x1a28 */ DWORD unknown001674; -/* 0x1a2c */ DWORD unknown001675; -/* 0x1a30 */ DWORD unknown001676; -/* 0x1a34 */ DWORD unknown001677; -/* 0x1a38 */ DWORD unknown001678; -/* 0x1a3c */ DWORD unknown001679; -/* 0x1a40 */ DWORD unknown001680; -/* 0x1a44 */ DWORD unknown001681; -/* 0x1a48 */ DWORD unknown001682; -/* 0x1a4c */ DWORD unknown001683; -/* 0x1a50 */ DWORD unknown001684; -/* 0x1a54 */ DWORD unknown001685; -/* 0x1a58 */ DWORD unknown001686; -/* 0x1a5c */ DWORD unknown001687; -/* 0x1a60 */ DWORD unknown001688; -/* 0x1a64 */ DWORD unknown001689; -/* 0x1a68 */ DWORD unknown001690; -/* 0x1a6c */ DWORD unknown001691; -/* 0x1a70 */ DWORD unknown001692; -/* 0x1a74 */ DWORD unknown001693; -/* 0x1a78 */ DWORD unknown001694; -/* 0x1a7c */ DWORD unknown001695; -/* 0x1a80 */ DWORD unknown001696; -/* 0x1a84 */ DWORD unknown001697; -/* 0x1a88 */ DWORD unknown001698; -/* 0x1a8c */ DWORD unknown001699; -/* 0x1a90 */ DWORD unknown001700; -/* 0x1a94 */ DWORD unknown001701; -/* 0x1a98 */ DWORD unknown001702; -/* 0x1a9c */ DWORD unknown001703; -/* 0x1aa0 */ DWORD unknown001704; -/* 0x1aa4 */ DWORD unknown001705; -/* 0x1aa8 */ DWORD unknown001706; -/* 0x1aac */ DWORD unknown001707; -/* 0x1ab0 */ DWORD unknown001708; -/* 0x1ab4 */ DWORD unknown001709; -/* 0x1ab8 */ DWORD unknown001710; -/* 0x1abc */ DWORD unknown001711; -/* 0x1ac0 */ DWORD unknown001712; -/* 0x1ac4 */ DWORD unknown001713; -/* 0x1ac8 */ DWORD unknown001714; -/* 0x1acc */ DWORD unknown001715; -/* 0x1ad0 */ DWORD unknown001716; -/* 0x1ad4 */ DWORD unknown001717; -/* 0x1ad8 */ DWORD unknown001718; -/* 0x1adc */ DWORD unknown001719; -/* 0x1ae0 */ DWORD unknown001720; -/* 0x1ae4 */ DWORD unknown001721; -/* 0x1ae8 */ DWORD unknown001722; -/* 0x1aec */ DWORD unknown001723; -/* 0x1af0 */ DWORD unknown001724; -/* 0x1af4 */ DWORD unknown001725; -/* 0x1af8 */ DWORD unknown001726; -/* 0x1afc */ DWORD unknown001727; -/* 0x1b00 */ DWORD unknown001728; -/* 0x1b04 */ DWORD unknown001729; -/* 0x1b08 */ DWORD unknown001730; -/* 0x1b0c */ DWORD unknown001731; -/* 0x1b10 */ DWORD unknown001732; -/* 0x1b14 */ DWORD unknown001733; -/* 0x1b18 */ DWORD unknown001734; -/* 0x1b1c */ DWORD unknown001735; -/* 0x1b20 */ DWORD unknown001736; -/* 0x1b24 */ DWORD unknown001737; -/* 0x1b28 */ DWORD unknown001738; -/* 0x1b2c */ DWORD unknown001739; -/* 0x1b30 */ DWORD unknown001740; -/* 0x1b34 */ DWORD unknown001741; -/* 0x1b38 */ DWORD unknown001742; -/* 0x1b3c */ DWORD unknown001743; -/* 0x1b40 */ DWORD unknown001744; -/* 0x1b44 */ DWORD unknown001745; -/* 0x1b48 */ DWORD unknown001746; -/* 0x1b4c */ DWORD unknown001747; -/* 0x1b50 */ DWORD unknown001748; -/* 0x1b54 */ DWORD unknown001749; -/* 0x1b58 */ DWORD unknown001750; -/* 0x1b5c */ DWORD unknown001751; -/* 0x1b60 */ DWORD unknown001752; -/* 0x1b64 */ DWORD unknown001753; -/* 0x1b68 */ DWORD unknown001754; -/* 0x1b6c */ DWORD unknown001755; -/* 0x1b70 */ DWORD unknown001756; -/* 0x1b74 */ DWORD unknown001757; -/* 0x1b78 */ DWORD unknown001758; -/* 0x1b7c */ DWORD unknown001759; -/* 0x1b80 */ DWORD unknown001760; -/* 0x1b84 */ DWORD unknown001761; -/* 0x1b88 */ DWORD unknown001762; -/* 0x1b8c */ DWORD unknown001763; -/* 0x1b90 */ DWORD unknown001764; -/* 0x1b94 */ DWORD unknown001765; -/* 0x1b98 */ DWORD unknown001766; -/* 0x1b9c */ DWORD unknown001767; -/* 0x1ba0 */ DWORD unknown001768; -/* 0x1ba4 */ DWORD unknown001769; -/* 0x1ba8 */ DWORD unknown001770; -/* 0x1bac */ DWORD unknown001771; -/* 0x1bb0 */ DWORD unknown001772; -/* 0x1bb4 */ DWORD unknown001773; -/* 0x1bb8 */ DWORD unknown001774; -/* 0x1bbc */ DWORD unknown001775; -/* 0x1bc0 */ DWORD unknown001776; -/* 0x1bc4 */ DWORD unknown001777; -/* 0x1bc8 */ DWORD unknown001778; -/* 0x1bcc */ DWORD unknown001779; -/* 0x1bd0 */ DWORD unknown001780; -/* 0x1bd4 */ DWORD unknown001781; -/* 0x1bd8 */ DWORD unknown001782; -/* 0x1bdc */ DWORD unknown001783; -/* 0x1be0 */ DWORD unknown001784; -/* 0x1be4 */ DWORD unknown001785; -/* 0x1be8 */ DWORD unknown001786; -/* 0x1bec */ DWORD unknown001787; -/* 0x1bf0 */ DWORD unknown001788; -/* 0x1bf4 */ DWORD unknown001789; -/* 0x1bf8 */ DWORD unknown001790; -/* 0x1bfc */ DWORD unknown001791; -/* 0x1c00 */ DWORD unknown001792; -/* 0x1c04 */ DWORD unknown001793; -/* 0x1c08 */ DWORD unknown001794; -/* 0x1c0c */ DWORD unknown001795; -/* 0x1c10 */ DWORD unknown001796; -/* 0x1c14 */ DWORD unknown001797; -/* 0x1c18 */ DWORD unknown001798; -/* 0x1c1c */ DWORD unknown001799; -/* 0x1c20 */ DWORD unknown001800; -/* 0x1c24 */ DWORD unknown001801; -/* 0x1c28 */ DWORD unknown001802; -/* 0x1c2c */ DWORD unknown001803; -/* 0x1c30 */ DWORD unknown001804; -/* 0x1c34 */ DWORD unknown001805; -/* 0x1c38 */ DWORD unknown001806; -/* 0x1c3c */ DWORD unknown001807; -/* 0x1c40 */ DWORD unknown001808; -/* 0x1c44 */ DWORD unknown001809; -/* 0x1c48 */ DWORD unknown001810; -/* 0x1c4c */ DWORD unknown001811; -/* 0x1c50 */ DWORD unknown001812; -/* 0x1c54 */ DWORD unknown001813; -/* 0x1c58 */ DWORD unknown001814; -/* 0x1c5c */ DWORD unknown001815; -/* 0x1c60 */ DWORD unknown001816; -/* 0x1c64 */ DWORD unknown001817; -/* 0x1c68 */ DWORD unknown001818; -/* 0x1c6c */ DWORD unknown001819; -/* 0x1c70 */ DWORD unknown001820; -/* 0x1c74 */ DWORD unknown001821; -/* 0x1c78 */ DWORD unknown001822; -/* 0x1c7c */ DWORD unknown001823; -/* 0x1c80 */ DWORD unknown001824; -/* 0x1c84 */ DWORD unknown001825; -/* 0x1c88 */ DWORD unknown001826; -/* 0x1c8c */ DWORD unknown001827; -/* 0x1c90 */ DWORD unknown001828; -/* 0x1c94 */ DWORD unknown001829; -/* 0x1c98 */ DWORD unknown001830; -/* 0x1c9c */ DWORD unknown001831; -/* 0x1ca0 */ DWORD unknown001832; -/* 0x1ca4 */ DWORD unknown001833; -/* 0x1ca8 */ DWORD unknown001834; -/* 0x1cac */ DWORD unknown001835; -/* 0x1cb0 */ DWORD unknown001836; -/* 0x1cb4 */ DWORD unknown001837; -/* 0x1cb8 */ DWORD unknown001838; -/* 0x1cbc */ DWORD unknown001839; -/* 0x1cc0 */ DWORD unknown001840; -/* 0x1cc4 */ DWORD unknown001841; -/* 0x1cc8 */ DWORD unknown001842; -/* 0x1ccc */ DWORD unknown001843; -/* 0x1cd0 */ DWORD unknown001844; -/* 0x1cd4 */ DWORD unknown001845; -/* 0x1cd8 */ DWORD unknown001846; -/* 0x1cdc */ DWORD unknown001847; -/* 0x1ce0 */ DWORD unknown001848; -/* 0x1ce4 */ DWORD unknown001849; -/* 0x1ce8 */ DWORD unknown001850; -/* 0x1cec */ DWORD unknown001851; -/* 0x1cf0 */ DWORD unknown001852; -/* 0x1cf4 */ DWORD unknown001853; -/* 0x1cf8 */ DWORD unknown001854; -/* 0x1cfc */ DWORD unknown001855; -/* 0x1d00 */ DWORD unknown001856; -/* 0x1d04 */ DWORD unknown001857; -/* 0x1d08 */ DWORD unknown001858; -/* 0x1d0c */ DWORD unknown001859; -/* 0x1d10 */ DWORD unknown001860; -/* 0x1d14 */ DWORD unknown001861; -/* 0x1d18 */ DWORD unknown001862; -/* 0x1d1c */ DWORD unknown001863; -/* 0x1d20 */ DWORD unknown001864; -/* 0x1d24 */ DWORD unknown001865; -/* 0x1d28 */ DWORD unknown001866; -/* 0x1d2c */ DWORD unknown001867; -/* 0x1d30 */ DWORD unknown001868; -/* 0x1d34 */ DWORD unknown001869; -/* 0x1d38 */ DWORD unknown001870; -/* 0x1d3c */ DWORD unknown001871; -/* 0x1d40 */ DWORD unknown001872; -/* 0x1d44 */ DWORD unknown001873; -/* 0x1d48 */ DWORD unknown001874; -/* 0x1d4c */ DWORD unknown001875; -/* 0x1d50 */ DWORD unknown001876; -/* 0x1d54 */ DWORD unknown001877; -/* 0x1d58 */ DWORD unknown001878; -/* 0x1d5c */ DWORD unknown001879; -/* 0x1d60 */ DWORD unknown001880; -/* 0x1d64 */ DWORD unknown001881; -/* 0x1d68 */ DWORD unknown001882; -/* 0x1d6c */ DWORD unknown001883; -/* 0x1d70 */ DWORD unknown001884; -/* 0x1d74 */ DWORD unknown001885; -/* 0x1d78 */ DWORD unknown001886; -/* 0x1d7c */ DWORD unknown001887; -/* 0x1d80 */ DWORD unknown001888; -/* 0x1d84 */ DWORD unknown001889; -/* 0x1d88 */ DWORD unknown001890; -/* 0x1d8c */ DWORD unknown001891; -/* 0x1d90 */ DWORD unknown001892; -/* 0x1d94 */ DWORD unknown001893; -/* 0x1d98 */ DWORD unknown001894; -/* 0x1d9c */ DWORD unknown001895; -/* 0x1da0 */ DWORD unknown001896; -/* 0x1da4 */ DWORD unknown001897; -/* 0x1da8 */ DWORD unknown001898; -/* 0x1dac */ DWORD unknown001899; -/* 0x1db0 */ DWORD unknown001900; -/* 0x1db4 */ DWORD unknown001901; -/* 0x1db8 */ DWORD unknown001902; -/* 0x1dbc */ DWORD unknown001903; -/* 0x1dc0 */ DWORD unknown001904; -/* 0x1dc4 */ DWORD unknown001905; -/* 0x1dc8 */ DWORD unknown001906; -/* 0x1dcc */ DWORD unknown001907; -/* 0x1dd0 */ DWORD unknown001908; -/* 0x1dd4 */ DWORD unknown001909; -/* 0x1dd8 */ DWORD unknown001910; -/* 0x1ddc */ DWORD unknown001911; -/* 0x1de0 */ DWORD unknown001912; -/* 0x1de4 */ DWORD unknown001913; -/* 0x1de8 */ DWORD unknown001914; -/* 0x1dec */ DWORD unknown001915; -/* 0x1df0 */ DWORD unknown001916; -/* 0x1df4 */ DWORD unknown001917; -/* 0x1df8 */ DWORD unknown001918; -/* 0x1dfc */ DWORD unknown001919; -/* 0x1e00 */ DWORD unknown001920; -/* 0x1e04 */ DWORD unknown001921; -/* 0x1e08 */ DWORD unknown001922; -/* 0x1e0c */ DWORD unknown001923; -/* 0x1e10 */ DWORD unknown001924; -/* 0x1e14 */ DWORD unknown001925; -/* 0x1e18 */ DWORD unknown001926; -/* 0x1e1c */ DWORD unknown001927; -/* 0x1e20 */ DWORD unknown001928; -/* 0x1e24 */ DWORD unknown001929; -/* 0x1e28 */ DWORD unknown001930; -/* 0x1e2c */ DWORD unknown001931; -/* 0x1e30 */ DWORD unknown001932; -/* 0x1e34 */ DWORD unknown001933; -/* 0x1e38 */ DWORD unknown001934; -/* 0x1e3c */ DWORD unknown001935; -/* 0x1e40 */ DWORD unknown001936; -/* 0x1e44 */ DWORD unknown001937; -/* 0x1e48 */ DWORD unknown001938; -/* 0x1e4c */ DWORD unknown001939; -/* 0x1e50 */ DWORD unknown001940; -/* 0x1e54 */ DWORD unknown001941; -/* 0x1e58 */ DWORD unknown001942; -/* 0x1e5c */ DWORD unknown001943; -/* 0x1e60 */ DWORD unknown001944; -/* 0x1e64 */ DWORD unknown001945; -/* 0x1e68 */ DWORD unknown001946; -/* 0x1e6c */ DWORD unknown001947; -/* 0x1e70 */ DWORD unknown001948; -/* 0x1e74 */ DWORD unknown001949; -/* 0x1e78 */ DWORD unknown001950; -/* 0x1e7c */ DWORD unknown001951; -/* 0x1e80 */ DWORD unknown001952; -/* 0x1e84 */ DWORD unknown001953; -/* 0x1e88 */ DWORD unknown001954; -/* 0x1e8c */ DWORD unknown001955; -/* 0x1e90 */ DWORD unknown001956; -/* 0x1e94 */ DWORD unknown001957; -/* 0x1e98 */ DWORD unknown001958; -/* 0x1e9c */ DWORD unknown001959; -/* 0x1ea0 */ DWORD unknown001960; -/* 0x1ea4 */ DWORD unknown001961; -/* 0x1ea8 */ DWORD unknown001962; -/* 0x1eac */ DWORD unknown001963; -/* 0x1eb0 */ DWORD unknown001964; -/* 0x1eb4 */ DWORD unknown001965; -/* 0x1eb8 */ DWORD unknown001966; -/* 0x1ebc */ DWORD unknown001967; -/* 0x1ec0 */ DWORD unknown001968; -/* 0x1ec4 */ DWORD unknown001969; -/* 0x1ec8 */ DWORD unknown001970; -/* 0x1ecc */ DWORD unknown001971; -/* 0x1ed0 */ DWORD unknown001972; -/* 0x1ed4 */ DWORD unknown001973; -/* 0x1ed8 */ DWORD unknown001974; -/* 0x1edc */ DWORD unknown001975; -/* 0x1ee0 */ DWORD unknown001976; -/* 0x1ee4 */ DWORD unknown001977; -/* 0x1ee8 */ DWORD unknown001978; -/* 0x1eec */ DWORD unknown001979; -/* 0x1ef0 */ DWORD unknown001980; -/* 0x1ef4 */ DWORD unknown001981; -/* 0x1ef8 */ DWORD unknown001982; -/* 0x1efc */ DWORD unknown001983; -/* 0x1f00 */ DWORD unknown001984; -/* 0x1f04 */ DWORD unknown001985; -/* 0x1f08 */ DWORD unknown001986; -/* 0x1f0c */ DWORD unknown001987; -/* 0x1f10 */ DWORD unknown001988; -/* 0x1f14 */ DWORD unknown001989; -/* 0x1f18 */ DWORD unknown001990; -/* 0x1f1c */ DWORD unknown001991; -/* 0x1f20 */ DWORD unknown001992; -/* 0x1f24 */ DWORD unknown001993; -/* 0x1f28 */ DWORD unknown001994; -/* 0x1f2c */ DWORD unknown001995; -/* 0x1f30 */ DWORD unknown001996; -/* 0x1f34 */ DWORD unknown001997; -/* 0x1f38 */ DWORD unknown001998; -/* 0x1f3c */ DWORD unknown001999; -/* 0x1f40 */ DWORD unknown002000; -/* 0x1f44 */ DWORD unknown002001; -/* 0x1f48 */ DWORD unknown002002; -/* 0x1f4c */ DWORD unknown002003; -/* 0x1f50 */ DWORD unknown002004; -/* 0x1f54 */ DWORD unknown002005; -/* 0x1f58 */ DWORD unknown002006; -/* 0x1f5c */ DWORD unknown002007; -/* 0x1f60 */ DWORD unknown002008; -/* 0x1f64 */ DWORD unknown002009; -/* 0x1f68 */ DWORD unknown002010; -/* 0x1f6c */ DWORD unknown002011; -/* 0x1f70 */ DWORD unknown002012; -/* 0x1f74 */ DWORD unknown002013; -/* 0x1f78 */ DWORD unknown002014; -/* 0x1f7c */ DWORD unknown002015; -/* 0x1f80 */ DWORD unknown002016; -/* 0x1f84 */ DWORD unknown002017; -/* 0x1f88 */ DWORD unknown002018; -/* 0x1f8c */ DWORD unknown002019; -/* 0x1f90 */ DWORD unknown002020; -/* 0x1f94 */ DWORD unknown002021; -/* 0x1f98 */ DWORD unknown002022; -/* 0x1f9c */ DWORD unknown002023; -/* 0x1fa0 */ DWORD unknown002024; -/* 0x1fa4 */ DWORD unknown002025; -/* 0x1fa8 */ DWORD unknown002026; -/* 0x1fac */ DWORD unknown002027; -/* 0x1fb0 */ DWORD unknown002028; -/* 0x1fb4 */ DWORD unknown002029; -/* 0x1fb8 */ DWORD unknown002030; -/* 0x1fbc */ DWORD unknown002031; -/* 0x1fc0 */ DWORD unknown002032; -/* 0x1fc4 */ DWORD unknown002033; -/* 0x1fc8 */ DWORD unknown002034; -/* 0x1fcc */ DWORD unknown002035; -/* 0x1fd0 */ DWORD unknown002036; -/* 0x1fd4 */ DWORD unknown002037; -/* 0x1fd8 */ DWORD unknown002038; -/* 0x1fdc */ DWORD unknown002039; -/* 0x1fe0 */ DWORD unknown002040; -/* 0x1fe4 */ DWORD unknown002041; -/* 0x1fe8 */ DWORD unknown002042; -/* 0x1fec */ DWORD unknown002043; -/* 0x1ff0 */ DWORD unknown002044; -/* 0x1ff4 */ DWORD unknown002045; -/* 0x1ff8 */ DWORD unknown002046; -/* 0x1ffc */ DWORD unknown002047; -/* 0x2000 */ DWORD unknown002048; -/* 0x2004 */ DWORD unknown002049; -/* 0x2008 */ DWORD unknown002050; -/* 0x200c */ DWORD unknown002051; -/* 0x2010 */ DWORD unknown002052; -/* 0x2014 */ DWORD unknown002053; -/* 0x2018 */ DWORD unknown002054; -/* 0x201c */ DWORD unknown002055; -/* 0x2020 */ DWORD unknown002056; -/* 0x2024 */ DWORD unknown002057; -/* 0x2028 */ DWORD unknown002058; -/* 0x202c */ DWORD unknown002059; -/* 0x2030 */ DWORD unknown002060; -/* 0x2034 */ DWORD unknown002061; -/* 0x2038 */ DWORD unknown002062; -/* 0x203c */ DWORD unknown002063; -/* 0x2040 */ DWORD unknown002064; -/* 0x2044 */ DWORD unknown002065; -/* 0x2048 */ DWORD unknown002066; -/* 0x204c */ DWORD unknown002067; -/* 0x2050 */ DWORD unknown002068; -/* 0x2054 */ DWORD unknown002069; -/* 0x2058 */ DWORD unknown002070; -/* 0x205c */ DWORD unknown002071; -/* 0x2060 */ DWORD unknown002072; -/* 0x2064 */ DWORD unknown002073; -/* 0x2068 */ DWORD unknown002074; -/* 0x206c */ DWORD unknown002075; -/* 0x2070 */ DWORD unknown002076; -/* 0x2074 */ DWORD unknown002077; -/* 0x2078 */ DWORD unknown002078; -/* 0x207c */ DWORD unknown002079; -/* 0x2080 */ DWORD unknown002080; -/* 0x2084 */ DWORD unknown002081; -/* 0x2088 */ DWORD unknown002082; -/* 0x208c */ DWORD unknown002083; -/* 0x2090 */ DWORD unknown002084; -/* 0x2094 */ DWORD unknown002085; -/* 0x2098 */ DWORD unknown002086; -/* 0x209c */ DWORD unknown002087; -/* 0x20a0 */ DWORD unknown002088; -/* 0x20a4 */ DWORD unknown002089; -/* 0x20a8 */ DWORD unknown002090; -/* 0x20ac */ DWORD unknown002091; -/* 0x20b0 */ DWORD unknown002092; -/* 0x20b4 */ DWORD unknown002093; -/* 0x20b8 */ DWORD unknown002094; -/* 0x20bc */ DWORD unknown002095; -/* 0x20c0 */ DWORD unknown002096; -/* 0x20c4 */ DWORD unknown002097; -/* 0x20c8 */ DWORD unknown002098; -/* 0x20cc */ DWORD unknown002099; -/* 0x20d0 */ DWORD unknown002100; -/* 0x20d4 */ DWORD unknown002101; -/* 0x20d8 */ DWORD unknown002102; -/* 0x20dc */ DWORD unknown002103; -/* 0x20e0 */ DWORD unknown002104; -/* 0x20e4 */ DWORD unknown002105; -/* 0x20e8 */ DWORD unknown002106; -/* 0x20ec */ DWORD unknown002107; -/* 0x20f0 */ DWORD unknown002108; -/* 0x20f4 */ DWORD unknown002109; -/* 0x20f8 */ DWORD unknown002110; -/* 0x20fc */ DWORD unknown002111; +/* 0x0030 */ Direct3D9DisplayAdapterInfo_INT DisplayAdapters[DX_D3D9_MAX_NUM_ADAPTERS]; /* 0x2100 */ DWORD unknown002112; /* 0x2104 */ DWORD unknown002113; /* 0x2108 */ DWORD unknown002114; @@ -4184,7 +2611,7 @@ /* 0x47a8 */ DWORD unknown004586; /* 0x47ac */ DWORD unknown004587; /* 0x47b0 */ DWORD unknown004588; -/* 0x47b4 */ DWORD unknown004589; /*? 0x00000020 */ +/* 0x47b4 */ UINT SDKVersion; } DIRECT3D9_INT, *LPDIRECT3D9_INT; #endif // _D3D9_PRIVATE_H_

16 years, 7 months

[cwittich] 32023: add newline before eof

by cwittich＠svn.reactos.org

Author: cwittich Date: Sat Jan 26 22:27:43 2008 New Revision: 32023 URL: http://svn.reactos.org/svn/reactos?rev=32023&view=rev Log: add newline before eof Modified: trunk/reactos/dll/cpl/intl/rsrc.rc Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=3… ============================================================================== --- trunk/reactos/dll/cpl/intl/rsrc.rc (original) +++ trunk/reactos/dll/cpl/intl/rsrc.rc Sat Jan 26 22:27:43 2008 @@ -19,4 +19,4 @@ #include "lang/ja-JP.rc" #include "lang/nl-NL.rc" #include "lang/sv-SE.rc" -*/ +*/

16 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
54
Older →

Jump to page: