May 2009 - Wine-Commits - list.winehq.org

Huw Davies : ole32: Add support for retrieving data from IPersistStorage.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 63eb8104288f0b3731902d41d4687ed7d2fd0ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63eb8104288f0b3731902d41d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 11 13:51:49 2009 +0100 ole32: Add support for retrieving data from IPersistStorage. --- dlls/ole32/ole2impl.c | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index dd65e88..b37ced6 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -98,13 +98,15 @@ static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) * * Retrieve an object's storage from a variety of sources. * - * FIXME: CF_EMBEDDEDOBJECT, CF_FILENAME, IPersistStorage. + * FIXME: CF_EMBEDDEDOBJECT, CF_FILENAME. */ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) { HRESULT hr; FORMATETC fmt; STGMEDIUM med; + IPersistStorage *persist; + CLSID clsid; *src_cf = 0; @@ -119,6 +121,24 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) return hr; } + /* IPersistStorage */ + hr = IDataObject_QueryInterface(data, &IID_IPersistStorage, (void**)&persist); + if(FAILED(hr)) return hr; + + hr = IPersistStorage_GetClassID(persist, &clsid); + if(FAILED(hr)) goto end; + + hr = IStorage_SetClass(stg, &clsid); + if(FAILED(hr)) goto end; + + hr = IPersistStorage_Save(persist, stg, FALSE); + if(FAILED(hr)) goto end; + + hr = IPersistStorage_SaveCompleted(persist, NULL); + +end: + IPersistStorage_Release(persist); + return hr; }

1 0

Huw Davies : ole32/tests: Cope with an alignment hole between the two marshalled interfaces.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 564b96042899ee0431229846c59843013b62bb37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=564b96042899ee0431229846c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 11:35:00 2009 +0100 ole32/tests: Cope with an alignment hole between the two marshalled interfaces. --- dlls/ole32/tests/usrmarshal.c | 51 ++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index da1fb25..5c83ddc 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -633,25 +633,19 @@ static void test_marshal_STGMEDIUM(void) USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; - unsigned char *buffer, *buffer_end, *unk_buffer, *unk_buffer_end, *stm_buffer, *stm_buffer_end; - ULONG size, unk_size, stm_size; + unsigned char *buffer, *buffer_end, *expect_buffer, *expect_buffer_end; + ULONG size, expect_size; STGMEDIUM med, med2; IUnknown *unk = &Test_Unknown; IStream *stm = &Test_Stream; - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - unk_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); - unk_buffer = HeapAlloc(GetProcessHeap(), 0, unk_size); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, unk_buffer, unk_size, MSHCTX_DIFFERENTMACHINE); - unk_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, unk_buffer, unk, &IID_IUnknown); + /* TYMED_NULL with pUnkForRelease */ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - stm_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, (IUnknown*)stm, &IID_IStream); - stm_buffer = HeapAlloc(GetProcessHeap(), 0, stm_size); - init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, stm_buffer, stm_size, MSHCTX_DIFFERENTMACHINE); - stm_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, stm_buffer, (IUnknown*)stm, &IID_IStream); - - /* TYMED_NULL with pUnkForRelease */ + expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 2 * sizeof(DWORD), unk, &IID_IUnknown); + expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 2 * sizeof(DWORD), unk, &IID_IUnknown); med.tymed = TYMED_NULL; U(med).pstg = NULL; @@ -659,15 +653,15 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); - ok(size == unk_size + 2 * sizeof(DWORD), "size %d should be %d bytes\n", size, unk_size + 8); + ok(size == expect_size, "size %d should be %d bytes\n", size, expect_size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); - ok(buffer_end - buffer - 2 * sizeof(DWORD) == unk_buffer_end - unk_buffer, "buffer size mismatch\n"); + ok(buffer_end - buffer == expect_buffer_end - expect_buffer, "buffer size mismatch\n"); ok(*(DWORD*)buffer == TYMED_NULL, "got %08x\n", *(DWORD*)buffer); ok(*((DWORD*)buffer+1) != 0, "got %08x\n", *((DWORD*)buffer+1)); - ok(!memcmp(buffer+8, unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); + ok(!memcmp(buffer+8, expect_buffer + 8, expect_buffer_end - expect_buffer - 8), "buffer mismatch\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); @@ -686,25 +680,38 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); + HeapFree(GetProcessHeap(), 0, expect_buffer); + /* TYMED_ISTREAM with pUnkForRelease */ + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); + expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 3 * sizeof(DWORD), (IUnknown*)stm, &IID_IStream); + expect_size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, expect_size, unk, &IID_IUnknown); + + expect_buffer = HeapAlloc(GetProcessHeap(), 0, expect_size); + /* There may be a hole between the two interfaces so init the buffer to something */ + memset(expect_buffer, 0xcc, expect_size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, expect_buffer, expect_size, MSHCTX_DIFFERENTMACHINE); + expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer + 3 * sizeof(DWORD), (IUnknown*)stm, &IID_IStream); + expect_buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, expect_buffer_end, unk, &IID_IUnknown); + med.tymed = TYMED_ISTREAM; U(med).pstm = stm; med.pUnkForRelease = unk; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); size = STGMEDIUM_UserSize(&umcb.Flags, 0, &med); - ok(size == stm_size + unk_size + 3 * sizeof(DWORD), "size %d should be %d bytes\n", size, stm_size + unk_size + 3 * sizeof(DWORD)); + ok(size == expect_size, "size %d should be %d bytes\n", size, expect_size); buffer = HeapAlloc(GetProcessHeap(), 0, size); + memset(buffer, 0xcc, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); buffer_end = STGMEDIUM_UserMarshal(&umcb.Flags, buffer, &med); - ok(buffer_end - buffer - 3 * sizeof(DWORD) == (unk_buffer_end - unk_buffer) + (stm_buffer_end - stm_buffer), "buffer size mismatch\n"); + ok(buffer_end - buffer == expect_buffer_end - expect_buffer, "buffer size mismatch\n"); ok(*(DWORD*)buffer == TYMED_ISTREAM, "got %08x\n", *(DWORD*)buffer); ok(*((DWORD*)buffer+1) != 0, "got %08x\n", *((DWORD*)buffer+1)); ok(*((DWORD*)buffer+2) != 0, "got %08x\n", *((DWORD*)buffer+2)); - ok(!memcmp(buffer + 12, stm_buffer, stm_buffer_end - stm_buffer), "buffer mismatch\n"); - ok(!memcmp(buffer + 12 + (stm_buffer_end - stm_buffer), unk_buffer, unk_buffer_end - unk_buffer), "buffer mismatch\n"); + ok(!memcmp(buffer + 12, expect_buffer + 12, (buffer_end - buffer) - 12), "buffer mismatch\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); @@ -724,9 +731,7 @@ static void test_marshal_STGMEDIUM(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); STGMEDIUM_UserFree(&umcb.Flags, &med2); - - HeapFree(GetProcessHeap(), 0, stm_buffer); - HeapFree(GetProcessHeap(), 0, unk_buffer); + HeapFree(GetProcessHeap(), 0, expect_buffer); } START_TEST(usrmarshal)

1 0

Huw Davies : ole32: Use OleCreateFromDataEx to implement OleCreateFromData.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 8aa2db4724114188e00dc79410918a404fb7a81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aa2db4724114188e00dc7941… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:09:08 2009 +0100 ole32: Use OleCreateFromDataEx to implement OleCreateFromData. --- dlls/ole32/ole2impl.c | 110 +++--------------------------------------------- 1 files changed, 7 insertions(+), 103 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index e226687..e4eccc1 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -184,112 +184,16 @@ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, /****************************************************************************** * OleCreateFromData [OLE32.@] - * - * Author : Abey George - * Creates an embedded object from data transfer object retrieved from - * the clipboard or OLE drag and drop. - * Returns : S_OK - Embedded object was created successfully. - * OLE_E_STATIC - OLE can create only a static object - * DV_E_FORMATETC - No acceptable format is available (only error return code) - * TODO : CF_FILENAME, CF_EMBEDEDOBJECT formats. Parameter renderopt is currently ignored. */ - -HRESULT WINAPI OleCreateFromData(LPDATAOBJECT pSrcDataObject, REFIID riid, - DWORD renderopt, LPFORMATETC pFormatEtc, - LPOLECLIENTSITE pClientSite, LPSTORAGE pStg, - LPVOID* ppvObj) +HRESULT WINAPI OleCreateFromData(LPDATAOBJECT data, REFIID iid, + DWORD renderopt, LPFORMATETC fmt, + LPOLECLIENTSITE client_site, LPSTORAGE stg, + LPVOID* obj) { - IEnumFORMATETC *pfmt; - FORMATETC fmt; - CHAR szFmtName[MAX_CLIPFORMAT_NAME]; - STGMEDIUM std; - HRESULT hr; - HRESULT hr1; - - hr = IDataObject_EnumFormatEtc(pSrcDataObject, DATADIR_GET, &pfmt); - - if (hr == S_OK) - { - memset(&std, 0, sizeof(STGMEDIUM)); - - hr = IEnumFORMATETC_Next(pfmt, 1, &fmt, NULL); - while (hr == S_OK) - { - GetClipboardFormatNameA(fmt.cfFormat, szFmtName, MAX_CLIPFORMAT_NAME-1); - - /* first, Check for Embedded Object, Embed Source or Filename */ - /* TODO: Currently checks only for Embed Source. */ - - if (!strcmp(szFmtName, CF_EMBEDSOURCE)) - { - std.tymed = TYMED_HGLOBAL; - - if ((hr1 = IDataObject_GetData(pSrcDataObject, &fmt, &std)) == S_OK) - { - ILockBytes *ptrILockBytes = 0; - IStorage *pStorage = 0; - IOleObject *pOleObject = 0; - IPersistStorage *pPersistStorage = 0; - CLSID clsID; - - /* Create ILock bytes */ - - hr1 = CreateILockBytesOnHGlobal(std.u.hGlobal, FALSE, &ptrILockBytes); - - /* Open storage on the ILock bytes */ - - if (hr1 == S_OK) - hr1 = StgOpenStorageOnILockBytes(ptrILockBytes, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &pStorage); - - /* Get Class ID from the opened storage */ - - if (hr1 == S_OK) - hr1 = ReadClassStg(pStorage, &clsID); - - /* Create default handler for Persist storage */ - - if (hr1 == S_OK) - hr1 = OleCreateDefaultHandler(&clsID, NULL, &IID_IPersistStorage, (LPVOID*)&pPersistStorage); - - /* Load the storage to Persist storage */ - - if (hr1 == S_OK) - hr1 = IPersistStorage_Load(pPersistStorage, pStorage); - - /* Query for IOleObject */ - - if (hr1 == S_OK) - hr1 = IPersistStorage_QueryInterface(pPersistStorage, &IID_IOleObject, (LPVOID*)&pOleObject); - - /* Set client site with the IOleObject */ - - if (hr1 == S_OK) - hr1 = IOleObject_SetClientSite(pOleObject, pClientSite); - - IPersistStorage_Release(pPersistStorage); - /* Query for the requested interface */ - - if (hr1 == S_OK) - hr1 = IPersistStorage_QueryInterface(pPersistStorage, riid, ppvObj); - - IPersistStorage_Release(pPersistStorage); - - IStorage_Release(pStorage); - - if (hr1 == S_OK) - return S_OK; - } - - /* Return error */ - - return DV_E_FORMATETC; - } - - hr = IEnumFORMATETC_Next(pfmt, 1, &fmt, NULL); - } - } + DWORD advf = ADVF_PRIMEFIRST; - return DV_E_FORMATETC; + return OleCreateFromDataEx(data, iid, 0, renderopt, fmt ? 1 : 0, fmt ? &advf : NULL, + fmt, NULL, NULL, client_site, stg, obj); }

1 0

Huw Davies : ole32: Add support for retrieving the data from CF_EMBEDDEDOBJECT.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: d2837d91d0670e3d79e10620911e7f661d0d3d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2837d91d0670e3d79e106209… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 12:08:18 2009 +0100 ole32: Add support for retrieving the data from CF_EMBEDDEDOBJECT. --- dlls/ole32/ole2impl.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index b37ced6..e226687 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -98,7 +98,7 @@ static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) * * Retrieve an object's storage from a variety of sources. * - * FIXME: CF_EMBEDDEDOBJECT, CF_FILENAME. + * FIXME: CF_FILENAME. */ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) { @@ -110,6 +110,17 @@ static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) *src_cf = 0; + /* CF_EMBEDEDOBJECT */ + init_fmtetc(&fmt, embedded_object_clipboard_format, TYMED_ISTORAGE); + med.tymed = TYMED_ISTORAGE; + med.u.pstg = stg; + hr = IDataObject_GetDataHere(data, &fmt, &med); + if(SUCCEEDED(hr)) + { + *src_cf = embedded_object_clipboard_format; + return hr; + } + /* CF_EMBEDSOURCE */ init_fmtetc(&fmt, embed_source_clipboard_format, TYMED_ISTORAGE); med.tymed = TYMED_ISTORAGE;

1 0

Huw Davies : ole32: Beginnings of OleCreateFromDataEx.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: a9f96ad60a548600eb3524e82d1c96d55257c9d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9f96ad60a548600eb3524e82… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon May 11 13:49:24 2009 +0100 ole32: Beginnings of OleCreateFromDataEx. --- dlls/ole32/ole2impl.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index f7da399..dd65e88 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -84,6 +84,44 @@ HRESULT WINAPI OleQueryCreateFromData(IDataObject *data) return found_static ? OLE_S_STATIC : S_FALSE; } +static inline void init_fmtetc(FORMATETC *fmt, CLIPFORMAT cf, TYMED tymed) +{ + fmt->cfFormat = cf; + fmt->ptd = NULL; + fmt->dwAspect = DVASPECT_CONTENT; + fmt->lindex = -1; + fmt->tymed = tymed; +} + +/*************************************************************************** + * get_storage + * + * Retrieve an object's storage from a variety of sources. + * + * FIXME: CF_EMBEDDEDOBJECT, CF_FILENAME, IPersistStorage. + */ +static HRESULT get_storage(IDataObject *data, IStorage *stg, UINT *src_cf) +{ + HRESULT hr; + FORMATETC fmt; + STGMEDIUM med; + + *src_cf = 0; + + /* CF_EMBEDSOURCE */ + init_fmtetc(&fmt, embed_source_clipboard_format, TYMED_ISTORAGE); + med.tymed = TYMED_ISTORAGE; + med.u.pstg = stg; + hr = IDataObject_GetDataHere(data, &fmt, &med); + if(SUCCEEDED(hr)) + { + *src_cf = embed_source_clipboard_format; + return hr; + } + + return hr; +} + /****************************************************************************** * OleCreateFromDataEx [OLE32.@] * @@ -91,15 +129,26 @@ HRESULT WINAPI OleQueryCreateFromData(IDataObject *data) * the clipboard or OLE drag and drop. */ HRESULT WINAPI OleCreateFromDataEx(IDataObject *data, REFIID iid, DWORD flags, - DWORD renderopt, ULONG num_fmts, DWORD *adv_flags, FORMATETC *fmts, + DWORD renderopt, ULONG num_cache_fmts, DWORD *adv_flags, FORMATETC *cache_fmts, IAdviseSink *sink, DWORD *conns, IOleClientSite *client_site, IStorage *stg, void **obj) { + HRESULT hr; + UINT src_cf; + FIXME("(%p, %s, %08x, %08x, %d, %p, %p, %p, %p, %p, %p, %p): stub\n", - data, debugstr_guid(iid), flags, renderopt, num_fmts, adv_flags, fmts, + data, debugstr_guid(iid), flags, renderopt, num_cache_fmts, adv_flags, cache_fmts, sink, conns, client_site, stg, obj); - return E_NOTIMPL; + hr = get_storage(data, stg, &src_cf); + if(FAILED(hr)) return hr; + + hr = OleLoad(stg, iid, client_site, obj); + if(FAILED(hr)) return hr; + + /* FIXME: Init cache */ + + return hr; } /******************************************************************************

1 0

Huw Davies : ntdll/tests: Mark RtlUnicodeStringToInteger("", 16) as broken for nt4.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: fd0e7969197084a11eb1e57378ca367d52aa856a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd0e7969197084a11eb1e5737… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 14:47:47 2009 +0100 ntdll/tests: Mark RtlUnicodeStringToInteger("", 16) as broken for nt4. --- dlls/ntdll/tests/rtlstr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 53f0c80..ad9c5a1 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -1357,7 +1357,8 @@ static void test_RtlUnicodeStringToInteger(void) test_num, str2int[test_num].str, str2int[test_num].base, result, str2int[test_num].result, str2int[test_num].alternative); if (result == STATUS_SUCCESS) - ok(value == str2int[test_num].value, + ok(value == str2int[test_num].value || + broken(str2int[test_num].str[0] == '\0' && str2int[test_num].base == 16), /* nt4 */ "(test %d): RtlUnicodeStringToInteger(\"%s\", %d, [out]) assigns value %d, expected: %d\n", test_num, str2int[test_num].str, str2int[test_num].base, value, str2int[test_num].value); else

1 0

Huw Davies : ole32/tests: Remove assumptions about the size of marshalled data.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 707f9628963af33ac14a9d09213cc5c22cf156d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=707f9628963af33ac14a9d092… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 19 10:41:55 2009 +0100 ole32/tests: Remove assumptions about the size of marshalled data. --- dlls/ole32/tests/usrmarshal.c | 41 +++++++++++++++++------------------------ 1 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 2f934d8..da1fb25 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -550,13 +550,9 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) unsigned char *wireip; HGLOBAL h = GlobalAlloc(GMEM_MOVEABLE, 0); IStream *stm; - void *ptr; + void *marshal_data; LARGE_INTEGER pos; - DWORD h_size, marshal_size, expected_size; - - /* The marshalled data depends on the LOWORD of the ctx */ - - expected_size = (LOWORD(ctx) == MSHCTX_INPROC) ? 0x4c : 0xb4; + DWORD marshal_size; /* shows that the WdtpInterfacePointer functions don't marshal anything for * NULL pointers, so code using these functions must handle that case @@ -571,36 +567,33 @@ static void marshal_WdtpInterfacePointer(DWORD umcb_ctx, DWORD ctx) wireip = buffer; HeapFree(GetProcessHeap(), 0, buffer); + /* Now for a non-NULL pointer. The marshalled data are two size DWORDS and then + the result of CoMarshalInterface called with the LOWORD of the ctx */ + unk = &Test_Unknown; + + CreateStreamOnHGlobal(h, TRUE, &stm); + CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); + marshal_size = GlobalSize(h); + marshal_data = GlobalLock(h); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, umcb_ctx); size = WdtpInterfacePointer_UserSize(&umcb.Flags, ctx, 0, unk, &IID_IUnknown); - todo_wine - ok(size >= expected_size, "size should be >= %x bytes, not %x\n", expected_size, size); - trace("WdtpInterfacePointer_UserSize returned %d\n", size); + ok(size >= marshal_size + 2 * sizeof(DWORD), "marshal size %x got %x\n", marshal_size, size); + trace("WdtpInterfacePointer_UserSize returned %x\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, umcb_ctx); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, ctx, buffer, unk, &IID_IUnknown); wireip = buffer; - /* Wine's standard marshalling appears to be a DWORD short */ - todo_wine - ok(buffer_end == buffer + expected_size, "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); + ok(buffer_end == buffer + marshal_size + 2 * sizeof(DWORD), "buffer_end %p buffer %p (diff %x)\n", buffer_end, buffer, buffer_end - buffer); - marshal_size = buffer_end - buffer - 2 * sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x0 should be %x instead of %x\n", marshal_size, *(DWORD *)wireip); wireip += sizeof(DWORD); - ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); + ok(*(DWORD *)wireip == marshal_size, "wireip + 0x4 should be %x instead of %x\n", marshal_size, *(DWORD *)wireip); wireip += sizeof(DWORD); - /* The remaining 0x44/0xac bytes are the result of CoMarshalInterface */ - - CreateStreamOnHGlobal(h, TRUE, &stm); - CoMarshalInterface(stm, &IID_IUnknown, unk, LOWORD(ctx), NULL, MSHLFLAGS_NORMAL); - h_size = GlobalSize(h); - ok(h_size == marshal_size, "size %x\n", h_size); - - ptr = GlobalLock(h); - ok(!memcmp(ptr, wireip, h_size), "buffer mismatch\n"); + ok(!memcmp(marshal_data, wireip, marshal_size), "buffer mismatch\n"); GlobalUnlock(h); pos.QuadPart = 0; IStream_Seek(stm, pos, STREAM_SEEK_SET, NULL);

1 0

Nikolay Sivov : comctl32/syslink: Use cached colors for SysLink.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: a2f309a3ee6d4d8df5d4c88687d82c47d5a44b79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2f309a3ee6d4d8df5d4c8868… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 19:59:13 2009 +0400 comctl32/syslink: Use cached colors for SysLink. --- dlls/comctl32/syslink.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 8f48b4c..1b89bc7 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -831,7 +831,7 @@ static LRESULT SYSLINK_Draw (const SYSLINK_INFO *infoPtr, HDC hdc) hOldFont = SelectObject(hdc, infoPtr->Font); OldTextColor = SetTextColor(hdc, infoPtr->TextColor); - OldBkColor = SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + OldBkColor = SetBkColor(hdc, comctl32_color.clrBtnFace); GetClientRect(infoPtr->Self, &rc); rc.right -= SL_RIGHTMARGIN + SL_LEFTMARGIN; @@ -1729,9 +1729,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, infoPtr->Items = NULL; infoPtr->HasFocus = FALSE; infoPtr->MouseDownID = -1; - infoPtr->TextColor = GetSysColor(COLOR_WINDOWTEXT); - infoPtr->LinkColor = GetSysColor(COLOR_HIGHLIGHT); - infoPtr->VisitedColor = GetSysColor(COLOR_HIGHLIGHT); + infoPtr->TextColor = comctl32_color.clrWindowText; + infoPtr->LinkColor = comctl32_color.clrHighlight; + infoPtr->VisitedColor = comctl32_color.clrHighlight; infoPtr->BreakChar = ' '; TRACE("SysLink Ctrl creation, hwnd=%p\n", hwnd); SYSLINK_SetText(infoPtr, ((LPCREATESTRUCTW)lParam)->lpszName); @@ -1746,6 +1746,10 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message, Free (infoPtr); return 0; + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + default: HandleDefaultMessage: if ((message >= WM_USER) && (message < WM_APP) && !COMCTL32_IsReflectedMessage(message))

1 0

Nikolay Sivov : comctl32/tooltips: Use cached colors for ToolTips.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 8f5a1ae8c90d819c7f2e80ae911c7a9d981c32a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f5a1ae8c90d819c7f2e80ae9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 20:02:09 2009 +0400 comctl32/tooltips: Use cached colors for ToolTips. --- dlls/comctl32/tooltips.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 010f3a9..fc9052e 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -189,8 +189,8 @@ TOOLTIPS_InitSystemSettings (TOOLTIPS_INFO *infoPtr) { NONCLIENTMETRICSW nclm; - infoPtr->clrBk = GetSysColor (COLOR_INFOBK); - infoPtr->clrText = GetSysColor (COLOR_INFOTEXT); + infoPtr->clrBk = comctl32_color.clrInfoBk; + infoPtr->clrText = comctl32_color.clrInfoText; DeleteObject (infoPtr->hFont); nclm.cbSize = sizeof(nclm); @@ -2839,6 +2839,10 @@ TOOLTIPS_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_SETFONT: return TOOLTIPS_SetFont (hwnd, wParam, lParam); + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return 0; + case WM_TIMER: return TOOLTIPS_Timer (hwnd, wParam, lParam);

1 0

Nikolay Sivov : comctl32/listview: Handle mouse selections more accurately.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: d769368f66ae648dce519264c748fe670e79aab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d769368f66ae648dce519264c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon May 18 20:50:43 2009 +0400 comctl32/listview: Handle mouse selections more accurately. --- dlls/comctl32/listview.c | 46 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e94d389..ce78224 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -293,6 +293,7 @@ typedef struct tagLISTVIEW_INFO HWND hwndEdit; WNDPROC EditWndProc; INT nEditLabelItem; + INT nLButtonDownItem; /* tracks item to reset multiselection on WM_LBUTTONUP */ DWORD dwHoverTime; HWND hwndToolTip; @@ -3388,6 +3389,7 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN { POINT tmp; RECT rect; + LVHITTESTINFO lvHitTestInfo; WORD wDragWidth = GetSystemMetrics(SM_CXDRAG); WORD wDragHeight= GetSystemMetrics(SM_CYDRAG); @@ -3399,11 +3401,33 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN tmp.x = x; tmp.y = y; + lvHitTestInfo.pt = tmp; + LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); + + /* reset item marker */ + if (infoPtr->nLButtonDownItem != lvHitTestInfo.iItem) + infoPtr->nLButtonDownItem = -1; + if (!PtInRect(&rect, tmp)) { - LVHITTESTINFO lvHitTestInfo; NMLISTVIEW nmlv; + /* this path covers the following: + 1. WM_LBUTTONDOWN over selected item (sets focus on it) + 2. change focus with keys + 3. move mouse over item from step 1 selects it and moves focus on it */ + if (infoPtr->nLButtonDownItem != -1 && + !LISTVIEW_GetItemState(infoPtr, infoPtr->nLButtonDownItem, LVIS_SELECTED)) + { + LVITEMW lvItem; + + lvItem.state = LVIS_FOCUSED | LVIS_SELECTED; + lvItem.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + + LISTVIEW_SetItemState(infoPtr, infoPtr->nLButtonDownItem, &lvItem); + infoPtr->nLButtonDownItem = -1; + } + lvHitTestInfo.pt = infoPtr->ptClickPos; LISTVIEW_HitTest(infoPtr, &lvHitTestInfo, TRUE, TRUE); @@ -3420,8 +3444,6 @@ static LRESULT LISTVIEW_MouseMove(LISTVIEW_INFO *infoPtr, WORD fwKeys, INT x, IN return 0; } } - else - infoPtr->bLButtonDown = FALSE; /* see if we are supposed to be tracking mouse hovering */ if (LISTVIEW_isHotTracking(infoPtr)) { @@ -8144,6 +8166,7 @@ static LRESULT LISTVIEW_NCCreate(HWND hwnd, const CREATESTRUCTW *lpcs) infoPtr->iconSpacing.cx = GetSystemMetrics(SM_CXICONSPACING); infoPtr->iconSpacing.cy = GetSystemMetrics(SM_CYICONSPACING); infoPtr->nEditLabelItem = -1; + infoPtr->nLButtonDownItem = -1; infoPtr->dwHoverTime = -1; /* default system hover time */ infoPtr->nMeasureItemHeight = 0; infoPtr->xTrackLine = -1; /* no track line */ @@ -8835,10 +8858,15 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN else { if (LISTVIEW_GetItemState(infoPtr, nItem, LVIS_SELECTED)) + { infoPtr->nEditLabelItem = nItem; + infoPtr->nLButtonDownItem = nItem; - /* set selection (clears other pre-existing selections) */ - LISTVIEW_SetSelection(infoPtr, nItem); + LISTVIEW_SetItemFocus(infoPtr, nItem); + } + else + /* set selection (clears other pre-existing selections) */ + LISTVIEW_SetSelection(infoPtr, nItem); } } @@ -8848,7 +8876,8 @@ static LRESULT LISTVIEW_LButtonDown(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, IN else { /* remove all selections */ - LISTVIEW_DeselectAll(infoPtr); + if (!(wKey & MK_CONTROL) && !(wKey & MK_SHIFT)) + LISTVIEW_DeselectAll(infoPtr); ReleaseCapture(); } @@ -8885,6 +8914,11 @@ static LRESULT LISTVIEW_LButtonUp(LISTVIEW_INFO *infoPtr, WORD wKey, INT x, INT /* set left button flag */ infoPtr->bLButtonDown = FALSE; + /* set a single selection, reset others */ + if(lvHitTestInfo.iItem == infoPtr->nLButtonDownItem && lvHitTestInfo.iItem != -1) + LISTVIEW_SetSelection(infoPtr, infoPtr->nLButtonDownItem); + infoPtr->nLButtonDownItem = -1; + if (infoPtr->bDragging) { infoPtr->bDragging = FALSE;

1 0