November 2018 - Wine-commits

Jacek Caban : ntdll: Update debug trace.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 2172855fbae29a911836d08038c6e35075afbea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2172855fbae29a911836d080… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:41:16 2018 +0100 ntdll: Update debug trace. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 4d2fa7a..7c8b8ed 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -837,7 +837,7 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; BOOL send_completion = FALSE, async_read, timeout_init_done = FALSE; - TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", + TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); if (!io_status) return STATUS_ACCESS_VIOLATION; @@ -1204,7 +1204,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, BOOL send_completion = FALSE, async_write, append_write = FALSE, timeout_init_done = FALSE; LARGE_INTEGER offset_eof; - TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", + TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)\n", hFile,hEvent,apc,apc_user,io_status,buffer,length,offset,key); if (!io_status) return STATUS_ACCESS_VIOLATION;

1 0

Jacek Caban : widl: Add __int32 type support.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 2761fc91d0f23406b8ed8930325915eaa41ef6cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2761fc91d0f23406b8ed8930… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 15:02:28 2018 +0100 widl: Add __int32 type support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/expr.c | 2 ++ tools/widl/header.c | 7 +++++++ tools/widl/parser.l | 1 + tools/widl/parser.y | 7 +++++-- tools/widl/typegen.c | 4 +++- tools/widl/typelib.c | 1 + tools/widl/typetree.c | 1 + tools/widl/widltypes.h | 1 + 8 files changed, 21 insertions(+), 3 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index b461aee..2ed4aff 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -50,6 +50,7 @@ static int is_integer_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: @@ -82,6 +83,7 @@ static int is_signed_integer_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: return type_basic_get_sign(type) < 0; case TYPE_BASIC_CHAR: return TRUE; diff --git a/tools/widl/header.c b/tools/widl/header.c index 7681a3f..b8e11bb 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -369,6 +369,7 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_BASIC: if (type_basic_get_type(t) != TYPE_BASIC_INT32 && type_basic_get_type(t) != TYPE_BASIC_INT64 && + type_basic_get_type(t) != TYPE_BASIC_LONG && type_basic_get_type(t) != TYPE_BASIC_HYPER) { if (type_basic_get_sign(t) < 0) fprintf(h, "signed "); @@ -389,6 +390,12 @@ void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly) case TYPE_BASIC_HANDLE: fprintf(h, "handle_t"); break; case TYPE_BASIC_INT32: if (type_basic_get_sign(t) > 0) + fprintf(h, "UINT32"); + else + fprintf(h, "INT32"); + break; + case TYPE_BASIC_LONG: + if (type_basic_get_sign(t) > 0) fprintf(h, "ULONG"); else fprintf(h, "LONG"); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index a57ac64..342109e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -250,6 +250,7 @@ static const struct keyword keywords[] = { {"TRUE", tTRUE}, {"__cdecl", tCDECL}, {"__fastcall", tFASTCALL}, + {"__int32", tINT32}, {"__int3264", tINT3264}, {"__int64", tINT64}, {"__pascal", tPASCAL}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 1cb9ab9..0f85498 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -208,7 +208,7 @@ static typelib_t *current_typelib; %token tIMPORT tIMPORTLIB %token tIN tIN_LINE tINLINE %token tINPUTSYNC -%token tINT tINT3264 tINT64 +%token tINT tINT32 tINT3264 tINT64 %token tINTERFACE %token tLCID %token tLENGTHIS tLIBRARY @@ -815,10 +815,11 @@ m_int: int_std: tINT { $$ = type_new_int(TYPE_BASIC_INT, 0); } | tSHORT m_int { $$ = type_new_int(TYPE_BASIC_INT16, 0); } | tSMALL { $$ = type_new_int(TYPE_BASIC_INT8, 0); } - | tLONG m_int { $$ = type_new_int(TYPE_BASIC_INT32, 0); } + | tLONG m_int { $$ = type_new_int(TYPE_BASIC_LONG, 0); } | tHYPER m_int { $$ = type_new_int(TYPE_BASIC_HYPER, 0); } | tINT64 { $$ = type_new_int(TYPE_BASIC_INT64, 0); } | tCHAR { $$ = type_new_int(TYPE_BASIC_CHAR, 0); } + | tINT32 { $$ = type_new_int(TYPE_BASIC_INT32, 0); } | tINT3264 { $$ = type_new_int(TYPE_BASIC_INT3264, 0); } ; @@ -1408,6 +1409,7 @@ static int is_allowed_range_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_BYTE: case TYPE_BASIC_CHAR: case TYPE_BASIC_WCHAR: @@ -2399,6 +2401,7 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_BASIC_INT32: case TYPE_BASIC_INT64: case TYPE_BASIC_INT: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6151b1c..ce4c578 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -208,7 +208,8 @@ unsigned char get_basic_fc(const type_t *type) { case TYPE_BASIC_INT8: return (sign <= 0 ? FC_SMALL : FC_USMALL); case TYPE_BASIC_INT16: return (sign <= 0 ? FC_SHORT : FC_USHORT); - case TYPE_BASIC_INT32: return (sign <= 0 ? FC_LONG : FC_ULONG); + case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: return (sign <= 0 ? FC_LONG : FC_ULONG); case TYPE_BASIC_INT64: return FC_HYPER; case TYPE_BASIC_INT: return (sign <= 0 ? FC_LONG : FC_ULONG); case TYPE_BASIC_INT3264: return (sign <= 0 ? FC_INT3264 : FC_UINT3264); @@ -234,6 +235,7 @@ static unsigned char get_basic_fc_signed(const type_t *type) case TYPE_BASIC_INT64: return FC_HYPER; case TYPE_BASIC_INT: return FC_LONG; case TYPE_BASIC_INT3264: return FC_INT3264; + case TYPE_BASIC_LONG: return FC_LONG; case TYPE_BASIC_BYTE: return FC_BYTE; case TYPE_BASIC_CHAR: return FC_CHAR; case TYPE_BASIC_WCHAR: return FC_WCHAR; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 3083839..9b1de2c 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -156,6 +156,7 @@ unsigned short get_type_vt(type_t *t) else return VT_INT; case TYPE_BASIC_INT32: + case TYPE_BASIC_LONG: case TYPE_BASIC_ERROR_STATUS_T: if (type_basic_get_sign(t) > 0) return VT_UI4; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index baf53a1..10657b0 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -377,6 +377,7 @@ static int is_valid_bitfield_type(const type_t *type) case TYPE_BASIC_INT64: case TYPE_BASIC_INT: case TYPE_BASIC_INT3264: + case TYPE_BASIC_LONG: case TYPE_BASIC_CHAR: case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 7891a1d..b4eb003 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -265,6 +265,7 @@ enum type_basic_type TYPE_BASIC_INT64, TYPE_BASIC_INT, TYPE_BASIC_INT3264, + TYPE_BASIC_LONG, TYPE_BASIC_CHAR, TYPE_BASIC_HYPER, TYPE_BASIC_BYTE,

1 0

Jacek Caban : widl: Ignore -robust command line option.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 511b50e7bff5c67c9c928e47f4fbab66ddc0295c URL: https://source.winehq.org/git/wine.git/?a=commit;h=511b50e7bff5c67c9c928e47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 15:02:42 2018 +0100 widl: Ignore -robust command line option. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/widl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index a38f917..96fb240 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -72,6 +72,7 @@ static const char usage[] = " --prefix-client=p Prefix names of client stubs with 'p'\n" " --prefix-server=p Prefix names of server functions with 'p'\n" " -r Generate registration script\n" +" -robust Ignored, present for midl compatibility\n" " --winrt Enable Windows Runtime mode\n" " --ns_prefix Prefix namespaces with ABI namespace\n" " -s Generate server stub\n" @@ -163,7 +164,8 @@ enum { WIN64_OPTION, WIN32_ALIGN_OPTION, WIN64_ALIGN_OPTION, - APP_CONFIG_OPTION + APP_CONFIG_OPTION, + ROBUST_OPTION }; static const char short_options[] = @@ -179,6 +181,7 @@ static const struct option long_options[] = { { "prefix-all", 1, NULL, PREFIX_ALL_OPTION }, { "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION }, { "prefix-server", 1, NULL, PREFIX_SERVER_OPTION }, + { "robust", 0, NULL, ROBUST_OPTION }, { "winrt", 0, NULL, RT_OPTION }, { "win32", 0, NULL, WIN32_OPTION }, { "win64", 0, NULL, WIN64_OPTION }, @@ -609,6 +612,9 @@ int main(int argc,char *argv[]) /* widl does not distinguish between app_mode and default mode, but we ignore this option for midl compatibility */ break; + case ROBUST_OPTION: + /* FIXME: Support robust option */ + break; case 'b': set_target( optarg ); break;

1 0

Gijs Vermeulen : msvcp100: Add Concurrency::_GetCombinableSize stub.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 82ba4373ae84ebe51d649dfe416af8b31097d62a URL: https://source.winehq.org/git/wine.git/?a=commit;h=82ba4373ae84ebe51d649dfe… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Nov 1 17:52:31 2018 +0100 msvcp100: Add Concurrency::_GetCombinableSize stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41419 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 4 ++-- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp90/misc.c | 8 ++++++++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 44e0061..4ba1825 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -336,8 +336,8 @@ @ thiscall -arch=i386 ?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IAEXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IAEXXZ @ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IEAAXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details(a)Concurrency@@IEAAXXZ @ cdecl ?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ(ptr) msvcr120.?_Get(a)_CurrentScheduler@details(a)Concurrency@@SA?AV_Scheduler(a)23@XZ -@ stub -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize(a)details@Concurrency@@YAIXZ +@ cdecl -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize(a)details@Concurrency@@YA_KXZ @ stub -arch=win32 ?_GetConcRTTraceInfo(a)Concurrency@@YAPBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ stub -arch=win64 ?_GetConcRTTraceInfo(a)Concurrency@@YAPEBU_CONCRT_TRACE_INFO(a)details@1(a)XZ @ cdecl ?_GetConcurrency(a)details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency(a)details@Concurrency@@YAIXZ diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index adfc7d7..74e1ccf 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -821,8 +821,8 @@ @ cdecl -arch=win64 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AEAVios_base(a)2@GPEBD_K333(a)Z(ptr ptr ptr ptr long str long long long long) num_put_short__Fput @ cdecl -arch=win32 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPBDIIII(a)Z(ptr ptr long ptr ptr long str long long long long) num_put_wchar__Fput @ cdecl -arch=win64 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEBD_K444(a)Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput -@ stub -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ() _GetCombinableSize @ stub ?_GetCurrentThreadId(a)details@Concurrency@@YAKXZ @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) codecvt_char__Getcat diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 8be2e17..4d9d90b 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1227,8 +1227,8 @@ @ cdecl -arch=win64 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEBD_K444(a)Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput @ stub -arch=win32 ?_Future_error_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Future_error_map(a)std@@YAPEBDH(a)Z -@ stub -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ() _GetCombinableSize @ stub ?_GetCurrentThreadId(a)details@Concurrency@@YAKXZ @ stub ?_GetNextAsyncId(a)details@Concurrency@@YAIXZ @ stub -arch=win32 ?_Get_future_error_what(a)std@@YAPBDH(a)Z diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index bf2e35b..4e0dbe4 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1192,8 +1192,8 @@ @ cdecl -arch=win64 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEBD_K444(a)Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput @ stub -arch=win32 ?_Future_error_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Future_error_map(a)std@@YAPEBDH(a)Z -@ stub -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ() _GetCombinableSize @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) codecvt_short__Getcat diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index aa1d654..e548a29 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1192,8 +1192,8 @@ @ cdecl -arch=win64 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEBD_K444(a)Z(ptr ptr ptr ptr long str long long long long) msvcp120.?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AEAVios_base(a)2@_WPEBD_K444(a)Z @ stub -arch=win32 ?_Future_error_map(a)std@@YAPBDH(a)Z @ stub -arch=win64 ?_Future_error_map(a)std@@YAPEBDH(a)Z -@ stub -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize(a)details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize(a)details@Concurrency@@YAIXZ +@ cdecl -arch=win64 ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize(a)details@Concurrency@@YA_KXZ @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z @ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2(a)PEBV42@@Z @ cdecl -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2(a)PBV42@@Z diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index ae7a129..c5079d7 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -2578,6 +2578,14 @@ MSVCP_bool __cdecl is_current_task_group_canceling(void) { return Context_IsCurrentTaskCollectionCanceling(); } + +/* ?_GetCombinableSize(a)details@Concurrency@@YAIXZ */ +/* ?_GetCombinableSize(a)details@Concurrency@@YA_KXZ */ +MSVCP_size_t __cdecl _GetCombinableSize(void) +{ + FIXME("() stub\n"); + return 11; +} #endif #if _MSVCP_VER >= 140

1 0

Sebastian Lackner : xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: c649ec3a02a7574578180e1228dacb6f3a511c55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c649ec3a02a7574578180e12… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Nov 1 10:32:38 2018 -0500 xaudio2: Use assembly wrapper to call OnVoiceProcessingPassStart callback. During a callback function, some games use the wrong function signature for an xaudio2 function, which changed between xaudio2 versions. As a result, the EDI and ESI registers are overwritten by the game. Apparently Windows's implementation happens not to use these registers in a way that causes the crash. This patch pushes EDI and ESI onto the stack before calling the callback, then pops them back after the callback exits. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42520 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43358 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 461ac56..0bbe943 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" #include <stdarg.h> #define NONAMELESSUNION @@ -50,6 +51,37 @@ static HINSTANCE instance; #define COMPAT_E_DEVICE_INVALIDATED XAUDIO2_E_DEVICE_INVALIDATED #endif +#if XAUDIO2_VER != 0 && defined(__i386__) +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +#define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) +extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); +__ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp,%ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "pushl %esi\n\t" + __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") + "pushl %edi\n\t" + __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") + "subl $8,%esp\n\t" + "pushl 12(%ebp)\n\t" /* BytesRequired */ + "pushl 8(%ebp)\n\t" /* This */ + "movl 8(%ebp),%eax\n\t" + "movl 0(%eax),%eax\n\t" + "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ + "leal -8(%ebp),%esp\n\t" + "popl %edi\n\t" + __ASM_CFI(".cfi_same_value %edi\n\t") + "popl %esi\n\t" + __ASM_CFI(".cfi_same_value %esi\n\t") + "popl %ebp\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret" ) +#endif + static void dump_fmt(const WAVEFORMATEX *fmt) { TRACE("wFormatTag: 0x%x (", fmt->wFormatTag);

1 0

Zebediah Figura : oleaut32/tests: Add some tests for marshalling safe arrays.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 9d1b5fd44f1c25615ddf8790ba89bef1c92e7ea5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1b5fd44f1c25615ddf8790… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 10:20:01 2018 -0500 oleaut32/tests: Add some tests for marshalling safe arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 74 ++++++++++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 +++ 2 files changed, 78 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index f219742..e3656d6 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1248,6 +1248,56 @@ static HRESULT WINAPI Widget_variant(IWidget *iface, VARIANT in, VARIANT *out, V return S_OK; } +static SAFEARRAY *make_safearray(ULONG len) +{ + SAFEARRAY *sa = SafeArrayCreateVector(VT_I4, 0, len); + int i, *data; + + SafeArrayAccessData(sa, (void **)&data); + for (i = 0; i < len; ++i) + data[i] = len + i; + SafeArrayUnaccessData(sa); + + return sa; +} + +static void check_safearray(SAFEARRAY *sa, LONG expect) +{ + LONG len, i, *data; + HRESULT hr; + + hr = SafeArrayGetUBound(sa, 1, &len); + len++; + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(len == expect, "Expected len %d, got %d.\n", expect, len); + + hr = SafeArrayAccessData(sa, (void **)&data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < len; ++i) + ok(data[i] == len + i, "Expected data %d at %d, got %d.\n", len + i, i, data[i]); + + SafeArrayUnaccessData(sa); +} + +static HRESULT WINAPI Widget_safearray(IWidget *iface, SAFEARRAY *in, SAFEARRAY **out, SAFEARRAY **in_ptr, SAFEARRAY **in_out) +{ + HRESULT hr; + + check_safearray(in, 3); + ok(!*out, "Got array %p.\n", *out); + check_safearray(*in_ptr, 7); + check_safearray(*in_out, 9); + + hr = SafeArrayDestroy(*in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + *out = make_safearray(4); + *in_out = make_safearray(6); + + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -1297,6 +1347,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_ptr, Widget_bstr, Widget_variant, + Widget_safearray, }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -2160,6 +2211,28 @@ static void test_marshal_variant(IWidget *widget, IDispatch *disp) ok(V_I1(&in_out) == 5, "Got wrong value %d.\n", V_I1(&in_out)); } +static void test_marshal_safearray(IWidget *widget, IDispatch *disp) +{ + SAFEARRAY *in, *out, *in_ptr, *in_out; + HRESULT hr; + + in = make_safearray(3); + out = make_safearray(5); + in_ptr = make_safearray(7); + in_out = make_safearray(9); + hr = IWidget_safearray(widget, in, &out, &in_ptr, &in_out); + ok(hr == S_OK, "Got hr %#x.\n", hr); + check_safearray(in, 3); + check_safearray(out, 4); + check_safearray(in_ptr, 7); + check_safearray(in_out, 6); + + SafeArrayDestroy(in); + SafeArrayDestroy(out); + SafeArrayDestroy(in_ptr); + SafeArrayDestroy(in_out); +} + static void test_typelibmarshal(void) { static const WCHAR szCat[] = { 'C','a','t',0 }; @@ -2758,6 +2831,7 @@ todo_wine test_marshal_iface(pWidget, pDispatch); test_marshal_bstr(pWidget, pDispatch); test_marshal_variant(pWidget, pDispatch); + test_marshal_safearray(pWidget, pDispatch); IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 16d2f9d..d630091 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -63,6 +63,7 @@ enum IWidget_dispids DISPID_TM_IFACE_PTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, + DISPID_TM_SAFEARRAY, }; static const int DISPID_TM_NEG_RESTRICTED = -26; @@ -267,6 +268,9 @@ library TestTypelib [id(DISPID_TM_VARIANT)] HRESULT variant([in] VARIANT in, [out] VARIANT *out, [in] VARIANT *in_ptr, [in, out] VARIANT *in_out); + + [id(DISPID_TM_SAFEARRAY)] + HRESULT safearray([in] SAFEARRAY(int) in, [out] SAFEARRAY(int) *out, [in] SAFEARRAY(int) *in_ptr, [in, out] SAFEARRAY(int) *in_out); } [

1 0

Zebediah Figura : oleaut32/tests: Add some more tests for marshalling structs.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 09a81b30f8ca458db22d73c33545f02fd510702a URL: https://source.winehq.org/git/wine.git/?a=commit;h=09a81b30f8ca458db22d73c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 10:20:02 2018 -0500 oleaut32/tests: Add some more tests for marshalling structs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 153 +++++++++++++++++++++++++-------------- dlls/oleaut32/tests/tmarshal.idl | 26 ++++++- 2 files changed, 121 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=09a81b30f8ca458db22d…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: e2ec160e3ca2d11fe430190303f517e0a6b9d53f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2ec160e3ca2d11fe4301903… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu Nov 1 08:21:50 2018 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index c10e649..b7b5a5f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-10-24 08:54+0300\n" +"PO-Revision-Date: 2018-11-01 08:19+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -2449,16 +2449,12 @@ msgid "You have successfully completed the Certificate Export Wizard." msgstr "Sėkmingai baigėte liudijimo eksporto vediklį." #: cryptui.rc:456 cryptui.rc:179 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select Certificate" -msgstr "Išrinkite liudijimų saugyklą" +msgstr "Išrinkite liudijimą" #: cryptui.rc:459 -#, fuzzy -#| msgid "Select the certificate store you want to use:" msgid "Select a certificate you want to use" -msgstr "Išrinkite liudijimų saugyklą, kurią norite naudoti:" +msgstr "Išrinkite liudijimą, kurį norite naudoti" #: cryptui.rc:30 cryptui.rc:93 msgid "Certificate" @@ -2987,20 +2983,16 @@ msgid "Note: The private key for this certificate is not exportable." msgstr "Pastaba: šio liudijimo privatusis raktas neišeksportuojamas." #: cryptui.rc:177 -#, fuzzy -#| msgid "I&ntended purpose:" msgid "Intended Use" -msgstr "&Numatytosios paskirtys:" +msgstr "Numatyta paskirtis" #: cryptui.rc:178 shell32.rc:152 msgid "Location" msgstr "Vieta" #: cryptui.rc:180 -#, fuzzy -#| msgid "Select Certificate Store" msgid "Select a certificate" -msgstr "Išrinkite liudijimų saugyklą" +msgstr "Išrinkite liudijimą" #: cryptui.rc:181 winefile.rc:102 winhlp32.rc:110 winhlp32.rc:85 msgid "Not yet implemented"

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_texture_init().
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 14434751dd852cd4664df4ac2ee23afbedd98664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14434751dd852cd4664df4ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:25 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 45de4a1..df92b53 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2906,10 +2906,10 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc return WINED3DERR_INVALIDCALL; } - if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL)) - && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE)) + if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) && !((desc->usage & WINED3DUSAGE_DYNAMIC) + || (desc->bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)))) WARN("Creating a mappable texture that doesn't specify dynamic usage.\n"); - if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) + if (desc->bind_flags & WINED3D_BIND_RENDER_TARGET && desc->access & WINED3D_RESOURCE_ACCESS_CPU) FIXME("Trying to create a CPU accessible render target.\n"); pow2_width = desc->width; @@ -2955,7 +2955,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->pow2_height = pow2_height; if ((pow2_width > d3d_info->limits.texture_size || pow2_height > d3d_info->limits.texture_size) - && (desc->usage & WINED3DUSAGE_TEXTURE)) + && (desc->bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { /* One of four options: * 1: Do the same as we do with NPOT and scale the texture. (Any

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_texture_upload_data().
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 6435bd743b434ce4e3875dd42161e24858cfd2b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6435bd743b434ce4e3875dd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 1 11:25:26 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_texture_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index df92b53..5ee86d3 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2053,7 +2053,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s if (srgb) internal = format_gl->srgb_internal; - else if (texture->resource.usage & WINED3DUSAGE_RENDERTARGET + else if (texture->resource.bind_flags & WINED3D_BIND_RENDER_TARGET && wined3d_resource_is_offscreen(&texture->resource)) internal = format_gl->rt_internal; else

1 0