February 2007 - Wine-Commits

Michael Stefaniuc : atl: Fix a comparison between signed and unsigned.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 90c0ffd45ec4ee655405977cc27bd4a5b118f745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c0ffd45ec4ee655405977cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 13 00:13:00 2007 +0100 atl: Fix a comparison between signed and unsigned. --- dlls/atl/registrar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 612ebda..6fa2fbd 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -360,7 +360,7 @@ static HRESULT do_process_root_key(LPCOL LPCOLESTR iter = data; strbuf buf; HRESULT hres = S_OK; - int i; + unsigned int i; strbuf_init(&buf); hres = get_word(&iter, &buf);

1 0

Dmitry Timoshkov : comctl32: Implement ImageList_GetFlags.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 74950a9e1f0c3db4f1c0c5da3704034b67dbc396 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74950a9e1f0c3db4f1c0c5da3… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 13 16:25:02 2007 +0800 comctl32: Implement ImageList_GetFlags. --- dlls/comctl32/imagelist.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 972a84a..b24c4e7 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -1423,8 +1423,9 @@ ImageList_GetDragImage (POINT *ppt, POIN DWORD WINAPI ImageList_GetFlags(HIMAGELIST himl) { - FIXME("(%p):empty stub\n", himl); - return 0; + TRACE("%p\n", himl); + + return is_valid(himl) ? himl->flags : 0; }

1 0

Dmitry Timoshkov : user32: Activate an MDI child on WM_SETFOCUS as well as on WM_CHILDACTIVATE.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 474a8f5357063ccc907144f6ec05da5d0a4dc39a URL: http://source.winehq.org/git/wine.git/?a=commit;h=474a8f5357063ccc907144f6e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 13 16:24:17 2007 +0800 user32: Activate an MDI child on WM_SETFOCUS as well as on WM_CHILDACTIVATE. --- dlls/user32/mdi.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 23dd8e9..190e0cc 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -1480,6 +1480,11 @@ LRESULT WINAPI DefMDIChildProcW( HWND hw SendMessageW( client, WM_MDIDESTROY, (WPARAM)hwnd, 0 ); return 0; + case WM_SETFOCUS: + if (ci->hwndActiveChild != hwnd) + MDI_ChildActivate( client, hwnd ); + break; + case WM_CHILDACTIVATE: MDI_ChildActivate( client, hwnd ); return 0;

1 0

Andrew Talbot : dinput: Constify some variables.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: e744c3a5b11754be727420f21a26100c85b3f9e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e744c3a5b11754be727420f21… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 12 20:58:08 2007 +0000 dinput: Constify some variables. --- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 26a62b5..822cb94 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -113,7 +113,7 @@ struct JoystickImpl POV povs[4]; }; -static GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ +static const GUID DInput_Wine_Joystick_GUID = { /* 9e573ed9-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed9, 0x7734, 0x11d2, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index ac08c19..ca98738 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -93,7 +93,7 @@ static LRESULT CALLBACK KeyboardCallback return CallNextHookEx(0, code, wparam, lparam); } -static GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ +static const GUID DInput_Wine_Keyboard_GUID = { /* 0ab8648a-7735-11d2-8c73-71df54a96441 */ 0x0ab8648a, 0x7735, 0x11d2, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4cfffb8..21f3776 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -73,7 +73,7 @@ struct SysMouseImpl /* FIXME: This is ugly and not thread safe :/ */ static IDirectInputDevice8A* current_lock = NULL; -static GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ +static const GUID DInput_Wine_Mouse_GUID = { /* 9e573ed8-7734-11d2-8d4a-23903fb6bdf7 */ 0x9e573ed8, 0x7734, 0x11d2,

1 0

Andrew Talbot : amstream: Constify a variable.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 8cbba46dba8721c61c64892467f7b85cfd416a76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbba46dba8721c61c6489246… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Feb 12 20:58:47 2007 +0000 amstream: Constify a variable. --- dlls/amstream/mediastream.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index c2446c9..891c7a3 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -42,7 +42,7 @@ typedef struct { STREAM_TYPE StreamType; } IMediaStreamImpl; -static struct IMediaStreamVtbl MediaStream_Vtbl; +static const struct IMediaStreamVtbl MediaStream_Vtbl; HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) { @@ -166,7 +166,7 @@ static HRESULT WINAPI IMediaStreamImpl_S return S_FALSE; } -static IMediaStreamVtbl MediaStream_Vtbl = +static const struct IMediaStreamVtbl MediaStream_Vtbl = { IMediaStreamImpl_QueryInterface, IMediaStreamImpl_AddRef,

1 0

Stefan Dösinger : d3d8: Deleting bound shaders unbinds them.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 00aa8ab08cdacfa1f4b5252527ad117f6711d287 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00aa8ab08cdacfa1f4b525252… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:21:45 2007 +0100 d3d8: Deleting bound shaders unbinds them. --- dlls/d3d8/device.c | 21 +++++- dlls/d3d8/tests/device.c | 148 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 151 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00aa8ab08cdacfa1f4b52…

1 0

Stefan Dösinger : wined3d: Use the context manager to create onscreen contexts.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: f5f501d5735c552dc5082e4eabf7ac4c9afa3ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f501d5735c552dc5082e4ea… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:22:41 2007 +0100 wined3d: Use the context manager to create onscreen contexts. --- dlls/wined3d/context.c | 324 +++++++++++++++++++++--------------- dlls/wined3d/device.c | 363 ++++++++++++---------------------------- dlls/wined3d/swapchain.c | 163 +++++-------------- dlls/wined3d/wined3d_private.h | 11 +- 4 files changed, 333 insertions(+), 528 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5f501d5735c552dc5082…

1 0

Stefan Dösinger : wined3d: Use the context manager to select the primary render target.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 12252d058914a66f40e976484cc7d8aa52ffca47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12252d058914a66f40e976484… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:21:10 2007 +0100 wined3d: Use the context manager to select the primary render target. --- dlls/wined3d/context.c | 514 +++++++++++++++++++++++++++++++++-- dlls/wined3d/device.c | 583 +++------------------------------------- dlls/wined3d/directx.c | 6 - dlls/wined3d/surface.c | 30 +-- dlls/wined3d/swapchain.c | 31 ++- dlls/wined3d/wined3d_private.h | 54 ++--- 6 files changed, 582 insertions(+), 636 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12252d058914a66f40e97…

1 0

Stefan Dösinger : wined3d: Make the context array dynamic.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: 7253fae31fbea07f11c35f05d1b38750d0c34477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7253fae31fbea07f11c35f05d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:35:45 2007 +0100 wined3d: Make the context array dynamic. --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 13 +++++++++---- dlls/wined3d/directx.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1f6d693..6dc88fb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -207,7 +207,7 @@ void ActivateContext(IWineD3DDeviceImpl /* TODO: Thread selection */ /* TODO: Activate the opengl context */ - context = &This->contexts[This->activeContext]; + context = This->contexts[This->activeContext]; switch(usage) { case CTXUSAGE_RESOURCELOAD: diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1f27916..1771e63 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -350,10 +350,16 @@ static ULONG WINAPI IWineD3DDeviceImpl_R TRACE("(%p) : Releasing from %d\n", This, refCount + 1); if (!refCount) { + UINT i; if (This->fbo) { GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->fbo)); } + for(i = 0; i < This->numContexts; i++) { + HeapFree(GetProcessHeap(), 0, This->contexts[i]); + } + HeapFree(GetProcessHeap(), 0, This->contexts); + HeapFree(GetProcessHeap(), 0, This->render_targets); HeapFree(GetProcessHeap(), 0, This->draw_buffers); @@ -2007,8 +2013,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl /* Initialize the current view state */ This->view_ident = 1; - This->numContexts = 1; - This->contexts[0].last_was_rhw = 0; + This->contexts[0]->last_was_rhw = 0; glGetIntegerv(GL_MAX_LIGHTS, &This->maxConcurrentLights); TRACE("(%p) All defaults now set up, leaving Init3D with %p\n", This, This); @@ -5948,7 +5953,7 @@ static void device_render_to_texture(IWi if (This->depth_copy_state != WINED3D_DCS_NO_COPY) { This->depth_copy_state = WINED3D_DCS_COPY; } - This->contexts[0].last_was_rhw = FALSE; + This->contexts[0]->last_was_rhw = FALSE; /* Viewport state will reapply the projection matrix for now */ IWineD3DDeviceImpl_MarkStateDirty(This, WINED3DRS_CULLMODE); @@ -6985,7 +6990,7 @@ void IWineD3DDeviceImpl_MarkStateDirty(I if(!rep) return; for(i = 0; i < This->numContexts; i++) { - context = &This->contexts[i]; + context = This->contexts[i]; if(isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7bd04bb..e711b10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2444,6 +2444,12 @@ static HRESULT WINAPI IWineD3DImpl_Crea object->ddraw_format = pixelformat_for_depth(GetDeviceCaps(hDC, BITSPIXEL) * GetDeviceCaps(hDC, PLANES)); ReleaseDC(0, hDC); + /* Allocate one context for now */ + object->contexts = HeapAlloc(GetProcessHeap(), 0, sizeof(WineD3DContext *)); + object->contexts[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(WineD3DContext)); + object->numContexts = 1; + object->activeContext = 0; + return WINED3D_OK; create_device_error: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 03d5759..7be34ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -695,7 +695,7 @@ struct IWineD3DDeviceImpl BOOL useDrawStridedSlow; /* Context management */ - WineD3DContext contexts[1]; /* Dynamic array later */ + WineD3DContext **contexts; /* Dynamic array containing pointers to context structures */ UINT activeContext; /* Only 0 for now */ UINT numContexts; /* Always 1 for now */ };

1 0

Stefan Dösinger : wined3d: Improve render target to texture blits.
by Alexandre Julliard Feb. 13, 2007

Feb. 13, 2007

Module: wine Branch: master Commit: e53434045082099e9ea3e8f573265860a00444d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e53434045082099e9ea3e8f57… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 12 19:18:46 2007 +0100 wined3d: Improve render target to texture blits. --- dlls/wined3d/surface.c | 319 +++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 276 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e53434045082099e9ea3e…

1 0