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

Matteo Bruni : ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: fbffd8bae4144ef28a7f45af4514b0be9ba26506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbffd8bae4144ef28a7f45af4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:04 2015 +0200 ddraw: Enable WINED3D_RS_NORMALIZENORMALS on d3d versions older than d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 688f02b..f0f4ac3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6839,6 +6839,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_COLORKEYENABLE, TRUE); else if (version == 2) wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_SPECULARENABLE, TRUE); + if (version < 7) + wined3d_device_set_render_state(ddraw->wined3d_device, WINED3D_RS_NORMALIZENORMALS, TRUE); return D3D_OK; }

1 0

Nikolay Sivov : dwrite: Update to IDWriteRenderingParams2.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 7b664095aadfef5e670e8aa19d7dc84bbdcb457e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b664095aadfef5e670e8aa19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 31 11:39:59 2015 +0300 dwrite: Update to IDWriteRenderingParams2. --- dlls/dwrite/main.c | 121 +++++++++++++++++++++++++++++++---------------- dlls/dwrite/tests/font.c | 45 +++++++++++++++++- 2 files changed, 125 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b664095aadfef5e670e8…

1 0

Matteo Bruni : ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn' t exist before d3d7.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: 382c8fde0897f1ed2250d6fd136122ae186f68a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=382c8fde0897f1ed2250d6fd1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:03 2015 +0200 ddraw: D3DRENDERSTATE_NORMALIZENORMALS doesn't exist before d3d7. --- dlls/ddraw/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 582a1d4..688f02b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2525,6 +2525,7 @@ static HRESULT WINAPI d3d_device3_GetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: *value = 0xffffffff; return D3D_OK; @@ -2884,6 +2885,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, } case D3DRENDERSTATE_LIGHTING: + case D3DRENDERSTATE_NORMALIZENORMALS: hr = D3D_OK; break;

1 0

Michael Stefaniuc : wmp: Forward from a Release to a Release method.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: dbf8bde14616e54abbcf4caca92d4b708170b0ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbf8bde14616e54abbcf4caca… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 31 14:25:07 2015 +0200 wmp: Forward from a Release to a Release method. --- dlls/wmp/oleobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 33c0323..75957a4 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -671,7 +671,7 @@ static ULONG WINAPI OleControl_AddRef(IOleControl *iface) static ULONG WINAPI OleControl_Release(IOleControl *iface) { WindowsMediaPlayer *This = impl_from_IOleControl(iface); - return IOleObject_AddRef(&This->IOleObject_iface); + return IOleObject_Release(&This->IOleObject_iface); } static HRESULT WINAPI OleControl_GetControlInfo(IOleControl *iface, CONTROLINFO *pCI)

1 0

Matteo Bruni : ddraw: Make sure to activate / deactivate the light on D3DLIGHT_ACTIVE flag changes.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Erich E. Hoover : advapi32/tests: Add tests for inheriting ACL attributes.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Nikolay Sivov : comctl32/listview: Use defined name instead of magic value.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Mark Harmstone : comctl32: Redraw themed button on WM_ENABLE.
by Alexandre Julliard March 31, 2015

March 31, 2015

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

Christoph von Wittich : riched20: EM_SETSEL should not return 0.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: c0c36fba709a53eecdebf8b7cd4b4e37027a3a89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c36fba709a53eecdebf8b7c… Author: Christoph von Wittich <Christoph_vW(a)ReactOS.org> Date: Mon Mar 30 19:39:13 2015 +0200 riched20: EM_SETSEL should not return 0. --- dlls/riched20/editor.c | 3 +-- dlls/riched20/tests/editor.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 146e4be..171ec69 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3308,8 +3308,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - handle_EM_EXSETSEL( editor, wParam, lParam ); - return 0; + return handle_EM_EXSETSEL( editor, wParam, lParam ); } case EM_SETSCROLLPOS: { diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 151fcba..65752af 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4454,6 +4454,43 @@ static void test_EM_EXSETSEL(void) DestroyWindow(hwndRichEdit); } +static void check_EM_SETSEL(HWND hwnd, const struct exsetsel_s *setsel, int id) { + LRESULT result; + int start, end; + + result = SendMessageA(hwnd, EM_SETSEL, setsel->min, setsel->max); + + ok(result == setsel->expected_retval, "EM_SETSEL(%d): expected: %ld actual: %ld\n", id, setsel->expected_retval, result); + + SendMessageA(hwnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end); + + if (setsel->_getsel_todo_wine) { + todo_wine { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } + } else { + ok(start == setsel->expected_getsel_start && end == setsel->expected_getsel_end, "EM_SETSEL(%d): expected (%d,%d) actual:(%d,%d)\n", id, setsel->expected_getsel_start, setsel->expected_getsel_end, start, end); + } +} + +static void test_EM_SETSEL(void) +{ + HWND hwndRichEdit = new_richedit(NULL); + int i; + const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + + /* sending some text to the window */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); + /* 01234567890123456*/ + /* 10 */ + + for (i = 0; i < num_tests; i++) { + check_EM_SETSEL(hwndRichEdit, &exsetsel_tests[i], i); + } + + DestroyWindow(hwndRichEdit); +} + static void test_EM_REPLACESEL(int redraw) { HWND hwndRichEdit = new_richedit(NULL); @@ -7658,6 +7695,7 @@ START_TEST( editor ) test_EM_GETLIMITTEXT(); test_WM_SETFONT(); test_EM_GETMODIFY(); + test_EM_SETSEL(); test_EM_EXSETSEL(); test_WM_PASTE(); test_EM_STREAMIN();

1 0

Matteo Bruni : ddraw: D3DLIGHT lights default to active.
by Alexandre Julliard March 31, 2015

March 31, 2015

Module: wine Branch: master Commit: ca7e56cfee5887c51b432dad4cab0f1304b70e35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca7e56cfee5887c51b432dad4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Mar 30 20:18:00 2015 +0200 ddraw: D3DLIGHT lights default to active. Actually, there is no way to deactivate them short of removing them from the viewport. --- dlls/ddraw/light.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 755fb41..baaf6a3 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -81,7 +81,6 @@ void light_deactivate(struct d3d_light *light) if (!light->active_viewport || !light->active_viewport->active_device) return; device = light->active_viewport->active_device; - /* If was not active, activate it */ if (light->light.dwFlags & D3DLIGHT_ACTIVE) { IDirect3DDevice7_LightEnable(&device->IDirect3DDevice7_iface, light->dwLightIndex, FALSE); @@ -171,6 +170,7 @@ static const float zero_value[] = { static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) { struct d3d_light *light = impl_from_IDirect3DLight(iface); + DWORD flags = data->dwSize >= sizeof(D3DLIGHT2) ? ((D3DLIGHT2 *)data)->dwFlags : D3DLIGHT_ACTIVE; D3DLIGHT7 *light7 = &light->light7; TRACE("iface %p, data %p.\n", iface, data); @@ -184,7 +184,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) + if (!(flags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value; @@ -200,9 +200,10 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) light7->dvPhi = data->dvPhi; wined3d_mutex_lock(); - memcpy(&light->light, data, data->dwSize); - if (light->light.dwFlags & D3DLIGHT_ACTIVE) + memcpy(&light->light, data, sizeof(D3DLIGHT)); + if (flags & D3DLIGHT_ACTIVE) light_update(light); + light->light.dwFlags = flags; wined3d_mutex_unlock(); return D3D_OK;

1 0