Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-13 Thread Stefan Dösinger
Am Dienstag 13 März 2007 03:44 schrieb Erich Hoover: > Real Name: > Erich Hoover > Changelog: > wined3d: Allow SetCursorProperties on existing cursor Looks good to me, except one cosmetic issue: if(pCursorBitmap) { +WINED3DLOCKED_RECT rect; +. /*

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread Erich Hoover
Sun, 11 Mar 2007 20:03:39 -0600 Subject: wined3d: Allow SetCursorProperties on existing cursor --- dlls/wined3d/device.c | 49 + 1 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0998eec..919d0

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread Erich Hoover
[EMAIL PROTECTED](none)> Date: Sun, 11 Mar 2007 16:55:06 -0600 Subject: wined3d: Allow SetCursorProperties on existing cursor --- dlls/wined3d/device.c | 42 ++ 1 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread Erich Hoover
93490beba1129d2772c2396f293bfe7ea06ec9 Mon Sep 17 00:00:00 2001 From: Erich Hoover <[EMAIL PROTECTED](none)> Date: Sun, 11 Mar 2007 14:04:51 -0600 Subject: wined3d: Allow SetCursorProperties on existing cursor --- dlls/wined3d/device.c | 35 +-- 1 files c

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread H. Verbeet
On 12/03/07, Stefan Dösinger <[EMAIL PROTECTED]> wrote: Am Sonntag 11 März 2007 23:58 schrieb Erich Hoover: You can remove the SFLAG_FORCELOAD definition from wined3d_private.h now. You'll need to remove that from surface.c as well then.

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread Stefan Dösinger
Am Sonntag 11 März 2007 23:58 schrieb Erich Hoover: > Is the attached what you mean? Yes, that looks better. A few minor things: You can remove the SFLAG_FORCELOAD definition from wined3d_private.h now. Also, if I remember right, the cursor must be A8R8G8B8, so instead of reading the description

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-12 Thread H. Verbeet
On 12/03/07, Erich Hoover <[EMAIL PROTECTED]> wrote: Please examine the attached corrections. Erich Hoover [EMAIL PROTECTED] Looks ok to me.

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-11 Thread H. Verbeet
On 11/03/07, Erich Hoover <[EMAIL PROTECTED]> wrote: Is the attached what you mean? Erich Hoover [EMAIL PROTECTED] +if (IWineD3DSurface_LockRect(pCursorBitmap, &rect, NULL, WINED3DLOCK_READONLY) == WINED3D_OK) I know the current code doesn't do it everywhere either, but you should p

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-11 Thread Stefan Dösinger
Am Sonntag 11 März 2007 21:08 schrieb Erich Hoover: > Yeah, that would make more sense wouldn't it :) Please see attached patch. If you do it that way, you can remove the PreLoad, LockRect the surface(with WINED3DLOCK_READONLY), use glTexImage2D to load This->cursorTexture and then Unlock the su

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-11 Thread H. Verbeet
On 11/03/07, Erich Hoover <[EMAIL PROTECTED]> wrote: So, which change exactly are you concerned about? Changes are: 1) The removal of "glDeleteTextures(1, &This->cursorTexture);" in device.c This change should just keep SetCursorProperties from deleting the gl texture. By removing this call an a

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-11 Thread Erich Hoover
file without the cursor tests is now in dlls/d3d9/tests/visual.c. I think this visual.c version is not the version I used for checking later surface changes. From b27ae021b3c52d6fc1bf918098219160dedefa5f Mon Sep 17 00:00:00 2001 From: Erich Hoover <[EMAIL PROTECTED](none)> Date: Sat, 10 Mar

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-11 Thread Stefan Dösinger
Am Sonntag 11 März 2007 03:08 schrieb Erich Hoover: > I ran all of the d3d9 tests and did not get any errors with my patch > applied. I did get an error when I ran your modified visual.c test, but I > get the same errors with and without my patch. Yes; The existing d3d9 tests do not check what hap

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-10 Thread Erich Hoover
t;). *>* This patch corrects this issue and permits SetCursorProperties to retrieve *>* the gl texture of an old cursor. *>* Changelog: *>* wined3d: Allow SetCursorProperties on existing cursor *This is not completely correct: The application can Release the d3d surface after sett

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-10 Thread Stefan Dösinger
> The API documentation doesn't say anything about an application releasing > the d3d surface, There is a test for that somewhere in dlls/d3d9/tests/device.c (or some other test file in there). > but the documentation in the code seems to indicate that > the gl texture needs to remain when the s

Re: wined3d: Allow SetCursorProperties on existing cursor

2007-03-10 Thread Stefan Dösinger
atch corrects this issue and permits SetCursorProperties to retrieve > the gl texture of an old cursor. > Changelog: > wined3d: Allow SetCursorProperties on existing cursor This is not completely correct: The application can Release the d3d surface after setting the cursor. This woul