March 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : d3dcompiler/tests: Update todos for tests that succeed with vkd3d 1.7.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: master Commit: b8807b994f9df0febf5fc22f0e71fae92181d79e URL: https://gitlab.winehq.org/wine/wine/-/commit/b8807b994f9df0febf5fc22f0e71fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 25 10:46:13 2023 +0100 d3dcompiler/tests: Update todos for tests that succeed with vkd3d 1.7. --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 9 ++++++--- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 7 ++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c index 3e6f3614986..ac0cf20e5ee 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d11.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d11.c @@ -492,7 +492,7 @@ static void test_trig(void) if (!init_test_context(&test_context)) return; - todo_wine ps_code = compile_shader(ps_source, "ps_4_0"); + ps_code = compile_shader(ps_source, "ps_4_0"); if (ps_code) { draw_quad(&test_context, ps_code); @@ -817,7 +817,7 @@ static void test_reflection(void) {"a", D3D_SIT_TEXTURE, 3, 1, D3D_SIF_TEXTURE_COMPONENTS, D3D_RETURN_TYPE_FLOAT, D3D_SRV_DIMENSION_TEXTURE2D, ~0u}, }; - todo_wine code = compile_shader(vs_source, "vs_5_0"); + code = compile_shader(vs_source, "vs_5_0"); if (!code) return; @@ -898,7 +898,10 @@ static void test_reflection(void) refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %lu.\n", refcount); + todo_wine code = compile_shader_flags(ps_source, "ps_4_0", D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + if (!code) + return; hr = D3DReflect(ID3D10Blob_GetBufferPointer(code), ID3D10Blob_GetBufferSize(code), &IID_ID3D11ShaderReflection, (void **)&reflection); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -1123,7 +1126,7 @@ static void test_semantic_reflection(void) { winetest_push_context("Test %u", i); - todo_wine_if (i > 5) code = compile_shader_flags(tests[i].source, tests[i].target, + todo_wine_if (i > 6) code = compile_shader_flags(tests[i].source, tests[i].target, tests[i].legacy ? D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY : 0); if (!code) { diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index b52b840f3bf..4fef301a721 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -691,7 +691,7 @@ static void test_trig(void) return; device = test_context.device; - todo_wine ps_code = compile_shader(ps_source, "ps_2_0"); + ps_code = compile_shader(ps_source, "ps_2_0"); if (ps_code) { draw_quad(device, ps_code); @@ -702,6 +702,7 @@ static void test_trig(void) float expect_x = (sinf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; float expect_y = (cosf(i * 2 * M_PI / 32) + 1.0f) / 2.0f; v = get_readback_vec4(&rb, i * 640 / 32, 0); + todo_wine ok(compare_vec4(v, expect_x, expect_y, 0.0f, 0.0f, 4096), "Test %u: Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e}.\n", i, v->x, v->y, v->z, v->w, expect_x, expect_y, 0.0f, 0.0f); @@ -767,7 +768,7 @@ static void test_return(void) draw_quad(test_context.device, ps_code); v = get_color_vec4(test_context.device, 0, 0); - todo_wine ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), + ok(compare_vec4(&v, 0.1f, 0.2f, 0.3f, 0.4f, 0), "Got unexpected value {%.8e, %.8e, %.8e, %.8e}.\n", v.x, v.y, v.z, v.w); ID3D10Blob_Release(ps_code); @@ -1102,7 +1103,7 @@ static void test_samplers(void) { hr = IDirect3DDevice9_Clear(test_context.device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_XRGB(255, 0, 0), 1.0f, 0); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#lx.\n", i, hr); - todo_wine_if (i < 3) ps_code = compile_shader(tests[i], "ps_2_0"); + ps_code = compile_shader(tests[i], "ps_2_0"); if (ps_code) { draw_quad(test_context.device, ps_code);

1 0

Alexandre Julliard : Wine release 7.0.2
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: website Branch: master Commit: 91d7ee250d2db8b73536d86f960f2d53e1ea9696 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/91d7ee250d2db8b73536d86f96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:10:26 2023 +0200 Wine release 7.0.2 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2023032701.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2023032701.xml b/news/en/2023032701.xml new file mode 100644 index 00000000..a73a5889 --- /dev/null +++ b/news/en/2023032701.xml @@ -0,0 +1,13 @@ +<news> +<date>March 27, 2023</date> +<title>Wine 7.0.2 Released</title> +<body> + The Wine stable release 7.0.2 is now available. + <a href="{$root}/announce/7.0.2">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.0/wine-7.0.2.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-7.0.2 : Alexandre Julliard : Release 7.0.2
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: refs/tags/wine-7.0.2 Tag: c89165f915266e0e60dd60e44cb1368370043839 URL: https://gitlab.winehq.org/wine/wine/-/tags/c89165f915266e0e60dd60e44cb13683… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 27 22:08:31 2023 +0200 Release 7.0.2

1 0

Alexandre Julliard : mountmgr: Don't crash if connecting to dbus fails.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 025172bdc9ca860afc5d5663c2e5c51da302241c URL: https://gitlab.winehq.org/wine/wine/-/commit/025172bdc9ca860afc5d5663c2e5c5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 16:45:57 2022 +0200 mountmgr: Don't crash if connecting to dbus fails. (cherry picked from commit 3110b72e12a2dba79a3993fe6511351a97ce1917) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 581d45e7702..e5f4240d8e1 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -600,6 +600,9 @@ static DBusMessage *device_by_iface_request( const char *iface ) DBusMessage *request, *reply; DBusMessageIter iter; DBusError error; + DBusConnection *connection = get_dhcp_connection(); + + if (!connection) return NULL; request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", "/org/freedesktop/NetworkManager", "org.freedesktop.NetworkManager", "GetDeviceByIpIface" ); @@ -609,7 +612,7 @@ static DBusMessage *device_by_iface_request( const char *iface ) p_dbus_message_iter_append_basic( &iter, DBUS_TYPE_STRING, &iface ); p_dbus_error_init( &error ); - reply = p_dbus_connection_send_with_reply_and_block( get_dhcp_connection(), request, -1, &error ); + reply = p_dbus_connection_send_with_reply_and_block( connection, request, -1, &error ); p_dbus_message_unref( request ); if (!reply) {

1 0

Zhiyi Zhang : gdi32/tests: Add more tests for GetTextMetrics().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: e743adebb14c988a0b995c00d6a8631aab0d7304 URL: https://gitlab.winehq.org/wine/wine/-/commit/e743adebb14c988a0b995c00d6a863… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 gdi32/tests: Add more tests for GetTextMetrics(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 821b36e00bd99924a454bf2e982fe7d4924f08e7) Conflicts: dlls/gdi32/tests/font.c Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 03ac72254cc..18fbf0660d6 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4010,7 +4010,10 @@ static INT CALLBACK enum_truetype_font_proc(const LOGFONTA *lf, const TEXTMETRIC static void test_GetTextMetrics(void) { + HFONT old_hf, hf; + TEXTMETRICA tm; LOGFONTA lf; + BOOL ret; HDC hdc; INT enumed; @@ -4021,6 +4024,19 @@ static void test_GetTextMetrics(void) enumed = 0; EnumFontFamiliesExA(hdc, &lf, enum_truetype_font_proc, (LPARAM)&enumed, 0); + /* Test a bug triggered by rounding up FreeType ppem */ + hf = CreateFontA(20, 0, 0, 0, FW_REGULAR, FALSE, FALSE, FALSE, DEFAULT_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, + "Tahoma"); + ok(hf != NULL, "CreateFontA failed, error %u\n", GetLastError()); + old_hf = SelectObject(hdc, hf); + ret = GetTextMetricsA(hdc, &tm); + ok(ret, "GetTextMetricsA failed, error %u\n", GetLastError()); + todo_wine + ok(tm.tmHeight <= 20, "Got unexpected tmHeight %d\n", tm.tmHeight); + SelectObject(hdc, old_hf); + DeleteObject(hf); + ReleaseDC(0, hdc); }

1 0

Zhiyi Zhang : win32u: Choose a smaller ppem to avoid exceeding the requested font height.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 047d3f054495e644fdfa28ea91668469918f7a11 URL: https://gitlab.winehq.org/wine/wine/-/commit/047d3f054495e644fdfa28ea916684… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 12 11:32:54 2022 +0800 win32u: Choose a smaller ppem to avoid exceeding the requested font height. When height > 0, CreateFontA/W() should not return a font face exceeding the requested height. For instance, Tahoma has 2049 units of ascent, 423 units of descent and its units per EM square is 2048. When requesting a font 20 pixels in height, ppem = units_per_EM * requested_height / (ascent + descent) = 2048 * 20 / (2049 + 423) = 16.57 ~= 17. When getting the resulting height back from the ppem, resulting_height = (ascent + descent) * ppem / units_per_EM = (2049.0 + 423) * 17 / 2048 = 20.52 ~=21. So it ends up getting a larger font than requested and violates the spec. Fix Nancy Drew: Legend of the Crystal Skull crash at start. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> (cherry picked from commit 58b477d1581f715d75c2e117ffa9489c6e64a678) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 1 - dlls/win32u/freetype.c | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 18fbf0660d6..5a67cf4fcf0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4032,7 +4032,6 @@ static void test_GetTextMetrics(void) old_hf = SelectObject(hdc, hf); ret = GetTextMetricsA(hdc, &tm); ok(ret, "GetTextMetricsA failed, error %u\n", GetLastError()); - todo_wine ok(tm.tmHeight <= 20, "Got unexpected tmHeight %d\n", tm.tmHeight); SelectObject(hdc, old_hf); DeleteObject(hf); diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index 77f4ef8eab3..0879c29b5f9 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -1975,10 +1975,18 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) if(height > 0) { USHORT windescent = get_fixed_windescent(pOS2->usWinDescent); + LONG units; + if(pOS2->usWinAscent + windescent == 0) - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pHori->Ascender - pHori->Descender); + units = pHori->Ascender - pHori->Descender; else - ppem = pFT_MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + windescent); + units = pOS2->usWinAscent + windescent; + ppem = pFT_MulDiv(ft_face->units_per_EM, height, units); + + /* If rounding ends up getting a font exceeding height, choose a smaller ppem */ + if(ppem > 1 && pFT_MulDiv(units, ppem, ft_face->units_per_EM) > height) + --ppem; + if(ppem > MAX_PPEM) { WARN("Ignoring too large height %d, ppem %d\n", height, ppem); ppem = 1;

1 0

Zebediah Figura : msvcrt: Add SEH annotations for sse2_memcpy().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: b17e54de418eac8a5e282102c5a1b2570faa6154 URL: https://gitlab.winehq.org/wine/wine/-/commit/b17e54de418eac8a5e282102c5a1b2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 17:02:24 2022 -0500 msvcrt: Add SEH annotations for sse2_memcpy(). This allows unwinding from a crash inside the function. (cherry picked from commit 57140421378ade6a5b5dea32bb94a1e8ab92906f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index d92b7a38d12..5071d2fa8b3 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2724,8 +2724,11 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) #define MEMMOVE_INIT \ "pushq " SRC_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " SRC_REG "\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "pushq " DEST_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " DEST_REG "\n\t") \ + __ASM_SEH(".seh_endprologue\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "movq %rcx, " DEST_REG "\n\t" \ "movq %rdx, " SRC_REG "\n\t"

1 0

Alexandre Julliard : gdiplus: Get the compositing mode directly from the graphics object.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: b30b5520a765ba6fcfd094ae0f7be3e31c8526dd URL: https://gitlab.winehq.org/wine/wine/-/commit/b30b5520a765ba6fcfd094ae0f7be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 28 14:44:35 2022 +0200 gdiplus: Get the compositing mode directly from the graphics object. GdipGetCompositingMode() fails when the object is busy, which happens when flushing changes in GdipReleaseDC(). Fixes a test crash on Gitlab CI. (cherry picked from commit fe7df461189e59e0e6d54a83ad3903f1fd93aa01) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphics.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 65cdf96510d..ff1e3cd1db9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -418,9 +418,7 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ { GpBitmap *dst_bitmap = (GpBitmap*)graphics->image; INT x, y; - CompositingMode comp_mode; - - GdipGetCompositingMode(graphics, &comp_mode); + CompositingMode comp_mode = graphics->compmode; for (y=0; y<src_height; y++) {

1 0

Kevin Puetz : vbscript: Don't abort when trying to TRACE() functions with many arguments.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 484f3e0ea4516ed8d97c20f13c07b7b501cb7d00 URL: https://gitlab.winehq.org/wine/wine/-/commit/484f3e0ea4516ed8d97c20f13c07b7… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Sep 28 17:53:36 2022 -0500 vbscript: Don't abort when trying to TRACE() functions with many arguments. __wine_dbg_output accumulates the output characters in a debug_info structure, flushing it when it encounters '\n'. If debug_info plus the new string exceed 1024 characters, append_output will print > wine_dbg_output: debugstr buffer overflow and then crash the process via abort(). wine_dbgstr_variant limits the length printed for any individual argument, but a function with multiple parameters can still plausibly exceed 1024. Fixed by formatting the TRACE for each argument on a separate line, as similar places (like oleaut32/typelib.c:dump_DispParms) do. (cherry picked from commit 0fb2d0f04e321100d0e166b804c2898f52be2ce7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/interp.c | 5 ++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d9d1eee741..4ad1cab3ab2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2422,7 +2422,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd heap_pool_init(&exec.heap); - TRACE("%s(", debugstr_w(func->name)); + TRACE("%s args=%u\n", debugstr_w(func->name),func->arg_cnt); if(func->arg_cnt) { VARIANT *v; unsigned i; @@ -2435,7 +2435,7 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd for(i=0; i < func->arg_cnt; i++) { v = get_arg(dp, i); - TRACE("%s%s", i ? ", " : "", debugstr_variant(v)); + TRACE(" [%d] %s\n", i, debugstr_variant(v)); if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { if(func->args[i].by_ref) exec.args[i] = *v; @@ -2452,7 +2452,6 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd }else { exec.args = NULL; } - TRACE(")\n"); if(func->var_cnt) { exec.vars = heap_alloc_zero(func->var_cnt * sizeof(VARIANT)); diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index a765eb1fcda..05a1fbf1c06 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -748,6 +748,11 @@ Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +function strlength(s1, s2, s3, s4, s5) + strlength = Len(s1 & s2 & s3 & s4 & s5) +end function +Call ok(strlength(String(500, "a"), String(500, "b"), String(500, "c"), String(500, "d"), String(500, "e")) = 500*5, "strlength(...) = 500*5") + sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ String(cnt, char) & """ expected """ & exp & """")

1 0

Torge Matthies : msvcp90: Fix segfault in bad_alloc exception default constructor.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 84692f4c9164b7653f6ac6a3a48a9735ddc9a587 URL: https://gitlab.winehq.org/wine/wine/-/commit/84692f4c9164b7653f6ac6a3a48a97… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Jun 7 10:30:07 2022 +0200 msvcp90: Fix segfault in bad_alloc exception default constructor. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 00012d3381c4fdd81d2e9c5fc7de5c74e7740cf9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index e5b6018fe31..eaf8121c56a 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -36,7 +36,7 @@ int* __cdecl __processing_throw(void); #if _MSVCP_VER >= 70 || defined(_MSVCIRT) typedef const char **exception_name; #define EXCEPTION_STR(name) (*name) -#define EXCEPTION_NAME(str) ((exception_name)&str) +#define EXCEPTION_NAME(str) (&str) #else typedef const char *exception_name; #define EXCEPTION_STR(name) (name) @@ -96,7 +96,7 @@ exception* __thiscall exception_copy_ctor(exception *this, const exception *rhs) this->name = rhs->name; this->do_free = FALSE; } else - MSVCP_exception_ctor(this, EXCEPTION_NAME(rhs->name)); + MSVCP_exception_ctor(this, (exception_name)EXCEPTION_NAME(rhs->name)); TRACE("name = %s\n", this->name); return this; } @@ -214,7 +214,7 @@ bad_alloc* __thiscall MSVCP_bad_alloc_ctor(bad_alloc *this, exception_name name) DEFINE_THISCALL_WRAPPER(MSVCP_bad_alloc_default_ctor, 4) bad_alloc* __thiscall MSVCP_bad_alloc_default_ctor(bad_alloc *this) { - static const char name[] = "bad allocation"; + static const char *name = "bad allocation"; return MSVCP_bad_alloc_ctor(this, EXCEPTION_NAME(name)); }

1 0