Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 37488: - Merge misaligned reads support (35998, 36834 by Art) from arty-newcc branch.
by fireball＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: fireball Date: Thu Nov 20 14:02:36 2008 New Revision: 37488 URL: http://svn.reactos.org/svn/reactos?rev=37488&view=rev Log: - Merge misaligned reads support (35998, 36834 by Art) from arty-newcc branch. Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c Modified: trunk/reactos/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/rw.c [iso-8859-1] Thu Nov 20 14:02:36 2008 @@ -76,14 +76,23 @@ { LARGE_INTEGER FileOffset; IO_STATUS_BLOCK IoStatus; + CC_FILE_SIZES FileSizes; if (ReadOffset + Length > Fcb->Entry.DataLengthL) Length = Fcb->Entry.DataLengthL - ReadOffset; if (FileObject->PrivateCacheMap == NULL) { + FileSizes.AllocationSize = Fcb->RFCB.AllocationSize; + FileSizes.FileSize = Fcb->RFCB.FileSize; + FileSizes.ValidDataLength = Fcb->RFCB.ValidDataLength; + + DPRINT("Attach FCB to File: Size %08x%08x\n", + Fcb->RFCB.ValidDataLength.HighPart, + Fcb->RFCB.ValidDataLength.LowPart); + CcInitializeCacheMap(FileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + &FileSizes, FALSE, &(CdfsGlobalData->CacheMgrCallbacks), Fcb); @@ -103,25 +112,65 @@ if ((ReadOffset % BLOCKSIZE) != 0 || (Length % BLOCKSIZE) != 0) { - return STATUS_INVALID_PARAMETER; - } - - if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) - Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; - - Status = CdfsReadSectors(DeviceExt->StorageDevice, - Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), - Length / BLOCKSIZE, - Buffer, - FALSE); - if (NT_SUCCESS(Status)) - { - *LengthRead = Length; - if (Length + ReadOffset > Fcb->Entry.DataLengthL) - { - memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, - 0, - Length + ReadOffset - Fcb->Entry.DataLengthL); + /* Then we need to do a partial or misaligned read ... */ + PVOID PageBuf = ExAllocatePool(NonPagedPool, BLOCKSIZE); + PCHAR ReadInPage = (PCHAR)PageBuf + (ReadOffset & (BLOCKSIZE - 1)); + PCHAR TargetRead = (PCHAR)Buffer; + ULONG ActualReadOffset, EndOfExtent, ReadLen; + + if (!PageBuf) + { + return STATUS_NO_MEMORY; + } + + ActualReadOffset = ReadOffset & ~(BLOCKSIZE - 1); + EndOfExtent = ReadOffset + Length; + + while (ActualReadOffset < EndOfExtent) + { + Status = CdfsReadSectors + (DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ActualReadOffset / BLOCKSIZE), + 1, + PageBuf, + FALSE); + + if (!NT_SUCCESS(Status)) + break; + + ReadLen = BLOCKSIZE - (ActualReadOffset & (BLOCKSIZE - 1)); + if (ReadLen > EndOfExtent - ActualReadOffset) + { + ReadLen = EndOfExtent - ActualReadOffset; + } + + RtlCopyMemory(TargetRead, ReadInPage, ReadLen); + + ActualReadOffset += ReadLen; + TargetRead += ReadLen; + } + + ExFreePool(PageBuf); + } + else + { + if (ReadOffset + Length > ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE)) + Length = ROUND_UP(Fcb->Entry.DataLengthL, BLOCKSIZE) - ReadOffset; + + Status = CdfsReadSectors(DeviceExt->StorageDevice, + Fcb->Entry.ExtentLocationL + (ReadOffset / BLOCKSIZE), + Length / BLOCKSIZE, + Buffer, + FALSE); + if (NT_SUCCESS(Status)) + { + *LengthRead = Length; + if (Length + ReadOffset > Fcb->Entry.DataLengthL) + { + memset(Buffer + Fcb->Entry.DataLengthL - ReadOffset, + 0, + Length + ReadOffset - Fcb->Entry.DataLengthL); + } } }

1 0

[dgoette] 37487: implement new entry 'page & content' generation
by dgoette＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: dgoette Date: Thu Nov 20 13:25:28 2008 New Revision: 37487 URL: http://svn.reactos.org/svn/reactos?rev=37487&view=rev Log: implement new entry 'page & content' generation Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Thu Nov 20 13:25:28 2008 @@ -529,13 +529,11 @@ * @return bool * @access public */ - public static function add( $show_output = false, $dynamic_content = false, $entry_status = 'draft', $layout_template = '') + public static function add($data_type = null, $lang = null, $show_output = false, $dynamic_content = false, $entry_status = 'draft', $layout_template = '') { global $roscms_intern_account_id; $data_name = @htmlspecialchars($_GET['d_name']); - $data_type = @$_GET['d_type']; - $lang = @$_GET['d_r_lang']; $stmt=DBConnection::getInstance()->prepare("SELECT data_id FROM data_ WHERE data_name = :name AND data_type = :type LIMIT 1"); $stmt->bindParam('name',$data_name,PDO::PARAM_STR); @@ -599,8 +597,8 @@ $stmt->execute(); } - if ($layout_template != '' && $layout_template != 'no') { - $content = " '[#templ_".$layout_template."]' "; + if ($layout_template != '' && $layout_template != 'none') { + $content = '[#templ_'.$layout_template.']'; } else { $content = ''; @@ -645,12 +643,7 @@ new Editor_Website($data_id, $rev_id, 'show'); } } - - // nothing todo, even revision entry is already there - elseif ($show_output == true) { - echo '<p>Entry already exist.</p>'; - Editor_Website::showAddEntry(); - } + } // end of member function getCookieDomain Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Thu Nov 20 13:25:28 2008 @@ -48,6 +48,7 @@ protected function evalAction( $action ) { global $roscms_security_level; + global $roscms_standard_language; global $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4; global $RosCMS_GET_d_id, $RosCMS_GET_d_r_id; global $RosCMS_GET_d_r_lang; @@ -78,18 +79,18 @@ // single entry - save entry case 'newentry2': - Data::add(true, false); + Data::add(@$_GET['d_type'], @$_GET['d_r_lang'],true); break; // dynamic entry - save entry case 'newentry4': - Data::add(true, true); + Data::add('content', $roscms_standard_language,true, true); break; // page & content - save entry case 'newentry3': - Data::add(false, false, 'stable', htmlspecialchars(@$_GET['d_template'])); - Data::add(true); + Data::add('page', $roscms_standard_language, false, false, 'stable', htmlspecialchars(@$_GET['d_template'])); + Data::add('content', $roscms_standard_language, true); break; // show Metadata details

1 0

[sginsberg] 37486: - Fix "missing newling" warning
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 13:00:17 2008 New Revision: 37486 URL: http://svn.reactos.org/svn/reactos?rev=37486&view=rev Log: - Fix "missing newling" warning Modified: trunk/reactos/include/psdk/dsgetdc.h Modified: trunk/reactos/include/psdk/dsgetdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dsgetdc.h?rev… ============================================================================== --- trunk/reactos/include/psdk/dsgetdc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dsgetdc.h [iso-8859-1] Thu Nov 20 13:00:17 2008 @@ -109,4 +109,4 @@ #ifdef __cplusplus } #endif -#endif +#endif

1 0

[sginsberg] 37485: - Remove more instances of system_header
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 09:30:15 2008 New Revision: 37485 URL: http://svn.reactos.org/svn/reactos?rev=37485&view=rev Log: - Remove more instances of system_header Modified: trunk/reactos/include/psdk/objfwd.h trunk/reactos/include/psdk/odbcinst.h trunk/reactos/include/psdk/ole.h trunk/reactos/include/psdk/oleacc.h trunk/reactos/include/psdk/olectlid.h Modified: trunk/reactos/include/psdk/objfwd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/objfwd.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/objfwd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/objfwd.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OBJFWD_H #define _OBJFWD_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #include <basetyps.h> Modified: trunk/reactos/include/psdk/odbcinst.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/odbcinst.h?re… ============================================================================== --- trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/odbcinst.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,6 @@ #ifndef _ODBCINST_H #define _ODBCINST_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif + #include <sql.h> #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/ole.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ole.h?rev=374… ============================================================================== --- trunk/reactos/include/psdk/ole.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ole.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLE_H #define _OLE_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/oleacc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/oleacc.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/oleacc.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/oleacc.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLEACC_H #define _OLEACC_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { Modified: trunk/reactos/include/psdk/olectlid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/olectlid.h?re… ============================================================================== --- trunk/reactos/include/psdk/olectlid.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/olectlid.h [iso-8859-1] Thu Nov 20 09:30:15 2008 @@ -1,8 +1,5 @@ #ifndef _OLECTLID_H #define _OLECTLID_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" {

1 0

[jimtabor] 37484: - Add Section support for CreateDIBSection. Section support was disabled from the first time it was committed at revision 1753.
by jimtabor＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: jimtabor Date: Thu Nov 20 09:11:43 2008 New Revision: 37484 URL: http://svn.reactos.org/svn/reactos?rev=37484&view=rev Log: - Add Section support for CreateDIBSection. Section support was disabled from the first time it was committed at revision 1753. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Nov 20 09:11:43 2008 @@ -404,7 +404,7 @@ _SEH_TRY // Look at NtGdiStretchDIBitsInternal { SourceSize.cx = bmi->bmiHeader.biWidth; - SourceSize.cy = ScanLines; + SourceSize.cy = ScanLines; // this one --> abs(bmi->bmiHeader.biHeight) - StartScan DIBWidth = DIB_GetDIBWidthBytes(SourceSize.cx, bmi->bmiHeader.biBitCount); ProbeForRead(Bits, DIBWidth * abs(bmi->bmiHeader.biHeight), 1); @@ -479,8 +479,8 @@ if (NT_SUCCESS(Status)) { - /* FIXME: Should probably be only the number of lines actually copied */ - ret = ScanLines; + /* FIXME: Should probably be only the number of lines actually copied */ + ret = ScanLines; // this one --> abs(Info->bmiHeader.biHeight) - StartScan; } if (pSourceSurf) EngUnlockSurface(pSourceSurf); @@ -555,7 +555,7 @@ coreheader->bcWidth = BitmapObj->SurfObj.sizlBitmap.cx; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - /* Resulting height may be smaller than original height */ + /* Resulting height may be smaller than original height */ // You think! coreheader->bcHeight = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); coreheader->bcSize = DIB_GetDIBWidthBytes(coreheader->bcWidth, coreheader->bcBitCount) * coreheader->bcHeight; @@ -566,6 +566,8 @@ if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) { ProbeForWrite(Info, sizeof(BITMAPINFO), 1); + + if (!ScanLines) ScanLines = abs(Info->bmiHeader.biHeight) - StartScan; Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; /* Resulting height may be smaller than original height */ @@ -683,16 +685,18 @@ if (bPaletteMatch) PALETTE_UnlockPalette(DestPalette); + if (!ScanLines) ScanLines = abs(Info->bmiHeader.biHeight) - StartScan; + /* Create the destination bitmap to for the copy operation */ if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) { _SEH_YIELD(goto cleanup); } else - { + { // Here again! ScanLine can be zero! ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; - DestSize.cy = ScanLines; + DestSize.cy = ScanLines; // this one ---> abs(Info->bmiHeader.biHeight) - StartScan; hDestBitmap = NULL; @@ -762,6 +766,8 @@ &DestRect, &SourcePoint)) { + DPRINT("GetDIBits %d \n",abs(Info->bmiHeader.biHeight) - StartScan); +// Result = abs(Info->bmiHeader.biHeight) - StartScan; Result = ScanLines; } @@ -1131,6 +1137,7 @@ HBITMAP res = 0; BITMAPOBJ *bmp = NULL; DIBSECTION *dib = NULL; + void *mapBits = NULL; // Fill BITMAP32 structure with DIB data BITMAPINFOHEADER *bi = &bmi->bmiHeader; @@ -1167,17 +1174,50 @@ if (section) { -/* bm.bmBits = MapViewOfFile(section, FILE_MAP_ALL_ACCESS, - 0L, offset, totalSize); */ - DbgPrint("DIB_CreateDIBSection: Cannot yet handle section DIBs\n"); - SetLastWin32Error(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + SYSTEM_BASIC_INFORMATION Sbi; + NTSTATUS Status; + DWORD mapOffset; + LARGE_INTEGER SectionOffset; + SIZE_T mapSize; + + Status = ZwQuerySystemInformation ( SystemBasicInformation, + &Sbi, + sizeof Sbi, + 0); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + mapOffset = offset - (offset % Sbi.AllocationGranularity); + mapSize = dib->dsBmih.biSizeImage + (offset - mapOffset); + + SectionOffset.LowPart = mapOffset; + SectionOffset.HighPart = 0; + + Status = ZwMapViewOfSection ( section, + NtCurrentProcess(), + &mapBits, + 0, + 0, + &SectionOffset, + &mapSize, + ViewShare, + 0, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + return NULL; + } + + if (mapBits) bm.bmBits = (char *)mapBits + (offset - mapOffset); } else if (ovr_pitch && offset) bm.bmBits = (LPVOID) offset; - else { - offset = 0; - bm.bmBits = EngAllocUserMem(totalSize, 0); + else + { + offset = 0; + bm.bmBits = EngAllocUserMem( totalSize, 0 ); } if(usage == DIB_PAL_COLORS) @@ -1202,20 +1242,16 @@ } else switch(bi->biBitCount) { + case 15: case 16: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0x7c00; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x03e0; dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x001f; break; case 24: - dib->dsBitfields[0] = 0xff0000; - dib->dsBitfields[1] = 0x00ff00; - dib->dsBitfields[2] = 0x0000ff; - break; - case 32: - dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; + dib->dsBitfields[0] = (bi->biCompression == BI_BITFIELDS) ? *(DWORD *)lpRGB : 0xff0000; dib->dsBitfields[1] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 1) : 0x00ff00; dib->dsBitfields[2] = (bi->biCompression == BI_BITFIELDS) ? *((DWORD *)lpRGB + 2) : 0x0000ff; break; @@ -1226,38 +1262,41 @@ // Create Device Dependent Bitmap and add DIB pointer Size.cx = bm.bmWidth; Size.cy = abs(bm.bmHeight); - res = IntCreateBitmap(Size, bm.bmWidthBytes, - BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), - BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | - (bi->biHeight < 0 ? BMF_TOPDOWN : 0), - bm.bmBits); - if (! res) - { + res = IntCreateBitmap( Size, + bm.bmWidthBytes, + BitmapFormat(bi->biBitCount * bi->biPlanes, bi->biCompression), + BMF_DONTCACHE | BMF_USERMEM | BMF_NOZEROINIT | + (bi->biHeight < 0 ? BMF_TOPDOWN : 0), + bm.bmBits); + if ( !res ) + { if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } SetLastWin32Error(ERROR_NO_SYSTEM_RESOURCES); return NULL; - } + } bmp = BITMAPOBJ_LockBitmap(res); if (NULL == bmp) - { + { if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } SetLastWin32Error(ERROR_INVALID_HANDLE); NtGdiDeleteObject(bmp); return NULL; - } + } bmp->dib = (DIBSECTION *) dib; bmp->flFlags = BITMAPOBJ_IS_APIBITMAP; - /* WINE NOTE: WINE makes use of a colormap, which is a color translation table between the DIB and the X physical - device. Obviously, this is left out of the ReactOS implementation. Instead, we call - NtGdiSetDIBColorTable. */ + /* WINE NOTE: WINE makes use of a colormap, which is a color translation + table between the DIB and the X physical device. Obviously, + this is left out of the ReactOS implementation. Instead, + we call NtGdiSetDIBColorTable. */ bi->biClrUsed = 0; + /* set number of entries in bmi.bmiColors table */ if(bi->biBitCount == 1) { bi->biClrUsed = 2; } else if(bi->biBitCount == 4) { bi->biClrUsed = 16; } else if(bi->biBitCount == 8) { bi->biClrUsed = 256; } @@ -1278,13 +1317,17 @@ if (!res || !bmp || !dib || !bm.bmBits) { DPRINT("got an error res=%08x, bmp=%p, dib=%p, bm.bmBits=%p\n", res, bmp, dib, bm.bmBits); -/* if (bm.bmBits) + if (bm.bmBits) { - if (section) - UnmapViewOfFile(bm.bmBits), bm.bmBits = NULL; - else if (!offset) - VirtualFree(bm.bmBits, 0L, MEM_RELEASE), bm.bmBits = NULL; - } */ + if (section) + { + ZwUnmapViewOfSection(NtCurrentProcess(), mapBits); + bm.bmBits = NULL; + } + else + if (!offset) + EngFreeUserMem(bm.bmBits), bm.bmBits = NULL; + } if (dib) { ExFreePoolWithTag(dib, TAG_DIB); dib = NULL; } if (bmp) { bmp = NULL; } @@ -1292,20 +1335,20 @@ } if (lpRGB != bmi->bmiColors) - { + { ExFreePoolWithTag(lpRGB, TAG_COLORMAP); - } + } if (bmp) - { + { BITMAPOBJ_UnlockBitmap(bmp); - } + } // Return BITMAP handle and storage location if (NULL != bm.bmBits && NULL != bits) - { + { *bits = bm.bmBits; - } + } return res; }

1 0

[sginsberg] 37483: - Correct a header guard
by sginsberg＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: sginsberg Date: Thu Nov 20 09:02:42 2008 New Revision: 37483 URL: http://svn.reactos.org/svn/reactos?rev=37483&view=rev Log: - Correct a header guard Modified: trunk/reactos/include/psdk/mlang.idl Modified: trunk/reactos/include/psdk/mlang.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.idl?rev… ============================================================================== --- trunk/reactos/include/psdk/mlang.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mlang.idl [iso-8859-1] Thu Nov 20 09:02:42 2008 @@ -23,7 +23,7 @@ interface IStream; /* FIXME: LANGID is defined in winnt.h and mlang.h in the platform SDK */ -cpp_quote("#ifndef _WINNT_") +cpp_quote("#ifndef _WINNT_H") typedef WORD LANGID; cpp_quote("#endif")

1 0

[dgoette] 37482: * fix more html issues * now adding entries is possible again * catch an additional error
by dgoette＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: dgoette Date: Thu Nov 20 07:14:38 2008 New Revision: 37482 URL: http://svn.reactos.org/svn/reactos?rev=37482&view=rev Log: * fix more html issues * now adding entries is possible again * catch an additional error Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Data.class.php [iso-8859-1] Thu Nov 20 07:14:38 2008 @@ -25,12 +25,6 @@ */ class Data { - - /** Aggregations: */ - - /** Compositions: */ - - /*** Attributes: ***/ /** @@ -535,9 +529,13 @@ * @return bool * @access public */ - public static function add( $data_name, $data_type, $lang, $show_output = false, $entry_status = 'draft', $layout_template = '', $dynamic_content = false) + public static function add( $show_output = false, $dynamic_content = false, $entry_status = 'draft', $layout_template = '') { global $roscms_intern_account_id; + + $data_name = @htmlspecialchars($_GET['d_name']); + $data_type = @$_GET['d_type']; + $lang = @$_GET['d_r_lang']; $stmt=DBConnection::getInstance()->prepare("SELECT data_id FROM data_ WHERE data_name = :name AND data_type = :type LIMIT 1"); $stmt->bindParam('name',$data_name,PDO::PARAM_STR); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Editor_Website.class.php [iso-8859-1] Thu Nov 20 07:14:38 2008 @@ -50,8 +50,8 @@ global $roscms_security_level; global $RosCMS_GET_d_value, $RosCMS_GET_d_value2, $RosCMS_GET_d_value3, $RosCMS_GET_d_value4; global $RosCMS_GET_d_id, $RosCMS_GET_d_r_id; - global $RosCMS_GET_d_name, $RosCMS_GET_d_type, $RosCMS_GET_d_r_lang; - + global $RosCMS_GET_d_r_lang; + switch ($action) { // create entry - show interface @@ -78,18 +78,18 @@ // single entry - save entry case 'newentry2': - Data::add($RosCMS_GET_d_name, $RosCMS_GET_d_type, $RosCMS_GET_d_r_lang, true, 'draft', '', false); + Data::add(true, false); break; // dynamic entry - save entry case 'newentry4': - Data::add($RosCMS_GET_d_name, $RosCMS_GET_d_type, $RosCMS_GET_d_r_lang, true, 'draft', '', true); + Data::add(true, true); break; // page & content - save entry case 'newentry3': - Data::add($RosCMS_GET_d_name, $RosCMS_GET_d_type, $RosCMS_GET_d_r_lang, false, 'stable', htmlspecialchars(@$_GET['d_template']), false); - Data::add($RosCMS_GET_d_name, $RosCMS_GET_d_type, $RosCMS_GET_d_r_lang, true); + Data::add(false, false, 'stable', htmlspecialchars(@$_GET['d_template'])); + Data::add(true); break; // show Metadata details @@ -225,8 +225,10 @@ $stmt->bindParam('date',date('Y-m-d'),PDO::PARAM_STR); $stmt->execute(); $translation = $stmt->fetchOnce(); - - $this->show( $translation['data_id'], $translation['rev_id'], $translation['rev_language'] ); + + $this->data_id = $translation['data_id']; + $this->rev_id = $translation['rev_id']; + $this->show(); } else { die('Translation not successful, due entry-copy problem. If this happens more than once or twice please contact the website admin.'); @@ -244,13 +246,8 @@ * * @access private */ - protected function show( $lang = null) - { - global $roscms_standard_language; - - // if no value is given, try to omnit GET vars - if ($lang === null) $lang = (isset($_GET['d_r_lang']) ? $_GET['d_r_lang'] : $roscms_standard_language); - + protected function show( ) + { $this->showEntryData(); $this->showEntryDetails(self::METADATA); echo '</div></div>'; // close elements opened in showEntryData @@ -421,7 +418,7 @@ * * @access protected */ - protected function showAddEntry($tmode = self::SINGLE) + public function showAddEntry($tmode = self::SINGLE) { echo_strip(' <div id="frmadd" style="border-bottom: 1px solid #bbb; border-right: 1px solid #bbb; background: #FFFFFF none repeat scroll 0%;"> @@ -436,7 +433,7 @@ else { echo '<span class="detailmenu" onclick="'."changecreateinterface('single')".'">Single Entry</span>'; } - echo " | "; + echo ' | '; // is dynamic if ($tmode == self::DYNAMIC) { @@ -445,7 +442,7 @@ else { echo '<span class="detailmenu" onclick="'."changecreateinterface('dynamic')".'">Dynamic Entry</span>'; } - echo " | "; + echo ' | '; // is page & content if ($tmode == self::TEMPLATE) { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/Export_QuickInfo.class.php [iso-8859-1] Thu Nov 20 07:14:38 2008 @@ -32,8 +32,7 @@ // check if everything was given, we need to get the quick info if (!isset($_GET['d_id']) || !isset($_GET['d_r_id'])) { - echo 'No entry was found.'; - return; + die('No entry was found.'); } $this->getInfo(); } @@ -58,6 +57,11 @@ $stmt->bindParam('rev_id',$_GET['d_r_id'],PDO::PARAM_INT); $stmt->execute(); $revision = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // abort if no entry was found + if ($revision === false) { + die('No entry was found.'); + } // helper vars $t_s = '<span style="color:#FF6600;">'; // tag start Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS.class.php [iso-8859-1] Thu Nov 20 07:14:38 2008 @@ -163,9 +163,9 @@ break; case 'website': - echo_strip('Quick Links: <a href="'.$roscms_intern_page_link.'data&branch=welcome#web_news_langgroup">Translation Group News</a> - | <a href="'.$roscms_intern_webserver_pages.'?page=tutorial_roscms" target="_blank">Text- & Video-Tutorials</a> - | <a href="'.$roscms_intern_webserver_pages.'/forum/viewforum.php?f=18" target="_blank">Website Forum</a>'); + echo_strip('Quick Links: <a href="'.$roscms_intern_page_link.'data&branch=welcome#web_news_langgroup">Translation Group News</a> + | <a href="'.$roscms_intern_webserver_pages.'?page=tutorial_roscms">Text- & Video-Tutorials</a> + | <a href="'.$roscms_intern_webserver_pages.'/forum/viewforum.php?f=18">Website Forum</a>'); break; case 'user': Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/HTML_CMS_Website.class.php [iso-8859-1] Thu Nov 20 07:14:38 2008 @@ -345,8 +345,8 @@ </div> </div> <br /> - <p><strong>Table Legend</strong></p> <table id="legend" cellspacing="5"> + <caption style="font-weight:bold;text-align:left;">Table Legend</caption> <tr> <td class="lbox" style="background-color:#ddd"> </td> <td style="width:205px" rowspan="2"> @@ -372,7 +372,7 @@ <td class="lbox" style="background-color:#FFE4C1"> </td> <td>Draft</td> <td class="lbox" style="background-color:#FAA5A5"> </td> - <td>Translation outdated</td> + <td>Translation outdated</td> </tr> <tr> <td class="lbox" style="background-color:#ffffcc"> </td>

1 0

[greatlrd] 37481: Cleanup lite for the dump functions for dumping internal value in ddraw.dll and add some new dumping function have been add.
by greatlrd＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: greatlrd Date: Thu Nov 20 06:25:27 2008 New Revision: 37481 URL: http://svn.reactos.org/svn/reactos?rev=37481&view=rev Log: Cleanup lite for the dump functions for dumping internal value in ddraw.dll and add some new dumping function have been add. Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Thu Nov 20 06:25:27 2008 @@ -5,10 +5,25 @@ #define MIX_BOTH_CAPS(a,b) ( (a + b - (a & b)) ) +/* Simple position the dump output bit better */ +#define MY_MAX_SPACE_LEN 70 + +#define MY_POS1_SPACE_LEN 30 +#define MY_POS2_SPACE_LEN 0 +char space_buffer[MY_MAX_SPACE_LEN+1]; + +#define MY_DUMP_STR(buffer,mStr,str,lpStr) sprintf(buffer,"%s%s%s%s%s", mStr,&space_buffer[ MY_POS1_SPACE_LEN + strlen(mStr) ], str,lpStr, &space_buffer[ MY_POS2_SPACE_LEN + (strlen(lpStr) + strlen(str)) ]); + +/* DirectDraw dump*/ void dump_DDRAWI_DIRECTDRAW_INT(char *str, LPDDRAWI_DIRECTDRAW_INT lpDraw_int, DWORD offset); void dump_DDRAWI_DIRECTDRAW_LCL(char *str, LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl, DWORD offset); void dump_DDRAWI_DIRECTDRAW_GBL(char *str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD offset); - +void dump_DDRAWI_DDRAWSURFACE_LCL(char *str, LPDDRAWI_DDRAWSURFACE_LCL lpDdrawSurface, DWORD offset); + +/* DirectDraw Surface dump*/ +void dump_DDRAWI_DDRAWSURFACE_INT(char *str, LPDDRAWI_DDRAWSURFACE_INT lpDdrawSurface, DWORD offset); + +/* DirectDraw misc dump*/ void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset); void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset); void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset); @@ -47,10 +62,21 @@ if (lpDraw_int == NULL) return ; - printf("%08lx LPVOID %slpVtbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl)+offset, str, lpDraw_int->lpVtbl); - printf("%08lx DWORD %s->lpLcl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl) + offset, str, lpDraw_int->lpLcl ); - printf("%08lx DWORD %s->lpLink : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink) + offset, str, lpDraw_int->lpLink ); - printf("%08lx DWORD %s->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt) + offset, str, lpDraw_int->dwIntRefCnt ); + RtlFillMemory(space_buffer,MY_MAX_SPACE_LEN,32); + space_buffer[MY_MAX_SPACE_LEN] = 0; + + + MY_DUMP_STR(buffer,"LPVOID\0",str,"lpVtbl\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl)+offset, buffer, lpDraw_int->lpVtbl); + + MY_DUMP_STR(buffer,"DWORD\0",str,"lpLcl\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl) + offset, buffer, lpDraw_int->lpLcl ); + + MY_DUMP_STR(buffer,"DWORD\0",str,"lpLink\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink) + offset, buffer, lpDraw_int->lpLink ); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwIntRefCnt\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt) + offset, buffer, lpDraw_int->dwIntRefCnt ); printf("\n"); sprintf(buffer,"%slpLcl->",str); @@ -67,36 +93,96 @@ if (lpDraw_lcl == NULL) return ; - printf("%08lx DWORD %slpDDMore : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore)+offset, str, lpDraw_lcl->lpDDMore); - printf("%08lx LPDDRAWI_DIRECTDRAW_GBL %slpGbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl)+offset, str, lpDraw_lcl->lpGbl); - printf("%08lx DWORD %sdwUnused0 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0)+offset, str, lpDraw_lcl->dwUnused0); - printf("%08lx DWORD %sdwLocalFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags)+offset, str, lpDraw_lcl->dwLocalFlags); - printf("%08lx DWORD %sdwLocalRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt)+offset, str, lpDraw_lcl->dwLocalRefCnt); - printf("%08lx DWORD %sdwProcessId : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId)+offset, str, lpDraw_lcl->dwProcessId); - printf("%08lx PVOID %spUnkOuter : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter)+offset, str, lpDraw_lcl->pUnkOuter); - printf("%08lx DWORD %sdwObsolete1 : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1)+offset, str, lpDraw_lcl->dwObsolete1); - printf("%08lx ULONG_PTR %shWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd)+offset, str, (PVOID)lpDraw_lcl->hWnd); - printf("%08lx ULONG_PTR %shDC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC)+offset, str, (PVOID) lpDraw_lcl->hDC); - printf("%08lx DWORD %sdwErrorMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode)+offset, str, lpDraw_lcl->dwErrorMode); - printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %slpPrimary : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary)+offset, str, lpDraw_lcl->lpPrimary); - printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %slpCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB)+offset, str, lpDraw_lcl->lpCB); - printf("%08lx DWORD %sdwPreferredMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode)+offset, str, lpDraw_lcl->dwPreferredMode); - printf("%08lx HINSTANCE %shD3DInstance : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance)+offset, str, lpDraw_lcl->hD3DInstance); - printf("%08lx PVOID %spD3DIUnknown : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown)+offset, str, (PVOID) lpDraw_lcl->pD3DIUnknown); - printf("%08lx LPDDHAL_CALLBACKS %slpDDCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB)+offset, str, lpDraw_lcl->lpDDCB); - printf("%08lx ULONG_PTR %shDDVxd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd)+offset, str, (PVOID) lpDraw_lcl->hDDVxd); - printf("%08lx DWORD %sdwAppHackFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags)+offset, str, lpDraw_lcl->dwAppHackFlags); - printf("%08lx ULONG_PTR %shFocusWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd)+offset, str, (PVOID) lpDraw_lcl->hFocusWnd); - printf("%08lx DWORD %sdwHotTracking : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking)+offset, str, lpDraw_lcl->dwHotTracking); - printf("%08lx DWORD %sdwIMEState : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState)+offset, str, lpDraw_lcl->dwIMEState); - printf("%08lx ULONG_PTR %shWndPopup : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup)+offset, str, (PVOID) lpDraw_lcl->hWndPopup); - printf("%08lx ULONG_PTR %shDD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD)+offset, str, (PVOID) lpDraw_lcl->hDD); - printf("%08lx ULONG_PTR %shGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator)+offset, str, (PVOID) lpDraw_lcl->hGammaCalibrator); - printf("%08lx LPDDGAMMACALIBRATORPROC %slpGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator)+offset, str, lpDraw_lcl->lpGammaCalibrator); + MY_DUMP_STR(buffer,"DWORD\0",str,"lpDDMore\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore)+offset, buffer, lpDraw_lcl->lpDDMore); + + MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_GBL\0",str,"lpGbl\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl)+offset, buffer, lpDraw_lcl->lpGbl); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused0\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0)+offset, buffer, lpDraw_lcl->dwUnused0); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalFlags\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags)+offset, buffer, lpDraw_lcl->dwLocalFlags); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalRefCnt\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt)+offset, buffer, lpDraw_lcl->dwLocalRefCnt); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwProcessId\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId)+offset, buffer, lpDraw_lcl->dwProcessId); + + MY_DUMP_STR(buffer,"PVOID\0",str,"pUnkOuter\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter)+offset, buffer, lpDraw_lcl->pUnkOuter); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwObsolete1\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1)+offset, buffer, lpDraw_lcl->dwObsolete1); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hWnd\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd)+offset, buffer, (PVOID)lpDraw_lcl->hWnd); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDC\0"); + printf("%08lx %shDC: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC)+offset, str, (PVOID) lpDraw_lcl->hDC); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwErrorMode\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode)+offset, buffer, lpDraw_lcl->dwErrorMode); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpPrimary\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary)+offset, buffer, lpDraw_lcl->lpPrimary); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpCB\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB)+offset, buffer, lpDraw_lcl->lpCB); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwPreferredMode\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode)+offset, buffer, lpDraw_lcl->dwPreferredMode); + + + + + MY_DUMP_STR(buffer,"HINSTANCE\0",str,"hD3DInstance\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance)+offset, buffer, lpDraw_lcl->hD3DInstance); + + MY_DUMP_STR(buffer,"PVOID\0",str,"pD3DIUnknown\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown)+offset, buffer, (PVOID) lpDraw_lcl->pD3DIUnknown); + + MY_DUMP_STR(buffer,"LPDDHAL_CALLBACKS\0",str,"lpDDCB\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB)+offset, buffer, lpDraw_lcl->lpDDCB); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDDVxd\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd)+offset, buffer, (PVOID) lpDraw_lcl->hDDVxd); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAppHackFlags\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags)+offset, buffer, lpDraw_lcl->dwAppHackFlags); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hFocusWnd\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd)+offset, buffer, (PVOID) lpDraw_lcl->hFocusWnd); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwHotTracking\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking)+offset, buffer, lpDraw_lcl->dwHotTracking); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwIMEState\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState)+offset, buffer, lpDraw_lcl->dwIMEState); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hWndPopu\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup)+offset, buffer, (PVOID) lpDraw_lcl->hWndPopup); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDD\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD)+offset, buffer, (PVOID) lpDraw_lcl->hDD); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hGammaCalibrator\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator)+offset, buffer, (PVOID) lpDraw_lcl->hGammaCalibrator); + + MY_DUMP_STR(buffer,"LPDDGAMMACALIBRATORPROC\0",str,"lpGammaCalibrator\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator)+offset, buffer, lpDraw_lcl->lpGammaCalibrator); + + printf("\n"); sprintf(buffer,"%slpGbl->",str); dump_DDRAWI_DIRECTDRAW_GBL(buffer, lpDraw_lcl->lpGbl, 0); + sprintf(buffer,"%slpPrimary->",str); + dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDraw_lcl->lpPrimary, 0); + sprintf(buffer,"%slpCB->",str); + dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDraw_lcl->lpCB, 0); } void dump_DDRAWI_DIRECTDRAW_GBL(char * str, LPDDRAWI_DIRECTDRAW_GBL lpDraw_gbl, DWORD offset) @@ -105,108 +191,283 @@ if (lpDraw_gbl == NULL) return ; - printf("%08lx DWORD %sdwRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwRefCnt) + offset, str, lpDraw_gbl->dwRefCnt); - printf("%08lx DWORD %sdwFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwFlags) + offset, str, lpDraw_gbl->dwFlags); - printf("%08lx FLATPTR %sfpPrimaryOrig : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, fpPrimaryOrig) + offset, str, (LPVOID)lpDraw_gbl->fpPrimaryOrig); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwRefCnt\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwRefCnt) + offset, buffer, lpDraw_gbl->dwRefCnt); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwFlags) + offset, buffer, lpDraw_gbl->dwFlags); + + MY_DUMP_STR(buffer,"FLATPTR\0",str,"fpPrimaryOrig\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, fpPrimaryOrig) + offset, buffer, (LPVOID)lpDraw_gbl->fpPrimaryOrig); sprintf(buffer,"%sddCaps.",str); dump_DDCORECAPS(buffer, &lpDraw_gbl->ddCaps, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddCaps) + offset ); - printf("%08lx DWORD %sdwInternal1 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwInternal1) + offset, str, lpDraw_gbl->dwInternal1); - printf("%08lx DWORD %sdwUnused1[0] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[0]) + offset, str, lpDraw_gbl->dwUnused1[0]); - printf("%08lx DWORD %sdwUnused1[1] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[1]) + offset, str, lpDraw_gbl->dwUnused1[1]); - printf("%08lx DWORD %sdwUnused1[2] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[2]) + offset, str, lpDraw_gbl->dwUnused1[2]); - printf("%08lx DWORD %sdwUnused1[3] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[3]) + offset, str, lpDraw_gbl->dwUnused1[3]); - printf("%08lx DWORD %sdwUnused1[4] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[4]) + offset, str, lpDraw_gbl->dwUnused1[4]); - printf("%08lx DWORD %sdwUnused1[5] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[5]) + offset, str, lpDraw_gbl->dwUnused1[5]); - printf("%08lx DWORD %sdwUnused1[6] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[6]) + offset, str, lpDraw_gbl->dwUnused1[6]); - printf("%08lx DWORD %sdwUnused1[7] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[7]) + offset, str, lpDraw_gbl->dwUnused1[7]); - printf("%08lx DWORD %sdwUnused1[8] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[8]) + offset, str, lpDraw_gbl->dwUnused1[8]); - printf("%08lx LPDDHAL_CALLBACKS %slpDDCBtmp : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDCBtmp) + offset, str, lpDraw_gbl->lpDDCBtmp); - printf("%08lx LPDDRAWI_DDRAWSURFACE_INT %sdsList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dsList) + offset, str, lpDraw_gbl->dsList); - printf("%08lx LPDDRAWI_DDRAWPALETTE_INT %spalList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, palList) + offset, str, lpDraw_gbl->palList); - printf("%08lx LPDDRAWI_DDRAWCLIPPER_INT %sclipperList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, clipperList) + offset, str, lpDraw_gbl->clipperList); - printf("%08lx LPDDRAWI_DIRECTDRAW_GBL %slp16DD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lp16DD) + offset, str, lpDraw_gbl->lp16DD); - printf("%08lx DWORD %sdwMaxOverlays : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMaxOverlays) + offset, str, lpDraw_gbl->dwMaxOverlays); - printf("%08lx DWORD %sdwCurrOverlays : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwCurrOverlays) + offset, str, lpDraw_gbl->dwCurrOverlays); - printf("%08lx DWORD %sdwMonitorFrequency : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMonitorFrequency) + offset, str, lpDraw_gbl->dwMonitorFrequency); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwInternal1\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwInternal1) + offset, buffer, lpDraw_gbl->dwInternal1); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[0]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[0]) + offset, buffer, lpDraw_gbl->dwUnused1[0]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[1]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[1]) + offset, buffer, lpDraw_gbl->dwUnused1[1]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[2]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[2]) + offset, buffer, lpDraw_gbl->dwUnused1[2]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[3]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[3]) + offset, buffer, lpDraw_gbl->dwUnused1[3]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[4]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[4]) + offset, buffer, lpDraw_gbl->dwUnused1[4]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[5]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[5]) + offset, buffer, lpDraw_gbl->dwUnused1[5]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[6]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[6]) + offset, buffer, lpDraw_gbl->dwUnused1[6]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[7]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[7]) + offset, buffer, lpDraw_gbl->dwUnused1[7]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused1[8]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused1[8]) + offset, buffer, lpDraw_gbl->dwUnused1[8]); + + MY_DUMP_STR(buffer,"LPDDHAL_CALLBACKS\0",str,"lpDDCBtmp[8]\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDDCBtmp) + offset, buffer, lpDraw_gbl->lpDDCBtmp); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"dsList\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dsList) + offset, buffer, lpDraw_gbl->dsList); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWPALETTE_INT\0",str,"palList\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, palList) + offset, buffer, lpDraw_gbl->palList); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWCLIPPER_INT\0",str,"clipperList\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, clipperList) + offset, buffer, lpDraw_gbl->clipperList); + + MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_GBL\0",str,"lp16DD\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lp16DD) + offset, buffer, lpDraw_gbl->lp16DD); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxOverlays\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMaxOverlays) + offset, buffer, lpDraw_gbl->dwMaxOverlays); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrOverlays\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwCurrOverlays) + offset, buffer, lpDraw_gbl->dwCurrOverlays); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMonitorFrequency\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwMonitorFrequency) + offset, buffer, lpDraw_gbl->dwMonitorFrequency); sprintf(buffer,"%sddHELCaps.",str); dump_DDCORECAPS(buffer, &lpDraw_gbl->ddHELCaps, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddHELCaps) + offset ); - printf("%08lx DWORD %sdwUnused2[0] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[0]) + offset, str, lpDraw_gbl->dwUnused2[0]); - printf("%08lx DWORD %sdwUnused2[1] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[1]) + offset, str, lpDraw_gbl->dwUnused2[1]); - printf("%08lx DWORD %sdwUnused2[2] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[2]) + offset, str, lpDraw_gbl->dwUnused2[2]); - printf("%08lx DWORD %sdwUnused2[3] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[3]) + offset, str, lpDraw_gbl->dwUnused2[3]); - printf("%08lx DWORD %sdwUnused2[4] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[4]) + offset, str, lpDraw_gbl->dwUnused2[4]); - printf("%08lx DWORD %sdwUnused2[5] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[5]) + offset, str, lpDraw_gbl->dwUnused2[5]); - printf("%08lx DWORD %sdwUnused2[6] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[6]) + offset, str, lpDraw_gbl->dwUnused2[6]); - printf("%08lx DWORD %sdwUnused2[7] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[7]) + offset, str, lpDraw_gbl->dwUnused2[7]); - printf("%08lx DWORD %sdwUnused2[8] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[8]) + offset, str, lpDraw_gbl->dwUnused2[8]); - printf("%08lx DWORD %sdwUnused2[9] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[9]) + offset, str, lpDraw_gbl->dwUnused2[9]); - printf("%08lx DWORD %sdwUnused2[10] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[10]) + offset, str, lpDraw_gbl->dwUnused2[10]); - printf("%08lx DWORD %sdwUnused2[11] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[11]) + offset, str, lpDraw_gbl->dwUnused2[11]); - printf("%08lx DWORD %sdwUnused2[12] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[12]) + offset, str, lpDraw_gbl->dwUnused2[12]); - printf("%08lx DWORD %sdwUnused2[13] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[13]) + offset, str, lpDraw_gbl->dwUnused2[13]); - printf("%08lx DWORD %sdwUnused2[14] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[14]) + offset, str, lpDraw_gbl->dwUnused2[14]); - printf("%08lx DWORD %sdwUnused2[15] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[15]) + offset, str, lpDraw_gbl->dwUnused2[15]); - printf("%08lx DWORD %sdwUnused2[16] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[16]) + offset, str, lpDraw_gbl->dwUnused2[16]); - printf("%08lx DWORD %sdwUnused2[17] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[17]) + offset, str, lpDraw_gbl->dwUnused2[17]); - printf("%08lx DWORD %sdwUnused2[18] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[18]) + offset, str, lpDraw_gbl->dwUnused2[18]); - printf("%08lx DWORD %sdwUnused2[19] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[19]) + offset, str, lpDraw_gbl->dwUnused2[19]); - printf("%08lx DWORD %sdwUnused2[20] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[20]) + offset, str, lpDraw_gbl->dwUnused2[20]); - printf("%08lx DWORD %sdwUnused2[21] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[21]) + offset, str, lpDraw_gbl->dwUnused2[21]); - printf("%08lx DWORD %sdwUnused2[22] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[22]) + offset, str, lpDraw_gbl->dwUnused2[22]); - printf("%08lx DWORD %sdwUnused2[23] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[23]) + offset, str, lpDraw_gbl->dwUnused2[23]); - printf("%08lx DWORD %sdwUnused2[24] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[24]) + offset, str, lpDraw_gbl->dwUnused2[24]); - printf("%08lx DWORD %sdwUnused2[25] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[25]) + offset, str, lpDraw_gbl->dwUnused2[25]); - printf("%08lx DWORD %sdwUnused2[26] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[26]) + offset, str, lpDraw_gbl->dwUnused2[26]); - printf("%08lx DWORD %sdwUnused2[27] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[27]) + offset, str, lpDraw_gbl->dwUnused2[27]); - printf("%08lx DWORD %sdwUnused2[28] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[28]) + offset, str, lpDraw_gbl->dwUnused2[28]); - printf("%08lx DWORD %sdwUnused2[29] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[29]) + offset, str, lpDraw_gbl->dwUnused2[29]); - printf("%08lx DWORD %sdwUnused2[30] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[30]) + offset, str, lpDraw_gbl->dwUnused2[30]); - printf("%08lx DWORD %sdwUnused2[31] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[31]) + offset, str, lpDraw_gbl->dwUnused2[31]); - printf("%08lx DWORD %sdwUnused2[32] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[32]) + offset, str, lpDraw_gbl->dwUnused2[32]); - printf("%08lx DWORD %sdwUnused2[33] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[33]) + offset, str, lpDraw_gbl->dwUnused2[33]); - printf("%08lx DWORD %sdwUnused2[34] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[34]) + offset, str, lpDraw_gbl->dwUnused2[34]); - printf("%08lx DWORD %sdwUnused2[35] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[35]) + offset, str, lpDraw_gbl->dwUnused2[35]); - printf("%08lx DWORD %sdwUnused2[36] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[36]) + offset, str, lpDraw_gbl->dwUnused2[36]); - printf("%08lx DWORD %sdwUnused2[37] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[37]) + offset, str, lpDraw_gbl->dwUnused2[37]); - printf("%08lx DWORD %sdwUnused2[38] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[38]) + offset, str, lpDraw_gbl->dwUnused2[38]); - printf("%08lx DWORD %sdwUnused2[39] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[39]) + offset, str, lpDraw_gbl->dwUnused2[39]); - printf("%08lx DWORD %sdwUnused2[40] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[40]) + offset, str, lpDraw_gbl->dwUnused2[40]); - printf("%08lx DWORD %sdwUnused2[41] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[41]) + offset, str, lpDraw_gbl->dwUnused2[41]); - printf("%08lx DWORD %sdwUnused2[42] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[42]) + offset, str, lpDraw_gbl->dwUnused2[42]); - printf("%08lx DWORD %sdwUnused2[43] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[43]) + offset, str, lpDraw_gbl->dwUnused2[43]); - printf("%08lx DWORD %sdwUnused2[44] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[44]) + offset, str, lpDraw_gbl->dwUnused2[44]); - printf("%08lx DWORD %sdwUnused2[45] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[45]) + offset, str, lpDraw_gbl->dwUnused2[45]); - printf("%08lx DWORD %sdwUnused2[46] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[46]) + offset, str, lpDraw_gbl->dwUnused2[46]); - printf("%08lx DWORD %sdwUnused2[47] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[47]) + offset, str, lpDraw_gbl->dwUnused2[47]); - printf("%08lx DWORD %sdwUnused2[48] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[48]) + offset, str, lpDraw_gbl->dwUnused2[48]); - printf("%08lx DWORD %sdwUnused2[49] : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[49]) + offset, str, lpDraw_gbl->dwUnused2[49]); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x00]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[0]) + offset, buffer, lpDraw_gbl->dwUnused2[0]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x01]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[1]) + offset, buffer, lpDraw_gbl->dwUnused2[1]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x02]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[2]) + offset, buffer, lpDraw_gbl->dwUnused2[2]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x03]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[3]) + offset, buffer, lpDraw_gbl->dwUnused2[3]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x04]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[4]) + offset, buffer, lpDraw_gbl->dwUnused2[4]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x05]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[5]) + offset, buffer, lpDraw_gbl->dwUnused2[5]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x06]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[6]) + offset, buffer, lpDraw_gbl->dwUnused2[6]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x07]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[7]) + offset, buffer, lpDraw_gbl->dwUnused2[7]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x08]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[8]) + offset, buffer, lpDraw_gbl->dwUnused2[8]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x09]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[9]) + offset, buffer, lpDraw_gbl->dwUnused2[9]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0A]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[10]) + offset, buffer, lpDraw_gbl->dwUnused2[10]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0B]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[11]) + offset, buffer, lpDraw_gbl->dwUnused2[11]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0C]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[12]) + offset, buffer, lpDraw_gbl->dwUnused2[12]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0D]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[13]) + offset, buffer, lpDraw_gbl->dwUnused2[13]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0E]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[14]) + offset, buffer, lpDraw_gbl->dwUnused2[14]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x0F]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[15]) + offset, buffer, lpDraw_gbl->dwUnused2[15]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x10]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[16]) + offset, buffer, lpDraw_gbl->dwUnused2[16]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x11]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[17]) + offset, buffer, lpDraw_gbl->dwUnused2[17]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x12]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[18]) + offset, buffer, lpDraw_gbl->dwUnused2[18]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x13]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[19]) + offset, buffer, lpDraw_gbl->dwUnused2[19]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x14]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[20]) + offset, buffer, lpDraw_gbl->dwUnused2[20]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x15]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[21]) + offset, buffer, lpDraw_gbl->dwUnused2[21]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x16]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[22]) + offset, buffer, lpDraw_gbl->dwUnused2[22]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x17]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[23]) + offset, buffer, lpDraw_gbl->dwUnused2[23]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x18]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[24]) + offset, buffer, lpDraw_gbl->dwUnused2[24]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x19]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[25]) + offset, buffer, lpDraw_gbl->dwUnused2[25]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1A]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[26]) + offset, buffer, lpDraw_gbl->dwUnused2[26]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1B]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[27]) + offset, buffer, lpDraw_gbl->dwUnused2[27]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1C]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[28]) + offset, buffer, lpDraw_gbl->dwUnused2[28]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1D]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[29]) + offset, buffer, lpDraw_gbl->dwUnused2[29]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1E]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[30]) + offset, buffer, lpDraw_gbl->dwUnused2[30]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x1F]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[31]) + offset, buffer, lpDraw_gbl->dwUnused2[31]); + + + + + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x20]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[32]) + offset, buffer, lpDraw_gbl->dwUnused2[32]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x21]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[33]) + offset, buffer, lpDraw_gbl->dwUnused2[33]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x22]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[34]) + offset, buffer, lpDraw_gbl->dwUnused2[34]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x23]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[35]) + offset, buffer, lpDraw_gbl->dwUnused2[35]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x24]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[36]) + offset, buffer, lpDraw_gbl->dwUnused2[36]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x25]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[37]) + offset, buffer, lpDraw_gbl->dwUnused2[37]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x26]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[38]) + offset, buffer, lpDraw_gbl->dwUnused2[38]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x27]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[39]) + offset, buffer, lpDraw_gbl->dwUnused2[39]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x28]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[40]) + offset, buffer, lpDraw_gbl->dwUnused2[40]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x29]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[41]) + offset, buffer, lpDraw_gbl->dwUnused2[41]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2A]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[42]) + offset, buffer, lpDraw_gbl->dwUnused2[42]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2B]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[43]) + offset, buffer, lpDraw_gbl->dwUnused2[43]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2C]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[44]) + offset, buffer, lpDraw_gbl->dwUnused2[44]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2D]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[45]) + offset, buffer, lpDraw_gbl->dwUnused2[45]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2E]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[46]) + offset, buffer, lpDraw_gbl->dwUnused2[46]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x2F]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[47]) + offset, buffer, lpDraw_gbl->dwUnused2[47]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x30]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[46]) + offset, buffer, lpDraw_gbl->dwUnused2[48]); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwUnused2[0x31]\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwUnused2[47]) + offset, buffer, lpDraw_gbl->dwUnused2[49]); + + //printf("%08lx DDCOLORKEY lpGbl->ddckCKDestOverlay : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKDestOverlay) + offset, str, lpDraw_gbl->ddckCKDestOverlay); //printf("%08lx DDCOLORKEY lpGbl->ddckCKSrcOverlay : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, ddckCKSrcOverlay) + offset, str, lpDraw_gbl->ddckCKSrcOverlay); sprintf(buffer,"%svmiData.",str); dump_VIDMEMINFO(buffer, &lpDraw_gbl->vmiData, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, vmiData) + offset); - printf("%08lx LPVOID %slpDriverHandle : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDriverHandle) + offset, str, lpDraw_gbl->lpDriverHandle); - printf("%08lx LPDDRAWI_DIRECTDRAW_LCL %slpExclusiveOwner : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpExclusiveOwner) + offset, str, lpDraw_gbl->lpExclusiveOwner); - printf("%08lx DWORD %sdwModeIndex : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndex) + offset, str, lpDraw_gbl->dwModeIndex); - printf("%08lx DWORD %sdwModeIndexOrig : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndexOrig) + offset, str, lpDraw_gbl->dwModeIndexOrig); - printf("%08lx DWORD %sdwNumFourCC : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumFourCC) + offset, str, lpDraw_gbl->dwNumFourCC); - printf("%08lx LPDWORD %slpdwFourCC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, str, lpDraw_gbl->lpdwFourCC); - printf("%08lx DWORD %sdwNumModes : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumModes) + offset, str, lpDraw_gbl->dwNumModes); - printf("%08lx LPDDHALMODEI %slpModeInfo : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpModeInfo) + offset, str, lpDraw_gbl->lpModeInfo); + MY_DUMP_STR(buffer,"LPVOID\0",str,"lpDriverHandle\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpDriverHandle) + offset, buffer, lpDraw_gbl->lpDriverHandle); + + MY_DUMP_STR(buffer,"LPDDRAWI_DIRECTDRAW_LCL\0",str,"lpExclusiveOwner\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpExclusiveOwner) + offset, buffer, lpDraw_gbl->lpExclusiveOwner); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeIndex\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndex) + offset, buffer, lpDraw_gbl->dwModeIndex); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeIndexOrig\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwModeIndexOrig) + offset, buffer, lpDraw_gbl->dwModeIndexOrig); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumFourCC\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumFourCC) + offset, buffer, lpDraw_gbl->dwNumFourCC); + + + MY_DUMP_STR(buffer,"LPDWORD\0",str,"lpdwFourCC\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpdwFourCC) + offset, buffer, lpDraw_gbl->lpdwFourCC); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumModes\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwNumModes) + offset, buffer, lpDraw_gbl->dwNumModes); + + MY_DUMP_STR(buffer,"LPDDHALMODEINFO\0",str,"lpModeInfo\0"); + printf("%08lx %s: 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, lpModeInfo) + offset, buffer, lpDraw_gbl->lpModeInfo); //printf("%08lx PROCESS_LIST lpGbl->plProcessList : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, plProcessList) + offset, str, lpDraw_gbl->plProcessList); - printf("%08lx DWORD %sdwSurfaceLockCount : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwSurfaceLockCount) + offset, str, lpDraw_gbl->dwSurfaceLockCount); - printf("%08lx DWORD %sdwAliasedLockCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwAliasedLockCnt) + offset, str, lpDraw_gbl->dwAliasedLockCnt); - printf("%08lx DWORD %sdwReserved3 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved3) + offset, str, lpDraw_gbl->dwReserved3); - printf("%08lx ULONG_PTR %shDD : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDD) + offset, str, lpDraw_gbl->hDD); - printf("%08lx char %scObsolete : %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cObsolete[0]) + offset, str, lpDraw_gbl->cObsolete); - printf("%08lx DWORD %sdwReserved1 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved1)+ offset, str, lpDraw_gbl->dwReserved1); - printf("%08lx DWORD %sdwReserved2 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved2)+ offset, str, lpDraw_gbl->dwReserved2); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSurfaceLockCount\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwSurfaceLockCount) + offset, buffer, lpDraw_gbl->dwSurfaceLockCount); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAliasedLockCnt\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwAliasedLockCnt) + offset, buffer, lpDraw_gbl->dwAliasedLockCnt); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved3\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved3) + offset, buffer, lpDraw_gbl->dwReserved3); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDD\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, hDD) + offset, buffer, lpDraw_gbl->hDD); + + MY_DUMP_STR(buffer,"char\0",str,"cObsolete\0"); + printf("%08lx %s: %s \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, cObsolete[0]) + offset, buffer, lpDraw_gbl->cObsolete); + + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved1\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved1)+ offset, buffer, lpDraw_gbl->dwReserved1); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved2\0"); + printf("%08lx %s: 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dwReserved2)+ offset, buffer, lpDraw_gbl->dwReserved2); sprintf(buffer,"%sdbnOverlayRoot.",str); dump_DBLNODE(buffer, &lpDraw_gbl->dbnOverlayRoot, FIELD_OFFSET(DDRAWI_DIRECTDRAW_GBL, dbnOverlayRoot)+ offset); @@ -266,122 +527,345 @@ void dump_DBLNODE(char *str, LPDBLNODE lpDblnode, DWORD offset) { - + char buffer[2048]; if (lpDblnode == NULL) return ; - printf("%08lx struct _DBLNODE * %snext : 0x%p\n", FIELD_OFFSET(DBLNODE, next)+offset, str, lpDblnode->next); - printf("%08lx struct _DBLNODE * %sprev : 0x%p\n", FIELD_OFFSET(DBLNODE, prev)+offset, str, lpDblnode->prev); - printf("%08lx struct LPDDRAWI_DDRAWSURFACE_LCL %sobject : 0x%p\n", FIELD_OFFSET(DBLNODE, object)+offset, str, lpDblnode->object); - printf("%08lx struct LPDDRAWI_DDRAWSURFACE_INT %sobject_int : 0x%p\n", FIELD_OFFSET(DBLNODE, object_int)+offset, str, lpDblnode->object_int); + MY_DUMP_STR(buffer,"struct _DBLNODE *\0",str,"next\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, next)+offset, buffer, lpDblnode->next); + + MY_DUMP_STR(buffer,"struct _DBLNODE *\0",str,"prev\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, prev)+offset, buffer, lpDblnode->prev); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_LCL\0",str,"object\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, object)+offset, buffer, lpDblnode->object); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"object_int\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DBLNODE, object_int)+offset, buffer, lpDblnode->object_int); + + printf("\n"); + sprintf(buffer,"%sobject_int->",str); + dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDblnode->object_int, 0); } void dump_DDCORECAPS(char *str, LPDDCORECAPS lpDdcorecaps, DWORD offset) { - + char buffer[2048]; if (lpDdcorecaps == NULL) return ; int c; - printf("%08lx DWORD %sdwSize : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSize)+offset, str, lpDdcorecaps->dwSize); - printf("%08lx DWORD %sdwCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps)+offset, str, lpDdcorecaps->dwCaps); - printf("%08lx DWORD %sdwCaps2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps2)+offset, str, lpDdcorecaps->dwCaps2); - printf("%08lx DWORD %sdwCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCKeyCaps)+offset, str, lpDdcorecaps->dwCKeyCaps); - printf("%08lx DWORD %sdwFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXCaps)+offset, str, lpDdcorecaps->dwFXCaps); - printf("%08lx DWORD %sdwFXAlphaCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXAlphaCaps)+offset, str, lpDdcorecaps->dwFXAlphaCaps); - printf("%08lx DWORD %sdwPalCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwPalCaps)+offset, str, lpDdcorecaps->dwPalCaps); - printf("%08lx DWORD %sdwSVCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVCaps)+offset, str, lpDdcorecaps->dwSVCaps); - printf("%08lx DWORD %sdwAlphaBltConstBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltConstBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltConstBitDepths); - printf("%08lx DWORD %sdwAlphaBltPixelBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltPixelBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltPixelBitDepths); - printf("%08lx DWORD %sdwAlphaBltSurfaceBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltSurfaceBitDepths)+offset, str, lpDdcorecaps->dwAlphaBltSurfaceBitDepths); - printf("%08lx DWORD %sdwAlphaOverlayConstBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayConstBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlayConstBitDepths); - printf("%08lx DWORD %sdwAlphaOverlayPixelBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayPixelBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlayPixelBitDepths); - printf("%08lx DWORD %sdwAlphaOverlaySurfaceBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlaySurfaceBitDepths)+offset, str, lpDdcorecaps->dwAlphaOverlaySurfaceBitDepths); - printf("%08lx DWORD %sdwZBufferBitDepths : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str, lpDdcorecaps->dwZBufferBitDepths); - printf("%08lx DWORD %sdwVidMemTotal : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemTotal)+offset, str, lpDdcorecaps->dwVidMemTotal); - printf("%08lx DWORD %sdwVidMemFree : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemFree)+offset, str, lpDdcorecaps->dwVidMemFree); - printf("%08lx DWORD %sdwMaxVisibleOverlays : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVisibleOverlays)+offset, str, lpDdcorecaps->dwMaxVisibleOverlays); - printf("%08lx DWORD %sdwCurrVisibleOverlays : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVisibleOverlays)+offset, str, lpDdcorecaps->dwCurrVisibleOverlays); - printf("%08lx DWORD %sdwNumFourCCCodes : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwNumFourCCCodes)+offset, str, lpDdcorecaps->dwNumFourCCCodes); - printf("%08lx DWORD %sdwAlignBoundarySrc : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundarySrc)+offset, str, lpDdcorecaps->dwAlignBoundarySrc); - printf("%08lx DWORD %sdwAlignSizeSrc : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeSrc)+offset, str, lpDdcorecaps->dwAlignSizeSrc); - printf("%08lx DWORD %sdwAlignBoundaryDest : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundaryDest)+offset, str, lpDdcorecaps->dwAlignBoundaryDest); - printf("%08lx DWORD %sdwAlignSizeDest : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeDest)+offset, str, lpDdcorecaps->dwAlignSizeDest); - printf("%08lx DWORD %sdwAlignStrideAlign : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignStrideAlign)+offset, str, lpDdcorecaps->dwAlignStrideAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSize\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSize)+offset, buffer, lpDdcorecaps->dwSize); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps)+offset, buffer, lpDdcorecaps->dwCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCaps2\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCaps2)+offset, buffer, lpDdcorecaps->dwCaps2); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCKeyCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCKeyCaps)+offset, buffer, lpDdcorecaps->dwCKeyCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFXCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXCaps)+offset, buffer, lpDdcorecaps->dwFXCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFXAlphaCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwFXAlphaCaps)+offset, buffer, lpDdcorecaps->dwFXAlphaCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwPalCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwPalCaps)+offset, buffer, lpDdcorecaps->dwPalCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVCaps)+offset, buffer, lpDdcorecaps->dwSVCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltConstBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltConstBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltConstBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltPixelBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltPixelBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltPixelBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaBltSurfaceBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaBltSurfaceBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaBltSurfaceBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlayConstBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayConstBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaOverlayConstBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlayPixelBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlayPixelBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaOverlayPixelBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaOverlaySurfaceBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlphaOverlaySurfaceBitDepths)+offset, buffer, lpDdcorecaps->dwAlphaOverlaySurfaceBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwZBufferBitDepths\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, buffer, lpDdcorecaps->dwZBufferBitDepths); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwVidMemTotal\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemTotal)+offset, buffer, lpDdcorecaps->dwVidMemTotal); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwVidMemFree\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVidMemFree)+offset, buffer, lpDdcorecaps->dwVidMemFree); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxVisibleOverlays\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVisibleOverlays)+offset, buffer, lpDdcorecaps->dwMaxVisibleOverlays); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrVisibleOverlays\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVisibleOverlays)+offset, buffer, lpDdcorecaps->dwCurrVisibleOverlays); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumFourCCCodes\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwNumFourCCCodes)+offset, buffer, lpDdcorecaps->dwNumFourCCCodes); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignBoundarySrc\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundarySrc)+offset, buffer, lpDdcorecaps->dwAlignBoundarySrc); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignSizeSrc\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeSrc)+offset, buffer, lpDdcorecaps->dwAlignSizeSrc); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignBoundaryDest\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignBoundaryDest)+offset, buffer, lpDdcorecaps->dwAlignBoundaryDest); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignSizeDest\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignSizeDest)+offset, buffer, lpDdcorecaps->dwAlignSizeDest); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlignStrideAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwAlignStrideAlign)+offset, buffer, lpDdcorecaps->dwAlignStrideAlign); for (c=0;c<DD_ROP_SPACE;c++) { printf("%08lx DWORD %sdwRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwRops[c])+offset, str, c, lpDdcorecaps->dwRops[c]); } - printf("%08lx DWORD %sddsCaps.dwCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, ddsCaps)+offset, str, lpDdcorecaps->ddsCaps.dwCaps); - printf("%08lx DWORD %sdwMinOverlayStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinOverlayStretch)+offset, str, lpDdcorecaps->dwMinOverlayStretch); - printf("%08lx DWORD %sdwMaxOverlayStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxOverlayStretch)+offset, str, lpDdcorecaps->dwMaxOverlayStretch); - printf("%08lx DWORD %sdwMinLiveVideoStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinLiveVideoStretch)+offset, str, lpDdcorecaps->dwMinLiveVideoStretch); - printf("%08lx DWORD %sdwMaxLiveVideoStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxLiveVideoStretch)+offset, str, lpDdcorecaps->dwMaxLiveVideoStretch); - printf("%08lx DWORD %sdwMinHwCodecStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinHwCodecStretch)+offset, str, lpDdcorecaps->dwMinHwCodecStretch); - printf("%08lx DWORD %sdwMaxHwCodecStretch : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxHwCodecStretch)+offset, str, lpDdcorecaps->dwMaxHwCodecStretch); - printf("%08lx DWORD %sdwReserved1 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved1)+offset, str, lpDdcorecaps->dwReserved1); - printf("%08lx DWORD %sdwReserved2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved2)+offset, str, lpDdcorecaps->dwReserved2); - printf("%08lx DWORD %sdwReserved3 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved3)+offset, str, lpDdcorecaps->dwReserved3); - printf("%08lx DWORD %sdwSVBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCaps)+offset, str, lpDdcorecaps->dwSVBCaps); - printf("%08lx DWORD %sdwSVBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCKeyCaps)+offset, str, lpDdcorecaps->dwSVBCKeyCaps); - printf("%08lx DWORD %sdwSVBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBFXCaps)+offset, str, lpDdcorecaps->dwSVBFXCaps); + MY_DUMP_STR(buffer,"DWORD\0",str,"ddsCaps.dwCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, ddsCaps)+offset, buffer, lpDdcorecaps->ddsCaps.dwCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinOverlayStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinOverlayStretch)+offset, buffer, lpDdcorecaps->dwMinOverlayStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxOverlayStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxOverlayStretch)+offset, buffer, lpDdcorecaps->dwMaxOverlayStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinLiveVideoStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinLiveVideoStretch)+offset, buffer, lpDdcorecaps->dwMinLiveVideoStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxLiveVideoStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxLiveVideoStretch)+offset, buffer, lpDdcorecaps->dwMaxLiveVideoStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMinHwCodecStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMinHwCodecStretch)+offset, buffer, lpDdcorecaps->dwMinHwCodecStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxHwCodecStretch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxHwCodecStretch)+offset, buffer, lpDdcorecaps->dwMaxHwCodecStretch); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved1\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved1)+offset, buffer, lpDdcorecaps->dwReserved1); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved2\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved2)+offset, buffer, lpDdcorecaps->dwReserved2); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwReserved3\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwReserved3)+offset, buffer, lpDdcorecaps->dwReserved3); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCaps)+offset, buffer, lpDdcorecaps->dwSVBCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCKeyCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBCKeyCaps)+offset, buffer, lpDdcorecaps->dwSVBCKeyCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBFXCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBFXCaps)+offset, buffer, lpDdcorecaps->dwSVBFXCaps); for (c=0;c<DD_ROP_SPACE;c++) { printf("%08lx DWORD %sdwSVBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSVBRops[c])+offset, str, c, lpDdcorecaps->dwSVBRops[c]); } - printf("%08lx DWORD %sdwVSBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCaps)+offset, str, lpDdcorecaps->dwVSBCaps); - printf("%08lx DWORD %sdwVSBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCKeyCaps)+offset, str, lpDdcorecaps->dwVSBCKeyCaps); - printf("%08lx DWORD %sdwVSBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBFXCaps)+offset, str, lpDdcorecaps->dwVSBFXCaps); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCaps)+offset, buffer, lpDdcorecaps->dwVSBCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBCKeyCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBCKeyCaps)+offset, buffer, lpDdcorecaps->dwVSBCKeyCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwVSBFXCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBFXCaps)+offset, buffer, lpDdcorecaps->dwVSBFXCaps); for (c=0;c<DD_ROP_SPACE;c++) { printf("%08lx DWORD %sdwVSBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwVSBRops[c])+offset, str, c, lpDdcorecaps->dwVSBRops[c]); } - printf("%08lx DWORD %sdwSSBCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCaps)+offset, str, lpDdcorecaps->dwSSBCaps); - printf("%08lx DWORD %sdwSSBCKeyCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCKeyCaps)+offset, str, lpDdcorecaps->dwSSBCKeyCaps); - printf("%08lx DWORD %sdwSSBFXCaps : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBFXCaps)+offset, str, lpDdcorecaps->dwSSBFXCaps); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCaps)+offset, buffer, lpDdcorecaps->dwSSBCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBCKeyCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBCKeyCaps)+offset, buffer, lpDdcorecaps->dwSSBCKeyCaps); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSSBFXCaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBFXCaps)+offset, buffer, lpDdcorecaps->dwSSBFXCaps); for (c=0;c<DD_ROP_SPACE;c++) { printf("%08lx DWORD %sdwSSBRops[0x%02x] : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwSSBRops[c])+offset, str, c, lpDdcorecaps->dwSSBRops[c]); } - printf("%08lx DWORD %sdwMaxVideoPorts : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVideoPorts)+offset, str, lpDdcorecaps->dwMaxVideoPorts); - printf("%08lx DWORD %sdwCurrVideoPorts : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVideoPorts)+offset, str, lpDdcorecaps->dwCurrVideoPorts); - printf("%08lx DWORD %sdwSVBCaps2 : 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, str, lpDdcorecaps->dwSVBCaps2); + MY_DUMP_STR(buffer,"DWORD\0",str,"dwMaxVideoPorts\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwMaxVideoPorts)+offset, buffer, lpDdcorecaps->dwMaxVideoPorts); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwCurrVideoPorts\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwCurrVideoPorts)+offset, buffer, lpDdcorecaps->dwCurrVideoPorts); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwSVBCaps2\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDCORECAPS, dwZBufferBitDepths)+offset, buffer, lpDdcorecaps->dwSVBCaps2); } void dump_VIDMEMINFO(char *str, LPVIDMEMINFO lpVidmeminfo, DWORD offset) { - + char buffer[2048]; if (lpVidmeminfo == NULL) return ; - printf("%08lx FLATPTR %sfpPrimary : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str, lpVidmeminfo->fpPrimary); - printf("%08lx DWORD %sdwFlags : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwFlags)+offset, str, lpVidmeminfo->dwFlags); - printf("%08lx DWORD %sdwDisplayWidth : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, str, lpVidmeminfo->dwDisplayWidth); - printf("%08lx DWORD %sdwDisplayHeight : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayHeight)+offset, str, lpVidmeminfo->dwDisplayHeight); - printf("%08lx LONG %slDisplayPitch : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, lDisplayPitch)+offset, str, lpVidmeminfo->lDisplayPitch); + MY_DUMP_STR(buffer,"FLATPTR\0",str,"fpPrimary\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, buffer, lpVidmeminfo->fpPrimary); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwFlags)+offset, buffer, lpVidmeminfo->dwFlags); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwDisplayWidth\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, fpPrimary)+offset, buffer, lpVidmeminfo->dwDisplayWidth); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwDisplayHeight\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayHeight)+offset, buffer, lpVidmeminfo->dwDisplayHeight); + + MY_DUMP_STR(buffer,"LONG\0",str,"lDisplayPitch\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, lDisplayPitch)+offset, buffer, lpVidmeminfo->lDisplayPitch); //printf("%08lx DDPIXELFORMAT %sddpfDisplay : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, ddpfDisplay)+offset, str, lpVidmeminfo->ddpfDisplay); - printf("%08lx DWORD %sdwOffscreenAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOffscreenAlign)+offset, str, lpVidmeminfo->dwOffscreenAlign); - printf("%08lx DWORD %sdwOverlayAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOverlayAlign)+offset, str, lpVidmeminfo->dwOverlayAlign); - printf("%08lx DWORD %sdwTextureAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwTextureAlign)+offset, str, lpVidmeminfo->dwTextureAlign); - printf("%08lx DWORD %sdwZBufferAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwZBufferAlign)+offset, str, lpVidmeminfo->dwZBufferAlign); - printf("%08lx DWORD %sdwAlphaAlign : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayWidth)+offset, str, lpVidmeminfo->dwAlphaAlign); - printf("%08lx DWORD %sdwNumHeaps : 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwNumHeaps)+offset, str, lpVidmeminfo->dwNumHeaps); - printf("%08lx LPVIDMEM %spvmList : 0x%p\n", FIELD_OFFSET(VIDMEMINFO, pvmList)+offset, str, lpVidmeminfo->pvmList); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwOffscreenAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOffscreenAlign)+offset, buffer, lpVidmeminfo->dwOffscreenAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwOverlayAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwOverlayAlign)+offset, buffer, lpVidmeminfo->dwOverlayAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwTextureAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwTextureAlign)+offset, buffer, lpVidmeminfo->dwTextureAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwZBufferAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwZBufferAlign)+offset, buffer, lpVidmeminfo->dwZBufferAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwAlphaAlign\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwDisplayWidth)+offset, buffer, lpVidmeminfo->dwAlphaAlign); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwNumHeaps\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(VIDMEMINFO, dwNumHeaps)+offset, buffer, lpVidmeminfo->dwNumHeaps); + + MY_DUMP_STR(buffer,"LPVIDMEM\0",str,"pvmList\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(VIDMEMINFO, pvmList)+offset, buffer, lpVidmeminfo->pvmList); } - - - +/* Surface dump */ + +void dump_DDRAWI_DDRAWSURFACE_INT(char *str, LPDDRAWI_DDRAWSURFACE_INT lpDdrawSurface, DWORD offset) +{ + char buffer[2048]; + if (lpDdrawSurface == NULL) + return ; + + MY_DUMP_STR(buffer,"LPVOID\0",str,"lpVtbl\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT, lpVtbl)+offset, buffer, lpDdrawSurface->lpVtbl); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_LCL\0",str,"lpLcl\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT, lpLcl)+offset, buffer, lpDdrawSurface->lpLcl); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpLink\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT, lpLink)+offset, str, lpDdrawSurface->lpLink); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwIntRefCnt\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_INT, dwIntRefCnt)+offset, str, lpDdrawSurface->dwIntRefCnt); + + printf("\n"); + sprintf(buffer,"%slpLcl->",str); + dump_DDRAWI_DDRAWSURFACE_LCL(buffer, lpDdrawSurface->lpLcl, 0); + + sprintf(buffer,"%slpLcl->lpLink",str); + dump_DDRAWI_DDRAWSURFACE_INT(buffer, lpDdrawSurface->lpLink, 0); +} + +void dump_DDRAWI_DDRAWSURFACE_LCL(char *str, LPDDRAWI_DDRAWSURFACE_LCL lpDdrawSurface, DWORD offset) +{ + + char buffer[2048]; + if (lpDdrawSurface == NULL) + return ; + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_MORE\0",str,"lpSurfMore\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpSurfMore)+offset, buffer, lpDdrawSurface->lpSurfMore); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_GBL\0",str,"lpGbl\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpGbl)+offset, buffer, lpDdrawSurface->lpGbl); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDDSurface\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, hDDSurface)+offset, buffer, lpDdrawSurface->hDDSurface); + + MY_DUMP_STR(buffer,"LPATTACHLIST\0",str,"lpAttachList\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpAttachList)+offset, buffer, lpDdrawSurface->lpAttachList); + + MY_DUMP_STR(buffer,"LPATTACHLIST\0",str,"lpAttachListFrom\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpAttachListFrom)+offset, buffer, lpDdrawSurface->lpAttachListFrom); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwLocalRefCnt\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwLocalRefCnt)+offset, buffer, lpDdrawSurface->dwLocalRefCnt); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwProcessId\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwProcessId)+offset, buffer, lpDdrawSurface->dwProcessId); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwFlags\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwFlags)+offset, buffer, lpDdrawSurface->dwFlags); + //printf("%08lx DDSCAPS %sddsCaps : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddsCaps)+offset, str, lpDdrawSurface->ddsCaps); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWPALETTE_INT\0",str,"lpDDPalette\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpDDPalette)+offset, buffer, lpDdrawSurface->lpDDPalette); + /* note slpDDClipper have union to LPDDRAWI_DDRAWCLIPPER_INT, we need figout how to detect which are set */ + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWCLIPPER_LCL\0",str,"lpDDClipper\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpDDClipper)+offset, buffer, lpDdrawSurface->lpDDClipper); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwModeCreatedIn\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwModeCreatedIn)+offset, buffer, lpDdrawSurface->dwModeCreatedIn); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwBackBufferCount\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwBackBufferCount)+offset, buffer, lpDdrawSurface->dwBackBufferCount); + + // printf("%08lx DDCOLORKEY %sddckCKDestBlt : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKDestBlt)+offset, str, lpDdrawSurface->ddckCKDestBlt); + // printf("%08lx DDCOLORKEY %sddckCKSrcBlt : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKSrcBlt)+offset, str, lpDdrawSurface->ddckCKSrcBlt); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"hDC\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, hDC)+offset, buffer, lpDdrawSurface->hDC); + + MY_DUMP_STR(buffer,"ULONG_PTR\0",str,"dwReserved1\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwReserved1)+offset, buffer, lpDdrawSurface->dwReserved1); + + + //printf("%08lx DDCOLORKEY %sddckCKSrcOverlay : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKSrcOverlay)+offset, str, lpDdrawSurface->ddckCKSrcOverlay); + //printf("%08lx DDCOLORKEY %sddckCKDestOverlay : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, ddckCKDestOverlay)+offset, str, lpDdrawSurface->ddckCKDestOverlay); + + MY_DUMP_STR(buffer,"LPDDRAWI_DDRAWSURFACE_INT\0",str,"lpSurfaceOverlaying\0"); + printf("%08lx %s: 0x%p\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lpSurfaceOverlaying)+offset, buffer, lpDdrawSurface->lpSurfaceOverlaying); + + // printf("%08lx DBLNODE %sdbnOverlayNode : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dbnOverlayNode)+offset, str, lpDdrawSurface->dbnOverlayNode); + //printf("%08lx RECT %srcOverlaySrc : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, rcOverlaySrc)+offset, str, lpDdrawSurface->rcOverlaySrc); + // printf("%08lx RECT %srcOverlayDest : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, rcOverlayDest)+offset, str, lpDdrawSurface->rcOverlayDest); + + MY_DUMP_STR(buffer,"DWORD\0",str,"dwClrXparent\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, dwClrXparent)+offset, buffer, lpDdrawSurface->dwClrXparent); + + MY_DUMP_STR(buffer,"LONG\0",str,"lOverlayX\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lOverlayX)+offset, buffer, lpDdrawSurface->lOverlayX); + + MY_DUMP_STR(buffer,"LONG\0",str,"lOverlayY\0"); + printf("%08lx %s: 0x%08lx\n", FIELD_OFFSET(DDRAWI_DDRAWSURFACE_LCL, lOverlayY)+offset, buffer, lpDdrawSurface->lOverlayY); +} Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] Thu Nov 20 06:25:27 2008 @@ -451,7 +451,7 @@ #if DUMP_ON if (pIntDirectDraw7 != NULL) { - dump_DDRAWI_DIRECTDRAW_INT("PDraw->", pIntDirectDraw7, 0); + dump_DDRAWI_DIRECTDRAW_INT("PDraw->\0", pIntDirectDraw7, 0); } #endif

1 0

[mkupfer] 37480: - start with German translation (not finished yet) - prepare setup to change setup language at runtime - fix resource files
by mkupfer＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: mkupfer Date: Thu Nov 20 04:21:17 2008 New Revision: 37480 URL: http://svn.reactos.org/svn/reactos?rev=37480&view=rev Log: - start with German translation (not finished yet) - prepare setup to change setup language at runtime - fix resource files Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/en-US.rc trunk/reactos/base/setup/reactos/reactos.c Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/de-DE.rc [iso-8859-1] Thu Nov 20 04:21:17 2008 @@ -18,11 +18,11 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "IDB_LOGO", IDB_ROSLOGO, "Static", WS_CHILD | WS_VISIBLE | SS_OWNERDRAW, 18, 0, 290, 99 - CONTROL "Setup language:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 + CONTROL "Installationssprache:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 109, 106, 11 CONTROL "", IDC_LANGUAGES, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 107, 176, 142 - CONTROL "Keyboard or input method:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 + CONTROL "Tastatur oder Eingabemethode:", IDC_STATIC, "Static", WS_CHILD | WS_VISIBLE | WS_GROUP | SS_RIGHT, 20, 142, 106, 11 CONTROL "", IDC_KEYLAYOUT, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST, 132, 141, 176, 81 - LTEXT "Click Next to select the setup type.", IDC_STATIC, 10, 180 ,297, 10 + LTEXT "Klicken Sie auf Weiter um zum Setuptyp zu gelangen.", IDC_STATIC, 10, 180 ,297, 10 END IDD_TYPEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -30,10 +30,10 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Type of setup", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 - CONTROL "Install ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 - CONTROL "Repair or update an installed ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 - LTEXT "Click Next to setup the devices.", IDC_STATIC, 10, 180 ,297, 10 + CONTROL "Setuptyp", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Installiere ReactOS", IDC_INSTALL, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 20, 15, 277, 10 + CONTROL "Repariere oder aktualisiere ein installiertes ReactOS", IDC_SETUP, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 20, 30, 277, 10 + LTEXT "Klicken Sie auf Weiter um die Geräte einzustellen.", IDC_STATIC, 10, 180 ,297, 10 END IDD_DEVICEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -41,14 +41,14 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 + CONTROL "Geräteeinstellungen", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 - LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 - LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 - LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 + LTEXT "Anzeige:", IDC_STATIC, 20,35, 80, 10 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 + LTEXT "Tastatur:", IDC_STATIC, 20,55, 80, 10 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 + LTEXT "Klicken Sie auf Weiter um Installationsort zu konfigurieren.", IDC_STATIC, 10, 180 ,277, 20 END IDD_DRIVEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 @@ -56,29 +56,29 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Partition for ReactOS installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 + CONTROL "Partition für die ReactOS-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 10,1,298,176 LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL - PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 - PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "&Erstellen", IDC_PARTCREATE, 20,155,50,15 + PUSHBUTTON "&Löschen", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "&Treiber", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "E&rweiterte Optionen...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Klicken Sie auf Weiter um die Zusammenfassung zu überprüfen.", IDC_STATIC, 10, 180 ,277, 20 END IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME -CAPTION "Advanced Partition Settings" +CAPTION "Erweiterte Partitionseinstellungen" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "Installation folder", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 + CONTROL "Installationsverzeichnis", IDC_STATIC, "Button", BS_GROUPBOX, 4,1,298,30 EDITTEXT IDC_PATH, 10,11,278,13, WS_VISIBLE - CONTROL "Boot loader installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 + CONTROL "Bootloader-Installation", IDC_STATIC, "Button", BS_GROUPBOX, 4,36,298,41 - CONTROL "Install boot loader on the hard disk (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 - CONTROL "No installation of bootloader", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 + CONTROL "Installiere Bootloader auf Festplatte (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 + CONTROL "Keine Bootloader-Installation", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Abbrechen", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -110,19 +110,19 @@ STRINGTABLE BEGIN - IDS_LANGTITLE "Language Selection" - IDS_LANGSUBTITLE "Choose language for setup and final system." - IDS_TYPETITLE "Welcome to ReactOS Setup" - IDS_TYPESUBTITLE "Choose setup type." - IDS_DEVICETITLE "Setup the basic devices" - IDS_DEVICESUBTITLE "Set the settings of display and keyboard." + IDS_LANGTITLE "Sprachauswahl" + IDS_LANGSUBTITLE "Wählen Sie eine Sprache für das Setup und das Endsystem aus." + IDS_TYPETITLE "Willkommen zum ReactOS Setup" + IDS_TYPESUBTITLE "Wählen Sie einen Setuptyp." + IDS_DEVICETITLE "Einstellen der Basisgeräte" + IDS_DEVICESUBTITLE "Einstellungen der Anzeigegeräte und der Tastatur." IDS_DRIVETITLE "Setup the installation partition and system folder" IDS_DRIVESUBTITLE "Prepare installation partition, system folder and boot loader." IDS_PROCESSTITLE "Prepare partition, copy files and setup system" IDS_PROCESSSUBTITLE "Create and format partition, copy files, install and setup boot loader" IDS_RESTARTTITLE "First stage of setup finished" IDS_RESTARTSUBTITLE "The first stage of setup has been completed, restart to continue with second stage" - IDS_ABORTSETUP "ReactOS is not completely installed on your computer. If you quit Setup now, you will need to run Setup again to install Reactos. Really quit?" - IDS_ABORTSETUP2 "Abort installation?" + IDS_ABORTSETUP "ReactOS ist nicht vollständig auf Ihrem Computer installiert. Wenn Sie das Setup verlassen, dann müssen Sie das Setup nochmal ausführen, um ReactOS zu installieren. Wirklich beenden?" + IDS_ABORTSETUP2 "Installation abbrechen?" END /* EOF */ Modified: trunk/reactos/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/en… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/en-US.rc [iso-8859-1] Thu Nov 20 04:21:17 2008 @@ -43,11 +43,11 @@ BEGIN CONTROL "Device settings", IDC_STATIC, "Button", BS_GROUPBOX, 10,0,297,172 LTEXT "Computer:", IDC_STATIC, 20,15, 80, 10 - CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 150, 80 + CONTROL "", IDC_COMPUTER, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 15, 180, 80 LTEXT "Display:", IDC_STATIC, 20,35, 80, 10 - CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 150, 80 + CONTROL "", IDC_DISPLAY, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 35, 180, 80 LTEXT "Keyboard:", IDC_STATIC, 20,55, 80, 10 - CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 150, 80 + CONTROL "", IDC_KEYBOARD, "ComboBox", WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST , 100, 55, 180, 80 LTEXT "Click Next setup of the installation device.", IDC_STATIC, 10, 180 ,277, 20 END @@ -60,9 +60,9 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Create", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Delete", IDC_PARTDELETE, 76,155,50,15 - PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15 - PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15, WS_DISABLED - LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 + PUSHBUTTON "D&river", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED + PUSHBUTTON "&Advanced Options...", IDC_PARTMOREOPTS, 218,155,80,15 + LTEXT "Click Next to check the summary.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 @@ -103,6 +103,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "Installation summary", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Click Next to start the installation process.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 Modified: trunk/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/reactos.c [iso-8859-1] Thu Nov 20 04:21:17 2008 @@ -344,6 +344,10 @@ if (tindex != CB_ERR) { SetupData.SelectedLangId = SendMessage(hList,CB_GETITEMDATA, (WPARAM)tindex, (LPARAM)0); + WORD LangID=strtol(SetupData.pLanguages[SetupData.SelectedLangId].LangId,NULL,16); + SetThreadLocale(MAKELCID(LangID,SORT_DEFAULT)); + // FIXME: need to reload all resource to force + // the new language setting } hList =GetDlgItem(hwndDlg, IDC_KEYLAYOUT); tindex = SendMessage(hList,CB_GETCURSEL, (WPARAM)0, (LPARAM)0); @@ -909,6 +913,7 @@ // get default for keyboard and language SetupData.DefaultKBLayout = -1; SetupData.DefaultLang = -1; + // TODO: get defaults from underlaying running system if (SetupFindFirstLine(hTxtsetupSif, _T("NLS"),_T("DefaultLayout"),&InfContext)) { SetupGetStringField(&InfContext, 1, tmp, sizeof(tmp) / sizeof(TCHAR), &LineLength); @@ -1078,7 +1083,6 @@ psp.pfnDlgProc = LangSelDlgProc; psp.pszTemplate = MAKEINTRESOURCE(IDD_LANGSELPAGE); ahpsp[nPages++] = CreatePropertySheetPage(&psp); - // Change language with "SetThreadLocale(langid)" /* Create install type selection page */ psp.dwSize = sizeof(PROPSHEETPAGE);

1 0

[cgutman] 37479: - Queue a work item for each packet instead of looping all packets currently on the work list - Round trip ping time to the loopback adapter is now about 1 ms
by cgutman＠svn.reactos.org 20 Nov '08

20 Nov '08

Author: cgutman Date: Wed Nov 19 18:08:26 2008 New Revision: 37479 URL: http://svn.reactos.org/svn/reactos?rev=37479&view=rev Log: - Queue a work item for each packet instead of looping all packets currently on the work list - Round trip ping time to the loopback adapter is now about 1 ms Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/loopback.c [iso-8859-1] Wed Nov 19 18:08:26 2008 @@ -22,7 +22,6 @@ KSPIN_LOCK LoopWorkLock; LIST_ENTRY LoopWorkList; WORK_QUEUE_ITEM LoopWorkItem; -BOOLEAN LoopReceiveWorkerBusy = FALSE; VOID STDCALL LoopReceiveWorker( PVOID Context ) { PLIST_ENTRY ListEntry; @@ -35,46 +34,43 @@ TI_DbgPrint(DEBUG_DATALINK, ("Called.\n")); - while( (ListEntry = - ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock )) ) { - WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); - - TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); - - Packet = WorkItem->Packet; - Adapter = WorkItem->Adapter; - BytesTransferred = WorkItem->BytesTransferred; - - ExFreePool( WorkItem ); - - IPPacket.NdisPacket = Packet; - - TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", - Packet, Adapter, BytesTransferred)); - - NdisGetFirstBufferFromPacket(Packet, - &NdisBuffer, - &IPPacket.Header, - &IPPacket.ContigSize, - &IPPacket.TotalSize); - - IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; - /* Determine which upper layer protocol that should receive - this packet and pass it to the correct receive handler */ - - TI_DbgPrint(MID_TRACE, - ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", - IPPacket.ContigSize, IPPacket.TotalSize, - BytesTransferred)); - - IPPacket.Position = 0; - - IPReceive(Loopback, &IPPacket); - - FreeNdisPacket( Packet ); - } + ListEntry = ExInterlockedRemoveHeadList( &LoopWorkList, &LoopWorkLock ); + WorkItem = CONTAINING_RECORD(ListEntry, LAN_WQ_ITEM, ListEntry); + + TI_DbgPrint(DEBUG_DATALINK, ("WorkItem: %x\n", WorkItem)); + + Packet = WorkItem->Packet; + Adapter = WorkItem->Adapter; + BytesTransferred = WorkItem->BytesTransferred; + + ExFreePool( WorkItem ); + + IPPacket.NdisPacket = Packet; + + TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x Trans %x\n", + Packet, Adapter, BytesTransferred)); + + NdisGetFirstBufferFromPacket(Packet, + &NdisBuffer, + &IPPacket.Header, + &IPPacket.ContigSize, + &IPPacket.TotalSize); + + IPPacket.ContigSize = IPPacket.TotalSize = BytesTransferred; + /* Determine which upper layer protocol that should receive + this packet and pass it to the correct receive handler */ + + TI_DbgPrint(MID_TRACE, + ("ContigSize: %d, TotalSize: %d, BytesTransferred: %d\n", + IPPacket.ContigSize, IPPacket.TotalSize, + BytesTransferred)); + + IPPacket.Position = 0; + + IPReceive(Loopback, &IPPacket); + + FreeNdisPacket( Packet ); TI_DbgPrint(DEBUG_DATALINK, ("Leaving\n")); - LoopReceiveWorkerBusy = FALSE; } VOID LoopSubmitReceiveWork( @@ -84,34 +80,19 @@ UINT BytesTransferred) { PLAN_WQ_ITEM WQItem; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)BindingContext; - KIRQL OldIrql; - - TcpipAcquireSpinLock( &LoopWorkLock, &OldIrql ); WQItem = ExAllocatePool( NonPagedPool, sizeof(LAN_WQ_ITEM) ); - if( !WQItem ) { - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); - return; - } + if( !WQItem ) return; WQItem->Packet = Packet; WQItem->Adapter = Adapter; WQItem->BytesTransferred = BytesTransferred; - InsertTailList( &LoopWorkList, &WQItem->ListEntry ); + ExInterlockedInsertTailList( &LoopWorkList, &WQItem->ListEntry, &LoopWorkLock ); TI_DbgPrint(DEBUG_DATALINK, ("Packet %x Adapter %x BytesTrans %x\n", Packet, Adapter, BytesTransferred)); - if( !LoopReceiveWorkerBusy ) { - LoopReceiveWorkerBusy = TRUE; - ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); - TI_DbgPrint(DEBUG_DATALINK, - ("Work item inserted %x %x\n", &LoopWorkItem, WQItem)); - } else { - TI_DbgPrint(DEBUG_DATALINK, - ("LOOP WORKER BUSY %x %x\n", &LoopWorkItem, WQItem)); - } - TcpipReleaseSpinLock( &LoopWorkLock, OldIrql ); + ExQueueWorkItem( &LoopWorkItem, CriticalWorkQueue ); } VOID LoopTransmit(

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs