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

Francois Gouget : readme: Adjust a couple of section separators.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: a924b9e1f74cc84b1fc12201b9999ab5044dad0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a924b9e1f74cc84b1fc12201b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:42:38 2017 +0100 readme: Adjust a couple of section separators. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 5cd2151..5423e7b 100644 --- a/README +++ b/README @@ -82,6 +82,7 @@ Optional support libraries: 64-bit Wine (or a mixed 32-bit and 64-bit Wine setup), see http://wiki.winehq.org/Wine64 for details. + 4. COMPILATION To build Wine, do: @@ -98,6 +99,7 @@ To see compile configuration options, do ./configure --help. For more information, see https://wiki.winehq.org/Building_Wine + 5. SETUP Once Wine has been built correctly, you can do "make install"; this

1 0

Hugh McMaster : regedit/tests: Add mixed line concatenation and comment tests.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: f8afd05d6c1414bd5f09ac1c1ce3364bee705d10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8afd05d6c1414bd5f09ac1c1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Mar 24 10:26:54 2017 +0000 regedit/tests: Add mixed line concatenation and comment tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 5d096aa..37ac2c1 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -610,6 +610,33 @@ static void test_comments(void) " 65,6e,61,74,69,6f,6e,00,00\n\n"); todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line3\"=hex(7):4c,69,6e,\\;comment\n" + " 65,20,\\;comment\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line4\"=hex(7):4c,69,6e,\\;#comment\n" + " 65,20,\\;#comment\n" + " 63,6f,6e,\\;#comment\n" + " 63,61,74,\\;#comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + todo_wine verify_reg(hkey, "Multi-Line4", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Multi-Line5\"=hex(7):4c,69,6e,\\;comment\n" + " 65,20,\\;comment\n" + " 63,6f,6e,\\;comment\n" + " 63,61,74,\\#comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n"); + verify_reg_nonexist(hkey, "Multi-Line5"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Henri Verbeet : usp10: Introduce a helper function to lookup a script in the script cache.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 2a0ffc985205ea7f4ebbf585ebc13d0f8922d258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a0ffc985205ea7f4ebbf585e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:43 2017 +0100 usp10: Introduce a helper function to lookup a script in the script cache. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 92 ++++++++++++++++++++++----------------------------- 1 file changed, 39 insertions(+), 53 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 6cc1b5d..e5e7ece 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2481,6 +2481,19 @@ unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *script_cache, const O lookup_index, glyphs, glyph_index, glyph_count, goffset); } +static LoadedScript *usp10_script_cache_get_script(ScriptCache *script_cache, OPENTYPE_TAG tag) +{ + size_t i; + + for (i = 0; i < script_cache->script_count; ++i) + { + if (script_cache->scripts[i].tag == tag) + return &script_cache->scripts[i]; + } + + return NULL; +} + static void GSUB_initialize_script_cache(ScriptCache *psc) { int i; @@ -2510,6 +2523,7 @@ static void GPOS_expand_script_cache(ScriptCache *psc) int i, count; const OT_ScriptList *script; const GPOS_Header* header = (const GPOS_Header*)psc->GPOS_Table; + LoadedScript *loaded_script; if (!header) return; @@ -2539,24 +2553,18 @@ static void GPOS_expand_script_cache(ScriptCache *psc) { for (i = 0; i < count; i++) { - int j; int offset = GET_BE_WORD(script->ScriptRecord[i].Script); OPENTYPE_TAG tag = MS_MAKE_TAG(script->ScriptRecord[i].ScriptTag[0], script->ScriptRecord[i].ScriptTag[1], script->ScriptRecord[i].ScriptTag[2], script->ScriptRecord[i].ScriptTag[3]); - for (j = 0; j < psc->script_count; j++) - { - if (psc->scripts[j].tag == tag) - { - psc->scripts[j].gpos_table = ((const BYTE*)script + offset); - break; - } - } - if (j == psc->script_count) + + if (!(loaded_script = usp10_script_cache_get_script(psc, tag))) { psc->script_count++; - psc->scripts = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,psc->scripts, sizeof(LoadedScript) * psc->script_count); - psc->scripts[j].tag = tag; - psc->scripts[j].gpos_table = ((const BYTE*)script + offset); + psc->scripts = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + psc->scripts, psc->script_count * sizeof(*psc->scripts)); + loaded_script = &psc->scripts[psc->script_count - 1]; + loaded_script->tag = tag; } + loaded_script->gpos_table = (const BYTE *)script + offset; } } } @@ -2574,32 +2582,30 @@ static void _initialize_script_cache(ScriptCache *psc) HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) { int i; + const LoadedScript *script; HRESULT rc = S_OK; _initialize_script_cache(psc); *pcTags = psc->script_count; - if (!searchingFor && cMaxTags < *pcTags) + if (searchingFor) + { + if (!(script = usp10_script_cache_get_script(psc, searchingFor))) + return USP_E_SCRIPT_NOT_IN_FONT; + + *pScriptTags = script->tag; + *pcTags = 1; + return S_OK; + } + + if (cMaxTags < *pcTags) rc = E_OUTOFMEMORY; - else if (searchingFor) - rc = USP_E_SCRIPT_NOT_IN_FONT; - for (i = 0; i < psc->script_count; i++) + cMaxTags = min(cMaxTags, psc->script_count); + for (i = 0; i < cMaxTags; ++i) { - if (i < cMaxTags) - pScriptTags[i] = psc->scripts[i].tag; - - if (searchingFor) - { - if (searchingFor == psc->scripts[i].tag) - { - pScriptTags[0] = psc->scripts[i].tag; - *pcTags = 1; - rc = S_OK; - break; - } - } + pScriptTags[i] = psc->scripts[i].tag; } return rc; } @@ -2714,17 +2720,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, LoadedScript *script = NULL; _initialize_script_cache(psc); - - for (i = 0; i < psc->script_count; i++) - { - if (psc->scripts[i].tag == script_tag) - { - script = &psc->scripts[i]; - break; - } - } - - if (!script) + if (!(script = usp10_script_cache_get_script(psc, script_tag))) return E_INVALIDARG; _initialize_language_cache(script); @@ -2904,22 +2900,12 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) { int i; + LoadedScript *script; HRESULT rc = S_OK; - LoadedScript *script = NULL; LoadedLanguage *language = NULL; _initialize_script_cache(psc); - - for (i = 0; i < psc->script_count; i++) - { - if (psc->scripts[i].tag == script_tag) - { - script = &psc->scripts[i]; - break; - } - } - - if (!script) + if (!(script = usp10_script_cache_get_script(psc, script_tag))) { *pcTags = 0; if (!filtered)

1 0

Paul Gofman : d3dx9: Fix a warning output in preshader.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 3b99567192f30475b415c748f5e57b427fb67e10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b99567192f30475b415c748f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Mar 23 18:06:57 2017 +0300 d3dx9: Fix a warning output in preshader. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index b650f33..9aedc99 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -1088,16 +1088,11 @@ static HRESULT init_set_constants(struct d3dx_const_tab *const_tab, ID3DXConstan return ret; } -static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_ins *ins, - const struct d3dx_pres_operand *opr, unsigned int comp) +static double exec_get_arg(struct d3dx_regstore *rs, const struct d3dx_pres_operand *opr, unsigned int comp) { if (!regstore_is_val_set_reg(rs, opr->table, (opr->offset + comp) / table_info[opr->table].reg_component_count)) - { - WARN("Using uninitialized input "); - dump_arg(rs, opr, comp); - TRACE(".\n"); - dump_ins(rs, ins); - } + WARN("Using uninitialized input, table %u, offset %u.\n", opr->table, opr->offset + comp); + return regstore_get_double(rs, opr->table, opr->offset + comp); } @@ -1130,7 +1125,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) } for (k = 0; k < oi->input_count; ++k) for (j = 0; j < ins->component_count; ++j) - args[k * ins->component_count + j] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], + args[k * ins->component_count + j] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); @@ -1142,7 +1137,7 @@ static HRESULT execute_preshader(struct d3dx_preshader *pres) for (j = 0; j < ins->component_count; ++j) { for (k = 0; k < oi->input_count; ++k) - args[k] = exec_get_arg(&pres->regs, ins, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); + args[k] = exec_get_arg(&pres->regs, &ins->inputs[k], ins->scalar_op && !k ? 0 : j); res = oi->func(args, ins->component_count); exec_set_arg(&pres->regs, &ins->output, j, res); }

1 0

Hans Leidekker : wbemprox: Also free data for tables that don' t have a fill function (Valgrind).
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 66e3c97ca79f2dba590d281cfb4e04face345617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e3c97ca79f2dba590d281cf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:20 2017 +0100 wbemprox: Also free data for tables that don't have a fill function (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/table.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 273b8cb..ad56e0c 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -334,6 +334,7 @@ void free_table( struct table *table ) TRACE("destroying %p\n", table); heap_free( (WCHAR *)table->name ); free_columns( (struct column *)table->columns, table->num_cols ); + heap_free( table->data ); list_remove( &table->entry ); heap_free( table ); }

1 0

Hans Leidekker : winhttp: Fix a memory leak in insert_header (Valgrind).
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 08603e565bca3a64cf70b46b2b8cd8412fda37b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08603e565bca3a64cf70b46b2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 24 15:49:19 2017 +0100 winhttp: Fix a memory leak in insert_header (Valgrind). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index b2b72c7..3cdb6ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -368,25 +368,21 @@ static int get_header_index( request_t *request, LPCWSTR field, int requested_in static BOOL insert_header( request_t *request, header_t *header ) { - DWORD count; + DWORD count = request->num_headers + 1; header_t *hdrs; - count = request->num_headers + 1; - if (count > 1) + if (request->headers) hdrs = heap_realloc_zero( request->headers, sizeof(header_t) * count ); else - hdrs = heap_alloc_zero( sizeof(header_t) * count ); - - if (hdrs) - { - request->headers = hdrs; - request->headers[count - 1].field = strdupW( header->field ); - request->headers[count - 1].value = strdupW( header->value ); - request->headers[count - 1].is_request = header->is_request; - request->num_headers++; - return TRUE; - } - return FALSE; + hdrs = heap_alloc_zero( sizeof(header_t) ); + if (!hdrs) return FALSE; + + request->headers = hdrs; + request->headers[count - 1].field = strdupW( header->field ); + request->headers[count - 1].value = strdupW( header->value ); + request->headers[count - 1].is_request = header->is_request; + request->num_headers = count; + return TRUE; } static BOOL delete_header( request_t *request, DWORD index )

1 0

Henri Verbeet : usp10: Avoid LPVOID.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 213d3588a715418524986fcc4bafd8ef28f53db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=213d3588a715418524986fcc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 23 22:49:42 2017 +0100 usp10: Avoid LPVOID. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10_internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index d4d3434..f906885 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -180,11 +180,11 @@ typedef struct { BOOL sfnt; CacheGlyphPage *page[NUM_PAGES]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; - LPVOID GSUB_Table; - LPVOID GDEF_Table; - LPVOID CMAP_Table; - LPVOID CMAP_format12_Table; - LPVOID GPOS_Table; + void *GSUB_Table; + void *GDEF_Table; + void *CMAP_Table; + void *CMAP_format12_Table; + void *GPOS_Table; BOOL scripts_initialized; INT script_count; LoadedScript *scripts;

1 0

Francois Gouget : ddraw: Make ddraw_surface_release_iface() static.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: b7d0b4d8a6f7199e73b5e225ad6440614fb74161 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7d0b4d8a6f7199e73b5e225a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 24 03:43:45 2017 +0100 ddraw: Make ddraw_surface_release_iface() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/surface.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7d640f7..38ae28a7 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -215,7 +215,6 @@ struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddr void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct wined3d_texture *wined3d_texture, unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RECT *rect, BOOL read) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 247fb86..4c84783 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -529,7 +529,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) wined3d_texture_decref(surface->wined3d_texture); } -ULONG ddraw_surface_release_iface(struct ddraw_surface *This) +static ULONG ddraw_surface_release_iface(struct ddraw_surface *This) { ULONG iface_count;

1 0

Piotr Caban : msvcp100: Improve is_current_task_group_canceling function stub.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: 7ec727b31c98802a7e9ab1cfbae9e3539a279c2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ec727b31c98802a7e9ab1cfb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:10 2017 +0100 msvcp100: Improve is_current_task_group_canceling function stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 2 +- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp90/misc.c | 10 ++++------ dlls/msvcp90/msvcp90.h | 4 ++++ dlls/msvcp90/msvcp_main.c | 10 +++++++++- 7 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 6841678..7042598 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -2068,7 +2068,7 @@ @ extern ?is_bounded(a)_Num_base@std@@2_NB std_Num_base_is_bounded @ extern ?is_bounded(a)_Num_float_base@std@@2_NB std_Num_float_base_is_bounded @ extern ?is_bounded(a)_Num_int_base@std@@2_NB std_Num_int_base_is_bounded -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ extern ?is_exact(a)_Num_base@std@@2_NB std_Num_base_is_exact @ extern ?is_exact(a)_Num_float_base@std@@2_NB std_Num_float_base_is_exact @ extern ?is_exact(a)_Num_int_base@std@@2_NB std_Num_int_base_is_exact diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 602cb2b..52524c5 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -2832,7 +2832,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ stub ?is_task_cancellation_requested(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a839575..173728a 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) ctype_wchar_is_ch @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) ctype_wchar_is_ch -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) is_current_task_group_canceling +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() is_current_task_group_canceling @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) basic_istream_char_isfx @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) basic_istream_char_isfx @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) basic_istream_char_isfx diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 6bc6e5a..8a03b41 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -2774,7 +2774,7 @@ @ cdecl -arch=arm ?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBA_NF_W(a)Z @ thiscall -arch=i386 ?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QBE_NF_W(a)Z @ cdecl -arch=win64 ?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z(ptr long long) msvcp120.?is@?$ctype(a)_W@std@@QEBA_NF_W(a)Z -@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ(ptr) msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ +@ cdecl ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ() msvcp120.?is_current_task_group_canceling(a)Concurrency@@YA_NXZ @ cdecl -arch=arm ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAAXXZ @ thiscall -arch=i386 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEXXZ @ cdecl -arch=win64 ?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ(ptr) msvcp120.?isfx@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAXXZ diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 81a6f81..fa5ac1d 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1400,15 +1400,13 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) } #endif +#if _MSVCP_VER >= 100 /* ?is_current_task_group_canceling(a)Concurrency@@YA_NXZ */ -MSVCP_bool __cdecl is_current_task_group_canceling(void *this) +MSVCP_bool __cdecl is_current_task_group_canceling(void) { - static int once; - - if (!once++) - FIXME("(%p) stub\n", this); - return FALSE; + return Context_IsCurrentTaskCollectionCanceling(); } +#endif #if _MSVCP_VER >= 140 typedef struct { diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 86b787b..d751186 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -72,6 +72,10 @@ extern void (__thiscall *critical_section_unlock)(critical_section*); extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +extern MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + /* basic_string<char, char_traits<char>, allocator<char>> */ typedef struct { diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index 377ae01..3898c9d 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -68,6 +68,10 @@ void (__thiscall *critical_section_unlock)(critical_section*); MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); #endif +#if _MSVCP_VER >= 100 +MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); +#endif + #define VERSION_STRING(ver) #ver #if _MSVCP_VER >= 140 #define MSVCRT_NAME(ver) "ucrtbase.dll" @@ -133,7 +137,7 @@ int __cdecl sprintf(char *buf, const char *fmt, ...) static void init_cxx_funcs(void) { HMODULE hmod = GetModuleHandleA( MSVCRT_NAME(_MSVCP_VER) ); -#if _MSVCP_VER >= 110 +#if _MSVCP_VER >= 100 HMODULE hcon = hmod; #endif @@ -187,6 +191,10 @@ static void init_cxx_funcs(void) #endif } #endif /* _MSVCP_VER >= 110 */ + +#if _MSVCP_VER >= 100 + Context_IsCurrentTaskCollectionCanceling = (void*)GetProcAddress(hcon, "?IsCurrentTaskCollectionCanceling(a)Context@Concurrency@@SA_NXZ"); +#endif } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Piotr Caban : msvcrt: Add __ExceptionPtrCompare implementation.
by Alexandre Julliard March 24, 2017

March 24, 2017

Module: wine Branch: master Commit: cf7f632b31965b1f8ff6a4a69369326c4f146492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7f632b31965b1f8ff6a4a69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 24 12:45:14 2017 +0100 msvcrt: Add __ExceptionPtrCompare implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/cpp.c | 5 +++++ 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index a587c66..ecf2b26 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1691,8 +1691,8 @@ @ cdecl -arch=win64 ?_Xruntime_error(a)std@@YAXPEBD(a)Z(str) _Xruntime_error @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 06dd749..4b54ab1 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -410,8 +410,8 @@ @ cdecl ?_Value(a)_SpinCount@details(a)Concurrency@@SAIXZ() SpinCount__Value @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index b9826cf..9526502 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -688,8 +688,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index d8b1e2a..4f9fbec 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -670,8 +670,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) __ExceptionPtrCompare +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) __ExceptionPtrCompare @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) __ExceptionPtrCopy @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) __ExceptionPtrCopyException diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index b01f469..313d37c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -666,8 +666,8 @@ @ stub ?_Yield(a)_Context@details(a)Concurrency@@SAXXZ @ stub -arch=win32 ?__ExceptionPtrAssign@@YAXPAXPBX(a)Z @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX(a)Z -@ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z -@ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z +@ cdecl -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPBX0(a)Z +@ cdecl -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCompare@@YA_NPEBX0(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX(a)Z @ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX(a)Z @ cdecl -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z(ptr ptr ptr) msvcr120.?__ExceptionPtrCopyException@@YAXPAXPBX1(a)Z diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index e86df53..b5e21d9 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1671,6 +1671,11 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, } #endif +MSVCRT_bool __cdecl __ExceptionPtrCompare(const exception_ptr *ep1, const exception_ptr *ep2) +{ + return ep1->rec == ep2->rec; +} + void* __cdecl __AdjustPointer(void *obj, const this_ptr_offsets *off) { return get_this_pointer(off, obj);

1 0