June 2014 - Wine-commits - list.winehq.org

Tag wine-1.7.20 : Alexandre Julliard : Release 1.7.20
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: refs/tags/wine-1.7.20 Tag: 144e733c73abef6fe05846d57efaf440613a498f URL: http://source.winehq.org/git/wine.git/?a=tag;h=144e733c73abef6fe05846d57efa… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 13 19:45:11 2014 +0200 Release 1.7.20

1 0

Michael Stefaniuc : dmusic: Use generic "unimplemented" methods for IPersistStream.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 4e81a977c7601ae5542bb0084a72b44a891bff57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e81a977c7601ae5542bb0084… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:12:28 2014 +0200 dmusic: Use generic "unimplemented" methods for IPersistStream. --- dlls/dmusic/collection.c | 28 ++++------------------------ dlls/dmusic/dmobject.c | 26 ++++++++++++++++++++++++++ dlls/dmusic/dmobject.h | 9 +++++++++ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 9c6f357..c7084db 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -390,16 +390,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPERSISTSTREAM iface, CLSID* pClassID) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface) -{ - return S_FALSE; -} - static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); @@ -703,25 +693,15 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Save(LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax(LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) -{ - return E_NOTIMPL; -} - static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_QueryInterface, dmobj_IPersistStream_AddRef, dmobj_IPersistStream_Release, - IDirectMusicCollectionImpl_IPersistStream_GetClassID, - IDirectMusicCollectionImpl_IPersistStream_IsDirty, + unimpl_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, IDirectMusicCollectionImpl_IPersistStream_Load, - IDirectMusicCollectionImpl_IPersistStream_Save, - IDirectMusicCollectionImpl_IPersistStream_GetSizeMax + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index f6c83a0..4afd5b9 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -134,6 +134,32 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) return IUnknown_Release(This->outer_unk); } +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) +{ + TRACE("(%p, %p): method not implemented\n", iface, class); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) +{ + TRACE("(%p): method not implemented, always returning S_FALSE\n", iface); + return S_FALSE; +} + +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) +{ + TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty); + return E_NOTIMPL; +} + +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size) +{ + TRACE("(%p, %p): method not implemented\n", iface, size); + return E_NOTIMPL; +} + void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) { diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h index 1a09a0b..3574939 100644 --- a/dlls/dmusic/dmobject.h +++ b/dlls/dmusic/dmobject.h @@ -42,3 +42,12 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID void **ret_iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN; ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN; + +/* IPersistStream methods not implemented in native */ +HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, + CLSID *class) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream, + BOOL clear_dirty) DECLSPEC_HIDDEN; +HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, + ULARGE_INTEGER *size) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 147f100f3ea88851777ac78ef74b397490fceb4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=147f100f3ea88851777ac78ef… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:14:58 2014 +0200 dmusic: Get rid of the extra pointer to a DMUS_OBJECTDESC. --- dlls/dmusic/collection.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index c7084db..f3bb510 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -35,7 +35,6 @@ typedef struct IDirectMusicCollectionImpl { IStream *pStm; /* stream from which we load collection and later instruments */ LARGE_INTEGER liCollectionPosition; /* offset in a stream where collection was loaded from */ LARGE_INTEGER liWavePoolTablePosition; /* offset in a stream where wave pool table can be found */ - DMUS_OBJECTDESC *pDesc; CHAR *szCopyright; /* FIXME: should probably placed somewhere else */ DLSHEADER *pHeader; /* pool table */ @@ -440,14 +439,14 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST } case FOURCC_DLID: { TRACE_(dmfile)(": DLID (GUID) chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read(stream, &This->pDesc->guidObject, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_OBJECT; + IStream_Read(stream, &This->dmobj.desc.guidObject, chunk.dwSize, NULL); break; } case FOURCC_VERS: { TRACE_(dmfile)(": version chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read(stream, &This->pDesc->vVersion, chunk.dwSize, NULL); + This->dmobj.desc.dwValidData |= DMUS_OBJ_VERSION; + IStream_Read(stream, &This->dmobj.desc.vVersion, chunk.dwSize, NULL); break; } case FOURCC_PTBL: { @@ -475,9 +474,9 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST case mmioFOURCC('I','N','A','M'): { CHAR szName[DMUS_MAX_NAME]; TRACE_(dmfile)(": name chunk\n"); - This->pDesc->dwValidData |= DMUS_OBJ_NAME; + This->dmobj.desc.dwValidData |= DMUS_OBJ_NAME; IStream_Read(stream, szName, chunk.dwSize, NULL); - MultiByteToWideChar(CP_ACP, 0, szName, -1, This->pDesc->wszName, DMUS_MAX_NAME); + MultiByteToWideChar(CP_ACP, 0, szName, -1, This->dmobj.desc.wszName, DMUS_MAX_NAME); if (even_or_odd(chunk.dwSize)) { ListCount[0]++; liMove.QuadPart = 1; @@ -671,13 +670,13 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST struct list *listEntry; TRACE("*** IDirectMusicCollection (%p) ***\n", &This->IDirectMusicCollection_iface); - if (This->pDesc->dwValidData & DMUS_OBJ_OBJECT) - TRACE(" - GUID = %s\n", debugstr_dmguid(&This->pDesc->guidObject)); - if (This->pDesc->dwValidData & DMUS_OBJ_VERSION) - TRACE(" - Version = %i,%i,%i,%i\n", (This->pDesc->vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionMS & 0x0000FFFF, - (This->pDesc->vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->pDesc->vVersion.dwVersionLS & 0x0000FFFF); - if (This->pDesc->dwValidData & DMUS_OBJ_NAME) - TRACE(" - Name = %s\n", debugstr_w(This->pDesc->wszName)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_OBJECT) + TRACE(" - GUID = %s\n", debugstr_dmguid(&This->dmobj.desc.guidObject)); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_VERSION) + TRACE(" - Version = %i,%i,%i,%i\n", (This->dmobj.desc.vVersion.dwVersionMS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionMS & 0x0000FFFF, + (This->dmobj.desc.vVersion.dwVersionLS >> 8) & 0x0000FFFF, This->dmobj.desc.vVersion.dwVersionLS & 0x0000FFFF); + if (This->dmobj.desc.dwValidData & DMUS_OBJ_NAME) + TRACE(" - Name = %s\n", debugstr_w(This->dmobj.desc.wszName)); TRACE(" - Collection header:\n"); TRACE(" - cInstruments: %d\n", This->pHeader->cInstruments); @@ -724,7 +723,6 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicCollectionImpl(LPCGUID lpcGUID, LPVOID* p (IUnknown*)&obj->IDirectMusicCollection_iface); obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - obj->pDesc = &obj->dmobj.desc; list_init (&obj->Instruments);

1 0

Michael Stefaniuc : dmusic: Remove the redundant "IDirectMusicCollection" from method names.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: d33989f675d3a98c98268ab92a39c69650a1ebe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33989f675d3a98c98268ab92… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 12 11:22:45 2014 +0200 dmusic: Remove the redundant "IDirectMusicCollection" from method names. --- dlls/dmusic/collection.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index f3bb510..5754884 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -60,7 +60,8 @@ static inline IDirectMusicCollectionImpl *impl_from_IPersistStream(IPersistStrea } /* IDirectMusicCollectionImpl IUnknown part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface(LPDIRECTMUSICCOLLECTION iface, REFIID riid, LPVOID *ret_iface) +static HRESULT WINAPI IDirectMusicCollectionImpl_QueryInterface(IDirectMusicCollection *iface, + REFIID riid, void **ret_iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); @@ -84,7 +85,7 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInt return S_OK; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_AddRef(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedIncrement(&This->ref); @@ -94,7 +95,7 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef(LPD return ref; } -static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LPDIRECTMUSICCOLLECTION iface) +static ULONG WINAPI IDirectMusicCollectionImpl_Release(IDirectMusicCollection *iface) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); ULONG ref = InterlockedDecrement(&This->ref); @@ -110,7 +111,8 @@ static ULONG WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_Release(LP } /* IDirectMusicCollection Interface follows: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD patch, IDirectMusicInstrument** instrument) +static HRESULT WINAPI IDirectMusicCollectionImpl_GetInstrument(IDirectMusicCollection *iface, + DWORD patch, IDirectMusicInstrument **instrument) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DMUS_PRIVATE_INSTRUMENTENTRY *inst_entry; @@ -136,7 +138,8 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstr return DMUS_E_INVALIDPATCH; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument(LPDIRECTMUSICCOLLECTION iface, DWORD index, DWORD* patch, LPWSTR name, DWORD name_length) +static HRESULT WINAPI IDirectMusicCollectionImpl_EnumInstrument(IDirectMusicCollection *iface, + DWORD index, DWORD *patch, LPWSTR name, DWORD name_length) { IDirectMusicCollectionImpl *This = impl_from_IDirectMusicCollection(iface); DWORD i = 0; @@ -165,11 +168,11 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInst } static const IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = { - IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface, - IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef, - IDirectMusicCollectionImpl_IDirectMusicCollection_Release, - IDirectMusicCollectionImpl_IDirectMusicCollection_GetInstrument, - IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument + IDirectMusicCollectionImpl_QueryInterface, + IDirectMusicCollectionImpl_AddRef, + IDirectMusicCollectionImpl_Release, + IDirectMusicCollectionImpl_GetInstrument, + IDirectMusicCollectionImpl_EnumInstrument }; /* IDirectMusicCollectionImpl IDirectMusicObject part: */ @@ -191,7 +194,8 @@ static HRESULT read_from_stream(IStream *stream, void *data, ULONG size) return S_OK; } -static HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor(LPDIRECTMUSICOBJECT iface, LPSTREAM stream, LPDMUS_OBJECTDESC desc) +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { struct dmobject *This = impl_from_IDirectMusicObject(iface); DMUS_PRIVATE_CHUNK chunk; @@ -385,11 +389,12 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; /* IDirectMusicCollectionImpl IPersistStream part: */ -static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream) +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, + IStream *stream) { IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK chunk; @@ -698,7 +703,7 @@ static const IPersistStreamVtbl persiststream_vtbl = { dmobj_IPersistStream_Release, unimpl_IPersistStream_GetClassID, unimpl_IPersistStream_IsDirty, - IDirectMusicCollectionImpl_IPersistStream_Load, + IPersistStreamImpl_Load, unimpl_IPersistStream_Save, unimpl_IPersistStream_GetSizeMax };

1 0

Damjan Jovanovic : winex11.drv: Import text/ plain XDND selections through the clipboard.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: c2f73b97802dc9e1f84220c271038b97415bad5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2f73b97802dc9e1f84220c27… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:27 2014 +0200 winex11.drv: Import text/plain XDND selections through the clipboard. --- dlls/winex11.drv/clipboard.c | 1 + dlls/winex11.drv/xdnd.c | 57 ------------------------------------------ 2 files changed, 1 insertion(+), 57 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 350eeab..dfd09e9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -186,6 +186,7 @@ static const struct } builtin_formats[] = { { CF_TEXT, XA_STRING, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, + { CF_TEXT, XATOM_text_plain, X11DRV_CLIPBOARD_ImportXAString, X11DRV_CLIPBOARD_ExportString}, { CF_BITMAP, XATOM_WCF_BITMAP, X11DRV_CLIPBOARD_ImportClipboardData, NULL}, { CF_METAFILEPICT, XATOM_WCF_METAFILEPICT, X11DRV_CLIPBOARD_ImportMetaFilePict, X11DRV_CLIPBOARD_ExportMetaFilePict }, { CF_SYLK, XATOM_WCF_SYLK, X11DRV_CLIPBOARD_ImportClipboardData, X11DRV_CLIPBOARD_ExportClipboardData }, diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2184a42..db88fc2 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -73,13 +73,11 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); static void X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len); static WCHAR* X11DRV_XDND_URIToDOS(char *encodedURI); static CRITICAL_SECTION xdnd_cs; @@ -566,8 +564,6 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); - else if (property == x11drv_atom(text_plain)) - X11DRV_XDND_DeconstructTextPlain(property, data, len); else { /* use the clipboard import functions for other types */ @@ -676,25 +672,6 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) /************************************************************************** - * X11DRV_XDND_DeconstructTextPlain - * - * Interpret text/plain Data and add records to <dndfmt> linked list - */ -static int X11DRV_XDND_DeconstructTextPlain(int property, void* data, int len) -{ - char* dostext; - - /* Always supply plain text */ - X11DRV_XDND_UnixToDos(&dostext, data, len); - X11DRV_XDND_InsertXDNDData(property, CF_TEXT, dostext, strlen(dostext)); - - TRACE("CF_TEXT (%d): %s\n", CF_TEXT, dostext); - - return 1; -} - - -/************************************************************************** * X11DRV_XDND_SendDropFiles */ static void X11DRV_XDND_SendDropFiles(HWND hwnd) @@ -766,40 +743,6 @@ static void X11DRV_XDND_FreeDragDropOp(void) } - -/************************************************************************** - * X11DRV_XDND_UnixToDos - */ -static unsigned int X11DRV_XDND_UnixToDos(char** lpdest, char* lpsrc, int len) -{ - int i; - unsigned int destlen, lines; - - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lines++; - } - - destlen = len + lines + 1; - - if (lpdest) - { - char* lpstr = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, destlen); - for (i = 0, lines = 0; i <= len; i++) - { - if (lpsrc[i] == '\n') - lpstr[++lines + i] = '\r'; - lpstr[lines + i] = lpsrc[i]; - } - - *lpdest = lpstr; - } - - return lines; -} - - /************************************************************************** * X11DRV_XDND_URIToDOS */

1 0

Damjan Jovanovic : winex11.drv: Store XDND cached data in global memory objects.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: a58c220d9ba4ab496e4c33f5551c480caf172846 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a58c220d9ba4ab496e4c33f55… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:32 2014 +0200 winex11.drv: Store XDND cached data in global memory objects. --- dlls/winex11.drv/xdnd.c | 60 +++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index db88fc2..4cd67de 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -38,6 +38,7 @@ #define COBJMACROS #include "x11drv.h" +#include "shellapi.h" #include "shlobj.h" /* DROPFILES */ #include "oleidl.h" #include "objidl.h" @@ -56,8 +57,7 @@ typedef struct tagXDNDDATA { int cf_win; Atom cf_xdnd; - void *data; - unsigned int size; + HANDLE contents; struct list entry; } XDNDDATA, *LPXDNDDATA; @@ -71,7 +71,7 @@ static HWND XDNDLastTargetWnd; /* might be an ancestor of XDNDLastTargetWnd */ static HWND XDNDLastDropTargetWnd; -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len); +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len); static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, @@ -516,7 +516,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, if (current->cf_win != CF_HDROP && current->cf_win < CF_MAX) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } } @@ -529,7 +529,7 @@ static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, * * Cache available XDND property */ -static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, unsigned int len) +static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents) { LPXDNDDATA current = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(XDNDDATA)); @@ -538,8 +538,7 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns EnterCriticalSection(&xdnd_cs); current->cf_xdnd = property; current->cf_win = format; - current->data = data; - current->size = len; + current->contents = contents; list_add_tail(&xdndData, &current->entry); LeaveCriticalSection(&xdnd_cs); } @@ -553,14 +552,20 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, void* data, uns */ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int property, unsigned char *data, int len) { - void* xdata; + HANDLE xdata; TRACE("%d: %s\n", property, data); /* Always include the raw type */ - xdata = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); - memcpy(xdata, data, len); - X11DRV_XDND_InsertXDNDData(property, property, xdata, len); + xdata = GlobalAlloc(GMEM_FIXED, len); + if (xdata) + { + memcpy(GlobalLock(xdata), data, len); + GlobalUnlock(xdata); + X11DRV_XDND_InsertXDNDData(property, property, xdata); + } + else + ERR("out of memory\n"); if (property == x11drv_atom(text_uri_list)) X11DRV_XDND_DeconstructTextURIList(property, data, len); @@ -571,18 +576,7 @@ static void X11DRV_XDND_MapFormat(Display *display, Window xwin, unsigned int pr UINT windowsFormat; contents = X11DRV_CLIPBOARD_ImportSelection(display, property, xwin, x11drv_atom(XdndTarget), &windowsFormat); if (contents) - { - void *data = HeapAlloc(GetProcessHeap(), 0, GlobalSize(contents)); - if (data) - { - memcpy(data, GlobalLock(contents), GlobalSize(contents)); - GlobalUnlock(contents); - X11DRV_XDND_InsertXDNDData(property, windowsFormat, data, GlobalSize(contents)); - } - else - ERR("out of memory\n"); - GlobalFree(contents); - } + X11DRV_XDND_InsertXDNDData(property, windowsFormat, contents); } } @@ -651,10 +645,12 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) } if (out && end >= len) { + HDROP hDrop; DROPFILES *dropFiles; - dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); - if (dropFiles) + hDrop = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + if (hDrop) { + dropFiles = GlobalLock(hDrop); dropFiles->pFiles = sizeof(DROPFILES); dropFiles->pt.x = XDNDxy.x; dropFiles->pt.y = XDNDxy.y; @@ -662,7 +658,8 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) dropFiles->fWide = TRUE; out[size] = '\0'; memcpy(((char*)dropFiles) + dropFiles->pFiles, out, (size + 1)*sizeof(WCHAR)); - X11DRV_XDND_InsertXDNDData(property, CF_HDROP, dropFiles, sizeof(DROPFILES) + (size + 1)*sizeof(WCHAR)); + GlobalUnlock(hDrop); + X11DRV_XDND_InsertXDNDData(property, CF_HDROP, hDrop); count = 1; } } @@ -693,14 +690,14 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) if (found) { - HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, current->size); + HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); lpDrop->pt.x = XDNDxy.x; lpDrop->pt.y = XDNDxy.y; - memcpy(lpDrop, current->data, current->size); + memcpy(lpDrop, GlobalLock(current->contents), GlobalSize(current->contents)); TRACE("Sending WM_DROPFILES: hWnd(0x%p) %p(%s)\n", hwnd, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); @@ -730,7 +727,7 @@ static void X11DRV_XDND_FreeDragDropOp(void) LIST_FOR_EACH_ENTRY_SAFE(current, next, &xdndData, XDNDDATA, entry) { list_remove(&current->entry); - HeapFree(GetProcessHeap(), 0, current->data); + GlobalFree(current->contents); HeapFree(GetProcessHeap(), 0, current); } @@ -917,11 +914,12 @@ static HRESULT WINAPI XDNDDATAOBJECT_GetData(IDataObject *dataObject, if (current->cf_win == formatEtc->cfFormat) { pMedium->tymed = TYMED_HGLOBAL; - pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, current->size); + pMedium->u.hGlobal = GlobalAlloc(GMEM_FIXED | GMEM_ZEROINIT, GlobalSize(current->contents)); if (pMedium->u.hGlobal == NULL) return E_OUTOFMEMORY; - memcpy(GlobalLock(pMedium->u.hGlobal), current->data, current->size); + memcpy(GlobalLock(pMedium->u.hGlobal), GlobalLock(current->contents), GlobalSize(current->contents)); GlobalUnlock(pMedium->u.hGlobal); + GlobalUnlock(current->contents); pMedium->pUnkForRelease = 0; return S_OK; }

1 0

Damjan Jovanovic : winex11.drv: Migrate importing text/ uri-list XDND selections to the clipboard.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 026fe4d08e14c7a706985f8b367bb28895335bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026fe4d08e14c7a706985f8b3… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 27 02:23:55 2014 +0200 winex11.drv: Migrate importing text/uri-list XDND selections to the clipboard. --- dlls/winex11.drv/clipboard.c | 176 +++++++++++++++++++++++++++++++++ dlls/winex11.drv/xdnd.c | 223 ++---------------------------------------- 2 files changed, 182 insertions(+), 217 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=026fe4d08e14c7a706985…

1 0

Vincent Povirk : notepad: Check IsDialogMessage before TranslateAccelerator.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 8e873c8afcc23ad012177fc8c9eeda72ce648f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e873c8afcc23ad012177fc8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed May 21 11:18:03 2014 -0500 notepad: Check IsDialogMessage before TranslateAccelerator. --- programs/notepad/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 5c465ca..8b654da 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -790,7 +790,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) while (GetMessageW(&msg, 0, 0, 0)) { - if (!TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg) && !IsDialogMessageW(Globals.hFindReplaceDlg, &msg)) + if (!IsDialogMessageW(Globals.hFindReplaceDlg, &msg) && !TranslateAcceleratorW(Globals.hMainWnd, hAccel, &msg)) { TranslateMessage(&msg); DispatchMessageW(&msg);

1 0

Nikolay Sivov : shlwapi/tests: Skip if test ini file wasn't created.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: 31fb427737f189b7a1750b0c3c5059614955e0d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31fb427737f189b7a1750b0c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 1 21:56:13 2014 +0400 shlwapi/tests: Skip if test ini file wasn't created. --- dlls/shlwapi/tests/ordinal.c | 66 +++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6833095..531844f 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -2667,7 +2667,7 @@ static void test_SHIShellFolder_EnumObjects(void) IShellFolder_Release(folder); } -static void write_inifile(LPCWSTR filename) +static BOOL write_inifile(LPCWSTR filename) { DWORD written; HANDLE file; @@ -2678,12 +2678,16 @@ static void write_inifile(LPCWSTR filename) "AnotherKey=asdf\r\n"; file = CreateFileW(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - if(file == INVALID_HANDLE_VALUE) - return; + if(file == INVALID_HANDLE_VALUE) { + win_skip("failed to create ini file at %s\n", wine_dbgstr_w(filename)); + return FALSE; + } WriteFile(file, data, sizeof(data), &written, NULL); CloseHandle(file); + + return TRUE; } #define verify_inifile(f, e) r_verify_inifile(__LINE__, f, e) @@ -2694,6 +2698,7 @@ static void r_verify_inifile(unsigned l, LPCWSTR filename, LPCSTR exp) DWORD read; file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if(file == INVALID_HANDLE_VALUE) return; @@ -2712,52 +2717,54 @@ static void test_SHGetIniString(void) WCHAR out[64] = {0}; static const WCHAR TestAppW[] = {'T','e','s','t','A','p','p',0}; - static const WCHAR TestIniW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; static const WCHAR AKeyW[] = {'A','K','e','y',0}; static const WCHAR AnotherKeyW[] = {'A','n','o','t','h','e','r','K','e','y',0}; static const WCHAR JunkKeyW[] = {'J','u','n','k','K','e','y',0}; + static const WCHAR testpathW[] = {'C',':','\\','t','e','s','t','.','i','n','i',0}; + WCHAR pathW[MAX_PATH]; if(!pSHGetIniStringW || is_win2k_and_lower){ win_skip("SHGetIniStringW is not available\n"); return; } - write_inifile(TestIniW); + lstrcpyW(pathW, testpathW); + + if (!write_inifile(pathW)) + return; if(0){ /* these crash on Windows */ pSHGetIniStringW(NULL, NULL, NULL, 0, NULL); - pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), TestIniW); - pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), TestIniW); + pSHGetIniStringW(NULL, AKeyW, out, sizeof(out), pathW); + pSHGetIniStringW(TestAppW, AKeyW, NULL, sizeof(out), pathW); } - ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, TestIniW); + ret = pSHGetIniStringW(TestAppW, AKeyW, out, 0, pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); /* valid arguments */ - ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s\n", - wine_dbgstr_w(AKeyW), wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); - ok(broken(*out == 0) || /*win 98 */ - !strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), TestIniW); - ok(broken(ret == 0) || /* win 98 */ - ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); - ok(broken(*out == 0) || /* win 98 */ - !strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); - - ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), TestIniW); + out[0] = 0; + SetLastError(0xdeadbeef); + ret = pSHGetIniStringW(TestAppW, NULL, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!lstrcmpW(out, AKeyW), "Expected %s, got: %s, %d\n", + wine_dbgstr_w(AKeyW), wine_dbgstr_w(out), GetLastError()); + + ret = pSHGetIniStringW(TestAppW, AKeyW, out, sizeof(out), pathW); + ok(ret == 1, "SHGetIniStringW should have given 1, instead: %d\n", ret); + ok(!strcmp_wa(out, "1"), "Expected L\"1\", got: %s\n", wine_dbgstr_w(out)); + + ret = pSHGetIniStringW(TestAppW, AnotherKeyW, out, sizeof(out), pathW); + ok(ret == 4, "SHGetIniStringW should have given 4, instead: %d\n", ret); + ok(!strcmp_wa(out, "asdf"), "Expected L\"asdf\", got: %s\n", wine_dbgstr_w(out)); + + out[0] = 1; + ret = pSHGetIniStringW(TestAppW, JunkKeyW, out, sizeof(out), pathW); ok(ret == 0, "SHGetIniStringW should have given 0, instead: %d\n", ret); ok(*out == 0, "Expected L\"\", got: %s\n", wine_dbgstr_w(out)); - DeleteFileW(TestIniW); + DeleteFileW(pathW); } static void test_SHSetIniString(void) @@ -2776,7 +2783,8 @@ static void test_SHSetIniString(void) return; } - write_inifile(TestIniW); + if (!write_inifile(TestIniW)) + return; ret = pSHSetIniStringW(TestAppW, AKeyW, AValueW, TestIniW); ok(ret == TRUE, "SHSetIniStringW should not have failed\n");

1 0

Andrew Eikum : ole32: Fix return value logging.
by Alexandre Julliard 13 Jun '14

13 Jun '14

Module: wine Branch: master Commit: f02c0ae6567bb28a6afd8967d97aa9455f737e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f02c0ae6567bb28a6afd8967d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Jun 13 09:07:39 2014 -0500 ole32: Fix return value logging. --- dlls/ole32/stg_stream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index b60b17b..7738cf1 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -252,7 +252,7 @@ static HRESULT WINAPI StgStreamImpl_Write( if (SUCCEEDED(res)) res = StorageBaseImpl_Flush(This->parentStorage); - TRACE("<-- S_OK, written %u\n", *pcbWritten); + TRACE("<-- %08x, written %u\n", res, *pcbWritten); return res; }

1 0