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

Henri Verbeet : wined3d: Use GLSL 1.30 for SM4 shaders when available.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 94b0e895db0e647b06d5a6479a2a52b7b93669b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b0e895db0e647b06d5a6479… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:58 2015 +0200 wined3d: Use GLSL 1.30 for SM4 shaders when available. This is required for bitwise operators in particular if no other extension provides them. --- dlls/wined3d/glsl_shader.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c857e76..f89a7c7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -258,6 +258,15 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } +static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version->major >= 4) + return "#version 130"; + else + return "#version 120"; +} + static void shader_glsl_append_imm_vec4(struct wined3d_shader_buffer *buffer, const float *values) { char str[4][17]; @@ -4477,7 +4486,7 @@ static GLuint generate_param_reorder_function(struct wined3d_shader_buffer *buff shader_buffer_clear(buffer); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); if (ps_major < 3) { @@ -4635,7 +4644,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_ps_args = args; priv_ctx.cur_np2fixup_info = np2fixup_info; - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); @@ -4695,7 +4704,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); @@ -4770,7 +4779,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "#version 120\n"); + shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) shader_addline(buffer, "#extension GL_ARB_geometry_shader4 : enable\n");

1 0

Henri Verbeet : wined3d: Take WINED3D_PIXEL_CENTER_INTEGER into account when calculating vpos.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: d0d8a7827be8808a3ad1098835a574c37beebed4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d8a7827be8808a3ad109883… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:57 2015 +0200 wined3d: Take WINED3D_PIXEL_CENTER_INTEGER into account when calculating vpos. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e4ddbe6..c857e76 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1420,8 +1420,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont * centers instead of the pixel corners. This code will behave correctly * on drivers that returns integer values. */ if (version->type == WINED3D_SHADER_TYPE_PIXEL && reg_maps->vpos) - shader_addline(buffer, - "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); + { + if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + shader_addline(buffer, + "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); + else + shader_addline(buffer, + "vpos = vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1);\n"); + } } /*****************************************************************************

1 0

Nikolay Sivov : comctl32/dsa: Implement DSA_Clone().
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: ff0634dfe18b87f75d2d00e8c114d25c27f0f0a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0634dfe18b87f75d2d00e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 08:44:23 2015 +0300 comctl32/dsa: Implement DSA_Clone(). --- dlls/comctl32/comctl32.spec | 1 + dlls/comctl32/dsa.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 0bd8b13..aff8c8b 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -131,6 +131,7 @@ @ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) +@ stdcall DSA_Clone(ptr) @ stdcall FlatSB_EnableScrollBar (long long long) @ stdcall FlatSB_GetScrollInfo (long long ptr) @ stdcall FlatSB_GetScrollPos (long long) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 71837db..73f0d30 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -434,3 +434,39 @@ void WINAPI DSA_DestroyCallback (HDSA hdsa, PFNDSAENUMCALLBACK enumProc, DSA_EnumCallback (hdsa, enumProc, lParam); DSA_Destroy (hdsa); } + +/************************************************************************** + * DSA_Clone [COMCTL32.@] + * + * Creates a copy of a dsa + * + * PARAMS + * hdsa [I] handle to the dynamic storage array + * + * RETURNS + * Cloned dsa + */ +HDSA WINAPI DSA_Clone(HDSA hdsa) +{ + HDSA dest; + INT i; + + TRACE("(%p)\n", hdsa); + + if (!hdsa) + return NULL; + + dest = DSA_Create (hdsa->nItemSize, hdsa->nGrow); + if (!dest) + return NULL; + + for (i = 0; i < hdsa->nItemCount; i++) { + void *ptr = DSA_GetItemPtr (hdsa, i); + if (DSA_InsertItem (dest, DA_LAST, ptr) == -1) { + DSA_Destroy (dest); + return NULL; + } + } + + return dest; +}

1 0

Bruno Jesus : ws2_32/tests: Skip part of OOB test to unfreeze NT4 test.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 45d64ce26bf80d40ec30054740e9e85819ad9d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d64ce26bf80d40ec3005474… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Mar 31 00:06:40 2015 -0300 ws2_32/tests: Skip part of OOB test to unfreeze NT4 test. NT4 doesn't care about OOB_INLINE and receives data in the wrong recv call so the next call never receives data and hangs forever. Skip it to resume NT4 test normally. --- dlls/ws2_32/tests/sock.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 188e25c..533e58c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3741,11 +3741,14 @@ static void test_select(void) tmp_buf[0] = 0xAF; SetLastError(0xdeadbeef); ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); /* can't recv with MSG_OOB if OOBINLINED */ - ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); - ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); - ok(ret == 1, "expected 1, got %d\n", ret); - ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + if (ret == SOCKET_ERROR) /* can't recv with MSG_OOB if OOBINLINED */ + { + ok(GetLastError() == WSAEINVAL, "expected 10022, got %d\n", GetLastError()); + ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), 0); + ok(ret == 1, "expected 1, got %d\n", ret); + ok(tmp_buf[0] == 'A', "expected 'A', got 0x%02X\n", tmp_buf[0]); + } + else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); /* When the connection is closed the socket is set in the read descriptor */ ret = closesocket(fdRead); @@ -4724,15 +4727,18 @@ todo_wine i = MSG_OOB; SetLastError(0xdeadbeef); ret = recv(dst, &data, 1, i); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); - bufs.len = sizeof(char); - bufs.buf = &data; - ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); - ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); - ret = GetLastError(); - ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + if (ret == SOCKET_ERROR) + { + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + bufs.len = sizeof(char); + bufs.buf = &data; + ret = WSARecv(dst, &bufs, 1, &bytes_rec, &i, NULL, NULL); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ret = GetLastError(); + ok(ret == WSAEINVAL, "expected 10022, got %d\n", ret); + } + else ok(broken(ret == 1) /* <= NT4 */, "expected error, got 1\n"); closesocket(dst); optval = 0xdeadbeef;

1 0

Sebastian Lackner : advapi32/tests: Repeat ACL inheritance tests for NtCreateFile.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Nikolay Sivov : comctl32/listview: Always forward HDM_SETORDERARRAY to a header.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Nikolay Sivov : comctl32/listview: Support header item image/ bitmap in LVSCW_AUTOSIZE_USEHEADER case.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Ken Thomases : winemac: Cleanup system tray icons when their owner is destroyed instead of polling.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 5bba54505d7fe9977351f577c1b2e91cc9bee62f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bba54505d7fe9977351f577c… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Mar 30 14:00:26 2015 -0500 winemac: Cleanup system tray icons when their owner is destroyed instead of polling. --- dlls/winemac.drv/systray.c | 50 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 6bae0ed..16d2e6c 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -35,10 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(systray); -#define CHECK_SYSTRAY_TIMER 1 -#define CHECK_SYSTRAY_INTERVAL_MS 2000 - - /* an individual systray icon */ struct tray_icon { @@ -59,49 +55,16 @@ static BOOL delete_icon(struct tray_icon *icon); /*********************************************************************** - * check_icons + * cleanup_icons * - * Timer procedure for periodically checking that the systray icons are - * still valid (their owning windows still exist). + * Delete all systray icons owned by a given window. */ -static VOID CALLBACK check_icons(HWND hwnd, UINT msg, UINT_PTR timer, DWORD time) +static void cleanup_icons(HWND hwnd) { struct tray_icon *icon, *next; LIST_FOR_EACH_ENTRY_SAFE(icon, next, &icon_list, struct tray_icon, entry) - if (!IsWindow(icon->owner)) delete_icon(icon); -} - - -/*********************************************************************** - * setup_check_icons_timer - * - * Set up a window with a timer to check that tray icons are still valid - * (their owning windows still exist). - */ -static void setup_check_icons_timer(void) -{ - static BOOL done; - - if (!done) - { - static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; - HWND timer_window; - - /* Whether we succeed or not, don't try again. */ - done = TRUE; - - timer_window = CreateWindowW(messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, - NULL, NULL, NULL); - if (!timer_window) - { - WARN("Could not create systray checking message window\n"); - return; - } - - if (!SetTimer(timer_window, CHECK_SYSTRAY_TIMER, CHECK_SYSTRAY_INTERVAL_MS, check_icons)) - WARN("Could not create systray checking timer\n"); - } + if (icon->owner == hwnd) delete_icon(icon); } @@ -231,8 +194,6 @@ static BOOL add_icon(NOTIFYICONDATAW *nid) return FALSE; } - setup_check_icons_timer(); - if (!(icon = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*icon)))) { ERR("out of memory\n"); @@ -299,6 +260,9 @@ int CDECL wine_notify_icon(DWORD msg, NOTIFYICONDATAW *data) case NIM_MODIFY: if ((icon = get_icon(data->hWnd, data->uID))) ret = modify_icon(icon, data); break; + case 0xdead: /* Wine extension: owner window has died */ + cleanup_icons(data->hWnd); + break; default: FIXME("unhandled tray message: %u\n", msg); break;

1 0

Henri Verbeet : d2d1/tests: Add a test for color brushes.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: ae7aee3dd608cf14ddab15d2f5f9f09613d528b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae7aee3dd608cf14ddab15d2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 10:24:56 2015 +0200 d2d1/tests: Add a test for color brushes. --- dlls/d2d1/tests/d2d1.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c4e329b..3285acb 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -17,6 +17,7 @@ */ #define COBJMACROS +#include <math.h> #include "d2d1.h" #include "wincrypt.h" #include "wine/test.h" @@ -45,6 +46,45 @@ static void set_color(D2D1_COLOR_F *color, float r, float g, float b, float a) color->a = a; } +static void set_matrix_identity(D2D1_MATRIX_3X2_F *matrix) +{ + matrix->_11 = 1.0f; + matrix->_12 = 0.0f; + matrix->_21 = 0.0f; + matrix->_22 = 1.0f; + matrix->_31 = 0.0f; + matrix->_32 = 0.0f; +} + +static void rotate_matrix(D2D1_MATRIX_3X2_F *matrix, float theta) +{ + float sin_theta, cos_theta, tmp_11, tmp_12; + + sin_theta = sinf(theta); + cos_theta = cosf(theta); + tmp_11 = matrix->_11; + tmp_12 = matrix->_12; + + matrix->_11 = cos_theta * tmp_11 + sin_theta * matrix->_21; + matrix->_12 = cos_theta * tmp_12 + sin_theta * matrix->_22; + matrix->_21 = -sin_theta * tmp_11 + cos_theta * matrix->_21; + matrix->_22 = -sin_theta * tmp_12 + cos_theta * matrix->_22; +} + +static void scale_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + matrix->_11 *= x; + matrix->_12 *= x; + matrix->_21 *= y; + matrix->_22 *= y; +} + +static void translate_matrix(D2D1_MATRIX_3X2_F *matrix, float x, float y) +{ + matrix->_31 += x * matrix->_11 + y * matrix->_21; + matrix->_32 += x * matrix->_12 + y * matrix->_22; +} + static BOOL compare_sha1(void *data, unsigned int pitch, unsigned int bpp, unsigned int w, unsigned int h, const char *ref_sha1) { @@ -546,8 +586,108 @@ static void test_state_block(void) DestroyWindow(window); } +static void test_color_brush(void) +{ + D2D1_MATRIX_3X2_F matrix, tmp_matrix; + D2D1_BRUSH_PROPERTIES brush_desc; + D2D1_COLOR_F color, tmp_color; + ID2D1SolidColorBrush *brush; + IDXGISwapChain *swapchain; + ID2D1RenderTarget *rt; + ID3D10Device1 *device; + IDXGISurface *surface; + D2D1_RECT_F rect; + float opacity; + HWND window; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + window = CreateWindowA("static", "d2d1_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + swapchain = create_swapchain(device, window, TRUE); + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); + ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + rt = create_render_target(surface); + ok(!!rt, "Failed to create render target.\n"); + + ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); + ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + opacity = ID2D1SolidColorBrush_GetOpacity(brush); + ok(opacity == 1.0f, "Got unexpected opacity %.8e.\n", opacity); + set_matrix_identity(&matrix); + ID2D1SolidColorBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + tmp_color = ID2D1SolidColorBrush_GetColor(brush); + ok(!memcmp(&tmp_color, &color, sizeof(color)), + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_color.r, tmp_color.g, tmp_color.b, tmp_color.a); + ID2D1SolidColorBrush_Release(brush); + + set_color(&color, 0.0f, 1.0f, 0.0f, 0.8f); + brush_desc.opacity = 0.3f; + set_matrix_identity(&matrix); + scale_matrix(&matrix, 2.0f, 2.0f); + brush_desc.transform = matrix; + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, &brush_desc, &brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + opacity = ID2D1SolidColorBrush_GetOpacity(brush); + ok(opacity == 0.3f, "Got unexpected opacity %.8e.\n", opacity); + ID2D1SolidColorBrush_GetTransform(brush, &tmp_matrix); + ok(!memcmp(&tmp_matrix, &matrix, sizeof(matrix)), + "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", + tmp_matrix._11, tmp_matrix._12, tmp_matrix._21, + tmp_matrix._22, tmp_matrix._31, tmp_matrix._32); + tmp_color = ID2D1SolidColorBrush_GetColor(brush); + ok(!memcmp(&tmp_color, &color, sizeof(color)), + "Got unexpected color {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_color.r, tmp_color.g, tmp_color.b, tmp_color.a); + + ID2D1RenderTarget_BeginDraw(rt); + + set_color(&color, 0.0f, 0.0f, 1.0f, 1.0f); + ID2D1RenderTarget_Clear(rt, &color); + + ID2D1SolidColorBrush_SetOpacity(brush, 1.0f); + set_rect(&rect, 40.0f, 120.0f, 120.0f, 360.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)brush); + + set_matrix_identity(&matrix); + scale_matrix(&matrix, 0.5f, 2.0f); + translate_matrix(&matrix, 320.0f, 240.0f); + rotate_matrix(&matrix, M_PI / 4.0f); + ID2D1RenderTarget_SetTransform(rt, &matrix); + set_color(&color, 1.0f, 0.0f, 0.0f, 0.625f); + ID2D1SolidColorBrush_SetColor(brush, &color); + ID2D1SolidColorBrush_SetOpacity(brush, 0.75f); + set_rect(&rect, -80.0f, -60.0f, 80.0f, 60.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, (ID2D1Brush *)brush); + + hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); + ok(compare_surface(surface, "6d1218fca5e21fb7e287b3a439d60dbc251f5ceb"), "Surface does not match.\n"); + + ID2D1SolidColorBrush_Release(brush); + ID2D1RenderTarget_Release(rt); + IDXGISurface_Release(surface); + IDXGISwapChain_Release(swapchain); + ID3D10Device1_Release(device); + DestroyWindow(window); +} + START_TEST(d2d1) { test_clip(); test_state_block(); + test_color_brush(); }

1 0

Nikolay Sivov : comctl32/dsa: Implement DSA_GetSize().
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 82bab3283b828a846d142d641f21e7c6e335dcc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82bab3283b828a846d142d641… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 08:52:49 2015 +0300 comctl32/dsa: Implement DSA_GetSize(). --- dlls/comctl32/comctl32.spec | 3 ++- dlls/comctl32/dsa.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index aff8c8b..1e92e5f 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -127,11 +127,12 @@ @ stdcall DestroyPropertySheetPage(long) @ stdcall -private DllGetVersion(ptr) @ stdcall -private DllInstall(long wstr) -@ stdcall DPA_GetSize(ptr) +@ stdcall -ret64 DPA_GetSize(ptr) @ stdcall DrawShadowText(long wstr long ptr long long long long long) @ stdcall DrawStatusText(long ptr ptr long) DrawStatusTextA @ stdcall DrawStatusTextW(long ptr wstr long) @ stdcall DSA_Clone(ptr) +@ stdcall -ret64 DSA_GetSize(ptr) @ stdcall FlatSB_EnableScrollBar (long long long) @ stdcall FlatSB_GetScrollInfo (long long ptr) @ stdcall FlatSB_GetScrollPos (long long) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index 73f0d30..32f9926 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -470,3 +470,23 @@ HDSA WINAPI DSA_Clone(HDSA hdsa) return dest; } + +/************************************************************************** + * DSA_GetSize [COMCTL32.@] + * + * Returns allocated memory size for this array + * + * PARAMS + * hdsa [I] handle to the dynamic storage array + * + * RETURNS + * Size + */ +ULONGLONG WINAPI DSA_GetSize(HDSA hdsa) +{ + TRACE("(%p)\n", hdsa); + + if (!hdsa) return 0; + + return sizeof(*hdsa) + hdsa->nMaxCount*hdsa->nItemSize; +}

1 0