April 2017 - Wine-Commits - list.winehq.org

Jacek Caban : ntdll: Use callback stored in async user for calling APC_ASYNC_IO.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 05410c4aa6f4d0c710e3d82eb41bfdad825c4b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05410c4aa6f4d0c710e3d82eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:20:51 2017 +0200 ntdll: Use callback stored in async user for calling APC_ASYNC_IO. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index ac3183b..ed77aa5 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -406,10 +406,9 @@ static BOOL invoke_apc( const apc_call_t *call, apc_result_t *result ) { void *apc = NULL, *arg = NULL; IO_STATUS_BLOCK *iosb = wine_server_get_ptr( call->async_io.sb ); - NTSTATUS (*func)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.func ); + NTSTATUS (**user)(void *, IO_STATUS_BLOCK *, NTSTATUS, void **, void **) = wine_server_get_ptr( call->async_io.user ); result->type = call->type; - result->async_io.status = func( wine_server_get_ptr( call->async_io.user ), - iosb, call->async_io.status, &apc, &arg ); + result->async_io.status = (*user)( user, iosb, call->async_io.status, &apc, &arg ); if (result->async_io.status != STATUS_PENDING) { result->async_io.total = iosb->Information;

1 0

Józef Kucia : wined3d: Fix atomics for raw thread group shared memory.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 08b8c5b2074664ef1b9c7b976e2d0d21f36379f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08b8c5b2074664ef1b9c7b976… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:36 2017 +0200 wined3d: Fix atomics for raw thread group shared memory. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c5017cb..a4221e0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5405,7 +5405,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) { shader_glsl_add_src_param(ins, &ins->src[0], coord_mask, &offset); string_buffer_sprintf(address, "%s", offset.param_str); - if (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW) + if (is_tgsm || (reg_maps->uav_resource_info[resource_idx].flags & WINED3D_VIEW_BUFFER_RAW)) shader_addline(address, "/ 4"); }

1 0

Józef Kucia : wined3d: Add ARB_texture_gather extension.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: ec5cb71bd908839f19c4716e13ab442f4b847050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5cb71bd908839f19c4716e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 11 13:30:30 2017 +0200 wined3d: Add ARB_texture_gather extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f434157..0aaa35e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -172,6 +172,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_env_combine", ARB_TEXTURE_ENV_COMBINE }, {"GL_ARB_texture_env_dot3", ARB_TEXTURE_ENV_DOT3 }, {"GL_ARB_texture_float", ARB_TEXTURE_FLOAT }, + {"GL_ARB_texture_gather", ARB_TEXTURE_GATHER }, {"GL_ARB_texture_mirrored_repeat", ARB_TEXTURE_MIRRORED_REPEAT }, {"GL_ARB_texture_mirror_clamp_to_edge", ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE}, {"GL_ARB_texture_non_power_of_two", ARB_TEXTURE_NON_POWER_OF_TWO }, @@ -3828,6 +3829,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_GPU_SHADER5, MAKEDWORD_VERSION(4, 0)}, {ARB_TEXTURE_CUBE_MAP_ARRAY, MAKEDWORD_VERSION(4, 0)}, + {ARB_TEXTURE_GATHER, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK2, MAKEDWORD_VERSION(4, 0)}, {ARB_TRANSFORM_FEEDBACK3, MAKEDWORD_VERSION(4, 0)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1130b20..348de8f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9788,7 +9788,7 @@ static void shader_glsl_init_context_state(struct wined3d_context *context) static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) { - UINT shader_model; + unsigned int shader_model; /* FIXME: Check for the specific extensions required for SM5 support * (ARB_compute_shader, ARB_tessellation_shader, ARB_gpu_shader5, ...) as @@ -9802,6 +9802,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] && gl_info->supported[ARB_SHADER_IMAGE_SIZE] && gl_info->supported[ARB_SHADING_LANGUAGE_PACKING] + && gl_info->supported[ARB_TEXTURE_GATHER] && gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4960fc7..2d1c606 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -105,6 +105,7 @@ enum wined3d_gl_extension ARB_TEXTURE_ENV_COMBINE, ARB_TEXTURE_ENV_DOT3, ARB_TEXTURE_FLOAT, + ARB_TEXTURE_GATHER, ARB_TEXTURE_MIRRORED_REPEAT, ARB_TEXTURE_MIRROR_CLAMP_TO_EDGE, ARB_TEXTURE_NON_POWER_OF_TWO,

1 0

Jacek Caban : ntdll: Store async callback in async_fileio struct.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: b82782a9c1a6413512d0fa3016cdcc236f92a0ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82782a9c1a6413512d0fa301… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 10 13:20:38 2017 +0200 ntdll: Store async callback in async_fileio struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c153e7b..d97c4dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -346,8 +346,11 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIB * Asynchronous file I/O * */ +typedef NTSTATUS async_callback_t( void *user, IO_STATUS_BLOCK *io, NTSTATUS status, void **apc, void **arg ); + struct async_fileio { + async_callback_t *callback; /* must be the first field */ struct async_fileio *next; HANDLE handle; PIO_APC_ROUTINE apc; @@ -391,7 +394,8 @@ static void release_fileio( struct async_fileio *io ) } } -static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROUTINE apc, void *arg ) +static struct async_fileio *alloc_fileio( DWORD size, async_callback_t callback, HANDLE handle, + PIO_APC_ROUTINE apc, void *arg ) { /* first free remaining previous fileinfos */ @@ -406,9 +410,10 @@ static struct async_fileio *alloc_fileio( DWORD size, HANDLE handle, PIO_APC_ROU if ((io = RtlAllocateHeap( GetProcessHeap(), 0, size ))) { - io->handle = handle; - io->apc = apc; - io->apc_arg = arg; + io->callback = callback; + io->handle = handle; + io->apc = apc; + io->apc_arg = arg; } return io; } @@ -558,7 +563,7 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; @@ -605,7 +610,7 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; @@ -783,7 +788,7 @@ static NTSTATUS register_async_file_read( HANDLE handle, HANDLE event, struct async_fileio_read *fileio; NTSTATUS status; - if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), handle, apc, apc_user ))) + if (!(fileio = (struct async_fileio_read *)alloc_fileio( sizeof(*fileio), FILE_AsyncReadService, handle, apc, apc_user ))) return STATUS_NO_MEMORY; fileio->already = already; @@ -1345,7 +1350,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, { struct async_fileio_write *fileio; - fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), hFile, apc, apc_user ); + fileio = (struct async_fileio_write *)alloc_fileio( sizeof(*fileio), FILE_AsyncWriteService, hFile, apc, apc_user ); if (!fileio) { status = STATUS_NO_MEMORY; @@ -1539,7 +1544,7 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, ULONG options; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_context; - if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), handle, apc, apc_context ))) + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle, apc, apc_context ))) return STATUS_NO_MEMORY; async->event = event; async->buffer = out_buffer; @@ -1961,7 +1966,7 @@ NTSTATUS WINAPI NtNotifyChangeDirectoryFile( HANDLE handle, HANDLE event, PIO_AP if (filter == 0 || (filter & ~FILE_NOTIFY_ALL)) return STATUS_INVALID_PARAMETER; fileio = (struct read_changes_fileio *)alloc_fileio( offsetof(struct read_changes_fileio, data[size]), - handle, apc, apc_context ); + read_changes_apc, handle, apc, apc_context ); if (!fileio) return STATUS_NO_MEMORY; fileio->buffer = buffer;

1 0

Alistair Leslie-Hughes : include: Add interfaces IWMHeaderInfo/2/3.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: fbe53db498f256b9001cbee0b21a94b28a58123a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbe53db498f256b9001cbee0b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 30 22:06:53 2017 +0000 include: Add interfaces IWMHeaderInfo/2/3. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 158 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 0606be1..5ce849f 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -183,6 +183,13 @@ typedef enum tagWMT_OFFSET_FORMAT WMT_OFFSET_FORMAT_100NS_APPROXIMATE } WMT_OFFSET_FORMAT; +typedef enum WMT_CODEC_INFO_TYPE +{ + WMT_CODECINFO_AUDIO = 0, + WMT_CODECINFO_VIDEO = 1, + WMT_CODECINFO_UNKNOWN = 0xFFFFFFFF, +} WMT_CODEC_INFO_TYPE; + typedef LPCWSTR LPCWSTR_WMSDK_TYPE_SAFE; [ @@ -1016,6 +1023,157 @@ interface IWMWriterAdvanced3 : IWMWriterAdvanced2 HRESULT SetNonBlocking(); } +[ + object, + uuid(96406bda-2b2b-11d3-b36b-00c04f6108ff), + pointer_default(unique), + local +] +interface IWMHeaderInfo : IUnknown +{ + HRESULT GetAttributeCount( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeByIndex( + [in] WORD index, + [in, out] WORD *stream_num, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT GetAttributeByName( + [in, out] WORD *stream_num, + [in] LPCWSTR name, + [out] WMT_ATTR_DATATYPE *type, + [out, size_is( *length )] BYTE *value, + [in, out] WORD *length ); + + HRESULT SetAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WMT_ATTR_DATATYPE type, + [in, size_is( length )] const BYTE *value, + [in] WORD length ); + + HRESULT GetMarkerCount( + [out] WORD *markers ); + + HRESULT GetMarker( + [in] WORD index, + [out, size_is( *marker_len )] WCHAR *marker_name, + [in, out] WORD *marker_len, + [out] QWORD *marker_time ); + + HRESULT AddMarker( + [in] LPCWSTR_WMSDK_TYPE_SAFE marker_name, + [in] QWORD marker_time ); + + HRESULT RemoveMarker( + [in] WORD index ); + + HRESULT GetScriptCount( + [out] WORD *scripts ); + + HRESULT GetScript( + [in] WORD index, + [out, size_is( *type_len )] WCHAR *type, + [in, out] WORD *type_len, + [out, size_is( *command_len )] WCHAR *command, + [in, out] WORD *command_len, + [out] QWORD *script_time ); + + HRESULT AddScript( + [in] LPCWSTR_WMSDK_TYPE_SAFE type, + [in] LPCWSTR_WMSDK_TYPE_SAFE command, + [in] QWORD script_time ); + + HRESULT RemoveScript( + [in] WORD index ); +}; + +[ + object, + uuid(15cf9781-454e-482e-b393-85fae487a810), + pointer_default(unique), + local +] +interface IWMHeaderInfo2 : IWMHeaderInfo +{ + HRESULT GetCodecInfoCount( + [out] DWORD *codec_infos ); + + HRESULT GetCodecInfo( + [in] DWORD index, + [in, out] WORD *name_len, + [out, size_is( *name_len )] WCHAR *name, + [in, out] WORD *description_len, + [out, size_is( *description_len )] WCHAR *description, + [out] WMT_CODEC_INFO_TYPE *codec_type, + [in, out] WORD *codec_info_cnt, + [out, size_is( *codec_info_cnt )] BYTE *codec_info ); +}; + +[ + object, + uuid(15cc68e3-27cc-4ecd-b222-3f5d02d80bd5), + pointer_default(unique), + local +] +interface IWMHeaderInfo3 : IWMHeaderInfo2 +{ + HRESULT GetAttributeCountEx( + [in] WORD stream_num, + [out] WORD *attributes ); + + HRESULT GetAttributeIndices( + [in] WORD stream_num, + [in] LPCWSTR name, + [in] WORD *lang_index, + [out, size_is( *count )] WORD *indices, + [in, out] WORD *count ); + + HRESULT GetAttributeByIndexEx( + [in] WORD stream_num, + [in] WORD index, + [out, size_is( *name_len )] LPWSTR name, + [in, out] WORD *name_len, + [out] WMT_ATTR_DATATYPE *type, + [out] WORD *lang_index, + [out, size_is( *data_len )] BYTE *value, + [in, out] DWORD *data_len ); + + HRESULT ModifyAttribute( + [in] WORD stream_num, + [in] WORD index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT AddAttribute( + [in] WORD stream_num, + [in] LPCWSTR name, + [out] WORD *index, + [in] WMT_ATTR_DATATYPE type, + [in] WORD lang_index, + [in, size_is( length )] const BYTE *value, + [in] DWORD length ); + + HRESULT DeleteAttribute( + [in] WORD stream_num, + [in] WORD index ); + + HRESULT AddCodecInfo( + [in] LPCWSTR_WMSDK_TYPE_SAFE name, + [in] LPCWSTR_WMSDK_TYPE_SAFE description, + [in] WMT_CODEC_INFO_TYPE codec_type, + [in] WORD codec_info_cnt, + [in, size_is( codec_info_cnt )] BYTE *codec_info ); +}; + cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") cpp_quote("HRESULT WINAPI WMCreateReader(IUnknown*,DWORD,IWMReader**);")

1 0

Huw Davies : include: Add {Is,Set}ProcessDPIAware().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 9b9316cfb270856146c5c535ee919836a593be89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b9316cfb270856146c5c535e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 11 14:08:50 2017 +0100 include: Add {Is,Set}ProcessDPIAware(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 2b8331c..25fc207 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3282,6 +3282,8 @@ typedef struct tagCHANGEFILTERSTRUCT #define MSGFLT_ALLOW 1 #define MSGFLT_DISALLOW 2 +#define USER_DEFAULT_SCREEN_DPI 96 + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); @@ -3772,6 +3774,7 @@ WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); +WINUSERAPI BOOL WINAPI IsProcessDPIAware(void); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); @@ -3976,9 +3979,10 @@ WINUSERAPI BOOL WINAPI SetMenuItemInfoW(HMENU,UINT,BOOL,const MENUITEMINF #define SetMenuItemInfo WINELIB_NAME_AW(SetMenuItemInfo) WINUSERAPI LPARAM WINAPI SetMessageExtraInfo(LPARAM); WINUSERAPI BOOL WINAPI SetMessageQueue(INT); +WINUSERAPI HWND WINAPI SetParent(HWND,HWND); +WINUSERAPI BOOL WINAPI SetProcessDPIAware(void); WINUSERAPI BOOL WINAPI SetProcessDefaultLayout(DWORD); WINUSERAPI BOOL WINAPI SetProcessWindowStation(HWINSTA); -WINUSERAPI HWND WINAPI SetParent(HWND,HWND); WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE); #define SetProp WINELIB_NAME_AW(SetProp)

1 0

Hugh McMaster : regedit/tests: Add tests for importing DWORD values.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 098be09bcec750eb653fd33452be42194d783245 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098be09bcec750eb653fd3345… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Apr 11 13:11:32 2017 +0000 regedit/tests: Add tests for importing DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 56 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bbe5c4b..d15c477 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -280,6 +280,15 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine8a\"=dword:1\n" + "\"Wine8b\"=dword:4444\n\n"); + dword = 0x1; + verify_reg(hkey, "Wine8a", REG_DWORD, &dword, sizeof(dword), 0); + dword = 0x4444; + verify_reg(hkey, "Wine8b", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n"); verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); @@ -496,6 +505,33 @@ static void test_invalid_import(void) " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test12a\"=dword:\n" + "\"Test12b\"=dword:hello\n" + "\"Test12c\"=dword:123456789\n" + "\"Test12d\"=dword:012345678\n\n"); + verify_reg_nonexist(hkey, "Test12a"); + verify_reg_nonexist(hkey, "Test12b"); + verify_reg_nonexist(hkey, "Test12c"); + verify_reg_nonexist(hkey, "Test12d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test13a\"=dword:12345678abc\n" + "\"Test13b\"=dword:12345678 abc\n\n"); + verify_reg_nonexist(hkey, "Test13a"); + verify_reg_nonexist(hkey, "Test13b"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Test14a\"=dword:0x123\n" + "\"Test14b\"=dword:123 456\n" + "\"Test14c\"=dword:1234 5678\n\n"); + todo_wine verify_reg_nonexist(hkey, "Test14a"); + verify_reg_nonexist(hkey, "Test14b"); + verify_reg_nonexist(hkey, "Test14c"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -596,6 +632,18 @@ static void test_comments(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine25a\"=dword:1234;5678\n" + "\"Wine25b\"=dword:1234 ;5678\n" + "\"Wine25c\"=dword:1234#5678\n" + "\"Wine25d\"=dword:1234 #5678\n\n"); + dword = 0x1234; + todo_wine verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine25c"); + verify_reg_nonexist(hkey, "Wine25d"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n" " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n" @@ -747,6 +795,14 @@ static void test_import_with_whitespace(void) verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine9a\"=dword: 00000008\n" + "\"Wine9b\"=dword:\t\t00000008\n\n"); + dword = 0x00000008; + todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);

1 0

Nikolay Sivov : xmllite/writer: Fix IID argument handling in CreateXmlWriter().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: 707ab559e529ac7e3370146fc48b08ec381b628f URL: http://source.winehq.org/git/wine.git/?a=commit;h=707ab559e529ac7e3370146fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:28:41 2017 +0300 xmllite/writer: Fix IID argument handling in CreateXmlWriter(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 12 ++++++++++++ dlls/xmllite/writer.c | 24 +++++++++++++----------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 62ab871..89fdb4e 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -237,6 +237,7 @@ static void test_writer_create(void) HRESULT hr; IXmlWriter *writer; LONG_PTR value; + IUnknown *unk; /* crashes native */ if (0) @@ -245,6 +246,17 @@ static void test_writer_create(void) CreateXmlWriter(NULL, (void**)&writer, NULL); } + hr = CreateXmlWriter(&IID_IStream, (void **)&unk, NULL); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = CreateXmlWriter(&IID_IUnknown, (void **)&unk, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IXmlWriter, (void **)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(unk == (IUnknown *)writer, "unexpected interface pointer\n"); + IUnknown_Release(unk); + IXmlWriter_Release(writer); + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a841614..b0e16c0 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -458,11 +458,17 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); - if (IsEqualGUID(riid, &IID_IUnknown) || - IsEqualGUID(riid, &IID_IXmlWriter)) + if (IsEqualGUID(riid, &IID_IXmlWriter) || + IsEqualGUID(riid, &IID_IUnknown)) { *ppvObject = iface; } + else + { + FIXME("interface %s is not supported\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; + } IXmlWriter_AddRef(iface); @@ -1393,15 +1399,10 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl = HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) { xmlwriter *writer; + HRESULT hr; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (!IsEqualGUID(riid, &IID_IXmlWriter)) - { - ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); - return E_FAIL; - } - if (imalloc) writer = IMalloc_Alloc(imalloc, sizeof(*writer)); else @@ -1423,11 +1424,12 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) writer->starttagopen = FALSE; list_init(&writer->elements); - *obj = &writer->IXmlWriter_iface; + hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); + IXmlWriter_Release(&writer->IXmlWriter_iface); - TRACE("returning iface %p\n", *obj); + TRACE("returning iface %p, hr %#x\n", *obj, hr); - return S_OK; + return hr; } static HRESULT create_writer_output(IUnknown *stream, IMalloc *imalloc, xml_encoding encoding,

1 0

Nikolay Sivov : xmllite/reader: Fix IID argument handling in CreateXmlReader().
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: d1e14576bb746ce898782920712da8bf903d852c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1e14576bb746ce8987829207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:28:40 2017 +0300 xmllite/reader: Fix IID argument handling in CreateXmlReader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 14 +++++--------- dlls/xmllite/tests/reader.c | 19 +++++++++++++++++-- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 6056418..7f127f6 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3603,16 +3603,11 @@ static const struct IUnknownVtbl xmlreaderinputvtbl = HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) { xmlreader *reader; + HRESULT hr; int i; TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); - if (!IsEqualGUID(riid, &IID_IXmlReader)) - { - ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid)); - return E_FAIL; - } - if (imalloc) reader = IMalloc_Alloc(imalloc, sizeof(*reader)); else @@ -3640,11 +3635,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; - *obj = &reader->IXmlReader_iface; + hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); + IXmlReader_Release(&reader->IXmlReader_iface); - TRACE("returning iface %p\n", *obj); + TRACE("returning iface %p, hr %#x\n", *obj, hr); - return S_OK; + return hr; } HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 72c1fb7..9cdc7a7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -536,11 +536,11 @@ static IXmlResolver testresolver = { &resolvervtbl }; static void test_reader_create(void) { IXmlResolver *resolver; - HRESULT hr; + IUnknown *input, *unk; IXmlReader *reader; - IUnknown *input; DtdProcessing dtd; XmlNodeType nodetype; + HRESULT hr; /* crashes native */ if (0) @@ -549,6 +549,21 @@ static void test_reader_create(void) CreateXmlReader(NULL, (void**)&reader, NULL); } + hr = CreateXmlReader(&IID_IStream, (void **)&unk, NULL); + ok(hr == E_NOINTERFACE, "got %08x\n", hr); + + hr = CreateXmlReader(&IID_IUnknown, (void **)&unk, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IXmlReader, (void **)&reader); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(unk == (IUnknown *)reader, "unexpected interface\n"); + IXmlReader_Release(reader); + IUnknown_Release(unk); + + hr = CreateXmlReader(&IID_IUnknown, (void **)&reader, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IXmlReader_Release(reader); + hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Nikolay Sivov : dwrite: Improve font objects refcounting.
by Alexandre Julliard April 11, 2017

April 11, 2017

Module: wine Branch: master Commit: be5a4656bd299f0b2d42623a8112bdb7eba61f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a4656bd299f0b2d42623a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 11 14:21:32 2017 +0300 dwrite: Improve font objects refcounting. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 15 +- dlls/dwrite/font.c | 186 +++++++++------- dlls/dwrite/gdiinterop.c | 40 +++- dlls/dwrite/main.c | 79 ++++--- dlls/dwrite/tests/font.c | 512 ++++++++++++++++++++++++++++++++++++------- 5 files changed, 617 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=be5a4656bd299f0b2d426…

1 0