Ros-diffs May 2012

ros-diffs@reactos.org

12 participants
227 discussions

[tkreuzer] 56591: [WIN32K] Implement DC_bIsBitmapCompatible, which checks if a bitmap can be used with the DC in SelectBitmap or GetDIBits

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue May 15 16:52:21 2012 New Revision: 56591 URL: http://svn.reactos.org/svn/reactos?rev=56591&view=rev Log: [WIN32K] Implement DC_bIsBitmapCompatible, which checks if a bitmap can be used with the DC in SelectBitmap or GetDIBits Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dc.h [iso-8859-1] Tue May 15 16:52:21 2012 @@ -193,6 +193,10 @@ NTAPI DC_vSetBrushOrigin(PDC pdc, LONG x, LONG y); +BOOL +NTAPI +DC_bIsBitmapCompatible(PDC pdc, PSURFACE psurf); + FORCEINLINE PDC DC_LockDc(HDC hdc) Modified: branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c URL: http://svn.reactos.org/svn/reactos/branches/dib_rewrite/win32ss/gdi/ntgdi/d… ============================================================================== --- branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original) +++ branches/dib_rewrite/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Tue May 15 16:52:21 2012 @@ -316,6 +316,28 @@ return hOrgPen; } +BOOL +NTAPI +DC_bIsBitmapCompatible(PDC pdc, PSURFACE psurf) +{ + ULONG cBitsPixel; + + /* Must be an API bitmap */ + if (!(psurf->flags & API_BITMAP)) return FALSE; + + /* DIB sections are always compatible */ + if (psurf->ppal->flFlags & PAL_DIBSECTION) return TRUE; + + /* Get the bit depth of the bitmap */ + cBitsPixel = gajBitsPerFormat[psurf->SurfObj.iBitmapFormat]; + + /* 1 BPP is compatible */ + if ((cBitsPixel == 1) || (cBitsPixel == pdc->ppdev->gdiinfo.cBitsPixel)) + return TRUE; + + return FALSE; +} + /* * @implemented */ @@ -330,7 +352,6 @@ PSURFACE psurfNew, psurfOld; HRGN hVisRgn; HDC hdcOld; - ULONG cBitsPixel; ASSERT_NOGDILOCKS(); /* Verify parameters */ @@ -396,10 +417,7 @@ } /* Check if the bitmap is compatile with the dc */ - cBitsPixel = gajBitsPerFormat[psurfNew->SurfObj.iBitmapFormat]; - if ((cBitsPixel != 1) && - (cBitsPixel != pdc->ppdev->gdiinfo.cBitsPixel) && - (psurfNew->hSecure == NULL)) + if (!DC_bIsBitmapCompatible(pdc, psurfNew)) { /* Dereference the bitmap, unlock the DC and fail. */ SURFACE_ShareUnlockSurface(psurfNew);

12 years, 7 months

[cgutman] 56590: [NDIS] - Fix some sickening formatting disasters - Allocate the unicode string buffers from paged pool, like everything else in the NDIS config API

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon May 14 22:39:58 2012 New Revision: 56590 URL: http://svn.reactos.org/svn/reactos?rev=56590&view=rev Log: [NDIS] - Fix some sickening formatting disasters - Allocate the unicode string buffers from paged pool, like everything else in the NDIS config API Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon May 14 22:39:58 2012 @@ -444,10 +444,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"Environment", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"Environment") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -483,10 +481,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"ProcessorType", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"ProcessorType") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -519,10 +515,8 @@ return; } - if( - !wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && - wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR) - ) + if(!wcsncmp(Keyword->Buffer, L"NdisVersion", Keyword->Length/sizeof(WCHAR)) && + wcslen(L"NdisVersion") == Keyword->Length/sizeof(WCHAR)) { *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); if(!*ParameterValue) @@ -613,7 +607,7 @@ (*ParameterValue)->ParameterType = NdisParameterBinary; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -634,7 +628,7 @@ (*ParameterValue)->ParameterType = NdisParameterMultiString; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); @@ -678,7 +672,7 @@ (*ParameterValue)->ParameterType = NdisParameterString; - Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); if (!Buffer) { NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));

12 years, 7 months

[akhaldi] 56589: [MSI_WINETEST] * Sync to Wine 1.5.4.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 14 21:41:45 2012 New Revision: 56589 URL: http://svn.reactos.org/svn/reactos?rev=56589&view=rev Log: [MSI_WINETEST] * Sync to Wine 1.5.4. Modified: trunk/rostests/winetests/msi/action.c trunk/rostests/winetests/msi/automation.c trunk/rostests/winetests/msi/db.c trunk/rostests/winetests/msi/msi.c trunk/rostests/winetests/msi/package.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/action.c?re… Modified: trunk/rostests/winetests/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/automation.… Modified: trunk/rostests/winetests/msi/db.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/db.c?rev=56… Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=5… Modified: trunk/rostests/winetests/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/package.c?r…

12 years, 7 months

[akhaldi] 56588: [MSI] * Sync to Wine 1.5.4.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon May 14 21:41:31 2012 New Revision: 56588 URL: http://svn.reactos.org/svn/reactos?rev=56588&view=rev Log: [MSI] * Sync to Wine 1.5.4. Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt trunk/reactos/dll/win32/msi/action.c trunk/reactos/dll/win32/msi/appsearch.c trunk/reactos/dll/win32/msi/assembly.c trunk/reactos/dll/win32/msi/automation.c trunk/reactos/dll/win32/msi/custom.c trunk/reactos/dll/win32/msi/dialog.c trunk/reactos/dll/win32/msi/files.c trunk/reactos/dll/win32/msi/install.c trunk/reactos/dll/win32/msi/media.c trunk/reactos/dll/win32/msi/msi.c trunk/reactos/dll/win32/msi/msi.rc trunk/reactos/dll/win32/msi/msi.rgs trunk/reactos/dll/win32/msi/msi.spec trunk/reactos/dll/win32/msi/msipriv.h trunk/reactos/dll/win32/msi/package.c trunk/reactos/dll/win32/msi/registry.c trunk/reactos/dll/win32/msi/script.c trunk/reactos/dll/win32/msi/sql.tab.c trunk/reactos/dll/win32/msi/table.c trunk/reactos/include/psdk/msi.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/CMakeLists.t… Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… Modified: trunk/reactos/dll/win32/msi/appsearch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/appsearch.c?… Modified: trunk/reactos/dll/win32/msi/assembly.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/assembly.c?r… Modified: trunk/reactos/dll/win32/msi/automation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/automation.c… Modified: trunk/reactos/dll/win32/msi/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/custom.c?rev… Modified: trunk/reactos/dll/win32/msi/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev… Modified: trunk/reactos/dll/win32/msi/files.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=… Modified: trunk/reactos/dll/win32/msi/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/install.c?re… Modified: trunk/reactos/dll/win32/msi/media.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=… Modified: trunk/reactos/dll/win32/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=56… Modified: trunk/reactos/dll/win32/msi/msi.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rc?rev=5… Modified: trunk/reactos/dll/win32/msi/msi.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rgs?rev=… Modified: trunk/reactos/dll/win32/msi/msi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.spec?rev… Modified: trunk/reactos/dll/win32/msi/msipriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msipriv.h?re… Modified: trunk/reactos/dll/win32/msi/package.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/package.c?re… Modified: trunk/reactos/dll/win32/msi/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/registry.c?r… Modified: trunk/reactos/dll/win32/msi/script.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/script.c?rev… Modified: trunk/reactos/dll/win32/msi/sql.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/sql.tab.c?re… Modified: trunk/reactos/dll/win32/msi/table.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/table.c?rev=… Modified: trunk/reactos/include/psdk/msi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msi.h?rev=565… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

12 years, 7 months

[tfaber] 56587: [SHELL32] - Port CommandLineToArgvW fixes from Wine. Fixes crash in shell32:shlexec test.

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 14 19:26:40 2012 New Revision: 56587 URL: http://svn.reactos.org/svn/reactos?rev=56587&view=rev Log: [SHELL32] - Port CommandLineToArgvW fixes from Wine. Fixes crash in shell32:shlexec test. Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp Modified: trunk/reactos/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shell32_main.cpp [iso-8859-1] Mon May 14 19:26:40 2012 @@ -66,27 +66,34 @@ LPWSTR cmdline; int in_quotes,bcount; + if(!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (*lpCmdline==0) { /* Return the path to the executable */ - DWORD len, size=16; - - argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size); + DWORD len, deslen=MAX_PATH, size; + + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); for (;;) { - len = GetModuleFileNameW(0, (LPWSTR)(argv+1), (size-sizeof(LPWSTR))/sizeof(WCHAR)); + if (!(argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, size))) return NULL; + len = GetModuleFileNameW(0, (LPWSTR)(argv+1), deslen); if (!len) { LocalFree(argv); return NULL; } - if (len < size) break; - size*=2; - argv = (LPWSTR *)LocalReAlloc(argv, size, 0); + if (len < deslen) break; + deslen*=2; + size = sizeof(LPWSTR) + deslen*sizeof(WCHAR) + sizeof(LPWSTR); + LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); - if (numargs) - *numargs=1; + *numargs=1; return argv; } @@ -133,11 +140,9 @@ /* Allocate in a single lump, the string array, and the strings that go with it. * This way the caller can make a single GlobalFree call to free both, as per MSDN. */ - argv = (LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); - + argv=(LPWSTR *)LocalAlloc(LMEM_FIXED, argc*sizeof(LPWSTR)+(wcslen(lpCmdline)+1)*sizeof(WCHAR)); if (!argv) return NULL; - cmdline=(LPWSTR)(argv+argc); wcscpy(cmdline, lpCmdline); @@ -203,8 +208,7 @@ *d='\0'; argv[argc++]=arg; } - if (numargs) - *numargs=argc; + *numargs=argc; return argv; }

12 years, 7 months

[tkreuzer] 56586: [GDI32_APITEST] Simplify code

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon May 14 11:48:17 2012 New Revision: 56586 URL: http://svn.reactos.org/svn/reactos?rev=56586&view=rev Log: [GDI32_APITEST] Simplify code Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c Modified: trunk/rostests/apitests/gdi32/CreateDIBitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/CreateDIBi… ============================================================================== --- trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/CreateDIBitmap.c [iso-8859-1] Mon May 14 11:48:17 2012 @@ -28,7 +28,7 @@ return FALSE; } - if (fuUsage != 0) + if (fuUsage != DIB_RGB_COLORS) { if (hdc == (HDC)-1) { @@ -76,22 +76,19 @@ return TRUE; } - if (lpbmih && (lpbmih != (PVOID)0xc0000000) && (lpbmih->biSize != 0)) - { - if (hdc == (HDC)-1) - { - *pdwError = ERROR_INVALID_PARAMETER; - return FALSE; - } - } - - if ((lpbmih == NULL) || (lpbmih == (PVOID)0xC0000000) || (lpbmih->biSize == 0)) { return FALSE; } + + if (hdc == (HDC)-1) + { + *pdwError = ERROR_INVALID_PARAMETER; + return FALSE; + } + if (lpbmi == (PVOID)0xc0000000) return FALSE;

12 years, 7 months

[ekohl] 56585: [SAMLIB] Remove the unused functions SamGetDomainSid and SamSetDomainSid. They have been replaced by LSA APIs.

by ekohl＠svn.reactos.org

Author: ekohl Date: Mon May 14 00:01:24 2012 New Revision: 56585 URL: http://svn.reactos.org/svn/reactos?rev=56585&view=rev Log: [SAMLIB] Remove the unused functions SamGetDomainSid and SamSetDomainSid. They have been replaced by LSA APIs. Modified: trunk/reactos/dll/win32/samlib/samlib.c trunk/reactos/dll/win32/samlib/samlib.spec trunk/reactos/include/reactos/libs/samlib/samlib.h Modified: trunk/reactos/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.c?… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.c [iso-8859-1] Mon May 14 00:01:24 2012 @@ -298,52 +298,6 @@ } -BOOL WINAPI -SamGetDomainSid (PSID *Sid) -{ - DPRINT ("SamGetDomainSid() called\n"); - - return FALSE; -} - - -BOOL WINAPI -SamSetDomainSid (PSID Sid) -{ - HKEY hAccountKey; - - DPRINT ("SamSetDomainSid() called\n"); - - if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, - L"SAM\\SAM\\Domains\\Account", - 0, - KEY_ALL_ACCESS, - &hAccountKey)) - { - DPRINT1 ("Failed to open the Account key! (Error %lu)\n", GetLastError()); - return FALSE; - } - - if (RegSetValueExW (hAccountKey, - L"Sid", - 0, - REG_BINARY, - (LPBYTE)Sid, - RtlLengthSid (Sid))) - { - DPRINT1 ("Failed to set Domain-SID value! (Error %lu)\n", GetLastError()); - RegCloseKey (hAccountKey); - return FALSE; - } - - RegCloseKey (hAccountKey); - - DPRINT ("SamSetDomainSid() called\n"); - - return TRUE; -} - - /* * ERROR_USER_EXISTS */ Modified: trunk/reactos/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samlib/samlib.sp… ============================================================================== --- trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samlib/samlib.spec [iso-8859-1] Mon May 14 00:01:24 2012 @@ -65,8 +65,6 @@ @ stub SamiSetDSRMPasswordOWF @ stdcall SamInitializeSAM() -@ stdcall SamGetDomainSid(ptr) -@ stdcall SamSetDomainSid(ptr) @ stdcall SamCreateUser(wstr wstr ptr) @ stdcall SamCheckUserPassword(wstr wstr) @ stdcall SamGetUserSid(wstr ptr) Modified: trunk/reactos/include/reactos/libs/samlib/samlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/samli… ============================================================================== --- trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/samlib/samlib.h [iso-8859-1] Mon May 14 00:01:24 2012 @@ -30,12 +30,6 @@ SamInitializeSAM (VOID); BOOL WINAPI -SamGetDomainSid (PSID *Sid); - -BOOL WINAPI -SamSetDomainSid (PSID Sid); - -BOOL WINAPI SamCreateUser (PWSTR UserName, PWSTR UserPassword, PSID UserSid);

12 years, 7 months

[ekohl] 56584: [SYSSETUP] Remove the now outdated call to SamSetDomainSid.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun May 13 23:33:36 2012 New Revision: 56584 URL: http://svn.reactos.org/svn/reactos?rev=56584&view=rev Log: [SYSSETUP] Remove the now outdated call to SamSetDomainSid. Modified: trunk/reactos/dll/win32/syssetup/security.c Modified: trunk/reactos/dll/win32/syssetup/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/securit… ============================================================================== --- trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/security.c [iso-8859-1] Sun May 13 23:33:36 2012 @@ -25,9 +25,6 @@ LSA_OBJECT_ATTRIBUTES ObjectAttributes; LSA_HANDLE PolicyHandle; NTSTATUS Status; - - if (DomainSid != NULL) - SamSetDomainSid (DomainSid); memset(&ObjectAttributes, 0, sizeof(LSA_OBJECT_ATTRIBUTES)); ObjectAttributes.Length = sizeof(LSA_OBJECT_ATTRIBUTES);

12 years, 7 months

[spetreolle] 56583: [MSI] Create InstallerLocation key, regression from r55046. Fixes msi installer check in bug 6879.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun May 13 22:49:24 2012 New Revision: 56583 URL: http://svn.reactos.org/svn/reactos?rev=56583&view=rev Log: [MSI] Create InstallerLocation key, regression from r55046. Fixes msi installer check in bug 6879. Modified: trunk/reactos/media/inf/syssetup.inf Modified: trunk/reactos/media/inf/syssetup.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf?rev… ============================================================================== --- trunk/reactos/media/inf/syssetup.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/syssetup.inf [iso-8859-1] Sun May 13 22:49:24 2012 @@ -28,6 +28,7 @@ [RegistrationPhase2] RegisterDlls = OleControlDlls +AddReg=Classes [OleControlDlls] 11,,atl.dll,1 @@ -89,3 +90,16 @@ 11,,wininet.dll,2 11,,wintrust.dll,1 11,,wuapi.dll,1 + +[Strings] +MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" +Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32" +Desktop="Control Panel\Desktop" +Metrics="Control Panel\Desktop\WindowMetrics" +CurrentVersion="Software\Microsoft\Windows\CurrentVersion" +CurrentVersionNT="Software\Microsoft\Windows NT\CurrentVersion" +FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes" +Control="System\CurrentControlSet\Control" + +[Classes] +HKLM,%CurrentVersion%\Installer,"InstallerLocation",,"%11%"

12 years, 7 months

[tkreuzer] 56582: [WIN32K] - Handle unknown color types in TranslateCOLORREF - properly translate the color back to RGB in NtGdiSetPixel Fixes a few hundred thousand gdi32 winetests (dib) :)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 13 22:31:28 2012 New Revision: 56582 URL: http://svn.reactos.org/svn/reactos?rev=56582&view=rev Log: [WIN32K] - Handle unknown color types in TranslateCOLORREF - properly translate the color back to RGB in NtGdiSetPixel Fixes a few hundred thousand gdi32 winetests (dib) :) Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c Modified: trunk/reactos/win32ss/gdi/ntgdi/bitblt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/bitblt.c… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/bitblt.c [iso-8859-1] Sun May 13 22:31:28 2012 @@ -18,11 +18,10 @@ #define ROP_TO_ROP4(Rop) ((Rop) >> 16) ULONG -TranslateCOLORREF(PDC pdc, COLORREF *pcrColor) +TranslateCOLORREF(PDC pdc, COLORREF crColor) { PPALETTE ppalDC, ppalSurface; ULONG index, ulColor, iBitmapFormat; - COLORREF crColor = *pcrColor; EXLATEOBJ exlo; switch (crColor >> 24) @@ -65,15 +64,11 @@ else if (iBitmapFormat == BMF_8BPP) index = crColor & 0xFF; else if (iBitmapFormat == BMF_16BPP) index = crColor & 0xFFFF; else index = crColor & 0xFFFFFF; - - /* Translate the color to RGB for the caller */ - ppalSurface = pdc->dclevel.pSurface->ppal; - *pcrColor = PALETTE_ulGetRGBColorFromIndex(ppalSurface, index); return index; default: DPRINT("Unsupported color type %d passed\n", crColor >> 24); - return 0; + crColor &= 0xFFFFFF; } /* Initialize an XLATEOBJ from RGB to the target surface */ @@ -86,19 +81,6 @@ /* Cleanup the XLATEOBJ */ EXLATEOBJ_vCleanup(&exlo); - /* Initialize an XLATEOBJ from the target surface to RGB */ - EXLATEOBJ_vInitialize(&exlo, - ppalSurface, - &gpalRGB, - 0, - pdc->pdcattr->crBackgroundClr, - pdc->pdcattr->crForegroundClr); - - /* Translate the color back to RGB */ - *pcrColor = XLATEOBJ_iXlate(&exlo.xlo, ulColor); - - /* Cleanup and return the target format color */ - EXLATEOBJ_vCleanup(&exlo); return ulColor; } @@ -1070,6 +1052,7 @@ BOOL bResult; PEBRUSHOBJ pebo; ULONG ulDirty; + EXLATEOBJ exlo; /* Lock the DC */ pdc = DC_LockDc(hdc); @@ -1088,7 +1071,7 @@ } /* Translate the color to the target format and get the RGB value */ - iSolidColor = TranslateCOLORREF(pdc, &crColor); + iSolidColor = TranslateCOLORREF(pdc, crColor); /* Use the DC's text brush, which is always a solid brush */ pebo = &pdc->eboText; @@ -1106,6 +1089,20 @@ /* Restore old text brush color and dirty flags */ EBRUSHOBJ_iSetSolidColor(pebo, iOldColor); pdc->pdcattr->ulDirty_ = ulDirty; + + /* Initialize an XLATEOBJ from the target surface to RGB */ + EXLATEOBJ_vInitialize(&exlo, + pdc->dclevel.pSurface->ppal, + &gpalRGB, + 0, + pdc->pdcattr->crBackgroundClr, + pdc->pdcattr->crForegroundClr); + + /* Translate the color back to RGB */ + crColor = XLATEOBJ_iXlate(&exlo.xlo, iSolidColor); + + /* Cleanup and return the target format color */ + EXLATEOBJ_vCleanup(&exlo); /* Unlock the DC */ DC_UnlockDc(pdc);

12 years, 7 months

← Newer
1
...
7
8
9
10
11
12
13
...
23
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 May 2012