wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

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

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@Concurrency@@IAEXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details@Concurrency@@IAEXXZ @ cdecl -arch=win64 ?_DoYield@?$_SpinWait@$0A@@details@Concurrency@@IEAAXXZ(ptr) msvcr120.?_DoYield@?$_SpinWait@$0A@@details@Concurrency@@IEAAXXZ @ cdecl ?_Get@_CurrentScheduler@details@Concurrency@@SA?AV_Scheduler@23@XZ(ptr) msvcr120.?_Get@_CurrentScheduler@details@Concurrency@@SA?AV_Scheduler@23@XZ -@ stub -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize@details@Concurrency@@YAIXZ +@ cdecl -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize@details@Concurrency@@YA_KXZ @ stub -arch=win32 ?_GetConcRTTraceInfo@Concurrency@@YAPBU_CONCRT_TRACE_INFO@details@1@XZ @ stub -arch=win64 ?_GetConcRTTraceInfo@Concurrency@@YAPEBU_CONCRT_TRACE_INFO@details@1@XZ @ cdecl ?_GetConcurrency@details@Concurrency@@YAIXZ() msvcr120.?_GetConcurrency@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@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AEAVios_base@2@GPEBD_K333@Z(ptr ptr ptr ptr long str long long long long) num_put_short__Fput @ cdecl -arch=win32 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AAVios_base@2@_WPBDIIII@Z(ptr ptr long ptr ptr long str long long long long) num_put_wchar__Fput @ cdecl -arch=win64 ?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput -@ stub -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ() _GetCombinableSize @ stub ?_GetCurrentThreadId@details@Concurrency@@YAKXZ @ cdecl -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@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@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput @ stub -arch=win32 ?_Future_error_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Future_error_map@std@@YAPEBDH@Z -@ stub -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ() _GetCombinableSize @ stub ?_GetCurrentThreadId@details@Concurrency@@YAKXZ @ stub ?_GetNextAsyncId@details@Concurrency@@YAIXZ @ stub -arch=win32 ?_Get_future_error_what@std@@YAPBDH@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@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z(ptr ptr ptr ptr long str long long long long) num_put_wchar__Fput @ stub -arch=win32 ?_Future_error_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Future_error_map@std@@YAPEBDH@Z -@ stub -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ() _GetCombinableSize +@ cdecl -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ() _GetCombinableSize @ cdecl -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z(ptr ptr) codecvt_char__Getcat @ cdecl -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@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@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z(ptr ptr ptr ptr long str long long long long) msvcp120.?_Fput@?$num_put@_WV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator@_WU?$char_traits@_W@std@@@2@V32@AEAVios_base@2@_WPEBD_K444@Z @ stub -arch=win32 ?_Future_error_map@std@@YAPBDH@Z @ stub -arch=win64 ?_Future_error_map@std@@YAPEBDH@Z -@ stub -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ -@ stub -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ +@ cdecl -arch=win32 ?_GetCombinableSize@details@Concurrency@@YAIXZ() msvcp120.?_GetCombinableSize@details@Concurrency@@YAIXZ +@ cdecl -arch=win64 ?_GetCombinableSize@details@Concurrency@@YA_KXZ() msvcp120.?_GetCombinableSize@details@Concurrency@@YA_KXZ @ cdecl -arch=win32 ?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt@DDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z @ cdecl -arch=win64 ?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt@DDH@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z @ cdecl -arch=win32 ?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@PBV42@@Z(ptr ptr) msvcp120.?_Getcat@?$codecvt@GDH@std@@SAIPAPBVfacet@locale@2@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@details@Concurrency@@YAIXZ */ +/* ?_GetCombinableSize@details@Concurrency@@YA_KXZ */ +MSVCP_size_t __cdecl _GetCombinableSize(void) +{ + FIXME("() stub\n"); + return 11; +} #endif #if _MSVCP_VER >= 140

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

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 : 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 : ntdll: Remove no longer needed event handle from async_irp.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 9ee34a5d92510ea2899940036b035a6fb6c4fb04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ee34a5d92510ea289994003… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:41:11 2018 +0100 ntdll: Remove no longer needed event handle from async_irp. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 2b62206..4d2fa7a 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -375,7 +375,6 @@ struct async_fileio_write struct async_irp { struct async_fileio io; - HANDLE event; /* async event */ void *buffer; /* buffer for output */ ULONG size; /* size of buffer */ }; @@ -568,7 +567,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = buffer; async->size = size; @@ -612,7 +610,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = NULL; async->size = 0; @@ -1522,7 +1519,6 @@ static NTSTATUS server_ioctl_file( HANDLE handle, HANDLE event, if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) return STATUS_NO_MEMORY; - async->event = event; async->buffer = out_buffer; async->size = out_size; @@ -3321,7 +3317,6 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE hFile, IO_STATUS_BLOCK *io ) if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, hFile ))) return STATUS_NO_MEMORY; - async->event = NULL; async->buffer = NULL; async->size = 0;

1 0

Jacek Caban : server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 3dacf82173a142fbcf26dec59614481f27f91d68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dacf82173a142fbcf26dec5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 1 12:40:04 2018 +0100 server: Add FILE_SKIP_SET_EVENT_ON_HANDLE support. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/pipe.c | 4 ---- server/fd.c | 5 ++++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 622b5de..2b62206 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2661,8 +2661,8 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, { FILE_IO_COMPLETION_NOTIFICATION_INFORMATION *info = ptr; - if (info->Flags & ~FILE_SKIP_COMPLETION_PORT_ON_SUCCESS) - FIXME( "Unsupported completion flags %x\n", info->Flags ); + if (info->Flags & FILE_SKIP_SET_USER_EVENT_ON_FAST_IO) + FIXME( "FILE_SKIP_SET_USER_EVENT_ON_FAST_IO not supported\n" ); SERVER_START_REQ( set_fd_completion_mode ) { diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 08bde6d..406d555 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -1423,12 +1423,10 @@ static void test_completion(void) info.Flags = FILE_SKIP_SET_EVENT_ON_HANDLE; status = pNtSetInformationFile(client, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); ok(status == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %08x\n", status); - todo_wine ok(!is_signaled(client), "client is not signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); test_queued_completion(port, &io, STATUS_SUCCESS, sizeof(buf)); @@ -1439,12 +1437,10 @@ static void test_completion(void) ret = WriteFile(client, buf, 1, &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); ret = WriteFile(pipe, buf, sizeof(buf), &num_bytes, NULL); ok(ret, "WriteFile failed, error %u\n", GetLastError()); - todo_wine ok(!is_signaled(client), "client is signaled\n"); CloseHandle(port); diff --git a/server/fd.c b/server/fd.c index 119fae6..fa174f5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1964,6 +1964,7 @@ int is_fd_removable( struct fd *fd ) /* set or clear the fd signaled state */ void set_fd_signaled( struct fd *fd, int signaled ) { + if (fd->comp_flags & FILE_SKIP_SET_EVENT_ON_HANDLE) return; fd->signaled = signaled; if (signaled) wake_up( fd->user, 0 ); } @@ -2647,7 +2648,9 @@ DECL_HANDLER(set_fd_completion_mode) { if (is_fd_overlapped( fd )) { - /* removing COMPLETION_SKIP_ON_SUCCESS is not allowed */ + if (req->flags & FILE_SKIP_SET_EVENT_ON_HANDLE) + set_fd_signaled( fd, 0 ); + /* removing flags is not allowed */ fd->comp_flags |= req->flags & ( FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE | FILE_SKIP_SET_USER_EVENT_ON_FAST_IO );

1 0

Nikolay Sivov : gdiplus: Skip failed font family when building system collection.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 455de70201da10c9b5347f2c381fb61e8cc696fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=455de70201da10c9b5347f2c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:29 2018 +0300 gdiplus: Skip failed font family when building system collection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 74cd29b..729592b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1496,6 +1496,7 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) struct add_font_param { GpFontCollection *collection; + BOOL is_system; GpStatus stat; }; @@ -1541,6 +1542,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lfw.lfPitchAndFamily = 0; param.collection = fontCollection; + param.is_system = FALSE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) ret = param.stat; @@ -1651,6 +1653,9 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) { + WARN("Failed to create font family for %s, status %d.\n", debugstr_w(lfw->lfFaceName), stat); + if (param->is_system) + return 1; param->stat = stat; return 0; } @@ -1691,6 +1696,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfPitchAndFamily = 0; param.collection = &installedFontCollection; + param.is_system = TRUE; if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts();

1 0

Nikolay Sivov : gdiplus: Return actual code on failed attempt to add a font.
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: 4aaa94111bbd56ee2bd3f6dd3bae9c4085f9b806 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aaa94111bbd56ee2bd3f6dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:28 2018 +0300 gdiplus: Return actual code on failed attempt to add a font. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 64778bb..74cd29b 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1493,6 +1493,12 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) return NULL; } +struct add_font_param +{ + GpFontCollection *collection; + GpStatus stat; +}; + static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam); /***************************************************************************** @@ -1520,6 +1526,7 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, ret = InvalidParameter; else { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1533,8 +1540,9 @@ GpStatus WINGDIPAPI GdipPrivateAddMemoryFont(GpFontCollection* fontCollection, lstrcpyW(lfw.lfFaceName, name); lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)fontCollection, 0)) - ret = OutOfMemory; + param.collection = fontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) + ret = param.stat; DeleteDC(hdc); } @@ -1606,10 +1614,14 @@ void free_installed_fonts(void) static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, DWORD type, LPARAM lParam) { - GpFontCollection* fonts = (GpFontCollection*)lParam; + struct add_font_param *param = (struct add_font_param *)lParam; + GpFontCollection *fonts = param->collection; GpFontFamily* family; + GpStatus stat; int i; + param->stat = Ok; + if (type == RASTER_FONTTYPE) return 1; @@ -1626,7 +1638,10 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, GpFontFamily** new_family_list = heap_alloc(new_alloc_count*sizeof(void*)); if (!new_family_list) + { + param->stat = OutOfMemory; return 0; + } memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); heap_free(fonts->FontFamilies); @@ -1634,8 +1649,11 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, fonts->allocated = new_alloc_count; } - if (GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family) != Ok) + if ((stat = GdipCreateFontFamilyFromName(lfw->lfFaceName, NULL, &family)) != Ok) + { + param->stat = stat; return 0; + } /* skip duplicates */ for (i=0; i<fonts->count; i++) @@ -1662,6 +1680,7 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( if (installedFontCollection.count == 0) { + struct add_font_param param; HDC hdc; LOGFONTW lfw; @@ -1671,11 +1690,12 @@ GpStatus WINGDIPAPI GdipNewInstalledFontCollection( lfw.lfFaceName[0] = 0; lfw.lfPitchAndFamily = 0; - if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&installedFontCollection, 0)) + param.collection = &installedFontCollection; + if (!EnumFontFamiliesExW(hdc, &lfw, add_font_proc, (LPARAM)&param, 0)) { free_installed_fonts(); DeleteDC(hdc); - return OutOfMemory; + return param.stat; } DeleteDC(hdc);

1 0

Nikolay Sivov : gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount().
by Alexandre Julliard 01 Nov '18

01 Nov '18

Module: wine Branch: master Commit: a1ff2c44ea156c7d0f469341328d804bee8675b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1ff2c44ea156c7d0f469341… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 12:53:27 2018 +0300 gdiplus/tests: Add parameter validation test for GdipGetFontCollectionFamilyCount(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/font.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 961d845..0a3a3be 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1238,6 +1238,27 @@ static void test_GdipGetFontCollectionFamilyList(void) GdipDeleteFontFamily(family2); } +static void test_GdipGetFontCollectionFamilyCount(void) +{ + GpFontCollection *collection; + GpStatus status; + INT count; + + status = GdipGetFontCollectionFamilyCount(NULL, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + + count = 123; + status = GdipGetFontCollectionFamilyCount(NULL, &count); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); + ok(count == 123, "Unexpected family count %d.\n", count); + + status = GdipNewInstalledFontCollection(&collection); + ok(status == Ok, "Failed to get system collection, status %d.\n", status); + + status = GdipGetFontCollectionFamilyCount(collection, NULL); + ok(status == InvalidParameter, "Unexpected status %d.\n", status); +} + START_TEST(font) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1269,6 +1290,7 @@ START_TEST(font) test_installedfonts(); test_heightgivendpi(); test_GdipGetFontCollectionFamilyList(); + test_GdipGetFontCollectionFamilyCount(); GdiplusShutdown(gdiplusToken); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2018