wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Fabian Maurer : user32: Only send position-change messages when needed.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: d594ba3322e1385f2ad94b7c58d3acef3f246c73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d594ba3322e1385f2ad94b7c5… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:30 2017 +0100 user32: Only send position-change messages when needed. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 18 +++++++++--------- dlls/user32/winpos.c | 6 ++++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ea5980e..13bc038 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5164,31 +5164,31 @@ static void test_messages(void) test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, 0, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, - SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, TRUE); + SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTSIZE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq5, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOZORDER, FALSE); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 6ed2d95..c2b35ec 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1643,7 +1643,8 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT /* Send WM_WINDOWPOSCHANGING message */ - if (!(pWinpos->flags & SWP_NOSENDCHANGING)) + if (!(pWinpos->flags & SWP_NOSENDCHANGING) + && !((pWinpos->flags & SWP_AGG_NOCLIENTCHANGE) && (pWinpos->flags & SWP_SHOWWINDOW))) SendMessageW( pWinpos->hwnd, WM_WINDOWPOSCHANGING, 0, (LPARAM)pWinpos ); if (!(wndPtr = WIN_GetPtr( pWinpos->hwnd )) || @@ -2271,7 +2272,8 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) TRACE("\tstatus flags = %04x\n", winpos->flags & SWP_AGG_STATUSFLAGS); - if (((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE)) + if (((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) + && !((orig_flags & SWP_AGG_NOCLIENTCHANGE) && (orig_flags & SWP_SHOWWINDOW))) { /* WM_WINDOWPOSCHANGED is sent even if SWP_NOSENDCHANGING is set and always contains final window position.

1 0

Fabian Maurer : user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 997d4ef44f0f9e2284f99d7ce9ec135d68b30c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=997d4ef44f0f9e2284f99d7ce… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Feb 13 16:58:29 2017 +0100 user32: Send WM_NCPAINT and WM_ERASEBKGND when window is shown. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- dlls/user32/winpos.c | 33 +++++++++++++++++++++++---------- 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0d5aec7..ea5980e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -4651,7 +4651,7 @@ static void test_showwindow(void) flush_sequence(); ShowWindow(hwnd, SW_SHOWMAXIMIZED); ok_sequence(WmShowMaxPopupResizedSeq_todo, - "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", FALSE); + "ShowWindow(SW_SHOWMAXIMIZED):invisible maximized and resized popup TODO", TRUE); DestroyWindow(hwnd); flush_sequence(); @@ -5135,7 +5135,7 @@ static void test_messages(void) 10, 10, 100, 100, NULL, 0, 0, NULL ); ok (hwnd != 0, "Failed to create popup window\n"); RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); - ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_visible", FALSE); DestroyWindow(hwnd); /* Invisible, show, message */ @@ -5146,7 +5146,7 @@ static void test_messages(void) ok (hwnd != 0, "Failed to create popup window\n"); ShowWindow(hwnd, SW_SHOW); SendMessageW(hwnd, WM_PAINT, 0, 0); - ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_1, "RedrawWindow:show_popup_first_draw_show", FALSE); DestroyWindow(hwnd); /* Invisible, show maximized, redraw */ @@ -5157,20 +5157,20 @@ static void test_messages(void) ok (hwnd != 0, "Failed to create popup window\n"); ShowWindow(hwnd, SW_SHOWMAXIMIZED); RedrawWindow(hwnd, NULL, NULL, RDW_UPDATENOW); - ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", TRUE); + ok_sequence(WmShowPopupFirstDrawSeq_2, "RedrawWindow:show_popup_first_draw_show_maximized", FALSE); DestroyWindow(hwnd); /* Test SetWindowPos */ - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, 0, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOMOVE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTSIZE, TRUE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCLIENTMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOCLIENTMOVE, TRUE); @@ -5179,12 +5179,12 @@ static void test_messages(void) test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOSIZE, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_DEFERERASE | SWP_NOZORDER, FALSE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTMOVE, TRUE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOCLIENTSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, TRUE); - test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, TRUE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq4, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOMOVE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOSIZE, FALSE); + test_msg_setpos(WmFirstDrawSetWindowPosSeq1, SWP_SHOWWINDOW | SWP_NOCOPYBITS | SWP_NOZORDER, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq2, SWP_SHOWWINDOW | SWP_NOREDRAW, FALSE); test_msg_setpos(WmFirstDrawSetWindowPosSeq3, SWP_SHOWWINDOW | SWP_NOREDRAW | SWP_NOCLIENTMOVE, TRUE); @@ -5220,7 +5220,7 @@ static void test_messages(void) flush_sequence(); SetWindowPos(hparent, NULL, 0, 0, 100, 100, SWP_SHOWWINDOW); ok_sequence(WmFirstDrawChildSeq2, /* Expect child to be redrawn */ - "SetWindowPos:show_popup_first_show_window_child2", TRUE); + "SetWindowPos:show_popup_first_show_window_child2", FALSE); DestroyWindow(hchild); DestroyWindow(hparent); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index d94f5a3..6ed2d95 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); (SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER) #define SWP_AGG_STATUSFLAGS \ (SWP_AGG_NOPOSCHANGE | SWP_FRAMECHANGED | SWP_HIDEWINDOW | SWP_SHOWWINDOW) +#define SWP_AGG_NOCLIENTCHANGE \ + (SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE) #define HAS_DLGFRAME(style,exStyle) \ (((exStyle) & WS_EX_DLGMODALFRAME) || \ @@ -2229,16 +2231,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) &newWindowRect, &newClientRect, valid_rects )) return FALSE; - /* erase parent when hiding or resizing child */ - if (!(orig_flags & SWP_DEFERERASE) && - ((orig_flags & SWP_HIDEWINDOW) || - (!(orig_flags & SWP_SHOWWINDOW) && - (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE))) - { - HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); - if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; - erase_now( parent, 0 ); - } + if( winpos->flags & SWP_HIDEWINDOW ) HideCaret(winpos->hwnd); @@ -2254,6 +2247,26 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos ) SetForegroundWindow( winpos->hwnd ); } + if(!(orig_flags & SWP_DEFERERASE)) + { + /* erase parent when hiding or resizing child */ + if ((orig_flags & SWP_HIDEWINDOW) || + (!(orig_flags & SWP_SHOWWINDOW) && + (winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOGEOMETRYCHANGE)) + { + HWND parent = GetAncestor( winpos->hwnd, GA_PARENT ); + if (!parent || parent == GetDesktopWindow()) parent = winpos->hwnd; + erase_now( parent, 0 ); + } + + /* Give newly shown windows a chance to redraw */ + if(((winpos->flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) + && !(orig_flags & SWP_AGG_NOCLIENTCHANGE) && (orig_flags & SWP_SHOWWINDOW)) + { + erase_now(winpos->hwnd, 0); + } + } + /* And last, send the WM_WINDOWPOSCHANGED message */ TRACE("\tstatus flags = %04x\n", winpos->flags & SWP_AGG_STATUSFLAGS);

1 0

Gerald Pfeifer : propsys: Use snprintf in PROPVAR_ConvertFILETIME.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 6df21d4015dcc4564e223062ec41252700fc6590 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df21d4015dcc4564e223062e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Feb 11 23:13:00 2017 +0100 propsys: Use snprintf in PROPVAR_ConvertFILETIME. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propvar.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index 002555e..3fee67a 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -50,13 +50,15 @@ static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest, static const char format[] = "%04d/%02d/%02d:%02d:%02d:%02d.%03d"; ppropvarDest->u.pszVal = HeapAlloc(GetProcessHeap(), 0, - lstrlenA(format) + 1); + sizeof(format)); if (!ppropvarDest->u.pszVal) return E_OUTOFMEMORY; - sprintf(ppropvarDest->u.pszVal, format, time.wYear, time.wMonth, - time.wDay, time.wHour, time.wMinute, - time.wSecond, time.wMilliseconds); + snprintf( ppropvarDest->u.pszVal, sizeof(format), + format, + time.wYear, time.wMonth, time.wDay, + time.wHour, time.wMinute, time.wSecond, + time.wMilliseconds ); return S_OK; }

1 0

Zebediah Figura : storage.dll16: Fix an error in a comment.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 68c095302f0a8e73cc25c3d4271d7f14112c93c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68c095302f0a8e73cc25c3d42… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Feb 11 15:56:04 2017 -0600 storage.dll16: Fix an error in a comment. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index cac616c..5969333 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -70,7 +70,7 @@ struct storage_pps_entry { GUID pps_guid; /* 50: class ID */ DWORD pps_unknown1; /* 60: unknown */ FILETIME pps_ft1; /* 64: filetime1 */ - FILETIME pps_ft2; /* 70: filetime2 */ + FILETIME pps_ft2; /* 6C: filetime2 */ DWORD pps_sb; /* 74: data startblock */ DWORD pps_size; /* 78: datalength. (<0x1000)?small:big blocks*/ DWORD pps_unknown2; /* 7C: unknown */

1 0

Austin English : advapi32: Add LookupSecurityDescriptorPartsA/W stubs.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 03c2bf093b2f96b8bf79d9dd0a600b9efa8fa1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c2bf093b2f96b8bf79d9dd0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 16 21:17:30 2017 +0100 advapi32: Add LookupSecurityDescriptorPartsA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/security.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 6c57c88..88d8634 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -415,8 +415,8 @@ @ stdcall LookupPrivilegeNameW(wstr ptr ptr ptr) @ stdcall LookupPrivilegeValueA(ptr ptr ptr) @ stdcall LookupPrivilegeValueW(ptr ptr ptr) -# @ stub LookupSecurityDescriptorPartsA -# @ stub LookupSecurityDescriptorPartsW +@ stdcall LookupSecurityDescriptorPartsA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupSecurityDescriptorPartsW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LsaAddAccountRights(ptr ptr ptr long) @ stub LsaAddPrivilegesToAccount # @ stub LsaClearAuditLog diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index ac61005..e36792c 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -6093,3 +6093,27 @@ BOOL WINAPI SaferSetLevelInformation(SAFER_LEVEL_HANDLE handle, SAFER_OBJECT_INF FIXME("(%p %u %p %u) stub\n", handle, infotype, buffer, size); return FALSE; } + +/****************************************************************************** + * LookupSecurityDescriptorPartsA [ADVAPI32.@] + */ +DWORD WINAPI LookupSecurityDescriptorPartsA(TRUSTEEA *owner, TRUSTEEA *group, ULONG *access_count, + EXPLICIT_ACCESSA *access_list, ULONG *audit_count, + EXPLICIT_ACCESSA *audit_list, SECURITY_DESCRIPTOR *descriptor) +{ + FIXME("(%p %p %p %p %p %p %p) stub\n", owner, group, access_count, + access_list, audit_count, audit_list, descriptor); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * LookupSecurityDescriptorPartsW [ADVAPI32.@] + */ +DWORD WINAPI LookupSecurityDescriptorPartsW(TRUSTEEW *owner, TRUSTEEW *group, ULONG *access_count, + EXPLICIT_ACCESSW *access_list, ULONG *audit_count, + EXPLICIT_ACCESSW *audit_list, SECURITY_DESCRIPTOR *descriptor) +{ + FIXME("(%p %p %p %p %p %p %p) stub\n", owner, group, access_count, + access_list, audit_count, audit_list, descriptor); + return ERROR_CALL_NOT_IMPLEMENTED; +}

1 0

Bruno Jesus : ws2_32/tests: Add IP_HDRINCL tests.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 19666ef55bb28ecaa4bbe14063ce0e1f25fa243f URL: http://source.winehq.org/git/wine.git/?a=commit;h=19666ef55bb28ecaa4bbe1406… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Feb 20 01:48:30 2017 -0300 ws2_32/tests: Add IP_HDRINCL tests. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7208088..59a23d7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1565,6 +1565,8 @@ todo_wine /* test SO_PROTOCOL_INFO structure returned for different protocols */ for (i = 0; i < sizeof(prottest) / sizeof(prottest[0]); i++) { + int k; + s = socket(prottest[i].family, prottest[i].type, prottest[i].proto); if (s == INVALID_SOCKET && prottest[i].family == AF_INET6) continue; @@ -1609,6 +1611,76 @@ todo_wine ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); + /* IP_HDRINCL is supported only on SOCK_RAW but passed to SOCK_DGRAM by Impossible Creatures */ + size = sizeof(i); + k = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + if (err == -1) /* >= Vista */ + { + todo_wine { + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + k = 99; + SetLastError(0xdeadbeef); + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); + + size = sizeof(k); + k = 0; + SetLastError(0xdeadbeef); + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + } + ok(err == -1, "Expected -1, got %d\n", err); + todo_wine { + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + k = 99; + SetLastError(0xdeadbeef); + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAEINVAL, "Expected 10022, got %d\n", GetLastError()); + ok(k == 99, "Expected 99, got %d\n", k); + } + } + else /* <= 2003 the tests differ between TCP and UDP, UDP silenty accepts */ + { + SetLastError(0xdeadbeef); + k = 99; + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + if (prottest[i].type == SOCK_DGRAM) + { + ok(err == 0, "Expected 0, got %d\n", err); + ok(k == 1, "Expected 1, got %d\n", k); + } + else + { + /* contratry to what we could expect the function returns error but k is changed */ + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); + ok(k == 0, "Expected 0, got %d\n", k); + } + + k = 0; + err = setsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, size); + ok(err == 0, "Expected 0, got %d\n", err); + + k = 99; + err = getsockopt(s, IPPROTO_IP, IP_HDRINCL, (char *) &k, &size); + if (prottest[i].type == SOCK_DGRAM) + { + ok(err == 0, "Expected 0, got %d\n", err); + ok(k == 0, "Expected 0, got %d\n", k); + } + else + { + /* contratry to what we could expect the function returns error but k is changed */ + ok(err == -1, "Expected -1, got %d\n", err); + ok(GetLastError() == WSAENOPROTOOPT, "Expected 10042, got %d\n", GetLastError()); + ok(k == 0, "Expected 0, got %d\n", k); + } + } + closesocket(s); }

1 0

Nikolay Sivov : comctl32/tests: Some tests for property page initialization.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: ad7a1a0e3dacb553e3facfa6ed4c10a60bddd345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7a1a0e3dacb553e3facfa6e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 22:26:27 2017 +0300 comctl32/tests: Some tests for property page initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 142 ++++++++++++++++++++++++++++++++++++++++ include/prsht.h | 1 + 2 files changed, 143 insertions(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 7547e79..0b1c45c 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -987,6 +987,147 @@ if (0) DestroyWindow(hdlg); } +struct custom_proppage +{ + union + { + PROPSHEETPAGEA pageA; + PROPSHEETPAGEW pageW; + } u; + unsigned int addref_called; + unsigned int release_called; +}; + +static UINT CALLBACK proppage_callback_a(HWND hwnd, UINT msg, PROPSHEETPAGEA *psp) +{ + struct custom_proppage *cpage = (struct custom_proppage *)psp->lParam; + PROPSHEETPAGEA *psp_orig = &cpage->u.pageA; + + ok(hwnd == NULL, "Expected NULL hwnd, got %p\n", hwnd); + + ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %lx, %p\n", + psp->lParam, psp); + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + ok(!lstrcmpA(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + + switch (msg) + { + case PSPCB_ADDREF: + ok(psp->dwSize > PROPSHEETPAGEA_V1_SIZE, "Expected ADDREF for V2+ only, got size %u\n", psp->dwSize); + cpage->addref_called++; + break; + case PSPCB_RELEASE: + ok(psp->dwSize >= PROPSHEETPAGEA_V1_SIZE, "Unexpected RELEASE, got size %u\n", psp->dwSize); + cpage->release_called++; + break; + default: + ok(0, "Unexpected message %u\n", msg); + } + + return 1; +} + +static UINT CALLBACK proppage_callback_w(HWND hwnd, UINT msg, PROPSHEETPAGEW *psp) +{ + struct custom_proppage *cpage = (struct custom_proppage *)psp->lParam; + PROPSHEETPAGEW *psp_orig = &cpage->u.pageW; + + ok(hwnd == NULL, "Expected NULL hwnd, got %p\n", hwnd); + ok(psp->lParam && psp->lParam != (LPARAM)psp, "Expected newly allocated page description, got %lx, %p\n", + psp->lParam, psp); + ok(psp_orig->pszTitle == psp->pszTitle, "Expected same page title pointer\n"); + ok(!lstrcmpW(psp_orig->pszTitle, psp->pszTitle), "Expected same page title string\n"); + + switch (msg) + { + case PSPCB_ADDREF: + ok(psp->dwSize > PROPSHEETPAGEW_V1_SIZE, "Expected ADDREF for V2+ only, got size %u\n", psp->dwSize); + cpage->addref_called++; + break; + case PSPCB_RELEASE: + ok(psp->dwSize >= PROPSHEETPAGEW_V1_SIZE, "Unexpected RELEASE, got size %u\n", psp->dwSize); + cpage->release_called++; + break; + default: + ok(0, "Unexpected message %u\n", msg); + } + + return 1; +} + +static void test_CreatePropertySheetPage(void) +{ + static const WCHAR titleW[] = {'T','i','t','l','e',0}; + struct custom_proppage page; + HPROPSHEETPAGE hpsp; + BOOL ret; + + memset(&page.u.pageA, 0, sizeof(page.u.pageA)); + page.u.pageA.dwFlags = PSP_USECALLBACK; + page.u.pageA.pfnDlgProc = page_dlg_proc_messages; + page.u.pageA.pfnCallback = proppage_callback_a; + page.u.pageA.lParam = (LPARAM)&page; + page.u.pageA.pszTitle = "Title"; + + /* Only minimal size validation is performed */ + for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) + { + page.addref_called = 0; + hpsp = CreatePropertySheetPageA(&page.u.pageA); + + if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) + todo_wine + ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); + else + { + ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageA.dwSize); + todo_wine_if(page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) + ok(page.addref_called == (page.u.pageA.dwSize > PROPSHEETPAGEA_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); + } + + if (hpsp) + { + page.release_called = 0; + ret = DestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + todo_wine + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + } + } + + memset(&page.u.pageW, 0, sizeof(page.u.pageW)); + page.u.pageW.dwFlags = PSP_USECALLBACK; + page.u.pageW.pfnDlgProc = page_dlg_proc_messages; + page.u.pageW.pfnCallback = proppage_callback_w; + page.u.pageW.lParam = (LPARAM)&page; + page.u.pageW.pszTitle = titleW; + + for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) + { + page.addref_called = 0; + hpsp = CreatePropertySheetPageW(&page.u.pageW); + + if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) + todo_wine + ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); + else + { + ok(hpsp != NULL, "Failed to create a page, size %u\n", page.u.pageW.dwSize); + todo_wine_if(page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) + ok(page.addref_called == (page.u.pageW.dwSize > PROPSHEETPAGEW_V1_SIZE) ? 1 : 0, "Expected ADDREF callback message\n"); + } + + if (hpsp) + { + page.release_called = 0; + ret = DestroyPropertySheetPage(hpsp); + ok(ret, "Failed to destroy a page\n"); + todo_wine + ok(page.release_called == 1, "Expected RELEASE callback message\n"); + } + } +} + START_TEST(propsheet) { test_title(); @@ -998,4 +1139,5 @@ START_TEST(propsheet) test_messages(); test_PSM_ADDPAGE(); test_PSM_INSERTPAGE(); + test_CreatePropertySheetPage(); } diff --git a/include/prsht.h b/include/prsht.h index f12f402..2b2a3e18 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -293,6 +293,7 @@ DECL_PRSHT_TYPE_AW(LPCPROPSHEETPAGE, LATEST) #define PSP_USEFUSIONCONTEXT 0x00004000 #define PSP_COMMANDLINKS 0x00040000 +#define PSPCB_ADDREF 0 #define PSPCB_RELEASE 1 #define PSPCB_CREATE 2

1 0

Nikolay Sivov : include: Fix PROPSHEETPAGE_V4_SIZE definition.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: e1023765c38929bff9e2fda39fd4b69d7f011dd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1023765c38929bff9e2fda39… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 22:26:26 2017 +0300 include: Fix PROPSHEETPAGE_V4_SIZE definition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/prsht.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/prsht.h b/include/prsht.h index 21fc266..f12f402 100644 --- a/include/prsht.h +++ b/include/prsht.h @@ -99,7 +99,7 @@ typedef const PROPSHEETPAGEA *LPCPROPSHEETPAGEA, *LPCPROPSHEETPAGEA_LATEST; #define PROPSHEETPAGEA_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pcRefParent) #define PROPSHEETPAGEA_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, pszHeaderSubTitle) #define PROPSHEETPAGEA_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEA, hActCtx) -#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETHEADERA) +#define PROPSHEETPAGEA_V4_SIZE sizeof(PROPSHEETPAGEA) typedef struct _PROPSHEETPAGEW { @@ -136,7 +136,7 @@ typedef const PROPSHEETPAGEW *LPCPROPSHEETPAGEW, *LPCPROPSHEETPAGEW_LATEST; #define PROPSHEETPAGEW_V1_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pcRefParent) #define PROPSHEETPAGEW_V2_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, pszHeaderSubTitle) #define PROPSHEETPAGEW_V3_SIZE CCSIZEOF_STRUCT(PROPSHEETPAGEW, hActCtx) -#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETHEADERA) +#define PROPSHEETPAGEW_V4_SIZE sizeof(PROPSHEETPAGEW) typedef struct _PROPSHEETHEADERA

1 0

Bruno Jesus : ws2_32: Trace accept() error.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: f482eed2988d0f0c88b52fc8a264a4365e14a418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f482eed2988d0f0c88b52fc8a… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Feb 19 15:54:31 2017 -0300 ws2_32: Trace accept() error. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4977bbf..3c8c806 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2737,10 +2737,7 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) TRACE("socket %04lx\n", s ); status = _is_blocking(s, &is_blocking); if (status) - { - set_error(status); - return INVALID_SOCKET; - } + goto error; do { /* try accepting first (if there is a deferred connection) */ @@ -2773,7 +2770,9 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) } } while (is_blocking && status == STATUS_CANT_WAIT); +error: set_error(status); + WARN(" -> ERROR %d\n", GetLastError()); return INVALID_SOCKET; }

1 0

Nikolay Sivov : explorerframe: Use W-functions to access window property.
by Alexandre Julliard 20 Feb '17

20 Feb '17

Module: wine Branch: master Commit: 312dc5dc1d23196e46145346f503a313a1f82daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=312dc5dc1d23196e46145346f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 19 21:21:33 2017 +0300 explorerframe: Use W-functions to access window property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/explorerframe/nstc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 9ed392b..a2ab974 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -72,6 +72,8 @@ static const DWORD unsupported_styles2 = NSTCS2_INTERRUPTNOTIFICATIONS | NSTCS2_SHOWNULLSPACEMENU | NSTCS2_DISPLAYPADDING | NSTCS2_DISPLAYPINNEDONLY | NTSCS2_NOSINGLETONAUTOEXPAND | NTSCS2_NEVERINSERTNONENUMERATED; +static const WCHAR thispropW[] = {'P','R','O','P','_','T','H','I','S',0}; + static inline NSTC2Impl *impl_from_INameSpaceTreeControl2(INameSpaceTreeControl2 *iface) { return CONTAINING_RECORD(iface, NSTC2Impl, INameSpaceTreeControl2_iface); @@ -502,7 +504,7 @@ static LRESULT create_namespacetree(HWND hWnd, CREATESTRUCTW *crs) This->tv_oldwndproc = (WNDPROC)SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)tv_wndproc); if(This->tv_oldwndproc) - SetPropA(This->hwnd_tv, "PROP_THIS", This); + SetPropW(This->hwnd_tv, thispropW, This); return TRUE; } @@ -526,7 +528,7 @@ static LRESULT destroy_namespacetree(NSTC2Impl *This) if(This->tv_oldwndproc) { SetWindowLongPtrW(This->hwnd_tv, GWLP_WNDPROC, (ULONG_PTR)This->tv_oldwndproc); - RemovePropA(This->hwnd_tv, "PROP_THIS"); + RemovePropW(This->hwnd_tv, thispropW); } INameSpaceTreeControl2_RemoveAllRoots(&This->INameSpaceTreeControl2_iface); @@ -754,7 +756,7 @@ static LRESULT on_kbd_event(NSTC2Impl *This, UINT uMsg, WPARAM wParam, LPARAM lP static LRESULT CALLBACK tv_wndproc(HWND hWnd, UINT uMessage, WPARAM wParam, LPARAM lParam) { - NSTC2Impl *This = (NSTC2Impl*)GetPropA(hWnd, "PROP_THIS"); + NSTC2Impl *This = (NSTC2Impl*)GetPropW(hWnd, thispropW); switch(uMessage) { case WM_KEYDOWN:

1 0

← Newer
1
...
28
29
30
31
32
33
34
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017