September 2018 - Wine-Commits

Alexandre Julliard : kernel32: Retrieve binary information from the server for PE files.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 9d3a5a969c6c45468e012cdfc591f6485ad28ae7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d3a5a969c6c45468e012cdf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 13:37:30 2018 +0200 kernel32: Retrieve binary information from the server for PE files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 180 ++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d3a5a969c6c45468e01…

1 0

Alexandre Julliard : kernel32: Determine 32/ 64-bitness from the PE architecture.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: da40de3ced303178610e4da4640d1beead4096fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=da40de3ced303178610e4da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 14:23:52 2018 +0200 kernel32: Determine 32/64-bitness from the PE architecture. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 49e6bc2..02dce89 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -123,12 +123,9 @@ enum binary_type BINARY_UNIX_LIB }; -#define BINARY_FLAG_64BIT 0x02 - struct binary_info { enum binary_type type; - DWORD flags; pe_image_info_t pe; }; @@ -174,6 +171,15 @@ static inline unsigned int is_path_prefix( const WCHAR *prefix, const WCHAR *fil /*********************************************************************** + * is_64bit_arch + */ +static inline BOOL is_64bit_arch( WORD machine ) +{ + return (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); +} + + +/*********************************************************************** * get_pe_info */ static NTSTATUS get_pe_info( HANDLE handle, pe_image_info_t *info ) @@ -251,15 +257,12 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) { case STATUS_SUCCESS: info->type = BINARY_PE; - if (info->pe.machine == IMAGE_FILE_MACHINE_AMD64 || info->pe.machine == IMAGE_FILE_MACHINE_ARM64) - info->flags |= BINARY_FLAG_64BIT; return; case STATUS_INVALID_IMAGE_WIN_32: info->type = BINARY_PE; return; case STATUS_INVALID_IMAGE_WIN_64: info->type = BINARY_PE; - info->flags |= BINARY_FLAG_64BIT; return; case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: @@ -279,7 +282,6 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) #else BOOL byteswap = (header.elf.data == 2); #endif - if (header.elf.class == 2) info->flags |= BINARY_FLAG_64BIT; if (byteswap) { header.elf.type = RtlUshortByteSwap( header.elf.type ); @@ -337,7 +339,6 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) else if (header.macho.magic == 0xfeedface || header.macho.magic == 0xcefaedfe || header.macho.magic == 0xfeedfacf || header.macho.magic == 0xcffaedfe) { - if ((header.macho.cputype >> 24) == 1) info->flags |= BINARY_FLAG_64BIT; if (header.macho.magic == 0xcefaedfe || header.macho.magic == 0xcffaedfe) { header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); @@ -371,7 +372,7 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil WCHAR *file_part; UINT len; void *redir_disabled = 0; - unsigned int flags = (sizeof(void*) > sizeof(int) ? BINARY_FLAG_64BIT : 0); + BOOL is_64bit = (sizeof(void*) > sizeof(int)); /* builtin names cannot be empty or contain spaces */ if (!libname[0] || strchrW( libname, ' ' ) || strchrW( libname, '\t' )) return FALSE; @@ -387,11 +388,11 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil if ((len = is_path_prefix( DIR_System, filename ))) { - if (is_wow64 && redir_disabled) flags = BINARY_FLAG_64BIT; + if (is_wow64 && redir_disabled) is_64bit = TRUE; } else if (DIR_SysWow64 && (len = is_path_prefix( DIR_SysWow64, filename ))) { - flags = 0; + is_64bit = FALSE; } else return FALSE; @@ -405,7 +406,7 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil file_part = filename + len; if (file_part > filename && file_part[-1] != '\\') *file_part++ = '\\'; strcpyW( file_part, libname ); - if (is_wow64 && redir_disabled) flags = BINARY_FLAG_64BIT; + if (is_wow64 && redir_disabled) is_64bit = TRUE; } if (ext && !strchrW( file_part, '.' )) { @@ -415,10 +416,9 @@ static BOOL get_builtin_path( const WCHAR *libname, const WCHAR *ext, WCHAR *fil } memset( binary_info, 0, sizeof(*binary_info) ); binary_info->type = BINARY_UNIX_LIB; - binary_info->flags = flags; /* assume current arch */ #if defined(__i386__) || defined(__x86_64__) - binary_info->pe.machine = (flags & BINARY_FLAG_64BIT) ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; + binary_info->pe.machine = is_64bit ? IMAGE_FILE_MACHINE_AMD64 : IMAGE_FILE_MACHINE_I386; #elif defined(__powerpc__) binary_info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; #elif defined(__arm__) && !defined(__ARMEB__) @@ -2078,7 +2078,7 @@ static pid_t exec_loader( LPCWSTR cmd_line, unsigned int flags, int socketfd, argv = build_argv( cmd_line, 1 ); - if (!is_win64 ^ !(binary_info->flags & BINARY_FLAG_64BIT)) + if (!is_win64 ^ !is_64bit_arch( binary_info->pe.machine )) loader = get_alternate_loader( &wineloader ); if (exec_only || !(pid = fork())) /* child */ @@ -2678,7 +2678,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A { case BINARY_PE: TRACE( "starting %s as Win%d binary (%s-%s, arch %04x)\n", - debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, + debugstr_w(name), is_64bit_arch(binary_info.pe.machine) ? 64 : 32, wine_dbgstr_longlong(binary_info.pe.base), wine_dbgstr_longlong(binary_info.pe.base + binary_info.pe.map_size), binary_info.pe.machine ); @@ -2692,7 +2692,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A break; case BINARY_UNIX_LIB: TRACE( "starting %s as %d-bit Winelib app\n", - debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32 ); + debugstr_w(name), is_64bit_arch(binary_info.pe.machine) ? 64 : 32 ); retv = create_process( hFile, name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, inherit, flags, startup_info, info, unixdir, &binary_info, FALSE ); break; @@ -2830,7 +2830,7 @@ static void exec_process( LPCWSTR name ) { case BINARY_PE: TRACE( "starting %s as Win%d binary (%s-%s, arch %04x)\n", - debugstr_w(name), (binary_info.flags & BINARY_FLAG_64BIT) ? 64 : 32, + debugstr_w(name), is_64bit_arch(binary_info.pe.machine) ? 64 : 32, wine_dbgstr_longlong(binary_info.pe.base), wine_dbgstr_longlong(binary_info.pe.base + binary_info.pe.map_size), binary_info.pe.machine );

1 0

Alexandre Julliard : kernel32: Return the binary type from get_binary_info ().
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: df637816bc3ad1afa10135fcb2b784eca49e6f06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df637816bc3ad1afa10135fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 14:44:47 2018 +0200 kernel32: Return the binary type from get_binary_info(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 71 +++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 02dce89..59a829b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -207,7 +207,7 @@ static NTSTATUS get_pe_info( HANDLE handle, pe_image_info_t *info ) /*********************************************************************** * get_binary_info */ -static void get_binary_info( HANDLE hfile, struct binary_info *info ) +static enum binary_type get_binary_info( HANDLE hfile, struct binary_info *info ) { union { @@ -256,24 +256,21 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) switch (status) { case STATUS_SUCCESS: - info->type = BINARY_PE; - return; + return BINARY_PE; case STATUS_INVALID_IMAGE_WIN_32: - info->type = BINARY_PE; - return; + return BINARY_PE; case STATUS_INVALID_IMAGE_WIN_64: - info->type = BINARY_PE; - return; + return BINARY_PE; case STATUS_INVALID_IMAGE_WIN_16: case STATUS_INVALID_IMAGE_NE_FORMAT: case STATUS_INVALID_IMAGE_PROTECT: - info->type = BINARY_WIN16; - return; + return BINARY_WIN16; } /* Seek to the start of the file and read the header information. */ - if (SetFilePointer( hfile, 0, NULL, SEEK_SET ) == -1) return; - if (!ReadFile( hfile, &header, sizeof(header), &len, NULL ) || len != sizeof(header)) return; + if (SetFilePointer( hfile, 0, NULL, SEEK_SET ) == -1) return BINARY_UNKNOWN; + if (!ReadFile( hfile, &header, sizeof(header), &len, NULL ) || len != sizeof(header)) + return BINARY_UNKNOWN; if (!memcmp( header.elf.magic, "\177ELF", 4 )) { @@ -287,11 +284,19 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) header.elf.type = RtlUshortByteSwap( header.elf.type ); header.elf.machine = RtlUshortByteSwap( header.elf.machine ); } + switch(header.elf.machine) + { + case 3: info->pe.machine = IMAGE_FILE_MACHINE_I386; break; + case 20: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break; + case 40: info->pe.machine = IMAGE_FILE_MACHINE_ARMNT; break; + case 50: info->pe.machine = IMAGE_FILE_MACHINE_IA64; break; + case 62: info->pe.machine = IMAGE_FILE_MACHINE_AMD64; break; + case 183: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break; + } switch(header.elf.type) { case 2: - info->type = BINARY_UNIX_EXE; - break; + return BINARY_UNIX_EXE; case 3: { LARGE_INTEGER phoff; @@ -309,30 +314,15 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) } while (phnum--) { - if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return; - if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) return; + if (SetFilePointerEx( hfile, phoff, NULL, FILE_BEGIN ) == -1) return BINARY_UNKNOWN; + if (!ReadFile( hfile, &type, sizeof(type), &len, NULL ) || len < sizeof(type)) + return BINARY_UNKNOWN; if (byteswap) type = RtlUlongByteSwap( type ); - if (type == 3) - { - info->type = BINARY_UNIX_EXE; - break; - } + if (type == 3) return BINARY_UNIX_EXE; phoff.QuadPart += (header.elf.class == 2) ? 56 : 32; } - if (!info->type) info->type = BINARY_UNIX_LIB; - break; - } - default: - return; + return BINARY_UNIX_LIB; } - switch(header.elf.machine) - { - case 3: info->pe.machine = IMAGE_FILE_MACHINE_I386; break; - case 20: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break; - case 40: info->pe.machine = IMAGE_FILE_MACHINE_ARMNT; break; - case 50: info->pe.machine = IMAGE_FILE_MACHINE_IA64; break; - case 62: info->pe.machine = IMAGE_FILE_MACHINE_AMD64; break; - case 183: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break; } } /* Mach-o File with Endian set to Big Endian or Little Endian */ @@ -344,11 +334,6 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) header.macho.filetype = RtlUlongByteSwap( header.macho.filetype ); header.macho.cputype = RtlUlongByteSwap( header.macho.cputype ); } - switch(header.macho.filetype) - { - case 2: info->type = BINARY_UNIX_EXE; break; - case 8: info->type = BINARY_UNIX_LIB; break; - } switch(header.macho.cputype) { case 0x00000007: info->pe.machine = IMAGE_FILE_MACHINE_I386; break; @@ -357,7 +342,13 @@ static void get_binary_info( HANDLE hfile, struct binary_info *info ) case 0x0100000c: info->pe.machine = IMAGE_FILE_MACHINE_ARM64; break; case 0x00000012: info->pe.machine = IMAGE_FILE_MACHINE_POWERPC; break; } + switch(header.macho.filetype) + { + case 2: return BINARY_UNIX_EXE; + case 8: return BINARY_UNIX_LIB; + } } + return BINARY_UNKNOWN; } @@ -452,7 +443,7 @@ static HANDLE open_exe_file( const WCHAR *name, struct binary_info *binary_info if (contains_path( name ) && get_builtin_path( name, NULL, buffer, sizeof(buffer), binary_info )) handle = 0; } - else get_binary_info( handle, binary_info ); + else binary_info->type = get_binary_info( handle, binary_info ); return handle; } @@ -477,7 +468,7 @@ static BOOL find_exe_file( const WCHAR *name, WCHAR *buffer, int buflen, if ((*handle = CreateFileW( buffer, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0 )) != INVALID_HANDLE_VALUE) { - get_binary_info( *handle, binary_info ); + binary_info->type = get_binary_info( *handle, binary_info ); return TRUE; } return FALSE;

1 0

Alexandre Julliard : kernel32: Get rid of the binary_info structure.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: ec13f6ec2ac84f32cc572148d542e92a57f47008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec13f6ec2ac84f32cc572148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 14:54:01 2018 +0200 kernel32: Get rid of the binary_info structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 205 +++++++++++++++++++++++------------------------- 1 file changed, 98 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec13f6ec2ac84f32cc57…

1 0

Francois Gouget : winebus.sys: Add a trailing '\n' to a TRACE().
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 90de9129cc5f3458ddb88d8d1a09c415c896a66d URL: https://source.winehq.org/git/wine.git/?a=commit;h=90de9129cc5f3458ddb88d8d… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 09:24:35 2018 +0200 winebus.sys: Add a trailing '\n' to a TRACE(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6b1949c..cee0ae6 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -391,7 +391,7 @@ static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); - TRACE("IRP_MN_QUERY_DEVICE_RELATIONS"); + TRACE("IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch (irpsp->Parameters.QueryDeviceRelations.Type) { case EjectionRelations:

1 0

Piotr Caban : ole32: Add IDataObject_GetData tests on synthesized format.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: b8c7b3310667c32735e449eb8111d15244e01d58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8c7b3310667c32735e449eb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 14:52:31 2018 +0200 ole32: Add IDataObject_GetData tests on synthesized format. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 82 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 7aeaa20..ee8bbe9 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -59,6 +59,7 @@ typedef struct DataObjectImpl { HANDLE text; IStream *stm; IStorage *stg; + HMETAFILEPICT hmfp; } DataObjectImpl; typedef struct EnumFormatImpl { @@ -80,6 +81,26 @@ static UINT cf_stream, cf_storage, cf_global, cf_another, cf_onemore; static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT size, LPENUMFORMATETC *lplpformatetc); +static HMETAFILE create_mf(void) +{ + RECT rect = {0, 0, 100, 100}; + HDC hdc = CreateMetaFileA(NULL); + ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); + return CloseMetaFile(hdc); +} + +static HMETAFILEPICT create_metafilepict(void) +{ + HGLOBAL ret = GlobalAlloc(GMEM_MOVEABLE, sizeof(METAFILEPICT)); + METAFILEPICT *mf = GlobalLock(ret); + mf->mm = MM_ANISOTROPIC; + mf->xExt = 100; + mf->yExt = 200; + mf->hMF = create_mf(); + GlobalUnlock(ret); + return ret; +} + static inline DataObjectImpl *impl_from_IDataObject(IDataObject *iface) { return CONTAINING_RECORD(iface, DataObjectImpl, IDataObject_iface); @@ -230,6 +251,12 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) HeapFree(GetProcessHeap(), 0, This->fmtetc); if(This->stm) IStream_Release(This->stm); if(This->stg) IStorage_Release(This->stg); + if(This->hmfp) { + METAFILEPICT *mfp = GlobalLock(This->hmfp); + DeleteMetaFile(mfp->hMF); + GlobalUnlock(This->hmfp); + GlobalFree(This->hmfp); + } HeapFree(GetProcessHeap(), 0, This); } @@ -280,6 +307,11 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor IStorage_AddRef(This->stg); U(*pmedium).pstg = This->stg; } + else if(pformatetc->cfFormat == CF_METAFILEPICT) + { + pmedium->tymed = TYMED_MFPICT; + U(*pmedium).hMetaFilePict = This->hmfp; + } return S_OK; } } @@ -394,6 +426,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) GlobalUnlock(obj->text); obj->stm = NULL; obj->stg = NULL; + obj->hmfp = NULL; obj->fmtetc_cnt = 1; obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); @@ -426,7 +459,9 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) StgCreateDocfileOnILockBytes(lbs, STGM_CREATE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &obj->stg); ILockBytes_Release(lbs); - obj->fmtetc_cnt = 8; + obj->hmfp = create_metafilepict(); + + obj->fmtetc_cnt = 9; /* zeroing here since FORMATETC has a hole in it, and it's confusing to have this uninitialised. */ obj->fmtetc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); @@ -454,6 +489,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) InitFormatEtc(obj->fmtetc[6], cf_another, 0xfffff); InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); obj->fmtetc[7].dwAspect = DVASPECT_ICON; + InitFormatEtc(obj->fmtetc[8], CF_METAFILEPICT, TYMED_MFPICT); *lplpdataobj = &obj->IDataObject_iface; return S_OK; @@ -825,6 +861,44 @@ static void test_cf_dataobject(IDataObject *data) ok(found_priv_data, "didn't find cf_ole_priv_data\n"); } +static void test_complex_get_clipboard(void) +{ + HRESULT hr; + IDataObject *data_obj; + FORMATETC fmtetc; + STGMEDIUM stgmedium; + + hr = OleGetClipboard(&data_obj); + ok(hr == S_OK, "OleGetClipboard failed with error 0x%08x\n", hr); + + DataObjectImpl_GetData_calls = 0; + + InitFormatEtc(fmtetc, CF_METAFILEPICT, TYMED_MFPICT); + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_METAFILEPICT, TYMED_HGLOBAL); + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_ENHMETAFILE, TYMED_HGLOBAL); + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); + + InitFormatEtc(fmtetc, CF_ENHMETAFILE, TYMED_ENHMF); + hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); + todo_wine ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); + + todo_wine ok(DataObjectImpl_GetData_calls == 5, + "DataObjectImpl_GetData called 5 times instead of %d times\n", + DataObjectImpl_GetData_calls); + IDataObject_Release(data_obj); +} + static void test_set_clipboard(void) { HRESULT hr; @@ -932,6 +1006,7 @@ static void test_set_clipboard(void) trace("setting complex\n"); hr = OleSetClipboard(data_cmpl); ok(hr == S_OK, "failed to set clipboard to complex data, hr = 0x%08x\n", hr); + test_complex_get_clipboard(); test_cf_dataobject(data_cmpl); test_enum_fmtetc(data_cmpl); @@ -1346,6 +1421,11 @@ static void test_flushed_getdata(void) HeapFree(GetProcessHeap(), 0, fmt.ptd); } + /* CF_ENHMETAFILE format */ + InitFormatEtc(fmt, CF_ENHMETAFILE, TYMED_ENHMF); + hr = IDataObject_GetData(get, &fmt, &med); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) ReleaseStgMedium(&med); IDataObject_Release(get); IDataObject_Release(src);

1 0

Piotr Caban : ole32: Change DataObjectImpl_GetData return value to show more implementation problems.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 0196eee8a884f8293da250d1bfb418a69527ea2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0196eee8a884f8293da250d1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 14:52:35 2018 +0200 ole32: Change DataObjectImpl_GetData return value to show more implementation problems. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index ee8bbe9..dc3ce5a 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -267,7 +267,6 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor { DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; - BOOL foundFormat = FALSE; trace("getdata: %s\n", dump_fmtetc(pformatetc)); @@ -284,7 +283,6 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor { if(This->fmtetc[i].cfFormat == pformatetc->cfFormat) { - foundFormat = TRUE; if(This->fmtetc[i].tymed & pformatetc->tymed) { pmedium->pUnkForRelease = (LPUNKNOWN)iface; @@ -317,7 +315,7 @@ static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pfor } } - return foundFormat ? DV_E_TYMED : DV_E_FORMATETC; + return E_FAIL; } static HRESULT WINAPI DataObjectImpl_GetDataHere(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) @@ -588,12 +586,12 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_RIFF, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + todo_wine ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_FILE); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); + todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); ok(DataObjectImpl_GetData_calls == 6, "DataObjectImpl_GetData should have been called 6 times instead of %d times\n", DataObjectImpl_GetData_calls); @@ -880,7 +878,7 @@ static void test_complex_get_clipboard(void) InitFormatEtc(fmtetc, CF_METAFILEPICT, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); + todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_ENHMETAFILE, TYMED_HGLOBAL);

1 0

Piotr Caban : ole32: Improve OleClipboardData GetData implementation.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 01c6002a490d986b6959f2f62aeef488877dd48b URL: https://source.winehq.org/git/wine.git/?a=commit;h=01c6002a490d986b6959f2f6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 26 14:52:39 2018 +0200 ole32: Improve OleClipboardData GetData implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 47 +++++++++++++++++++++++++++++++++++--------- dlls/ole32/tests/clipboard.c | 14 ++++++------- 2 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index cb005d3..7ee611f 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1296,6 +1296,14 @@ static HRESULT get_stgmed_for_storage(HGLOBAL h, STGMEDIUM *med) return hr; } + hr = StgIsStorageILockBytes(lbs); + if(hr!=S_OK) + { + ILockBytes_Release(lbs); + GlobalFree(dst); + return SUCCEEDED(hr) ? E_FAIL : hr; + } + hr = StgOpenStorageOnILockBytes(lbs, NULL, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, NULL, 0, &med->u.pstg); ILockBytes_Release(lbs); if(FAILED(hr)) @@ -1402,12 +1410,19 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, if(This->data) { hr = IDataObject_GetData(This->data, fmt, med); - CloseClipboard(); - return hr; + if(SUCCEEDED(hr)) + { + CloseClipboard(); + return hr; + } + } + if(fmt->lindex != -1) + { + hr = DV_E_FORMATETC; + goto end; } - h = GetClipboardData(fmt->cfFormat); - if(!h) + if(!IsClipboardFormatAvailable(fmt->cfFormat)) { hr = DV_E_FORMATETC; goto end; @@ -1425,17 +1440,31 @@ static HRESULT WINAPI snapshot_GetData(IDataObject *iface, FORMATETC *fmt, goto end; } mask = fmt->tymed & entry->fmtetc.tymed; - if(!mask) mask = fmt->tymed & (TYMED_ISTREAM | TYMED_HGLOBAL); + if(!mask && (entry->fmtetc.tymed & (TYMED_ISTREAM | TYMED_HGLOBAL | TYMED_ISTORAGE))) + mask = fmt->tymed & (TYMED_ISTREAM | TYMED_HGLOBAL | TYMED_ISTORAGE); } else /* non-Ole format */ - mask = fmt->tymed & TYMED_HGLOBAL; + mask = fmt->tymed & get_tymed_from_nonole_cf(fmt->cfFormat); - if(mask & TYMED_ISTORAGE) - hr = get_stgmed_for_storage(h, med); - else if(mask & TYMED_HGLOBAL) + if(!mask) + { + hr = DV_E_TYMED; + goto end; + } + + h = GetClipboardData(fmt->cfFormat); + if(!h) + { + hr = DV_E_FORMATETC; + goto end; + } + + if(mask & TYMED_HGLOBAL) hr = get_stgmed_for_global(h, med); else if(mask & TYMED_ISTREAM) hr = get_stgmed_for_stream(h, med); + else if(mask & TYMED_ISTORAGE) + hr = get_stgmed_for_storage(h, med); else if(mask & TYMED_ENHMF) hr = get_stgmed_for_emf((HENHMETAFILE)h, med); else if(mask & TYMED_GDI) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index dc3ce5a..f5ad98e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -586,12 +586,12 @@ static void test_get_clipboard(void) InitFormatEtc(fmtetc, CF_RIFF, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); + ok(hr == DV_E_FORMATETC, "IDataObject_GetData should have failed with DV_E_FORMATETC instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_TEXT, TYMED_FILE); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); + ok(hr == DV_E_TYMED, "IDataObject_GetData should have failed with DV_E_TYMED instead of 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); ok(DataObjectImpl_GetData_calls == 6, "DataObjectImpl_GetData should have been called 6 times instead of %d times\n", DataObjectImpl_GetData_calls); @@ -878,20 +878,20 @@ static void test_complex_get_clipboard(void) InitFormatEtc(fmtetc, CF_METAFILEPICT, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); + ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_ENHMETAFILE, TYMED_HGLOBAL); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); + ok(hr == DV_E_TYMED, "IDataObject_GetData failed with error 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); InitFormatEtc(fmtetc, CF_ENHMETAFILE, TYMED_ENHMF); hr = IDataObject_GetData(data_obj, &fmtetc, &stgmedium); - todo_wine ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); + ok(hr == S_OK, "IDataObject_GetData failed with error 0x%08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&stgmedium); - todo_wine ok(DataObjectImpl_GetData_calls == 5, + ok(DataObjectImpl_GetData_calls == 5, "DataObjectImpl_GetData called 5 times instead of %d times\n", DataObjectImpl_GetData_calls); IDataObject_Release(data_obj); @@ -1422,7 +1422,7 @@ static void test_flushed_getdata(void) /* CF_ENHMETAFILE format */ InitFormatEtc(fmt, CF_ENHMETAFILE, TYMED_ENHMF); hr = IDataObject_GetData(get, &fmt, &med); - todo_wine ok(hr == S_OK, "got %08x\n", hr); + ok(hr == S_OK, "got %08x\n", hr); if(SUCCEEDED(hr)) ReleaseStgMedium(&med); IDataObject_Release(get);

1 0

Zebediah Figura : strmbase: Fix implementation of IEnumPins_Skip().
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: 0e29ac058118abe33ea7f18a5b1369df75404a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e29ac058118abe33ea7f18a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Sep 26 23:36:23 2018 -0500 strmbase: Fix implementation of IEnumPins_Skip(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 55fa7ec..abfaf69 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -162,19 +162,19 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) +static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) { - IEnumPinsImpl *This = impl_from_IEnumPins(iface); + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - TRACE("(%p)->(%u)\n", iface, cPins); + TRACE("enum_pins %p, count %u.\n", enum_pins, count); - if (This->Version != This->receive_version(This->base)) + if (enum_pins->Version != enum_pins->receive_version(enum_pins->base)) return VFW_E_ENUM_OUT_OF_SYNC; - if (This->receive_pincount(This->base) >= This->uIndex + cPins) + if (enum_pins->uIndex + count > enum_pins->receive_pincount(enum_pins->base)) return S_FALSE; - This->uIndex += cPins; + enum_pins->uIndex += count; return S_OK; }

1 0

Gabriel Ivăncescu : shell32/autocomplete: Use the same font for the AutoComplete listbox as the edit control.
by Alexandre Julliard Sept. 27, 2018

Sept. 27, 2018

Module: wine Branch: master Commit: d8de5fe47dbbd2bd542f5b2cbdd0230a94bff286 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8de5fe47dbbd2bd542f5b2c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Sep 27 00:35:21 2018 +0300 shell32/autocomplete: Use the same font for the AutoComplete listbox as the edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index fe5bba2..9acd3f4 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -384,6 +384,10 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, ret = CallWindowProcW(This->wpOrigEditProc, hwnd, uMsg, wParam, lParam); autocomplete_text(This, hwnd, autoappend_flag_yes); return ret; + case WM_SETFONT: + if (This->hwndListBox) + SendMessageW(This->hwndListBox, WM_SETFONT, wParam, lParam); + break; case WM_DESTROY: { WNDPROC proc = This->wpOrigEditProc; @@ -434,9 +438,16 @@ static void create_listbox(IAutoCompleteImpl *This) 0, 0, 0, 0, GetParent(This->hwndEdit), NULL, shell32_hInstance, NULL); if (This->hwndListBox) { + HFONT edit_font; + This->wpOrigLBoxProc = (WNDPROC) SetWindowLongPtrW( This->hwndListBox, GWLP_WNDPROC, (LONG_PTR) ACLBoxSubclassProc); SetWindowLongPtrW( This->hwndListBox, GWLP_USERDATA, (LONG_PTR)This); SetParent(This->hwndListBox, HWND_DESKTOP); + + /* Use the same font as the edit control, as it gets destroyed before it anyway */ + edit_font = (HFONT)SendMessageW(This->hwndEdit, WM_GETFONT, 0, 0); + if (edit_font) + SendMessageW(This->hwndListBox, WM_SETFONT, (WPARAM)edit_font, FALSE); } else This->options &= ~ACO_AUTOSUGGEST;

1 0