Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 15719: Adding Cromwell to usb.
by jimtabor＠svn.reactos.com 01 Jun '05

01 Jun '05

Adding Cromwell to usb. Modified: trunk/reactos/drivers/usb/directory.xml _____ Modified: trunk/reactos/drivers/usb/directory.xml --- trunk/reactos/drivers/usb/directory.xml 2005-06-01 19:43:32 UTC (rev 15718) +++ trunk/reactos/drivers/usb/directory.xml 2005-06-01 21:55:09 UTC (rev 15719) @@ -1,3 +1,6 @@ +<directory name="cromwell"> + <xi:include href="cromwell/directory.xml" /> +</directory> <directory name="miniport"> <xi:include href="miniport/directory.xml" /> </directory>

1 0

[ekohl] 15718: Build the UNICODE version of the eventlog service.
by ekohl＠svn.reactos.com 01 Jun '05

01 Jun '05

Build the UNICODE version of the eventlog service. Modified: trunk/reactos/services/eventlog/eventlog.xml _____ Modified: trunk/reactos/services/eventlog/eventlog.xml --- trunk/reactos/services/eventlog/eventlog.xml 2005-06-01 19:01:12 UTC (rev 15717) +++ trunk/reactos/services/eventlog/eventlog.xml 2005-06-01 19:43:32 UTC (rev 15718) @@ -1,5 +1,7 @@ <module name="eventlog" type="win32cui" installbase="system32" installname="eventlog.exe"> <include base="eventlog">.</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library>

1 0

[weiden] 15717: fixed warnings
by weiden＠svn.reactos.com 01 Jun '05

01 Jun '05

fixed warnings Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c Modified: trunk/reactos/apps/utils/net/netstat/netstat.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-06-01 18:11:26 UTC (rev 15716) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-06-01 19:01:12 UTC (rev 15717) @@ -52,7 +52,7 @@ if (result == ERROR_BUFFER_OVERFLOW) { pFixedInfo = (FIXED_INFO*)malloc(OutBufLen); if (!pFixedInfo) { - _tprintf(_T("ERROR: failed to allocate 0x%08X bytes of memory\n"), OutBufLen); + _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), OutBufLen); return; } } else { @@ -100,7 +100,7 @@ _tprintf(_T("This function is not supported on the operating system in use on the local system\n")); break; default: - _tprintf(_T("0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result); + _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result); break; } } @@ -114,10 +114,10 @@ DWORD dwOutBufLen = 0; if ((result = GetNumberOfInterfaces(&dwNumIf)) != NO_ERROR) { - _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result); + _tprintf(_T("GetNumberOfInterfaces() failed with code 0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result); return; } else { - _tprintf(_T("GetNumberOfInterfaces() returned %d\n"), dwNumIf); + _tprintf(_T("GetNumberOfInterfaces() returned %lu\n"), dwNumIf); } result = GetInterfaceInfo(pIfTable, &dwOutBufLen); @@ -127,7 +127,7 @@ pIfTable = (IP_INTERFACE_INFO*)malloc(dwOutBufLen); if (!pIfTable) { - _tprintf(_T("ERROR: failed to allocate 0x%08X bytes of memory\n"), dwOutBufLen); + _tprintf(_T("ERROR: failed to allocate 0x%08lX bytes of memory\n"), dwOutBufLen); return; } /* @@ -144,7 +144,7 @@ result = GetInterfaceInfo(pIfTable, &dwOutBufLen); if (result == NO_ERROR) { int i; - _tprintf(_T("GetInterfaceInfo() returned with %d adaptor entries\n"), pIfTable->NumAdapters); + _tprintf(_T("GetInterfaceInfo() returned with %ld adaptor entries\n"), pIfTable->NumAdapters); for (i = 0; i < pIfTable->NumAdapters; i++) { wprintf(L"[%d] %s\n", i + 1, pIfTable->Adapter[i].Name); //wprintf(L"[%d] %s\n", pIfTable->Adapter[i].Index, pIfTable->Adapter[i].Name); @@ -162,13 +162,13 @@ break; case ERROR_INSUFFICIENT_BUFFER: _tprintf(_T("The buffer pointed to by the pIfTable parameter is not large enough. The required size is returned in the DWORD variable pointed to by the dwOutBufLen parameter\n")); - _tprintf(_T("\tdwOutBufLen: %d\n"), dwOutBufLen); + _tprintf(_T("\tdwOutBufLen: %lu\n"), dwOutBufLen); break; case ERROR_NOT_SUPPORTED: _tprintf(_T("This function is not supported on the operating system in use on the local system\n")); break; default: - _tprintf(_T("0x%08X - Use FormatMessage to obtain the message string for the returned error\n"), result); + _tprintf(_T("0x%08lX - Use FormatMessage to obtain the message string for the returned error\n"), result); break; } } @@ -227,8 +227,8 @@ GlobalFree(pAdaptorInfo); pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen); } - if (dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) { - _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: %08x\n"), dwRetVal); + if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) { + _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal); } else { while (pAdaptorInfo) { printf(" AdapterName: %s\n", pAdaptorInfo->AdapterName); _____ Modified: trunk/reactos/apps/utils/net/netstat/netstat.c --- trunk/reactos/apps/utils/net/netstat/netstat.c 2005-06-01 18:11:26 UTC (rev 15716) +++ trunk/reactos/apps/utils/net/netstat/netstat.c 2005-06-01 19:01:12 UTC (rev 15717) @@ -16,6 +16,7 @@ #include <winsock.h> #include <tchar.h> #include <stdio.h> +#include <ctype.h> #include <time.h> #include <iptypes.h> @@ -56,31 +57,32 @@ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL); - printf("%s\n", lpMsgBuf); + printf("%s\n", (TCHAR*)lpMsgBuf); LocalFree(lpMsgBuf); } +#if 0 static void ShowTcpStatistics() { MIB_TCPSTATS TcpStatsMIB; GetTcpStatistics(&TcpStatsMIB); _tprintf(_T("TCP/IP Statistics\t\n")); - _tprintf(_T(" time-out algorithm:\t\t%d\n"), TcpStatsMIB.dwRtoAlgorithm); - _tprintf(_T(" minimum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMin); - _tprintf(_T(" maximum time-out:\t\t%d\n"), TcpStatsMIB.dwRtoMax); - _tprintf(_T(" maximum connections:\t\t%d\n"), TcpStatsMIB.dwMaxConn); - _tprintf(_T(" active opens:\t\t\t%d\n"), TcpStatsMIB.dwActiveOpens); - _tprintf(_T(" passive opens:\t\t\t%d\n"), TcpStatsMIB.dwPassiveOpens); - _tprintf(_T(" failed attempts:\t\t%d\n"), TcpStatsMIB.dwAttemptFails); - _tprintf(_T(" established connections reset:\t%d\n"), TcpStatsMIB.dwEstabResets); - _tprintf(_T(" established connections:\t%d\n"), TcpStatsMIB.dwCurrEstab); - _tprintf(_T(" segments received:\t\t%d\n"), TcpStatsMIB.dwInSegs); - _tprintf(_T(" segment sent:\t\t\t%d\n"), TcpStatsMIB.dwOutSegs); - _tprintf(_T(" segments retransmitted:\t\t%d\n"), TcpStatsMIB.dwRetransSegs); - _tprintf(_T(" incoming errors:\t\t%d\n"), TcpStatsMIB.dwInErrs); - _tprintf(_T(" outgoing resets:\t\t%d\n"), TcpStatsMIB.dwOutRsts); - _tprintf(_T(" cumulative connections:\t\t%d\n"), TcpStatsMIB.dwNumConns); + _tprintf(_T(" time-out algorithm:\t\t%lu\n"), TcpStatsMIB.dwRtoAlgorithm); + _tprintf(_T(" minimum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMin); + _tprintf(_T(" maximum time-out:\t\t%lu\n"), TcpStatsMIB.dwRtoMax); + _tprintf(_T(" maximum connections:\t\t%lu\n"), TcpStatsMIB.dwMaxConn); + _tprintf(_T(" active opens:\t\t\t%lu\n"), TcpStatsMIB.dwActiveOpens); + _tprintf(_T(" passive opens:\t\t\t%lu\n"), TcpStatsMIB.dwPassiveOpens); + _tprintf(_T(" failed attempts:\t\t%lu\n"), TcpStatsMIB.dwAttemptFails); + _tprintf(_T(" established connections reset:\t%lu\n"), TcpStatsMIB.dwEstabResets); + _tprintf(_T(" established connections:\t%lu\n"), TcpStatsMIB.dwCurrEstab); + _tprintf(_T(" segments received:\t\t%lu\n"), TcpStatsMIB.dwInSegs); + _tprintf(_T(" segment sent:\t\t\t%lu\n"), TcpStatsMIB.dwOutSegs); + _tprintf(_T(" segments retransmitted:\t\t%lu\n"), TcpStatsMIB.dwRetransSegs); + _tprintf(_T(" incoming errors:\t\t%lu\n"), TcpStatsMIB.dwInErrs); + _tprintf(_T(" outgoing resets:\t\t%lu\n"), TcpStatsMIB.dwOutRsts); + _tprintf(_T(" cumulative connections:\t\t%lu\n"), TcpStatsMIB.dwNumConns); } static void ShowUdpStatistics() @@ -89,11 +91,11 @@ GetUdpStatistics(&UDPStatsMIB); _tprintf(_T("UDP Statistics\t\n")); - _tprintf(_T(" received datagrams:\t\t\t%d\n"), UDPStatsMIB.dwInDatagrams); - _tprintf(_T(" datagrams for which no port exists:\t%d\n"), UDPStatsMIB.dwNoPorts); - _tprintf(_T(" errors on received datagrams:\t\t%d\n"), UDPStatsMIB.dwInErrors); - _tprintf(_T(" sent datagrams:\t\t\t\t%d\n"), UDPStatsMIB.dwOutDatagrams); - _tprintf(_T(" number of entries in listener table:\t%d\n"), UDPStatsMIB.dwNumAddrs); + _tprintf(_T(" received datagrams:\t\t\t%lu\n"), UDPStatsMIB.dwInDatagrams); + _tprintf(_T(" datagrams for which no port exists:\t%lu\n"), UDPStatsMIB.dwNoPorts); + _tprintf(_T(" errors on received datagrams:\t\t%lu\n"), UDPStatsMIB.dwInErrors); + _tprintf(_T(" sent datagrams:\t\t\t\t%lu\n"), UDPStatsMIB.dwOutDatagrams); + _tprintf(_T(" number of entries in listener table:\t%lu\n"), UDPStatsMIB.dwNumAddrs); } static void ShowIpStatistics() @@ -102,27 +104,27 @@ GetIpStatistics(&IPStatsMIB); _tprintf(_T("IP Statistics\t\n")); - _tprintf(_T(" IP forwarding enabled or disabled:\t%d\n"), IPStatsMIB.dwForwarding); - _tprintf(_T(" default time-to-live:\t\t\t%d\n"), IPStatsMIB.dwDefaultTTL); - _tprintf(_T(" datagrams received:\t\t\t%d\n"), IPStatsMIB.dwInReceives); - _tprintf(_T(" received header errors:\t\t\t%d\n"), IPStatsMIB.dwInHdrErrors); - _tprintf(_T(" received address errors:\t\t%d\n"), IPStatsMIB.dwInAddrErrors); - _tprintf(_T(" datagrams forwarded:\t\t\t%d\n"), IPStatsMIB.dwForwDatagrams); - _tprintf(_T(" datagrams with unknown protocol:\t%d\n"), IPStatsMIB.dwInUnknownProtos); - _tprintf(_T(" received datagrams discarded:\t\t%d\n"), IPStatsMIB.dwInDiscards); - _tprintf(_T(" received datagrams delivered:\t\t%d\n"), IPStatsMIB.dwInDelivers); - _tprintf(_T(" sent datagrams discarded:\t\t%d\n"), IPStatsMIB.dwOutDiscards); - _tprintf(_T(" datagrams for which no route exists:\t%d\n"), IPStatsMIB.dwOutNoRoutes); - _tprintf(_T(" datagrams for which frags didn't arrive:%d\n"), IPStatsMIB.dwReasmTimeout); - _tprintf(_T(" datagrams requiring reassembly:\t\t%d\n"), IPStatsMIB.dwReasmReqds); - _tprintf(_T(" successful reassemblies:\t\t%d\n"), IPStatsMIB.dwReasmOks); - _tprintf(_T(" failed reassemblies:\t\t\t%d\n"), IPStatsMIB.dwReasmFails); - _tprintf(_T(" successful fragmentations:\t\t%d\n"), IPStatsMIB.dwFragOks); - _tprintf(_T(" failed fragmentations:\t\t\t%d\n"), IPStatsMIB.dwFragFails); - _tprintf(_T(" datagrams fragmented:\t\t\t%d\n"), IPStatsMIB.dwFragCreates); - _tprintf(_T(" number of interfaces on computer:\t%d\n"), IPStatsMIB.dwNumIf); - _tprintf(_T(" number of IP address on computer:\t%d\n"), IPStatsMIB.dwNumAddr); - _tprintf(_T(" number of routes in routing table:\t%d\n"), IPStatsMIB.dwNumRoutes); + _tprintf(_T(" IP forwarding enabled or disabled:\t%lu\n"), IPStatsMIB.dwForwarding); + _tprintf(_T(" default time-to-live:\t\t\t%lu\n"), IPStatsMIB.dwDefaultTTL); + _tprintf(_T(" datagrams received:\t\t\t%lu\n"), IPStatsMIB.dwInReceives); + _tprintf(_T(" received header errors:\t\t\t%lu\n"), IPStatsMIB.dwInHdrErrors); + _tprintf(_T(" received address errors:\t\t%lu\n"), IPStatsMIB.dwInAddrErrors); + _tprintf(_T(" datagrams forwarded:\t\t\t%lu\n"), IPStatsMIB.dwForwDatagrams); + _tprintf(_T(" datagrams with unknown protocol:\t%lu\n"), IPStatsMIB.dwInUnknownProtos); + _tprintf(_T(" received datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwInDiscards); + _tprintf(_T(" received datagrams delivered:\t\t%lu\n"), IPStatsMIB.dwInDelivers); + _tprintf(_T(" sent datagrams discarded:\t\t%lu\n"), IPStatsMIB.dwOutDiscards); + _tprintf(_T(" datagrams for which no route exists:\t%lu\n"), IPStatsMIB.dwOutNoRoutes); + _tprintf(_T(" datagrams for which frags didn't arrive:%lu\n"), IPStatsMIB.dwReasmTimeout); + _tprintf(_T(" datagrams requiring reassembly:\t\t%lu\n"), IPStatsMIB.dwReasmReqds); + _tprintf(_T(" successful reassemblies:\t\t%lu\n"), IPStatsMIB.dwReasmOks); + _tprintf(_T(" failed reassemblies:\t\t\t%lu\n"), IPStatsMIB.dwReasmFails); + _tprintf(_T(" successful fragmentations:\t\t%lu\n"), IPStatsMIB.dwFragOks); + _tprintf(_T(" failed fragmentations:\t\t\t%lu\n"), IPStatsMIB.dwFragFails); + _tprintf(_T(" datagrams fragmented:\t\t\t%lu\n"), IPStatsMIB.dwFragCreates); + _tprintf(_T(" number of interfaces on computer:\t%lu\n"), IPStatsMIB.dwNumIf); + _tprintf(_T(" number of IP address on computer:\t%lu\n"), IPStatsMIB.dwNumAddr); + _tprintf(_T(" number of routes in routing table:\t%lu\n"), IPStatsMIB.dwNumRoutes); } static void ShowNetworkParams() @@ -140,8 +142,8 @@ GlobalFree(FixedInfo); FixedInfo =(FIXED_INFO*)GlobalAlloc(GPTR, ulOutBufLen); } - if (dwRetVal = GetNetworkParams(FixedInfo, &ulOutBufLen)) { - _tprintf(_T("Call to GetNetworkParams failed. Return Value: %08x\n"), dwRetVal); + if ((dwRetVal = GetNetworkParams(FixedInfo, &ulOutBufLen))) { + _tprintf(_T("Call to GetNetworkParams failed. Return Value: 0x%08lx\n"), dwRetVal); } else { printf(" Host Name: %s", FixedInfo->HostName); printf("\n Domain Name: %s", FixedInfo->DomainName); @@ -168,8 +170,8 @@ GlobalFree(pAdaptorInfo); pAdaptorInfo = (IP_ADAPTER_INFO*)GlobalAlloc(GPTR, ulOutBufLen); } - if (dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen)) { - _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: %08x\n"), dwRetVal); + if ((dwRetVal = GetAdaptersInfo(pAdaptorInfo, &ulOutBufLen))) { + _tprintf(_T("Call to GetAdaptersInfo failed. Return Value: 0x%08lx\n"), dwRetVal); } else { while (pAdaptorInfo) { printf(" AdapterName: %s\n", pAdaptorInfo->AdapterName); @@ -178,6 +180,7 @@ } } } +#endif /* typedef struct { @@ -271,7 +274,7 @@ return name; } // Try to translate to a name - if (psrvent = getservbyport(port, proto)) { + if ((psrvent = getservbyport(port, proto))) { strcpy(name, psrvent->s_name ); } else { sprintf(name, "%d", htons((WORD)port)); @@ -351,9 +354,9 @@ BOOLEAN usage(void) { - TCHAR buffer[MAX_RESLEN]; + TCHAR buffer[MAX_RESLEN]; - int length = LoadString(GetModuleHandle(NULL), IDS_APP_USAGE, buffer, sizeof(buffer)/sizeof(buffer[0])); + LoadString(GetModuleHandle(NULL), IDS_APP_USAGE, buffer, sizeof(buffer)/sizeof(buffer[0])); _fputts(buffer, stderr); return FALSE; }

1 0

[greatlrd] 15716: small optimze for StretchBlt
by greatlrd＠svn.reactos.com 01 Jun '05

01 Jun '05

small optimze for StretchBlt Thanks Alex for the idea with neg for statement it is still a ref implemnet and have some limits Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-01 17:28:51 UTC (rev 15715) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-01 18:11:26 UTC (rev 15716) @@ -629,6 +629,9 @@ int zoomX; int zoomY; int count; + int saveX; + int saveY; + BOOLEAN DesIsBiggerY=FALSE; DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -646,202 +649,656 @@ zoomY = DesSizeY / SrcSizeY; if (zoomY==0) zoomY=1; + if (DesSizeY>SrcSizeY) + DesIsBiggerY = TRUE; + + + switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + + + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) - { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + saveY = DesY+zoomY; - if (sy > SourceRect->bottom) break; + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + saveX = DesX + zoomX; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 0); + else + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 1); + + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ + + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; + if (sx > SourceRect->right) break; + + saveX = DesX + zoomX; - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 0); + else + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, 1); + + } + } + } + } + else + { + + if (DesSizeX>SrcSizeX) + { + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, 0); + else + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, 1); + + + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) { - for (count=DesY;count<DesY+zoomY;count++) - { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); - } - - } else { + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, 0); + else + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, 1); + + } + } + } + } + break; - for (count=DesY;count<DesY+zoomY;count++) - { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); - } - } - } - } - break; - - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) - { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (sy > SourceRect->bottom) break; - if (sy > SourceRect->bottom) break; + saveY = DesY+zoomY; + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + } + + else + { + + if (DesSizeX>SrcSizeX) + { + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; - for (count=DesY;count<DesY+zoomY;count++) + color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - } + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + } + break; - } - } - break; - case BMF_8BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) - { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - if (sy > SourceRect->bottom) break; + if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ + + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + } + + else + { + + if (DesSizeX>SrcSizeX) + { + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + saveY = DesY+zoomY; - for (count=DesY;count<DesY+zoomY;count++) + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - } - - } - } + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + } break; - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + case BMF_16BPP: + return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, + ClipRegion, ColorTranslation, Mode); + break; + + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ + + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + } + + else + { + + if (DesSizeX>SrcSizeX) { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - if (sy > SourceRect->bottom) break; + if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + } + break; - color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - for (count=DesY;count<DesY+zoomY;count++) - { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - } - } - } - break; - - case BMF_32BPP: + case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ + + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + saveX = DesX + zoomX; + for (count=DesY;count<saveY;count++) + DIB_16BPP_HLine(DestSurf, DesX, saveX, count, color); + } + } + } + } + + else + { + + if (DesSizeX>SrcSizeX) { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - if (sy > SourceRect->bottom) break; + if (sy > SourceRect->bottom) break; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; + if (sx > SourceRect->right) break; + + color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); + + for (count=DesY;count<saveY;count++) + DIB_16BPP_PutPixel(DestSurf, DesX, count, color); + } + } + } + } + break; - color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - for (count=DesY;count<DesY+zoomY;count++) - { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); - } - } - } break; - - case BMF_16BPP: - return ScaleRectAvg16(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, - ClipRegion, ColorTranslation, Mode); - break; - default: DPRINT1("DIB_16BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-01 17:28:51 UTC (rev 15715) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-01 18:11:26 UTC (rev 15716) @@ -497,6 +497,9 @@ int zoomX; int zoomY; int count; + int saveX; + int saveY; + BOOLEAN DesIsBiggerY=FALSE; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -510,225 +513,762 @@ zoomY = DesSizeY / SrcSizeY; if (zoomY==0) zoomY=1; + if (DesSizeY>SrcSizeY) + DesIsBiggerY = TRUE; + switch(SourceSurf->iBitmapFormat) { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) - { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (zoomX>1) + { + /* Draw one Hline on X - Led to the Des Zoom In*/ + if (DesSizeX>SrcSizeX) + { + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (sy > SourceRect->bottom) break; - if (sy > SourceRect->bottom) break; + saveY = DesY+zoomY; + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + saveX = DesX + zoomX; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + + for (count=DesY;count<saveY;count++) + DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); + + + } + } + } + else + { + /* Draw one Hline on X - Led to the Des Zoom Out*/ + + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) { - if (DesSizeX>SrcSizeX) - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; + + saveY = DesY+zoomY; + + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + if (sx > SourceRect->right) break; - for (count=DesY;count<DesY+zoomY;count++) - { - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); - else - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } + saveX = DesX + zoomX; + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + + for (count=DesY;count<saveY;count++) + DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); + + + } } - } - break; + } + } + else + { + + if (DesSizeX>SrcSizeX) + { + /* Draw one pixel on X - Led to the Des Zoom In*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + + if (sy > SourceRect->bottom) break; - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ + saveY = DesY+zoomY; - for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) - { - if (DesSizeY>SrcSizeY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + + for (count=DesY;count<saveY;count++) + DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); + + } + } + } + else + { + /* Draw one pixel on X - Led to the Des Zoom Out*/ + for (DesY=DestRect->bottom-zoomY; DesY>=0; DesY-=zoomY) + { + if (DesIsBiggerY) + sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); + else + sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); + if (sy > SourceRect->bottom) break; - if (sy > SourceRect->bottom) break; + saveY = DesY+zoomY; + for (DesX=DestRect->right-zoomX; DesX>=0; DesX-=zoomX) + { + sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); + + if (sx > SourceRect->right) break; + + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + + for (count=DesY;count<saveY;count++) + DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); + + } + } + } + } + break; - for (DesX=0; DesX<DestRect->right; DesX+=zoomX) + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + if (zoomX>1) + { [truncated at 1000 lines; 4182 more skipped]

1 0

[chorns] 15715: Build with MP=1
by chorns＠svn.reactos.com 01 Jun '05

01 Jun '05

Build with MP=1 Modified: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/generic/spinlock.c Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-06-01 17:27:55 UTC (rev 15714) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-06-01 17:28:51 UTC (rev 15715) @@ -15,6 +15,7 @@ #include <ddk/ntddk.h> #include <ddk/iotypes.h> +#include <internal/ps.h> #define NDEBUG #include <internal/debug.h> #include <hal.h> _____ Modified: trunk/reactos/hal/halx86/generic/pci.c --- trunk/reactos/hal/halx86/generic/pci.c 2005-06-01 17:27:55 UTC (rev 15714) +++ trunk/reactos/hal/halx86/generic/pci.c 2005-06-01 17:28:51 UTC (rev 15715) @@ -22,6 +22,7 @@ #include <bus.h> #include <halirq.h> #include <hal.h> +#include <internal/ps.h> #define NDEBUG #include <internal/debug.h> _____ Modified: trunk/reactos/hal/halx86/generic/spinlock.c --- trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-01 17:27:55 UTC (rev 15714) +++ trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-01 17:28:51 UTC (rev 15715) @@ -18,6 +18,7 @@ /* INCLUDES ****************************************************************/ #include <ddk/ntddk.h> +#include <internal/ps.h> #include <internal/debug.h> _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-01 17:27:55 UTC (rev 15714) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-01 17:28:51 UTC (rev 15715) @@ -14,6 +14,7 @@ #include <ddk/ntddk.h> #include <hal.h> #include "halxbox.h" +#include <internal/ps.h> #define NDEBUG #include <internal/debug.h>

1 0

[chorns] 15714: Remove unneded file
by chorns＠svn.reactos.com 01 Jun '05

01 Jun '05

Remove unneded file Deleted: trunk/reactos/lib/setupapi/makefile _____ Deleted: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-06-01 16:27:21 UTC (rev 15713) +++ trunk/reactos/lib/setupapi/makefile 2005-06-01 17:27:55 UTC (rev 15714) @@ -1,5 +0,0 @@ -# This file is automatically generated. - -TOP = ../.. -DEFAULT = setupapi -include $(TOP)/proxy.mak

1 0

[gvg] 15713: Merge 15334:15712 from trunk (but don't activate xmlbuild)
by gvg＠svn.reactos.com 01 Jun '05

01 Jun '05

Merge 15334:15712 from trunk (but don't activate xmlbuild) Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c Added: branches/xen/reactos/boot/freeldr/freeldr/freeldr.xml Added: branches/xen/reactos/boot/freeldr/freeldr/freeldr_base.xml Added: branches/xen/reactos/boot/freeldr/freeldr/freeldr_base64k.xml Added: branches/xen/reactos/boot/freeldr/freeldr/freeldr_main.xml Added: branches/xen/reactos/boot/freeldr/freeldr/freeldr_startup.xml Modified: branches/xen/reactos/boot/freeldr/freeldr/mm/mm.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c Added: branches/xen/reactos/boot/freeldr/freeldr/setupldr.xml Added: branches/xen/reactos/boot/freeldr/freeldr/setupldr_main.xml Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c Property changes on: branches/xen/reactos/boot/freeldr/freeldr ___________________________________________________________________ Name: lastmerge - 15334 + 15712 _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/hardware.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -1715,7 +1715,7 @@ /* Set 'Identifier' value */ strcpy(Buffer, "PCAT_ENHANCED"); - Error = RegSetValue(ControllerKey, + Error = RegSetValue(PeripheralKey, "Identifier", REG_SZ, Buffer, _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xboxcons.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -73,6 +73,8 @@ { ; } + + return 0; } /* EOF */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/freeldr.c --- branches/xen/reactos/boot/freeldr/freeldr/freeldr.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/freeldr.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -35,7 +35,7 @@ DebugInit(); - DbgPrint((DPRINT_WARNING, "BootMain() called. BootDrive = 0x%x BootPartition = %d\n", BootDrive, BootPartition)); + DbgPrint((DPRINT_WARNING, "BootMain() called.\n")); if (!MmInitializeMemoryManager()) { _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/freeldr.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/freeldr.xml) _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/freeldr_base.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml) _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/freeldr_base64k.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.xml) _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/freeldr_main.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/freeldr_main.xml) _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/freeldr_startup.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/freeldr_startup.xml) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/mm/mm.c --- branches/xen/reactos/boot/freeldr/freeldr/mm/mm.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/mm/mm.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -36,10 +36,30 @@ VOID MemAllocTest(VOID); #endif // DEBUG +/* + * Hack alert + * Normally, we allocate whole pages. This is ofcourse wastefull for small + * allocations (a few bytes). So, for small allocations (smaller than a page) + * we sub-allocate. When the first small allocation is done, a page is + * requested. We keep a pointer to that page in SubAllocationPage. The alloc + * is satisfied by returning a pointer to the beginning of the page. We also + * keep track of how many bytes are still available in the page in SubAllocationRest. + * When the next small request comes in, we try to allocate it just after the + * memory previously allocated. If it won't fit, we allocate a new page and + * the whole process starts again. + * Note that suballocations are done back-to-back, there's no bookkeeping at all. + * That also means that we cannot really free suballocations. So, when a free is + * done and it is determined that this might be a free of a sub-allocation, we + * just no-op the free. + * Perhaps we should use the heap routines from ntdll here. + */ +static PVOID SubAllocationPage = NULL; +static unsigned SubAllocationRest = 0; + PVOID MmAllocateMemory(ULONG MemorySize) { - ULONG PagesNeeded; - ULONG FirstFreePageFromEnd; + ULONG PagesNeeded; + ULONG FirstFreePageFromEnd; PVOID MemPointer; if (MemorySize == 0) @@ -49,6 +69,14 @@ return NULL; } + MemorySize = ROUND_UP(MemorySize, 4); + if (MemorySize <= SubAllocationRest) + { + MemPointer = SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest; + SubAllocationRest -= MemorySize; + return MemPointer; + } + // Find out how many blocks it will take to // satisfy this allocation PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; @@ -76,6 +104,13 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); + if (MemorySize < MM_PAGE_SIZE) + { + SubAllocationPage = MemPointer; + SubAllocationRest = MM_PAGE_SIZE - MemorySize; + } + + #ifdef DEBUG IncrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); @@ -235,6 +270,13 @@ #endif + /* If this allocation is only a single page, it could be a sub-allocated page. + * Just don't free it */ + if (1 == PageCount) + { + return; + } + // Loop through our array and mark all the // blocks as free for (Idx=PageNumber; Idx<(PageNumber + PageCount); Idx++) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c --- branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/reactos/reactos.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -760,6 +760,16 @@ if (!FrLdrLoadDriver(szHalName, 10)) return; +#if 0 + /* Load bootvid */ + strcpy(value, "INBV.DLL"); + strcpy(szHalName, szBootPath); + strcat(szHalName, "SYSTEM32\\"); + strcat(szHalName, value); + + if (!FrLdrLoadDriver(szHalName, 10)) + return; +#endif /* * Load the System hive from disk */ _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c --- branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/reactos/setupldr.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -34,7 +34,7 @@ #include "registry.h" -//#define USE_UI +#define USE_UI static BOOL @@ -88,7 +88,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -155,7 +155,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -220,7 +220,7 @@ * Update the status bar with the current file */ #ifdef USE_UI - sprintf(szBuffer, "Reading %s", szShortName); + sprintf(szBuffer, "Setup is loading files (%s)", szShortName); UiDrawStatusText(szBuffer); #else printf("Reading %s\n", szShortName); @@ -232,6 +232,7 @@ return(TRUE); } +BOOL SetupUiInitialize(VOID); VOID RunLoader(VOID) { @@ -294,7 +295,7 @@ #endif #ifdef USE_UI - UiInitialize(); + SetupUiInitialize(); UiDrawStatusText(""); #endif _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/setupldr.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/setupldr.xml) _____ Copied: branches/xen/reactos/boot/freeldr/freeldr/setupldr_main.xml (from rev 15712, trunk/reactos/boot/freeldr/freeldr/setupldr_main.xml) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c --- branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c 2005-06-01 01:59:05 UTC (rev 15712) +++ branches/xen/reactos/boot/freeldr/freeldr/ui/ui.c 2005-06-01 16:27:21 UTC (rev 15713) @@ -27,6 +27,7 @@ #include <inifile.h> #include <version.h> #include <video.h> +#include <reactos/buildno.h> ULONG UiScreenWidth = 80; // Screen Width ULONG UiScreenHeight = 25; // Screen Height @@ -197,7 +198,40 @@ UserInterfaceUp = TRUE; DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; +} +BOOL SetupUiInitialize(VOID) +{ + + CHAR DisplayModeText[260]; + ULONG Depth; + + + DisplayModeText[0] = '\0'; + + + UiDisplayMode = MachVideoSetDisplayMode(DisplayModeText, TRUE); + MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); + + TuiInitialize(); + + // Draw the backdrop and fade it in if special effects are enabled + TuiFillArea(0, + 0, + UiScreenWidth - 1, + UiScreenHeight - 2, + 0, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); + + UiStatusBarBgColor = 7; + UserInterfaceUp = TRUE; + + TuiDrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor)); + TuiDrawText(3, 2, "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xC D\xCD\xCD\xCD\xCD\xCD\xCD", ATTR(COLOR_GRAY, UiBackdropBgColor)); + + DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n")); + return TRUE; }

1 0

[ion] 15712: Fix some debug messages (do I need to patch this to wine?)
by ion＠svn.reactos.com 01 Jun '05

01 Jun '05

Fix some debug messages (do I need to patch this to wine?) Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/makefile _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-06-01 01:56:55 UTC (rev 15711) +++ trunk/reactos/lib/setupapi/devinst.c 2005-06-01 01:59:05 UTC (rev 15712) @@ -1259,9 +1259,8 @@ BOOL bFileQueueCreated = FALSE; HKEY hClassKey; + FIXME("not fully implemented\n"); - FIXME("\n"); - if ((Flags & DI_NOVCP) && (FileQueue == NULL || FileQueue == INVALID_HANDLE_VALUE)) { SetLastError(ERROR_INVALID_PARAMETER); _____ Modified: trunk/reactos/lib/setupapi/makefile --- trunk/reactos/lib/setupapi/makefile 2005-06-01 01:56:55 UTC (rev 15711) +++ trunk/reactos/lib/setupapi/makefile 2005-06-01 01:59:05 UTC (rev 15712) @@ -1,5 +1,5 @@ # This file is automatically generated. -TOP = ..\.. +TOP = ../.. DEFAULT = setupapi include $(TOP)/proxy.mak

1 0

[ion] 15711: Fix some debug messages
by ion＠svn.reactos.com 01 Jun '05

01 Jun '05

Fix some debug messages Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/subsys/smss/smapicomp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-05-31 23:58:14 UTC (rev 15710) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-06-01 01:56:55 UTC (rev 15711) @@ -27,6 +27,7 @@ /* INCLUDES *******************************************************************/ +#define NDEBUG #include "vbemp.h" /* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ _____ Modified: trunk/reactos/subsys/smss/smapicomp.c --- trunk/reactos/subsys/smss/smapicomp.c 2005-05-31 23:58:14 UTC (rev 15710) +++ trunk/reactos/subsys/smss/smapicomp.c 2005-06-01 01:56:55 UTC (rev 15711) @@ -43,7 +43,7 @@ Status = SmCompleteClientInitialization ((ULONG) Request->Header.ClientId.UniqueProcess); if (!NT_SUCCESS(Status)) { - DPRINT1("SM: %s: NtQueryInformationProcess failed (Status=0x%08lx)\n", + DPRINT1("SM: %s: SmCompleteClientInitialization failed (Status=0x%08lx)\n", __FUNCTION__, Status); } Request->SmHeader.Status = Status;

1 0

[greatlrd] 15710: small optimze for StretchBlt
by greatlrd＠svn.reactos.com 31 May '05

31 May '05

small optimze for StretchBlt now do only getpixel ones instead call hole time on getpixel for the color value when it stretch to biger BMP the hole stretchblt need to be optimze this code are geting it working bit faster and it is reference implementation Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c --- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -627,6 +627,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; DPRINT("DIB_16BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -641,13 +643,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -665,19 +670,25 @@ if (sx > SourceRect->right) break; - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } } else { - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -687,7 +698,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -709,10 +720,13 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -722,7 +736,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -742,10 +756,13 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -755,7 +772,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -774,10 +791,13 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } break; @@ -786,7 +806,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -805,10 +825,13 @@ if (sx > SourceRect->right) break; color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_16BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_16BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_16BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -495,6 +495,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -505,14 +507,17 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -534,11 +539,15 @@ color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, color); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, color); } + + } } break; @@ -546,7 +555,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -568,12 +577,14 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; @@ -581,7 +592,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -601,12 +612,15 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -614,7 +628,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -634,12 +648,15 @@ color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -647,7 +664,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -667,19 +684,22 @@ color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; case BMF_32BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -699,11 +719,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_1BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -319,6 +319,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -329,13 +331,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -351,21 +356,25 @@ else sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - if (sx > SourceRect->right) break; - - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + + } else { - } else { - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -375,7 +384,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -394,11 +403,15 @@ if (sx > SourceRect->right) break; color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } } break; @@ -406,7 +419,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -425,11 +438,16 @@ if (sx > SourceRect->right) break; color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + } } break; @@ -437,7 +455,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -456,11 +474,16 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + } } break; @@ -468,7 +491,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -487,11 +510,16 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, color); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, color); } + + } } break; @@ -499,7 +527,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -519,11 +547,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_24BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_24BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -561,6 +561,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", @@ -575,14 +577,17 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; - + + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -602,16 +607,23 @@ if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } } else { - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -621,7 +633,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -644,10 +656,13 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } } } @@ -657,7 +672,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -677,11 +692,16 @@ color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + + + } } break; @@ -689,7 +709,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -708,11 +728,15 @@ if (sx > SourceRect->right) break; color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } } break; @@ -720,7 +744,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -739,11 +763,16 @@ if (sx > SourceRect->right) break; color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_32BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - } + + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_32BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_32BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } + + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c --- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -373,6 +373,9 @@ int DesY; int color; int zoomX; + int zoomY; + int count; + SrcSizeY = SourceRect->bottom; SrcSizeX = SourceRect->right; @@ -383,13 +386,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -407,19 +413,25 @@ if (sx > SourceRect->right) break; - if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) { - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 0)); + } - } else { - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } else { + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, 1)); + } } } } @@ -429,7 +441,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -451,12 +463,15 @@ color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, color); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, color); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, color); + } - } + } } break; @@ -464,7 +479,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -497,7 +512,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -517,12 +532,15 @@ color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -530,7 +548,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -550,12 +568,15 @@ color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + } - } + } } break; @@ -563,7 +584,7 @@ /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); @@ -583,12 +604,14 @@ color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); - if (zoomX>1) - DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - else - DIB_4BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); - + for (count=DesY;count<DesY+zoomY;count++) + { + if (zoomX>1) + DIB_4BPP_HLine(DestSurf, DesX, DesX + zoomX, count, XLATEOBJ_iXlate(ColorTranslation, color)); + else + DIB_4BPP_PutPixel(DestSurf, DesX, count, XLATEOBJ_iXlate(ColorTranslation, color)); } + } } break; _____ Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c --- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 22:06:18 UTC (rev 15709) +++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-05-31 23:58:14 UTC (rev 15710) @@ -551,6 +551,8 @@ int DesY; int color; int zoomX; + int zoomY; + int count; DPRINT("DIB_8BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, SourceRect->bottom, @@ -565,13 +567,16 @@ zoomX = DesSizeX / SrcSizeX; if (zoomX==0) zoomX=1; + zoomY = DesSizeY / SrcSizeY; + if (zoomY==0) zoomY=1; + switch(SourceSurf->iBitmapFormat) { case BMF_1BPP: /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ /* This is a reference implementation, it hasn't been optimized for speed */ - for (DesY=0; DesY<DestRect->bottom; DesY++) + for (DesY=0; DesY<DestRect->bottom; DesY+=zoomY) { if (DesSizeY>SrcSizeY) sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); [truncated at 1000 lines; 149 more skipped]

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