February 2022 - Wine-Commits

Henri Verbeet : d2d1/tests: Declare "level" as D3D_FEATURE_LEVEL in create_d3d11_device().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: a6b44a551f8e5aafb11a90e53447d0fbb102150f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b44a551f8e5aafb11a90e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 19:40:08 2022 +0100 d2d1/tests: Declare "level" as D3D_FEATURE_LEVEL in create_d3d11_device(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 314d8b7ce60..003aad60505 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -824,7 +824,7 @@ static ID3D10Device1 *create_d3d10_device(void) static ID3D11Device *create_d3d11_device(void) { - DWORD level = D3D_FEATURE_LEVEL_11_0; + D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_11_0; ID3D11Device *device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL,

1 0

Eric Pouech : d3dx11/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 513720542547af3195994a73e8e51ab5e15152b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=513720542547af3195994a73… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 19:40:06 2022 +0100 d3dx11/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/tests/Makefile.in | 1 - dlls/d3dx11_43/tests/Makefile.in | 1 - dlls/d3dx11_43/tests/d3dx11.c | 145 ++++++++++++++++++++------------------- 3 files changed, 73 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=513720542547af319599…

1 0

Paul Gofman : hnetcfg/tests: Don't leak IEnumVARIANT reference in test_static_port_mapping_collection().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 69acffb95424c06e8f9eacfa9fe9969e2ae3261c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69acffb95424c06e8f9eacfa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:33 2022 +0300 hnetcfg/tests: Don't leak IEnumVARIANT reference in test_static_port_mapping_collection(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index b6b353ac87d..f344019d1d3 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -188,6 +188,7 @@ static void test_static_port_mapping_collection( IStaticPortMappingCollection *p hr = IUnknown_QueryInterface(unk, &IID_IEnumVARIANT, (void **)&enum_ports); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IUnknown_Release( unk ); refcount2 = get_refcount((IUnknown *)ports); ok(refcount2 == refcount, "Got unexpected refcount %u, refcount2 %u.\n", refcount, refcount2);

1 0

Nikolay Sivov : msxml3: Fix long types warnings in traces.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 624202be4bfdbec9955eb0d3cf301d48742c13d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=624202be4bfdbec9955eb0d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 3 13:48:04 2022 +0300 msxml3: Fix long types warnings in traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/Makefile.in | 1 - dlls/msxml3/attribute.c | 8 ++-- dlls/msxml3/bsc.c | 33 ++++++++------- dlls/msxml3/cdata.c | 40 ++++++++---------- dlls/msxml3/comment.c | 40 ++++++++---------- dlls/msxml3/dispex.c | 54 ++++++++++-------------- dlls/msxml3/docfrag.c | 25 ++++++----- dlls/msxml3/doctype.c | 25 ++++++----- dlls/msxml3/domdoc.c | 42 ++++++++++--------- dlls/msxml3/domimpl.c | 23 +++++----- dlls/msxml3/element.c | 29 +++++++------ dlls/msxml3/entityref.c | 7 ++-- dlls/msxml3/factory.c | 20 +++++---- dlls/msxml3/httprequest.c | 104 ++++++++++++++++++++-------------------------- dlls/msxml3/main.c | 2 +- dlls/msxml3/mxnamespace.c | 18 ++++---- dlls/msxml3/mxwriter.c | 52 +++++++++-------------- dlls/msxml3/node.c | 30 +++++-------- dlls/msxml3/nodelist.c | 13 +++--- dlls/msxml3/nodemap.c | 17 ++++---- dlls/msxml3/parseerror.c | 7 ++-- dlls/msxml3/pi.c | 8 ++-- dlls/msxml3/saxreader.c | 34 ++++++--------- dlls/msxml3/schema.c | 14 +++---- dlls/msxml3/selection.c | 20 ++++----- dlls/msxml3/stylesheet.c | 10 ++--- dlls/msxml3/text.c | 18 ++++---- dlls/msxml3/xmldoc.c | 17 +++----- dlls/msxml3/xmlelem.c | 31 +++++--------- dlls/msxml3/xmlparser.c | 26 ++++-------- dlls/msxml3/xmlview.c | 84 +++++++++++++++---------------------- 31 files changed, 373 insertions(+), 479 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=624202be4bfdbec9955e…

1 0

Eric Pouech : msvcrt: Add cast to avoid 'long' types warning in _beginthreadex.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 800971f9344e67067f0c8c96a8ffb4c264414d4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=800971f9344e67067f0c8c96… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:24 2022 +0100 msvcrt: Add cast to avoid 'long' types warning in _beginthreadex. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index 173763d0eb1..e71b949a6d5 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -235,7 +235,7 @@ uintptr_t CDECL _beginthreadex( #endif thread = CreateThread(security, stack_size, _beginthreadex_trampoline, - trampoline, initflag, thrdaddr); + trampoline, initflag, (DWORD *)thrdaddr); if(!thread) { #if _MSVCR_VER >= 140 FreeLibrary(trampoline->module);

1 0

Eric Pouech : msvcrt: Add casts to avoid 'long' types warning in locale functions.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 29541adafa3fc7422293dc4ea385535b9dbc3c99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29541adafa3fc7422293dc4e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 11:50:30 2022 +0100 msvcrt: Add casts to avoid 'long' types warning in locale functions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 4c0fce194bd..3b3d027f466 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -429,13 +429,13 @@ static void copy_threadlocinfo_category(pthreadlocinfo locinfo, if(!locinfo->lc_category[category].locale) { locinfo->lc_category[category].locale = old_locinfo->lc_category[category].locale; locinfo->lc_category[category].refcount = old_locinfo->lc_category[category].refcount; - InterlockedIncrement(locinfo->lc_category[category].refcount); + InterlockedIncrement((LONG *)locinfo->lc_category[category].refcount); } #if _MSVCR_VER >= 110 locinfo->lc_name[category] = old_locinfo->lc_name[category]; locinfo->lc_category[category].wrefcount = old_locinfo->lc_category[category].wrefcount; if(locinfo->lc_category[category].wrefcount) - InterlockedIncrement(locinfo->lc_category[category].wrefcount); + InterlockedIncrement((LONG *)locinfo->lc_category[category].wrefcount); #endif } @@ -560,21 +560,21 @@ static void grab_locinfo(pthreadlocinfo locinfo) { int i; - InterlockedIncrement(&locinfo->refcount); + InterlockedIncrement((LONG *)&locinfo->refcount); for(i=LC_MIN+1; i<=LC_MAX; i++) { - InterlockedIncrement(locinfo->lc_category[i].refcount); + InterlockedIncrement((LONG *)locinfo->lc_category[i].refcount); if(locinfo->lc_category[i].wrefcount) - InterlockedIncrement(locinfo->lc_category[i].wrefcount); + InterlockedIncrement((LONG *)locinfo->lc_category[i].wrefcount); } if(locinfo->lconv_intl_refcount) - InterlockedIncrement(locinfo->lconv_intl_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_intl_refcount); if(locinfo->lconv_num_refcount) - InterlockedIncrement(locinfo->lconv_num_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_num_refcount); if(locinfo->lconv_mon_refcount) - InterlockedIncrement(locinfo->lconv_mon_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_mon_refcount); if(locinfo->ctype1_refcount) - InterlockedIncrement(locinfo->ctype1_refcount); + InterlockedIncrement((LONG *)locinfo->ctype1_refcount); InterlockedIncrement(&locinfo->lc_time_curr->refcount); } @@ -1039,12 +1039,12 @@ void free_locinfo(pthreadlocinfo locinfo) for(i=LC_MIN+1; i<=LC_MAX; i++) { if(!locinfo->lc_category[i].refcount - || !InterlockedDecrement(locinfo->lc_category[i].refcount)) { + || !InterlockedDecrement((LONG *)locinfo->lc_category[i].refcount)) { free(locinfo->lc_category[i].locale); free(locinfo->lc_category[i].refcount); } if(!locinfo->lc_category[i].wrefcount - || !InterlockedDecrement(locinfo->lc_category[i].wrefcount)) { + || !InterlockedDecrement((LONG *)locinfo->lc_category[i].wrefcount)) { #if _MSVCR_VER >= 110 free(locinfo->lc_name[i]); #endif @@ -1053,7 +1053,7 @@ void free_locinfo(pthreadlocinfo locinfo) } if(locinfo->lconv_num_refcount - && !InterlockedDecrement(locinfo->lconv_num_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_num_refcount)) { free(locinfo->lconv->decimal_point); free(locinfo->lconv->thousands_sep); free(locinfo->lconv->grouping); @@ -1064,7 +1064,7 @@ void free_locinfo(pthreadlocinfo locinfo) free(locinfo->lconv_num_refcount); } if(locinfo->lconv_mon_refcount - && !InterlockedDecrement(locinfo->lconv_mon_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_mon_refcount)) { free(locinfo->lconv->int_curr_symbol); free(locinfo->lconv->currency_symbol); free(locinfo->lconv->mon_decimal_point); @@ -1083,13 +1083,13 @@ void free_locinfo(pthreadlocinfo locinfo) free(locinfo->lconv_mon_refcount); } if(locinfo->lconv_intl_refcount - && !InterlockedDecrement(locinfo->lconv_intl_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->lconv_intl_refcount)) { free(locinfo->lconv_intl_refcount); free(locinfo->lconv); } if(locinfo->ctype1_refcount - && !InterlockedDecrement(locinfo->ctype1_refcount)) { + && !InterlockedDecrement((LONG *)locinfo->ctype1_refcount)) { free(locinfo->ctype1_refcount); free(locinfo->ctype1); free((void*)locinfo->pclmap); @@ -1100,7 +1100,7 @@ void free_locinfo(pthreadlocinfo locinfo) && locinfo->lc_time_curr != &cloc_time_data) free(locinfo->lc_time_curr); - if(InterlockedDecrement(&locinfo->refcount)) + if(InterlockedDecrement((LONG *)&locinfo->refcount)) return; free(locinfo); @@ -1398,7 +1398,7 @@ static pthreadlocinfo create_locinfo(int category, locinfo->pclmap = old_locinfo->pclmap; locinfo->pcumap = old_locinfo->pcumap; if(locinfo->ctype1_refcount) - InterlockedIncrement(locinfo->ctype1_refcount); + InterlockedIncrement((LONG *)locinfo->ctype1_refcount); } else if(lcid[LC_CTYPE]) { CPINFO cp_info; int j; @@ -1480,7 +1480,7 @@ static pthreadlocinfo create_locinfo(int category, locinfo->lconv = old_locinfo->lconv; locinfo->lconv_intl_refcount = old_locinfo->lconv_intl_refcount; if(locinfo->lconv_intl_refcount) - InterlockedIncrement(locinfo->lconv_intl_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_intl_refcount); } else if(lcid[LC_MONETARY] || lcid[LC_NUMERIC]) { locinfo->lconv = malloc(sizeof(struct lconv)); locinfo->lconv_intl_refcount = malloc(sizeof(int)); @@ -1510,7 +1510,7 @@ static pthreadlocinfo create_locinfo(int category, copy_threadlocinfo_category(locinfo, old_locinfo, LC_MONETARY); locinfo->lconv_mon_refcount = old_locinfo->lconv_mon_refcount; if(locinfo->lconv_mon_refcount) - InterlockedIncrement(locinfo->lconv_mon_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_mon_refcount); if(locinfo->lconv != &cloc_lconv && locinfo->lconv != old_locinfo->lconv) { locinfo->lconv->int_curr_symbol = old_locinfo->lconv->int_curr_symbol; locinfo->lconv->currency_symbol = old_locinfo->lconv->currency_symbol; @@ -1785,7 +1785,7 @@ static pthreadlocinfo create_locinfo(int category, copy_threadlocinfo_category(locinfo, old_locinfo, LC_NUMERIC); locinfo->lconv_num_refcount = old_locinfo->lconv_num_refcount; if(locinfo->lconv_num_refcount) - InterlockedIncrement(locinfo->lconv_num_refcount); + InterlockedIncrement((LONG *)locinfo->lconv_num_refcount); if(locinfo->lconv != &cloc_lconv && locinfo->lconv != old_locinfo->lconv) { locinfo->lconv->decimal_point = old_locinfo->lconv->decimal_point; locinfo->lconv->thousands_sep = old_locinfo->lconv->thousands_sep;

1 0

Eric Pouech : d2d1/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: aa45100f4aa5af5c33404f1d67689f8621dc14f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa45100f4aa5af5c33404f1d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 19:40:09 2022 +0100 d2d1/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 1 - dlls/d2d1/tests/d2d1.c | 1341 +++++++++++++++++++++---------------------- 2 files changed, 666 insertions(+), 676 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa45100f4aa5af5c3340…

1 0

Dmitry Timoshkov : user32/tests: Actually test ShowWindow() return value.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: cc91ba6da75ab82d249a5fea3b00abded5021585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc91ba6da75ab82d249a5fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 3 20:27:20 2022 +0300 user32/tests: Actually test ShowWindow() return value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5ce7eb02f1c..8ec6d8af064 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7232,7 +7232,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_RESTORE); + ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); @@ -7246,7 +7246,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_MAXIMIZE); + ret = ShowWindow(hwnd, SW_MAXIMIZE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); @@ -7264,7 +7264,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rcResized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcResized), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_RESTORE); + ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n");

1 0

Paul Gofman : hnetcfg/tests: Don't test removing the same mapping twice.
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 19c2ffe85202859914dfcde7f7b1dbd6bdb1cb41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c2ffe85202859914dfcde7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:34 2022 +0300 hnetcfg/tests: Don't test removing the same mapping twice. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/tests/policy.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index f344019d1d3..3b614e6e05a 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -278,8 +278,6 @@ static void test_static_port_mapping_collection( IStaticPortMappingCollection *p hr = IEnumVARIANT_Next(enum_ports, 1, &var, &fetched); ok(hr == S_FALSE, "Got unexpected hr %#x.\n", hr); - hr = IStaticPortMappingCollection_Remove(ports, 12345, (BSTR)L"UDP"); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IStaticPortMappingCollection_Remove(ports, 12345, (BSTR)L"UDP"); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Paul Gofman : hnetcfg: Handle NULL strings in update_mapping_list().
by Alexandre Julliard Feb. 3, 2022

Feb. 3, 2022

Module: wine Branch: master Commit: 31f0509b72e2bfdef83c313e0dd41374f4fb6828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31f0509b72e2bfdef83c313e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 3 14:28:32 2022 +0300 hnetcfg: Handle NULL strings in update_mapping_list(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/port.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/hnetcfg/port.c b/dlls/hnetcfg/port.c index 611a652ce5e..47bfc16be79 100644 --- a/dlls/hnetcfg/port.c +++ b/dlls/hnetcfg/port.c @@ -540,6 +540,22 @@ static LONG long_from_bstr( BSTR s ) return _wtoi( s ); } +static BSTR mapping_move_bstr( BSTR *s ) +{ + BSTR ret; + + if (*s) + { + ret = *s; + *s = NULL; + } + else if (!(ret = SysAllocString( L"" ))) + { + ERR( "No memory.\n" ); + } + return ret; +} + static void update_mapping_list(void) { struct xml_value_desc mapping_desc[ARRAY_SIZE(port_mapping_template)]; @@ -579,20 +595,17 @@ static void update_mapping_list(void) } break; } - new_mappings[index].external_ip = mapping_desc[PM_EXTERNAL_IP].value; - mapping_desc[PM_EXTERNAL_IP].value = NULL; + new_mappings[index].external_ip = mapping_move_bstr( &mapping_desc[PM_EXTERNAL_IP].value ); new_mappings[index].external = long_from_bstr( mapping_desc[PM_EXTERNAL].value ); - new_mappings[index].protocol = mapping_desc[PM_PROTOCOL].value; - mapping_desc[PM_PROTOCOL].value = NULL; + new_mappings[index].protocol = mapping_move_bstr( &mapping_desc[PM_PROTOCOL].value ); new_mappings[index].internal = long_from_bstr( mapping_desc[PM_INTERNAL].value ); - new_mappings[index].client = mapping_desc[PM_CLIENT].value; - mapping_desc[PM_CLIENT].value = NULL; - if (!wcsicmp( mapping_desc[PM_ENABLED].value, L"true" ) || long_from_bstr( mapping_desc[PM_ENABLED].value )) + new_mappings[index].client = mapping_move_bstr( &mapping_desc[PM_CLIENT].value ); + if (mapping_desc[PM_ENABLED].value && (!wcsicmp( mapping_desc[PM_ENABLED].value, L"true" ) + || long_from_bstr( mapping_desc[PM_ENABLED].value ))) new_mappings[index].enabled = VARIANT_TRUE; else new_mappings[index].enabled = VARIANT_FALSE; - new_mappings[index].descr = mapping_desc[PM_DESC].value; - mapping_desc[PM_DESC].value = NULL; + new_mappings[index].descr = mapping_move_bstr( &mapping_desc[PM_DESC].value ); TRACE( "%s %s %s:%u -> %s:%u, enabled %d.\n", debugstr_w(new_mappings[index].descr), debugstr_w(new_mappings[index].protocol), debugstr_w(new_mappings[index].external_ip),

1 0