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

Mark Harmstone : comctl32: Redraw themed button on WM_ENABLE.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 961c7b887bb35598b601edc653463d5e39587936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961c7b887bb35598b601edc65… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Mon Mar 30 21:34:53 2015 +0100 comctl32: Redraw themed button on WM_ENABLE. --- dlls/comctl32/theme_button.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 5a3b4b4..bdeba93 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -380,9 +380,11 @@ LRESULT CALLBACK THEMING_ButtonSubclassProc(HWND hwnd, UINT msg, case WM_ENABLE: theme = GetWindowTheme(hwnd); - if (theme) RedrawWindow(hwnd, NULL, NULL, - RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); - return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); + if (theme) { + RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW); + return 0; + } else + return THEMING_CallOriginalClass(hwnd, msg, wParam, lParam); case WM_MOUSEMOVE: {

1 0

Nikolay Sivov : comctl32/listview: Support header item image/ bitmap in LVSCW_AUTOSIZE_USEHEADER case.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 9fcfaaa64aeb76649c327bd473165c0cb7d2576d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fcfaaa64aeb76649c327bd47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 23:39:14 2015 +0300 comctl32/listview: Support header item image/bitmap in LVSCW_AUTOSIZE_USEHEADER case. --- dlls/comctl32/listview.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 861335b..b3c7976 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,7 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun - * Copyright 2009-2014 Nikolay Sivov + * Copyright 2009-2015 Nikolay Sivov * Copyright 2009 Owen Rudge for CodeWeavers * Copyright 2012-2013 Daniel Jelinski * @@ -54,7 +54,6 @@ * -- Support CustomDraw options for _WIN32_IE >= 0x560 (see NMLVCUSTOMDRAW docs). * -- LVA_SNAPTOGRID not implemented * -- LISTVIEW_ApproximateViewRect partially implemented - * -- LISTVIEW_SetColumnWidth ignores header images & bitmap * -- LISTVIEW_StyleChanged doesn't handle some changes too well * * Speedups @@ -8402,18 +8401,38 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) cx = 0; /* retrieve header text */ - hdi.mask = HDI_TEXT; + hdi.mask = HDI_TEXT|HDI_FORMAT|HDI_IMAGE|HDI_BITMAP; hdi.cchTextMax = DISP_TEXT_SIZE; hdi.pszText = szDispText; if (SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdi)) { HDC hdc = GetDC(infoPtr->hwndSelf); HFONT old_font = SelectObject(hdc, (HFONT)SendMessageW(infoPtr->hwndHeader, WM_GETFONT, 0, 0)); + HIMAGELIST himl = (HIMAGELIST)SendMessageW(infoPtr->hwndHeader, HDM_GETIMAGELIST, 0, 0); + INT bitmap_margin = 0; SIZE size; if (GetTextExtentPoint32W(hdc, hdi.pszText, lstrlenW(hdi.pszText), &size)) cx = size.cx + TRAILING_HEADER_PADDING; - /* FIXME: Take into account the header image, if one is present */ + + if (hdi.fmt & (HDF_IMAGE|HDF_BITMAP)) + bitmap_margin = SendMessageW(infoPtr->hwndHeader, HDM_GETBITMAPMARGIN, 0, 0); + + if ((hdi.fmt & HDF_IMAGE) && himl) + { + INT icon_cx, icon_cy; + + if (!ImageList_GetIconSize(himl, &icon_cx, &icon_cy)) + cx += icon_cx + 2*bitmap_margin; + } + else if (hdi.fmt & HDF_BITMAP) + { + BITMAP bmp; + + GetObjectW(hdi.hbm, sizeof(BITMAP), &bmp); + cx += bmp.bmWidth + 2*bitmap_margin; + } + SelectObject(hdc, old_font); ReleaseDC(infoPtr->hwndSelf, hdc); }

1 0

Nikolay Sivov : comctl32/listview: Use defined name instead of magic value.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: d12c2f8b6ff2ea5c32655d9c23b0bfb10b3f4682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12c2f8b6ff2ea5c32655d9c2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 29 10:21:16 2015 +0300 comctl32/listview: Use defined name instead of magic value. --- dlls/comctl32/listview.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b3c7976..081f2a0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8340,9 +8340,10 @@ static BOOL LISTVIEW_SetColumnWidth(LISTVIEW_INFO *infoPtr, INT nColumn, INT cx) /* set column width only if in report or list mode */ if (infoPtr->uView != LV_VIEW_DETAILS && infoPtr->uView != LV_VIEW_LIST) return FALSE; - /* take care of invalid cx values */ - if(infoPtr->uView == LV_VIEW_DETAILS && cx < -2) cx = LVSCW_AUTOSIZE; - else if (infoPtr->uView == LV_VIEW_LIST && cx < 1) return FALSE; + /* take care of invalid cx values - LVSCW_AUTOSIZE_* values are negative, + with _USEHEADER being the lowest */ + if (infoPtr->uView == LV_VIEW_DETAILS && cx < LVSCW_AUTOSIZE_USEHEADER) cx = LVSCW_AUTOSIZE; + else if (infoPtr->uView == LV_VIEW_LIST && cx <= 0) return FALSE; /* resize all columns if in LV_VIEW_LIST mode */ if(infoPtr->uView == LV_VIEW_LIST)

1 0

Nikolay Sivov : comctl32/listview: Always forward HDM_SETORDERARRAY to a header.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 30cdd592525340fc96b380f8900397873ed11aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=30cdd592525340fc96b380f89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 29 10:28:30 2015 +0300 comctl32/listview: Always forward HDM_SETORDERARRAY to a header. --- dlls/comctl32/listview.c | 6 +----- dlls/comctl32/tests/listview.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 081f2a0..d2cd940 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8307,12 +8307,8 @@ static BOOL LISTVIEW_SetColumnT(const LISTVIEW_INFO *infoPtr, INT nColumn, */ static BOOL LISTVIEW_SetColumnOrderArray(LISTVIEW_INFO *infoPtr, INT iCount, const INT *lpiArray) { - TRACE("iCount %d lpiArray %p\n", iCount, lpiArray); - - if (!lpiArray || !IsWindow(infoPtr->hwndHeader)) return FALSE; - + if (!infoPtr->hwndHeader) return FALSE; infoPtr->colRectsDirty = TRUE; - return SendMessageW(infoPtr->hwndHeader, HDM_SETORDERARRAY, iCount, (LPARAM)lpiArray); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0947251..94c19f4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -181,6 +181,14 @@ static const struct message listview_getorderarray_seq[] = { { 0 } }; +static const struct message listview_setorderarray_seq[] = { + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 2, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 2, 0, HEADER_ID }, + { LVM_SETCOLUMNORDERARRAY, sent|id|wparam, 0, 0, LISTVIEW_ID }, + { HDM_SETORDERARRAY, sent|id|wparam, 0, 0, HEADER_ID }, + { 0 } +}; + static const struct message empty_seq[] = { { 0 } }; @@ -1479,6 +1487,19 @@ static void test_columns(void) ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_getorderarray_seq, "get order array", FALSE); + /* LVM_SETCOLUMNORDERARRAY */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + order[0] = 0; + order[1] = 1; + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 2, (LPARAM)&order); + expect(1, rc); + + rc = SendMessageA(hwnd, LVM_SETCOLUMNORDERARRAY, 0, 0); + expect(0, rc); + + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, listview_setorderarray_seq, "set order array", FALSE); + /* after column added subitem is considered as present */ insert_item(hwnd, 0);

1 0

Erich E. Hoover : advapi32/tests: Add tests for inheriting ACL attributes.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 404d5bf09d2ba78e7507099a04b42cdae8ec8884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404d5bf09d2ba78e7507099a0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Apr 18 14:08:36 2014 -0600 advapi32/tests: Add tests for inheriting ACL attributes. CreateFile should also inherit ACL from the parent directory. --- dlls/advapi32/tests/security.c | 50 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index a3690e8..f195f94 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3118,10 +3118,11 @@ static void test_CreateDirectoryA(void) ACL_SIZE_INFORMATION acl_size; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; + char tmpfile[MAX_PATH]; char tmpdir[MAX_PATH]; + HANDLE token, hTemp; struct _SID *owner; BOOL bret = TRUE; - HANDLE token; DWORD error; PACL pDacl; @@ -3214,6 +3215,53 @@ static void test_CreateDirectoryA(void) } LocalFree(pSD); + /* Test inheritance of ACLs */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + + hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, + CREATE_NEW, FILE_FLAG_DELETE_ON_CLOSE, NULL); + ok(hTemp != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError()); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Inherited Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine + ok(bret, "Inherited Current User ACE != Current User SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Inherited Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine + ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); + done: HeapFree(GetProcessHeap(), 0, user); bret = RemoveDirectoryA(tmpdir);

1 0

Sebastian Lackner : advapi32/tests: Repeat ACL inheritance tests for NtCreateFile.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: 80b384311ffc17cd68cfa08553a651109eaa1ca5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80b384311ffc17cd68cfa0855… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 30 06:19:39 2015 +0200 advapi32/tests: Repeat ACL inheritance tests for NtCreateFile. --- dlls/advapi32/tests/security.c | 108 ++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 23 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f195f94..065dd9a 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "aclapi.h" #include "winnt.h" #include "sddl.h" @@ -59,29 +60,6 @@ #define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) #define THREAD_ALL_ACCESS_VISTA (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xffff) -/* copied from Wine winternl.h - not included in the Windows SDK */ -typedef enum _OBJECT_INFORMATION_CLASS { - ObjectBasicInformation, - ObjectNameInformation, - ObjectTypeInformation, - ObjectAllInformation, - ObjectDataInformation -} OBJECT_INFORMATION_CLASS, *POBJECT_INFORMATION_CLASS; - -typedef struct _OBJECT_BASIC_INFORMATION { - ULONG Attributes; - ACCESS_MASK GrantedAccess; - ULONG HandleCount; - ULONG PointerCount; - ULONG PagedPoolUsage; - ULONG NonPagedPoolUsage; - ULONG Reserved[3]; - ULONG NameInformationLength; - ULONG TypeInformationLength; - ULONG SecurityDescriptorLength; - LARGE_INTEGER CreateTime; -} OBJECT_BASIC_INFORMATION, *POBJECT_BASIC_INFORMATION; - #define expect_eq(expr, value, type, format) { type ret_ = expr; ok((value) == ret_, #expr " expected " format " got " format "\n", (value), (ret_)); } static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); @@ -148,6 +126,9 @@ static BOOL (WINAPI *pCreateRestrictedToken)(HANDLE, DWORD, DWORD, PSID_AND_ATTR static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); +static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*); +static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN); static HMODULE hmod; static int myARGC; @@ -175,6 +156,9 @@ static void init(void) pNtQueryObject = (void *)GetProcAddress( hntdll, "NtQueryObject" ); pNtAccessCheck = (void *)GetProcAddress( hntdll, "NtAccessCheck" ); pNtSetSecurityObject = (void *)GetProcAddress(hntdll, "NtSetSecurityObject"); + pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); + pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); hmod = GetModuleHandleA("advapi32.dll"); pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); @@ -3108,6 +3092,24 @@ static void test_SetEntriesInAclA(void) HeapFree(GetProcessHeap(), 0, OldAcl); } +/* helper function for test_CreateDirectoryA */ +static void get_nt_pathW(const char *name, UNICODE_STRING *nameW) +{ + UNICODE_STRING strW; + ANSI_STRING str; + NTSTATUS status; + BOOLEAN ret; + RtlInitAnsiString(&str, name); + + status = pRtlAnsiStringToUnicodeString(&strW, &str, TRUE); + ok(!status, "RtlAnsiStringToUnicodeString failed with %08x\n", status); + + ret = pRtlDosPathNameToNtPathName_U(strW.Buffer, nameW, NULL, NULL); + ok(ret, "RtlDosPathNameToNtPathName_U failed\n"); + + RtlFreeUnicodeString(&strW); +} + static void test_CreateDirectoryA(void) { char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; @@ -3116,13 +3118,17 @@ static void test_CreateDirectoryA(void) char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; PSECURITY_DESCRIPTOR pSD = &sd; ACL_SIZE_INFORMATION acl_size; + UNICODE_STRING tmpfileW; ACCESS_ALLOWED_ACE *ace; SECURITY_ATTRIBUTES sa; + OBJECT_ATTRIBUTES attr; char tmpfile[MAX_PATH]; char tmpdir[MAX_PATH]; HANDLE token, hTemp; + IO_STATUS_BLOCK io; struct _SID *owner; BOOL bret = TRUE; + NTSTATUS status; DWORD error; PACL pDacl; @@ -3262,6 +3268,62 @@ static void test_CreateDirectoryA(void) LocalFree(pSD); CloseHandle(hTemp); + /* Repeat the same test with ntdll functions */ + strcpy(tmpfile, tmpdir); + lstrcatA(tmpfile, "/tmpfile"); + get_nt_pathW(tmpfile, &tmpfileW); + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &tmpfileW; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = pNtCreateFile(&hTemp, GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ, FILE_CREATE, FILE_DELETE_ON_CLOSE, NULL, 0); + ok(!status, "NtCreateFile failed with %08x\n", status); + RtlFreeUnicodeString(&tmpfileW); + + error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + (PSID *)&owner, NULL, &pDacl, NULL, &pSD); + ok(error == ERROR_SUCCESS, "Failed to get permissions on file\n"); + + bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); + ok(bret, "GetAclInformation failed\n"); + todo_wine + ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", + acl_size.AceCount); + if (acl_size.AceCount > 0) + { + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Inherited Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); + todo_wine + ok(bret, "Inherited Current User ACE != Current User SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + if (acl_size.AceCount > 1) + { + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Inherited Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); + todo_wine + ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); + todo_wine + ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, + "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, + "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ace->Mask); + } + LocalFree(pSD); + CloseHandle(hTemp); + done: HeapFree(GetProcessHeap(), 0, user); bret = RemoveDirectoryA(tmpdir);

1 0

Matteo Bruni : ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: e8aba71529adbcfe349fba53604b296d714dfa49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8aba71529adbcfe349fba536… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:02 2015 +0200 ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes. --- dlls/ddraw/light.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index baaf6a3..c632c32 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -201,7 +201,11 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) wined3d_mutex_lock(); memcpy(&light->light, data, sizeof(D3DLIGHT)); - if (flags & D3DLIGHT_ACTIVE) + if (!(light->light.dwFlags & D3DLIGHT_ACTIVE) && flags & D3DLIGHT_ACTIVE) + light_activate(light); + else if (light->light.dwFlags & D3DLIGHT_ACTIVE && !(flags & D3DLIGHT_ACTIVE)) + light_deactivate(light); + else if (flags & D3DLIGHT_ACTIVE) light_update(light); light->light.dwFlags = flags; wined3d_mutex_unlock();

1 0

Piotr Caban : msvcr120: Add some missing exports on i386 architecture.
by Alexandre Julliard 31 Mar '15

31 Mar '15

Module: wine Branch: master Commit: ccea6c60599e5c2e46d3b5596c4ba167792de649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccea6c60599e5c2e46d3b5596… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Mar 30 16:31:38 2015 +0200 msvcr120: Add some missing exports on i386 architecture. --- dlls/msvcr120/msvcr120.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/math.c | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index c7df42f..b79e32c 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -893,8 +893,8 @@ @ stub -arch=i386,win64 __crtCompareStringEx @ cdecl __crtCompareStringW(long long wstr long wstr long) @ stub __crtCreateEventExW -@ stub -arch=i386 ___crtCreateSemaphoreExW -@ stub -arch=x86_64 __crtCreateSymbolicLinkW +@ stub -arch=i386 __crtCreateSemaphoreExW +@ stub __crtCreateSymbolicLinkW @ stub -arch=i386,win64 __crtEnumSystemLocalesEx @ stub -arch=i386,win64 __crtFlsAlloc @ stub -arch=i386,win64 __crtFlsFree @@ -1057,7 +1057,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl _chgsignf(float) MSVCRT__chgsignf @ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -1071,7 +1071,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) @ stub _cprintf_l @ stub _cprintf_p diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 71a6347..f67e414 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1021,7 +1021,7 @@ @ cdecl _calloc_crt(long long) msvcr120._calloc_crt @ cdecl _cexit() msvcr120._cexit @ cdecl _chgsign(double) msvcr120._chgsign -@ cdecl -arch=arm,x86_64 _chgsignf(float) msvcr120._chgsignf +@ cdecl _chgsignf(float) msvcr120._chgsignf @ cdecl -arch=i386 -norelay _chkesp() msvcr120._chkesp @ cdecl _chmod(str long) msvcr120._chmod @ cdecl _chsize(long long) msvcr120._chsize @@ -1035,7 +1035,7 @@ @ cdecl _controlfp(long long) msvcr120._controlfp @ cdecl _controlfp_s(ptr long long) msvcr120._controlfp_s @ cdecl _copysign(double double) msvcr120._copysign -@ cdecl -arch=arm,x86_64 _copysignf(float float) msvcr120._copysignf +@ cdecl _copysignf(float float) msvcr120._copysignf @ cdecl _creat(str long) msvcr120._creat @ cdecl _create_locale(long str) msvcr120._create_locale @ stub -arch=i386 _crt_debugger_hook diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0cd69da..7c971d3 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -73,7 +73,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#if defined(__x86_64__) || defined(__arm__) +#if defined(__x86_64__) || defined(__arm__) || _MSVCR_VER>=120 /********************************************************************* * _chgsignf (MSVCRT.@) @@ -94,6 +94,9 @@ float CDECL MSVCRT__copysignf( float num, float sign ) return signbit(num) ? -num : num; } +#endif +#if defined(__x86_64__) || defined(__arm__) + /********************************************************************* * _finitef (MSVCRT.@) */

1 0

Piotr Caban : ntdll: Improve parameter validation in RtlAddAce.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 966c5dffed3e8f089a0648e2e94d300620869bbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=966c5dffed3e8f089a0648e2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Mar 28 15:26:37 2015 +0100 ntdll: Improve parameter validation in RtlAddAce. --- dlls/advapi32/tests/security.c | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/sec.c | 4 +++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 15c3b1d..0e9cf8c 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -5568,6 +5568,51 @@ static void test_AdjustTokenPrivileges(void) CloseHandle(token); } +static void test_AddAce(void) +{ + static SID const sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; + + char acl_buf[1024], ace_buf[256]; + ACCESS_ALLOWED_ACE *ace = (ACCESS_ALLOWED_ACE*)ace_buf; + PACL acl = (PACL)acl_buf; + BOOL ret; + + memset(ace, 0, sizeof(ace_buf)); + ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE)-sizeof(DWORD)+sizeof(SID); + memcpy(&ace->SidStart, &sidWorld, sizeof(sidWorld)); + + ret = InitializeAcl(acl, sizeof(acl_buf), ACL_REVISION2); + ok(ret, "InitializeAcl failed: %d\n", GetLastError()); + + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ret = AddAce(acl, ACL_REVISION3, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION3, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION4, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == ACL_REVISION4, "acl->AclRevision = %d\n", acl->AclRevision); + ret = AddAce(acl, ACL_REVISION2, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + + ret = AddAce(acl, MIN_ACL_REVISION-1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + /* next test succeededs but corrupts ACL */ + ret = AddAce(acl, MAX_ACL_REVISION+1, MAXDWORD, ace, ace->Header.AceSize); + ok(ret, "AddAce failed: %d\n", GetLastError()); + ok(acl->AclRevision == MAX_ACL_REVISION+1, "acl->AclRevision = %d\n", acl->AclRevision); + SetLastError(0xdeadbeef); + ret = AddAce(acl, ACL_REVISION1, MAXDWORD, ace, ace->Header.AceSize); + ok(!ret, "AddAce succeeded\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetLastError() = %d\n", GetLastError()); +} + START_TEST(security) { init(); @@ -5609,4 +5654,5 @@ START_TEST(security) test_TokenIntegrityLevel(); test_default_dacl_owner_sid(); test_AdjustTokenPrivileges(); + test_AddAce(); } diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index b733f77..0917780 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1167,7 +1167,7 @@ NTSTATUS WINAPI RtlAddAce( PACE_HEADER ace,targetace; int nrofaces; - if (acl->AclRevision != ACL_REVISION) + if (!RtlValidAcl(acl)) return STATUS_INVALID_PARAMETER; if (!RtlFirstFreeAce(acl,&targetace)) return STATUS_INVALID_PARAMETER; @@ -1180,6 +1180,8 @@ NTSTATUS WINAPI RtlAddAce( return STATUS_INVALID_PARAMETER; memcpy(targetace,acestart,acelen); acl->AceCount+=nrofaces; + if (rev > acl->AclRevision) + acl->AclRevision = rev; return STATUS_SUCCESS; }

1 0

Thomas Faber : gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC).
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 8a390c8661ad3975d13aeae1f9953822d4c42461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a390c8661ad3975d13aeae1f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Mar 28 13:29:06 2015 +0100 gdi32: Avoid uninitialized variable use in EnumEnhMetaFile (MSVC). --- dlls/gdi32/enhmetafile.c | 123 +++++++++++++++++++++++------------------------ 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 61f541f..7fb0b34 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2288,6 +2288,7 @@ BOOL WINAPI EnumEnhMetaFile( SetLastError(ERROR_NOT_ENOUGH_MEMORY); return FALSE; } + info->state.mode = MM_TEXT; info->state.wndOrgX = 0; info->state.wndOrgY = 0; info->state.wndExtX = 1; @@ -2338,71 +2339,69 @@ BOOL WINAPI EnumEnhMetaFile( old_arcdir = SetArcDirection(hdc, AD_COUNTERCLOCKWISE); old_polyfill = SetPolyFillMode(hdc, ALTERNATE); old_stretchblt = SetStretchBltMode(hdc, BLACKONWHITE); - } - - info->state.mode = MM_TEXT; - if ( IS_WIN9X() ) - { - /* Win95 leaves the vp/win ext/org info alone */ - info->init_transform.eM11 = 1.0; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = 1.0; - info->init_transform.eDx = 0.0; - info->init_transform.eDy = 0.0; - } - else - { - /* WinNT combines the vp/win ext/org info into a transform */ - double xscale, yscale; - xscale = (double)vp_size.cx / (double)win_size.cx; - yscale = (double)vp_size.cy / (double)win_size.cy; - info->init_transform.eM11 = xscale; - info->init_transform.eM12 = 0.0; - info->init_transform.eM21 = 0.0; - info->init_transform.eM22 = yscale; - info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; - info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; - - CombineTransform(&info->init_transform, &savedXform, &info->init_transform); - } + if ( IS_WIN9X() ) + { + /* Win95 leaves the vp/win ext/org info alone */ + info->init_transform.eM11 = 1.0; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = 1.0; + info->init_transform.eDx = 0.0; + info->init_transform.eDy = 0.0; + } + else + { + /* WinNT combines the vp/win ext/org info into a transform */ + double xscale, yscale; + xscale = (double)vp_size.cx / (double)win_size.cx; + yscale = (double)vp_size.cy / (double)win_size.cy; + info->init_transform.eM11 = xscale; + info->init_transform.eM12 = 0.0; + info->init_transform.eM21 = 0.0; + info->init_transform.eM22 = yscale; + info->init_transform.eDx = (double)vp_org.x - xscale * (double)win_org.x; + info->init_transform.eDy = (double)vp_org.y - yscale * (double)win_org.y; + + CombineTransform(&info->init_transform, &savedXform, &info->init_transform); + } - if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) - { - double xSrcPixSize, ySrcPixSize, xscale, yscale; - XFORM xform; - - TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", - lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, - emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, - emh->rclFrame.bottom); - - xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; - ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; - xscale = (double) WIDTH(*lpRect) * 100.0 / - WIDTH(emh->rclFrame) * xSrcPixSize; - yscale = (double) HEIGHT(*lpRect) * 100.0 / - HEIGHT(emh->rclFrame) * ySrcPixSize; - TRACE("xscale = %f, yscale = %f\n", xscale, yscale); - - xform.eM11 = xscale; - xform.eM12 = 0; - xform.eM21 = 0; - xform.eM22 = yscale; - xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; - xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; - - CombineTransform(&info->init_transform, &xform, &info->init_transform); - } + if ( lpRect && WIDTH(emh->rclFrame) && HEIGHT(emh->rclFrame) ) + { + double xSrcPixSize, ySrcPixSize, xscale, yscale; + XFORM xform; + + TRACE("rect: %d,%d - %d,%d. rclFrame: %d,%d - %d,%d\n", + lpRect->left, lpRect->top, lpRect->right, lpRect->bottom, + emh->rclFrame.left, emh->rclFrame.top, emh->rclFrame.right, + emh->rclFrame.bottom); + + xSrcPixSize = (double) emh->szlMillimeters.cx / emh->szlDevice.cx; + ySrcPixSize = (double) emh->szlMillimeters.cy / emh->szlDevice.cy; + xscale = (double) WIDTH(*lpRect) * 100.0 / + WIDTH(emh->rclFrame) * xSrcPixSize; + yscale = (double) HEIGHT(*lpRect) * 100.0 / + HEIGHT(emh->rclFrame) * ySrcPixSize; + TRACE("xscale = %f, yscale = %f\n", xscale, yscale); + + xform.eM11 = xscale; + xform.eM12 = 0; + xform.eM21 = 0; + xform.eM22 = yscale; + xform.eDx = (double) lpRect->left - (double) WIDTH(*lpRect) / WIDTH(emh->rclFrame) * emh->rclFrame.left; + xform.eDy = (double) lpRect->top - (double) HEIGHT(*lpRect) / HEIGHT(emh->rclFrame) * emh->rclFrame.top; + + CombineTransform(&info->init_transform, &xform, &info->init_transform); + } - /* WinNT resets the current vp/win org/ext */ - if ( !IS_WIN9X() && hdc ) - { - SetMapMode(hdc, MM_TEXT); - SetWindowOrgEx(hdc, 0, 0, NULL); - SetViewportOrgEx(hdc, 0, 0, NULL); - EMF_Update_MF_Xform(hdc, info); + /* WinNT resets the current vp/win org/ext */ + if ( !IS_WIN9X() ) + { + SetMapMode(hdc, MM_TEXT); + SetWindowOrgEx(hdc, 0, 0, NULL); + SetViewportOrgEx(hdc, 0, 0, NULL); + EMF_Update_MF_Xform(hdc, info); + } } ret = TRUE;

1 0