October 2015 - Wine-commits

Henri Verbeet : d2d1: Implement d2d_point_ccw() in a more robust way.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: e8b4d8e0d0edec7f6d160126fdb95a3992193cef URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b4d8e0d0edec7f6d160126f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:22 2015 +0200 d2d1: Implement d2d_point_ccw() in a more robust way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- configure | 28 ++++++ configure.ac | 1 + dlls/d2d1/Makefile.in | 1 + dlls/d2d1/geometry.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 278 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8b4d8e0d0edec7f6d160…

1 0

Henri Verbeet : d2d1: Implement d2d_cdt_incircle() in a more robust way.
by Alexandre Julliard 07 Oct '15

07 Oct '15

Module: wine Branch: master Commit: 7e6b52e88b5f35caf678f87d45fc0972844400c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6b52e88b5f35caf678f87d4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 6 18:48:23 2015 +0200 d2d1: Implement d2d_cdt_incircle() in a more robust way. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/geometry.c | 336 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 327 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e6b52e88b5f35caf678f…

1 0

Alex Henrie : user32: Pass num_steps=0 to alloc_icon_handle if is_ani= FALSE.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 7bbcc766ef10770f64db002c08f08bafc94780dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bbcc766ef10770f64db002c0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 4 21:27:57 2015 -0600 user32: Pass num_steps=0 to alloc_icon_handle if is_ani=FALSE. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/user32/cursoricon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 6a05822..ea3f2ef 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -939,7 +939,7 @@ done: HeapFree( GetProcessHeap(), 0, bmi_copy ); if (ret) - hObj = alloc_icon_handle( FALSE, 1 ); + hObj = alloc_icon_handle( FALSE, 0 ); if (hObj) { struct cursoricon_object *info = get_icon_ptr( hObj ); @@ -1575,7 +1575,7 @@ HICON WINAPI CopyIcon( HICON hIcon ) SetLastError( ERROR_INVALID_CURSOR_HANDLE ); return 0; } - if ((hNew = alloc_icon_handle( FALSE, 1 ))) + if ((hNew = alloc_icon_handle( FALSE, 0 ))) { struct cursoricon_frame *frameOld, *frameNew; @@ -2181,7 +2181,7 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo) DeleteDC( hdc ); - hObj = alloc_icon_handle( FALSE, 1 ); + hObj = alloc_icon_handle( FALSE, 0 ); if (hObj) { struct cursoricon_object *info = get_icon_ptr( hObj );

1 0

Frédéric Delanoy : wbemprox: Silence some noisy FIXMEs.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: ea3dba9d6997fe1b3aee6e5fd35cc6f6b6ab9bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea3dba9d6997fe1b3aee6e5fd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Oct 5 14:13:08 2015 +0200 wbemprox: Silence some noisy FIXMEs. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> --- dlls/wbemprox/class.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index afb9f8c..27229bd 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -114,13 +114,14 @@ static HRESULT WINAPI enum_class_object_Next( { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); struct view *view = ec->query->view; + static int once = 0; HRESULT hr; TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); if (!uCount) return WBEM_S_FALSE; if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; - if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); + if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; if (ec->index >= view->count) return WBEM_S_FALSE; @@ -162,10 +163,11 @@ static HRESULT WINAPI enum_class_object_Skip( { struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); struct view *view = ec->query->view; + static int once = 0; TRACE("%p, %d, %u\n", iface, lTimeout, nCount); - if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); + if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); if (!view->count) return WBEM_S_FALSE;

1 0

Sebastian Lackner : user32/tests: Add a test for sending WM_SIZE message to edit control.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: e4a3cd60dfa9c67df2a5c4b62c487b2aa8275005 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a3cd60dfa9c67df2a5c4b62… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Oct 6 03:32:07 2015 +0200 user32/tests: Add a test for sending WM_SIZE message to edit control. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/user32/tests/edit.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index e8b41c2..bd7b6d5 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1476,10 +1476,23 @@ static void test_margins(void) SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10)); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - ok(new_rect.left == old_rect.left, "The left border of the rectangle has changed\n"); - ok(new_rect.right == old_rect.right, "The right border of the rectangle has changed\n"); - ok(new_rect.top == old_rect.top, "The top border of the rectangle has changed\n"); - ok(new_rect.bottom == old_rect.bottom, "The bottom border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + + /* The lParam argument of the WM_SIZE message should be ignored. */ + + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); + SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); + todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); DestroyWindow (hwEdit);

1 0

Michael Müller : user32: Ignore lParam argument of WM_SIZE message for edit control.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 2be56fdc95584e1902670481e3b12cb6b4a9eb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be56fdc95584e1902670481e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Oct 6 03:32:21 2015 +0200 user32: Ignore lParam argument of WM_SIZE message for edit control. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> --- dlls/user32/edit.c | 7 +++---- dlls/user32/tests/edit.c | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 084bbff..dfd72e8 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3923,12 +3923,11 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) * WM_SIZE * */ -static void EDIT_WM_Size(EDITSTATE *es, UINT action, INT width, INT height) +static void EDIT_WM_Size(EDITSTATE *es, UINT action) { if ((action == SIZE_MAXIMIZED) || (action == SIZE_RESTORED)) { RECT rc; - TRACE("width = %d, height = %d\n", width, height); - SetRect(&rc, 0, 0, width, height); + GetClientRect(es->hwndSelf, &rc); EDIT_SetRectNP(es, &rc); EDIT_UpdateText(es, NULL, TRUE); } @@ -5096,7 +5095,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; case WM_SIZE: - EDIT_WM_Size(es, (UINT)wParam, LOWORD(lParam), HIWORD(lParam)); + EDIT_WM_Size(es, (UINT)wParam); break; case WM_STYLECHANGED: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index bd7b6d5..6ff7225 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1483,16 +1483,16 @@ static void test_margins(void) SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect); SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, 0); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); SendMessageA(hwEdit, WM_SIZE, SIZE_MINIMIZED, 0); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); SendMessageA(hwEdit, WM_SIZE, SIZE_MAXIMIZED, 0); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); SendMessageA(hwEdit, WM_SIZE, SIZE_RESTORED, MAKELONG(10, 10)); SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&new_rect); - todo_wine ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); + ok(EqualRect(&old_rect, &new_rect), "The border of the rectangle has changed\n"); DestroyWindow (hwEdit);

1 0

Nikolay Sivov : dwrite: Properly implement CreateFontFaceFromHdc().
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: f2b830ec762b3ecc96fbff2f60fb0ef3f0a9d414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b830ec762b3ecc96fbff2f6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 13:46:18 2015 +0300 dwrite: Properly implement CreateFontFaceFromHdc(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/gdiinterop.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index ea745c5..cf81699 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -777,31 +777,85 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *ifa return hr; } +struct font_realization_info { + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + DWORD face_index; +}; + +struct font_fileinfo { + FILETIME writetime; + LARGE_INTEGER size; + WCHAR path[1]; +}; + +/* Undocumented gdi32 exports, used to access actually selected font information */ +extern BOOL WINAPI GetFontRealizationInfo(HDC hdc, struct font_realization_info *info); +extern BOOL WINAPI GetFontFileInfo(DWORD instance_id, DWORD unknown, struct font_fileinfo *info, DWORD size, DWORD *needed); + static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, HDC hdc, IDWriteFontFace **fontface) { struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); - IDWriteFont *font; - LOGFONTW logfont; - HFONT hfont; + struct font_realization_info info; + struct font_fileinfo *fileinfo; + DWRITE_FONT_FILE_TYPE filetype; + DWRITE_FONT_FACE_TYPE facetype; + IDWriteFontFile *file; + BOOL is_supported; + UINT32 facenum; + DWORD needed; HRESULT hr; TRACE("(%p)->(%p %p)\n", This, hdc, fontface); *fontface = NULL; - hfont = GetCurrentObject(hdc, OBJ_FONT); - if (!hfont) + if (!hdc) return E_INVALIDARG; - GetObjectW(hfont, sizeof(logfont), &logfont); - hr = IDWriteGdiInterop_CreateFontFromLOGFONT(iface, &logfont, &font); + /* get selected font id */ + info.size = sizeof(info); + if (!GetFontRealizationInfo(hdc, &info)) { + WARN("failed to get selected font id\n"); + return E_FAIL; + } + + needed = 0; + GetFontFileInfo(info.instance_id, 0, NULL, 0, &needed); + if (needed == 0) { + WARN("failed to get font file info size\n"); + return E_FAIL; + } + + fileinfo = heap_alloc(needed); + if (!fileinfo) + return E_OUTOFMEMORY; + + if (!GetFontFileInfo(info.instance_id, 0, fileinfo, needed, &needed)) { + heap_free(fileinfo); + return E_FAIL; + } + + hr = IDWriteFactory2_CreateFontFileReference(This->factory, fileinfo->path, &fileinfo->writetime, + &file); + heap_free(fileinfo); if (FAILED(hr)) return hr; - hr = IDWriteFont_CreateFontFace(font, fontface); - IDWriteFont_Release(font); + is_supported = FALSE; + hr = IDWriteFontFile_Analyze(file, &is_supported, &filetype, &facetype, &facenum); + if (FAILED(hr) || !is_supported) { + IDWriteFontFile_Release(file); + return hr; + } + hr = IDWriteFactory2_CreateFontFace(This->factory, facetype, 1, &file, info.face_index, DWRITE_FONT_SIMULATIONS_NONE, + fontface); + IDWriteFontFile_Release(file); return hr; }

1 0

Nikolay Sivov : maintainers: Add entries for dwrite and comctl32.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: de5168146d7b33041c97726ae929c22e1c06de45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de5168146d7b33041c97726ae… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 6 13:52:24 2015 +0300 maintainers: Add entries for dwrite and comctl32. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9dba0d2..e7aa7e2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -47,6 +47,10 @@ F: dlls/msvcrt/except_arm.c F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* +Common Controls Library +P: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/comctl32/ + Direct2D M: Henri Verbeet <hverbeet(a)codeweavers.com> F: dlls/d2d*/ @@ -63,6 +67,10 @@ DirectInput P: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dinput/ +DirectWrite +M: Nikolay Sivov <nsivov(a)codeweavers.com> +F: dlls/dwrite/ + HID support M: Aric Stewart <aric(a)codeweavers.com> F: dlls/hid/

1 0

Dmitry Timoshkov : msi/tests: Add a test for MsiInstallProduct with command line containing double quotes inside of the property.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 1b3087e79f70c48f3e697d9ba16fa936bace0e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b3087e79f70c48f3e697d9ba… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 18:10:29 2015 +0800 msi/tests: Add a test for MsiInstallProduct with command line containing double quotes inside of the property. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/install.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 5eff29f..6b86cd2 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4716,6 +4716,13 @@ static void test_propcase(void) ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); + r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); +todo_wine + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); +todo_wine + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + error: DeleteFileA(msifile); DeleteFileA("msitest\\augustus");

1 0

Dmitry Timoshkov : msi: Correctly parse double quotes in the token value.
by Alexandre Julliard 06 Oct '15

06 Oct '15

Module: wine Branch: master Commit: 42caac841e1755570ba25c2ce95948fc28f31372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42caac841e1755570ba25c2ce… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 6 18:10:35 2015 +0800 msi: Correctly parse double quotes in the token value. This fixes an installer that passes to InstallProduct a command line like PROPERTY1="Installing ""Product name"" version 8.0" PROPERTY2=1 PROPERTY3=1 In this case properties PROPERTY2 and PROPERTY3 were not recognized and that led to an installation failure when a custom action didn't see them as set. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/action.c | 4 ++-- dlls/msi/tests/install.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 16c633b..f2e8e71 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -245,7 +245,7 @@ static int parse_prop( const WCHAR *str, WCHAR *value, int *quotes ) { case '"': state = state_quote; - if (in_quotes) count--; + if (in_quotes && p[1] != '\"') count--; else count++; break; case ' ': @@ -329,7 +329,7 @@ UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, ptr2 = strchrW( ptr, '=' ); if (!ptr2) return ERROR_INVALID_COMMAND_LINE; - + len = ptr2 - ptr; if (!len) return ERROR_INVALID_COMMAND_LINE; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6b86cd2..df6fe9c 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4718,9 +4718,7 @@ static void test_propcase(void) r = MsiInstallProductA(msifile, "BLAHBLAH=\"Copyright \"\"My Company\"\" 2015\" MyProp=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); -todo_wine ok(delete_pf("msitest", FALSE), "Directory not created\n"); error:

1 0