November 2007 - Wine-commits

Dmitry Timoshkov : winex11.drv: Add support for saving/ reading display settings.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 7bb12b9e8c4230d38244f965ad2a55e771a83fb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb12b9e8c4230d38244f965a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 14:23:19 2007 +0800 winex11.drv: Add support for saving/reading display settings. --- dlls/winex11.drv/settings.c | 73 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 908d61e..d530f9b 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -24,6 +24,7 @@ #include "x11drv.h" #include "windef.h" +#include "winreg.h" #include "wingdi.h" #include "ddrawi.h" #include "wine/debug.h" @@ -144,11 +145,13 @@ static int X11DRV_nores_GetCurrentMode(void) { return 0; } + static LONG X11DRV_nores_SetCurrentMode(int mode) { TRACE("Ignoring mode change request\n"); return DISP_CHANGE_FAILED; } + /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { @@ -159,6 +162,68 @@ void X11DRV_Settings_Init(void) X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); } +/* Our fake driver GUID path */ +static const char wine_X11_reg_key[] = + "System\\CurrentControlSet\\Control\\Video\\{64498428-1122-3344-5566-778899aabbcc}\\0000"; + +static BOOL read_registry_settings(DEVMODEW *dm) +{ + HKEY hkey; + DWORD type, size; + BOOL ret = TRUE; + + if (RegOpenKeyA(HKEY_CURRENT_CONFIG, wine_X11_reg_key, &hkey)) + return FALSE; + +#define query_value(name, data) \ + if (RegQueryValueExA(hkey, name, 0, &type, (LPBYTE)(data), &size) || \ + type != REG_DWORD || size != sizeof(DWORD)) \ + ret = FALSE + + query_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + query_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + query_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + query_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + query_value("DefaultSettings.Flags", &dm->dmDisplayFlags); + query_value("DefaultSettings.XPanning", &dm->dmPosition.x); + query_value("DefaultSettings.YPanning", &dm->dmPosition.y); + query_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + query_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); + +#undef query_value + + RegCloseKey(hkey); + return ret; +} + +static BOOL write_registry_settings(const DEVMODEW *dm) +{ + HKEY hkey; + BOOL ret = TRUE; + + if (RegCreateKeyA(HKEY_CURRENT_CONFIG, wine_X11_reg_key, &hkey)) + return FALSE; + +#define set_value(name, data) \ + if (RegSetValueExA(hkey, name, 0, REG_DWORD, (LPBYTE)(data), sizeof(DWORD))) \ + ret = FALSE + + set_value("DefaultSettings.BitsPerPel", &dm->dmBitsPerPel); + set_value("DefaultSettings.XResolution", &dm->dmPelsWidth); + set_value("DefaultSettings.YResolution", &dm->dmPelsHeight); + set_value("DefaultSettings.VRefresh", &dm->dmDisplayFrequency); + set_value("DefaultSettings.Flags", &dm->dmDisplayFlags); + set_value("DefaultSettings.XPanning", &dm->dmPosition.x); + set_value("DefaultSettings.YPanning", &dm->dmPosition.y); + set_value("DefaultSettings.Orientation", &dm->dmDisplayOrientation); + set_value("DefaultSettings.FixedOutput", &dm->dmDisplayFixedOutput); + +#undef set_value + + RegCloseKey(hkey); + return ret; +} + /*********************************************************************** * EnumDisplaySettingsEx (X11DRV.@) * @@ -192,7 +257,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n == ENUM_REGISTRY_SETTINGS) { TRACE("mode %d (registry) -- getting default mode (%s)\n", n, handler_name); - n = dd_mode_default; + return read_registry_settings(devmode); } if (n < dd_mode_count) { @@ -311,7 +376,11 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, } /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); - if (!(flags & CDS_TEST)) + + if (flags & CDS_UPDATEREGISTRY) + write_registry_settings(devmode); + + if (!(flags & (CDS_TEST | CDS_NORESET))) return pSetCurrentMode(i); return DISP_CHANGE_SUCCESSFUL; }

1 0

Dmitry Timoshkov : version: Use GetModuleHandleEx to increment the module ref count.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 09c3d32ff583dad7b1ba8a86d17a65bc8226f705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c3d32ff583dad7b1ba8a86d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Nov 1 14:23:38 2007 +0800 version: Use GetModuleHandleEx to increment the module ref count. --- dlls/version/info.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/version/info.c b/dlls/version/info.c index 0ad288e..935d0c1 100644 --- a/dlls/version/info.c +++ b/dlls/version/info.c @@ -246,11 +246,9 @@ static DWORD VERSION_GetFileVersionInfo_PE( LPCWSTR filename, DWORD datasize, LP TRACE("%s\n", debugstr_w(filename)); - hModule = GetModuleHandleW(filename); - if(!hModule) + if (!GetModuleHandleExW(0, filename, &hModule)) hModule = LoadLibraryExW(filename, 0, LOAD_LIBRARY_AS_DATAFILE); - else - hModule = LoadLibraryExW(filename, 0, 0); + if(!hModule) { WARN("Could not load %s\n", debugstr_w(filename));

1 0

Stefan Dösinger : wined3d: Reenable render target unlocking via textures.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 2a09716c75207d7276a95c094ef3dfa9bd03c613 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a09716c75207d7276a95c094… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Nov 1 01:40:44 2007 +0100 wined3d: Reenable render target unlocking via textures. --- dlls/wined3d/surface.c | 70 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36f3002..fab9919 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1138,10 +1138,16 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { switch(wined3d_settings.rendertargetlock_mode) { case RTL_READTEX: case RTL_TEXTEX: -#if 0 + ENTER_GL(); + if (This->glDescription.textureName == 0) { + glGenTextures(1, &This->glDescription.textureName); + checkGLcall("glGenTextures"); + } + glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); + checkGLcall("glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName);"); + LEAVE_GL(); IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ -#endif case RTL_AUTO: case RTL_READDRAW: @@ -3353,24 +3359,47 @@ struct coords { int x, y, z; }; -static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { +static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT *rect_in) { struct coords coords[4]; - int low_coord; + RECT rect; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + if(rect_in) { + rect = *rect_in; + } else { + rect.left = 0; + rect.top = 0; + rect.right = This->currentDesc.Width; + rect.bottom = This->currentDesc.Height; + } + ActivateContext(device, device->render_targets[0], CTXUSAGE_BLIT); ENTER_GL(); if(This->glDescription.target == GL_TEXTURE_2D) { glBindTexture(GL_TEXTURE_2D, This->glDescription.textureName); checkGLcall("GL_TEXTURE_2D, This->glDescription.textureName)"); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + + coords[0].x = rect.left / This->pow2Width; + coords[0].z = 0; + + coords[1].x = rect.left / This->pow2Width; + coords[1].z = 0; + + coords[2].x = rect.right / This->pow2Width; + coords[2].z = 0; - coords[0].x = 0; coords[0].y = 0; coords[0].z = 0; - coords[1].x = 0; coords[1].y = 1; coords[1].z = 0; - coords[2].x = 1; coords[2].y = 1; coords[2].z = 0; - coords[3].x = 1; coords[3].y = 0; coords[3].z = 0; + coords[3].x = rect.right / This->pow2Width; + coords[3].z = 0; - low_coord = 0; + coords[0].y = rect.top / This->pow2Height; + coords[1].y = rect.bottom / This->pow2Height; + coords[2].y = rect.bottom / This->pow2Height; + coords[3].y = rect.top / This->pow2Height; } else { /* Must be a cube map */ glDisable(GL_TEXTURE_2D); @@ -3379,6 +3408,10 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { checkGLcall("glEnable(GL_TEXTURE_CUBE_MAP_ARB)"); glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, This->glDescription.textureName); checkGLcall("GL_TEXTURE_CUBE_MAP_ARB, This->glDescription.textureName)"); + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); + glTexParameteri(GL_TEXTURE_CUBE_MAP_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + checkGLcall("glTexParameteri"); switch(This->glDescription.target) { case GL_TEXTURE_CUBE_MAP_POSITIVE_X: @@ -3427,29 +3460,20 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This) { LEAVE_GL(); return; } - - low_coord = -1; - } - - if(device->render_offscreen) { - coords[0].y = coords[0].y == 1 ? low_coord : 1; - coords[1].y = coords[1].y == 1 ? low_coord : 1; - coords[2].y = coords[2].y == 1 ? low_coord : 1; - coords[3].y = coords[3].y == 1 ? low_coord : 1; } glBegin(GL_QUADS); glTexCoord3iv((GLint *) &coords[0]); - glVertex2i(0, 0); + glVertex2i(rect.left, device->render_offscreen ? rect.bottom : rect.top); glTexCoord3iv((GLint *) &coords[1]); - glVertex2i(0, This->pow2Height); + glVertex2i(0, device->render_offscreen ? rect.top : rect.bottom); glTexCoord3iv((GLint *) &coords[2]); - glVertex2i(This->pow2Width, This->pow2Height); + glVertex2i(rect.right, device->render_offscreen ? rect.top : rect.bottom); glTexCoord3iv((GLint *) &coords[3]); - glVertex2i(This->pow2Width, 0); + glVertex2i(rect.right, device->render_offscreen ? rect.bottom : rect.top); glEnd(); checkGLcall("glEnd"); @@ -3598,7 +3622,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } } else if(flag == SFLAG_INDRAWABLE) { if(This->Flags & SFLAG_INTEXTURE) { - surface_blt_to_drawable(This); + surface_blt_to_drawable(This, rect); } else { /* Activate the correct context for the render target */ ActivateContext(myDevice, iface, CTXUSAGE_BLIT);

1 0

Stefan Dösinger : wined3d: Move a part of LockRect to the base class.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: a175e7b68e87460035e64731f42de036a65cdac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a175e7b68e87460035e64731f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Oct 9 22:19:39 2007 +0200 wined3d: Move a part of LockRect to the base class. --- dlls/wined3d/surface.c | 80 ++++++++-------------------------------- dlls/wined3d/surface_base.c | 77 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface_gdi.c | 71 +---------------------------------- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 97 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a175e7b68e87460035e64…

1 0

Stefan Dösinger : wined3d: Allocate memory for default pool resources too.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: f1f84a36155b9deb9983f12cd466b3ede31e6a13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f84a36155b9deb9983f12cd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 12:37:21 2007 +0200 wined3d: Allocate memory for default pool resources too. --- dlls/wined3d/device.c | 11 ++--------- dlls/wined3d/surface.c | 6 ------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2f957ae..17aeea2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,8 +101,8 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.allocatedMemory = (0 == _size ? NULL : Pool == WINED3DPOOL_DEFAULT ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size)); \ - if (object->resource.allocatedMemory == NULL && _size != 0 && Pool != WINED3DPOOL_DEFAULT) { \ + object->resource.allocatedMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + if (object->resource.allocatedMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ @@ -310,9 +310,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("(%p) : Size=%d, Usage=%d, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DVertexBuffer *)object; - if (Pool == WINED3DPOOL_DEFAULT ) { /* Allocate some system memory for now */ - object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->resource.size); - } object->fvf = FVF; /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + @@ -398,10 +395,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface /* Allocate the storage for the device */ D3DCREATERESOURCEOBJECTINSTANCE(object,IndexBuffer,WINED3DRTYPE_INDEXBUFFER, Length) - if (Pool == WINED3DPOOL_DEFAULT ) { /* We need a local copy for drawStridedSlow */ - object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,object->resource.size); - } - if(Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { CreateIndexBufferVBO(This, object); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index afb0b78..07501f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3280,12 +3280,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { This->glRect.bottom = This->pow2Height; } - if(This->resource.allocatedMemory == NULL) { - /* Make sure memory exists from the start, and it is initialized properly. D3D initializes surfaces, - * gl does not, so we need to upload zeroes to init the gl texture. - */ - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size + 4); - } This->Flags |= SFLAG_INSYSMEM; return WINED3D_OK;

1 0

Stefan Dösinger : wined3d: Disconnect allocatedMemory and Heap allocation.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 4d4fce7e3313bb8d2d76993361004c5a4b4dd63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d4fce7e3313bb8d2d7699336… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 13:02:03 2007 +0200 wined3d: Disconnect allocatedMemory and Heap allocation. --- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/resource.c | 3 ++- dlls/wined3d/surface.c | 17 ++++++++++++----- dlls/wined3d/surface_base.c | 4 ++-- dlls/wined3d/surface_gdi.c | 10 +++++++++- dlls/wined3d/swapchain.c | 4 ++++ dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17aeea2..db7a4e3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,13 +101,14 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.allocatedMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ - if (object->resource.allocatedMemory == NULL && _size != 0) { \ + object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + if (object->resource.heapMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ return WINED3DERR_OUTOFVIDEOMEMORY; \ } \ + object->resource.allocatedMemory = object->resource.heapMemory; \ *pp##type = (IWineD3D##type *) object; \ IWineD3DDeviceImpl_AddResource(iface, (IWineD3DResource *)object) ;\ TRACE("(%p) : Created resource %p\n", This, object); \ diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4a620f6..9faaea5 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -82,8 +82,9 @@ void IWineD3DResourceImpl_CleanUp(IWineD3DResource *iface){ } } - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = 0; + This->resource.heapMemory = 0; if (This->resource.wineD3DDevice != NULL) { IWineD3DDevice_ResourceReleased((IWineD3DDevice *)This->resource.wineD3DDevice, iface); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 07501f2..6637539 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -668,15 +668,17 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { checkGLcall("glBindBufferARB"); /* We don't need the system memory anymore and we can't even use it for PBOs */ - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; This->Flags |= SFLAG_PBO; LEAVE_GL(); } else if(!(This->resource.allocatedMemory || This->Flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); + This->resource.allocatedMemory = This->resource.heapMemory; if(This->Flags & SFLAG_INSYSMEM) { ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); } @@ -2024,8 +2026,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadTexture(IWineD3DSurface *iface, BO #endif if (!(This->Flags & SFLAG_DONOTFREE)) { - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, FALSE); } @@ -2257,7 +2260,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { This->hDC = NULL; This->Flags &= ~SFLAG_DIBSECTION; } else if(!(This->Flags & SFLAG_USERPTR)) { - release = This->resource.allocatedMemory; + release = This->resource.heapMemory; + This->resource.heapMemory = NULL; } This->resource.allocatedMemory = Mem; This->Flags |= SFLAG_USERPTR | SFLAG_INSYSMEM; @@ -2277,6 +2281,8 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { } else if(This->Flags & SFLAG_USERPTR) { /* Lockrect and GetDC will re-create the dib section and allocated memory */ This->resource.allocatedMemory = NULL; + /* HeapMemory should be NULL already */ + if(This->resource.heapMemory != NULL) ERR("User pointer surface has heap memory allocated\n"); This->Flags &= ~SFLAG_USERPTR; if(This->Flags & SFLAG_CLIENT) { @@ -2839,8 +2845,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } if(!(This->Flags & SFLAG_DONOTFREE)) { - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; } else { This->Flags &= ~SFLAG_INSYSMEM; } diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index a9c5a07..6b9c631 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -483,7 +483,6 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; int extraline = 0; SYSTEM_INFO sysInfo; - void *oldmem = This->resource.allocatedMemory; BITMAPINFO* b_info; HDC ddc; DWORD *masks; @@ -609,7 +608,8 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { This->Flags |= SFLAG_DIBSECTION; - HeapFree(GetProcessHeap(), 0, oldmem); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); + This->resource.heapMemory = NULL; return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index d3cb89d..a5ca3db 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -329,6 +329,13 @@ IWineGDISurfaceImpl_Flip(IWineD3DSurface *iface, tmp = This->resource.allocatedMemory; This->resource.allocatedMemory = Target->resource.allocatedMemory; Target->resource.allocatedMemory = tmp; + + if(This->resource.heapMemory) { + ERR("GDI Surface %p has heap memory allocated\n", This); + } + if(Target->resource.heapMemory) { + ERR("GDI Surface %p has heap memory allocated\n", Target); + } } /* client_memory should not be different, but just in case */ @@ -630,8 +637,9 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) /* Sysmem textures have memory already allocated - * release it, this avoids an unnecessary memcpy */ - HeapFree(GetProcessHeap(), 0, This->resource.allocatedMemory); + HeapFree(GetProcessHeap(), 0, This->resource.heapMemory); This->resource.allocatedMemory = NULL; + This->resource.heapMemory = NULL; /* We don't mind the nonpow2 stuff in GDI */ This->pow2Width = This->currentDesc.Width; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 330f928..501c7cd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -322,6 +322,10 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO tmp = front->resource.allocatedMemory; front->resource.allocatedMemory = back->resource.allocatedMemory; back->resource.allocatedMemory = tmp; + + tmp = front->resource.heapMemory; + front->resource.heapMemory = back->resource.heapMemory; + back->resource.heapMemory = tmp; } /* Flip the PBO */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8362aa1..fdfd43f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -817,7 +817,8 @@ typedef struct IWineD3DResourceClass UINT size; DWORD usage; WINED3DFORMAT format; - BYTE *allocatedMemory; + BYTE *allocatedMemory; /* Pointer to the real data location */ + BYTE *heapMemory; /* Pointer to the HeapAlloced block of memory */ struct list privateData; } IWineD3DResourceClass;

1 0

Stefan Dösinger : wined3d: Make resource memory 32 byte aligned.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 393ed4a070a38f093fc8920affd72cb77eb0942e URL: http://source.winehq.org/git/wine.git/?a=commit;h=393ed4a070a38f093fc8920af… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Oct 22 13:30:14 2007 +0200 wined3d: Make resource memory 32 byte aligned. --- dlls/d3d9/tests/device.c | 71 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 11 +++++- dlls/wined3d/surface.c | 5 ++- dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 85 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2402a97..4f655b6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1449,6 +1449,76 @@ static void test_null_stream(void) if(d3d9) IDirect3D9_Release(d3d9); } +static inline const char *debug_d3dpool(D3DPOOL pool) { + switch(pool) { + case D3DPOOL_DEFAULT: return "D3DPOOL_DEFAULT"; + case D3DPOOL_SYSTEMMEM: return "D3DPOOL_SYSTEMMEM"; + case D3DPOOL_SCRATCH: return "D3DPOOL_SCRATCH"; + case D3DPOOL_MANAGED: return "D3DPOOL_MANAGED"; + default: + return "unknown pool"; + } +} + +static void test_vertex_buffer_alignment(void) +{ + IDirect3DVertexBuffer9 *buffer = NULL; + D3DPRESENT_PARAMETERS present_parameters; + IDirect3DDevice9 *device = NULL; + IDirect3D9 *d3d9; + HWND hwnd; + HRESULT hr; + D3DPOOL pools[] = {D3DPOOL_DEFAULT, D3DPOOL_SYSTEMMEM, D3DPOOL_SCRATCH, D3DPOOL_MANAGED}; + DWORD sizes[] = {1, 4, 16, 17, 32, 33, 64, 65, 1024, 1025, 1048576, 1048577}; + unsigned int i, j; + void *data; + + d3d9 = pDirect3DCreate9( D3D_SDK_VERSION ); + ok(d3d9 != NULL, "Failed to create IDirect3D9 object\n"); + hwnd = CreateWindow( "static", "d3d9_test", WS_OVERLAPPEDWINDOW, 100, 100, 160, 160, NULL, NULL, NULL, NULL ); + ok(hwnd != NULL, "Failed to create window\n"); + if (!d3d9 || !hwnd) goto cleanup; + + ZeroMemory(&present_parameters, sizeof(present_parameters)); + present_parameters.Windowed = TRUE; + present_parameters.hDeviceWindow = hwnd; + present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; + + hr = IDirect3D9_CreateDevice( d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL /* no NULLREF here */, hwnd, + D3DCREATE_SOFTWARE_VERTEXPROCESSING, &present_parameters, &device ); + ok(hr == D3D_OK || hr == D3DERR_NOTAVAILABLE, "IDirect3D9_CreateDevice failed with %s\n", DXGetErrorString9(hr)); + if(!device) + { + skip("Failed to create a d3d device\n"); + goto cleanup; + } + + for(i = 0; i < (sizeof(sizes) / sizeof(sizes[0])); i++) { + for(j = 0; j < (sizeof(pools) / sizeof(pools[0])); j++) { + hr = IDirect3DDevice9_CreateVertexBuffer(device, sizes[i], 0, 0, pools[j], &buffer, NULL); + if(pools[j] == D3DPOOL_SCRATCH) { + ok(hr == D3DERR_INVALIDCALL, "Creating a D3DPOOL_SCRATCH buffer returned (0x%08x)\n", hr); + } else { + ok(SUCCEEDED(hr), "IDirect3DDevice9_CreateVertexBuffer failed (0x%08x). Pool = %s, size %d\n", hr, + debug_d3dpool(pools[j]), sizes[i]); + } + if(FAILED(hr)) continue; + + hr = IDirect3DVertexBuffer9_Lock(buffer, 0, 0, (void **) &data, 0); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Lock failed (0x%08x)\n", hr); + ok(((DWORD_PTR) data & 31) == 0, "Vertex buffer start address is not 32 byte aligned(size: %d, pool: %s, data: %p)\n", + sizes[i], debug_d3dpool(pools[j]), data); + hr = IDirect3DVertexBuffer9_Unlock(buffer); + ok(SUCCEEDED(hr), "IDirect3DVertexBuffer9_Unlock failed (0x%08x)\n", hr); + + if(buffer) IDirect3DVertexBuffer9_Release(buffer); + } + } + + cleanup: + if(d3d9) IDirect3D9_Release(d3d9); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -1473,5 +1543,6 @@ START_TEST(device) test_depthstenciltest(); test_draw_indexed(); test_null_stream(); + test_vertex_buffer_alignment(); } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index db7a4e3..dd6bde8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -101,14 +101,14 @@ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3 } \ WineD3DAdapterChangeGLRam(This, _size); \ } \ - object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + 4)); \ + object->resource.heapMemory = (0 == _size ? NULL : HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, _size + RESOURCE_ALIGNMENT)); \ if (object->resource.heapMemory == NULL && _size != 0) { \ FIXME("Out of memory!\n"); \ HeapFree(GetProcessHeap(), 0, object); \ *pp##type = NULL; \ return WINED3DERR_OUTOFVIDEOMEMORY; \ } \ - object->resource.allocatedMemory = object->resource.heapMemory; \ + object->resource.allocatedMemory = (BYTE *)(((ULONG_PTR) object->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); \ *pp##type = (IWineD3D##type *) object; \ IWineD3DDeviceImpl_AddResource(iface, (IWineD3DResource *)object) ;\ TRACE("(%p) : Created resource %p\n", This, object); \ @@ -304,6 +304,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); *ppVertexBuffer = NULL; return WINED3DERR_INVALIDCALL; + } else if(Pool == WINED3DPOOL_SCRATCH) { + /* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense + * anyway, SCRATCH vertex buffers aren't useable anywhere + */ + WARN("Vertex buffer in D3DPOOL_SCRATCH requested, returning WINED3DERR_INVALIDCALL\n"); + *ppVertexBuffer = NULL; + return WINED3DERR_INVALIDCALL; } D3DCREATERESOURCEOBJECTINSTANCE(object, VertexBuffer, WINED3DRTYPE_VERTEXBUFFER, Size) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6637539..5b6e908 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -677,8 +677,9 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { /* Whatever surface we have, make sure that there is memory allocated for the downloaded copy, * or a pbo to map */ - This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); - This->resource.allocatedMemory = This->resource.heapMemory; + This->resource.heapMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + RESOURCE_ALIGNMENT); + This->resource.allocatedMemory = + (BYTE *)(((ULONG_PTR) This->resource.heapMemory + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); if(This->Flags & SFLAG_INSYSMEM) { ERR("Surface without memory or pbo has SFLAG_INSYSMEM set!\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdfd43f..cac31a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -830,6 +830,8 @@ typedef struct IWineD3DResourceImpl IWineD3DResourceClass resource; } IWineD3DResourceImpl; +/* Tests show that the start address of resources is 32 byte aligned */ +#define RESOURCE_ALIGNMENT 32 /***************************************************************************** * IWineD3DVertexBuffer implementation structure (extends IWineD3DResourceImpl)

1 0

Alexandre Julliard : server: Fix get_next/ prev_window behavior for unlinked windows.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: b8435343579bcb414cbe9edfd0fb774a889b4157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8435343579bcb414cbe9edfd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 18:08:19 2007 +0100 server: Fix get_next/prev_window behavior for unlinked windows. --- server/window.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/window.c b/server/window.c index 1e81cbf..75f01a7 100644 --- a/server/window.c +++ b/server/window.c @@ -77,7 +77,8 @@ struct window unsigned int ex_style; /* window extended style */ unsigned int id; /* window id */ void* instance; /* creator instance */ - int is_unicode; /* ANSI or unicode */ + unsigned int is_unicode : 1; /* ANSI or unicode */ + unsigned int is_linked : 1; /* is it linked into the parent z-order list? */ unsigned long user_data; /* user-specific data */ WCHAR *text; /* window caption text */ unsigned int paint_flags; /* various painting flags */ @@ -142,6 +143,7 @@ static int set_parent_window( struct window *win, struct window *parent ) { win->parent = parent; list_add_head( &parent->children, &win->entry ); + win->is_linked = 1; /* if parent belongs to a different thread and the window isn't */ /* top-level, attach the two threads */ @@ -151,6 +153,7 @@ static int set_parent_window( struct window *win, struct window *parent ) else /* move it to parent unlinked list */ { list_add_head( &win->parent->unlinked, &win->entry ); + win->is_linked = 0; } return 1; } @@ -159,7 +162,6 @@ static int set_parent_window( struct window *win, struct window *parent ) static inline struct window *get_next_window( struct window *win ) { struct list *ptr = list_next( &win->parent->children, &win->entry ); - if (ptr == &win->parent->unlinked) ptr = NULL; return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; } @@ -167,7 +169,6 @@ static inline struct window *get_next_window( struct window *win ) static inline struct window *get_prev_window( struct window *win ) { struct list *ptr = list_prev( &win->parent->children, &win->entry ); - if (ptr == &win->parent->unlinked) ptr = NULL; return ptr ? LIST_ENTRY( ptr, struct window, entry ) : NULL; } @@ -402,6 +403,7 @@ static struct window *create_window( struct window *parent, struct window *owner win->id = 0; win->instance = NULL; win->is_unicode = 1; + win->is_linked = 0; win->user_data = 0; win->text = NULL; win->paint_flags = 0; @@ -1378,6 +1380,7 @@ static void set_window_pos( struct window *win, struct window *previous, list_remove( &win->entry ); /* unlink it from the previous location */ if (previous) list_add_after( &previous->entry, &win->entry ); else list_add_head( &win->parent->children, &win->entry ); + win->is_linked = 1; } if (swp_flags & SWP_SHOWWINDOW) win->style |= WS_VISIBLE; else if (swp_flags & SWP_HIDEWINDOW) win->style &= ~WS_VISIBLE; @@ -1765,8 +1768,11 @@ DECL_HANDLER(get_window_tree) struct window *parent = win->parent; reply->parent = parent->handle; reply->owner = win->owner; - if ((ptr = get_next_window( win ))) reply->next_sibling = ptr->handle; - if ((ptr = get_prev_window( win ))) reply->prev_sibling = ptr->handle; + if (win->is_linked) + { + if ((ptr = get_next_window( win ))) reply->next_sibling = ptr->handle; + if ((ptr = get_prev_window( win ))) reply->prev_sibling = ptr->handle; + } if ((ptr = get_first_child( parent ))) reply->first_sibling = ptr->handle; if ((ptr = get_last_child( parent ))) reply->last_sibling = ptr->handle; }

1 0

Alexandre Julliard : server: Added support for HWND_TOPMOST and HWND_NOTOPMOST.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: c183a9e6e7809ef39874d1c01778af31173d0e82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c183a9e6e7809ef39874d1c01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 18:12:56 2007 +0100 server: Added support for HWND_TOPMOST and HWND_NOTOPMOST. --- dlls/user32/winpos.c | 22 +++++-- server/window.c | 162 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 126 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c183a9e6e7809ef39874d…

1 0

Alexandre Julliard : winex11.drv: Set the WM_STATE_ABOVE hint on topmost windows.
by Alexandre Julliard 01 Nov '07

01 Nov '07

Module: wine Branch: master Commit: 83fd17f2163071415471bb1433b004dce1ddba00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fd17f2163071415471bb143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 31 18:13:20 2007 +0100 winex11.drv: Set the WM_STATE_ABOVE hint on topmost windows. --- dlls/winex11.drv/winpos.c | 3 +++ dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 9de341b..e4ce6f5 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -181,6 +181,7 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO static const unsigned int state_atoms[NB_WM_STATES] = { XATOM__NET_WM_STATE_FULLSCREEN, + XATOM__NET_WM_STATE_ABOVE, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR }; @@ -195,6 +196,8 @@ static void update_wm_states( Display *display, struct x11drv_win_data *data, BO new_state |= (1 << WM_STATE_FULLSCREEN); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + if (ex_style & WS_EX_TOPMOST) + new_state |= (1 << WM_STATE_ABOVE); if (ex_style & WS_EX_TOOLWINDOW) new_state |= (1 << WM_STATE_SKIP_TASKBAR) | (1 << WM_STATE_SKIP_PAGER); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 49d6e8b..445badc 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -578,6 +578,7 @@ enum x11drv_atoms XATOM__NET_WM_PID, XATOM__NET_WM_PING, XATOM__NET_WM_STATE, + XATOM__NET_WM_STATE_ABOVE, XATOM__NET_WM_STATE_FULLSCREEN, XATOM__NET_WM_STATE_SKIP_PAGER, XATOM__NET_WM_STATE_SKIP_TASKBAR, @@ -649,6 +650,7 @@ enum x11drv_window_messages enum x11drv_wm_state { WM_STATE_FULLSCREEN, + WM_STATE_ABOVE, WM_STATE_SKIP_PAGER, WM_STATE_SKIP_TASKBAR, NB_WM_STATES diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 1cfc0b0..d26fa8b 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -135,6 +135,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "_NET_WM_PID", "_NET_WM_PING", "_NET_WM_STATE", + "_NET_WM_STATE_ABOVE", "_NET_WM_STATE_FULLSCREEN", "_NET_WM_STATE_SKIP_PAGER", "_NET_WM_STATE_SKIP_TASKBAR",

1 0