April 2009 - Wine-commits - list.winehq.org

Michael Stefaniuc : wordpad: "Fix" the Turkish translation.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 410c00fae4b69d90705d1e9015f985d0309c1680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=410c00fae4b69d90705d1e901… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 00:35:27 2009 +0200 wordpad: "Fix" the Turkish translation. Remove the untranslated and incomplete STRINGTABLE. --- programs/wordpad/Tr.rc | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/programs/wordpad/Tr.rc b/programs/wordpad/Tr.rc index bf0eefd..7df9a36 100644 --- a/programs/wordpad/Tr.rc +++ b/programs/wordpad/Tr.rc @@ -225,16 +225,3 @@ STRINGTABLE DISCARDABLE BEGIN STRING_UNITS_CM, "cm" END - -STRINGTABLE DISCARDABLE -BEGIN - STRING_DEFAULT_FILENAME, "Document" - STRING_PROMPT_SAVE_CHANGES, "Save changes to '%s'?" - STRING_SEARCH_FINISHED, "Finished searching the document." - STRING_LOAD_RICHED_FAILED, "Failed to load the RichEdit library." - STRING_SAVE_LOSEFORMATTING, "You have chosen to save in plain text format, " \ - "which will cause all formatting to be lost. " \ - "Are you sure that you wish to do this?" - STRING_INVALID_NUMBER, "Invalid number format" - STRING_OLE_STORAGE_NOT_SUPPORTED, "OLE storage documents are not supported" -END

1 0

Jesse Allen : dsound: Allow a special cbSize case in CreateSoundBuffer.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: b7f6c1e1031e34fefbf1ece44ac8a2f007acb31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f6c1e1031e34fefbf1ece44… Author: Jesse Allen <the3dfxdude(a)gmail.com> Date: Mon Apr 20 21:41:21 2009 -0700 dsound: Allow a special cbSize case in CreateSoundBuffer. --- dlls/dsound/dsound.c | 6 +++++- dlls/dsound/tests/dsound8.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 7032774..77a5928 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1586,13 +1586,17 @@ HRESULT DirectSoundDevice_CreateSoundBuffer( } if (pwfxe->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE) { + /* check if cbSize is at least 22 bytes */ if (pwfxe->Format.cbSize < (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) { WARN("Too small a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_INVALIDPARAM; } - if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX))) + /* cbSize should be 22 bytes, with one possible exception */ + if (pwfxe->Format.cbSize > (sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) && + !(IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && + pwfxe->Format.cbSize == sizeof(WAVEFORMATEXTENSIBLE))) { WARN("Too big a cbSize %u\n", pwfxe->Format.cbSize); return DSERR_CONTROLUNAVAIL; diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index c79a7ac..88fc666 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -780,8 +780,42 @@ static HRESULT test_secondary8(LPGUID lpGuid) IDirectSoundBuffer_Release(secondary); secondary=NULL; } + + wfxe.Format.cbSize = sizeof(wfxe); + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok((rc==DSERR_CONTROLUNAVAIL || rc==DSERR_INVALIDCALL) && !secondary, + "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + rc, secondary); + if (secondary) + { + IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } + wfxe.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(rc==DS_OK && secondary, + "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + rc, secondary); + if (secondary) + { + IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } + wfxe.Format.cbSize = sizeof(wfxe) + 1; + rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); + ok(((rc==DSERR_CONTROLUNAVAIL || DSERR_INVALIDCALL /* 2003 */) && !secondary) + || rc==DS_OK /* driver dependent? */, + "IDirectSound_CreateSoundBuffer() returned: %08x %p\n", + rc, secondary); + if (secondary) + { + IDirectSoundBuffer_Release(secondary); + secondary=NULL; + } + + wfxe.Format.cbSize = sizeof(wfxe) - sizeof(wfx); ++wfxe.Samples.wValidBitsPerSample; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); ok(rc==DSERR_INVALIDPARAM && !secondary,

1 0

Michael Stefaniuc : rpcrt4: Replace some usage of the long type.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 3b803f5390483c6ae3065284693baecc343bd8b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b803f5390483c6ae30652846… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 09:59:45 2009 +0200 rpcrt4: Replace some usage of the long type. --- dlls/rpcrt4/ndr_marshall.c | 96 +++++++++++++++++++++---------------------- dlls/rpcrt4/ndr_misc.h | 2 +- 2 files changed, 48 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b803f5390483c6ae3065…

1 0

Michael Stefaniuc : winedbg: Remove some superfluous pointer casts.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 2e6ac3a571c05b489c38484e64e1c0bf30e09c48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6ac3a571c05b489c38484e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Apr 21 09:59:59 2009 +0200 winedbg: Remove some superfluous pointer casts. --- programs/winedbg/info.c | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/symbol.c | 2 +- programs/winedbg/tgt_minidump.c | 18 +++++++++--------- programs/winedbg/types.c | 2 +- programs/winedbg/winedbg.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index fd160d7..a4c919a 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -178,7 +178,7 @@ static inline BOOL module_is_container(const IMAGEHLP_MODULE64* wmod_cntnr, static BOOL CALLBACK info_mod_cb(PCSTR mod_name, DWORD64 base, PVOID ctx) { - struct info_module* im = (struct info_module*)ctx; + struct info_module* im = ctx; if (im->num_used + 1 > im->num_alloc) { diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c index 6457a46..fbaf228 100644 --- a/programs/winedbg/stack.c +++ b/programs/winedbg/stack.c @@ -217,7 +217,7 @@ struct sym_enum static BOOL WINAPI sym_enum_cb(PSYMBOL_INFO sym_info, ULONG size, PVOID user) { - struct sym_enum* se = (struct sym_enum*)user; + struct sym_enum* se = user; if (sym_info->Flags & SYMFLAG_PARAMETER) { diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index 03efac1..3a34e61 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -146,7 +146,7 @@ struct sgv_data static BOOL CALLBACK sgv_cb(PSYMBOL_INFO sym, ULONG size, PVOID ctx) { - struct sgv_data* sgv = (struct sgv_data*)ctx; + struct sgv_data* sgv = ctx; unsigned insp; char tmp[64]; diff --git a/programs/winedbg/tgt_minidump.c b/programs/winedbg/tgt_minidump.c index 3aa892c..ec8a5bb 100644 --- a/programs/winedbg/tgt_minidump.c +++ b/programs/winedbg/tgt_minidump.c @@ -81,7 +81,7 @@ struct tgt_process_minidump_data static inline struct tgt_process_minidump_data* private_data(struct dbg_process* pcs) { - return (struct tgt_process_minidump_data*)pcs->pio_data; + return pcs->pio_data; } static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, @@ -95,7 +95,7 @@ static BOOL WINAPI tgt_process_minidump_read(HANDLE hProcess, const void* addr, if (MiniDumpReadDumpStream(private_data(dbg_curr_process)->mapping, MemoryListStream, &dir, &stream, &size)) { - MINIDUMP_MEMORY_LIST* mml = (MINIDUMP_MEMORY_LIST*)stream; + MINIDUMP_MEMORY_LIST* mml = stream; MINIDUMP_MEMORY_DESCRIPTOR* mmd = &mml->MemoryRanges[0]; int i; @@ -180,7 +180,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) /* fetch PID */ if (MiniDumpReadDumpStream(data->mapping, MiscInfoStream, &dir, &stream, &size)) { - MINIDUMP_MISC_INFO* mmi = (MINIDUMP_MISC_INFO*)stream; + MINIDUMP_MISC_INFO* mmi = stream; if (mmi->Flags1 & MINIDUMP_MISC1_PROCESS_ID) pid = mmi->ProcessId; } @@ -189,7 +189,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) lstrcpyW(exec_name, default_exec_name); if (MiniDumpReadDumpStream(data->mapping, ModuleListStream, &dir, &stream, &size)) { - mml = (MINIDUMP_MODULE_LIST*)stream; + mml = stream; if (mml->NumberOfModules) { WCHAR* ptr; @@ -212,7 +212,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) if (MiniDumpReadDumpStream(data->mapping, SystemInfoStream, &dir, &stream, &size)) { - MINIDUMP_SYSTEM_INFO* msi = (MINIDUMP_SYSTEM_INFO*)stream; + MINIDUMP_SYSTEM_INFO* msi = stream; const char *str; char tmp[128]; @@ -308,7 +308,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) if (MiniDumpReadDumpStream(data->mapping, ThreadListStream, &dir, &stream, &size)) { - MINIDUMP_THREAD_LIST* mtl = (MINIDUMP_THREAD_LIST*)stream; + MINIDUMP_THREAD_LIST* mtl = stream; ULONG i; for (i = 0; i < mtl->NumberOfThreads; i++) @@ -323,7 +323,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { WCHAR buffer[MAX_PATH]; - mml = (MINIDUMP_MODULE_LIST*)stream; + mml = stream; for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); @@ -342,7 +342,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) { WCHAR buffer[MAX_PATH]; - mml = (MINIDUMP_MODULE_LIST*)stream; + mml = stream; for (i = 0, mm = &mml->Modules[0]; i < mml->NumberOfModules; i++, mm++) { mds = (MINIDUMP_STRING*)((char*)data->mapping + mm->ModuleNameRva); @@ -362,7 +362,7 @@ static enum dbg_start minidump_do_reload(struct tgt_process_minidump_data* data) } if (MiniDumpReadDumpStream(data->mapping, ExceptionStream, &dir, &stream, &size)) { - MINIDUMP_EXCEPTION_STREAM* mes = (MINIDUMP_EXCEPTION_STREAM*)stream; + MINIDUMP_EXCEPTION_STREAM* mes = stream; if ((dbg_curr_thread = dbg_get_thread(dbg_curr_process, mes->ThreadId))) { diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 8d3dabc..cc981a9 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -346,7 +346,7 @@ struct type_find_t static BOOL CALLBACK types_cb(PSYMBOL_INFO sym, ULONG size, void* _user) { - struct type_find_t* user = (struct type_find_t*)_user; + struct type_find_t* user = _user; BOOL ret = TRUE; struct dbg_type type; DWORD type_id; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index a801425..ec9bdf1 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -404,7 +404,7 @@ struct mod_loader_info static BOOL CALLBACK mod_loader_cb(PCSTR mod_name, ULONG base, PVOID ctx) { - struct mod_loader_info* mli = (struct mod_loader_info*)ctx; + struct mod_loader_info* mli = ctx; if (!strcmp(mod_name, "<wine-loader>")) {

1 0

Huw Davies : ole32: Make get_priv_data return target device ptrs ( rather than offsets) and add a couple of helper functions to simplify this process.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: bdca138d5aac6a37df540c613b80136176b1ed84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdca138d5aac6a37df540c613… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 15:27:24 2009 +0100 ole32: Make get_priv_data return target device ptrs (rather than offsets) and add a couple of helper functions to simplify this process. --- dlls/ole32/clipboard.c | 51 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index eaffb77..8aa14dc 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -105,6 +105,34 @@ typedef struct } ole_priv_data; /***************************************************************************** + * td_offs_to_ptr + * + * Returns a ptr to a target device at a given offset from the + * start of the ole_priv_data. + * + * Used when unpacking ole private data from the clipboard. + */ +static inline DVTARGETDEVICE *td_offs_to_ptr(ole_priv_data *data, DWORD_PTR off) +{ + if(off == 0) return NULL; + return (DVTARGETDEVICE*)((char*)data + off); +} + +/***************************************************************************** + * td_get_offs + * + * Get the offset from the start of the ole_priv_data of the idx'th + * target device. + * + * Used when packing ole private data to the clipboard. + */ +static inline DWORD_PTR td_get_offs(ole_priv_data *data, DWORD idx) +{ + if(data->entries[idx].fmtetc.ptd == NULL) return 0; + return (char*)data->entries[idx].fmtetc.ptd - (char*)data; +} + +/***************************************************************************** * create_empty_priv_data * * Create an empty data structure. The only thing that really matters @@ -313,7 +341,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next rgelt[i] = This->data->entries[This->pos++].fmtetc; if(rgelt[i].ptd) { - DVTARGETDEVICE *target = (DVTARGETDEVICE *)((char *)This->data + (DWORD)rgelt[i].ptd); + DVTARGETDEVICE *target = rgelt[i].ptd; rgelt[i].ptd = CoTaskMemAlloc(target->tdSize); if(!rgelt[i].ptd) return E_OUTOFMEMORY; memcpy(rgelt[i].ptd, target, target->tdSize); @@ -378,6 +406,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone { enum_fmtetc *This = impl_from_IEnumFORMATETC(iface); ole_priv_data *new_data; + DWORD i; TRACE("(%p)->(%p)\n", This, obj); @@ -386,6 +415,12 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone new_data = HeapAlloc(GetProcessHeap(), 0, This->data->size); if(!new_data) return E_OUTOFMEMORY; + memcpy(new_data, This->data, This->data->size); + + /* Fixup any target device ptrs */ + for(i = 0; i < This->data->count; i++) + new_data->entries[i].fmtetc.ptd = + td_offs_to_ptr(new_data, td_get_offs(This->data, i)); return enum_fmtetc_construct(new_data, This->pos, obj); } @@ -922,6 +957,8 @@ static HRESULT get_priv_data(ole_priv_data **data) ole_priv_data *src = GlobalLock(handle); if(src) { + DWORD i; + /* FIXME: sanity check on size */ *data = HeapAlloc(GetProcessHeap(), 0, src->size); if(!*data) @@ -931,6 +968,11 @@ static HRESULT get_priv_data(ole_priv_data **data) } memcpy(*data, src, src->size); GlobalUnlock(handle); + + /* Fixup any target device offsets to ptrs */ + for(i = 0; i < (*data)->count; i++) + (*data)->entries[i].fmtetc.ptd = + td_offs_to_ptr(*data, (DWORD_PTR)(*data)->entries[i].fmtetc.ptd); } } @@ -1343,7 +1385,7 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) FORMATETC fmt; IEnumFORMATETC *enum_fmt; HGLOBAL priv_data_handle; - DWORD target_offset; + DWORD_PTR target_offset; ole_priv_data *priv_data; DWORD count = 0, needed = sizeof(*priv_data), idx; @@ -1410,9 +1452,8 @@ static HRESULT set_clipboard_formats(ole_clipbrd *clipbrd, IDataObject *data) clipbrd->cached_enum = HeapAlloc(GetProcessHeap(), 0, needed); memcpy(clipbrd->cached_enum, priv_data, needed); for(idx = 0; idx < clipbrd->cached_enum->count; idx++) - if(clipbrd->cached_enum->entries[idx].fmtetc.ptd) - clipbrd->cached_enum->entries[idx].fmtetc.ptd = - (DVTARGETDEVICE *)((char*)clipbrd->cached_enum + (DWORD)clipbrd->cached_enum->entries[idx].fmtetc.ptd); + clipbrd->cached_enum->entries[idx].fmtetc.ptd = + td_offs_to_ptr(clipbrd->cached_enum, (DWORD_PTR)clipbrd->cached_enum->entries[idx].fmtetc.ptd); GlobalUnlock(priv_data_handle); SetClipboardData(ole_priv_data_clipboard_format, priv_data_handle);

1 0

Huw Davies : ole32: Check that the target devices match.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 1e73a54690c7870075d950b98721c7ebe02f5adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e73a54690c7870075d950b98… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 16 16:49:35 2009 +0100 ole32: Check that the target devices match. --- dlls/ole32/clipboard.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ole32/tests/clipboard.c | 2 +- 2 files changed, 37 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 8aa14dc..9397a14 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1063,6 +1063,36 @@ static HRESULT get_stgmed_for_storage(HGLOBAL h, STGMEDIUM *med) return hr; } +static inline BOOL string_off_equal(const DVTARGETDEVICE *t1, WORD off1, const DVTARGETDEVICE *t2, WORD off2) +{ + const WCHAR *str1, *str2; + + if(off1 == 0 && off2 == 0) return TRUE; + if(off1 == 0 || off2 == 0) return FALSE; + + str1 = (const WCHAR*)((const char*)t1 + off1); + str2 = (const WCHAR*)((const char*)t2 + off2); + + return !lstrcmpW(str1, str2); +} + +static inline BOOL td_equal(const DVTARGETDEVICE *t1, const DVTARGETDEVICE *t2) +{ + if(t1 == NULL && t2 == NULL) return TRUE; + if(t1 == NULL || t2 == NULL) return FALSE; + + if(!string_off_equal(t1, t1->tdDriverNameOffset, t2, t2->tdDriverNameOffset)) + return FALSE; + if(!string_off_equal(t1, t1->tdDeviceNameOffset, t2, t2->tdDeviceNameOffset)) + return FALSE; + if(!string_off_equal(t1, t1->tdPortNameOffset, t2, t2->tdPortNameOffset)) + return FALSE; + + /* FIXME check devmode? */ + + return TRUE; +} + /************************************************************************ * snapshot_GetData */ @@ -1105,6 +1135,11 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, entry = find_format_in_list(enum_data->entries, enum_data->count, fmt->cfFormat); if(entry) { + if(!td_equal(fmt->ptd, entry->fmtetc.ptd)) + { + hr = DV_E_FORMATETC; + goto end; + } mask = fmt->tymed & entry->fmtetc.tymed; if(!mask) mask = fmt->tymed & (TYMED_ISTREAM | TYMED_HGLOBAL); } @@ -1125,6 +1160,7 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, } end: + HeapFree(GetProcessHeap(), 0, enum_data); if ( !CloseClipboard() ) hr = CLIPBRD_E_CANT_CLOSE; return hr; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ed47c8b..51b3a62 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1118,7 +1118,7 @@ static void test_flushed_getdata(void) InitFormatEtc(fmt, cf_another, 0xffff); hr = IDataObject_GetData(get, &fmt, &med); - todo_wine ok(hr == DV_E_FORMATETC, "got %08x\n", hr); + ok(hr == DV_E_FORMATETC, "got %08x\n", hr); InitFormatEtc(fmt, cf_another, 0xffff); memset(&dm, 0, sizeof(dm));

1 0

Huw Davies : ole32: Don't set cf_dataobject if we're clearing the clipboard .
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 575b0e1435bd7f3069c879f143b524792a44472b URL: http://source.winehq.org/git/wine.git/?a=commit;h=575b0e1435bd7f3069c879f14… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:44:27 2009 +0100 ole32: Don't set cf_dataobject if we're clearing the clipboard. --- dlls/ole32/clipboard.c | 3 ++- dlls/ole32/tests/clipboard.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 9397a14..c28b2f4 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1729,7 +1729,8 @@ HRESULT WINAPI OleSetClipboard(IDataObject* data) hr = set_src_dataobject(clipbrd, data); if(FAILED(hr)) goto end; - hr = set_dataobject_format(wnd); + if(data) + hr = set_dataobject_format(wnd); end: diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 51b3a62..4e5f497 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -595,6 +595,21 @@ static void test_enum_fmtetc(IDataObject *src) IDataObject_Release(data); } +static void test_no_cf_dataobject(void) +{ + UINT cf_dataobject = RegisterClipboardFormatA("DataObject"); + UINT cf_ole_priv_data = RegisterClipboardFormatA("Ole Private Data"); + HANDLE h; + OpenClipboard(NULL); + + h = GetClipboardData(cf_dataobject); + ok(!h, "got %p\n", h); + h = GetClipboardData(cf_ole_priv_data); + ok(!h, "got %p\n", h); + + CloseClipboard(); +} + static void test_cf_dataobject(IDataObject *data) { UINT cf = 0; @@ -851,6 +866,7 @@ static void test_set_clipboard(void) ok(OleSetClipboard(NULL) == S_OK, "failed to clear clipboard, hr = 0x%08x\n", hr); + test_no_cf_dataobject(); test_enum_fmtetc(NULL); ref = IDataObject_Release(data1);

1 0

Huw Davies : ole32: Add support for enumerating non-ole clipboard formats.
by Alexandre Julliard 21 Apr '09

21 Apr '09

Module: wine Branch: master Commit: 08d4352f9bf26cae93b5b15a6d9d7f7964ff1281 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08d4352f9bf26cae93b5b15a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 15:20:12 2009 +0100 ole32: Add support for enumerating non-ole clipboard formats. --- dlls/ole32/clipboard.c | 86 +++++++++++++++++-------- dlls/ole32/tests/clipboard.c | 148 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+), 27 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index c28b2f4..7255323 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -132,26 +132,6 @@ static inline DWORD_PTR td_get_offs(ole_priv_data *data, DWORD idx) return (char*)data->entries[idx].fmtetc.ptd - (char*)data; } -/***************************************************************************** - * create_empty_priv_data - * - * Create an empty data structure. The only thing that really matters - * here is setting count and size members. This is used by the enumerator as a - * convenience when there's an empty list. - */ -static HRESULT create_empty_priv_data(ole_priv_data **data) -{ - ole_priv_data *ptr; - - *data = NULL; - ptr = HeapAlloc(GetProcessHeap(), 0, sizeof(*ptr)); - if(!ptr) return E_OUTOFMEMORY; - ptr->size = sizeof(*ptr); - ptr->count = 0; - *data = ptr; - return S_OK; -} - /**************************************************************************** * Consumer snapshot. Represents the state of the ole clipboard * returned by OleGetClipboard(). @@ -939,6 +919,26 @@ end: return hr; } +static DWORD get_tymed_from_nonole_cf(UINT cf) +{ + if(cf >= 0xc000) return TYMED_ISTREAM | TYMED_HGLOBAL; + + switch(cf) + { + case CF_TEXT: + case CF_OEMTEXT: + case CF_UNICODETEXT: + return TYMED_ISTREAM | TYMED_HGLOBAL; + case CF_ENHMETAFILE: + return TYMED_ENHMF; + case CF_METAFILEPICT: + return TYMED_MFPICT; + default: + FIXME("returning TYMED_NULL for cf %04x\n", cf); + return TYMED_NULL; + } +} + /*********************************************************** * get_priv_data * @@ -948,6 +948,7 @@ static HRESULT get_priv_data(ole_priv_data **data) { HGLOBAL handle; HRESULT hr = S_OK; + ole_priv_data *ret = NULL; *data = NULL; @@ -960,24 +961,55 @@ static HRESULT get_priv_data(ole_priv_data **data) DWORD i; /* FIXME: sanity check on size */ - *data = HeapAlloc(GetProcessHeap(), 0, src->size); - if(!*data) + ret = HeapAlloc(GetProcessHeap(), 0, src->size); + if(!ret) { GlobalUnlock(handle); return E_OUTOFMEMORY; } - memcpy(*data, src, src->size); + memcpy(ret, src, src->size); GlobalUnlock(handle); /* Fixup any target device offsets to ptrs */ - for(i = 0; i < (*data)->count; i++) - (*data)->entries[i].fmtetc.ptd = - td_offs_to_ptr(*data, (DWORD_PTR)(*data)->entries[i].fmtetc.ptd); + for(i = 0; i < ret->count; i++) + ret->entries[i].fmtetc.ptd = + td_offs_to_ptr(ret, (DWORD_PTR) ret->entries[i].fmtetc.ptd); } } - if(!*data) hr = create_empty_priv_data(data); + if(!ret) /* Non-ole data */ + { + UINT cf; + DWORD count = 0, idx, size = FIELD_OFFSET(ole_priv_data, entries); + + for(cf = 0; (cf = EnumClipboardFormats(cf)) != 0; count++) + { + char buf[100]; + GetClipboardFormatNameA(cf, buf, sizeof(buf)); + TRACE("\tcf %04x %s\n", cf, buf); + ; + } + TRACE("count %d\n", count); + size += count * sizeof(ret->entries[0]); + + /* There are holes in fmtetc so zero init */ + ret = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); + if(!ret) return E_OUTOFMEMORY; + ret->size = size; + ret->count = count; + + for(cf = 0, idx = 0; (cf = EnumClipboardFormats(cf)) != 0; idx++) + { + ret->entries[idx].fmtetc.cfFormat = cf; + ret->entries[idx].fmtetc.ptd = NULL; + ret->entries[idx].fmtetc.dwAspect = DVASPECT_CONTENT; + ret->entries[idx].fmtetc.lindex = -1; + ret->entries[idx].fmtetc.tymed = get_tymed_from_nonole_cf(cf); + ret->entries[idx].first_use = 1; + } + } + *data = ret; return hr; } diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 4e5f497..17a30a7 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1163,9 +1163,157 @@ static void test_flushed_getdata(void) OleUninitialize(); } +static HGLOBAL create_text(void) +{ + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + char *p = GlobalLock(h); + strcpy(p, "test"); + GlobalUnlock(h); + return h; +} + +static HENHMETAFILE create_emf(void) +{ + const RECT rect = {0, 0, 100, 100}; + HDC hdc = CreateEnhMetaFileA(NULL, NULL, &rect, "HENHMETAFILE Ole Clipboard Test\0Test\0\0"); + ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); + return CloseEnhMetaFile(hdc); +} + +static void test_nonole_clipboard(void) +{ + HRESULT hr; + BOOL r; + IDataObject *get; + IEnumFORMATETC *enum_fmt; + FORMATETC fmt; + HGLOBAL h, hblob, htext; + HENHMETAFILE emf; + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + OleInitialize(NULL); + + /* empty clipboard */ + hr = OleGetClipboard(&get); + ok(hr == S_OK, "got %08x\n", hr); + hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_FALSE, "got %08x\n", hr); + IEnumFORMATETC_Release(enum_fmt); + + IDataObject_Release(get); + + /* set a user defined clipboard type */ + + htext = create_text(); + hblob = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE|GMEM_ZEROINIT, 10); + emf = create_emf(); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + h = SetClipboardData(CF_TEXT, htext); + ok(h == htext, "got %p\n", h); + h = SetClipboardData(cf_onemore, hblob); + ok(h == hblob, "got %p\n", h); + h = SetClipboardData(CF_ENHMETAFILE, emf); + ok(h == emf, "got %p\n", h); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + hr = OleGetClipboard(&get); + ok(hr == S_OK, "got %08x\n", hr); + hr = IDataObject_EnumFormatEtc(get, DATADIR_GET, &enum_fmt); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_TEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == cf_onemore, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_ENHMETAFILE, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == TYMED_ENHMF, "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); /* User32 adds some synthesised formats */ + + todo_wine ok(fmt.cfFormat == CF_LOCALE, "cf %04x\n", fmt.cfFormat); + if(fmt.cfFormat == CF_LOCALE) + { + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + } + + ok(fmt.cfFormat == CF_OEMTEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_UNICODETEXT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == (TYMED_ISTREAM | TYMED_HGLOBAL), "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(fmt.cfFormat == CF_METAFILEPICT, "cf %04x\n", fmt.cfFormat); + ok(fmt.ptd == NULL, "ptd %p\n", fmt.ptd); + ok(fmt.dwAspect == DVASPECT_CONTENT, "aspect %x\n", fmt.dwAspect); + ok(fmt.lindex == -1, "lindex %d\n", fmt.lindex); + ok(fmt.tymed == TYMED_MFPICT, "tymed %x\n", fmt.tymed); + + hr = IEnumFORMATETC_Next(enum_fmt, 1, &fmt, NULL); + ok(hr == S_FALSE, "got %08x\n", hr); + IEnumFORMATETC_Release(enum_fmt); + + IDataObject_Release(get); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + OleUninitialize(); +} + START_TEST(clipboard) { test_set_clipboard(); test_consumer_refs(); test_flushed_getdata(); + test_nonole_clipboard(); }

1 0

Hans Leidekker : msi: Fix another double free.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 55ad3fdda2453d36cda66f286b08cf5620c02523 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55ad3fdda2453d36cda66f286… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 20 16:09:12 2009 +0200 msi: Fix another double free. parser_alloc() allocates memory and puts it on a list attached the to query object. EXPR_sval() frees memory allocated via parser_alloc() on error but does not remove the pointer from the list, which means that when the query destructor is called it will be freed again. --- dlls/msi/sql.y | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 425b584..d71c186 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -876,10 +876,7 @@ static struct expr * EXPR_sval( void *info, const struct sql_str *str ) { e->type = EXPR_SVAL; if( SQL_getstring( info, str, (LPWSTR *)&e->u.sval ) != ERROR_SUCCESS ) - { - msi_free( e ); - return NULL; - } + return NULL; /* e will be freed by query destructor */ } return e; }

1 0

Nicolas Le Cam : msi: Fix buffer length value returned by MSI_RecordGetStringW on null and empty strings .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: e00d864a35ff9739fc55d73d869f69c0067d0bce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00d864a35ff9739fc55d73d8… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Thu Apr 16 01:09:09 2009 +0200 msi: Fix buffer length value returned by MSI_RecordGetStringW on null and empty strings. --- dlls/msi/record.c | 1 - dlls/msi/tests/record.c | 2 -- 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/record.c b/dlls/msi/record.c index d484cb8..db54cdc 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -444,7 +444,6 @@ UINT MSI_RecordGetStringW(MSIRECORD *rec, UINT iField, lstrcpynW(szValue, rec->fields[iField].u.szwVal, *pcchValue); break; case MSIFIELD_NULL: - len = 1; if( szValue && *pcchValue > 0 ) szValue[0] = 0; default: diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index ca70494..e8dd6f5 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -140,7 +140,6 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h, 0, bufW, &sz); ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); - todo_wine ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); r = MsiRecordSetString(h, 0, ""); ok(r == ERROR_SUCCESS, "Failed to set empty string at 0\n"); @@ -159,7 +158,6 @@ static void test_msirecord(void) r = MsiRecordGetStringW(h, 0, bufW, &sz); ok(r == ERROR_SUCCESS, "Failed to get string at 0\n"); ok(bufW[0] == 0, "MsiRecordGetStringW returned the wrong string\n"); - todo_wine ok(sz == 0, "MsiRecordGetStringW returned the wrong length\n"); /* same record, but add a string to it */

1 0