November 2012 - Wine-Commits

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE2.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 55ee76431ccb593ae19e98e255406cff65a36b00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ee76431ccb593ae19e98e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:19 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE2. --- dlls/d3drm/d3drm.c | 10 ++++------ dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 6 ++++-- include/d3drmobj.h | 8 ++++---- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e90ce30..dd33a2f 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -629,9 +629,8 @@ static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromSurface(IDirect3DRM2 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice2, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2* iface, LPDIRECT3D2 pD3D, - LPDIRECT3DDEVICE2 pD3DDev, - LPDIRECT3DRMDEVICE2 * ppDevice) +static HRESULT WINAPI IDirect3DRM2Impl_CreateDeviceFromD3D(IDirect3DRM2 *iface, + IDirect3D2 *pD3D, IDirect3DDevice2 *pD3DDev, IDirect3DRMDevice2 **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM2(iface); @@ -1073,9 +1072,8 @@ static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromSurface(IDirect3DRM3 *ifa return Direct3DRMDevice_create(&IID_IDirect3DRMDevice3, (IUnknown**)device); } -static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3* iface, LPDIRECT3D2 d3d, - LPDIRECT3DDEVICE2 d3ddev, - LPDIRECT3DRMDEVICE3* device) +static HRESULT WINAPI IDirect3DRM3Impl_CreateDeviceFromD3D(IDirect3DRM3 *iface, + IDirect3D2 *d3d, IDirect3DDevice2 *d3ddev, IDirect3DRMDevice3 **device) { IDirect3DRMImpl *This = impl_from_IDirect3DRM3(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 05ca080..5d2b249 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -421,9 +421,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D2(IDirect3DRMDevice2 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -460,8 +459,8 @@ static DWORD WINAPI IDirect3DRMDevice2Impl_GetRenderMode(IDirect3DRMDevice2* ifa return IDirect3DRMDevice3_GetRenderMode(&This->IDirect3DRMDevice3_iface); } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice2(IDirect3DRMDevice2 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -856,9 +855,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3* iface, - LPDIRECT3D2 lpD3D, - LPDIRECT3DDEVICE2 lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D2(IDirect3DRMDevice3 *iface, + IDirect3D2 *lpD3D, IDirect3DDevice2 *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -897,8 +895,8 @@ static DWORD WINAPI IDirect3DRMDevice3Impl_GetRenderMode(IDirect3DRMDevice3* ifa return This->rendermode; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE2 * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice2(IDirect3DRMDevice3 *iface, + IDirect3DDevice2 **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 3ec1183..4125e8a 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -206,7 +206,8 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE2 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice2 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE2 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice2 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, @@ -344,7 +345,8 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE3 *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice3 **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev, LPDIRECT3DRMDEVICE3 *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *d3d_device, + IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice3 **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 2265b56..1df113d 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -526,11 +526,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; }; #undef INTERFACE @@ -671,11 +671,11 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; /*** IDirect3DRMDevice2 methods ***/ - STDMETHOD(InitFromD3D2)(THIS_ LPDIRECT3D2 pD3D, LPDIRECT3DDEVICE2 pD3DDev) PURE; + STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; STDMETHOD(SetRenderMode)(THIS_ DWORD flags) PURE; STDMETHOD_(DWORD, GetRenderMode)(THIS) PURE; - STDMETHOD(GetDirect3DDevice2)(THIS_ LPDIRECT3DDEVICE2 *) PURE; + STDMETHOD(GetDirect3DDevice2)(THIS_ IDirect3DDevice2 **device) PURE; /*** IDirect3DRMDevice3 methods ***/ STDMETHOD(FindPreferredTextureFormat)(THIS_ DWORD BitDepths, DWORD flags, LPDDPIXELFORMAT pDDPF) PURE; STDMETHOD(RenderStateChange)(THIS_ D3DRENDERSTATETYPE drsType, DWORD val, DWORD flags) PURE;

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DDEVICE.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 49041569462fffbfe779738860fc73567f2e1ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49041569462fffbfe77973886… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:20 2012 +0100 d3drm: Avoid LPDIRECT3DDEVICE. --- dlls/d3drm/d3drm.c | 3 ++- dlls/d3drm/device.c | 18 ++++++++---------- include/d3drm.h | 3 ++- include/d3drmobj.h | 12 ++++++------ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index dd33a2f..7261eb2 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -251,7 +251,8 @@ static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromSurface(IDirect3DRM *iface return Direct3DRMDevice_create(&IID_IDirect3DRMDevice, (IUnknown**)ppDevice); } -static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM* iface, LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE * ppDevice) +static HRESULT WINAPI IDirect3DRMImpl_CreateDeviceFromD3D(IDirect3DRM *iface, + IDirect3D *pD3D, IDirect3DDevice *pD3DDev, IDirect3DRMDevice **ppDevice) { IDirect3DRMImpl *This = impl_from_IDirect3DRM(iface); diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 5d2b249..ed6055b 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -212,9 +212,8 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_Init(IDirect3DRMDevice2* iface, ULO } /*** IDirect3DRMDevice2 methods ***/ -static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_InitFromD3D(IDirect3DRMDevice2 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -411,8 +410,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice2Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice2Impl_GetDirect3DDevice(IDirect3DRMDevice2 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); @@ -639,9 +638,8 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_Init(IDirect3DRMDevice3* iface, ULO return D3DRM_OK; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3* iface, - LPDIRECT3D lpD3D, - LPDIRECT3DDEVICE lpD3DDev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_InitFromD3D(IDirect3DRMDevice3 *iface, + IDirect3D *lpD3D, IDirect3DDevice *lpD3DDev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); @@ -844,8 +842,8 @@ static D3DRMTEXTUREQUALITY WINAPI IDirect3DRMDevice3Impl_GetTextureQuality(IDire return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3* iface, - LPDIRECT3DDEVICE * dev) +static HRESULT WINAPI IDirect3DRMDevice3Impl_GetDirect3DDevice(IDirect3DRMDevice3 *iface, + IDirect3DDevice **dev) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); diff --git a/include/d3drm.h b/include/d3drm.h index 4125e8a..8311759 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -71,7 +71,8 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) STDMETHOD(CreateDevice)(THIS_ DWORD, DWORD, LPDIRECT3DRMDEVICE *) PURE; STDMETHOD(CreateDeviceFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface, IDirect3DRMDevice **device) PURE; - STDMETHOD(CreateDeviceFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev, LPDIRECT3DRMDEVICE *) PURE; + STDMETHOD(CreateDeviceFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device, + IDirect3DRMDevice **device) PURE; STDMETHOD(CreateDeviceFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height, IDirect3DRMDevice **device) PURE; STDMETHOD(CreateTextureFromSurface)(THIS_ IDirectDrawSurface *surface, diff --git a/include/d3drmobj.h b/include/d3drmobj.h index 1df113d..5e50abe 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -376,7 +376,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice,IUnknown) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; }; #undef INTERFACE @@ -503,7 +503,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -524,7 +524,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice2,IDirect3DRMDevice) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE; @@ -648,7 +648,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; /*** IDirect3DRMDevice methods ***/ STDMETHOD(Init)(THIS_ ULONG width, ULONG height) PURE; - STDMETHOD(InitFromD3D)(THIS_ LPDIRECT3D pD3D, LPDIRECT3DDEVICE pD3DDev) PURE; + STDMETHOD(InitFromD3D)(THIS_ IDirect3D *d3d, IDirect3DDevice *d3d_device) PURE; STDMETHOD(InitFromClipper)(THIS_ IDirectDrawClipper *clipper, GUID *guid, int width, int height) PURE; STDMETHOD(Update)(THIS) PURE; STDMETHOD(AddUpdateCallback)(THIS_ D3DRMUPDATECALLBACK, LPVOID arg) PURE; @@ -669,7 +669,7 @@ DECLARE_INTERFACE_(IDirect3DRMDevice3,IDirect3DRMObject) STDMETHOD_(D3DRMRENDERQUALITY, GetQuality)(THIS) PURE; STDMETHOD_(D3DCOLORMODEL, GetColorModel)(THIS) PURE; STDMETHOD_(D3DRMTEXTUREQUALITY, GetTextureQuality)(THIS) PURE; - STDMETHOD(GetDirect3DDevice)(THIS_ LPDIRECT3DDEVICE *) PURE; + STDMETHOD(GetDirect3DDevice)(THIS_ IDirect3DDevice **d3d_device) PURE; /*** IDirect3DRMDevice2 methods ***/ STDMETHOD(InitFromD3D2)(THIS_ IDirect3D2 *d3d, IDirect3DDevice2 *device) PURE; STDMETHOD(InitFromSurface)(THIS_ GUID *guid, IDirectDraw *ddraw, IDirectDrawSurface *surface) PURE;

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_IAGetIndexBuffer().
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: d0d213f7d14d242ad5ebd5893ec0ea0edc82b7dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d213f7d14d242ad5ebd5893… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 22:40:21 2012 +0100 d3d10core: Implement d3d10_device_IAGetIndexBuffer(). --- dlls/d3d10core/device.c | 20 +++++++++++++++++++- dlls/d3d8/device.c | 3 ++- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 6 ++++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index be55387..2501da99 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -534,7 +534,25 @@ static void STDMETHODCALLTYPE d3d10_device_IAGetVertexBuffers(ID3D10Device *ifac static void STDMETHODCALLTYPE d3d10_device_IAGetIndexBuffer(ID3D10Device *iface, ID3D10Buffer **buffer, DXGI_FORMAT *format, UINT *offset) { - FIXME("iface %p, buffer %p, format %p, offset %p stub!\n", iface, buffer, format, offset); + struct d3d10_device *device = impl_from_ID3D10Device(iface); + enum wined3d_format_id wined3d_format; + struct wined3d_buffer *wined3d_buffer; + struct d3d10_buffer *buffer_impl; + + TRACE("iface %p, buffer %p, format %p, offset %p.\n", iface, buffer, format, offset); + + wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format); + *format = dxgi_format_from_wined3dformat(wined3d_format); + *offset = 0; /* FIXME */ + if (!wined3d_buffer) + { + *buffer = NULL; + return; + } + + buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); + *buffer = &buffer_impl->ID3D10Buffer_iface; + ID3D10Buffer_AddRef(*buffer); } static void STDMETHODCALLTYPE d3d10_device_GSGetConstantBuffers(ID3D10Device *iface, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d1dcd02..d8d230f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2302,6 +2302,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, IDirect3DIndexBuffer8 **buffer, UINT *base_vertex_index) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d8_indexbuffer *buffer_impl; @@ -2313,7 +2314,7 @@ static HRESULT WINAPI d3d8_device_GetIndices(IDirect3DDevice8 *iface, /* The case from UINT to INT is safe because d3d8 will never set negative values */ wined3d_mutex_lock(); *base_vertex_index = wined3d_device_get_base_vertex_index(device->wined3d_device); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer8_iface; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c70f96..1c707e2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2483,6 +2483,7 @@ static HRESULT WINAPI d3d9_device_SetIndices(IDirect3DDevice9Ex *iface, IDirect3 static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3DIndexBuffer9 **buffer) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + enum wined3d_format_id wined3d_format; struct wined3d_buffer *wined3d_buffer; struct d3d9_indexbuffer *buffer_impl; @@ -2492,7 +2493,7 @@ static HRESULT WINAPI d3d9_device_GetIndices(IDirect3DDevice9Ex *iface, IDirect3 return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device))) + if ((wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &wined3d_format))) { buffer_impl = wined3d_buffer_get_parent(wined3d_buffer); *buffer = &buffer_impl->IDirect3DIndexBuffer9_iface; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea11f70..3211038 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2236,10 +2236,12 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, } } -struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device) +struct wined3d_buffer * CDECL wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format) { - TRACE("device %p.\n", device); + TRACE("device %p, format %p.\n", device, format); + *format = device->stateBlock->state.index_format; return device->stateBlock->state.index_buffer; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index e97c102..cb8304a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -65,7 +65,7 @@ @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) -@ cdecl wined3d_device_get_index_buffer(ptr) +@ cdecl wined3d_device_get_index_buffer(ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) @ cdecl wined3d_device_get_light_enable(ptr long ptr) @ cdecl wined3d_device_get_material(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 329698a..cf86df6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2125,7 +2125,8 @@ HRESULT __cdecl wined3d_device_get_front_buffer_data(const struct wined3d_device void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device); -struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device); +struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, + enum wined3d_format_id *format); HRESULT __cdecl wined3d_device_get_light(const struct wined3d_device *device, UINT light_idx, struct wined3d_light *light); HRESULT __cdecl wined3d_device_get_light_enable(const struct wined3d_device *device, UINT light_idx, BOOL *enable);

1 0

Jacek Caban : atl100: Addeed stub DLL.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 565d9f6dc8ba1b571d10de464dcfd0813b992323 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565d9f6dc8ba1b571d10de464… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:09:45 2012 +0100 atl100: Addeed stub DLL. --- configure | 1 + configure.ac | 1 + dlls/atl100/Makefile.in | 5 ++++ dlls/atl100/atl.c | 33 +++++++++++++++++++++++++++++ dlls/atl100/atl100.spec | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2fcdd20..2baf8c8 100755 --- a/configure +++ b/configure @@ -15247,6 +15247,7 @@ wine_fn_config_test dlls/apphelp/tests apphelp_test wine_fn_config_dll appwiz.cpl enable_appwiz_cpl po wine_fn_config_dll atl enable_atl implib wine_fn_config_test dlls/atl/tests atl_test +wine_fn_config_dll atl100 enable_atl100 wine_fn_config_dll atl80 enable_atl80 wine_fn_config_dll authz enable_authz wine_fn_config_dll avicap32 enable_avicap32 implib diff --git a/configure.ac b/configure.ac index a08b995..d003e8a 100644 --- a/configure.ac +++ b/configure.ac @@ -2513,6 +2513,7 @@ WINE_CONFIG_TEST(dlls/apphelp/tests) WINE_CONFIG_DLL(appwiz.cpl,,[po]) WINE_CONFIG_DLL(atl,,[implib]) WINE_CONFIG_TEST(dlls/atl/tests) +WINE_CONFIG_DLL(atl100) WINE_CONFIG_DLL(atl80) WINE_CONFIG_DLL(authz) WINE_CONFIG_DLL(avicap32,,[implib]) diff --git a/dlls/atl100/Makefile.in b/dlls/atl100/Makefile.in new file mode 100644 index 0000000..9121a10 --- /dev/null +++ b/dlls/atl100/Makefile.in @@ -0,0 +1,5 @@ +MODULE = atl100.dll + +C_SRCS = atl.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/atl100/atl.c b/dlls/atl100/atl.c new file mode 100644 index 0000000..ff257ce --- /dev/null +++ b/dlls/atl100/atl.c @@ -0,0 +1,33 @@ +/* + * Copyright 2012 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(atl); + +/*********************************************************************** + * AtlGetVersion [atl100.@] + */ +DWORD WINAPI AtlGetVersion(void *pReserved) +{ + return 0x0a00; +} diff --git a/dlls/atl100/atl100.spec b/dlls/atl100/atl100.spec new file mode 100644 index 0000000..d367615 --- /dev/null +++ b/dlls/atl100/atl100.spec @@ -0,0 +1,52 @@ +10 stub AtlAdvise +11 stub AtlUnadvise +12 stub AtlFreeMarshalStream +13 stub AtlMarshalPtrInProc +14 stub AtlUnmarshalPtr +15 stub AtlComModuleGetClassObject +17 stub AtlComModuleRegisterClassObjects +20 stub AtlComModuleRevokeClassObjects +22 stub AtlComModuleUnregisterServer +23 stub AtlUpdateRegistryFromResourceD +24 stub AtlWaitWithMessageLoop +25 stub AtlSetErrorInfo +26 stub AtlCreateTargetDC +27 stub AtlHiMetricToPixel +28 stub AtlPixelToHiMetric +29 stub AtlDevModeW2A +30 stub AtlComPtrAssign +31 stub AtlComQIPtrAssign +32 stub AtlInternalQueryInterface +34 stdcall AtlGetVersion(ptr) +35 stub AtlAxDialogBoxW +36 stub AtlAxDialogBoxA +37 stub AtlAxCreateDialogW +38 stub AtlAxCreateDialogA +39 stub AtlAxCreateControl +40 stub AtlAxCreateControlEx +41 stub AtlAxAttachControl +42 stub AtlAxWinInit +43 stub AtlWinModuleAddCreateWndData +44 stub AtlWinModuleExtractCreateWndData +45 stub AtlWinModuleRegisterWndClassInfoW +46 stub AtlWinModuleRegisterWndClassInfoA +47 stub AtlAxGetControl +48 stub AtlAxGetHost +49 stub AtlRegisterClassCategoriesHelper +50 stub AtlIPersistStreamInit_Load +51 stub AtlIPersistStreamInit_Save +52 stub AtlIPersistPropertyBag_Load +53 stub AtlIPersistPropertyBag_Save +54 stub AtlGetObjectSourceInterface +56 stub AtlLoadTypeLib +58 stub AtlModuleAddTermFunc +59 stub AtlAxCreateControlLic +60 stub AtlAxCreateControlLicEx +61 stub AtlCreateRegistrar +62 stub AtlWinModuleRegisterClassExW +63 stub AtlWinModuleRegisterClassExA +64 stub AtlCallTermFunc +65 stub AtlWinModuleInit +66 stub AtlWinModuleTerm +67 stub AtlSetPerUserRegistration +68 stub AtlGetPerUserRegistration

1 0

Jacek Caban : atl: Always return S_FALSE in DllCanUnloadNow.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 0cc483a07b7e8a5392692b16edfc2c00d8120e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cc483a07b7e8a5392692b16e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:10:01 2012 +0100 atl: Always return S_FALSE in DllCanUnloadNow. --- dlls/atl/registrar.c | 16 +--------------- 1 files changed, 1 insertions(+), 15 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 028f35e..2aaf888 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -36,8 +36,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(atl); -static LONG dll_count; - /************************************************************** * ATLRegistrar implementation */ @@ -570,7 +568,6 @@ static ULONG WINAPI Registrar_Release(IRegistrar *iface) if(!ref) { IRegistrar_ClearReplacements(iface); HeapFree(GetProcessHeap(), 0, This); - InterlockedDecrement(&dll_count); } return ref; } @@ -711,8 +708,6 @@ static HRESULT AtlCreateRegistrar(IRegistrar **ret) registrar->ref = 1; registrar->rep = NULL; - InterlockedIncrement(&dll_count); - *ret = &registrar->IRegistrar_iface; return S_OK; } @@ -736,13 +731,11 @@ static HRESULT WINAPI RegistrarCF_QueryInterface(IClassFactory *iface, REFIID ri static ULONG WINAPI RegistrarCF_AddRef(IClassFactory *iface) { - InterlockedIncrement(&dll_count); return 2; } static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) { - InterlockedDecrement(&dll_count); return 1; } @@ -771,12 +764,6 @@ static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) { TRACE("(%p)->(%x)\n", iface, lock); - - if(lock) - InterlockedIncrement(&dll_count); - else - InterlockedDecrement(&dll_count); - return S_OK; } @@ -886,6 +873,5 @@ HRESULT WINAPI DllUnregisterServer(void) */ HRESULT WINAPI DllCanUnloadNow(void) { - TRACE("dll_count = %u\n", dll_count); - return dll_count ? S_FALSE : S_OK; + return S_FALSE; }

1 0

Jacek Caban : atl: Moved atlwin.h to public includes.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: fe3684cadd30564cdac5bebc327825e9f1d34c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe3684cadd30564cdac5bebc3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:10 2012 +0100 atl: Moved atlwin.h to public includes. --- include/Makefile.in | 1 + {dlls/atl => include}/atlwin.h | 0 2 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index dc6ee88..c2ca25a 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -142,6 +142,7 @@ SRCDIR_INCLUDES = \ asynot.idl \ asysta.idl \ atlbase.h \ + atlwin.h \ audevcod.h \ audiosessiontypes.h \ aviriff.h \ diff --git a/dlls/atl/atlwin.h b/include/atlwin.h similarity index 100% rename from dlls/atl/atlwin.h rename to include/atlwin.h

1 0

Jacek Caban : atl100: Moved more function implementations to atl100.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 84587b689e3c42ca20fd2c86c8e22138598cc0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=84587b689e3c42ca20fd2c86c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:11:37 2012 +0100 atl100: Moved more function implementations to atl100. --- dlls/atl/Makefile.in | 3 +- dlls/atl/atl.spec | 50 +++++----- dlls/atl/atl_main.c | 197 +-------------------------------------- dlls/atl100/Makefile.in | 3 +- dlls/atl100/atl.c | 208 ++++++++++++++++++++++++++++++++++++++++- dlls/atl100/atl100.spec | 42 ++++---- dlls/{atl => atl100}/atl_ax.c | 30 +++--- 7 files changed, 270 insertions(+), 263 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84587b689e3c42ca20fd2…

1 0

Jacek Caban : atl80: Forward calls directly to atl100 when possible.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: f63617efb3ce6199dc10f60c1805876beeaaf99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63617efb3ce6199dc10f60c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 11:12:13 2012 +0100 atl80: Forward calls directly to atl100 when possible. --- dlls/atl80/atl80.c | 13 ++--------- dlls/atl80/atl80.spec | 54 ++++++++++++++++++++++++------------------------ tools/make_specfiles | 1 + 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/atl80/atl80.c b/dlls/atl80/atl80.c index 1c31fe9..ec9a515 100644 --- a/dlls/atl80/atl80.c +++ b/dlls/atl80/atl80.c @@ -19,17 +19,10 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" -#include "atliface.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(atl80); - -HRESULT WINAPI AtlCreateRegistrar(IRegistrar** ppReg) -{ - FIXME("(%p) stub\n", ppReg); - return E_NOTIMPL; -} +/*********************************************************************** + * AtlGetVersion [atl80.@] + */ DWORD WINAPI AtlGetVersion(void *pReserved) { return 0x0800; diff --git a/dlls/atl80/atl80.spec b/dlls/atl80/atl80.spec index 7f8cfc2..519bdd0 100644 --- a/dlls/atl80/atl80.spec +++ b/dlls/atl80/atl80.spec @@ -1,8 +1,8 @@ -10 stdcall AtlAdvise(ptr ptr ptr ptr) atl.AtlAdvise -11 stdcall AtlUnadvise(ptr ptr long) atl.AtlUnadvise -12 stdcall AtlFreeMarshalStream(ptr) atl.AtlFreeMarshalStream -13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl.AtlMarshalPtrInProc -14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl.AtlUnmarshalPtr +10 stdcall AtlAdvise(ptr ptr ptr ptr) atl100.AtlAdvise +11 stdcall AtlUnadvise(ptr ptr long) atl100.AtlUnadvise +12 stdcall AtlFreeMarshalStream(ptr) atl100.AtlFreeMarshalStream +13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) atl100.AtlMarshalPtrInProc +14 stdcall AtlUnmarshalPtr(ptr ptr ptr) atl100.AtlUnmarshalPtr 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) atl.AtlModuleGetClassObject 16 stdcall AtlModuleInit(ptr long long) atl.AtlModuleInit 17 stdcall AtlModuleRegisterClassObjects(ptr long long) atl.AtlModuleRegisterClassObjects @@ -14,41 +14,41 @@ 23 stdcall AtlModuleUpdateRegistryFromResourceD(ptr wstr long ptr ptr) atl.AtlModuleUpdateRegistryFromResourceD 24 stub AtlWaitWithMessageLoop 25 stub AtlSetErrorInfo -26 stdcall AtlCreateTargetDC(long ptr) atl.AtlCreateTargetDC -27 stdcall AtlHiMetricToPixel(ptr ptr) atl.AtlHiMetricToPixel -28 stdcall AtlPixelToHiMetric(ptr ptr) atl.AtlPixelToHiMetric +26 stdcall AtlCreateTargetDC(long ptr) atl100.AtlCreateTargetDC +27 stdcall AtlHiMetricToPixel(ptr ptr) atl100.AtlHiMetricToPixel +28 stdcall AtlPixelToHiMetric(ptr ptr) atl100.AtlPixelToHiMetric 29 stub AtlDevModeW2A -30 stdcall AtlComPtrAssign(ptr ptr) atl.AtlComPtrAssign -31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl.AtlComQIPtrAssign -32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl.AtlInternalQueryInterface +30 stdcall AtlComPtrAssign(ptr ptr) atl100.AtlComPtrAssign +31 stdcall AtlComQIPtrAssign(ptr ptr ptr) atl100.AtlComQIPtrAssign +32 stdcall AtlInternalQueryInterface(ptr ptr ptr ptr) atl100.AtlInternalQueryInterface 34 stdcall AtlGetVersion(ptr) 35 stub AtlAxDialogBoxW 36 stub AtlAxDialogBoxA -37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl.AtlAxCreateDialogW -38 stdcall AtlAxCreateDialogA(long str long ptr long) atl.AtlAxCreateDialogA -39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl.AtlAxCreateControl -40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl.AtlAxCreateControlEx -41 stdcall AtlAxAttachControl(ptr ptr ptr) atl.AtlAxAttachControl -42 stdcall AtlAxWinInit() atl.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData -44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA -47 stdcall AtlAxGetControl(long ptr) atl.AtlAxGetControl -48 stdcall AtlAxGetHost(long ptr) atl.AtlAxGetHost +37 stdcall AtlAxCreateDialogW(long wstr long ptr long) atl100.AtlAxCreateDialogW +38 stdcall AtlAxCreateDialogA(long str long ptr long) atl100.AtlAxCreateDialogA +39 stdcall AtlAxCreateControl(ptr ptr ptr ptr) atl100.AtlAxCreateControl +40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx +41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl +42 stdcall AtlAxWinInit() atl100.AtlAxWinInit +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl.AtlModuleAddCreateWndData # don't forward to atl100.dll +44 stdcall AtlModuleExtractCreateWndData(ptr) atl.AtlModuleExtractCreateWndData # don't forward to atl100.dll +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoW # don't forward to atl100.dll +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl.AtlModuleRegisterWndClassInfoA # don't forward to atl100.dll +47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl +48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper -50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl.AtlIPersistStreamInit_Load -51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl.AtlIPersistStreamInit_Save +50 stdcall AtlIPersistStreamInit_Load(ptr ptr ptr ptr) atl100.AtlIPersistStreamInit_Load +51 stdcall AtlIPersistStreamInit_Save(ptr long ptr ptr ptr) atl100.AtlIPersistStreamInit_Save 52 stub AtlIPersistPropertyBag_Load 53 stub AtlIPersistPropertyBag_Save 54 stub AtlGetObjectSourceInterface 55 stub AtlModuleUnRegisterTypeLib 56 stdcall AtlModuleLoadTypeLib(ptr wstr ptr ptr) atl.AtlModuleLoadTypeLib 57 stdcall AtlModuleUnregisterServerEx(ptr long ptr) atl.AtlModuleUnregisterServerEx -58 stdcall AtlModuleAddTermFunc(ptr ptr long) atl.AtlModuleAddTermFunc +58 stdcall AtlModuleAddTermFunc(ptr) atl.AtlModuleAddTermFunc # don't forward to atl100.dll 59 stub AtlAxCreateControlLic 60 stub AtlAxCreateControlLicEx -61 stdcall AtlCreateRegistrar(ptr) +61 stdcall AtlCreateRegistrar(ptr) atl100.AtlCreateRegistrar 62 stub AltWinModuleRegisterClassExW 63 stub AltWinModuleRegisterClassExA 64 stub AltCallTermFunc diff --git a/tools/make_specfiles b/tools/make_specfiles index 301345c..fdba89d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -112,6 +112,7 @@ my @dll_groups = "vcomp90", ], [ + "atl100", "atl", "atl80", ],

1 0

Jacek Caban : mshtml: Fixed leak in fill_props.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: 720c0c810d9ef4e3fac3c0a235cdaf5cc7b9172e URL: http://source.winehq.org/git/wine.git/?a=commit;h=720c0c810d9ef4e3fac3c0a23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 21 12:00:48 2012 +0100 mshtml: Fixed leak in fill_props. --- dlls/mshtml/propbag.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/propbag.c b/dlls/mshtml/propbag.c index f7bcf28..716f383 100644 --- a/dlls/mshtml/propbag.c +++ b/dlls/mshtml/propbag.c @@ -288,7 +288,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) nsres = nsIDOMNodeList_GetLength(params, &length); if(NS_FAILED(nsres)) - return S_OK; + length = 0; for(i=0; i < length; i++) { nsres = nsIDOMNodeList_Item(params, i, &nsnode); @@ -330,6 +330,7 @@ static HRESULT fill_props(nsIDOMHTMLElement *nselem, PropertyBag *prop_bag) } } + nsIDOMNodeList_Release(params); return hres; }

1 0

Aric Stewart : imm32: Use SendMessage not PostMessage for the default IME winproc.
by Alexandre Julliard Nov. 21, 2012

Nov. 21, 2012

Module: wine Branch: master Commit: ad6272486ba56fd609af537213f30affb7c6463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad6272486ba56fd609af53721… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 20 14:07:01 2012 -0600 imm32: Use SendMessage not PostMessage for the default IME winproc. --- dlls/imm32/imm.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 6bca604..1ade13a 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2906,8 +2906,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } default: if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || @@ -2920,8 +2921,9 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) - PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); - return TRUE; + return SendMessageW(immHkl->UIWnd,uMsg,wParam,lParam); + else + return FALSE; } return DefWindowProcW(hwnd, uMsg, wParam, lParam); }

1 0