June 2021 - Wine-commits - list.winehq.org

Piotr Caban : msvcr110: Copy utf16 strings in _Gettnames.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: b1b8412f96ca5e302c004c7b3416c348b9724cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b8412f96ca5e302c004c7b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 2 18:55:33 2021 +0100 msvcr110: Copy utf16 strings in _Gettnames. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50409 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b3fcb0f2c854311bd1604df958a6425c22c657b3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 13 ++++++++++--- dlls/msvcrt/locale.c | 12 ++++++++++++ dlls/msvcrt/tests/locale.c | 4 ++++ 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 5976a86963a..a68870ac77b 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -171,6 +171,7 @@ static int (__cdecl *p__dpcomp)(double x, double y); static wchar_t** (CDECL *p____lc_locale_name_func)(void); static unsigned int (CDECL *p__GetConcurrency)(void); static void* (CDECL *p__W_Gettnames)(void); +static void* (CDECL *p__Gettnames)(void); static void (CDECL *p_free)(void*); static float (CDECL *p_strtof)(const char *, char **); static int (CDECL *p__finite)(double); @@ -242,6 +243,7 @@ static BOOL init(void) p____lc_locale_name_func = (void*)GetProcAddress(module, "___lc_locale_name_func"); p__GetConcurrency = (void*)GetProcAddress(module,"?_GetConcurrency(a)details@Concurrency@@YAIXZ"); p__W_Gettnames = (void*)GetProcAddress(module, "_W_Gettnames"); + p__Gettnames = (void*)GetProcAddress(module, "_Gettnames"); p_free = (void*)GetProcAddress(module, "free"); p_strtof = (void*)GetProcAddress(module, "strtof"); p__finite = (void*)GetProcAddress(module, "_finite"); @@ -531,7 +533,7 @@ static void test__GetConcurrency(void) ok(c == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, c); } -static void test__W_Gettnames(void) +static void test_gettnames(void* (CDECL *p_gettnames)(void)) { static const char *str[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", @@ -557,7 +559,7 @@ static void test__W_Gettnames(void) if(!p_setlocale(LC_ALL, "english")) return; - ret = p__W_Gettnames(); + ret = p_gettnames(); size = ret->str[0]-(char*)ret; if(sizeof(void*) == 8) ok(size==0x2c0, "structure size: %x\n", size); @@ -572,6 +574,10 @@ static void test__W_Gettnames(void) ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } + + ok(ret->str[42] + strlen(ret->str[42])+1 == (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); p_free(ret); p_setlocale(LC_ALL, "C"); @@ -1111,7 +1117,8 @@ START_TEST(msvcr120) test__dpcomp(); test____lc_locale_name_func(); test__GetConcurrency(); - test__W_Gettnames(); + test_gettnames(p__W_Gettnames); + test_gettnames(p__Gettnames); test__strtof(); test_remainder(); test_critical_section(); diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ba98d31d719..c064d12edd6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -802,6 +802,10 @@ void* CDECL _Gettnames(void) for(i=0; i<ARRAY_SIZE(cur->str.str); i++) size += strlen(cur->str.str[i])+1; +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) + size += (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); +#endif ret = malloc(size); if(!ret) @@ -815,6 +819,14 @@ void* CDECL _Gettnames(void) ret->str.str[i] = &ret->data[size]; size += len; } +#if _MSVCR_VER >= 110 + for(i=0; i<ARRAY_SIZE(cur->wstr.wstr); i++) { + len = (wcslen(cur->wstr.wstr[i]) + 1) * sizeof(wchar_t); + memcpy(&ret->data[size], cur->wstr.wstr[i], len); + ret->wstr.wstr[i] = (wchar_t*)&ret->data[size]; + size += len; + } +#endif return ret; } diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 176e3b5e6e4..030d65de3cb 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -733,6 +733,10 @@ static void test__Gettnames(void) ok(!strcmp(ret->str[i], buf), "ret->str[%i] = %s, expected %s\n", i, ret->str[i], buf); } + ok(ret->wstr[0] != NULL, "ret->wstr[0] = NULL\n"); + ok(ret->str[42] + strlen(ret->str[42])+1 != (char*)ret->wstr[0], + "ret->str[42] = %p len = %d, ret->wstr[0] = %p\n", + ret->str[42], strlen(ret->str[42]), ret->wstr[0]); free(ret); if(!setlocale(LC_TIME, "german"))

1 0

Piotr Caban : concrt140: Add arm exports.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: ec8c5545c3c5f0395619bd7a4558013978d2c3a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8c5545c3c5f0395619bd7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 3 16:23:03 2021 +0100 concrt140: Add arm exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2201ca08fb03d069fa2ccf46773c150a6f7988bc) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 259 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 233 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec8c5545c3c5f0395619…

1 0

Zebediah Figura : winemac: Send systray messages with SendNotifyMessage().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 2e1ba07a11b35b2a0243f4a5cbbbed86ffc37c3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e1ba07a11b35b2a0243f4a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:32 2021 -0600 winemac: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 46c4facab73558af8e9d1c96093656ce06cdf51b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winemac.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 75bca5e3d51..d026f0b970b 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -290,7 +290,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) } TRACE("posting msg 0x%04x to hwnd %p id 0x%x\n", msg, icon->owner, icon->id); - if (!PostMessageW(icon->owner, icon->callback_message, wp, lp) && + if (!SendNotifyMessageW(icon->owner, icon->callback_message, wp, lp) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id);

1 0

Zebediah Figura : winex11: Send systray messages with SendNotifyMessage().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 02850d83bf064f05c38bf0e5b5ff645f5ccae555 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02850d83bf064f05c38bf0e5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 30 13:54:33 2021 -0600 winex11: Send systray messages with SendNotifyMessage(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50441 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5c09d815f838ec349816840f6992187acd4f72bb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winex11.drv/systray.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 3be4bd65347..70462a14a6f 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -451,7 +451,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) } TRACE( "relaying 0x%x\n", msg ); - if (!PostMessageW( icon->owner, icon->callback_message, wp, lp ) && + if (!SendNotifyMessageW( icon->owner, icon->callback_message, wp, lp ) && (GetLastError() == ERROR_INVALID_WINDOW_HANDLE)) { WARN( "application window was destroyed, removing icon %u\n", icon->id );

1 0

Henri Verbeet : wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 1eead2aaca540d0b03c99359b256739328c2ce39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eead2aaca540d0b03c99359… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 11 11:52:15 2021 +0100 wined3d: Create the backbuffer rendertarget view only after calling adapter_init_3d(). Otherwise we may not be able to acquire a context to create the view. In practice, this is only an issue for d3d9 and earlier in combination with the Vulkan backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b9a440d15d84e7967f70b38291d2f85767fb7a6f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/device.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c16a3c691e..a2c3bee135a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1088,6 +1088,24 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; + device->swapchain_count = 1; + if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) + { + ERR("Failed to allocate swapchain array.\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + device->swapchains[0] = swapchain; + + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) + if (device->state.fb.render_targets[i]) + wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); + + memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); + if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) + goto err_out; + device->d3d_initialized = TRUE; + swapchain_desc = &swapchain->state.desc; if (swapchain_desc->backbuffer_count && swapchain_desc->backbuffer_bind_flags & WINED3D_BIND_RENDER_TARGET) { @@ -1104,28 +1122,12 @@ HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, str NULL, &wined3d_null_parent_ops, &device->back_buffer_view))) { ERR("Failed to create rendertarget view, hr %#x.\n", hr); - return hr; + device->adapter->adapter_ops->adapter_uninit_3d(device); + device->d3d_initialized = FALSE; + goto err_out; } } - device->swapchain_count = 1; - if (!(device->swapchains = heap_calloc(device->swapchain_count, sizeof(*device->swapchains)))) - { - ERR("Failed to allocate swapchain array.\n"); - hr = E_OUTOFMEMORY; - goto err_out; - } - device->swapchains[0] = swapchain; - - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - if (device->state.fb.render_targets[i]) - wined3d_rtv_bind_count_dec(device->state.fb.render_targets[i]); - - memset(device->state.fb.render_targets, 0, sizeof(device->state.fb.render_targets)); - if (FAILED(hr = device->adapter->adapter_ops->adapter_init_3d(device))) - goto err_out; - device->d3d_initialized = TRUE; - device_init_swapchain_state(device, swapchain); TRACE("All defaults now set up.\n"); @@ -1147,11 +1149,6 @@ err_out: heap_free(device->swapchains); device->swapchains = NULL; device->swapchain_count = 0; - if (device->back_buffer_view) - { - wined3d_rendertarget_view_decref(device->back_buffer_view); - device->back_buffer_view = NULL; - } return hr; }

1 0

Henri Verbeet : d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: c760f6b9de0224e0ca778cd29dd3e4e926880023 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c760f6b9de0224e0ca778cd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:23:58 2021 +0100 d3d11/tests: Add format compatibility tests for DXGI_FORMAT_R9G9B9E5_SHAREDEXP. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 70c09cd89d7b6c181dcef4ad35f49f13ee429ac6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9fc09a5ec83..1fbc91bb5e1 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -26557,6 +26557,13 @@ static void test_format_compatibility(void) {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_UINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R32_SINT, 4, TRUE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_B8G8R8A8_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R9G9B9E5_SHAREDEXP, DXGI_FORMAT_R16G16_TYPELESS, 4, FALSE}, {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, @@ -26590,6 +26597,7 @@ static void test_format_compatibility(void) for (i = 0; i < ARRAY_SIZE(test_data); ++i) { unsigned int x, y, texel_dwords; + BOOL broken = FALSE; D3D11_BOX box; texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); @@ -26617,15 +26625,23 @@ static void test_format_compatibility(void) texel_dwords = test_data[i].texel_size / sizeof(DWORD); get_texture_readback(dst_texture, 0, &rb); - for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + colour = get_readback_color(&rb, 0, 0, 0); + if (test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && colour == bitmap_data[0]) + { + win_skip("Broken destination offset for %#x -> %#x copy.\n", + test_data[i].src_format, test_data[i].dst_format); + broken = TRUE; + } + for (j = 0; j < ARRAY_SIZE(bitmap_data) && !broken; ++j) { x = j % 4; y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success && x >= texel_dwords && y ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb); @@ -26638,8 +26654,9 @@ static void test_format_compatibility(void) y = j / 4; colour = get_readback_color(&rb, x, y, 0); expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; - ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", - i, colour, x, y, expected); + todo_wine_if(test_data[i].src_format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP && expected) + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); } release_resource_readback(&rb);

1 0

Henri Verbeet : wined3d: Allow resource copies between block-compatible formats.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: dff027f211f1df5010fef3edf622b43c4720de94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dff027f211f1df5010fef3ed… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Feb 10 00:24:02 2021 +0100 wined3d: Allow resource copies between block-compatible formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 02385a4042daf096a6ca693e74e6bc9043e3ae5e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 10 ++--- dlls/wined3d/device.c | 24 ++++++++++-- dlls/wined3d/utils.c | 83 ++++++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 76 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dff027f211f1df5010fe…

1 0

Hans Leidekker : wbemprox: Report the real OS version.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 18ab8254e98dc05cb60396c381ae383373bb808e URL: https://source.winehq.org/git/wine.git/?a=commit;h=18ab8254e98dc05cb60396c3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 2 14:25:20 2021 +0100 wbemprox: Report the real OS version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50580 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ba06f7a541c44343a9751cc6105211c1ef058c49) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9ae34a50c0d..f1cf75ab380 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3514,13 +3514,13 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct { struct record_operatingsystem *rec; enum fill_status status = FILL_STATUS_UNFILTERED; - OSVERSIONINFOEXW ver; + RTL_OSVERSIONINFOEXW ver; UINT row = 0; if (!resize_table( table, 1, sizeof(*rec) )) return FILL_STATUS_FAILED; ver.dwOSVersionInfoSize = sizeof(ver); - GetVersionExW( (OSVERSIONINFOW *)&ver ); + RtlGetVersion( &ver ); rec = (struct record_operatingsystem *)table->data; rec->buildnumber = get_osbuildnumber( &ver );

1 0

Austin English : ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: d81c2f2fa7d9d326a43db6ee76637cd2c404532d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81c2f2fa7d9d326a43db6ee… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 1 15:25:41 2021 -0600 ntoskrnl.exe: Add KdDisableDebugger/KdEnableDebugger stubs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50599 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e8cb99466b053e4fb2c720cb56bf7ba1d4e4a4d1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2e6131c32c7..9dc5809614a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4256,6 +4256,18 @@ void WINAPI KeUnstackDetachProcess(KAPC_STATE *apc_state) FIXME("apc_state %p stub.\n", apc_state); } +NTSTATUS WINAPI KdDisableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + +NTSTATUS WINAPI KdEnableDebugger(void) +{ + FIXME(": stub.\n"); + return STATUS_DEBUGGER_INACTIVE; +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d57a2f81df6..22968913300 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -515,8 +515,8 @@ @ stub IoWriteTransferCount @ extern KdDebuggerEnabled @ stub KdDebuggerNotPresent -@ stub KdDisableDebugger -@ stub KdEnableDebugger +@ stdcall KdDisableDebugger() +@ stdcall KdEnableDebugger() @ stub KdEnteredDebugger @ stub KdPollBreakIn @ stub KdPowerTransition

1 0

Roman Pišl : conhost: Fix copy-paste error when setting windows size.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: stable Commit: 9dff1027d550783186dcfa027bfb6c08faad2a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dff1027d550783186dcfa02… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Feb 1 18:29:15 2021 +0100 conhost: Fix copy-paste error when setting windows size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50602 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 361b4c381e7a94e5a2ef25e7dca77440dd983444) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/conhost/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index 55690377a7e..5e94a1d454e 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -1885,7 +1885,7 @@ static void apply_config( struct console *console, const struct console_config * console->active->attr = config->attr; console->active->popup_attr = config->popup_attr; console->active->win.left = config->win_pos.X; - console->active->win.right = config->win_pos.Y; + console->active->win.top = config->win_pos.Y; console->active->win.right = config->win_pos.X + config->win_width - 1; console->active->win.bottom = config->win_pos.Y + config->win_height - 1; memcpy( console->active->color_map, config->color_map, sizeof(config->color_map) );

1 0