Commit graph

133 commits

Author SHA1 Message Date
Jérôme Gardou
9e7867ddde revert unwanted changes
svn path=/branches/reactos-yarotows/; revision=47120
2010-05-07 23:36:49 +00:00
Jérôme Gardou
a7eaab78db some leftover from last sync : GDIDBG macros expect handles, not index
svn path=/branches/reactos-yarotows/; revision=47119
2010-05-07 23:33:11 +00:00
Jérôme Gardou
147736390c Delete win32k.h, it's useless now
svn path=/branches/reactos-yarotows/; revision=47118
2010-05-07 07:44:50 +00:00
Jérôme Gardou
88c9e7c6e8 Sync with trunk (r47116), hopefully without breaking anything.
svn path=/branches/reactos-yarotows/; revision=47117
2010-05-07 07:41:13 +00:00
Jérôme Gardou
56da974d0c [WIN32K]
- Assign a correct pdevmode to the pdevobj when creating it.

svn path=/branches/reactos-yarotows/; revision=47114
2010-05-06 11:46:48 +00:00
Jérôme Gardou
1b5e323072 [GDI32]
- Use device string when given one in IntCreateDIC
[WIN32K]
  - Exchange pdevmode when excahnging PDEVOBJ pointers
  - Update Globals gdi devcaps when switching mode if ppdev is the primary surface

svn path=/branches/reactos-yarotows/; revision=47044
2010-04-26 21:49:09 +00:00
Timo Kreuzer
99d15ff5ab Update TODO.txt
svn path=/branches/reactos-yarotows/; revision=46995
2010-04-22 19:14:15 +00:00
Timo Kreuzer
600a901153 [WIN32K]
- Call DC_vPrepareDCsForBlit in IntRectangle with device coordinates instead of in NtGdiRectangle with logical coordinates. Fixes updating mouse pointer.
- Update TODO.txt

svn path=/branches/reactos-yarotows/; revision=46986
2010-04-22 03:53:49 +00:00
Jérôme Gardou
ef35c1e75c [WIN32K]
- Use the attached surface bits depth when creating a compatible DC
[USER32]
  - use a display DC for loading images

svn path=/branches/reactos-yarotows/; revision=46981
2010-04-21 15:52:52 +00:00
Timo Kreuzer
2250e691f1 [WIN32K]
- move IntEngMovePointer code into GreMovePointer
- Delete the mouse cursor before mode switch, to force setting a new one after a mode switch. Fixes cursor artifacts after mode change.
- Update TODO.txt

svn path=/branches/reactos-yarotows/; revision=46976
2010-04-21 13:44:06 +00:00
Timo Kreuzer
634c608726 [WIN32K]
- Remove an ASSERT in DC_Cleanup
- Improve code in PDEVOBJ_vSwitchPdev (code shamelessly stolen from Jerome's earlier commit)
- Fix up GDIINFO in PDEVOBJ_bEnablePDEV instead of EngpCreatePDEV
- Update TODO.txt

svn path=/branches/reactos-yarotows/; revision=46975
2010-04-21 12:21:53 +00:00
Jérôme Gardou
bb632b9d29 [WIN32K]
- revert r46970, it does not work after all...
  - add missing trailing character in debug print

svn path=/branches/reactos-yarotows/; revision=46974
2010-04-21 09:24:15 +00:00
Jérôme Gardou
11483181a8 [WIN32K]
- Physicus : In theory the text brush should never be changed
So be it, it works anyway...

svn path=/branches/reactos-yarotows/; revision=46970
2010-04-20 22:26:03 +00:00
Jérôme Gardou
d8020bbbe1 [WIN32K]
- revert unwanted change from r46964
  - Use MouseSafetyOnDrawStart/End in GreExtTextOutW when we already hold the blit lock

svn path=/branches/reactos-yarotows/; revision=46969
2010-04-20 22:20:55 +00:00
Jérôme Gardou
2f9569c2e5 [WIN32K]
- really update Text and BackGround brushes when asked to

svn path=/branches/reactos-yarotows/; revision=46966
2010-04-20 20:44:43 +00:00
Jérôme Gardou
f2a22bfe7a [WIN32K]
- Update brushes at the good moment in different places

svn path=/branches/reactos-yarotows/; revision=46965
2010-04-20 20:23:15 +00:00
Jérôme Gardou
650b476440 [WIN32K]
- Revert r46960 : the correct way to go is to mark brushes as dirty and update them where needed
  - Do so in GreExtTextOutW, NtGdiBitBlt, NtGdiStrecthBltMask and IntPatBlt
  - Add a small hack to GreEstTextOutW so we hold the Blit lock when needed without too much pain.

svn path=/branches/reactos-yarotows/; revision=46964
2010-04-20 19:31:45 +00:00
Jérôme Gardou
75f07ae3b4 [WIN32K]
- Reinitialize EBRUSHOBJs instead of marking them as dirty when switching modes

svn path=/branches/reactos-yarotows/; revision=46960
2010-04-20 17:55:56 +00:00
Timo Kreuzer
db0c72e132 [WIN32K]
Fix LPARAM parameter when sending WM_DISPLAYCHANGE, fixes resizing the desktop.

svn path=/branches/reactos-yarotows/; revision=46954
2010-04-19 23:36:31 +00:00
Timo Kreuzer
43d5c84818 [WIN32K]
Don't call IntHideDesktop and co_IntShowDesktop for now. This doesn't seem to be neccessary and fixes a bunch of problems

svn path=/branches/reactos-yarotows/; revision=46953
2010-04-19 23:22:17 +00:00
Jérôme Gardou
b1f448326a [WIN32K]
- update clipping, GraphicCaps, brush, pen, background and charset of the DC after a mode change

svn path=/branches/reactos-yarotows/; revision=46952
2010-04-19 22:51:40 +00:00
Jérôme Gardou
202a5fc5c7 [WIN32K]
- Do not access surface before holding ppdev Lock

svn path=/branches/reactos-yarotows/; revision=46951
2010-04-19 21:56:44 +00:00
Jérôme Gardou
8188ea3959 [WIN32K]
- Prepare DC for blit before initializing EBRUSHOBJ

svn path=/branches/reactos-yarotows/; revision=46950
2010-04-19 21:48:17 +00:00
Jérôme Gardou
0988b6c773 Grotesque mistake...
svn path=/branches/reactos-yarotows/; revision=46943
2010-04-19 16:04:59 +00:00
Jérôme Gardou
14be9f22bd [WIN32K]
- HW accelerated StretchBlt when possible in EngAlphaBlend

svn path=/branches/reactos-yarotows/; revision=46941
2010-04-19 15:15:17 +00:00
Jérôme Gardou
82ad88f1ab [WIN32K]
- Get rid of IntEngBitBltEx, it's Exness isn't needed anymore

svn path=/branches/reactos-yarotows/; revision=46940
2010-04-19 15:08:03 +00:00
Jérôme Gardou
75108218f7 [WIN32K]
- move mouse related ppdev locking to Gre* functions
Spotted by Physicus

svn path=/branches/reactos-yarotows/; revision=46939
2010-04-19 14:17:26 +00:00
Jérôme Gardou
e918eb7c29 [WIN32K]
- Update direct DCs surface before blit if needed
  - call directly ppdev in MouseSafetyOnDraw{Start,End}
  - use directly the PDEVOBJ surface in mouse operations
  - Add some mouse-related sanity checks

svn path=/branches/reactos-yarotows/; revision=46937
2010-04-19 13:52:37 +00:00
Jérôme Gardou
083f2b4f4a [WIN32K]
- Finally get rid of SURFACE::BitsLock

svn path=/branches/reactos-yarotows/; revision=46935
2010-04-19 00:56:25 +00:00
Jérôme Gardou
75dff0cf6a [WIN32k]
- Don't hold the DC blit lock during the whole GreTextOutW function.

svn path=/branches/reactos-yarotows/; revision=46934
2010-04-19 00:51:32 +00:00
Jérôme Gardou
a98902ef25 [WIN32K]
- Do not draw mouse when it has intentionnally been put away.
Fixes some mouse-related graphical glitches

svn path=/branches/reactos-yarotows/; revision=46933
2010-04-19 00:11:30 +00:00
Jérôme Gardou
ce0a7a6e3b [WIN32K]
- call DC_vPrepareDCsForBlit / DC_vFinishBlit in the right place

svn path=/branches/reactos-yarotows/; revision=46932
2010-04-18 23:48:11 +00:00
Jérôme Gardou
18f210877b [WIN32K]
- Do not create a PDEVOBJ for nothing at startup
  - Create the surface for real in IntCreatePrimarySurface

svn path=/branches/reactos-yarotows/; revision=46930
2010-04-18 23:15:02 +00:00
Jérôme Gardou
1e00973f21 grotesque copy-paste mistake
svn path=/branches/reactos-yarotows/; revision=46926
2010-04-18 17:36:11 +00:00
Jérôme Gardou
4cc8e60093 [WIN32K]
- The last DC_vPrepareForBlit/DC_vFinishBlit commit

svn path=/branches/reactos-yarotows/; revision=46925
2010-04-18 17:33:03 +00:00
Jérôme Gardou
11131896db [WIN32K]
- More DC_vPrepareDCsForBlit/DC_vFinishBlit with assorted MouseSafetyOnDrawEnd removals

svn path=/branches/reactos-yarotows/; revision=46923
2010-04-18 17:19:36 +00:00
Jérôme Gardou
62473c84e9 Sync to trunk (r46918)
svn path=/branches/reactos-yarotows/; revision=46920
2010-04-18 14:06:07 +00:00
Jérôme Gardou
53222b46da [WIN32K]
- Use DC_vPrepareForBlit, DC_vFinishBlit in GreTextOutputW
  - So we can get rid of MouseSafetyOnDraw{Start,End} in IntEngMaskBlt

svn path=/branches/reactos-yarotows/; revision=46911
2010-04-17 22:48:44 +00:00
Jérôme Gardou
fa0a6275a9 [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

svn path=/branches/reactos-yarotows/; revision=46909
2010-04-17 20:51:42 +00:00
Jérôme Gardou
d2655f9e72 [WIN32K]
- Now we welcome GreStretchBltMask into the fabulous world of GDIOBJ_LockMultipleObjects, DC_vPrepareDCsForBlit and DC_vFinishBlit
  - With the assorted MouseSafetyOnDraw{Start,End} removal

svn path=/branches/reactos-yarotows/; revision=46908
2010-04-17 20:27:32 +00:00
Jérôme Gardou
663acbc064 [WIN32K]
- For now, limit DC_UnlockDc to a simple GDIOBJ_LockObj
  - More GDIOBJ_LockMultipleObj, DC_vPrepareDCsForBlit and DC_vFinishBlit fun

svn path=/branches/reactos-yarotows/; revision=46906
2010-04-17 15:24:10 +00:00
Jérôme Gardou
42073050d4 [WIN32K]
-Use GDIOBJ_LockMultipleObjs, DC_vPrepareDCsForBlit and DC_vFinishBlit in NtGdiTransparentBlt
  -Get rid of MouseSafetyOnDraw{End,Start} in IntEngTransparentBlt

svn path=/branches/reactos-yarotows/; revision=46905
2010-04-17 14:46:05 +00:00
Jérôme Gardou
859f9c2a13 Fix typo...
svn path=/branches/reactos-yarotows/; revision=46903
2010-04-17 14:24:50 +00:00
Jérôme Gardou
0cdfd4399d [WIN32K]
- Introduce DC_vPrepareDCsForBlit and DC_vFinishBlit and use them in NtGdiAlphaBlend
  - Get rid of now unnecessary call for MouseSafetyOnDraw{Start,End} in IntEngAlphaBlend
  - Yet Another Rewrite of GDIOBJ_LockMultipleObjs :-/ and use it in NtGdiAlphaBlend

svn path=/branches/reactos-yarotows/; revision=46902
2010-04-17 14:20:48 +00:00
Jérôme Gardou
4ec4675b9e [WIN32K]
- There is currently no need to lock more than three objects at a time, this permits code simplification/speed
  - Keep the handles order in GDIOBJ_LockMultipleObjs
Still unused...

svn path=/branches/reactos-yarotows/; revision=46899
2010-04-16 16:55:52 +00:00
Jérôme Gardou
6a8d2ef675 revert the DC list stuff, it's not worth it (tm). Things will be done differently
svn path=/branches/reactos-yarotows/; revision=46892
2010-04-16 09:49:05 +00:00
Jérôme Gardou
a4e83efd83 [WIN32K]
- Introduce deadlocks killer GDIOBJ_LockMultipleObjs, unused for now
  - Make the PDEVOBJ DCs list a sorted list
Didicated to Physicus

svn path=/branches/reactos-yarotows/; revision=46891
2010-04-15 22:38:04 +00:00
Jérôme Gardou
2a6301401d [WIN32K]
- Maintain a list of DC attached to a PDEVOBJ
No functional change for now, stay tuned!

svn path=/branches/reactos-yarotows/; revision=46885
2010-04-15 19:07:07 +00:00
Jérôme Gardou
c3731e5552 [WIN32K]
- get rid of ROS_DC::BitsPerPixel.
1 - It was a hack.
2 - Its use was inconsistent.

svn path=/branches/reactos-yarotows/; revision=46848
2010-04-12 18:44:36 +00:00
Jérôme Gardou
c9353947a1 completely revert 46733
svn path=/branches/reactos-yarotows/; revision=46846
2010-04-11 21:32:53 +00:00
Jérôme Gardou
47cbf8f46d [WIN32K]
Partially revert 46733
  Silence some debug output

svn path=/branches/reactos-yarotows/; revision=46734
2010-04-05 11:53:36 +00:00
Jérôme Gardou
243eeb574a [WIN32K]
-Make direct DC release shared lock on surface each time they're unlocked.
  -Now they don't hold it unless they're locked themselves.
  -Do not create the device surface when switching modes, this is inconsistent with the PDEVOBJ creation, which does not.

*No more "you are freeing a surface which is still hold" debug message when switching modes*

svn path=/branches/reactos-yarotows/; revision=46733
2010-04-05 10:58:43 +00:00
Jérôme Gardou
6638a5b899 Sync with trunk (aka 'I want my virtualbox mouse integration too')
svn path=/branches/reactos-yarotows/; revision=46732
2010-04-05 09:59:21 +00:00
Jérôme Gardou
327d8a1ac6 [WIN32K]
Also send message to desktop window with HWND_BROADCAST.

svn path=/branches/reactos-yarotows/; revision=46726
2010-04-04 23:20:02 +00:00
Jérôme Gardou
5099deb554 Fix build
svn path=/branches/reactos-yarotows/; revision=46713
2010-04-04 09:42:26 +00:00
Timo Kreuzer
25a0c069c9 [WIN32K]
- use a macro in RegReadDisplaySettings to make things smaller
- Send WM_DISPLAYCHANGE to all toplevel windows when changing mode
- leave UserChangeDisplaySettings when mode switching failed

svn path=/branches/reactos-yarotows/; revision=46701
2010-04-03 17:30:00 +00:00
Jérôme Gardou
34a9bb0081 [WIN32K]
Unlock surface when deleting DC

svn path=/branches/reactos-yarotows/; revision=46698
2010-04-03 16:42:04 +00:00
Jérôme Gardou
736c7b0111 [WIN32K]
Unlock/lock surface when locking DC

svn path=/branches/reactos-yarotows/; revision=46697
2010-04-03 16:32:30 +00:00
Timo Kreuzer
705ea2a9c3 [WIN32K]
- EngAcquireSemaphoreShared: update dwEngAcquireCount
- DC_LockDc/DC_UnlockDc: Acquire PDEV lock only for direct DCs, in that case also update the pSurface pointer
- When copying DC states, copy the surface only for memory dcs
- after switching the mode, update system metrics and redraw the desktop window.
- Remove testdraw code.

svn path=/branches/reactos-yarotows/; revision=46658
2010-04-01 22:36:40 +00:00
Timo Kreuzer
5fa6a416ca [WIN32K]
Refactor NtUserClipCursor, don't acquire user lock in UserRedrawDesktop, 

svn path=/branches/reactos-yarotows/; revision=46657
2010-04-01 22:30:44 +00:00
Timo Kreuzer
ac6192b1b0 [WIN32K]
Just dereference the PDEV's surface and let the driver free it.

svn path=/branches/reactos-yarotows/; revision=46638
2010-04-01 05:44:09 +00:00
Timo Kreuzer
49d7aed889 Merge to trunk head (r46631)
svn path=/branches/reactos-yarotows/; revision=46633
2010-04-01 02:52:00 +00:00
Timo Kreuzer
49383c3d97 [win32k]
Use PREGION as type fo the DC regions instead of PVOID.

svn path=/branches/reactos-yarotows/; revision=46630
2010-03-31 22:43:02 +00:00
Timo Kreuzer
2190eb07dd Add a todo list for win32k. Enjoy the current size as long as it's that small.
svn path=/branches/reactos-yarotows/; revision=46579
2010-03-30 04:59:56 +00:00
Jérôme Gardou
6495ee7167 [WIN32K]
DC_SetOwnerShip : return FALSE on failure

svn path=/branches/reactos-yarotows/; revision=46575
2010-03-29 21:53:24 +00:00
Jérôme Gardou
6b19e6defc [WIN32K]
Free the surface instead of unlocking it

svn path=/branches/reactos-yarotows/; revision=46573
2010-03-29 19:50:49 +00:00
Jérôme Gardou
2bfb2d80b4 [WIN32K]
Implement releasing PDEVOBJs

svn path=/branches/reactos-yarotows/; revision=46572
2010-03-29 18:56:02 +00:00
Jérôme Gardou
1541aa6f43 [WIN32K]
Close another pair of DC_LockDC/DC_UnlockDC

Now gdi32:dc winetests doesn't crash anymore.

svn path=/branches/reactos-yarotows/; revision=46530
2010-03-28 22:27:57 +00:00
Jérôme Gardou
f6b83e4f45 [WIN32K]
Forgot this one

svn path=/branches/reactos-yarotows/; revision=46529
2010-03-28 22:18:45 +00:00
Jérôme Gardou
aebd9f2971 [WIN32K]
More PDEVOBJ_vRelease fun

svn path=/branches/reactos-yarotows/; revision=46528
2010-03-28 22:09:45 +00:00
Jérôme Gardou
c918b470ec [WIN32K]
Release ppdev when deleting DC

svn path=/branches/reactos-yarotows/; revision=46527
2010-03-28 21:45:43 +00:00
Jérôme Gardou
9234a82220 [WIN32K]
Close another pair of DC_lockDc DC_UnlockDc.

svn path=/branches/reactos-yarotows/; revision=46508
2010-03-28 00:51:25 +00:00
Jérôme Gardou
fc0d9235a5 [WIN32K]
Each DC_lockDc call should be followed by a DC_UnlockDc, even on error path.

svn path=/branches/reactos-yarotows/; revision=46507
2010-03-27 23:58:09 +00:00
Jérôme Gardou
b6edb50eb1 sync with trunk r46493
svn path=/branches/reactos-yarotows/; revision=46494
2010-03-27 20:19:56 +00:00
Jérôme Gardou
76085ba982 [WIN32K]
Lock PDC with pDevObj semaphore too.

svn path=/branches/reactos-yarotows/; revision=46470
2010-03-26 16:17:12 +00:00
Jérôme Gardou
33f63724b1 [WIN32K]
Get rid of hVisRgn in ROS_DC_INFO, use prgnVis in DC instead

svn path=/branches/reactos-yarotows/; revision=46372
2010-03-23 23:02:00 +00:00
Jérôme Gardou
f5cb03fb7c [WIN32K]
revert r46354

svn path=/branches/reactos-yarotows/; revision=46356
2010-03-23 16:09:23 +00:00
Timo Kreuzer
84253d01e7 Fix a typo
svn path=/branches/reactos-yarotows/; revision=46355
2010-03-23 16:05:10 +00:00
Jérôme Gardou
6ca135323d [WIN32K]
Don't access garbage pointer.

svn path=/branches/reactos-yarotows/; revision=46354
2010-03-23 15:30:41 +00:00
Jérôme Gardou
c16ad873a6 sync with trunk (r46275)
svn path=/branches/reactos-yarotows/; revision=46279
2010-03-19 21:09:21 +00:00
Timo Kreuzer
299a3749d1 Move the DC_InitHack
svn path=/branches/reactos-yarotows/; revision=46249
2010-03-17 15:49:25 +00:00
Timo Kreuzer
74ef03da5c Commit the stuff. Lots of changes. I'll write a proper list of changes when it's done.
svn path=/branches/reactos-yarotows/; revision=45355
2010-01-30 21:12:42 +00:00
Timo Kreuzer
6afbc8f483 Hopefully create a branch and not destroy the svn repository.
svn path=/branches/reactos-yarotows/; revision=45219
2010-01-23 23:25:04 +00:00