Ros-diffs March 2011

ros-diffs@reactos.org

21 participants
276 discussions

[jgardou] 50996: [NTOSKRNL] - Beatify cpu supported features output once and for all DPRINT1 is not printf...

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 7 20:39:33 2011 New Revision: 50996 URL: http://svn.reactos.org/svn/reactos?rev=50996&view=rev Log: [NTOSKRNL] - Beatify cpu supported features output once and for all DPRINT1 is not printf... Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Mar 7 20:39:33 2011 @@ -482,32 +482,31 @@ } } - DPRINT1("Supported CPU features :\n"); + DPRINT1("Supported CPU features : %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s\n", #define print_supported(kf_value) \ - if(FeatureBits & kf_value) DPRINT1("\t" #kf_value) - print_supported(KF_V86_VIS); - print_supported(KF_RDTSC); - print_supported(KF_CR4); - print_supported(KF_CMOV); - print_supported(KF_GLOBAL_PAGE); - print_supported(KF_LARGE_PAGE); - print_supported(KF_MTRR); - print_supported(KF_CMPXCHG8B); - print_supported(KF_MMX); - print_supported(KF_WORKING_PTE); - print_supported(KF_PAT); - print_supported(KF_FXSR); - print_supported(KF_FAST_SYSCALL); - print_supported(KF_XMMI); - print_supported(KF_3DNOW); - print_supported(KF_AMDK6MTRR); - print_supported(KF_XMMI64); - print_supported(KF_DTS); - print_supported(KF_NX_BIT); - print_supported(KF_NX_DISABLED); - print_supported(KF_NX_ENABLED); + FeatureBits & kf_value ? #kf_value : "" + print_supported(KF_V86_VIS), + print_supported(KF_RDTSC), + print_supported(KF_CR4), + print_supported(KF_CMOV), + print_supported(KF_GLOBAL_PAGE), + print_supported(KF_LARGE_PAGE), + print_supported(KF_MTRR), + print_supported(KF_CMPXCHG8B), + print_supported(KF_MMX), + print_supported(KF_WORKING_PTE), + print_supported(KF_PAT), + print_supported(KF_FXSR), + print_supported(KF_FAST_SYSCALL), + print_supported(KF_XMMI), + print_supported(KF_3DNOW), + print_supported(KF_AMDK6MTRR), + print_supported(KF_XMMI64), + print_supported(KF_DTS), + print_supported(KF_NX_BIT), + print_supported(KF_NX_DISABLED), + print_supported(KF_NX_ENABLED)); #undef print_supported - DPRINT1("\n"); /* Return the Feature Bits */ return FeatureBits;

13 years, 6 months

[pschweitzer] 50995: [FASTFAT] Do not set file attributes in case they are set to 0 or -1

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Mar 7 20:28:42 2011 New Revision: 50995 URL: http://svn.reactos.org/svn/reactos?rev=50995&view=rev Log: [FASTFAT] Do not set file attributes in case they are set to 0 or -1 Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon Mar 7 20:28:42 2011 @@ -156,43 +156,68 @@ if (FCB->Flags & FCB_IS_FATX_ENTRY) { - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->CreationTime, - &FCB->entry.FatX.CreationDate, - &FCB->entry.FatX.CreationTime); - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->LastAccessTime, - &FCB->entry.FatX.AccessDate, - &FCB->entry.FatX.AccessTime); - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->LastWriteTime, - &FCB->entry.FatX.UpdateDate, - &FCB->entry.FatX.UpdateTime); + if (BasicInfo->CreationTime.QuadPart != 0 && BasicInfo->CreationTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->CreationTime, + &FCB->entry.FatX.CreationDate, + &FCB->entry.FatX.CreationTime); + } + + if (BasicInfo->LastAccessTime.QuadPart != 0 && BasicInfo->LastAccessTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->LastAccessTime, + &FCB->entry.FatX.AccessDate, + &FCB->entry.FatX.AccessTime); + } + + if (BasicInfo->LastWriteTime.QuadPart != 0 && BasicInfo->LastWriteTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->LastWriteTime, + &FCB->entry.FatX.UpdateDate, + &FCB->entry.FatX.UpdateTime); + } } else { - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->CreationTime, - &FCB->entry.Fat.CreationDate, - &FCB->entry.Fat.CreationTime); - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->LastAccessTime, - &FCB->entry.Fat.AccessDate, - NULL); - FsdSystemTimeToDosDateTime(DeviceExt, - &BasicInfo->LastWriteTime, - &FCB->entry.Fat.UpdateDate, - &FCB->entry.Fat.UpdateTime); - } - - *FCB->Attributes = (unsigned char)((*FCB->Attributes & - (FILE_ATTRIBUTE_DIRECTORY | 0x48)) | - (BasicInfo->FileAttributes & - (FILE_ATTRIBUTE_ARCHIVE | - FILE_ATTRIBUTE_SYSTEM | - FILE_ATTRIBUTE_HIDDEN | - FILE_ATTRIBUTE_READONLY))); - DPRINT("Setting attributes 0x%02x\n", *FCB->Attributes); + if (BasicInfo->CreationTime.QuadPart != 0 && BasicInfo->CreationTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->CreationTime, + &FCB->entry.Fat.CreationDate, + &FCB->entry.Fat.CreationTime); + } + + if (BasicInfo->LastAccessTime.QuadPart != 0 && BasicInfo->LastAccessTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->LastAccessTime, + &FCB->entry.Fat.AccessDate, + NULL); + } + + if (BasicInfo->LastWriteTime.QuadPart != 0 && BasicInfo->LastWriteTime.QuadPart != -1) + { + FsdSystemTimeToDosDateTime(DeviceExt, + &BasicInfo->LastWriteTime, + &FCB->entry.Fat.UpdateDate, + &FCB->entry.Fat.UpdateTime); + } + } + + if (BasicInfo->FileAttributes) + { + *FCB->Attributes = (unsigned char)((*FCB->Attributes & + (FILE_ATTRIBUTE_DIRECTORY | 0x48)) | + (BasicInfo->FileAttributes & + (FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_READONLY))); + DPRINT("Setting attributes 0x%02x\n", *FCB->Attributes); + } VfatUpdateEntry(FCB);

13 years, 6 months

[ekohl] 50994: [SERVICES] Leave the critical section when the allocation of the control packet fails. Bug spotted by hzlilx.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 7 20:25:28 2011 New Revision: 50994 URL: http://svn.reactos.org/svn/reactos?rev=50994&view=rev Log: [SERVICES] Leave the critical section when the allocation of the control packet fails. Bug spotted by hzlilx. Modified: trunk/reactos/base/system/services/database.c Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… ============================================================================== --- trunk/reactos/base/system/services/database.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/database.c [iso-8859-1] Mon Mar 7 20:25:28 2011 @@ -700,7 +700,10 @@ HEAP_ZERO_MEMORY, sizeof(SCM_CONTROL_PACKET) + (TotalLength * sizeof(WCHAR))); if (ControlPacket == NULL) + { + LeaveCriticalSection(&ControlServiceCriticalSection); return ERROR_NOT_ENOUGH_MEMORY; + } ControlPacket->dwControl = dwControl; ControlPacket->dwSize = TotalLength;

13 years, 6 months

[jgardou] 50993: [NTOSKRNL] - shrink cpu features output. - Add reference for the detection of non SYSENTER aware but claiming so CPUs detection

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 7 18:45:11 2011 New Revision: 50993 URL: http://svn.reactos.org/svn/reactos?rev=50993&view=rev Log: [NTOSKRNL] - shrink cpu features output. - Add reference for the detection of non SYSENTER aware but claiming so CPUs detection Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Mar 7 18:45:11 2011 @@ -311,7 +311,8 @@ Reg[3] |= 0x800; } - /* Check if the CPU is too old to support SYSENTER */ + /* Check if the CPU is too old to support SYSENTER, + * See Intel CPUID instruction manual for details*/ if ((Reg[0] & 0x0FFF3FFF) < 0x00000633) { /* Disable it */ @@ -483,7 +484,7 @@ DPRINT1("Supported CPU features :\n"); #define print_supported(kf_value) \ - if(FeatureBits & kf_value) DPRINT1("\t" #kf_value "\n") + if(FeatureBits & kf_value) DPRINT1("\t" #kf_value) print_supported(KF_V86_VIS); print_supported(KF_RDTSC); print_supported(KF_CR4); @@ -506,6 +507,7 @@ print_supported(KF_NX_DISABLED); print_supported(KF_NX_ENABLED); #undef print_supported + DPRINT1("\n"); /* Return the Feature Bits */ return FeatureBits;

13 years, 6 months

[fireball] 50992: [NTOS/FSRTL] - Remove unnecessary upcasing, thanks Pierre.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Mar 7 13:51:46 2011 New Revision: 50992 URL: http://svn.reactos.org/svn/reactos?rev=50992&view=rev Log: [NTOS/FSRTL] - Remove unnecessary upcasing, thanks Pierre. Modified: trunk/reactos/ntoskrnl/fsrtl/name.c Modified: trunk/reactos/ntoskrnl/fsrtl/name.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/name.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/name.c [iso-8859-1] Mon Mar 7 13:51:46 2011 @@ -85,7 +85,7 @@ /* Now compare upcased name char with expression */ if (UpcaseTable[Name->Buffer[NamePosition + ExpressionPosition]] != - UpcaseTable[IntExpression.Buffer[ExpressionPosition]]) + IntExpression.Buffer[ExpressionPosition]) { return FALSE; }

13 years, 6 months

[jgardou] 50991: [NTOSKRNL] - Print supported CPU features. - Simplify detection of non working but claimed SYSENTER support for intel processors - Workaround a virtualbox "feature" : claim that SY...

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Mar 7 13:33:10 2011 New Revision: 50991 URL: http://svn.reactos.org/svn/reactos?rev=50991&view=rev Log: [NTOSKRNL] - Print supported CPU features. - Simplify detection of non working but claimed SYSENTER support for intel processors - Workaround a virtualbox "feature" : claim that SYSENTER isn't supported despite the fact that it is. Fix hang on registration of mshtml.dll in 2nd stage when using Virtualbox. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Mon Mar 7 13:33:10 2011 @@ -303,10 +303,16 @@ /* Remove support for correct PTE support. */ FeatureBits &= ~KF_WORKING_PTE; } + + /* Virtualbox claims to have no SYSENTER support, + * which is false for processors >= Pentium Pro */ + if(Prcb->CpuType >= 6) + { + Reg[3] |= 0x800; + } /* Check if the CPU is too old to support SYSENTER */ - if ((Prcb->CpuType < 6) || - ((Prcb->CpuType == 6) && (Prcb->CpuStep < 0x0303))) + if ((Reg[0] & 0x0FFF3FFF) < 0x00000633) { /* Disable it */ Reg[3] &= ~0x800; @@ -474,6 +480,32 @@ } } } + + DPRINT1("Supported CPU features :\n"); +#define print_supported(kf_value) \ + if(FeatureBits & kf_value) DPRINT1("\t" #kf_value "\n") + print_supported(KF_V86_VIS); + print_supported(KF_RDTSC); + print_supported(KF_CR4); + print_supported(KF_CMOV); + print_supported(KF_GLOBAL_PAGE); + print_supported(KF_LARGE_PAGE); + print_supported(KF_MTRR); + print_supported(KF_CMPXCHG8B); + print_supported(KF_MMX); + print_supported(KF_WORKING_PTE); + print_supported(KF_PAT); + print_supported(KF_FXSR); + print_supported(KF_FAST_SYSCALL); + print_supported(KF_XMMI); + print_supported(KF_3DNOW); + print_supported(KF_AMDK6MTRR); + print_supported(KF_XMMI64); + print_supported(KF_DTS); + print_supported(KF_NX_BIT); + print_supported(KF_NX_DISABLED); + print_supported(KF_NX_ENABLED); +#undef print_supported /* Return the Feature Bits */ return FeatureBits;

13 years, 6 months

[ekohl] 50990: [SETUPAPI] Implement CM_Query_Arbitrator_Free_Data[_Ex] and CM_Query_Arbitrator_Free_Size[_Ex].

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon Mar 7 12:01:17 2011 New Revision: 50990 URL: http://svn.reactos.org/svn/reactos?rev=50990&view=rev Log: [SETUPAPI] Implement CM_Query_Arbitrator_Free_Data[_Ex] and CM_Query_Arbitrator_Free_Size[_Ex]. Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c trunk/reactos/dll/win32/setupapi/setupapi.spec Modified: trunk/reactos/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/cfgmgr.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/cfgmgr.c [iso-8859-1] Mon Mar 7 12:01:17 2011 @@ -4126,6 +4126,163 @@ pszVetoName, ulNameLength, ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** + * CM_Query_Arbitrator_Free_Data [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Query_Arbitrator_Free_Data( + PVOID pData, ULONG DataLen, DEVINST dnDevInst, RESOURCEID ResourceID, + ULONG ulFlags) +{ + TRACE("%p %lu %lx %lu 0x%08lx\n", pData, DataLen, dnDevInst, + ResourceID, ulFlags); + + return CM_Query_Arbitrator_Free_Data_Ex(pData, DataLen, dnDevInst, + ResourceID, ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Query_Arbitrator_Free_Data_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Query_Arbitrator_Free_Data_Ex( + OUT PVOID pData, + IN ULONG DataLen, + IN DEVINST dnDevInst, + IN RESOURCEID ResourceID, + IN ULONG ulFlags, + IN HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + CONFIGRET ret; + + TRACE("%p %lu %lx %lu 0x%08lx %p\n", pData, DataLen, dnDevInst, + ResourceID, ulFlags, hMachine); + + if (pData == NULL || DataLen == 0) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags & ~CM_QUERY_ARBITRATOR_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + RpcTryExcept + { + ret = PNP_QueryArbitratorFreeData(BindingHandle, + pData, + DataLen, + lpDevInst, + ResourceID, + ulFlags); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + ret = RpcStatusToCmStatus(RpcExceptionCode()); + } + RpcEndExcept; + + return ret; +} + + +/*********************************************************************** + * CM_Query_Arbitrator_Free_Size [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Query_Arbitrator_Free_Size( + PULONG pulSize, DEVINST dnDevInst, RESOURCEID ResourceID, ULONG ulFlags) +{ + TRACE("%p %lu %lx 0x%08lx\n", pulSize, dnDevInst,ResourceID, ulFlags); + + return CM_Query_Arbitrator_Free_Size_Ex(pulSize, dnDevInst, ResourceID, + ulFlags, NULL); +} + + +/*********************************************************************** + * CM_Query_Arbitrator_Free_Size_Ex [SETUPAPI.@] + */ +CONFIGRET WINAPI CM_Query_Arbitrator_Free_Size_Ex( + PULONG pulSize, DEVINST dnDevInst, RESOURCEID ResourceID, + ULONG ulFlags, HMACHINE hMachine) +{ + RPC_BINDING_HANDLE BindingHandle = NULL; + HSTRING_TABLE StringTable = NULL; + LPWSTR lpDevInst; + CONFIGRET ret; + + TRACE("%p %lu %lx 0x%08lx %p\n", pulSize, dnDevInst,ResourceID, ulFlags, + hMachine); + + if (pulSize == NULL) + return CR_INVALID_POINTER; + + if (dnDevInst == 0) + return CR_INVALID_DEVINST; + + if (ulFlags & ~CM_QUERY_ARBITRATOR_BITS) + return CR_INVALID_FLAG; + + if (hMachine != NULL) + { + BindingHandle = ((PMACHINE_INFO)hMachine)->BindingHandle; + if (BindingHandle == NULL) + return CR_FAILURE; + + StringTable = ((PMACHINE_INFO)hMachine)->StringTable; + if (StringTable == 0) + return CR_FAILURE; + } + else + { + if (!PnpGetLocalHandles(&BindingHandle, &StringTable)) + return CR_FAILURE; + } + + lpDevInst = pSetupStringTableStringFromId(StringTable, dnDevInst); + if (lpDevInst == NULL) + return CR_INVALID_DEVNODE; + + RpcTryExcept + { + ret = PNP_QueryArbitratorFreeSize(BindingHandle, + pulSize, + lpDevInst, + ResourceID, + ulFlags); } RpcExcept(EXCEPTION_EXECUTE_HANDLER) { Modified: trunk/reactos/dll/win32/setupapi/setupapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi.spec [iso-8859-1] Mon Mar 7 12:01:17 2011 @@ -159,10 +159,10 @@ @ stdcall CM_Query_And_Remove_SubTreeW(long ptr wstr long long) @ stdcall CM_Query_And_Remove_SubTree_ExA(long ptr str long long long) @ stdcall CM_Query_And_Remove_SubTree_ExW(long ptr wstr long long long) -@ stub CM_Query_Arbitrator_Free_Data -@ stub CM_Query_Arbitrator_Free_Data_Ex -@ stub CM_Query_Arbitrator_Free_Size -@ stub CM_Query_Arbitrator_Free_Size_Ex +@ stdcall CM_Query_Arbitrator_Free_Data(ptr long long long long) +@ stdcall CM_Query_Arbitrator_Free_Data_Ex(ptr long long long long ptr) +@ stdcall CM_Query_Arbitrator_Free_Size(ptr long long long) +@ stdcall CM_Query_Arbitrator_Free_Size_Ex(ptr long long long ptr) @ stdcall CM_Query_Remove_SubTree(long long) @ stdcall CM_Query_Remove_SubTree_Ex(long long long) @ stub CM_Query_Resource_Conflict_List

13 years, 6 months

[tkreuzer] 50989: [WIN32K] Use GreCreateBitmapEx instead of EngCreateBitmap in NtGdiSetDIBitsToDeviceInternal, so that the RLE hack works. Fix initialization of XLATEOBJ.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 7 10:00:27 2011 New Revision: 50989 URL: http://svn.reactos.org/svn/reactos?rev=50989&view=rev Log: [WIN32K] Use GreCreateBitmapEx instead of EngCreateBitmap in NtGdiSetDIBitsToDeviceInternal, so that the RLE hack works. Fix initialization of XLATEOBJ. 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] Mon Mar 7 10:00:27 2011 @@ -463,7 +463,7 @@ rcDest.top = YDest; if (bTransformCoordinates) { - CoordLPtoDP(pDC, (LPPOINT)&rcDest); + IntLPtoDP(pDC, (LPPOINT)&rcDest, 2); } rcDest.left += pDC->ptlDCOrig.x; rcDest.top += pDC->ptlDCOrig.y; @@ -479,12 +479,16 @@ DIBWidth = WIDTH_BYTES_ALIGN32(SourceSize.cx, bmi->bmiHeader.biBitCount); - hSourceBitmap = EngCreateBitmap(SourceSize, - DIBWidth, - BitmapFormat(bmi->bmiHeader.biBitCount, - bmi->bmiHeader.biCompression), - bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, - (PVOID) Bits); + hSourceBitmap = GreCreateBitmapEx(bmi->bmiHeader.biWidth, + ScanLines, + 0, + BitmapFormat(bmi->bmiHeader.biBitCount, + bmi->bmiHeader.biCompression), + bmi->bmiHeader.biHeight < 0 ? BMF_TOPDOWN : 0, + bmi->bmiHeader.biSizeImage, + Bits, + 0); + if (!hSourceBitmap) { EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); @@ -520,7 +524,12 @@ } /* Initialize EXLATEOBJ */ - EXLATEOBJ_vInitialize(&exlo, ppalDIB, pSurf->ppal, 0, 0, 0); + EXLATEOBJ_vInitialize(&exlo, + ppalDIB, + pSurf->ppal, + RGB(0xff, 0xff, 0xff), + pDC->pdcattr->crBackgroundClr, + pDC->pdcattr->crForegroundClr); /* Copy the bits */ DPRINT("BitsToDev with dstsurf=(%d|%d) (%d|%d), src=(%d|%d) w=%d h=%d\n", @@ -1433,6 +1442,7 @@ /* CreateDIBSection should fail for compressed formats */ if (bi->biCompression == BI_RLE4 || bi->biCompression == BI_RLE8) { + DPRINT1("no compressed format allowed\n"); return (HBITMAP)NULL; } @@ -1465,6 +1475,7 @@ 0); if (!NT_SUCCESS(Status)) { + DPRINT1("ZwQuerySystemInformation failed (0x%lx)\n", Status); return NULL; } @@ -1486,6 +1497,7 @@ PAGE_READWRITE); if (!NT_SUCCESS(Status)) { + DPRINT1("ZwMapViewOfSection failed (0x%lx)\n", Status); EngSetLastError(ERROR_INVALID_PARAMETER); return NULL; } @@ -1498,7 +1510,11 @@ { offset = 0; bm.bmBits = EngAllocUserMem(totalSize, 0); - if(!bm.bmBits) goto cleanup; + if(!bm.bmBits) + { + DPRINT1("Failed to allocate memory\n"); + goto cleanup; + } } // hSecure = MmSecureVirtualMemory(bm.bmBits, totalSize, PAGE_READWRITE); @@ -1546,12 +1562,14 @@ 0); if (!res) { + DPRINT1("GreCreateBitmapEx failed\n"); EngSetLastError(ERROR_NO_SYSTEM_RESOURCES); goto cleanup; } bmp = SURFACE_LockSurface(res); if (NULL == bmp) { + DPRINT1("SURFACE_LockSurface failed\n"); EngSetLastError(ERROR_INVALID_HANDLE); goto cleanup; }

13 years, 6 months

[tkreuzer] 50988: [WIN32K] Fix the RLE hack (partly)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Mar 7 09:53:03 2011 New Revision: 50988 URL: http://svn.reactos.org/svn/reactos?rev=50988&view=rev Log: [WIN32K] Fix the RLE hack (partly) Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c Modified: trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/bitmaps.c [iso-8859-1] Mon Mar 7 09:53:03 2011 @@ -82,8 +82,6 @@ PSURFACE psurf; SURFOBJ *pso; HBITMAP hbmp; - PVOID pvCompressedBits; - SIZEL sizl; /* Verify format */ if (iFormat < BMF_1BPP || iFormat > BMF_PNG) return NULL; @@ -103,22 +101,31 @@ /* The infamous RLE hack */ if (iFormat == BMF_4RLE || iFormat == BMF_8RLE) { + PVOID pvCompressedBits; + SIZEL sizl; + LONG lDelta; + sizl.cx = nWidth; sizl.cy = nHeight; + lDelta = WIDTH_BYTES_ALIGN32(nWidth, gajBitsPerFormat[iFormat]); + pvCompressedBits = pvBits; - pvBits = EngAllocMem(FL_ZERO_MEMORY, pso->cjBits, TAG_DIB); + pvBits = EngAllocMem(FL_ZERO_MEMORY, lDelta * nHeight, TAG_DIB); if (!pvBits) { EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); SURFACE_FreeSurfaceByHandle(hbmp); return NULL; } - DecompressBitmap(sizl, pvCompressedBits, pvBits, pso->lDelta, iFormat); + DecompressBitmap(sizl, pvCompressedBits, pvBits, lDelta, iFormat); fjBitmap |= BMF_RLE_HACK; - } - - /* Mark as API bitmap */ - psurf->flags |= (flags | API_BITMAP); + + iFormat = iFormat == BMF_4RLE ? BMF_4BPP : BMF_8BPP; + psurf->SurfObj.iBitmapFormat = iFormat; + } + + /* Mark as API bitmap */ + psurf->flags |= (flags | API_BITMAP); /* Set the bitmap bits */ if (!SURFACE_bSetBitmapBits(psurf, fjBitmap, cjWidthBytes, pvBits))

13 years, 6 months

[jimtabor] 50987: [GDI32] - Remove the old SetDIBBits, it severed us well.... Hold on to the win32k call. - Tested, Area.exe, wine gdi32 bitmaps test, AbiWord 2.8.6, OOo 2.4.3, SM 2.0.11 and ReactO...

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Mar 7 07:24:43 2011 New Revision: 50987 URL: http://svn.reactos.org/svn/reactos?rev=50987&view=rev Log: [GDI32] - Remove the old SetDIBBits, it severed us well.... Hold on to the win32k call. - Tested, Area.exe, wine gdi32 bitmaps test, AbiWord 2.8.6, OOo 2.4.3, SM 2.0.11 and ReactOS applications. - Aimp 2.61.583 (FULL, pinted okay), CoolPlayer 219, winamp 0.98d and winamp 2.95 (not FUll). The rest have drawing issue with DIB. See bug 5886. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Mon Mar 7 07:24:43 2011 @@ -531,7 +531,6 @@ return hBmp; } -#if 0 // FIXME!!! This is a victim of the Win32k Initialization BUG!!!!! /* * @implemented */ @@ -621,60 +620,6 @@ else RestoreDC(SavehDC, -1); - return LinesCopied; -} -#endif - -INT -WINAPI -SetDIBits(HDC hdc, - HBITMAP hbmp, - UINT uStartScan, - UINT cScanLines, - CONST VOID *lpvBits, - CONST BITMAPINFO *lpbmi, - UINT fuColorUse) -{ - PBITMAPINFO pConvertedInfo; - UINT ConvertedInfoSize; - INT LinesCopied = 0; - UINT cjBmpScanSize = 0; - PVOID pvSafeBits = (PVOID)lpvBits; - -// This needs to be almost the sames as SetDIBitsToDevice - - if ( !cScanLines || !lpbmi || !lpvBits || (GDI_HANDLE_GET_TYPE(hbmp) != GDI_OBJECT_TYPE_BITMAP)) - return 0; - - if ( fuColorUse && fuColorUse != DIB_PAL_COLORS && fuColorUse != DIB_PAL_COLORS+1 ) - return 0; - - pConvertedInfo = ConvertBitmapInfo(lpbmi, fuColorUse, - &ConvertedInfoSize, FALSE); - if (!pConvertedInfo) - return 0; - - cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, cScanLines); - - if ( lpvBits ) - { - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits) - RtlCopyMemory( pvSafeBits, lpvBits, cjBmpScanSize); - } - - LinesCopied = NtGdiSetDIBits( hdc, - hbmp, - uStartScan, - cScanLines, - pvSafeBits, - pConvertedInfo, - fuColorUse); - - if ( lpvBits != pvSafeBits) - RtlFreeHeap(RtlGetProcessHeap(), 0, pvSafeBits); - if (lpbmi != pConvertedInfo) - RtlFreeHeap(RtlGetProcessHeap(), 0, pConvertedInfo); return LinesCopied; }

13 years, 6 months

← Newer
1
...
20
21
22
23
24
25
26
27
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2011