March 2019 - Wine-Commits - list.winehq.org

Alexandre Julliard : wrc: Don' t map version block names to the target language.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 4b2d797d6ecfec9f9d85c2e96fb710181a490d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2d797d6ecfec9f9d85c2e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 15:45:56 2019 +0100 wrc: Don't map version block names to the target language. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/genres.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/wrc/genres.c b/tools/wrc/genres.c index 939d265..b01aced 100644 --- a/tools/wrc/genres.c +++ b/tools/wrc/genres.c @@ -1465,7 +1465,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang put_word(res, 0); if(win32) put_word(res, 0); /* level ? */ - put_string(res, blk->name, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, blk->name, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); for(val = blk->values; val; val = val->next) { @@ -1479,7 +1479,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); tag = res->size; put_string(res, val->value.str, win32 ? str_unicode : str_char, TRUE, lang); @@ -1500,7 +1500,7 @@ static void versionblock2res(res_t *res, ver_block_t *blk, int level, const lang { put_word(res, level); } - put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, lang); + put_string(res, val->key, win32 ? str_unicode : str_char, TRUE, NULL); put_pad(res); tag = res->size; for(i = 0; i < val->value.words->nwords; i++) @@ -1562,8 +1562,7 @@ static res_t *versioninfo2res(name_id_t *name, versioninfo_t *ver) put_word(res, 0); /* ValueSize filled in later*/ if(win32) put_word(res, 0); /* Tree-level ? */ - put_string(res, &vsvi, win32 ? str_unicode : str_char, - TRUE, win32 ? ver->lvc.language : NULL); + put_string(res, &vsvi, win32 ? str_unicode : str_char, TRUE, NULL); if(win32) put_pad(res); tag = res->size;

1 0

Vijay Kiran Kamuju : wmvcore: Add tests for WMCreateSyncReader.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 101710c7eb7dcf2368c165f3857b58ccb2fd371f URL: https://source.winehq.org/git/wine.git/?a=commit;h=101710c7eb7dcf2368c165f3… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 27 21:48:36 2019 +0100 wmvcore: Add tests for WMCreateSyncReader. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 87 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index af6d32a..ebeab3f 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -201,6 +202,91 @@ static void test_wmreader_interfaces(void) IWMReader_Release(reader); } +static void test_wmsyncreader_interfaces(void) +{ + HRESULT hr; + IWMSyncReader *reader; + IWMHeaderInfo *header; + IWMHeaderInfo2 *header2; + IWMHeaderInfo3 *header3; + IWMProfile *profile; + IWMProfile2 *profile2; + IWMProfile3 *profile3; + IWMPacketSize *packet; + IWMPacketSize2 *packet2; + IWMReaderTimecode *timecode; + IWMReaderPlaylistBurn *playlist; + IWMLanguageList *langlist; + + hr = WMCreateSyncReader( NULL, 0, &reader ); + todo_wine ok(hr == S_OK, "WMCreateSyncReader failed 0x%08x\n", hr); + if(FAILED(hr)) + { + skip("Failed to create IWMSyncReader\n"); + return; + } + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo, (void **)&header); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo2, (void **)&header2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMHeaderInfo3, (void **)&header3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile, (void **)&profile); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile2, (void **)&profile2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMProfile3, (void **)&profile3); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize, (void **)&packet); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMPacketSize2, (void **)&packet2); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderTimecode, (void **)&timecode); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMReaderPlaylistBurn, (void **)&playlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + hr = IWMSyncReader_QueryInterface(reader, &IID_IWMLanguageList, (void **)&langlist); + todo_wine ok(hr == S_OK, "Failed 0x%08x\n", hr); + + if(packet) + IWMPacketSize_Release(packet); + if(packet2) + IWMPacketSize2_Release(packet2); + if(profile) + IWMProfile_Release(profile); + if(profile2) + IWMProfile2_Release(profile2); + if(profile3) + IWMProfile3_Release(profile3); + if(header) + IWMHeaderInfo_Release(header); + if(header2) + IWMHeaderInfo2_Release(header2); + if(header3) + IWMHeaderInfo3_Release(header3); + if(timecode) + IWMReaderTimecode_Release(timecode); + if(playlist) + IWMReaderPlaylistBurn_Release(playlist); + if(langlist) + IWMLanguageList_Release(langlist); + + + IWMSyncReader_Release(reader); +} + + static void test_profile_manager_interfaces(void) { HRESULT hr; @@ -262,6 +348,7 @@ START_TEST(wmvcore) return; test_wmreader_interfaces(); + test_wmsyncreader_interfaces(); test_wmwriter_interfaces(); test_profile_manager_interfaces(); test_WMCreateWriterPriv();

1 0

Dmitry Timoshkov : wpcap: Fix compilation with recent pcap/ pcap.h versions.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 40c9b46500c3606e966d5404d45b68a48609b6ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c9b46500c3606e966d5404… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 28 20:37:47 2019 +0300 wpcap: Fix compilation with recent pcap/pcap.h versions. Recent libpcap versions have added inclusion of pcap/socket.h to pcap.h that includes sys/socket.h and other system .h files that lead to conflicts with winsock2.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index e7908cd..f163235 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -24,6 +24,7 @@ #undef SOCKET #undef INVALID_SOCKET +#define USE_WS_PREFIX #include "winsock2.h" #include "windef.h" #include "winbase.h"

1 0

Matteo Bruni : d3dx9: Get rid of the ID3DXEffectImpl #define.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: d18fb86134d40ccee8df84ce7ccc4e1bdcb2d481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18fb86134d40ccee8df84ce… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 28 19:14:39 2019 +0100 d3dx9: Get rid of the ID3DXEffectImpl #define. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 78aa1c0..bdc96e7 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -148,11 +148,9 @@ struct d3dx_technique struct IDirect3DStateBlock9 *saved_state; }; -#define ID3DXEffectImpl d3dx_effect - struct d3dx9_base_effect { - struct ID3DXEffectImpl *effect; + struct d3dx_effect *effect; UINT parameter_count; UINT technique_count; @@ -718,7 +716,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) } } -static void free_effect(struct ID3DXEffectImpl *effect) +static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); @@ -2841,7 +2839,7 @@ static void d3dx9_set_material_parameter(enum MATERIAL_TYPE op, D3DMATERIAL9 *ma } } -static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum SHADER_CONSTANT_TYPE op, UINT index, +static HRESULT d3dx_set_shader_const_state(struct d3dx_effect *effect, enum SHADER_CONSTANT_TYPE op, UINT index, struct d3dx_parameter *param, void *value_ptr) { static const struct @@ -2940,10 +2938,10 @@ static HRESULT d3dx_set_shader_const_state(struct ID3DXEffectImpl *effect, enum return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all); -static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx_set_shader_constants(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_parameter *param, BOOL vs, BOOL update_all) { HRESULT hr, ret; @@ -2989,7 +2987,7 @@ static HRESULT d3dx_set_shader_constants(struct ID3DXEffectImpl *effect, struct return ret; } -static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, +static HRESULT d3dx9_apply_state(struct d3dx_effect *effect, struct d3dx_pass *pass, struct d3dx_state *state, unsigned int parent_index, BOOL update_all) { struct d3dx_parameter *param; @@ -3125,7 +3123,7 @@ static HRESULT d3dx9_apply_state(struct ID3DXEffectImpl *effect, struct d3dx_pas return D3D_OK; } -static HRESULT d3dx9_apply_pass_states(struct ID3DXEffectImpl *effect, struct d3dx_pass *pass, BOOL update_all) +static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_pass *pass, BOOL update_all) { unsigned int i; HRESULT ret; @@ -6540,7 +6538,7 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectImpl *effect, struct d3dx_effect_pool *pool, + UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, const char *skip_constants_string) { DWORD tag, offset; @@ -6683,7 +6681,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, return D3D_OK; } -static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, struct IDirect3DDevice9 *device, +static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, UINT eflags, ID3DBlob **error_messages, struct ID3DXEffectPool *pool, const char *skip_constants) { @@ -6727,7 +6725,7 @@ HRESULT WINAPI D3DXCreateEffectEx(struct IDirect3DDevice9 *device, const void *s const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skip_constants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilation_errors) { - struct ID3DXEffectImpl *object; + struct d3dx_effect *object; HRESULT hr; TRACE("device %p, srcdata %p, srcdatalen %u, defines %p, include %p,"

1 0

Vijay Kiran Kamuju : include: Add missing WMT_RIGHTS enum definition.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 647ddb48214919c77964ef7a0e11efbf0ca19829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=647ddb48214919c77964ef7a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Feb 27 21:48:34 2019 +0100 include: Add missing WMT_RIGHTS enum definition. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/drmexternals.idl | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/drmexternals.idl b/include/drmexternals.idl index 88826ad..b890394 100644 --- a/include/drmexternals.idl +++ b/include/drmexternals.idl @@ -1,5 +1,6 @@ /* * Copyright 2017 Alistair Leslie-Hughes + * Copyright 2019 Vijay Kiran Kamuju * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,3 +18,16 @@ */ import "wmdrmsdk.idl"; + +typedef enum WMT_RIGHTS { + WMT_RIGHT_PLAYBACK = 0x00000001, + WMT_RIGHT_COPY_TO_NON_SDMI_DEVICE = 0x00000002, + WMT_RIGHT_COPY_TO_CD = 0x00000008, + WMT_RIGHT_COPY_TO_SDMI_DEVICE = 0x00000010, + WMT_RIGHT_ONE_TIME = 0x00000020, + WMT_RIGHT_SAVE_STREAM_PROTECTED = 0x00000040, + WMT_RIGHT_COPY = 0x00000080, + WMT_RIGHT_COLLABORATIVE_PLAY = 0x00000100, + WMT_RIGHT_SDMI_TRIGGER = 0x00010000, + WMT_RIGHT_SDMI_NOMORECOPIES = 0x00020000 +} WMT_RIGHTS;

1 0

Alexandre Julliard : winebuild: Make relay entry points hot-patchable.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 9d0ba368da20efb05eafabcc3cf8b8e62d1e40c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d0ba368da20efb05eafabcc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 12:39:39 2019 +0100 winebuild: Make relay entry points hot-patchable. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/spec32.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index d4091c2..132ab88 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -218,13 +218,14 @@ static void output_relay_debug( DLLSPEC *spec ) if (!needs_relay( odp )) continue; - output( "\t.align %d\n", get_alignment(4) ); - output( ".L__wine_spec_relay_entry_point_%d:\n", i ); - output_cfi( ".cfi_startproc" ); - switch (target_cpu) { case CPU_x86: + output( "\t.align %d\n", get_alignment(4) ); + output( "\t.long 0x90909090,0x90909090\n" ); + output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output_cfi( ".cfi_startproc" ); + output( "\t.byte 0x8b,0xff,0x55,0x8b,0xec,0x5d\n" ); /* hotpatch prolog */ if (odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)) /* add the register arguments */ { output( "\tpopl %%eax\n" ); @@ -251,6 +252,7 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tret $%u\n", get_args_size( odp )); else output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); break; case CPU_ARM: @@ -263,6 +265,9 @@ static void output_relay_debug( DLLSPEC *spec ) has_float = is_float_arg( odp, j ); val = (odp->u.func.args_str_offset << 16) | (i - spec->base); + output( "\t.align %d\n", get_alignment(4) ); + output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output_cfi( ".cfi_startproc" ); output( "\tpush {r0-r3}\n" ); output( "\tmov r2, SP\n"); if (has_float) output( "\tvpush {s0-s15}\n" ); @@ -279,10 +284,14 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tadd SP, #%u\n", 24 + (has_float ? 64 : 0) ); output( "\tbx IP\n"); output( "2:\t.long .L__wine_spec_relay_descr-1b\n" ); + output_cfi( ".cfi_endproc" ); break; } case CPU_ARM64: + output( "\t.align %d\n", get_alignment(4) ); + output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) { default: @@ -314,9 +323,14 @@ static void output_relay_debug( DLLSPEC *spec ) if (odp->u.func.nb_args) output( "\tadd SP, SP, #%u\n", 8 * ((min(odp->u.func.nb_args, 8) + 1) & ~1) ); output( "\tret\n"); + output_cfi( ".cfi_endproc" ); break; case CPU_x86_64: + output( "\t.align %d\n", get_alignment(4) ); + output( "\t.long 0x90909090,0x90909090\n" ); + output( ".L__wine_spec_relay_entry_point_%d:\n", i ); + output_cfi( ".cfi_startproc" ); switch (odp->u.func.nb_args) { default: output( "\tmovq %%%s,32(%%rsp)\n", is_float_arg( odp, 3 ) ? "xmm3" : "r9" ); @@ -333,12 +347,12 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tleaq .L__wine_spec_relay_descr(%%rip),%%rcx\n" ); output( "\tcallq *8(%%rcx)\n" ); output( "\tret\n" ); + output_cfi( ".cfi_endproc" ); break; default: assert(0); } - output_cfi( ".cfi_endproc" ); } }

1 0

Alexandre Julliard : winebuild: Use stdcall for fastcall wrappers.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 26bbbb7b73dcd345f5f89b9c48ace1f65f038ede URL: https://source.winehq.org/git/wine.git/?a=commit;h=26bbbb7b73dcd345f5f89b9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 1 10:30:56 2019 +0100 winebuild: Use stdcall for fastcall wrappers. This allows catching mismatched argument lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 4 ++-- dlls/ntdll/rtl.c | 2 +- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++-- tools/winebuild/spec32.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index d663c44..269a551 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntoskrnl); #ifdef __i386__ #define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) #define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index d13ec31..755cc6e 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); #ifdef __i386__ #define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ diff --git a/dlls/ntoskrnl.exe/ntoskrnl_private.h b/dlls/ntoskrnl.exe/ntoskrnl_private.h index c4002e8..440e638 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl_private.h +++ b/dlls/ntoskrnl.exe/ntoskrnl_private.h @@ -30,13 +30,13 @@ struct _OBJECT_TYPE { #ifdef __i386__ #define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_NAME(#func) __ASM_STDCALL(4) ) #define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_GLOBAL_FUNC( __fastcall_ ## func, \ + __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 44d1c2c..d4091c2 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -968,7 +968,7 @@ void output_def_file( DLLSPEC *spec, int include_private ) else if (strcmp(name, odp->link_name)) /* try to reduce output */ { output( "=%s", odp->link_name ); - if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & (FLAG_THISCALL | FLAG_FASTCALL))) + if (!kill_at && target_cpu == CPU_x86 && !(odp->flags & FLAG_THISCALL)) output( "@%d", at_param ); } break;

1 0

Nikolay Sivov : mfplat: Fail to create user queues on uninitialized platform.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 5e1b3b2f5aaf17d90fad39864dec1caa077d5bfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e1b3b2f5aaf17d90fad3986… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:15 2019 +0300 mfplat: Fail to create user queues on uninitialized platform. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 5 +++++ dlls/mfplat/mfplat_private.h | 1 + dlls/mfplat/queue.c | 3 +++ dlls/mfplat/tests/mfplat.c | 53 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2d82589..a8963ca 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -521,6 +521,11 @@ HRESULT WINAPI MFUnlockPlatform(void) return S_OK; } +BOOL is_platform_locked(void) +{ + return platform_lock > 0; +} + /*********************************************************************** * MFCopyImage (mfplat.@) */ diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 2d9e7d5..ac35ff2 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -18,3 +18,4 @@ extern void init_system_queues(void) DECLSPEC_HIDDEN; extern void shutdown_system_queues(void) DECLSPEC_HIDDEN; +extern BOOL is_platform_locked(void) DECLSPEC_HIDDEN; diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 23e54a5..f470cb4 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -543,6 +543,9 @@ static HRESULT alloc_user_queue(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue_ *queue_id = MFASYNC_CALLBACK_QUEUE_UNDEFINED; + if (!is_platform_locked()) + return MF_E_SHUTDOWN; + queue = heap_alloc_zero(sizeof(*queue)); if (!queue) return E_OUTOFMEMORY; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fa77929..2a2189b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -837,6 +837,7 @@ static void test_MFCreateAsyncResult(void) static void test_startup(void) { + DWORD queue; HRESULT hr; hr = MFStartup(MAKELONG(MF_API_VERSION, 0xdead), MFSTARTUP_FULL); @@ -845,8 +846,58 @@ static void test_startup(void) hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + hr = MFShutdown(); - ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + /* Already shut down, has no effect. */ + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + /* Platform lock. */ + hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); + ok(hr == S_OK, "Failed to start up, hr %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + /* Unlocking implies shutdown. */ + hr = MFUnlockPlatform(); + ok(hr == S_OK, "Failed to unlock, %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = MFLockPlatform(); + ok(hr == S_OK, "Failed to lock, %#x.\n", hr); + + hr = MFAllocateWorkQueue(&queue); + ok(hr == S_OK, "Failed to allocate a queue, hr %#x.\n", hr); + hr = MFUnlockWorkQueue(queue); + ok(hr == S_OK, "Failed to unlock the queue, hr %#x.\n", hr); + + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } static void test_allocate_queue(void)

1 0

Nikolay Sivov : mfplat: Implement waiting items with ability to cancel.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 1a53a655d19249c06799f4ca5195049acdd0d7a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a53a655d19249c06799f4ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:12 2019 +0300 mfplat: Implement waiting items with ability to cancel. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mfplat.spec | 1 + dlls/mfplat/queue.c | 288 +++++++++++++++++++++++++++++++++++---------- dlls/mfplat/tests/mfplat.c | 5 +- 3 files changed, 233 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1a53a655d19249c06799…

1 0

Nikolay Sivov : mfplat: Add a helper to create async result objects.
by Alexandre Julliard March 1, 2019

March 1, 2019

Module: wine Branch: master Commit: 3a433af207cfa6a471af1afe83a1344a3f9f2342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a433af207cfa6a471af1afe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 1 11:03:09 2019 +0300 mfplat: Add a helper to create async result objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 70efac3..3b59984 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -345,12 +345,10 @@ static const IMFAsyncResultVtbl async_result_vtbl = async_result_GetStateNoAddRef, }; -HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) +static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) { struct async_result *result; - TRACE("%p, %p, %p, %p.\n", object, callback, state, out); - if (!out) return E_INVALIDARG; @@ -374,10 +372,22 @@ HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, *out = &result->result.AsyncResult; + TRACE("Created async result object %p.\n", *out); + return S_OK; } /*********************************************************************** + * MFCreateAsyncResult (mfplat.@) + */ +HRESULT WINAPI MFCreateAsyncResult(IUnknown *object, IMFAsyncCallback *callback, IUnknown *state, IMFAsyncResult **out) +{ + TRACE("%p, %p, %p, %p.\n", object, callback, state, out); + + return create_async_result(object, callback, state, out); +} + +/*********************************************************************** * MFAllocateWorkQueue (mfplat.@) */ HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue)

1 0