April 2014 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3/tests: Fix enumerator instance leak (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 039712970bea2938e6b0e2b20861b453afee895b URL: http://source.winehq.org/git/wine.git/?a=commit;h=039712970bea2938e6b0e2b20… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 16:54:14 2014 +0400 msxml3/tests: Fix enumerator instance leak (Valgrind). --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 1a2ec5e..d064d10 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -9415,6 +9415,7 @@ static void test_selection(void) IEnumVARIANT_Release(enum1); IEnumVARIANT_Release(enum2); + IEnumVARIANT_Release(enum3); enum1 = NULL; hr = IXMLDOMSelection_get__newEnum(selection, (IUnknown**)&enum1);

1 0

Stefan Dösinger : ddraw: Only ddraw7 disallows SetPalette on sublevels.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 590582e6bc1d7f901be9d559a0e9f501c08ece4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=590582e6bc1d7f901be9d559a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 24 14:36:09 2014 +0200 ddraw: Only ddraw7 disallows SetPalette on sublevels. --- dlls/ddraw/surface.c | 78 ++++++++++++++++++++++++++++---------------------- 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 13458f6..b561af4 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -447,6 +447,43 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } +static HRESULT WINAPI ddraw_surface_set_palette(struct ddraw_surface *surface, IDirectDrawPalette *palette) +{ + struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); + struct ddraw_palette *prev; + + TRACE("iface %p, palette %p.\n", surface, palette); + + if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 + | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) + return DDERR_INVALIDPIXELFORMAT; + + wined3d_mutex_lock(); + + prev = surface->palette; + if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + { + if (prev) + prev->flags &= ~DDPCAPS_PRIMARYSURFACE; + if (palette_impl) + palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; + /* Update the wined3d frontbuffer if this is the primary. */ + if (surface->ddraw->wined3d_frontbuffer) + wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, + palette_impl ? palette_impl->wineD3DPalette : NULL); + } + if (palette_impl) + IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); + if (prev) + IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); + surface->palette = palette_impl; + wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); + + wined3d_mutex_unlock(); + + return DD_OK; +} + static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -456,7 +493,7 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) /* The refcount test shows that the palette is detached when the surface * is destroyed. */ - IDirectDrawSurface7_SetPalette(&surface->IDirectDrawSurface7_iface, NULL); + ddraw_surface_set_palette(surface, NULL); /* Loop through all complex attached surfaces and destroy them. * @@ -4640,42 +4677,13 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); - struct ddraw_palette *palette_impl = unsafe_impl_from_IDirectDrawPalette(palette); - struct ddraw_palette *prev; TRACE("iface %p, palette %p.\n", iface, palette); - if (!(surface->surface_desc.u4.ddpfPixelFormat.dwFlags & (DDPF_PALETTEINDEXED1 | DDPF_PALETTEINDEXED2 - | DDPF_PALETTEINDEXED4 | DDPF_PALETTEINDEXED8 | DDPF_PALETTEINDEXEDTO8))) - return DDERR_INVALIDPIXELFORMAT; - if (surface->surface_desc.ddsCaps.dwCaps2 & DDSCAPS2_MIPMAPSUBLEVEL) return DDERR_NOTONMIPMAPSUBLEVEL; - wined3d_mutex_lock(); - - prev = surface->palette; - if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - { - if (prev) - prev->flags &= ~DDPCAPS_PRIMARYSURFACE; - if (palette_impl) - palette_impl->flags |= DDPCAPS_PRIMARYSURFACE; - /* Update the wined3d frontbuffer if this is the primary. */ - if (surface->ddraw->wined3d_frontbuffer) - wined3d_surface_set_palette(surface->ddraw->wined3d_frontbuffer, - palette_impl ? palette_impl->wineD3DPalette : NULL); - } - if (palette_impl) - IDirectDrawPalette_AddRef(&palette_impl->IDirectDrawPalette_iface); - if (prev) - IDirectDrawPalette_Release(&prev->IDirectDrawPalette_iface); - surface->palette = palette_impl; - wined3d_surface_set_palette(surface->wined3d_surface, palette_impl ? palette_impl->wineD3DPalette : NULL); - - wined3d_mutex_unlock(); - - return DD_OK; + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDirectDrawPalette *palette) @@ -4684,7 +4692,7 @@ static HRESULT WINAPI ddraw_surface4_SetPalette(IDirectDrawSurface4 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDirectDrawPalette *palette) @@ -4693,7 +4701,7 @@ static HRESULT WINAPI ddraw_surface3_SetPalette(IDirectDrawSurface3 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDirectDrawPalette *palette) @@ -4702,7 +4710,7 @@ static HRESULT WINAPI ddraw_surface2_SetPalette(IDirectDrawSurface2 *iface, IDir TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDirectDrawPalette *palette) @@ -4711,7 +4719,7 @@ static HRESULT WINAPI ddraw_surface1_SetPalette(IDirectDrawSurface *iface, IDire TRACE("iface %p, palette %p.\n", iface, palette); - return ddraw_surface7_SetPalette(&surface->IDirectDrawSurface7_iface, palette); + return ddraw_surface_set_palette(surface, palette); } /**********************************************************

1 0

Vincent Povirk : user32/tests: Add test calling EndMenu from WM_ENTERMENULOOP.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 412222609f69ac72690fe5ae122bcf85ec864eb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412222609f69ac72690fe5ae1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 16 12:23:01 2014 -0500 user32/tests: Add test calling EndMenu from WM_ENTERMENULOOP. --- dlls/user32/tests/msg.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 684347d..fdc882d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1762,6 +1762,22 @@ static const struct message WmTrackPopupMenuEmpty[] = { { 0 } }; +static const struct message WmTrackPopupMenuAbort[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; @@ -14342,6 +14358,19 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); } +static LRESULT WINAPI cancel_init_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (ignore_message( message )) return 0; + + switch (message) { + case WM_ENTERMENULOOP: + ok(EndMenu() == TRUE, "EndMenu() failed\n"); + break; + } + + return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); +} + static void test_TrackPopupMenu(void) { HWND hwnd; @@ -14366,6 +14395,14 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_init_proc); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); + ok(ret == TRUE, "TrackPopupMenu failed\n"); + DestroyMenu(hpopupmenu); DestroyWindow(hwnd); }

1 0

Vincent Povirk : user32/tests: Add a message test for popup menus on windows that have capture.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e1c5af1e8d96a4e288611ff8c3bac5804536c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c5af1e8d96a4e288611ff8c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 25 15:40:04 2014 -0500 user32/tests: Add a message test for popup menus on windows that have capture. --- dlls/user32/tests/msg.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index fdc882d..6406190 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1747,6 +1747,24 @@ static const struct message WmTrackPopupMenu[] = { { 0 } }; +static const struct message WmTrackPopupMenuCapture[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_CAPTURECHANGED, sent }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + static const struct message WmTrackPopupMenuEmpty[] = { { HCBT_CREATEWND, hook }, { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, @@ -14353,6 +14371,9 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, case WM_UNINITMENUPOPUP: ok((HMENU)wParam == hpopupmenu, "expected %p, got %lx\n", hpopupmenu, wParam); break; + case WM_CAPTURECHANGED: + todo_wine ok(!lParam || (HWND)lParam == hwnd, "lost capture to %lx\n", lParam); + break; } return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); @@ -14403,6 +14424,16 @@ static void test_TrackPopupMenu(void) ok_sequence(WmTrackPopupMenuAbort, "WmTrackPopupMenuAbort", TRUE); ok(ret == TRUE, "TrackPopupMenu failed\n"); + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); + + SetCapture(hwnd); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuCapture, "TrackPopupMenuCapture", TRUE); + ok(ret == 1, "TrackPopupMenuCapture failed with error %i\n", GetLastError()); + DestroyMenu(hpopupmenu); DestroyWindow(hwnd); }

1 0

Vincent Povirk : user32/tests: Our popup test window loses capture to itself.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: eb8406b8102ae43d75b2573836de801203898c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb8406b8102ae43d75b257383… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 25 15:45:52 2014 -0500 user32/tests: Our popup test window loses capture to itself. --- dlls/user32/tests/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 2d6e534..aba9359 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3098,6 +3098,9 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, } cap_wnd = GetCapture(); + ok(cap_wnd == (HWND)lParam, "capture window %p does not match lparam %lx\n", cap_wnd, lParam); + todo_wine ok(cap_wnd == hWnd, "capture window %p does not match hwnd %p\n", cap_wnd, hWnd); + /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); ok(!set_cap_wnd || broken(set_cap_wnd == cap_wnd), /* nt4 */

1 0

André Hentschel : advapi32: Add stubs for GetTraceEnableFlags and GetTraceEnableLevel.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 77b0e788b8d117aacee482b6d1adda444190affd URL: http://source.winehq.org/git/wine.git/?a=commit;h=77b0e788b8d117aacee482b6d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 24 20:59:48 2014 +0200 advapi32: Add stubs for GetTraceEnableFlags and GetTraceEnableLevel. --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/eventlog.c | 18 ++++++++++++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 ++-- include/evntrace.h | 10 ++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 9e2ab05..0b654c8 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -351,8 +351,8 @@ @ stub GetSiteSidFromToken # @ stub GetThreadWaitChain @ stdcall GetTokenInformation(long long ptr long ptr) -@ stub GetTraceEnableFlags -@ stub GetTraceEnableLevel +@ stdcall GetTraceEnableFlags(int64) +@ stdcall GetTraceEnableLevel(int64) @ stdcall -ret64 GetTraceLoggerHandle(ptr) @ stdcall GetTrusteeFormA(ptr) @ stdcall GetTrusteeFormW(ptr) diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index 828f23b..d730bb9 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -378,6 +378,24 @@ BOOL WINAPI GetOldestEventLogRecord( HANDLE hEventLog, PDWORD OldestRecord ) } /****************************************************************************** + * GetTraceEnableFlags [ADVAPI32.@] + */ +ULONG WINAPI GetTraceEnableFlags( TRACEHANDLE handle ) +{ + FIXME("(%s) stub\n", wine_dbgstr_longlong(handle)); + return 0; +} + +/****************************************************************************** + * GetTraceEnableLevel [ADVAPI32.@] + */ +UCHAR WINAPI GetTraceEnableLevel( TRACEHANDLE handle ) +{ + FIXME("(%s) stub\n", wine_dbgstr_longlong(handle)); + return TRACE_LEVEL_VERBOSE; +} + +/****************************************************************************** * GetTraceLoggerHandle [ADVAPI32.@] */ TRACEHANDLE WINAPI GetTraceLoggerHandle( PVOID buf ) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 73f3207..5b0b069 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -66,8 +66,8 @@ @ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority @ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount @ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation -@ stub GetTraceEnableFlags -@ stub GetTraceEnableLevel +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel @ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle @ stdcall InitializeAcl(ptr long long) advapi32.InitializeAcl @ stdcall InitializeSecurityDescriptor(ptr long) advapi32.InitializeSecurityDescriptor diff --git a/include/evntrace.h b/include/evntrace.h index 418e437..cc442dc 100644 --- a/include/evntrace.h +++ b/include/evntrace.h @@ -30,6 +30,14 @@ extern "C" { #define EVENT_TRACE_CONTROL_UPDATE 2 #define EVENT_TRACE_CONTROL_FLUSH 3 +#define TRACE_LEVEL_NONE 0 +#define TRACE_LEVEL_CRITICAL 1 +#define TRACE_LEVEL_FATAL 1 +#define TRACE_LEVEL_ERROR 2 +#define TRACE_LEVEL_WARNING 3 +#define TRACE_LEVEL_INFORMATION 4 +#define TRACE_LEVEL_VERBOSE 5 + typedef ULONG64 TRACEHANDLE, *PTRACEHANDLE; struct _EVENT_TRACE_LOGFILEA; @@ -221,6 +229,8 @@ ULONG WINAPI EnableTrace(ULONG,ULONG,ULONG,LPCGUID,TRACEHANDLE); ULONG WINAPI FlushTraceA(TRACEHANDLE,LPCSTR,PEVENT_TRACE_PROPERTIES); ULONG WINAPI FlushTraceW(TRACEHANDLE,LPCWSTR,PEVENT_TRACE_PROPERTIES); #define FlushTrace WINELIB_NAME_AW(FlushTrace) +ULONG WINAPI GetTraceEnableFlags(TRACEHANDLE); +UCHAR WINAPI GetTraceEnableLevel(TRACEHANDLE); TRACEHANDLE WINAPI GetTraceLoggerHandle(PVOID); ULONG WINAPI QueryAllTracesA(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG); ULONG WINAPI QueryAllTracesW(PEVENT_TRACE_PROPERTIES*,ULONG,PULONG);

1 0

Bruno Jesus : dinput: Remove duplicated TRACE check.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e01130724493dab1e7bd6650db826c81c14cd3c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e01130724493dab1e7bd6650d… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Apr 24 20:42:37 2014 -0300 dinput: Remove duplicated TRACE check. --- dlls/dinput/joystick.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 4eddd89..0d61f57 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -406,7 +406,6 @@ void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) TRACE("dwFlags: %08x\n", lpDIDevCaps->dwFlags); TRACE("dwDevType: %08x %s\n", lpDIDevCaps->dwDevType, lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : - lpDIDevCaps->dwDevType == DIDEVTYPE_DEVICE ? "DIDEVTYPE_DEVICE" : lpDIDevCaps->dwDevType == DIDEVTYPE_MOUSE ? "DIDEVTYPE_MOUSE" : lpDIDevCaps->dwDevType == DIDEVTYPE_KEYBOARD ? "DIDEVTYPE_KEYBOARD" : lpDIDevCaps->dwDevType == DIDEVTYPE_JOYSTICK ? "DIDEVTYPE_JOYSTICK" :

1 0

Nikolay Sivov : advapi32/tests: Fix some leaks in tests (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: e543eeb42be157a5c6fb6bc17825d394af699aa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e543eeb42be157a5c6fb6bc17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 09:22:48 2014 +0400 advapi32/tests: Fix some leaks in tests (Valgrind). --- dlls/advapi32/tests/security.c | 8 ++++++-- dlls/advapi32/tests/service.c | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index bd45189..a0574c4 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3124,6 +3124,7 @@ static void test_CreateDirectoryA(void) ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } + LocalFree(pSD); done: HeapFree(GetProcessHeap(), 0, user); @@ -3231,10 +3232,12 @@ static void test_GetNamedSecurityInfoA(void) NULL, NULL, NULL, NULL, NULL); ok(error==ERROR_INVALID_PARAMETER, "GetNamedSecurityInfo failed with error %d\n", error); + pDacl = NULL; error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,DACL_SECURITY_INFORMATION, - NULL, NULL, &pDacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, &pSD); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); ok(pDacl != NULL, "DACL should not be NULL\n"); + LocalFree(pSD); error = pGetNamedSecurityInfoA(windows_dir, SE_FILE_OBJECT,OWNER_SECURITY_INFORMATION, NULL, NULL, &pDacl, NULL, NULL); @@ -3950,7 +3953,7 @@ static void test_GetSecurityInfo(void) NULL, NULL, pDacl, NULL); ok(ret == ERROR_SUCCESS, "SetSecurityInfo returned %d\n", ret); ret = pGetSecurityInfo(obj, SE_FILE_OBJECT, DACL_SECURITY_INFORMATION, - NULL, NULL, &pDacl, NULL, NULL); + NULL, NULL, &pDacl, NULL, &pSD); ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); ok(pDacl && IsValidAcl(pDacl), "GetSecurityInfo returned invalid DACL.\n"); bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); @@ -3977,6 +3980,7 @@ static void test_GetSecurityInfo(void) ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); } + LocalFree(pSD); CloseHandle(obj); } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 9b6c1cf..4ebae1c 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -136,6 +136,7 @@ static void test_open_svc(void) ok(GetLastError() == ERROR_INVALID_ADDRESS /* W2K, XP, W2K3, Vista */ || GetLastError() == ERROR_INVALID_PARAMETER /* NT4 */, "Expected ERROR_INVALID_ADDRESS or ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + CloseServiceHandle(scm_handle); /* Nonexistent service */ scm_handle = OpenSCManagerA(NULL, NULL, SC_MANAGER_CONNECT); @@ -1840,8 +1841,9 @@ static void test_sequence(void) if (!is_nt4) { retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, - NULL, &dacl, NULL, NULL); + NULL, &dacl, NULL, &pSD); ok(retval == ERROR_SUCCESS, "Expected GetSecurityInfo to succeed: result %d\n", retval); + LocalFree(pSD); SetLastError(0xdeadbeef); retval = pGetSecurityInfo(svc_handle, SE_SERVICE, DACL_SECURITY_INFORMATION, NULL, NULL, NULL, NULL, NULL);

1 0

Nikolay Sivov : comctl32/tests: Initialize text buffer pointer (Valgrind).
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 9b2ea633114651dfe55f9026bf1654290ae501b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b2ea633114651dfe55f9026b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 25 11:21:05 2014 +0400 comctl32/tests: Initialize text buffer pointer (Valgrind). --- dlls/comctl32/tests/tooltips.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 2766354..271009d 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -466,6 +466,7 @@ static void test_ttm_gettoolinfo(void) tiW.hwnd = NULL; tiW.uId = 0x1234ABCD; tiW.lParam = 0xaaaaaaaa; + tiW.lpszText = NULL; r = SendMessageA(hwnd, TTM_GETTOOLINFOW, 0, (LPARAM)&tiW); ok(r, "Getting tooltip info failed\n"); ok(0x1abe11ed == tiW.lParam ||

1 0

Vincent Povirk : shell32: Respect CMIC_MASK_NO_CONSOLE in ShellLink InvokeCommand.
by Alexandre Julliard 25 Apr '14

25 Apr '14

Module: wine Branch: master Commit: 7eebbf3b076aaa9438f04959e02a94c44c419b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7eebbf3b076aaa9438f04959e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Apr 17 17:30:43 2014 -0500 shell32: Respect CMIC_MASK_NO_CONSOLE in ShellLink InvokeCommand. --- dlls/shell32/shelllink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 4000a1d..b9c9e75 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2500,7 +2500,7 @@ ShellLink_InvokeCommand( IContextMenu* iface, LPCMINVOKECOMMANDINFO lpici ) memset( &sei, 0, sizeof sei ); sei.cbSize = sizeof sei; - sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); + sei.fMask = SEE_MASK_UNICODE | (lpici->fMask & (SEE_MASK_NOASYNC|SEE_MASK_NO_CONSOLE|SEE_MASK_ASYNCOK|SEE_MASK_FLAG_NO_UI)); sei.lpFile = path; sei.nShow = This->iShowCmd; sei.lpIDList = This->pPidl;

1 0