September 2018 - Wine-Commits

Jacek Caban : winhttp: Set last error in WinHttpQueryAuthSchemes when no auth scheme is found.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 6435f844dde0fa2f97944378c59392e8befdba8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6435f844dde0fa2f97944378… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 16:18:22 2018 +0200 winhttp: Set last error in WinHttpQueryAuthSchemes when no auth scheme is found. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 1 + dlls/winhttp/tests/winhttp.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 72cebdd..33d8682 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -965,6 +965,7 @@ BOOL WINAPI WinHttpQueryAuthSchemes( HINTERNET hrequest, LPDWORD supported, LPDW *target = WINHTTP_AUTH_TARGET_PROXY; ret = TRUE; } + else set_last_error( ERROR_INVALID_OPERATION ); release_object( &request->hdr ); if (ret) set_last_error( ERROR_SUCCESS ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5f0935f..9138d6a 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2441,7 +2441,7 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "unexpected success\n"); - todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); ok(supported == 0xdeadbeef, "got %x\n", supported); ok(first == 0xdeadbeef, "got %x\n", first); ok(target == 0xdeadbeef, "got %x\n", target); @@ -2528,7 +2528,7 @@ static void test_basic_authentication(int port) ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); error = GetLastError(); ok(!ret, "expected failure\n"); - todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); ok(supported == 0xdeadbeef, "got %x\n", supported); ok(first == 0xdeadbeef, "got %x\n", first); ok(target == 0xdeadbeef, "got %x\n", target);

1 0

Zebediah Figura : quartz/tests: Get rid of test_graph_builder().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 2da49669f9071d6c33e55719cce5353ba592f0a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2da49669f9071d6c33e55719… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:13 2018 -0500 quartz/tests: Get rid of test_graph_builder(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 64 ----------------------------------------- 1 file changed, 64 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2374e2f..5035f80 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,69 +760,6 @@ static void test_render_with_multithread(void) CoUninitialize(); } -static void test_graph_builder(void) -{ - HRESULT hr; - IGraphBuilder *pgraph; - IBaseFilter *pF = NULL; - IBaseFilter *pF2 = NULL; - IPin *pIn = NULL; - IEnumPins *pEnum = NULL; - PIN_DIRECTION dir; - static const WCHAR testFilterW[] = {'t','e','s','t','F','i','l','t','e','r',0}; - static const WCHAR fooBarW[] = {'f','o','o','B','a','r',0}; - - pgraph = (IGraphBuilder *)create_graph(); - - /* create video filter */ - hr = CoCreateInstance(&CLSID_VideoRenderer, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (LPVOID*)&pF); - ok(hr == S_OK, "CoCreateInstance failed with %x\n", hr); - ok(pF != NULL, "pF is NULL\n"); - - hr = IGraphBuilder_AddFilter(pgraph, NULL, testFilterW); - ok(hr == E_POINTER, "IGraphBuilder_AddFilter returned %x\n", hr); - - /* add the two filters to the graph */ - hr = IGraphBuilder_AddFilter(pgraph, pF, testFilterW); - ok(hr == S_OK, "failed to add pF to the graph: %x\n", hr); - - /* find the pins */ - hr = IBaseFilter_EnumPins(pF, &pEnum); - ok(hr == S_OK, "IBaseFilter_EnumPins failed for pF: %x\n", hr); - ok(pEnum != NULL, "pEnum is NULL\n"); - hr = IEnumPins_Next(pEnum, 1, &pIn, NULL); - ok(hr == S_OK, "IEnumPins_Next failed for pF: %x\n", hr); - ok(pIn != NULL, "pIn is NULL\n"); - hr = IPin_QueryDirection(pIn, &dir); - ok(hr == S_OK, "IPin_QueryDirection failed: %x\n", hr); - ok(dir == PINDIR_INPUT, "pin has wrong direction\n"); - - hr = IGraphBuilder_FindFilterByName(pgraph, fooBarW, &pF2); - ok(hr == VFW_E_NOT_FOUND, "IGraphBuilder_FindFilterByName returned %x\n", hr); - ok(pF2 == NULL, "IGraphBuilder_FindFilterByName returned %p\n", pF2); - hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, &pF2); - ok(hr == S_OK, "IGraphBuilder_FindFilterByName returned %x\n", hr); - ok(pF2 != NULL, "IGraphBuilder_FindFilterByName returned NULL\n"); - hr = IGraphBuilder_FindFilterByName(pgraph, testFilterW, NULL); - ok(hr == E_POINTER, "IGraphBuilder_FindFilterByName returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, NULL, pIn); - ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, pIn, NULL); - ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr); - - hr = IGraphBuilder_Connect(pgraph, pIn, pIn); - ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr); - - if (pIn) IPin_Release(pIn); - if (pEnum) IEnumPins_Release(pEnum); - if (pF) IBaseFilter_Release(pF); - if (pF2) IBaseFilter_Release(pF2); - IGraphBuilder_Release(pgraph); -} - struct testpin { IPin IPin_iface; @@ -1935,7 +1872,6 @@ START_TEST(filtergraph) test_render_run(avifile); test_render_run(mpegfile); test_enum_filters(); - test_graph_builder(); test_graph_builder_render(); test_aggregate_filter_graph(); test_control_delegation();

1 0

Alex Henrie : msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: b917cc66f4f7b786e7f19f63ab0c0819a5455222 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b917cc66f4f7b786e7f19f63… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Sep 18 00:58:21 2018 -0600 msvcrt: Add DECLSPEC_HOTPATCH to functions patched by libtcmalloc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45199 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/heap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/heap.c b/dlls/msvcrt/heap.c index 7ea80a3..b4f11d8 100644 --- a/dlls/msvcrt/heap.c +++ b/dlls/msvcrt/heap.c @@ -21,6 +21,7 @@ * handler and non atomic heap operations */ +#include "config.h" #include "msvcrt.h" #include "mtdll.h" #include "wine/debug.h" @@ -127,7 +128,7 @@ static MSVCRT_size_t msvcrt_heap_size(void *ptr) /********************************************************************* * ??2(a)YAPAXI@Z (MSVCRT.@) */ -void* CDECL MSVCRT_operator_new(MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_operator_new(MSVCRT_size_t size) { void *retval; int freed; @@ -169,7 +170,7 @@ void* CDECL MSVCRT_operator_new_dbg(MSVCRT_size_t size, int type, const char *fi /********************************************************************* * ??3(a)YAXPAX@Z (MSVCRT.@) */ -void CDECL MSVCRT_operator_delete(void *mem) +void CDECL DECLSPEC_HOTPATCH MSVCRT_operator_delete(void *mem) { TRACE("(%p)\n", mem); msvcrt_heap_free(mem); @@ -394,7 +395,7 @@ size_t CDECL _aligned_msize(void *p, MSVCRT_size_t alignment, MSVCRT_size_t offs /********************************************************************* * calloc (MSVCRT.@) */ -void* CDECL MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_calloc(MSVCRT_size_t count, MSVCRT_size_t size) { MSVCRT_size_t bytes = count*size; @@ -420,7 +421,7 @@ void* CDECL _calloc_base(MSVCRT_size_t count, MSVCRT_size_t size) /********************************************************************* * free (MSVCRT.@) */ -void CDECL MSVCRT_free(void* ptr) +void CDECL DECLSPEC_HOTPATCH MSVCRT_free(void* ptr) { msvcrt_heap_free(ptr); } @@ -459,7 +460,7 @@ void* CDECL _malloc_base(MSVCRT_size_t size) /********************************************************************* * realloc (MSVCRT.@) */ -void* CDECL MSVCRT_realloc(void* ptr, MSVCRT_size_t size) +void* CDECL DECLSPEC_HOTPATCH MSVCRT_realloc(void* ptr, MSVCRT_size_t size) { if (!ptr) return MSVCRT_malloc(size); if (size) return msvcrt_heap_realloc(0, ptr, size);

1 0

Nikolay Sivov : opcservices: Implement PartExists().
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: c009967baeb44cfce39a45737f14f4bd88c7a946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c009967baeb44cfce39a4573… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 19 14:19:37 2018 +0300 opcservices: Implement PartExists(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opcservices/package.c | 11 +++++++++-- dlls/opcservices/tests/opcservices.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index 6e1a024..ae610ac 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -1011,9 +1011,16 @@ static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *n static HRESULT WINAPI opc_part_set_PartExists(IOpcPartSet *iface, IOpcPartUri *name, BOOL *exists) { - FIXME("iface %p, name %p, exists %p stub!\n", iface, name, exists); + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); - return E_NOTIMPL; + TRACE("iface %p, name %p, exists %p.\n", iface, name, exists); + + if (!name || !exists) + return E_POINTER; + + *exists = opc_part_set_get_part(part_set, name) != NULL; + + return S_OK; } static HRESULT WINAPI opc_part_set_GetEnumerator(IOpcPartSet *iface, IOpcPartEnumerator **enumerator) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 2bcf46f..8bcd914 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -187,12 +187,19 @@ static void test_package(void) IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); + ret = 123; + hr = IOpcPartSet_PartExists(partset, NULL, &ret); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ok(ret == 123, "Unexpected return value.\n"); + + hr = IOpcPartSet_PartExists(partset, part_uri, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + ret = FALSE; hr = IOpcPartSet_PartExists(partset, part_uri, &ret); -todo_wine { ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); ok(ret, "Expected part to exist.\n"); -} + IOpcPartUri_Release(part_uri); IOpcPart_Release(part);

1 0

Michael Stefaniuc : winex11.drv: Use the ARRAY_SIZE() macro.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 8e1d40b96613f620ee1d1d4cf152812f4bbcbb0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e1d40b96613f620ee1d1d4c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Sep 19 21:01:10 2018 +0200 winex11.drv: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/brush.c | 2 +- dlls/winex11.drv/clipboard.c | 4 ++-- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/graphics.c | 6 +++--- dlls/winex11.drv/mouse.c | 6 +++--- dlls/winex11.drv/opengl.c | 2 +- dlls/winex11.drv/pen.c | 10 +++++----- dlls/winex11.drv/systray.c | 6 +++--- dlls/winex11.drv/window.c | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 46bd2dd..e3e5668 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -169,7 +169,7 @@ static Pixmap BRUSH_DitherMono( COLORREF color ) { 0x1, 0x3 }, /* LTGRAY */ }; int gray = (30 * GetRValue(color) + 59 * GetGValue(color) + 11 * GetBValue(color)) / 100; - int idx = gray * (sizeof gray_dither/sizeof gray_dither[0] + 1)/256 - 1; + int idx = gray * (ARRAY_SIZE( gray_dither ) + 1)/256 - 1; TRACE("color=%06x -> gray=%x\n", color, gray); return XCreateBitmapFromData( gdi_display, root_window, gray_dither[idx], 2, 2 ); diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 296c00c..a37530f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1933,12 +1933,12 @@ static LRESULT CALLBACK clipboard_wndproc( HWND hwnd, UINT msg, WPARAM wp, LPARA static BOOL wait_clipboard_mutex(void) { static const WCHAR prefix[] = {'_','_','w','i','n','e','_','c','l','i','p','b','o','a','r','d','_'}; - WCHAR buffer[MAX_PATH + sizeof(prefix) / sizeof(WCHAR)]; + WCHAR buffer[MAX_PATH + ARRAY_SIZE( prefix )]; HANDLE mutex; memcpy( buffer, prefix, sizeof(prefix) ); if (!GetUserObjectInformationW( GetProcessWindowStation(), UOI_NAME, - buffer + sizeof(prefix) / sizeof(WCHAR), + buffer + ARRAY_SIZE( prefix ), sizeof(buffer) - sizeof(prefix), NULL )) { ERR( "failed to get winstation name\n" ); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index b36ce6f..6054f64 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1739,7 +1739,7 @@ static BOOL X11DRV_ClientMessage( HWND hwnd, XEvent *xev ) return FALSE; } - for (i = 0; i < sizeof(client_messages)/sizeof(client_messages[0]); i++) + for (i = 0; i < ARRAY_SIZE( client_messages ); i++) { if (event->message_type == X11DRV_Atoms[client_messages[i].atom - FIRST_XATOM]) { diff --git a/dlls/winex11.drv/graphics.c b/dlls/winex11.drv/graphics.c index e8c59f9..2209053 100644 --- a/dlls/winex11.drv/graphics.c +++ b/dlls/winex11.drv/graphics.c @@ -1644,7 +1644,7 @@ BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) 'P','r','o','f','i','l','e','.','i','c','m',0}; HKEY hkey; DWORD required, len; - WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + sizeof(color_path)/sizeof(WCHAR)]; + WCHAR profile[MAX_PATH], fullname[2*MAX_PATH + ARRAY_SIZE( color_path )]; unsigned char *buffer; unsigned long buflen; @@ -1653,7 +1653,7 @@ BOOL X11DRV_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) GetSystemDirectoryW( fullname, MAX_PATH ); strcatW( fullname, color_path ); - len = sizeof(profile)/sizeof(WCHAR); + len = ARRAY_SIZE( profile ); if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, mntr_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, NULL ) && !RegEnumValueW( hkey, 0, profile, &len, NULL, NULL, NULL, NULL )) /* FIXME handle multiple values */ { @@ -1726,7 +1726,7 @@ INT X11DRV_EnumICMProfiles( PHYSDEV dev, ICMENUMPROCW proc, LPARAM lparam ) return -1; len_sysdir = GetSystemDirectoryW( sysdir, MAX_PATH ); - len_path = len_sysdir + sizeof(color_path) / sizeof(color_path[0]) - 1; + len_path = len_sysdir + ARRAY_SIZE( color_path ) - 1; len = 64; for (;;) { diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 10985c1..d678706 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -986,7 +986,7 @@ static int find_fallback_shape( const char *name ) { struct cursor_font_fallback *fallback; - if ((fallback = bsearch( name, fallbacks, sizeof(fallbacks) / sizeof(fallbacks[0]), + if ((fallback = bsearch( name, fallbacks, ARRAY_SIZE( fallbacks ), sizeof(*fallback), fallback_cmp ))) return fallback->shape; return -1; @@ -1038,9 +1038,9 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) if (info->szResName[0]) goto done; /* only integer resources are supported here */ if (!(module = GetModuleHandleW( info->szModName ))) goto done; - for (i = 0; i < sizeof(module_cursors)/sizeof(module_cursors[0]); i++) + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == sizeof(module_cursors)/sizeof(module_cursors[0])) goto done; + if (i == ARRAY_SIZE( module_cursors )) goto done; cursors = module_cursors[i].cursors; for (i = 0; cursors[i].id; i++) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 0b0fd51..13a1da3 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -555,7 +555,7 @@ static BOOL WINAPI init_opengl( INIT_ONCE *once, void *param, void **context ) return TRUE; } - for (i = 0; i < sizeof(opengl_func_names)/sizeof(opengl_func_names[0]); i++) + for (i = 0; i < ARRAY_SIZE( opengl_func_names ); i++) { if (!(((void **)&opengl_funcs.gl)[i] = wine_dlsym( opengl_handle, opengl_func_names[i], NULL, 0 ))) { diff --git a/dlls/winex11.drv/pen.c b/dlls/winex11.drv/pen.c index c6a15da..6df2659 100644 --- a/dlls/winex11.drv/pen.c +++ b/dlls/winex11.drv/pen.c @@ -108,27 +108,27 @@ HPEN X11DRV_SelectPen( PHYSDEV dev, HPEN hpen, const struct brush_pattern *patte switch(logpen.lopnStyle & PS_STYLE_MASK) { case PS_DASH: - physDev->pen.dash_len = sizeof(PEN_dash)/sizeof(*PEN_dash); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dash ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dash : PEN_dash, physDev->pen.dash_len); break; case PS_DOT: - physDev->pen.dash_len = sizeof(PEN_dot)/sizeof(*PEN_dot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dot : PEN_dot, physDev->pen.dash_len); break; case PS_DASHDOT: - physDev->pen.dash_len = sizeof(PEN_dashdot)/sizeof(*PEN_dashdot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dashdot : PEN_dashdot, physDev->pen.dash_len); break; case PS_DASHDOTDOT: - physDev->pen.dash_len = sizeof(PEN_dashdotdot)/sizeof(*PEN_dashdotdot); + physDev->pen.dash_len = ARRAY_SIZE( PEN_dashdotdot ); memcpy(physDev->pen.dashes, physDev->pen.ext ? EXTPEN_dashdotdot : PEN_dashdotdot, physDev->pen.dash_len); break; case PS_ALTERNATE: - physDev->pen.dash_len = sizeof(PEN_alternate)/sizeof(*PEN_alternate); + physDev->pen.dash_len = ARRAY_SIZE( PEN_alternate ); memcpy(physDev->pen.dashes, PEN_alternate, physDev->pen.dash_len); break; case PS_USERSTYLE: diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index da322e0..d4262c4 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -772,13 +772,13 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) } if (nid->uFlags & NIF_TIP) { - lstrcpynW(icon->tiptext, nid->szTip, sizeof(icon->tiptext)/sizeof(WCHAR)); + lstrcpynW(icon->tiptext, nid->szTip, ARRAY_SIZE( icon->tiptext )); if (icon->tooltip) update_tooltip_text(icon); } if (nid->uFlags & NIF_INFO && nid->cbSize >= NOTIFYICONDATAA_V2_SIZE) { - lstrcpynW( icon->info_text, nid->szInfo, sizeof(icon->info_text)/sizeof(WCHAR) ); - lstrcpynW( icon->info_title, nid->szInfoTitle, sizeof(icon->info_title)/sizeof(WCHAR) ); + lstrcpynW( icon->info_text, nid->szInfo, ARRAY_SIZE( icon->info_text )); + lstrcpynW( icon->info_title, nid->szInfoTitle, ARRAY_SIZE( icon->info_title )); icon->info_flags = nid->dwInfoFlags; icon->info_timeout = max(min(nid->u.uTimeout, BALLOON_SHOW_MAX_TIMEOUT), BALLOON_SHOW_MIN_TIMEOUT); icon->info_icon = nid->hBalloonIcon; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0a4f118..7a3b340 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1530,7 +1530,7 @@ static void create_whole_window( struct x11drv_win_data *data ) SetPropA( data->hwnd, whole_window_prop, (HANDLE)data->whole_window ); /* set the window text */ - if (!InternalGetWindowText( data->hwnd, text, sizeof(text)/sizeof(WCHAR) )) text[0] = 0; + if (!InternalGetWindowText( data->hwnd, text, ARRAY_SIZE( text ))) text[0] = 0; sync_window_text( data->display, data->whole_window, text ); /* set the window region */

1 0

Józef Kucia : dxgi/tests: Add test for swapchain window styles.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: f71dd6ce946a4ce29d9224f4feed3457c452d238 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f71dd6ce946a4ce29d9224f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 19 16:55:30 2018 +0200 dxgi/tests: Add test for swapchain window styles. Signed-off-by: Józef Kucia <jkucia(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 | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8c41eab..62070e0 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4480,6 +4480,145 @@ done: UnregisterClassA("dxgi_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_swapchain_window_styles(void) +{ + LONG style, exstyle, fullscreen_style, fullscreen_exstyle; + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + IDXGIDevice *device; + ULONG refcount; + unsigned int i; + HRESULT hr; + + static const struct + { + LONG style, exstyle; + LONG expected_style, expected_exstyle; + } + tests[] = + { + {WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, 0, + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPSIBLINGS, + WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE, 0, + WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_CLIPSIBLINGS | WS_VISIBLE, + WS_EX_WINDOWEDGE}, + {WS_OVERLAPPED | WS_VISIBLE, 0, + WS_OVERLAPPED | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CAPTION, WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_DISABLED, WS_EX_TOPMOST, + WS_CAPTION | WS_DISABLED | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_DISABLED | WS_VISIBLE, WS_EX_TOPMOST, + WS_CAPTION | WS_DISABLED | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_TOPMOST | WS_EX_WINDOWEDGE}, + {WS_CAPTION | WS_SYSMENU | WS_VISIBLE, WS_EX_APPWINDOW, + WS_CAPTION | WS_SYSMENU | WS_VISIBLE | WS_CLIPSIBLINGS, WS_EX_APPWINDOW | WS_EX_WINDOWEDGE}, + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + swapchain_desc.OutputWindow = CreateWindowExA(tests[i].exstyle, "static", "dxgi_test", + tests[i].style, 0, 0, 400, 200, 0, 0, 0, 0); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + fullscreen_style = tests[i].expected_style & (WS_VISIBLE | WS_DISABLED | WS_CLIPSIBLINGS); + fullscreen_exstyle = (tests[i].expected_exstyle & WS_EX_APPWINDOW) | WS_EX_TOPMOST; + + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to set fullscreen state, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine + ok(style == fullscreen_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, fullscreen_style); + ok(exstyle == fullscreen_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, fullscreen_exstyle); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + else + { + skip("Test %u: Could not change fullscreen state.\n", i); + } + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + style = GetWindowLongA(swapchain_desc.OutputWindow, GWL_STYLE); + exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); + todo_wine_if(!(tests[i].expected_style & WS_VISIBLE)) + ok(style == tests[i].expected_style, "Test %u: Got style %#x, expected %#x.\n", + i, style, tests[i].expected_style); + todo_wine_if(!(tests[i].expected_exstyle & WS_EX_TOPMOST)) + ok(exstyle == tests[i].expected_exstyle, "Test %u: Got exstyle %#x, expected %#x.\n", + i, exstyle, tests[i].expected_exstyle); + + DestroyWindow(swapchain_desc.OutputWindow); + } + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -4574,6 +4713,7 @@ START_TEST(dxgi) test_inexact_modes(); test_swapchain_parameters(); test_swapchain_window_messages(); + test_swapchain_window_styles(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); run_on_d3d10(test_swapchain_formats);

1 0

Józef Kucia : dbghelp: Fix memory leak in SymInitializeW() (Coverity).
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: b3717a92d11c84819ce934da39bc8f9c85582c9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3717a92d11c84819ce934da… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Sep 19 12:26:56 2018 +0200 dbghelp: Fix memory leak in SymInitializeW() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 5685c25..a085cd1 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -298,7 +298,8 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess); - if (process_find_by_handle(hProcess)){ + if (process_find_by_handle(hProcess)) + { WARN("the symbols for this process have already been initialized!\n"); /* MSDN says to only call this function once unless SymCleanup() has been called since the last call. @@ -307,15 +308,15 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP return TRUE; } - pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); - if (!pcs) return FALSE; - - pcs->handle = hProcess; - IsWow64Process(GetCurrentProcess(), &wow64); if (!IsWow64Process(hProcess, &child_wow64)) return FALSE; + + pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); + if (!pcs) return FALSE; + + pcs->handle = hProcess; pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; if (UserSearchPath)

1 0

Alexandre Julliard : ntoskrnl/tests: Fix error check that fails on Windows.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 4100bac563439be185d4b866bf4352192e2589a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4100bac563439be185d4b866… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 19 19:21:17 2018 +0200 ntoskrnl/tests: Fix error check that fails on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index fe070d4..5675818 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -230,8 +230,9 @@ static void test_driver3(void) ret = StartServiceA(service, 0, NULL); ok(!ret, "driver3 should fail to start\n"); -todo_wine - ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || + ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || + GetLastError() == ERROR_INVALID_FUNCTION || + GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || GetLastError() == ERROR_FILE_NOT_FOUND /* Win7 */, "got %u\n", GetLastError()); DeleteService(service);

1 0

Jacek Caban : winhttp: Modify index only if query_headers succeeded.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: f76208879e073226a8c55dff9ed4d52497538840 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f76208879e073226a8c55dff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 19 16:17:46 2018 +0200 winhttp: Modify index only if query_headers succeeded. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 3 +-- dlls/winhttp/tests/winhttp.c | 39 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 80694da..72cebdd 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -766,7 +766,6 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID set_last_error( ERROR_WINHTTP_HEADER_NOT_FOUND ); return FALSE; } - if (index) *index += 1; if (level & WINHTTP_QUERY_FLAG_NUMBER) { if (!buffer || sizeof(int) > *buflen) @@ -813,6 +812,7 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID } *buflen = len; } + if (ret && index) *index += 1; return ret; } @@ -902,7 +902,6 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support query_headers( request, level, NULL, NULL, &size, &index ); if (get_last_error() != ERROR_INSUFFICIENT_BUFFER) break; - index--; if (!(buffer = heap_alloc( size ))) return FALSE; if (!query_headers( request, level, NULL, buffer, &size, &index )) { diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1c72c07..5f0935f 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -33,6 +33,7 @@ #include <httprequestid.h> #include "wine/test.h" +#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -42,6 +43,22 @@ static const WCHAR test_winehq[] = {'t','e','s','t','.','w','i','n','e','h','q', static const WCHAR test_winehq_https[] = {'h','t','t','p','s',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',':','4','4','3',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; +static WCHAR *a2w(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + WCHAR *ret = heap_alloc(len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static int strcmp_wa(const WCHAR *str1, const char *stra) +{ + WCHAR *str2 = a2w(stra); + int r = lstrcmpW(str1, str2); + heap_free(str2); + return r; +} + static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2736,9 +2753,12 @@ static void test_basic_authentication(int port) static void test_multi_authentication(int port) { static const WCHAR multiauthW[] = {'/','m','u','l','t','i','a','u','t','h',0}; + static const WCHAR www_authenticateW[] = + {'W','W','W','-','A','u','t','h','e','n','t','i','c','a','t','e',0}; static const WCHAR getW[] = {'G','E','T',0}; HINTERNET ses, con, req; - DWORD supported, first, target; + DWORD supported, first, target, size, index; + WCHAR buf[512]; BOOL ret; ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); @@ -2764,6 +2784,22 @@ static void test_multi_authentication(int port) ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + index = 0; + size = sizeof(buf); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, buf, &size, &index); + ok(ret, "expected success\n"); + ok(!strcmp_wa(buf, "Bearer"), "buf = %s\n", wine_dbgstr_w(buf)); + ok(size == lstrlenW(buf) * sizeof(WCHAR), "size = %u\n", size); + ok(index == 1, "index = %u\n", index); + + index = 0; + size = 0xdeadbeef; + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, www_authenticateW, NULL, &size, &index); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "WinHttpQueryHeaders returned %x(%u)\n", ret, GetLastError()); + ok(size == (lstrlenW(buf) + 1) * sizeof(WCHAR), "size = %u\n", size); + ok(index == 0, "index = %u\n", index); + WinHttpCloseHandle(req); WinHttpCloseHandle(con); WinHttpCloseHandle(ses); @@ -3087,6 +3123,7 @@ static void test_bad_header( int port ) content_typeW, buffer, &len, &index ); ok( ret, "failed to query headers %u\n", GetLastError() ); ok( !lstrcmpW( buffer, text_htmlW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( index == 1, "index = %u\n", index ); WinHttpCloseHandle( req ); WinHttpCloseHandle( con );

1 0

Zebediah Figura : quartz/filtergraph: Unset the name of a removed filter.
by Alexandre Julliard Sept. 19, 2018

Sept. 19, 2018

Module: wine Branch: master Commit: 9ed4b1f7f8080430733990213b97503ba15788f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ed4b1f7f808043073399021… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 18 22:44:11 2018 -0500 quartz/filtergraph: Unset the name of a removed filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- dlls/quartz/tests/filtergraph.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 9d34bd4..7f22475 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -681,7 +681,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte IEnumPins_Release(penumpins); } - hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, entry->name); + hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, NULL); if (SUCCEEDED(hr)) { IBaseFilter_SetSyncSource(pFilter, NULL); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7425e29..4d49772 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1890,7 +1890,6 @@ static void test_add_remove_filter(void) hr = IFilterGraph2_RemoveFilter(graph, &filter.IBaseFilter_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); -todo_wine ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); ok(!filter.clock, "Got clock %p,\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); @@ -1904,7 +1903,6 @@ todo_wine hr = IFilterGraph2_Release(graph); ok(!hr, "Got outstanding refcount %d.\n", hr); ok(!filter.graph, "Got graph %p.\n", filter.graph); -todo_wine ok(!filter.name, "Got name %s.\n", wine_dbgstr_w(filter.name)); ok(!filter.clock, "Got clock %p.\n", filter.clock); ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref);

1 0