Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[fireball] 46917: [USER32] - Fix SetSysColorTemps prototype and implementation for 64 bit compatibility.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 18 14:42:28 2010 New Revision: 46917 URL: http://svn.reactos.org/svn/reactos?rev=46917&view=rev Log: [USER32] - Fix SetSysColorTemps prototype and implementation for 64 bit compatibility. Modified: trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/include/psdk/winuser.h Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Apr 18 14:42:28 2010 @@ -170,7 +170,7 @@ static HPEN SysColorPens[COLOR_MENUBAR + 1]; static HBRUSH SysColorBrushes[COLOR_MENUBAR + 1]; -DWORD +DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *pPens, const HBRUSH *pBrushes, @@ -193,7 +193,7 @@ SysColorBrushes[i] = pBrushes[i]; } - return (DWORD) pOldCol; /* FIXME: pointer truncation */ + return (DWORD_PTR) pOldCol; } if (!pPens && !pBrushes) /* "restore" call */ { Modified: trunk/reactos/include/psdk/winuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Sun Apr 18 14:42:28 2010 @@ -4442,7 +4442,7 @@ int WINAPI SetScrollPos(HWND,int,int,BOOL); BOOL WINAPI SetScrollRange(HWND,int,int,int,BOOL); BOOL WINAPI SetSysColors(int,const INT *,const COLORREF *); -DWORD WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD); +DWORD_PTR WINAPI SetSysColorsTemp(const COLORREF *, const HBRUSH *, DWORD); #define SetSysModalWindow(h) (NULL) BOOL WINAPI SetSystemCursor(HCURSOR,DWORD); BOOL WINAPI SetSystemMenu(HWND,HMENU);

14 years, 5 months

[mjmartin] 46916: [NTMARTA] - AccRewriteSetEntriesInAcl: Fix a bug that caused the for loop never to complete due to reuse of same variable.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun Apr 18 14:06:29 2010 New Revision: 46916 URL: http://svn.reactos.org/svn/reactos?rev=46916&view=rev Log: [NTMARTA] - AccRewriteSetEntriesInAcl: Fix a bug that caused the for loop never to complete due to reuse of same variable. Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Sun Apr 18 14:06:29 2010 @@ -1236,7 +1236,7 @@ DWORD ObjectsPresent; BOOL needToClean; PSID pSid1, pSid2; - ULONG i; + ULONG i, j; LSA_HANDLE PolicyHandle = NULL; BOOL bRet; DWORD LastErr; @@ -1295,11 +1295,11 @@ case REVOKE_ACCESS: case SET_ACCESS: /* Discard all accesses for the trustee... */ - for (i = 0; i < SizeInformation.AceCount; i++) + for (j = 0; j < SizeInformation.AceCount; j++) { - if (!pKeepAce[i]) + if (!pKeepAce[j]) continue; - if (!GetAce(OldAcl, i, (PVOID*)&pAce)) + if (!GetAce(OldAcl, j, (PVOID*)&pAce)) { Ret = GetLastError(); goto Cleanup; @@ -1308,7 +1308,7 @@ pSid2 = AccpGetAceSid(pAce); if (RtlEqualSid(pSid1, pSid2)) { - pKeepAce[i] = FALSE; + pKeepAce[j] = FALSE; SizeInformation.AclBytesInUse -= pAce->AceSize; } }

14 years, 5 months

[fireball] 46915: [VENDOR/WINE] - Import Wine-1.1.43 gdi32, user32, winex11.drv, wineserver.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 18 10:32:01 2010 New Revision: 46915 URL: http://svn.reactos.org/svn/reactos?rev=46915&view=rev Log: [VENDOR/WINE] - Import Wine-1.1.43 gdi32, user32, winex11.drv, wineserver. Added: vendor/wine/dlls/user32/current/resources/oic_bang.svg vendor/wine/dlls/user32/current/resources/oic_hand.svg vendor/wine/dlls/user32/current/resources/oic_note.svg vendor/wine/dlls/user32/current/resources/oic_ques.svg vendor/wine/dlls/user32/current/resources/oic_sample.svg vendor/wine/server/current/wineserver.de.man.in (with props) Modified: vendor/wine/dlls/gdi32/current/Makefile.in vendor/wine/dlls/gdi32/current/bidi.c vendor/wine/dlls/gdi32/current/dib.c vendor/wine/dlls/gdi32/current/painting.c vendor/wine/dlls/gdi32/current/tests/bitmap.c vendor/wine/dlls/gdi32/current/tests/generated.c vendor/wine/dlls/gdi32/current/tests/path.c vendor/wine/dlls/user32/current/Makefile.in vendor/wine/dlls/user32/current/button.c vendor/wine/dlls/user32/current/menu.c vendor/wine/dlls/user32/current/resources/oic_bang.ico vendor/wine/dlls/user32/current/resources/oic_hand.ico vendor/wine/dlls/user32/current/resources/oic_note.ico vendor/wine/dlls/user32/current/resources/oic_ques.ico vendor/wine/dlls/user32/current/resources/oic_sample.ico vendor/wine/dlls/user32/current/resources/oic_winlogo.ico vendor/wine/dlls/user32/current/resources/oic_winlogo.svg vendor/wine/dlls/user32/current/sysparams.c vendor/wine/dlls/user32/current/tests/generated.c vendor/wine/dlls/user32/current/tests/menu.c vendor/wine/dlls/user32/current/tests/win.c vendor/wine/dlls/user32/current/winpos.c vendor/wine/dlls/winex11.drv/current/bitblt.c vendor/wine/dlls/winex11.drv/current/bitmap.c vendor/wine/dlls/winex11.drv/current/dib.c vendor/wine/dlls/winex11.drv/current/mouse.c vendor/wine/dlls/winex11.drv/current/opengl.c vendor/wine/dlls/winex11.drv/current/window.c vendor/wine/dlls/winex11.drv/current/x11drv.h vendor/wine/dlls/winex11.drv/current/x11drv_main.c vendor/wine/dlls/winex11.drv/current/xrender.c vendor/wine/server/current/Makefile.in vendor/wine/server/current/ptrace.c vendor/wine/server/current/wineserver.fr.man.in vendor/wine/server/current/wineserver.man.in [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/wine/dlls/gdi32/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/Makefile.… Modified: vendor/wine/dlls/gdi32/current/bidi.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/bidi.c?re… Modified: vendor/wine/dlls/gdi32/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/dib.c?rev… Modified: vendor/wine/dlls/gdi32/current/painting.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/painting.… Modified: vendor/wine/dlls/gdi32/current/tests/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/bit… Modified: vendor/wine/dlls/gdi32/current/tests/generated.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/gen… Modified: vendor/wine/dlls/gdi32/current/tests/path.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/gdi32/current/tests/pat… Modified: vendor/wine/dlls/user32/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/Makefile… Modified: vendor/wine/dlls/user32/current/button.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/button.c… Modified: vendor/wine/dlls/user32/current/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/menu.c?r… Modified: vendor/wine/dlls/user32/current/resources/oic_bang.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Added: vendor/wine/dlls/user32/current/resources/oic_bang.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_hand.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Added: vendor/wine/dlls/user32/current/resources/oic_hand.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_note.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Added: vendor/wine/dlls/user32/current/resources/oic_note.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_ques.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Added: vendor/wine/dlls/user32/current/resources/oic_ques.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_sample.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Added: vendor/wine/dlls/user32/current/resources/oic_sample.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_winlogo.ico URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/resources/oic_winlogo.svg URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/resource… Modified: vendor/wine/dlls/user32/current/sysparams.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/sysparam… Modified: vendor/wine/dlls/user32/current/tests/generated.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/ge… Modified: vendor/wine/dlls/user32/current/tests/menu.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/me… Modified: vendor/wine/dlls/user32/current/tests/win.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/tests/wi… Modified: vendor/wine/dlls/user32/current/winpos.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/user32/current/winpos.c… Modified: vendor/wine/dlls/winex11.drv/current/bitblt.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/bitmap.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/bit… Modified: vendor/wine/dlls/winex11.drv/current/dib.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/dib… Modified: vendor/wine/dlls/winex11.drv/current/mouse.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/mou… Modified: vendor/wine/dlls/winex11.drv/current/opengl.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/ope… Modified: vendor/wine/dlls/winex11.drv/current/window.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/win… Modified: vendor/wine/dlls/winex11.drv/current/x11drv.h URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/x11drv_main.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/x11… Modified: vendor/wine/dlls/winex11.drv/current/xrender.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/winex11.drv/current/xre… Modified: vendor/wine/server/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/Makefile.in?r… Modified: vendor/wine/server/current/ptrace.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/ptrace.c?rev=… Added: vendor/wine/server/current/wineserver.de.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/wineserver.de… Modified: vendor/wine/server/current/wineserver.fr.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/wineserver.fr… Modified: vendor/wine/server/current/wineserver.man.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/server/current/wineserver.ma…

14 years, 5 months

[fireball] 46914: - Get rid of the last hardcoded screen size. - Remove unnecessary function declaration. See issue #5304 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Apr 18 10:15:55 2010 New Revision: 46914 URL: http://svn.reactos.org/svn/reactos?rev=46914&view=rev Log: - Get rid of the last hardcoded screen size. - Remove unnecessary function declaration. See issue #5304 for more details. Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Apr 18 10:15:55 2010 @@ -274,8 +274,8 @@ nmh.hdr.idFrom = 0; nmh.hdr.code = PM_SHOW_DESKTOP; - nmh.ShowDesktop.Width = 800; - nmh.ShowDesktop.Height = 600; + nmh.ShowDesktop.Width = GetSystemMetrics(SM_CXVIRTUALSCREEN); + nmh.ShowDesktop.Height = GetSystemMetrics(SM_CYVIRTUALSCREEN); SendMessageW(BackgroundWnd, WM_NOTIFY, Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Sun Apr 18 10:15:55 2010 @@ -21,7 +21,6 @@ #include <debug.h> void init_directories(void); -BOOL FASTCALL IntCreatePrimarySurface(); NTSTATUS FASTCALL InitDcImpl(VOID); /* GLOBALS *******************************************************************/

14 years, 5 months

[cgutman] 46913: [PCMCIA] - Check if the IOCTL interface should be enabled (not used yet)

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 18 01:32:29 2010 New Revision: 46913 URL: http://svn.reactos.org/svn/reactos?rev=46913&view=rev Log: [PCMCIA] - Check if the IOCTL interface should be enabled (not used yet) Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.c Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.c [iso-8859-1] Sun Apr 18 01:32:29 2010 @@ -10,6 +10,8 @@ //#define NDEBUG #include <debug.h> + +BOOLEAN IoctlEnabled; NTSTATUS NTAPI @@ -202,6 +204,11 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + DPRINT1("PCMCIA: DriverEntry\n"); + DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; @@ -211,7 +218,25 @@ DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; DriverObject->DriverUnload = PcmciaUnload; - DPRINT1("PCMCIA: DriverEntry\n"); + RtlZeroMemory(QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 2); + + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].Name = L"IoctlInterface"; + QueryTable[0].EntryContext = &IoctlEnabled; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + L"Pcmcia\\Parameters", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Key not present so assume disabled */ + IoctlEnabled = FALSE; + } + + DPRINT("PCMCIA: Ioctl interface %s\n", + (IoctlEnabled ? "enabled" : "disabled")); return STATUS_SUCCESS; }

14 years, 5 months

[cgutman] 46912: [NTOSKRNL] - Hackfix the device manager issue

by cgutman＠svn.reactos.org

Author: cgutman Date: Sun Apr 18 01:13:07 2010 New Revision: 46912 URL: http://svn.reactos.org/svn/reactos?rev=46912&view=rev Log: [NTOSKRNL] - Hackfix the device manager issue Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Apr 18 01:13:07 2010 @@ -502,9 +502,12 @@ UNICODE_STRING FullServiceName; UNICODE_STRING LegacyPrefix = RTL_CONSTANT_STRING(L"LEGACY_"); UNICODE_STRING UnknownDeviceName = RTL_CONSTANT_STRING(L"UNKNOWN"); - UNICODE_STRING KeyName, ClassName, ClassGUID; + UNICODE_STRING KeyName, ClassName; PUNICODE_STRING ServiceName1; ULONG LegacyValue; +#if 0 + UNICODE_STRING ClassGUID; +#endif HANDLE InstanceHandle; DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", @@ -587,6 +590,7 @@ RtlInitUnicodeString(&ClassName, L"LegacyDriver"); Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length); +#if 0 if (NT_SUCCESS(Status)) { RtlInitUnicodeString(&KeyName, L"ClassGUID"); @@ -594,6 +598,7 @@ RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}"); Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length); } +#endif } }

14 years, 5 months

[jgardou] 46911: [WIN32K] - Use DC_vPrepareForBlit, DC_vFinishBlit in GreTextOutputW - So we can get rid of MouseSafetyOnDraw{Start, End} in IntEngMaskBlt

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Apr 18 00:48:44 2010 New Revision: 46911 URL: http://svn.reactos.org/svn/reactos?rev=46911&view=rev Log: [WIN32K] - Use DC_vPrepareForBlit, DC_vFinishBlit in GreTextOutputW - So we can get rid of MouseSafetyOnDraw{Start,End} in IntEngMaskBlt Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/bitblt.c [iso-8859-1] Sun Apr 18 00:48:44 2010 @@ -973,8 +973,6 @@ psurfDest = CONTAINING_RECORD(psoDest, SURFACE, SurfObj); SURFACE_LockBitmapBits(psurfDest); - MouseSafetyOnDrawStart(psoDest, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); /* Dummy BitBlt to let driver know that it should flush its changes. This should really be done using a call to DrvSynchronizeSurface, @@ -991,7 +989,6 @@ DestRect, pptlMask, pptlMask, pbo, BrushOrigin, R4_NOOP, FALSE); - MouseSafetyOnDrawEnd(psoDest); SURFACE_UnlockBitmapBits(psurfDest); return ret; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Sun Apr 18 00:48:44 2010 @@ -3187,6 +3187,9 @@ return TRUE; } + /* FIXME : This is ugly, but this function must be rewritten anyway */ + DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds, NULL, DestRect); + pdcattr = dc->pdcattr; if (pdcattr->ulDirty_ & DIRTY_TEXT) @@ -3613,6 +3616,7 @@ if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); good: + DC_vFinishBlit(dc, NULL); DC_UnlockDc( dc ); return TRUE; @@ -3623,6 +3627,7 @@ fail: if (TextObj != NULL) TEXTOBJ_UnlockText(TextObj); + DC_vFinishBlit(dc, NULL); DC_UnlockDc(dc); return FALSE;

14 years, 5 months

[gschneider] 46910: [GDI32] GetFontUnicodeRanges was introduced in Windows 2000, patch by Love Nystrom See issue #5031 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sat Apr 17 22:59:59 2010 New Revision: 46910 URL: http://svn.reactos.org/svn/reactos?rev=46910&view=rev Log: [GDI32] GetFontUnicodeRanges was introduced in Windows 2000, patch by Love Nystrom See issue #5031 for more details. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sat Apr 17 22:59:59 2010 @@ -3050,7 +3050,9 @@ UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,UINT,PIXELFORMATDESCRIPTOR*); DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); DWORD WINAPI GetFontLanguageInfo(HDC); +#if (_WIN32_WINNT >= 0x0500) DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET); +#endif DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD); DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*);

14 years, 5 months

[jgardou] 46909: [WIN32K] - apply policy into DC_vPrepareDCsForBlit as in GDIOBJ_LockMultipleObjects before Physicus sees this :-D - GDIOBJ_LockObj : return NULL when handle is NULL : more speed, less debug output

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 17 22:51:42 2010 New Revision: 46909 URL: http://svn.reactos.org/svn/reactos?rev=46909&view=rev Log: [WIN32K] - apply policy into DC_vPrepareDCsForBlit as in GDIOBJ_LockMultipleObjects before Physicus sees this :-D - GDIOBJ_LockObj : return NULL when handle is NULL : more speed, less debug output Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Sat Apr 17 22:51:42 2010 @@ -463,15 +463,50 @@ PDC pdc2, RECT rc2) { - if(pdc1->dctype == DCTYPE_DIRECT) - { - EngAcquireSemaphore(pdc1->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(&pdc1->dclevel.pSurface->SurfObj, rc1.left, rc1.top, rc1.right, rc1.bottom) ; - } - if(pdc2 && pdc2->dctype == DCTYPE_DIRECT) - { - EngAcquireSemaphore(pdc2->ppdev->hsemDevLock); - MouseSafetyOnDrawStart(&pdc2->dclevel.pSurface->SurfObj, rc2.left, rc2.top, rc2.right, rc2.bottom) ; + PDC pdcFirst, pdcSecond; + PRECT prcFirst, prcSecond; + /* Lock them in good order */ + if(pdc2) + { + if((ULONG_PTR)pdc1->BaseObject.hHmgr >= (ULONG_PTR)pdc2->BaseObject.hHmgr) + { + pdcFirst = pdc1; + prcFirst = &rc1; + pdcSecond = pdc2; + prcSecond = &rc2; + } + else + { + pdcFirst = pdc2; + prcFirst = &rc2; + pdcSecond = pdc1; + prcSecond = &rc1; + } + } + else + { + pdcFirst = pdc1 ; + prcFirst = &rc1; + pdcSecond = NULL ; + } + + if(pdcFirst && pdcFirst->dctype == DCTYPE_DIRECT) + { + EngAcquireSemaphore(pdcFirst->ppdev->hsemDevLock); + MouseSafetyOnDrawStart(&pdcFirst->dclevel.pSurface->SurfObj, + prcFirst->left, + prcFirst->top, + prcFirst->right, + prcFirst->bottom) ; + } + if(pdcSecond && pdcSecond->dctype == DCTYPE_DIRECT) + { + EngAcquireSemaphore(pdcSecond->ppdev->hsemDevLock); + MouseSafetyOnDrawStart(&pdcSecond->dclevel.pSurface->SurfObj, + prcSecond->left, + prcSecond->top, + prcSecond->right, + prcSecond->bottom) ; } } Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Sat Apr 17 22:51:42 2010 @@ -952,6 +952,10 @@ POBJ Object = NULL; ULONG HandleType, HandleUpper; + /* Check for dummy call */ + if(hObj == NULL) + return NULL ; + GDIDBG_INITLOOPTRACE(); HandleIndex = GDI_HANDLE_GET_INDEX(hObj); @@ -959,7 +963,7 @@ HandleUpper = GDI_HANDLE_GET_UPPER(hObj); /* Check that the handle index is valid. */ - if (HandleIndex >= GDI_HANDLE_COUNT) + if (HandleIndex >= GDI_HANDLE_COUNT ) return NULL; Entry = &GdiHandleTable->Entries[HandleIndex];

14 years, 5 months

[jgardou] 46908: [WIN32K] - Now we welcome GreStretchBltMask into the fabulous world of GDIOBJ_LockMultipleObjects, DC_vPrepareDCsForBlit and DC_vFinishBlit - With the assorted MouseSafetyOnDraw{Start, End} removal

by jgardou＠svn.reactos.org

Author: jgardou Date: Sat Apr 17 22:27:32 2010 New Revision: 46908 URL: http://svn.reactos.org/svn/reactos?rev=46908&view=rev Log: [WIN32K] - Now we welcome GreStretchBltMask into the fabulous world of GDIOBJ_LockMultipleObjects, DC_vPrepareDCsForBlit and DC_vFinishBlit - With the assorted MouseSafetyOnDraw{Start,End} removal Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/stretchblt.c [iso-8859-1] Sat Apr 17 22:27:32 2010 @@ -463,8 +463,6 @@ /* No success yet */ ret = FALSE; SURFACE_LockBitmapBits(psurfDest); - MouseSafetyOnDrawStart(psoDest, OutputRect.left, OutputRect.top, - OutputRect.right, OutputRect.bottom); if (UsesSource) { @@ -473,8 +471,6 @@ { SURFACE_LockBitmapBits(psurfSource); } - MouseSafetyOnDrawStart(psoSource, InputRect.left, InputRect.top, - InputRect.right, InputRect.bottom); } /* Prepare color adjustment */ @@ -516,13 +512,11 @@ if (UsesSource) { - MouseSafetyOnDrawEnd(psoSource); if (psoSource != psoDest) { SURFACE_UnlockBitmapBits(psurfSource); } } - MouseSafetyOnDrawEnd(psoDest); SURFACE_UnlockBitmapBits(psurfDest); return ret; Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/bitblt.c [iso-8859-1] Sat Apr 17 22:27:32 2010 @@ -708,6 +708,8 @@ PDC DCDest; PDC DCSrc = NULL; PDC DCMask = NULL; + HDC ahDC[3]; + PGDIOBJ apObj[3]; PDC_ATTR pdcattr; SURFACE *BitmapDest, *BitmapSrc = NULL; SURFACE *BitmapMask = NULL; @@ -726,45 +728,55 @@ return FALSE; } - DCDest = DC_LockDc(hDCDest); + DPRINT("Locking DCs\n"); + ahDC[0] = hDCDest; + ahDC[1] = hDCSrc ; + ahDC[2] = hDCMask ; + GDIOBJ_LockMultipleObjs(3, ahDC, apObj); + DCDest = apObj[0]; + DCSrc = apObj[1]; + DCMask = apObj[2]; + if (NULL == DCDest) { - DPRINT1("Invalid destination dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCDest); - SetLastWin32Error(ERROR_INVALID_HANDLE); + if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject); + if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject); + DPRINT("Invalid destination dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCDest); return FALSE; } if (DCDest->dctype == DC_TYPE_INFO) { - DC_UnlockDc(DCDest); + if(DCSrc) GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject); + if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject); + GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject); /* Yes, Windows really returns TRUE in this case */ return TRUE; } if (UsesSource) { - if (hDCSrc != hDCDest) + if (NULL == DCSrc) { - DCSrc = DC_LockDc(hDCSrc); - if (NULL == DCSrc) - { - DC_UnlockDc(DCDest); - DPRINT1("Invalid source dc handle (0x%08x) passed to NtGdiStretchBlt\n", hDCSrc); - SetLastWin32Error(ERROR_INVALID_HANDLE); - return FALSE; - } - if (DCSrc->dctype == DC_TYPE_INFO) - { - DC_UnlockDc(DCSrc); - DC_UnlockDc(DCDest); - /* Yes, Windows really returns TRUE in this case */ - return TRUE; - } + GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject); + if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject); + DPRINT("Invalid source dc handle (0x%08x) passed to NtGdiBitBlt\n", hDCSrc); + return FALSE; } - else + if (DCSrc->dctype == DC_TYPE_INFO) { - DCSrc = DCDest; + GDIOBJ_UnlockObjByPtr(&DCDest->BaseObject); + GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject); + if(DCMask) GDIOBJ_UnlockObjByPtr(&DCMask->BaseObject); + /* Yes, Windows really returns TRUE in this case */ + return TRUE; } + } + else if(DCSrc) + { + DPRINT1("Getting a valid Source handle without using source!!!"); + GDIOBJ_UnlockObjByPtr(&DCSrc->BaseObject); + DCSrc = NULL ; } pdcattr = DCDest->pdcattr; @@ -801,6 +813,9 @@ BrushOrigin.x = 0; BrushOrigin.y = 0; + /* Only prepare Source and Dest, hdcMask represents a DIB */ + DC_vPrepareDCsForBlit(DCDest, DestRect, DCSrc, SourceRect); + /* Determine surfaces to be used in the bitblt */ BitmapDest = DCDest->dclevel.pSurface; if (BitmapDest == NULL) @@ -821,28 +836,25 @@ BrushOrigin.y += DCDest->ptlDCOrig.y; /* Make mask surface for source surface */ - if (BitmapSrc && hDCMask) - { - DCMask = DC_LockDc(hDCMask); - if (DCMask) + if (BitmapSrc && DCMask) + { + BitmapMask = DCMask->dclevel.pSurface; + if (BitmapMask && + (BitmapMask->SurfObj.sizlBitmap.cx < WidthSrc || + BitmapMask->SurfObj.sizlBitmap.cy < HeightSrc)) { - BitmapMask = DCMask->dclevel.pSurface; - if (BitmapMask && - (BitmapMask->SurfObj.sizlBitmap.cx < WidthSrc || - BitmapMask->SurfObj.sizlBitmap.cy < HeightSrc)) - { - DPRINT1("%dx%d mask is smaller than %dx%d bitmap\n", - BitmapMask->SurfObj.sizlBitmap.cx, BitmapMask->SurfObj.sizlBitmap.cy, - WidthSrc, HeightSrc); - goto failed; - } - /* Create mask offset point */ - MaskPoint.x = XOriginMask; - MaskPoint.y = YOriginMask; - IntLPtoDP(DCMask, &MaskPoint, 1); - MaskPoint.x += DCMask->ptlDCOrig.x; - MaskPoint.y += DCMask->ptlDCOrig.x; + DPRINT1("%dx%d mask is smaller than %dx%d bitmap\n", + BitmapMask->SurfObj.sizlBitmap.cx, BitmapMask->SurfObj.sizlBitmap.cy, + WidthSrc, HeightSrc); + EXLATEOBJ_vCleanup(&exlo); + goto failed; } + /* Create mask offset point */ + MaskPoint.x = XOriginMask; + MaskPoint.y = YOriginMask; + IntLPtoDP(DCMask, &MaskPoint, 1); + MaskPoint.x += DCMask->ptlDCOrig.x; + MaskPoint.y += DCMask->ptlDCOrig.x; } /* Perform the bitblt operation */ @@ -857,13 +869,14 @@ &DCDest->eboFill.BrushObject, &BrushOrigin, ROP3_TO_ROP4(ROP)); + if (UsesSource) + { + EXLATEOBJ_vCleanup(&exlo); + } failed: + DC_vFinishBlit(DCDest, DCSrc); if (UsesSource) - { - EXLATEOBJ_vCleanup(&exlo); - } - if (UsesSource && hDCSrc != hDCDest) { DC_UnlockDc(DCSrc); }

14 years, 5 months

← Newer
1
...
13
14
15
16
17
18
19
...
44
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 April 2010