February 2010 - Wine-Commits

Henri Verbeet : wined3d: Explicitly load and modify the surface in color_fill_fbo().
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 84913109f6396c6aa6cd18e17cca089e04d90687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84913109f6396c6aa6cd18e17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:24 2010 +0100 wined3d: Explicitly load and modify the surface in color_fill_fbo(). --- dlls/wined3d/device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1b5db14..79be3a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5387,6 +5387,9 @@ static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; struct wined3d_context *context; + if (rect) IWineD3DSurface_LoadLocation(surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_ModifyLocation(surface, SFLAG_INDRAWABLE, TRUE); + if (!surface_is_offscreen(surface)) { TRACE("Surface %p is onscreen\n", surface);

1 0

Alexandre Julliard : user32: Add a safety check in release_user_handle_ptr.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 48c8c8d7bd399a62d7c8072da2f785de54b11556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c8c8d7bd399a62d7c8072da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 12:18:47 2010 +0100 user32: Add a safety check in release_user_handle_ptr. --- dlls/user32/win.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index acf70a3..3953f09 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -143,6 +143,7 @@ void *get_user_handle_ptr( HANDLE handle, enum user_obj_type type ) */ void release_user_handle_ptr( void *ptr ) { + assert( ptr && ptr != OBJ_OTHER_PROCESS ); USER_Unlock(); }

1 0

Huw Davies : msdaps: Add a stub marshaller object.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 39710f8806d90d7019dc0dc1052dce14e5fbeed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39710f8806d90d7019dc0dc10… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 11:52:51 2010 +0000 msdaps: Add a stub marshaller object. --- dlls/msdaps/row_server.c | 160 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 155 insertions(+), 5 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 982a631..14f11d2 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -53,16 +53,166 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) return E_NOTIMPL; } -HRESULT create_row_marshal(IUnknown *outer, void **obj) +/* Marshal impl */ + +typedef struct { - FIXME("(%p, %p): stub\n", outer, obj); - *obj = NULL; + const IMarshalVtbl *marshal_vtbl; + + LONG ref; + CLSID unmarshal_class; + IUnknown *outer; +} marshal; + +static inline marshal *impl_from_IMarshal(IMarshal *iface) +{ + return (marshal *)((char*)iface - FIELD_OFFSET(marshal, marshal_vtbl)); +} + +static HRESULT WINAPI marshal_QueryInterface(IMarshal *iface, REFIID iid, void **obj) +{ + marshal *This = impl_from_IMarshal(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), obj); + + if(IsEqualIID(iid, &IID_IUnknown) || + IsEqualIID(iid, &IID_IMarshal)) + { + *obj = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IMarshal_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI marshal_AddRef(IMarshal *iface) +{ + marshal *This = impl_from_IMarshal(iface); + TRACE("(%p)\n", This); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI marshal_Release(IMarshal *iface) +{ + marshal *This = impl_from_IMarshal(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, void *obj, + DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags, CLSID *clsid) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags, clsid); + return E_NOTIMPL; } -HRESULT create_rowset_marshal(IUnknown *outer, void **obj) +static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *obj, + DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags, DWORD *size) { - FIXME("(%p, %p): stub\n", outer, obj); + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags, size); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, + void *obj, DWORD dwDestContext, void *pvDestContext, + DWORD mshlflags) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p, %s, %p, %08x, %p, %08x): stub\n", This, stream, debugstr_guid(iid), obj, dwDestContext, + pvDestContext, mshlflags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, + REFIID iid, void **obj) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p, %s, %p): stub\n", This, stream, debugstr_guid(iid), obj); *obj = NULL; + return E_NOTIMPL; } + +static HRESULT WINAPI marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%p): stub\n", This, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved) +{ + marshal *This = impl_from_IMarshal(iface); + FIXME("(%p)->(%08x)\n", This, dwReserved); + + return E_NOTIMPL; +} + +static const IMarshalVtbl marshal_vtbl = +{ + marshal_QueryInterface, + marshal_AddRef, + marshal_Release, + marshal_GetUnmarshalClass, + marshal_GetMarshalSizeMax, + marshal_MarshalInterface, + marshal_UnmarshalInterface, + marshal_ReleaseMarshalData, + marshal_DisconnectObject +}; + +static HRESULT create_marshal(IUnknown *outer, const CLSID *class, void **obj) +{ + marshal *marshal; + + TRACE("(%p, %p)\n", outer, obj); + *obj = NULL; + + marshal = HeapAlloc(GetProcessHeap(), 0, sizeof(*marshal)); + if(!marshal) return E_OUTOFMEMORY; + + marshal->unmarshal_class = *class; + marshal->outer = outer; /* don't ref outer unk */ + marshal->marshal_vtbl = &marshal_vtbl; + marshal->ref = 1; + + *obj = &marshal->marshal_vtbl; + TRACE("returing %p\n", *obj); + return S_OK; +} + +HRESULT create_row_marshal(IUnknown *outer, void **obj) +{ + TRACE("(%p, %p)\n", outer, obj); + return create_marshal(outer, &CLSID_wine_row_proxy, obj); +} + +HRESULT create_rowset_marshal(IUnknown *outer, void **obj) +{ + TRACE("(%p, %p)\n", outer, obj); + return create_marshal(outer, &CLSID_wine_rowset_proxy, obj); +}

1 0

Huw Davies : msdaps: Add a stub server object.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: d1dfdd72cf4eb000f743f028d1f560641c0d7159 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1dfdd72cf4eb000f743f028d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 12:07:12 2010 +0000 msdaps: Add a stub server object. --- dlls/msdaps/row_server.c | 128 +++++++++++++++++++++++++++++++++++++++++-- dlls/msdaps/row_server.idl | 14 +++++ 2 files changed, 136 insertions(+), 6 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 14f11d2..11ace6c 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -39,18 +39,134 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); -HRESULT create_row_server(IUnknown *outer, void **obj) + +typedef struct +{ + const IWineRowServerVtbl *vtbl; + + LONG ref; + + CLSID class; + IMarshal *marshal; + IUnknown *inner_unk; +} server; + +static inline server *impl_from_IWineRowServer(IWineRowServer *iface) +{ + return (server *)((char*)iface - FIELD_OFFSET(server, vtbl)); +} + +static HRESULT WINAPI server_QueryInterface(IWineRowServer *iface, REFIID riid, void **obj) { - FIXME("(%p, %p): stub\n", outer, obj); + server *This = impl_from_IWineRowServer(iface); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), obj); + *obj = NULL; - return E_NOTIMPL; + + if(IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWineRowServer)) + { + *obj = iface; + } + else + { + if(!IsEqualIID(riid, &IID_IMarshal)) /* We use standard marshalling */ + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IWineRowServer_AddRef(iface); + return S_OK; } -HRESULT create_rowset_server(IUnknown *outer, void **obj) +static ULONG WINAPI server_AddRef(IWineRowServer *iface) +{ + server *This = impl_from_IWineRowServer(iface); + TRACE("(%p)\n", This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI server_Release(IWineRowServer *iface) +{ + server *This = impl_from_IWineRowServer(iface); + LONG ref; + + TRACE("(%p)\n", This); + + ref = InterlockedDecrement(&This->ref); + if(ref == 0) + { + IMarshal_Release(This->marshal); + if(This->inner_unk) IUnknown_Release(This->inner_unk); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI server_SetInnerUnk(IWineRowServer *iface, IUnknown *inner) +{ + server *This = impl_from_IWineRowServer(iface); + + if(This->inner_unk) IUnknown_Release(This->inner_unk); + + if(inner) IUnknown_AddRef(inner); + This->inner_unk = inner; + return S_OK; +} + +static HRESULT WINAPI server_GetMarshal(IWineRowServer *iface, IMarshal **marshal) +{ + server *This = impl_from_IWineRowServer(iface); + + IMarshal_AddRef(This->marshal); + *marshal = This->marshal; + return S_OK; +} + +static const IWineRowServerVtbl server_vtbl = { - FIXME("(%p, %p): stub\n", outer, obj); + server_QueryInterface, + server_AddRef, + server_Release, + server_SetInnerUnk, + server_GetMarshal +}; + +static HRESULT create_server(IUnknown *outer, const CLSID *class, void **obj) +{ + server *server; + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(class), obj); + *obj = NULL; - return E_NOTIMPL; + + server = HeapAlloc(GetProcessHeap(), 0, sizeof(*server)); + if(!server) return E_OUTOFMEMORY; + + server->vtbl = &server_vtbl; + server->ref = 1; + server->class = *class; + server->inner_unk = NULL; + if(IsEqualGUID(class, &CLSID_wine_row_server)) + create_row_marshal((IUnknown*)server, (void**)&server->marshal); + else if(IsEqualGUID(class, &CLSID_wine_rowset_server)) + create_rowset_marshal((IUnknown*)server, (void**)&server->marshal); + else + ERR("create_server called with class %s\n", debugstr_guid(class)); + + *obj = server; + return S_OK; +} + +HRESULT create_row_server(IUnknown *outer, void **obj) +{ + return create_server(outer, &CLSID_wine_row_server, obj); +} + +HRESULT create_rowset_server(IUnknown *outer, void **obj) +{ + return create_server(outer, &CLSID_wine_rowset_server, obj); } /* Marshal impl */ diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 4da585f..f6d6303 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -18,6 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "oledb.idl"; + +[ + object, + uuid(38248178-cf6d-11de-abe5-000c2916d865), + pointer_default(unique) +] +interface IWineRowServer : IUnknown +{ + [local] HRESULT SetInnerUnk([in] IUnknown *unknown); + + [local] HRESULT GetMarshal([out] IMarshal **marshal); +} + [ uuid(38248178-cf6d-11de-abe5-000c2916d865) ]

1 0

Huw Davies : msdaps: Implement the marshalling object.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 3cd0fde34a5c97bccd15edabde39009d43197913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cd0fde34a5c97bccd15edabd… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 2 13:36:25 2010 +0000 msdaps: Implement the marshalling object. --- dlls/msdaps/row_server.c | 47 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 11ace6c..017f8c4 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -169,6 +169,13 @@ HRESULT create_rowset_server(IUnknown *outer, void **obj) return create_server(outer, &CLSID_wine_rowset_server, obj); } +HRESULT create_proxy(IWineRowServer *server, const CLSID *class, IUnknown **obj) +{ + FIXME("stub\n"); + *obj = NULL; + return E_NOTIMPL; +} + /* Marshal impl */ typedef struct @@ -234,10 +241,11 @@ static HRESULT WINAPI marshal_GetUnmarshalClass(IMarshal *iface, REFIID iid, voi DWORD mshlflags, CLSID *clsid) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%s, %p, %08x, %p, %08x, %p)\n", This, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags, clsid); - return E_NOTIMPL; + *clsid = This->unmarshal_class; + return S_OK; } static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, void *obj, @@ -245,10 +253,11 @@ static HRESULT WINAPI marshal_GetMarshalSizeMax(IMarshal *iface, REFIID iid, voi DWORD mshlflags, DWORD *size) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%s, %p, %08x, %p, %08x, %p): stub\n", This, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%s, %p, %08x, %p, %08x, %p)\n", This, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags, size); - return E_NOTIMPL; + return CoGetMarshalSizeMax(size, &IID_IWineRowServer, This->outer, dwDestContext, pvDestContext, + mshlflags); } static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, @@ -256,28 +265,44 @@ static HRESULT WINAPI marshal_MarshalInterface(IMarshal *iface, IStream *stream, DWORD mshlflags) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p, %s, %p, %08x, %p, %08x): stub\n", This, stream, debugstr_guid(iid), obj, dwDestContext, + TRACE("(%p)->(%p, %s, %p, %08x, %p, %08x)\n", This, stream, debugstr_guid(iid), obj, dwDestContext, pvDestContext, mshlflags); - return E_NOTIMPL; + return CoMarshalInterface(stream, &IID_IWineRowServer, This->outer, dwDestContext, pvDestContext, mshlflags); } static HRESULT WINAPI marshal_UnmarshalInterface(IMarshal *iface, IStream *stream, REFIID iid, void **obj) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p, %s, %p): stub\n", This, stream, debugstr_guid(iid), obj); + HRESULT hr; + IWineRowServer *server; + IUnknown *proxy; + + TRACE("(%p)->(%p, %s, %p)\n", This, stream, debugstr_guid(iid), obj); *obj = NULL; - return E_NOTIMPL; + hr = CoUnmarshalInterface(stream, &IID_IWineRowServer, (void**)&server); + if(SUCCEEDED(hr)) + { + hr = create_proxy(server, &This->unmarshal_class, &proxy); + if(SUCCEEDED(hr)) + { + hr = IUnknown_QueryInterface(proxy, iid, obj); + IUnknown_Release(proxy); + } + IWineRowServer_Release(server); + } + + TRACE("returing %p\n", *obj); + return hr; } static HRESULT WINAPI marshal_ReleaseMarshalData(IMarshal *iface, IStream *stream) { marshal *This = impl_from_IMarshal(iface); - FIXME("(%p)->(%p): stub\n", This, stream); - - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, stream); + return CoReleaseMarshalData(stream); } static HRESULT WINAPI marshal_DisconnectObject(IMarshal *iface, DWORD dwReserved)

1 0

Henri Verbeet : wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo().
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 5f3dccddb46c3521572d0dfc3a54e9dbbdf8bf86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3dccddb46c3521572d0dfc3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 3 11:02:23 2010 +0100 wined3d: Do not depend on context_attach_surface_fbo() to load the surface in stretch_rect_fbo(). --- dlls/wined3d/device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f915d1b..1b5db14 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5791,6 +5791,12 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED break; } + /* Make sure the drawables are up-to-date. Note that loading the + * destination surface isn't strictly required if we overwrite the + * entire surface. */ + IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); + IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); + /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); dst_swapchain = get_swapchain(dst_surface); @@ -5806,9 +5812,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(src_surface); TRACE("Source surface %p is onscreen\n", src_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize; @@ -5845,9 +5848,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED GLenum buffer = surface_get_gl_buffer(dst_surface); TRACE("Destination surface %p is onscreen\n", dst_surface); - /* Make sure the drawable is up to date. In the offscreen case - * attach_surface_fbo() implicitly takes care of this. */ - IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); if(buffer == GL_FRONT) { RECT windowsize;

1 0

Alexandre Julliard : user: Add icon handle mapping in the Get/SetClassWord/ Long functions.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 6806451db38e2b656e4dc959900070a409f8ca7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6806451db38e2b656e4dc9599… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 12:18:30 2010 +0100 user: Add icon handle mapping in the Get/SetClassWord/Long functions. --- dlls/user.exe16/window.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index b617c4d..e81d9ac 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -747,6 +747,16 @@ void WINAPI ValidateRgn16( HWND16 hwnd, HRGN16 hrgn ) */ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset ) { + HICON icon; + + switch (offset) + { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)GetClassLongPtrW( WIN_Handle32(hwnd), offset ); + return get_icon_16( icon ); + } return GetClassWord( WIN_Handle32(hwnd), offset ); } @@ -756,6 +766,16 @@ WORD WINAPI GetClassWord16( HWND16 hwnd, INT16 offset ) */ WORD WINAPI SetClassWord16( HWND16 hwnd, INT16 offset, WORD newval ) { + HICON icon; + + switch (offset) + { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)SetClassLongPtrW( WIN_Handle32(hwnd), offset, (ULONG_PTR)get_icon_32(newval) ); + return get_icon_16( icon ); + } return SetClassWord( WIN_Handle32(hwnd), offset, newval ); } @@ -773,6 +793,10 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset ) return (LONG_PTR)WINPROC_GetProc16( (WNDPROC)ret, FALSE ); case GCLP_MENUNAME: return MapLS( (void *)ret ); /* leak */ + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + return get_icon_16( (HICON)ret ); default: return ret; } @@ -784,8 +808,15 @@ LONG WINAPI GetClassLong16( HWND16 hwnd16, INT16 offset ) */ LONG WINAPI SetClassLong16( HWND16 hwnd16, INT16 offset, LONG newval ) { + HICON icon; + switch( offset ) { + case GCLP_HCURSOR: + case GCLP_HICON: + case GCLP_HICONSM: + icon = (HICON)SetClassLongPtrW( WIN_Handle32(hwnd16), offset, (ULONG_PTR)get_icon_32(newval) ); + return get_icon_16( icon ); case GCLP_WNDPROC: { WNDPROC new_proc = WINPROC_AllocProc16( (WNDPROC16)newval );

1 0

Alexandre Julliard : makefiles: Create the wine symlink from configure.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 7d020c9f088af3e2d8d6e75c2d088f430fcf4af0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d020c9f088af3e2d8d6e75c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:12:12 2010 +0100 makefiles: Create the wine symlink from configure. --- Make.rules.in | 1 - Makefile.in | 12 ++++-------- aclocal.m4 | 8 ++++++++ configure | 46 +++++++++++++++++++++++++++++++++++++++++++++- configure.ac | 3 +++ tools/make_makefiles | 1 + 6 files changed, 61 insertions(+), 10 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index e155d88..6a52a01 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -65,7 +65,6 @@ TARGETFLAGS = @TARGETFLAGS@ WINEBUILDFLAGS = $(TARGETFLAGS) $(DLLFLAGS) MKINSTALLDIRS= $(TOPSRCDIR)/tools/mkinstalldirs -m 755 WINAPI_CHECK = $(TOPSRCDIR)/tools/winapi/winapi_check -WINEWRAPPER = $(TOPSRCDIR)/tools/winewrapper C2MAN = $(TOPSRCDIR)/tools/c2man.pl RUNTEST = $(TOPSRCDIR)/tools/runtest WINEBUILD = $(TOOLSDIR)/tools/winebuild/winebuild$(TOOLSEXT) diff --git a/Makefile.in b/Makefile.in index 9dd1bd9..08349b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -26,7 +26,6 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ LIBEXT = @LIBEXT@ MODULE = none -PROGRAMS = wine # Sub-directories to run make depend/clean into SUBDIRS = \ @@ -46,7 +45,7 @@ INSTALLSUBDIRS = @ALL_TOP_DIRS@ # Sub-directories to run make test into TESTSUBDIRS = dlls -all: Make.rules $(PROGRAMS) +all: wine @echo "Wine build complete." WINAPI_CHECK_EXTRA_FLAGS = --global @@ -68,9 +67,6 @@ include/config.h: include/stamp-h include/stamp-h: include/config.h.in config.status @./config.status include/config.h include/stamp-h -wine: $(WINEWRAPPER) - $(RM) $@ && $(LN_S) $(WINEWRAPPER) $@ - # Installation rules uninstall:: @@ -138,10 +134,10 @@ distclean:: clean # Makefile rules -ALL_MAKERULES = @ALL_MAKERULES@ ALL_MAKEFILES = @ALL_MAKEFILES@ +ALL_CONFIGS = Makefile $(ALL_MAKEFILES) @ALL_MAKERULES@ @ALL_SYMLINKS@ -Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): +$(ALL_CONFIGS): @./config.status $@ .INIT: Makefile .BEGIN: Makefile @@ -150,6 +146,6 @@ Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES): $(RECURSE_TARGETS) $(MAKEDEP): $(ALL_MAKEFILES) distclean:: - $(RM) Makefile $(ALL_MAKERULES) $(ALL_MAKEFILES) + $(RM) $(ALL_CONFIGS) @ALL_MAKEFILE_DEPENDS@ diff --git a/aclocal.m4 b/aclocal.m4 index 76af863..3240435 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -142,6 +142,14 @@ dnl AC_DEFUN([WINE_CONFIG_EXTRA_DIR], [AC_CONFIG_COMMANDS([$1],[test -d "$1" || (AC_MSG_NOTICE([creating $1]) && mkdir "$1")])]) +dnl **** Create symlinks from config.status **** +dnl +dnl Usage: WINE_CONFIG_SYMLINK(name,target) +dnl +AC_DEFUN([WINE_CONFIG_SYMLINK],[AC_CONFIG_LINKS([$1:]m4_default([$2],[$1]))dnl +ALL_SYMLINKS="$ALL_SYMLINKS \\ + $1"]) + dnl **** Create a make rules file from config.status **** dnl dnl Usage: WINE_CONFIG_MAKERULES(file,var,deps) diff --git a/configure b/configure index 0e68b55..5aac1cf 100755 --- a/configure +++ b/configure @@ -608,6 +608,7 @@ ALL_IMPLIB_DIRS ALL_DLL_DIRS ALL_TOP_DIRS ALL_MAKEFILE_DEPENDS +ALL_SYMLINKS ALL_MAKEFILES ALL_MAKERULES DEPENDENCIES @@ -13653,6 +13654,8 @@ ALL_MAKERULES="" ALL_MAKEFILES="" +ALL_SYMLINKS="" + ALL_MAKEFILE_DEPENDS="# Makefile dependencies" @@ -13682,6 +13685,10 @@ ALL_PROGRAM_BIN_INSTALL_DIRS="" ac_config_commands="$ac_config_commands include/stamp-h" +ac_config_links="$ac_config_links wine:tools/winewrapper" +ALL_SYMLINKS="$ALL_SYMLINKS \\ + wine" + ac_config_commands="$ac_config_commands dlls/gdi32/enhmfdrv" ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv" @@ -19438,6 +19445,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" +config_links="$ac_config_links" config_commands="$ac_config_commands" _ACEOF @@ -19468,6 +19476,9 @@ $config_files Configuration headers: $config_headers +Configuration links: +$config_links + Configuration commands: $config_commands @@ -19596,6 +19607,7 @@ do case $ac_config_target in "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS include/stamp-h" ;; + "wine") CONFIG_LINKS="$CONFIG_LINKS wine:tools/winewrapper" ;; "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;; "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;; "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;; @@ -20159,6 +20171,7 @@ done if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands fi @@ -20480,7 +20493,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_HEADERS" -eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" shift for ac_tag do @@ -20721,7 +20734,38 @@ $as_echo "$as_me: $ac_file is unchanged" >&6;} || as_fn_error "could not create -" "$LINENO" 5 fi ;; + :L) + # + # CONFIG_LINK + # + + if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then + : + else + # Prefer the file from the source tree if names are identical. + if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then + ac_source=$srcdir/$ac_source + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + + if test ! -r "$ac_source"; then + as_fn_error "$ac_source: file not found" "$LINENO" 5 + fi + rm -f "$ac_file" + # Try a relative symlink, then a hard link, then a copy. + case $srcdir in + [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; + *) ac_rel_source=$ac_top_build_prefix$ac_source ;; + esac + ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || + ln "$ac_source" "$ac_file" 2>/dev/null || + cp -p "$ac_source" "$ac_file" || + as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 + fi + ;; :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; diff --git a/configure.ac b/configure.ac index b8b04c2..733c028 100644 --- a/configure.ac +++ b/configure.ac @@ -2096,6 +2096,7 @@ Makefile: dummy AC_SUBST(ALL_MAKERULES,"") AC_SUBST(ALL_MAKEFILES,"") +AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_MAKEFILE_DEPENDS,["# Makefile dependencies"]) AC_SUBST(ALL_TOP_DIRS,"") @@ -2113,6 +2114,8 @@ AH_TOP([#define __WINE_CONFIG_H]) AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h]) +WINE_CONFIG_SYMLINK(wine,tools/winewrapper) + WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv) WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv) WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls) diff --git a/tools/make_makefiles b/tools/make_makefiles index fec44f6..2a05442 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -86,6 +86,7 @@ my @ignores = ( "/configure.lineno", "/TAGS", "/tags", + "/wine", "Makefile", "dlldata.c", "dlls/*/*.def",

1 0

Alexandre Julliard : makefiles: Generate the config. status dependency as part of the makefile dependencies.
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 03e01a2987738ff98ead1c51e1237723d946e020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03e01a2987738ff98ead1c51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 13:40:57 2010 +0100 makefiles: Generate the config.status dependency as part of the makefile dependencies. --- Makefile.in | 2 +- aclocal.m4 | 4 +- configure | 1088 +++++++++++++++++++++++++++++----------------------------- 3 files changed, 547 insertions(+), 547 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03e01a2987738ff98ead1…

1 0

Alexandre Julliard : makefiles: Simplify the installation of program binaries by not attempting to hardlink them .
by Alexandre Julliard Feb. 3, 2010

Feb. 3, 2010

Module: wine Branch: master Commit: 7b7444fbcad4a0a56e842f645e42a28fa18be1bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b7444fbcad4a0a56e842f645… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 11:50:24 2010 +0100 makefiles: Simplify the installation of program binaries by not attempting to hardlink them. --- Make.rules.in | 1 - aclocal.m4 | 17 ----------------- configure | 17 ----------------- configure.ac | 1 - programs/Makefile.in | 17 ++++------------- 5 files changed, 4 insertions(+), 49 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index c7813b0..e155d88 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -40,7 +40,6 @@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ STRIP = @STRIP@ -LN = @LN@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/aclocal.m4 b/aclocal.m4 index aedffae..a88883a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -118,23 +118,6 @@ LIBS="$LIBS $2" AC_CHECK_FUNCS([$1],[$3],[$4]) LIBS="$ac_wine_check_funcs_save_LIBS"]) -dnl **** Check for ln **** -dnl -dnl Usage: WINE_PROG_LN -dnl -AC_DEFUN([WINE_PROG_LN], -[AC_MSG_CHECKING([whether ln works]) -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - AC_SUBST(LN,ln) - AC_MSG_RESULT([yes]) -else - AC_SUBST(LN,["cp -p"]) - AC_MSG_RESULT([no, using $LN]) -fi -rm -f conf$$ conf$$.file]) - dnl **** Check for a mingw program, trying the various mingw prefixes **** dnl dnl Usage: WINE_CHECK_MINGW_PROG(variable,prog,[value-if-not-found],[path]) diff --git a/configure b/configure index 2ae042f..537eb04 100755 --- a/configure +++ b/configure @@ -694,7 +694,6 @@ INSTALL_PROGRAM LDCONFIG EGREP GREP -LN LN_S STRIP RANLIB @@ -4572,22 +4571,6 @@ else $as_echo "no, using $LN_S" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 -$as_echo_n "checking whether ln works... " >&6; } -rm -f conf$$ conf$$.file -echo >conf$$.file -if ln conf$$.file conf$$ 2>/dev/null; then - LN=ln - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - LN="cp -p" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN" >&5 -$as_echo "no, using $LN" >&6; } -fi -rm -f conf$$ conf$$.file { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then : diff --git a/configure.ac b/configure.ac index f823045..b8b04c2 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,6 @@ AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_CHECK_TOOL(STRIP,strip,strip) AC_PROG_LN_S -WINE_PROG_LN AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) AC_PROG_INSTALL diff --git a/programs/Makefile.in b/programs/Makefile.in index b339aa3..eff82f9 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -20,25 +20,16 @@ wineapploader: wineapploader.in # Rules for installation -.PHONY: install-apploader install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) +.PHONY: install-progs install-progs.so $(INSTALLPROGS:%=%/__installprog__) -install-apploader: wineapploader $(INSTALLDIRS) dummy - $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/wineapploader - -$(INSTALLPROGS:%=%/__installprog__): install-apploader - $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(LN) $(DESTDIR)$(bindir)/wineapploader $(DESTDIR)$(bindir)/`dirname $@` +$(INSTALLPROGS:%=%/__installprog__): wineapploader $(INSTALLDIRS) dummy + $(RM) $(DESTDIR)$(bindir)/`dirname $@` && $(INSTALL_SCRIPT) wineapploader $(DESTDIR)$(bindir)/`dirname $@` install-progs.so: $(INSTALLPROGS:%=%/__installprog__) - $(RM) $(DESTDIR)$(bindir)/wineapploader - install-progs: # nothing to do here @WOW64_DISABLE@ install install-lib:: install-progs$(DLLEXT) $(INSTALLDIRS) uninstall:: - -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) + -cd $(DESTDIR)$(bindir) && $(RM) $(INSTALLPROGS) -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) - -# Rules for testing - -check test:: $(SUBDIRS:%=%/__test__)

1 0