January 2011 - Wine-commits

Michael Stefaniuc : d3d8: Finish the COM cleanup of the IDirect3DDevice8 iface.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 54a61ae734627f7e9873d60567decab97a52e60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a61ae734627f7e9873d6056… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 28 01:17:54 2011 +0100 d3d8: Finish the COM cleanup of the IDirect3DDevice8 iface. --- dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/d3d8_private.h | 2 +- dlls/d3d8/device.c | 20 ++++++++++---------- dlls/d3d8/directx.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index e2a026b..1389885 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -277,7 +277,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im return hr; } - buffer->parentDevice = (IDirect3DDevice8 *)device; + buffer->parentDevice = &device->IDirect3DDevice8_iface; IUnknown_AddRef(buffer->parentDevice); return D3D_OK; @@ -538,7 +538,7 @@ HRESULT indexbuffer_init(IDirect3DIndexBuffer8Impl *buffer, IDirect3DDevice8Impl return hr; } - buffer->parentDevice = (IDirect3DDevice8 *)device; + buffer->parentDevice = &device->IDirect3DDevice8_iface; IUnknown_AddRef(buffer->parentDevice); return D3D_OK; diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 7fa48b7..705a3a5 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -382,7 +382,7 @@ HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Imp return hr; } - texture->parentDevice = (IDirect3DDevice8 *)device; + texture->parentDevice = &device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(texture->parentDevice); return D3D_OK; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3352e2b..3bfceb2 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -177,7 +177,7 @@ struct FvfToDecl struct IDirect3DDevice8Impl { /* IUnknown fields */ - const IDirect3DDevice8Vtbl *lpVtbl; + IDirect3DDevice8 IDirect3DDevice8_iface; const IWineD3DDeviceParentVtbl *device_parent_vtbl; LONG ref; /* But what about baseVertexIndex in state blocks? hmm... it may be a better idea to pass this to wined3d */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 667d8a2..5582b33 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -266,7 +266,7 @@ static ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *swapchain) static inline IDirect3DDevice8Impl *impl_from_IDirect3DDevice8(IDirect3DDevice8 *iface) { - return CONTAINING_RECORD(iface, IDirect3DDevice8Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DDevice8Impl, IDirect3DDevice8_iface); } static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(IDirect3DDevice8 *iface, REFIID riid, @@ -2724,19 +2724,19 @@ static inline struct IDirect3DDevice8Impl *device_from_device_parent(IWineD3DDev static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); - return IDirect3DDevice8Impl_QueryInterface((IDirect3DDevice8 *)This, riid, object); + return IDirect3DDevice8Impl_QueryInterface(&This->IDirect3DDevice8_iface, riid, object); } static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); - return IDirect3DDevice8Impl_AddRef((IDirect3DDevice8 *)This); + return IDirect3DDevice8Impl_AddRef(&This->IDirect3DDevice8_iface); } static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); - return IDirect3DDevice8Impl_Release((IDirect3DDevice8 *)This); + return IDirect3DDevice8Impl_Release(&This->IDirect3DDevice8_iface); } /* IWineD3DDeviceParent methods */ @@ -2797,7 +2797,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice "\tmultisample_quality %u, lockable %u, surface %p\n", iface, superior, width, height, format, multisample_type, multisample_quality, lockable, surface); - hr = IDirect3DDevice8_CreateRenderTarget((IDirect3DDevice8 *)This, width, height, + hr = IDirect3DDevice8_CreateRenderTarget(&This->IDirect3DDevice8_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, lockable, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { @@ -2808,7 +2808,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice *surface = d3d_surface->wineD3DSurface; IWineD3DSurface_AddRef(*surface); - d3d_surface->container = (IUnknown *)This; + d3d_surface->container = (IUnknown *)&This->IDirect3DDevice8_iface; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3d_surface); @@ -2827,7 +2827,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 "\tmultisample_quality %u, discard %u, surface %p\n", iface, width, height, format, multisample_type, multisample_quality, discard, surface); - hr = IDirect3DDevice8_CreateDepthStencilSurface((IDirect3DDevice8 *)This, width, height, + hr = IDirect3DDevice8_CreateDepthStencilSurface(&This->IDirect3DDevice8_iface, width, height, d3dformat_from_wined3dformat(format), multisample_type, (IDirect3DSurface8 **)&d3d_surface); if (FAILED(hr)) { @@ -2838,7 +2838,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 *surface = d3d_surface->wineD3DSurface; IWineD3DSurface_AddRef(*surface); - d3d_surface->container = (IUnknown *)This; + d3d_surface->container = (IUnknown *)&This->IDirect3DDevice8_iface; /* Implicit surfaces are created with an refcount of 0 */ IUnknown_Release((IUnknown *)d3d_surface); @@ -2910,7 +2910,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDevicePar local_parameters.FullScreen_RefreshRateInHz = present_parameters->FullScreen_RefreshRateInHz; local_parameters.FullScreen_PresentationInterval = present_parameters->PresentationInterval; - hr = IDirect3DDevice8_CreateAdditionalSwapChain((IDirect3DDevice8 *)This, + hr = IDirect3DDevice8_CreateAdditionalSwapChain(&This->IDirect3DDevice8_iface, &local_parameters, (IDirect3DSwapChain8 **)&d3d_swapchain); if (FAILED(hr)) { @@ -2974,7 +2974,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte WINED3DPRESENT_PARAMETERS wined3d_parameters; HRESULT hr; - device->lpVtbl = &Direct3DDevice8_Vtbl; + device->IDirect3DDevice8_iface.lpVtbl = &Direct3DDevice8_Vtbl; device->device_parent_vtbl = &d3d8_wined3d_device_parent_vtbl; device->ref = 1; device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index d01f413..f2e6323 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -377,7 +377,7 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(IDirect3D8 *iface, UINT adapte } TRACE("Created device %p.\n", object); - *device = (IDirect3DDevice8 *)object; + *device = &object->IDirect3DDevice8_iface; return D3D_OK; } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index d6bfd63..93b9fbe 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -311,7 +311,7 @@ HRESULT surface_init(IDirect3DSurface8Impl *surface, IDirect3DDevice8Impl *devic return hr; } - surface->parentDevice = (IDirect3DDevice8 *)device; + surface->parentDevice = &device->IDirect3DDevice8_iface; IUnknown_AddRef(surface->parentDevice); return D3D_OK; diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 1c2a535..4875d3a 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -166,7 +166,7 @@ HRESULT swapchain_init(IDirect3DSwapChain8Impl *swapchain, IDirect3DDevice8Impl return hr; } - swapchain->parentDevice = (IDirect3DDevice8 *)device; + swapchain->parentDevice = &device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(swapchain->parentDevice); return D3D_OK; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index b4f3258..b432390 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -369,7 +369,7 @@ HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *devic return hr; } - texture->parentDevice = (IDirect3DDevice8 *)device; + texture->parentDevice = &device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(texture->parentDevice); return D3D_OK; diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 9b78d6e..b4396a3 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -370,7 +370,7 @@ HRESULT volumetexture_init(IDirect3DVolumeTexture8Impl *texture, IDirect3DDevice return hr; } - texture->parentDevice = (IDirect3DDevice8 *)device; + texture->parentDevice = &device->IDirect3DDevice8_iface; IDirect3DDevice8_AddRef(texture->parentDevice); return D3D_OK;

1 0

Michael Stefaniuc : d3d8: COM cleanup for the IWineD3DDeviceParent_iface.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 7f184144ff747da3375eedf582f7a5e037b6046b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f184144ff747da3375eedf58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jan 28 01:19:57 2011 +0100 d3d8: COM cleanup for the IWineD3DDeviceParent_iface. --- dlls/d3d8/d3d8_private.h | 10 +++++----- dlls/d3d8/device.c | 34 ++++++++++++++++------------------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 3bfceb2..372d51c 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -178,18 +178,18 @@ struct IDirect3DDevice8Impl { /* IUnknown fields */ IDirect3DDevice8 IDirect3DDevice8_iface; - const IWineD3DDeviceParentVtbl *device_parent_vtbl; - LONG ref; + IWineD3DDeviceParent IWineD3DDeviceParent_iface; + LONG ref; /* But what about baseVertexIndex in state blocks? hmm... it may be a better idea to pass this to wined3d */ - IWineD3DDevice *WineD3DDevice; - struct d3d8_handle_table handle_table; + IWineD3DDevice *WineD3DDevice; + struct d3d8_handle_table handle_table; /* FVF management */ struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; /* Avoids recursion with nested ReleaseRef to 0 */ - BOOL inDestruction; + BOOL inDestruction; }; HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapter, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5582b33..73d2228 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -286,8 +286,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(IDirect3DDevice8 *ifac if (IsEqualGUID(riid, &IID_IWineD3DDeviceParent)) { - IUnknown_AddRef((IUnknown *)&This->device_parent_vtbl); - *ppobj = &This->device_parent_vtbl; + IWineD3DDeviceParent_AddRef(&This->IWineD3DDeviceParent_iface); + *ppobj = &This->IWineD3DDeviceParent_iface; return S_OK; } @@ -2713,29 +2713,27 @@ static const IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = IDirect3DDevice8Impl_DeletePatch }; -/* IWineD3DDeviceParent IUnknown methods */ - -static inline struct IDirect3DDevice8Impl *device_from_device_parent(IWineD3DDeviceParent *iface) +static inline IDirect3DDevice8Impl *impl_from_IWineD3DDeviceParent(IWineD3DDeviceParent *iface) { - return (struct IDirect3DDevice8Impl *)((char*)iface - - FIELD_OFFSET(struct IDirect3DDevice8Impl, device_parent_vtbl)); + return CONTAINING_RECORD(iface, IDirect3DDevice8Impl, IWineD3DDeviceParent_iface); } -static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, REFIID riid, void **object) +static HRESULT STDMETHODCALLTYPE device_parent_QueryInterface(IWineD3DDeviceParent *iface, + REFIID riid, void **object) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_QueryInterface(&This->IDirect3DDevice8_iface, riid, object); } static ULONG STDMETHODCALLTYPE device_parent_AddRef(IWineD3DDeviceParent *iface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_AddRef(&This->IDirect3DDevice8_iface); } static ULONG STDMETHODCALLTYPE device_parent_Release(IWineD3DDeviceParent *iface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); return IDirect3DDevice8Impl_Release(&This->IDirect3DDevice8_iface); } @@ -2750,7 +2748,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateSurface(IWineD3DDeviceParen IUnknown *superior, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; BOOL lockable = TRUE; HRESULT hr; @@ -2789,7 +2787,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateRenderTarget(IWineD3DDevice WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL lockable, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; @@ -2819,7 +2817,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateDepthStencilSurface(IWineD3 UINT width, UINT height, enum wined3d_format_id format, WINED3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, BOOL discard, IWineD3DSurface **surface) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSurface8Impl *d3d_surface; HRESULT hr; @@ -2849,7 +2847,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent IUnknown *superior, UINT width, UINT height, UINT depth, enum wined3d_format_id format, WINED3DPOOL pool, DWORD usage, IWineD3DVolume **volume) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DVolume8Impl *object; HRESULT hr; @@ -2888,7 +2886,7 @@ static HRESULT STDMETHODCALLTYPE device_parent_CreateVolume(IWineD3DDeviceParent static HRESULT STDMETHODCALLTYPE device_parent_CreateSwapChain(IWineD3DDeviceParent *iface, WINED3DPRESENT_PARAMETERS *present_parameters, IWineD3DSwapChain **swapchain) { - struct IDirect3DDevice8Impl *This = device_from_device_parent(iface); + IDirect3DDevice8Impl *This = impl_from_IWineD3DDeviceParent(iface); IDirect3DSwapChain8Impl *d3d_swapchain; D3DPRESENT_PARAMETERS local_parameters; HRESULT hr; @@ -2975,7 +2973,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte HRESULT hr; device->IDirect3DDevice8_iface.lpVtbl = &Direct3DDevice8_Vtbl; - device->device_parent_vtbl = &d3d8_wined3d_device_parent_vtbl; + device->IWineD3DDeviceParent_iface.lpVtbl = &d3d8_wined3d_device_parent_vtbl; device->ref = 1; device->handle_table.entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, D3D8_INITIAL_HANDLE_TABLE_SIZE * sizeof(*device->handle_table.entries)); @@ -2990,7 +2988,7 @@ HRESULT device_init(IDirect3DDevice8Impl *device, IWineD3D *wined3d, UINT adapte wined3d_mutex_lock(); hr = IWineD3D_CreateDevice(wined3d, adapter, device_type, focus_window, flags, - (IWineD3DDeviceParent *)&device->device_parent_vtbl, &device->WineD3DDevice); + &device->IWineD3DDeviceParent_iface, &device->WineD3DDevice); if (FAILED(hr)) { WARN("Failed to create wined3d device, hr %#x.\n", hr);

1 0

Nikolay Sivov : msvcrt: Forward _realloc_crt to realloc.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 81c4f2a25f5532c60fddc1422fb93846464e8ea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c4f2a25f5532c60fddc1422… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 28 03:21:06 2011 +0300 msvcrt: Forward _realloc_crt to realloc. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcr90/tests/msvcr90.c | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d079728..703a78d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1042,7 +1042,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3ece44c..c622b0e 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -890,7 +890,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) msvcr90._recalloc @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 38cf0fb..52f49c5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -876,7 +876,7 @@ @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype @ cdecl _read(long ptr long) msvcrt._read -@ stub _realloc_crt +@ cdecl _realloc_crt(ptr long) msvcrt.realloc @ cdecl _recalloc(ptr long long) @ stub _recalloc_crt @ stub _resetstkoflw diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index eeb8842..d4a7262 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -75,6 +75,9 @@ static int (__cdecl *p_atoflt)(_CRT_FLOAT *, char *); static unsigned int (__cdecl *p_set_abort_behavior)(unsigned int, unsigned int); static int (__cdecl *p_sopen_s)(int*, const char*, int, int, int); static int (__cdecl *p_wsopen_s)(int*, const wchar_t*, int, int, int); +static void* (__cdecl *p_realloc_crt)(void*, size_t); +static void* (__cdecl *p_malloc)(size_t); +static void (__cdecl *p_free)(void*); static void* (WINAPI *pEncodePointer)(void *); @@ -753,6 +756,36 @@ static void test__wsopen_s(void) ok(fd == -1, "got %d\n", fd); } +static void test__realloc_crt(void) +{ + void *mem; + + if(!p_realloc_crt) + { + win_skip("_realloc_crt not found\n"); + return; + } + +if (0) +{ + /* crashes on some systems starting Vista */ + mem = p_realloc_crt(NULL, 10); +} + + mem = p_malloc(10); + ok(mem != NULL, "memory not allocated\n"); + + mem = p_realloc_crt(mem, 20); + ok(mem != NULL, "memory not reallocated\n"); + + mem = p_realloc_crt(mem, 0); + ok(mem == NULL, "memory not freed\n"); + + mem = p_realloc_crt(NULL, 0); + ok(mem != NULL, "memory not (re)allocated for size 0\n"); + p_free(mem); +} + START_TEST(msvcr90) { HMODULE hcrt; @@ -788,6 +821,9 @@ START_TEST(msvcr90) p_set_abort_behavior = (void *) GetProcAddress(hcrt, "_set_abort_behavior"); p_sopen_s = (void*) GetProcAddress(hcrt, "_sopen_s"); p_wsopen_s = (void*) GetProcAddress(hcrt, "_wsopen_s"); + p_realloc_crt = (void*) GetProcAddress(hcrt, "_realloc_crt"); + p_malloc = (void*) GetProcAddress(hcrt, "malloc"); + p_free = (void*)GetProcAddress(hcrt, "free"); hkernel32 = GetModuleHandleA("kernel32.dll"); pEncodePointer = (void *) GetProcAddress(hkernel32, "EncodePointer"); @@ -804,4 +840,5 @@ START_TEST(msvcr90) test__set_abort_behavior(); test__sopen_s(); test__wsopen_s(); + test__realloc_crt(); }

1 0

Alexandre Julliard : winedbg: Add dumping of floating point registers for x86_64.
by Alexandre Julliard 28 Jan '11

28 Jan '11

Module: wine Branch: master Commit: 22cd7e0e5e44af14271d35cd59a9c8431f4f1f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=22cd7e0e5e44af14271d35cd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 27 21:08:45 2011 +0100 winedbg: Add dumping of floating point registers for x86_64. --- programs/winedbg/be_x86_64.c | 83 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 82 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index bd7a00a..253b4ac 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -73,6 +73,8 @@ static void be_x86_64_single_step(CONTEXT* ctx, unsigned enable) static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, int all_regs) { + static const char mxcsr_flags[16][4] = { "IE", "DE", "ZE", "OE", "UE", "PE", "DAZ", "IM", + "DM", "ZM", "OM", "UM", "PM", "R-", "R+", "FZ" }; static const char flags[] = "aVR-N--ODITSZ-A-P-C"; char buf[33]; int i; @@ -92,7 +94,86 @@ static void be_x86_64_print_context(HANDLE hThread, const CONTEXT* ctx, dbg_printf(" r11:%016lx r12:%016lx r13:%016lx r14:%016lx r15:%016lx\n", ctx->R11, ctx->R12, ctx->R13, ctx->R14, ctx->R15 ); - if (all_regs) dbg_printf( "Floating point x86_64 dump not implemented\n" ); + if (!all_regs) return; + + dbg_printf(" cs:%04x ds:%04x es:%04x fs:%04x gs:%04x ss:%04x\n", + ctx->SegCs, ctx->SegDs, ctx->SegEs, ctx->SegFs, ctx->SegGs, ctx->SegSs ); + + dbg_printf("Debug:\n"); + dbg_printf(" dr0:%016lx dr1:%016lx dr2:%016lx dr3:%016lx\n", + ctx->Dr0, ctx->Dr1, ctx->Dr2, ctx->Dr3 ); + dbg_printf(" dr6:%016lx dr7:%016lx\n", ctx->Dr6, ctx->Dr7 ); + + dbg_printf("Floating point:\n"); + dbg_printf(" flcw:%04x ", LOWORD(ctx->u.FltSave.ControlWord)); + dbg_printf(" fltw:%04x ", LOWORD(ctx->u.FltSave.TagWord)); + dbg_printf(" flsw:%04x", LOWORD(ctx->u.FltSave.StatusWord)); + + dbg_printf("(cc:%d%d%d%d", (ctx->u.FltSave.StatusWord & 0x00004000) >> 14, + (ctx->u.FltSave.StatusWord & 0x00000400) >> 10, + (ctx->u.FltSave.StatusWord & 0x00000200) >> 9, + (ctx->u.FltSave.StatusWord & 0x00000100) >> 8); + + dbg_printf(" top:%01x", (unsigned int) (ctx->u.FltSave.StatusWord & 0x00003800) >> 11); + + if (ctx->u.FltSave.StatusWord & 0x00000001) /* Invalid Fl OP */ + { + if (ctx->u.FltSave.StatusWord & 0x00000040) /* Stack Fault */ + { + if (ctx->u.FltSave.StatusWord & 0x00000200) /* C1 says Overflow */ + dbg_printf(" #IE(Stack Overflow)"); + else + dbg_printf(" #IE(Stack Underflow)"); /* Underflow */ + } + else dbg_printf(" #IE(Arithmetic error)"); /* Invalid Fl OP */ + } + if (ctx->u.FltSave.StatusWord & 0x00000002) dbg_printf(" #DE"); /* Denormalised OP */ + if (ctx->u.FltSave.StatusWord & 0x00000004) dbg_printf(" #ZE"); /* Zero Divide */ + if (ctx->u.FltSave.StatusWord & 0x00000008) dbg_printf(" #OE"); /* Overflow */ + if (ctx->u.FltSave.StatusWord & 0x00000010) dbg_printf(" #UE"); /* Underflow */ + if (ctx->u.FltSave.StatusWord & 0x00000020) dbg_printf(" #PE"); /* Precision error */ + if (ctx->u.FltSave.StatusWord & 0x00000040) + if (!(ctx->u.FltSave.StatusWord & 0x00000001)) + dbg_printf(" #SE"); /* Stack Fault (don't think this can occur) */ + if (ctx->u.FltSave.StatusWord & 0x00000080) dbg_printf(" #ES"); /* Error Summary */ + if (ctx->u.FltSave.StatusWord & 0x00008000) dbg_printf(" #FB"); /* FPU Busy */ + dbg_printf(")\n"); + dbg_printf(" flerr:%04x:%08x fldata:%04x:%08x\n", + ctx->u.FltSave.ErrorSelector, ctx->u.FltSave.ErrorOffset, + ctx->u.FltSave.DataSelector, ctx->u.FltSave.DataOffset ); + + for (i = 0; i < 4; i++) + { + long double st; + memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); + dbg_printf(" st%u:%-16Lg ", i, st); + } + dbg_printf("\n"); + for (i = 4; i < 8; i++) + { + long double st; + memcpy(&st, &ctx->u.FltSave.FloatRegisters[i * 10], 10); + dbg_printf(" st%u:%-16Lg ", i, st); + } + dbg_printf("\n"); + + dbg_printf(" mxcsr: %04x (", ctx->u.FltSave.MxCsr ); + for (i = 0; i < 16; i++) + if (ctx->u.FltSave.MxCsr & (1 << i)) dbg_printf( " %s", mxcsr_flags[i] ); + dbg_printf(" )\n"); + + for (i = 0; i < 16; i++) + { + dbg_printf( " %sxmm%u: uint=%016lx%016lx", (i > 9) ? "" : " ", i, + ctx->u.FltSave.XmmRegisters[i].High, ctx->u.FltSave.XmmRegisters[i].Low ); + dbg_printf( " double={%g; %g}", *(double *)&ctx->u.FltSave.XmmRegisters[i].Low, + *(double *)&ctx->u.FltSave.XmmRegisters[i].High ); + dbg_printf( " float={%g; %g; %g; %g}\n", + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 0), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 1), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 2), + (double)*((float *)&ctx->u.FltSave.XmmRegisters[i] + 3) ); + } } static void be_x86_64_print_segment_info(HANDLE hThread, const CONTEXT* ctx)

1 0

Jacek Caban : jscript: Fixed some clang warnings.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 020245bba10e15e2a1b415f4a4a08d43f9fb1025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=020245bba10e15e2a1b415f4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 27 13:38:36 2011 +0100 jscript: Fixed some clang warnings. --- dlls/jscript/array.c | 3 +++ dlls/jscript/engine.c | 2 +- dlls/jscript/function.c | 3 ++- dlls/jscript/jscript.c | 3 ++- dlls/jscript/lex.c | 1 - dlls/jscript/number.c | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index b8fabe1..f99fe01 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -133,6 +133,9 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP HRESULT hres; hres = to_number(ctx, get_arg(dp, 0), ei, &num); + if(FAILED(hres)) + return hres; + if(V_VT(&num) == VT_I4) len = V_I4(&num); else diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 9a5ecbc..1b56e63 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2415,7 +2415,7 @@ static HRESULT typeof_exprval(script_ctx_t *ctx, exprval_t *exprval, jsexcept_t } VariantClear(&val); - return S_OK; + return hres; } HRESULT typeof_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index ff5364a..765fade 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -441,7 +441,8 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } } - hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); + if(SUCCEEDED(hres)) + hres = call_function(ctx, function, this_obj, &args, retv, ei, caller); if(this_obj) IDispatch_Release(this_obj); diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index a17b456..e5123b4 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -522,7 +522,8 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, item->flags = dwFlags; item->name = heap_strdupW(pstrName); if(!item->name) { - IDispatch_Release(disp); + if(disp) + IDispatch_Release(disp); heap_free(item); return E_OUTOFMEMORY; } diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index 723f0ef..6dfe937 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -249,7 +249,6 @@ static BOOL unescape(WCHAR *str) } p++; - c = 0; switch(*p) { case '\'': diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index f95a19a..82dd5bc 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -150,7 +150,7 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D if(exp) { if(log_radix==0) - buf[idx++] = '\0'; + buf[idx] = 0; else { static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; WCHAR ch;

1 0

Hans Leidekker : msi: Skip rollback custom actions.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 08c3d2a5ab76221af4f5bd56b30f2ad2394a7025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c3d2a5ab76221af4f5bd56b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:50 2011 +0100 msi: Skip rollback custom actions. --- dlls/msi/custom.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 5e0cbe0..80e1938 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -236,7 +236,7 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL } else if (type & msidbCustomActionTypeRollback) { - FIXME("Deferring rollback only action... rollbacks not supported yet\n"); + FIXME("Deferring rollback only action\n"); schedule_action(package, ROLLBACK_SCRIPT, deferred); } else @@ -274,6 +274,12 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script, BOOL msi_free(actiondata); } + if (type & msidbCustomActionTypeRollback) + { + FIXME("Rollbacks not supported yet\n"); + rc = ERROR_SUCCESS; + goto end; + } } else if (!check_execution_scheduling_options(package,action,type)) {

1 0

Hans Leidekker : winhttp/tests: Test a return value (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 1549088da0681b675c965b3dd8530e8abb3a85c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1549088da0681b675c965b3dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:57:03 2011 +0100 winhttp/tests: Test a return value (clang). --- dlls/winhttp/tests/notification.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 6c9142b..7ceede7 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -295,6 +295,7 @@ static void test_redirect( void ) setup_test( &info, winhttp_send_request, __LINE__ ); ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok(ret, "failed to send request %u\n", GetLastError()); setup_test( &info, winhttp_receive_response, __LINE__ ); ret = WinHttpReceiveResponse( req, NULL );

1 0

Alexander Morozov : shell32/tests: Fix test failure on some NT4.
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: c0ab36949db19b92b1f323eef1004596bb2f58df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ab36949db19b92b1f323eef… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Thu Jan 27 14:44:02 2011 +0300 shell32/tests: Fix test failure on some NT4. --- dlls/shell32/tests/shelldispatch.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 34dbdb5..1c31736 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -83,7 +83,9 @@ static void test_namespace(void) V_I4(&var) = ssfPROGRAMFILES; r = IShellDispatch_NameSpace(sd, var, &folder); todo_wine - ok(r == S_OK, "IShellDispatch::NameSpace failed: %08x\n", r); + ok(r == S_OK || + broken(r == S_FALSE), /* NT4 */ + "IShellDispatch::NameSpace failed: %08x\n", r); if (r == S_OK) { r = Folder_get_Title(folder, &title);

1 0

Hans Leidekker : msi: Initialize a variable in get_patch_product_codes ( clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: aae1b210920435268673343d83004043d66411b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae1b210920435268673343d8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:56:39 2011 +0100 msi: Initialize a variable in get_patch_product_codes (clang). --- dlls/msi/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 948ae35..325a5b0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -306,7 +306,7 @@ static UINT get_patch_product_codes( LPCWSTR szPatchPackage, WCHAR ***product_co UINT r, type; DWORD size; static WCHAR empty[] = {0}; - WCHAR *codes; + WCHAR *codes = NULL; r = MsiOpenDatabaseW( szPatchPackage, MSIDBOPEN_READONLY, &patch ); if (r != ERROR_SUCCESS)

1 0

Hans Leidekker : msi: Check the return value of IActiveScript_AddNamedItem (clang).
by Alexandre Julliard 27 Jan '11

27 Jan '11

Module: wine Branch: master Commit: 15f0cc3130951e60913b2ff9511a7e4c2e87ff79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15f0cc3130951e60913b2ff95… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 27 11:55:06 2011 +0100 msi: Check the return value of IActiveScript_AddNamedItem (clang). --- dlls/msi/script.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/script.c b/dlls/msi/script.c index 4f223da..27bbee1 100644 --- a/dlls/msi/script.c +++ b/dlls/msi/script.c @@ -143,6 +143,7 @@ DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function /* Add the session object */ hr = IActiveScript_AddNamedItem(pActiveScript, szSession, SCRIPTITEM_ISVISIBLE); + if (FAILED(hr)) goto done; /* Pass the script to the engine */ hr = IActiveScriptParse64_ParseScriptText(pActiveScriptParse, script, NULL, NULL, NULL, 0, 0, 0L, NULL, NULL);

1 0