May 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : qmgr: Update to IBackgroundCopyJob4.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 60837d12a7c33ee634f1a8e6665f45d212896764 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60837d12a7c33ee634f1a8e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 8 15:40:21 2020 +0300 qmgr: Update to IBackgroundCopyJob4. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/enum_jobs.c | 14 +- dlls/qmgr/file.c | 4 +- dlls/qmgr/job.c | 629 +++++++++++++++++++++++--------------------------- dlls/qmgr/qmgr.c | 10 +- dlls/qmgr/qmgr.h | 2 +- 5 files changed, 300 insertions(+), 359 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=60837d12a7c33ee634f1…

1 0

Tag wine-5.8 : Alexandre Julliard : Release 5.8
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: refs/tags/wine-5.8 Tag: 09ebdfe73ebf3eeeb414054a39de169add168523 URL: https://source.winehq.org/git/wine.git/?a=tag;h=09ebdfe73ebf3eeeb414054a39d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8

1 0

Zhiyi Zhang : dxgi/tests: Add more default full screen swapchain target output tests.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 3a93767da77fd1bf5c735f659a540b28b5a2e1e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a93767da77fd1bf5c735f65… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:51:03 2020 +0800 dxgi/tests: Add more default full screen swapchain target output tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 208 +++++++++++++++++++++++++++++++++---------------- 1 file changed, 139 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a93767da77fd1bf5c73…

1 0

Alexandre Julliard : Release 5.8.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: bf1abbac0c93e46b6b037dbd7f975c8b2f951b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1abbac0c93e46b6b037dbd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 22:18:56 2020 +0200 Release 5.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 970 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 448 insertions(+), 543 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1abbac0c93e46b6b03…

1 0

Zhiyi Zhang : wined3d: Move device window to the correct output when changing swapchain state to full screen.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: e847b082296547376309f25d9947f2367f98a9ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=e847b082296547376309f25d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:52:12 2020 +0800 wined3d: Move device window to the correct output when changing swapchain state to full screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 20 +++++++++++++++----- dlls/wined3d/swapchain.c | 38 +++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16bd84164..1711014c8d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4954,6 +4954,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -4971,11 +4977,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, swapchain_desc, output, mode))) return hr; @@ -4988,13 +4989,22 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { DWORD style = swapchain_state->style; DWORD exstyle = swapchain_state->exstyle; + struct wined3d_output_desc output_desc; + /* If we're in fullscreen, and the mode wasn't changed, we have to get * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + swapchain_state->style = 0; swapchain_state->exstyle = 0; wined3d_swapchain_state_setup_fullscreen(swapchain_state, swapchain_state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); swapchain_state->style = style; swapchain_state->exstyle = exstyle; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3071afb8ae..466bcd95ca 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -872,13 +872,14 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; + struct wined3d_output_desc output_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; + HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; HWND window; - HRESULT hr; wined3d_mutex_lock(); @@ -933,8 +934,21 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - wined3d_swapchain_state_setup_fullscreen(&swapchain->state, - window, desc->backbuffer_width, desc->backbuffer_height); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + goto err; + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + goto err; + } + + wined3d_swapchain_state_setup_fullscreen(&swapchain->state, window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, desc->backbuffer_width, + desc->backbuffer_height); } swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, @@ -1551,7 +1565,7 @@ static LONG fullscreen_exstyle(LONG exstyle) } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) + HWND window, int x, int y, int width, int height) { LONG style, exstyle; BOOL filter; @@ -1583,7 +1597,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, x, y, width, height, + SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); wined3d_filter_messages(window, filter); @@ -1647,6 +1662,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; HRESULT hr; TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", @@ -1695,10 +1711,17 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + if (state->desc.windowed) { /* Switch from windowed to fullscreen */ - if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, width, height))) + if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, height))) return hr; } else @@ -1708,7 +1731,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st /* Fullscreen -> fullscreen mode change */ filter = wined3d_filter_messages(window, TRUE); - MoveWindow(window, 0, 0, width, height, TRUE); + MoveWindow(window, output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, + height, TRUE); ShowWindow(window, SW_SHOW); wined3d_filter_messages(window, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a412d7a8e..0e20d1fc9b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4720,7 +4720,7 @@ struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) DECLSPEC_HIDDEN; + HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops {

1 0

Zhiyi Zhang : dxgi/tests: Add more get swapchain containing output tests.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: c84c7a553d3ac6927565f4652f78edc8e8af093f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c84c7a553d3ac6927565f465… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:54:31 2020 +0800 dxgi/tests: Add more get swapchain containing output tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 251 +++++++++++++++++++++++++++++++------------------ 1 file changed, 161 insertions(+), 90 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c84c7a553d3ac6927565…

1 0

Zhiyi Zhang : wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init().
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 094c344f2783a578bc7fed4a61f891f0c7b1e7ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=094c344f2783a578bc7fed4a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu May 7 15:51:56 2020 +0800 wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd0419412a..3071afb8ae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -895,7 +895,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc window = desc->device_window ? desc->device_window : device->create_parms.focus_window; if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) - return hr; + { + ERR("Failed to initialise swapchain state, hr %#x.\n", hr); + goto err; + } swapchain->swapchain_ops = swapchain_ops; swapchain->device = device;

1 0

Jacek Caban : comdlg32: Improve error handling in get_config_key_string.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: a16b9ff58334e47a170170a339f2bbb3ae942a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a16b9ff58334e47a170170a3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 8 16:41:12 2020 +0200 comdlg32: Improve error handling in get_config_key_string. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 6b79fcfc83..538358bd5f 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -250,11 +250,10 @@ static BOOL get_config_key_string(HKEY hkey, const WCHAR *name, WCHAR **value) DWORD type, size; WCHAR *str; - if (hkey && !RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) - { - if (type != REG_SZ && type != REG_EXPAND_SZ) - return FALSE; - } + if (RegQueryValueExW(hkey, name, 0, &type, NULL, &size)) + return FALSE; + if (type != REG_SZ && type != REG_EXPAND_SZ) + return FALSE; str = heap_alloc(size); if (RegQueryValueExW(hkey, name, 0, &type, (BYTE *)str, &size))

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseEncoder function.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 85dbf7b0144e29ab33274b252f59a278608c278e URL: https://source.winehq.org/git/wine.git/?a=commit;h=85dbf7b0144e29ab33274b25… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:36:44 2020 +0200 msasn1: Add stub for ASN1_CloseEncoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 5c9c6a5c86..f6ad865282 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -137,3 +137,8 @@ ASN1error_e WINAPI ASN1_CreateEncoder(ASN1module_t module, ASN1encoding_t *encod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseEncoder(ASN1encoding_t encoder) +{ + FIXME("(%p): Stub!\n", encoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index d79128344f..4ebc8f32ef 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -218,7 +218,7 @@ @ stub ASN1PERFreeSeqOf @ stub ASN1_CloseDecoder @ stub ASN1_CloseEncoder2 -@ stub ASN1_CloseEncoder +@ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) @ stub ASN1_CreateDecoder @ stub ASN1_CreateDecoderEx diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index e0ffbcd623..9d2c4231f7 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -118,6 +118,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -134,6 +135,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -150,6 +152,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -166,14 +169,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1ENCODE_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -192,6 +198,7 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == ASN1ENCODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(!!encoder,"Encoder creation failed.\n"); @@ -207,14 +214,17 @@ static void test_CreateEncoder(void) ok(!encoder->cbExtraHeader,"Got incorrect cbExtraHeader = %u.\n",encoder->cbExtraHeader); ok(encoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",encoder->eRule); ok(encoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1ENCODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateEncoder(mod, &encoder, buf, 0, NULL); ok(encoder->dwFlags == 0,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ret = ASN1_CreateEncoder(mod, &encoder, buf, 4, NULL); ok(encoder->dwFlags == ASN1ENCODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",encoder->dwFlags); + ASN1_CloseEncoder(encoder); ASN1_CloseModule(mod); }

1 0

Vijay Kiran Kamuju : msasn1: Add stub for ASN1_CloseDecoder function.
by Alexandre Julliard May 8, 2020

May 8, 2020

Module: wine Branch: master Commit: 9bf81247849ea77721d60a8bb155eb61b5cca985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bf81247849ea77721d60a8b… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri May 8 11:43:50 2020 +0200 msasn1: Add stub for ASN1_CloseDecoder function. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msasn1/main.c | 5 +++++ dlls/msasn1/msasn1.spec | 2 +- dlls/msasn1/tests/asn1.c | 10 ++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msasn1/main.c b/dlls/msasn1/main.c index 435dd0e2e1..c96be7d07d 100644 --- a/dlls/msasn1/main.c +++ b/dlls/msasn1/main.c @@ -185,3 +185,8 @@ ASN1error_e WINAPI ASN1_CreateDecoder(ASN1module_t module, ASN1decoding_t *decod return ASN1_SUCCESS; } + +void WINAPI ASN1_CloseDecoder(ASN1decoding_t decoder) +{ + FIXME("(%p): Stub!\n", decoder); +} diff --git a/dlls/msasn1/msasn1.spec b/dlls/msasn1/msasn1.spec index 5ec3f08d52..f98a4a62d7 100644 --- a/dlls/msasn1/msasn1.spec +++ b/dlls/msasn1/msasn1.spec @@ -216,7 +216,7 @@ @ stub ASN1PEREncUnsignedShort @ stub ASN1PEREncZero @ stub ASN1PERFreeSeqOf -@ stub ASN1_CloseDecoder +@ stdcall ASN1_CloseDecoder(ptr) @ stub ASN1_CloseEncoder2 @ stdcall ASN1_CloseEncoder(ptr) @ stdcall ASN1_CloseModule(ptr) diff --git a/dlls/msasn1/tests/asn1.c b/dlls/msasn1/tests/asn1.c index 017124d229..6bd95352ed 100644 --- a/dlls/msasn1/tests/asn1.c +++ b/dlls/msasn1/tests/asn1.c @@ -261,6 +261,7 @@ static void test_CreateDecoder(void) ok(!decoder->pos,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == ASN1DECODE_NOASSERT,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -276,6 +277,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER), "Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 2, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -291,6 +293,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(ASN1_SUCCEEDED(ret),"Got error code %d.\n",ret); @@ -306,14 +309,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_BER_RULE_DER,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_BER_RULE_DER, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NOASSERT, 1, encfn, decfn, freefn, size, name); @@ -331,6 +337,7 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %s.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect eRule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1DECODE_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(!!decoder,"Decoder creation failed.\n"); @@ -345,14 +352,17 @@ static void test_CreateDecoder(void) ok(decoder->pos==buf,"Got incorrect pos = %p.\n",decoder->pos); ok(decoder->eRule == ASN1_PER_RULE_ALIGNED,"Got incorrect rule = %08x.\n",decoder->eRule); ok(decoder->dwFlags == (ASN1FLAGS_NOASSERT|ASN1DECODE_SETBUFFER),"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); mod = ASN1_CreateModule(ASN1_THIS_VERSION, ASN1_PER_RULE_ALIGNED, ASN1FLAGS_NONE, 1, encfn, decfn, freefn, size, name); ret = ASN1_CreateDecoder(mod, &decoder, buf, 0, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ret = ASN1_CreateDecoder(mod, &decoder, buf, 4, NULL); ok(decoder->dwFlags == ASN1DECODE_SETBUFFER,"Got incorrect dwFlags = %08x.\n",decoder->dwFlags); + ASN1_CloseDecoder(decoder); ASN1_CloseModule(mod); }

1 0