April 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : ddraw: Replace the light list with a standard Wine list.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: ac95c302ffe61e5ff25eb086c883d095b7702f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac95c302ffe61e5ff25eb086c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 22:39:28 2011 +0200 ddraw: Replace the light list with a standard Wine list. --- dlls/ddraw/ddraw_private.h | 7 +-- dlls/ddraw/viewport.c | 109 ++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index e75e4bc..2e029b9 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -416,8 +416,7 @@ struct IDirect3DLightImpl DWORD dwLightIndex; - /* Chained list used for adding / removing from viewports */ - IDirect3DLightImpl *next; + struct list entry; }; /* Helper functions */ @@ -473,9 +472,7 @@ struct IDirect3DViewportImpl } viewports; struct list entry; - - /* Lights list */ - IDirect3DLightImpl *lights; + struct list light_list; /* Background material */ IDirect3DMaterialImpl *background; diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 6e0725e..de2bbce 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -36,18 +36,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); * activates the viewport using IDirect3DDevice7::SetViewport * *****************************************************************************/ -void viewport_activate(IDirect3DViewportImpl* This, BOOL ignore_lights) { - IDirect3DLightImpl* light; +void viewport_activate(IDirect3DViewportImpl *This, BOOL ignore_lights) +{ D3DVIEWPORT7 vp; - if (!ignore_lights) { - /* Activate all the lights associated with this context */ - light = This->lights; + if (!ignore_lights) + { + IDirect3DLightImpl *light; - while (light) + /* Activate all the lights associated with this context */ + LIST_FOR_EACH_ENTRY(light, &This->light_list, IDirect3DLightImpl, entry) { light_activate(light); - light = light->next; } } @@ -749,8 +749,7 @@ IDirect3DViewportImpl_AddLight(IDirect3DViewport3 *iface, This->map_lights |= 1<<i; /* Add the light in the 'linked' chain */ - lpDirect3DLightImpl->next = This->lights; - This->lights = lpDirect3DLightImpl; + list_add_head(&This->light_list, &lpDirect3DLightImpl->entry); IDirect3DLight_AddRef(lpDirect3DLight); /* Attach the light to the viewport */ @@ -782,33 +781,29 @@ IDirect3DViewportImpl_DeleteLight(IDirect3DViewport3 *iface, IDirect3DLight *lpDirect3DLight) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - IDirect3DLightImpl *lpDirect3DLightImpl = (IDirect3DLightImpl *)lpDirect3DLight; - IDirect3DLightImpl *cur_light, *prev_light = NULL; + IDirect3DLightImpl *l = (IDirect3DLightImpl *)lpDirect3DLight; TRACE("iface %p, light %p.\n", iface, lpDirect3DLight); EnterCriticalSection(&ddraw_cs); - cur_light = This->lights; - while (cur_light != NULL) { - if (cur_light == lpDirect3DLightImpl) - { - light_deactivate(lpDirect3DLightImpl); - if (!prev_light) This->lights = cur_light->next; - else prev_light->next = cur_light->next; - /* Detach the light from the viewport. */ - cur_light->active_viewport = NULL; - IDirect3DLight_Release((IDirect3DLight *)cur_light); - --This->num_lights; - This->map_lights &= ~(1 << lpDirect3DLightImpl->dwLightIndex); - LeaveCriticalSection(&ddraw_cs); - return D3D_OK; - } - prev_light = cur_light; - cur_light = cur_light->next; + + if (l->active_viewport != This) + { + WARN("Light %p active viewport is %p.\n", l, l->active_viewport); + LeaveCriticalSection(&ddraw_cs); + return DDERR_INVALIDPARAMS; } + + light_deactivate(l); + list_remove(&l->entry); + l->active_viewport = NULL; + IDirect3DLight_Release(lpDirect3DLight); + --This->num_lights; + This->map_lights &= ~(1 << l->dwLightIndex); + LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; + return D3D_OK; } /***************************************************************************** @@ -831,7 +826,9 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, DWORD dwFlags) { IDirect3DViewportImpl *This = (IDirect3DViewportImpl *)iface; - IDirect3DLightImpl *cur_light, *prev_light = NULL; + IDirect3DLightImpl *l = (IDirect3DLightImpl *)lpDirect3DLight; + struct list *entry; + HRESULT hr; TRACE("iface %p, light %p, next_light %p, flags %#x.\n", iface, lpDirect3DLight, lplpDirect3DLight, dwFlags); @@ -839,47 +836,50 @@ IDirect3DViewportImpl_NextLight(IDirect3DViewport3 *iface, if (!lplpDirect3DLight) return DDERR_INVALIDPARAMS; - *lplpDirect3DLight = NULL; - EnterCriticalSection(&ddraw_cs); - cur_light = This->lights; - - switch (dwFlags) { + switch (dwFlags) + { case D3DNEXT_NEXT: - if (!lpDirect3DLight) { - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } - while (cur_light != NULL) { - if (cur_light == (IDirect3DLightImpl *)lpDirect3DLight) { - *lplpDirect3DLight = (IDirect3DLight*)cur_light->next; - break; - } - cur_light = cur_light->next; + if (!l || l->active_viewport != This) + { + if (l) + WARN("Light %p active viewport is %p.\n", l, l->active_viewport); + entry = NULL; } + else + entry = list_next(&This->light_list, &l->entry); break; + case D3DNEXT_HEAD: - *lplpDirect3DLight = (IDirect3DLight*)This->lights; + entry = list_head(&This->light_list); break; + case D3DNEXT_TAIL: - while (cur_light != NULL) { - prev_light = cur_light; - cur_light = cur_light->next; - } - *lplpDirect3DLight = (IDirect3DLight*)prev_light; + entry = list_tail(&This->light_list); break; + default: - ERR("Unknown flag %d\n", dwFlags); + entry = NULL; + WARN("Invalid flags %#x.\n", dwFlags); break; } - if (*lplpDirect3DLight) + if (entry) + { + *lplpDirect3DLight = (IDirect3DLight *)LIST_ENTRY(entry, IDirect3DLightImpl, entry); IDirect3DLight_AddRef(*lplpDirect3DLight); + hr = D3D_OK; + } + else + { + *lplpDirect3DLight = NULL; + hr = DDERR_INVALIDPARAMS; + } LeaveCriticalSection(&ddraw_cs); - return *lplpDirect3DLight ? D3D_OK : DDERR_INVALIDPARAMS; + return hr; } /***************************************************************************** @@ -1131,4 +1131,5 @@ void d3d_viewport_init(IDirect3DViewportImpl *viewport, IDirectDrawImpl *ddraw) viewport->ref = 1; viewport->ddraw = ddraw; viewport->use_vp2 = 0xff; + list_init(&viewport->light_list); }

1 0

Henri Verbeet : wined3d: Get rid of IWineD3DSurface::GetType().
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: c852200b03ab3874ffdd4c02da947163c9f3990a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c852200b03ab3874ffdd4c02d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 22:39:32 2011 +0200 wined3d: Get rid of IWineD3DSurface::GetType(). --- dlls/d3d9/surface.c | 12 +++--------- dlls/wined3d/surface.c | 2 -- dlls/wined3d/surface_base.c | 5 ----- include/wine/wined3d.idl | 2 -- 4 files changed, 3 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index cedd30f..7cca2d6 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -210,17 +210,11 @@ static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { wined3d_mutex_unlock(); } -static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - D3DRESOURCETYPE ret; - +static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(IDirect3DSurface9 *iface) +{ TRACE("iface %p.\n", iface); - wined3d_mutex_lock(); - ret = IWineD3DSurface_GetType(This->wineD3DSurface); - wined3d_mutex_unlock(); - - return ret; + return D3DRTYPE_SURFACE; } /* IDirect3DSurface9 Interface follow: */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d302d35..7aa62c9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4922,7 +4922,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, IWineD3DSurfaceImpl_PreLoad, - IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, IWineD3DSurfaceImpl_Map, @@ -5550,7 +5549,6 @@ static const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_SetPriority, IWineD3DBaseSurfaceImpl_GetPriority, IWineGDISurfaceImpl_PreLoad, - IWineD3DBaseSurfaceImpl_GetType, /* IWineD3DSurface */ IWineD3DBaseSurfaceImpl_GetResource, IWineGDISurfaceImpl_Map, diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 6bd073d..d764ff4 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -157,11 +157,6 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPriority(IWineD3DSurface *iface) return resource_get_priority(&((IWineD3DSurfaceImpl *)iface)->resource); } -WINED3DRESOURCETYPE WINAPI IWineD3DBaseSurfaceImpl_GetType(IWineD3DSurface *iface) -{ - return resource_get_type(&((IWineD3DSurfaceImpl *)iface)->resource); -} - void * WINAPI IWineD3DBaseSurfaceImpl_GetParent(IWineD3DSurface *iface) { TRACE("iface %p.\n", iface); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 02c0d06..d536004 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2194,8 +2194,6 @@ interface IWineD3DSurface : IUnknown ); void PreLoad( ); - WINED3DRESOURCETYPE GetType( - ); struct wined3d_resource *GetResource( ); HRESULT Map(

1 0

Francois Gouget : gameux: Make some functions static.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: dad6598599f4d6aae96711670240719e86b4002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad6598599f4d6aae96711670… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 09:08:50 2011 +0200 gameux: Make some functions static. --- dlls/gameux/gameexplorer.c | 36 +++++++++++++++++++++++++++++------- dlls/gameux/gamestatistics.c | 2 +- dlls/gameux/gameux_private.h | 41 ----------------------------------------- 3 files changed, 30 insertions(+), 49 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 096e48e..965a0f0 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -44,9 +44,14 @@ extern BOOL WINAPI GUIDFromStringW(LPCWSTR psz, LPGUID pguid); /******************************************************************************* * GAMEUX_initGameData * - * Internal helper function. Description available in gameux_private.h file + * Internal helper function. + * Initializes GAME_DATA structure fields with proper values. Should be + * called always before first usage of this structure. Implemented in gameexplorer.c + * + * Parameters: + * GameData [I/O] pointer to structure to initialize */ -void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData) +static void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData) { GameData->sGDFBinaryPath = NULL; GameData->sGameInstallDirectory = NULL; @@ -56,9 +61,14 @@ void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData) /******************************************************************************* * GAMEUX_uninitGameData * - * Internal helper function. Description available in gameux_private.h file + * Internal helper function. + * Properly frees all data stored or pointed by fields of GAME_DATA structure. + * Should be called before freeing this structure. Implemented in gameexplorer.c + * + * Parameters: + * GameData [I/O] pointer to structure to uninitialize */ -void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) +static void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData) { HeapFree(GetProcessHeap(), 0, GameData->sGDFBinaryPath); HeapFree(GetProcessHeap(), 0, GameData->sGameInstallDirectory); @@ -497,11 +507,23 @@ static HRESULT GAMEUX_RemoveRegistryRecord(GUID* pInstanceID) return hr; } /******************************************************************************* - * GAMEUX_RegisterGame + * GAMEUX_RegisterGame * - * Internal helper function. Description available in gameux_private.h file + * Internal helper function. Registers game associated with given GDF binary in + * Game Explorer. Implemented in gameexplorer.c + * + * Parameters: + * sGDFBinaryPath [I] path to binary containing GDF file in + * resources + * sGameInstallDirectory [I] path to directory, where game installed + * it's files. + * installScope [I] scope of game installation + * pInstanceID [I/O] pointer to game instance identifier. + * If pointing to GUID_NULL, then new + * identifier will be generated automatically + * and returned via this parameter */ -HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, +static HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, LPCWSTR sGameInstallDirectory, GAME_INSTALL_SCOPE installScope, GUID *pInstanceID) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index b0e7674..63b8c8f 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -994,7 +994,7 @@ static const struct IGameStatisticsVtbl GameStatisticsImplVtbl = }; -HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) +static HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) { TRACE("(%p)\n", ppStats); diff --git a/dlls/gameux/gameux_private.h b/dlls/gameux/gameux_private.h index c8923b5..dc0c1d1 100644 --- a/dlls/gameux/gameux_private.h +++ b/dlls/gameux/gameux_private.h @@ -46,47 +46,6 @@ struct GAMEUX_GAME_DATA BSTR bstrDescription; /* game's description */ }; /******************************************************************************* - * GAMEUX_initGameData - * - * Initializes GAME_DATA structure fields with proper values. Should be - * called always before first usage of this structure. Implemented in gameexplorer.c - * - * Parameters: - * GameData [I/O] pointer to structure to initialize - */ -void GAMEUX_initGameData(struct GAMEUX_GAME_DATA *GameData); -/******************************************************************************* - * GAMEUX_uninitGameData - * - * Properly frees all data stored or pointed by fields of GAME_DATA structure. - * Should be called before freeing this structure. Implemented in gameexplorer.c - * - * Parameters: - * GameData [I/O] pointer to structure to uninitialize - */ -void GAMEUX_uninitGameData(struct GAMEUX_GAME_DATA *GameData); -/******************************************************************************* - * GAMEUX_RegisterGame - * - * Helper function. Registers game associated with given GDF binary in - * Game Explorer. Implemented in gameexplorer.c - * - * Parameters: - * sGDFBinaryPath [I] path to binary containing GDF file in - * resources - * sGameInstallDirectory [I] path to directory, where game installed - * it's files. - * installScope [I] scope of game installation - * pInstanceID [I/O] pointer to game instance identifier. - * If pointing to GUID_NULL, then new - * identifier will be generated automatically - * and returned via this parameter - */ -HRESULT WINAPI GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath, - LPCWSTR sGameInstallDirectory, - GAME_INSTALL_SCOPE installScope, - GUID *pInstanceID); -/******************************************************************************* * GAMEUX_FindGameInstanceId * * Helper function. Searches for instance identifier of given game in given

1 0

Alexandre Julliard : winex11: Clip out the top-level windows when repainting the desktop.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: d2ff4616152a1a656d087e1c8ebb66ecb038d64b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ff4616152a1a656d087e1c8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 12:16:33 2011 +0200 winex11: Clip out the top-level windows when repainting the desktop. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index acbafde..0a25afb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2280,6 +2280,9 @@ void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, escape.drawable = data ? data->whole_window : X11DRV_get_whole_window( hwnd ); else escape.drawable = escape.gl_drawable; + + /* special case: when repainting the root window, clip out top-level windows */ + if (data && data->whole_window == root_window) escape.mode = ClipByChildren; } else {

1 0

Henri Verbeet : wined3d: Get rid of wined3d_buffer_get_type().
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: efc080e3a3875c3a2a5cb1244a9b2fedb28760d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efc080e3a3875c3a2a5cb1244… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 22:39:30 2011 +0200 wined3d: Get rid of wined3d_buffer_get_type(). --- dlls/wined3d/buffer.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.idl | 1 - 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index ba3d06f..3fc5a15 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -961,11 +961,6 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) context_release(context); } -WINED3DRESOURCETYPE CDECL wined3d_buffer_get_type(const struct wined3d_buffer *buffer) -{ - return resource_get_type(&buffer->resource); -} - static DWORD buffer_sanitize_flags(struct wined3d_buffer *buffer, DWORD flags) { /* Not all flags make sense together, but Windows never returns an error. Catch the diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3795770..8d786fb 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -25,7 +25,6 @@ @ cdecl wined3d_buffer_get_priority(ptr) @ cdecl wined3d_buffer_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_buffer_get_resource(ptr) -@ cdecl wined3d_buffer_get_type(ptr) @ cdecl wined3d_buffer_incref(ptr) @ cdecl wined3d_buffer_map(ptr long long ptr long) @ cdecl wined3d_buffer_preload(ptr) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 422551d..20202bb 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2933,7 +2933,6 @@ DWORD __cdecl wined3d_buffer_get_priority(const struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_buffer_get_private_data(const struct wined3d_buffer *buffer, REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_buffer_get_resource(struct wined3d_buffer *buffer); -WINED3DRESOURCETYPE __cdecl wined3d_buffer_get_type(const struct wined3d_buffer *buffer); ULONG __cdecl wined3d_buffer_incref(struct wined3d_buffer *buffer); HRESULT __cdecl wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UINT size, BYTE **data, DWORD flags); void __cdecl wined3d_buffer_preload(struct wined3d_buffer *buffer);

1 0

Henri Verbeet : wined3d: Get rid of wined3d_volume_get_type().
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: cc39bde98d998caf7693704dd50afbde2104508b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc39bde98d998caf7693704dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 22:39:31 2011 +0200 wined3d: Get rid of wined3d_volume_get_type(). --- dlls/wined3d/volume.c | 5 ----- dlls/wined3d/wined3d.spec | 1 - include/wine/wined3d.idl | 1 - 3 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 66d7d6d..1792e1b 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -208,11 +208,6 @@ void CDECL wined3d_volume_preload(struct wined3d_volume *volume) FIXME("volume %p stub!\n", volume); } -WINED3DRESOURCETYPE CDECL wined3d_volume_get_type(const struct wined3d_volume *volume) -{ - return resource_get_type(&volume->resource); -} - struct wined3d_resource * CDECL wined3d_volume_get_resource(struct wined3d_volume *volume) { TRACE("volume %p.\n", volume); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 8d786fb..dfc4098 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -120,7 +120,6 @@ @ cdecl wined3d_volume_get_priority(ptr) @ cdecl wined3d_volume_get_private_data(ptr ptr ptr ptr) @ cdecl wined3d_volume_get_resource(ptr) -@ cdecl wined3d_volume_get_type(ptr) @ cdecl wined3d_volume_incref(ptr) @ cdecl wined3d_volume_map(ptr ptr ptr long) @ cdecl wined3d_volume_preload(ptr) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 20202bb..02c0d06 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3052,7 +3052,6 @@ DWORD __cdecl wined3d_volume_get_priority(const struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_get_private_data(const struct wined3d_volume *volume, REFGUID guid, void *data, DWORD *data_size); struct wined3d_resource * __cdecl wined3d_volume_get_resource(struct wined3d_volume *volume); -WINED3DRESOURCETYPE __cdecl wined3d_volume_get_type(const struct wined3d_volume *volume); ULONG __cdecl wined3d_volume_incref(struct wined3d_volume *volume); HRESULT __cdecl wined3d_volume_map(struct wined3d_volume *volume, WINED3DLOCKED_BOX *locked_box, const WINED3DBOX *box, DWORD flags);

1 0

Thomas Mullaly : wininet: Prevent a race condition which results in handles being leaked.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: 2e61684c5108eca65da451a473922c3f7fd4a891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e61684c5108eca65da451a47… Author: Thomas Mullaly <tmullaly(a)codeweavers.com> Date: Tue Apr 19 15:41:20 2011 -0400 wininet: Prevent a race condition which results in handles being leaked. --- dlls/wininet/urlcache.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 4d074ed..9cae3d7 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -224,8 +224,12 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) static const WCHAR wszIndex[] = {'i','n','d','e','x','.','d','a','t',0}; static const WCHAR wszMappingFormat[] = {'%','s','%','s','_','%','l','u',0}; - if (pContainer->hMapping) + WaitForSingleObject(pContainer->hMutex, INFINITE); + + if (pContainer->hMapping) { + ReleaseMutex(pContainer->hMutex); return ERROR_SUCCESS; + } strcpyW(wszFilePath, pContainer->path); strcatW(wszFilePath, wszIndex); @@ -240,14 +244,10 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) if (hFile == INVALID_HANDLE_VALUE) { TRACE("Could not open or create cache index file \"%s\"\n", debugstr_w(wszFilePath)); + ReleaseMutex(pContainer->hMutex); return GetLastError(); } - /* At this stage we need the mutex because we may be about to create the - * file. - */ - WaitForSingleObject(pContainer->hMutex, INFINITE); - dwFileSize = GetFileSize(hFile, NULL); if (dwFileSize == INVALID_FILE_SIZE) { @@ -420,8 +420,6 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) } - ReleaseMutex(pContainer->hMutex); - wsprintfW(wszFilePath, wszMappingFormat, pContainer->path, wszIndex, dwFileSize); URLCache_PathToObjectName(wszFilePath, '_'); pContainer->hMapping = OpenFileMappingW(FILE_MAP_WRITE, FALSE, wszFilePath); @@ -431,9 +429,12 @@ static DWORD URLCacheContainer_OpenIndex(URLCACHECONTAINER * pContainer) if (!pContainer->hMapping) { ERR("Couldn't create file mapping (error is %d)\n", GetLastError()); + ReleaseMutex(pContainer->hMutex); return GetLastError(); } + ReleaseMutex(pContainer->hMutex); + return ERROR_SUCCESS; }

1 0

André Hentschel : ntdll: Make sure RtlCaptureContext doesn't compile as Thumb but ARM.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: d0ea543f11419a7c588c63ee5d3849d04e21a12c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ea543f11419a7c588c63ee5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 21 18:32:07 2011 +0200 ntdll: Make sure RtlCaptureContext doesn't compile as Thumb but ARM. --- dlls/ntdll/signal_arm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 49caec8..ce65688 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -173,6 +173,7 @@ static inline void restore_fpu( CONTEXT *context, const ucontext_t *sigcontext ) */ /* FIXME: Use the Stack instead of the actual register values */ __ASM_STDCALL_FUNC( RtlCaptureContext, 4, + ".arm\n\t" "stmfd SP!, {r1}\n\t" "mov r1, #0x40\n\t" /* CONTEXT_ARM */ "add r1, r1, #0x3\n\t" /* CONTEXT_FULL */

1 0

Francois Gouget : d3dx9_36: Make some is_valid_xxx() functions static.
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: b383111574da809b29cc73495b587e302b930ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b383111574da809b29cc73495… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Apr 22 09:08:44 2011 +0200 d3dx9_36: Make some is_valid_xxx() functions static. --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 67d0698..d44616c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -156,7 +156,7 @@ static inline D3DXHANDLE get_pass_handle(struct d3dx_pass *pass) return (D3DXHANDLE) pass; } -struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) +static struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DXHANDLE technique) { unsigned int i; @@ -171,7 +171,7 @@ struct d3dx_technique *is_valid_technique(struct ID3DXBaseEffectImpl *base, D3DX return NULL; } -struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) +static struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pass) { unsigned int i, k; @@ -191,7 +191,7 @@ struct d3dx_pass *is_valid_pass(struct ID3DXBaseEffectImpl *base, D3DXHANDLE pas return NULL; } -struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) +static struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DXHANDLE parameter) { unsigned int i, count; struct d3dx_parameter *p; @@ -224,7 +224,7 @@ struct d3dx_parameter *is_valid_sub_parameter(struct d3dx_parameter *param, D3DX return NULL; } -struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) +static struct d3dx_parameter *is_valid_parameter(struct ID3DXBaseEffectImpl *base, D3DXHANDLE parameter) { unsigned int i, k, m; struct d3dx_parameter *p;

1 0

Henri Verbeet : wined3d: Make sure we release the correct DC in context_update_window().
by Alexandre Julliard April 22, 2011

April 22, 2011

Module: wine Branch: master Commit: 82e39ced7f3c2c513c95b4e52c446d23d4e2946b URL: http://source.winehq.org/git/wine.git/?a=commit;h=82e39ced7f3c2c513c95b4e52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 21 22:39:29 2011 +0200 wined3d: Make sure we release the correct DC in context_update_window(). --- dlls/wined3d/context.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 18c9438..3d07a35 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -873,7 +873,18 @@ static void context_update_window(struct wined3d_context *context) if (context->valid) { - if (!ReleaseDC(context->win_handle, context->hdc)) + /* You'd figure ReleaseDC() would fail if the DC doesn't match the + * window. However, that's not what actually happens, and there are + * user32 tests that confirm ReleaseDC() with the wrong window is + * supposed to succeed. So explicitly check that the DC belongs to + * the window, since we want to avoid releasing a DC that belongs to + * some other window if the original window was already destroyed. */ + if (WindowFromDC(context->hdc) != context->win_handle) + { + WARN("DC %p does not belong to window %p.\n", + context->hdc, context->win_handle); + } + else if (!ReleaseDC(context->win_handle, context->hdc)) { ERR("Failed to release device context %p, last error %#x.\n", context->hdc, GetLastError());

1 0