July 2015 - Wine-commits - list.winehq.org

Hans Leidekker : msi/tests: Mark a test result on win2k3 as broken.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 78349835410b071e76d3148ba1040188bd2d7402 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78349835410b071e76d3148ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:37:52 2015 +0200 msi/tests: Mark a test result on win2k3 as broken. --- dlls/msi/tests/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 28d3e54..41f0f9f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3414,7 +3414,7 @@ static void test_states(void) /* reinstall the product */ r = MsiInstallProductA(msifile3, "REINSTALL=ALL"); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS || broken(r == ERROR_INSTALL_FAILURE) /* win2k3 */, "Expected ERROR_SUCCESS, got %d\n", r); state = MsiQueryFeatureStateA("{7262AC98-EEBD-4364-8CE3-D654F6A425B9}", "five"); ok(state == INSTALLSTATE_UNKNOWN, "state = %d\n", state);

1 0

Hans Leidekker : wininet/tests: Include the error code in a failure message.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 6ab6c23707e436d75632526a838a8cb3147e1a1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ab6c23707e436d75632526a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 17 12:38:21 2015 +0200 wininet/tests: Include the error code in a failure message. --- dlls/wininet/tests/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index b841795..6b018de 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2888,7 +2888,7 @@ static void test_header_handling_order(int port) data_len = sizeof(data); memset(data, 'a', sizeof(data)); ret = HttpSendRequestA(request, connection, ~0u, data, data_len); - ok(ret, "HttpSendRequest failed\n"); + ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); status = 0; size = sizeof(status);

1 0

Piotr Caban : winemac.drv: Release mouse capture when destroying window specified in SetCapture call.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: a90592c8d29d3b145eada90c297405cbd8a9277f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a90592c8d29d3b145eada90c2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 12:54:54 2015 +0200 winemac.drv: Release mouse capture when destroying window specified in SetCapture call. --- dlls/winemac.drv/window.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index c67ccd0..9d996ec 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1274,6 +1274,8 @@ void CDECL macdrv_DestroyWindow(HWND hwnd) if (!(data = get_win_data(hwnd))) return; + if (hwnd == GetCapture()) macdrv_SetCapture(0, 0); + if (data->gl_view) macdrv_dispose_view(data->gl_view); destroy_cocoa_window(data);

1 0

Sebastian Lackner : vcomp/tests: Add tests for vcomp sections.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 57cbcec0c28260458996dd31a0cebc4c628b9b20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57cbcec0c28260458996dd31a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Jul 16 15:01:45 2015 +0200 vcomp/tests: Add tests for vcomp sections. --- dlls/vcomp/tests/vcomp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index a9b975d..c433991 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -33,6 +33,8 @@ static VOID (WINAPI *pReleaseActCtx)(HANDLE); static void (CDECL *p_vcomp_barrier)(void); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static void (CDECL *p_vcomp_sections_init)(int n); +static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); static int (CDECL *pomp_get_max_threads)(void); static int (CDECL *pomp_get_nested)(void); @@ -169,6 +171,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_barrier); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_sections_init); + VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); VCOMP_GET_PROC(omp_get_max_threads); VCOMP_GET_PROC(omp_get_nested); @@ -342,6 +346,52 @@ static void test_vcomp_fork(void) pomp_set_num_threads(max_threads); } +static void CDECL section_cb(LONG *a, LONG *b, LONG *c) +{ + int i; + + p_vcomp_sections_init(20); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(a); + Sleep(1); + } + + p_vcomp_sections_init(30); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(b); + Sleep(1); + } + + p_vcomp_sections_init(40); + while ((i = p_vcomp_sections_next()) != -1) + { + InterlockedIncrement(c); + Sleep(1); + } +} + +static void test_vcomp_sections_init(void) +{ + LONG a, b, c; + int max_threads = pomp_get_max_threads(); + int i; + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = b = c = 0; + p_vcomp_fork(TRUE, 3, section_cb, &a, &b, &c); + ok(a == 20, "expected a = 20, got %d\n", a); + ok(b == 30, "expected b = 30, got %d\n", b); + ok(c == 40, "expected c = 40, got %d\n", c); + } + + pomp_set_num_threads(max_threads); +} + START_TEST(vcomp) { if (!init_vcomp()) @@ -350,6 +400,7 @@ START_TEST(vcomp) test_omp_get_num_threads(FALSE); test_omp_get_num_threads(TRUE); test_vcomp_fork(); + test_vcomp_sections_init(); release_vcomp(); }

1 0

Alex Henrie : user32: Simplify if-else statement.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: f6125536948201ee380a44edc0b87a29b0a55af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6125536948201ee380a44edc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 16 01:05:25 2015 -0600 user32: Simplify if-else statement. --- dlls/user32/listbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 4853c3f..ed60a19 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -319,7 +319,8 @@ static LRESULT LISTBOX_SetTopItem( LB_DESCR *descr, INT index, BOOL scroll ) ScrollWindowEx( descr->self, 0, diff, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } - if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); + else + InvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; LISTBOX_UpdateScroll( descr ); return LB_OKAY;

1 0

Alex Henrie : user32: Scroll listbox item completely into view on LB_SETCURSEL.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 5caa651732beb7996ee8397929a0805ae2f45882 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5caa651732beb7996ee839792… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 16 03:30:30 2015 -0600 user32: Scroll listbox item completely into view on LB_SETCURSEL. --- dlls/user32/listbox.c | 2 +- dlls/user32/tests/listbox.c | 33 +++++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index ed60a19..2902ac9 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -2855,7 +2855,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; - LISTBOX_SetCaretIndex( descr, wParam, FALSE ); + LISTBOX_SetCaretIndex( descr, wParam, TRUE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); if (ret != LB_ERR) ret = descr->selected_item; return ret; diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index d99a82c..79d18e7 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -349,7 +349,7 @@ static void test_ownerdraw(void) ok(exp.caret == got.caret, "expected caret %d, got %d\n", exp.caret, got.caret); \ ok(exp.selcount == got.selcount, "expected selcount %d, got %d\n", exp.selcount, got.selcount); -static void test_selection(void) +static void test_LB_SELITEMRANGE(void) { static const struct listbox_stat test_nosel = { 0, LB_ERR, 0, 0 }; static const struct listbox_stat test_1 = { 0, LB_ERR, 0, 2 }; @@ -429,6 +429,34 @@ static void test_selection(void) DestroyWindow(hLB); } +static void test_LB_SETCURSEL(void) +{ + HWND parent, hLB; + INT ret; + + trace("testing LB_SETCURSEL\n"); + + parent = create_parent(); + assert(parent); + + hLB = create_listbox(LBS_NOINTEGRALHEIGHT | WS_CHILD, parent); + assert(hLB); + + SendMessageA(hLB, LB_SETITEMHEIGHT, 0, 32); + + ret = SendMessageA(hLB, LB_SETCURSEL, 2, 0); + ok(ret == 2, "LB_SETCURSEL returned %d instead of 2\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 0, "expected vscroll 0, got %d\n", ret); + + ret = SendMessageA(hLB, LB_SETCURSEL, 3, 0); + ok(ret == 3, "LB_SETCURSEL returned %d instead of 3\n", ret); + ret = GetScrollPos(hLB, SB_VERT); + ok(ret == 1, "expected vscroll 1, got %d\n", ret); + + DestroyWindow(hLB); +} + static void test_listbox_height(void) { HWND hList; @@ -1766,7 +1794,8 @@ START_TEST(listbox) check_item_height(); test_ownerdraw(); - test_selection(); + test_LB_SELITEMRANGE(); + test_LB_SETCURSEL(); test_listbox_height(); test_itemfrompoint(); test_listbox_item_data();

1 0

Jactry Zeng : gdi32: Add a helper to map font replacement.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: cb59350ed9e0eee83284bcd1f889315c9ea8607e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb59350ed9e0eee83284bcd1f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 8 21:53:52 2015 +0800 gdi32: Add a helper to map font replacement. --- dlls/gdi32/freetype.c | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 73824ea..e20e390 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2240,6 +2240,27 @@ static void DumpFontList(void) } } +static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) +{ + Family *family = find_family_from_any_name(repl); + if (family != NULL) + { + Family *new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); + if (new_family != NULL) + { + TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); + new_family->FamilyName = strdupW(orig); + new_family->EnglishName = NULL; + list_init(&new_family->faces); + new_family->replacement = &family->faces; + list_add_tail(&font_list, &new_family->entry); + return TRUE; + } + } + TRACE("%s is not available. Skip this replacement.\n", debugstr_w(repl)); + return FALSE; +} + /*********************************************************** * The replacement list is a way to map an entire font * family onto another family. For example adding @@ -2276,30 +2297,10 @@ static void LoadReplaceList(void) TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); /* "NewName"="Oldname" */ if(!find_family_from_any_name(value)) - { - Family * const family = find_family_from_any_name(data); - if (family != NULL) - { - Family * const new_family = HeapAlloc(GetProcessHeap(), 0, sizeof(*new_family)); - if (new_family != NULL) - { - TRACE("mapping %s to %s\n", debugstr_w(data), debugstr_w(value)); - new_family->FamilyName = strdupW(value); - new_family->EnglishName = NULL; - list_init(&new_family->faces); - new_family->replacement = &family->faces; - list_add_tail(&font_list, &new_family->entry); - } - } - else - { - TRACE("%s is not available. Skip this replacement.\n", debugstr_w(data)); - } - } + map_font_family(value, data); else - { TRACE("%s is available. Skip this replacement.\n", debugstr_w(value)); - } + /* reset dlen and vlen */ dlen = datalen; vlen = valuelen;

1 0

Jactry Zeng : gdi32: Add multiple font replacement support.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: c015447d074c535349e42ac3faa2384f8b46a231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c015447d074c535349e42ac3f… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Jul 8 21:54:05 2015 +0800 gdi32: Add multiple font replacement support. --- dlls/gdi32/freetype.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e20e390..e57d1a9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2292,12 +2292,24 @@ static void LoadReplaceList(void) dlen = datalen; vlen = valuelen; - while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, - &dlen) == ERROR_SUCCESS) { - TRACE("Got %s=%s\n", debugstr_w(value), debugstr_w(data)); + while(RegEnumValueW(hkey, i++, value, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) + { /* "NewName"="Oldname" */ if(!find_family_from_any_name(value)) - map_font_family(value, data); + { + if (type == REG_MULTI_SZ) + { + WCHAR *replace = data; + while(*replace) + { + if (map_font_family(value, replace)) + break; + replace += strlenW(replace) + 1; + } + } + else + map_font_family(value, data); + } else TRACE("%s is available. Skip this replacement.\n", debugstr_w(value));

1 0

Austin English : winsta: Add initial winsta.h.
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 70f9cc9e3ded83ea2e6837d8cacecb5cfcc514a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70f9cc9e3ded83ea2e6837d8c… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 4 19:14:02 2015 -0500 winsta: Add initial winsta.h. --- dlls/winsta/main.c | 9 +++-- dlls/winsta/winsta.h | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/winsta/winsta.spec | 2 +- 3 files changed, 104 insertions(+), 5 deletions(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 46a4ce7..a95782f 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "winternl.h" #include "wine/debug.h" +#include "winsta.h" WINE_DEFAULT_DEBUG_CHANNEL(winsta); @@ -68,7 +69,7 @@ BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, } BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, - ULONG *process_count, void *info ) + ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { FIXME( "%p %u %p %p\n", server, level, process_count, info ); *process_count = 0; @@ -76,10 +77,10 @@ BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, return FALSE; } -BOOL WINAPI WinStationGetProcessSid( PVOID a, HANDLE server, DWORD process_id, PFILETIME process_start_time, - PBYTE process_user_sid, PDWORD sid_size) +BOOLEAN WINAPI WinStationGetProcessSid( HANDLE server, ULONG process_id, FILETIME *process_start_time, + PVOID process_user_sid, PULONG sid_size ) { - FIXME( "(%p, %p, %d, %p, %p, %p): stub\n", a, server, process_id, process_start_time, process_user_sid, sid_size); + FIXME( "(%p, %d, %p, %p, %p): stub\n", server, process_id, process_start_time, process_user_sid, sid_size); SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h new file mode 100644 index 0000000..a97f4c4 --- /dev/null +++ b/dlls/winsta/winsta.h @@ -0,0 +1,98 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _WINSTA_H +#define _WINSTA_H + +#define WINSTATIONNAME_LENGTH 32 +typedef WCHAR WINSTATIONNAME[WINSTATIONNAME_LENGTH + 1]; + +typedef enum _WINSTATIONSTATECLASS +{ + State_Active, + State_Connected, + State_ConnectQuery, + State_Shadow, + State_Disconnected, + State_Idle, + State_Listen, + State_Reset, + State_Down, + State_Init +} WINSTATIONSTATECLASS; + +typedef struct _SESSIONIDW +{ + union + { + ULONG SessionId; + ULONG LogonId; + } DUMMYUNIONNAME; + WINSTATIONNAME WinStationName; + WINSTATIONSTATECLASS State; +} SESSIONIDW, *PSESSIONIDW; + +typedef struct _TS_SYS_PROCESS_INFORMATION +{ + ULONG NextEntryOffset; + ULONG NumberOfThreads; + LARGE_INTEGER SpareLi1; + LARGE_INTEGER SpareLi2; + LARGE_INTEGER SpareLi3; + LARGE_INTEGER CreateTime; + LARGE_INTEGER UserTime; + LARGE_INTEGER KernelTime; + UNICODE_STRING ImageName; + LONG BasePriority; + ULONG UniqueProcessId; + ULONG InheritedFromUniqueProcessId; + ULONG HandleCount; + ULONG SessionId; + ULONG SpareUl3; + SIZE_T PeakVirtualSize; + SIZE_T VirtualSize; + ULONG PageFaultCount; + ULONG PeakWorkingSetSize; + ULONG WorkingSetSize; + SIZE_T QuotaPeakPagedPoolUsage; + SIZE_T QuotaPagedPoolUsage; + SIZE_T QuotaPeakNonPagedPoolUsage; + SIZE_T QuotaNonPagedPoolUsage; + SIZE_T PagefileUsage; + SIZE_T PeakPagefileUsage; + SIZE_T PrivatePageCount; +} TS_SYS_PROCESS_INFORMATION, *PTS_SYS_PROCESS_INFORMATION; + +typedef struct _TS_ALL_PROCESSES_INFO +{ + PTS_SYS_PROCESS_INFORMATION pTsProcessInfo; + DWORD SizeOfSid; +#ifdef MIDL_PASS + [size_is(SizeOfSid)] PBYTE pSid; +#else + PBYTE pSid; +#endif +} TS_ALL_PROCESSES_INFO, *PTS_ALL_PROCESSES_INFO; + +BOOLEAN WINAPI WinStationEnumerateW(HANDLE,PSESSIONIDW *,PULONG); +BOOLEAN WINAPI WinStationGetAllProcesses(HANDLE,ULONG,PULONG,PTS_ALL_PROCESSES_INFO *); +BOOLEAN WINAPI WinStationGetProcessSid(HANDLE,ULONG,FILETIME *,PVOID,PULONG); +BOOLEAN WINAPI WinStationQueryInformationW(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); +BOOLEAN WINAPI WinStationRegisterConsoleNotification(HANDLE,HWND,ULONG); + +#endif /* _WINSTA_H */ diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 5854d83..30aa6b5 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -39,7 +39,7 @@ @ stub WinStationGetLanAdapterNameA @ stub WinStationGetLanAdapterNameW @ stub WinStationGetMachinePolicy -@ stdcall WinStationGetProcessSid(ptr ptr long ptr ptr ptr) +@ stdcall WinStationGetProcessSid(ptr long ptr ptr ptr) @ stub WinStationGetTermSrvCountersValue @ stub WinStationInstallLicense @ stub WinStationIsHelpAssistantSession

1 0

Aaryaman Vasishta : d3drm/tests: Fix leaks while creating device in tests (Valgrind).
by Alexandre Julliard 17 Jul '15

17 Jul '15

Module: wine Branch: master Commit: 9939ac8fe0def693107cf4e470d8f6ac4a052d59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9939ac8fe0def693107cf4e47… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Jul 16 21:56:07 2015 +0530 d3drm/tests: Fix leaks while creating device in tests (Valgrind). --- dlls/d3drm/tests/d3drm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1816214..1c80536 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1999,10 +1999,14 @@ static void test_create_device_from_clipper(void) hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 0, 0, &device2); todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); /* If NULL is passed for clipper, CreateDeviceFromClipper returns D3DRMERR_BADVALUE */ hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, NULL, &driver, 0, 0, &device2); todo_wine ok(hr == D3DRMERR_BADVALUE, "Expected hr == D3DRMERR_BADVALUE, got %x.\n", hr); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); hr = IDirect3DRM2_CreateDeviceFromClipper(d3drm2, clipper, &driver, 300, 200, &device2); ok(hr == D3DRM_OK, "Cannot create IDirect3DRMDevice2 interface (hr = %x).\n", hr); @@ -2197,6 +2201,8 @@ static void test_create_device_from_surface(void) hr = IDirect3DRM2_CreateDeviceFromSurface(d3drm2, &driver, ddraw, surface, &device2); todo_wine ok(hr == DDERR_INVALIDCAPS, "Expected hr == DDERR_INVALIDCAPS, got %x.\n", hr); IDirectDrawSurface_Release(surface); + if (SUCCEEDED(hr)) + IDirect3DRMDevice2_Release(device2); desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE; hr = IDirectDraw_CreateSurface(ddraw, &desc, &surface, NULL);

1 0