April 2016 - Wine-Commits - list.winehq.org

Sebastian Lackner : user32: Implement SetCoalescableTimer and add basic tests.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 57b7a9937deb3f01960fc426f6cedf2b79fd7885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57b7a9937deb3f01960fc426f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 12:34:53 2016 +0200 user32: Implement SetCoalescableTimer and add basic tests. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 13 +++++++++++-- dlls/user32/tests/msg.c | 16 ++++++++++++++++ dlls/user32/user32.spec | 1 + include/winuser.h | 7 +++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index fb4786b..bc6b661 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4443,9 +4443,9 @@ BOOL WINAPI MessageBeep( UINT i ) /*********************************************************************** - * SetTimer (USER32.@) + * SetCoalescableTimer (USER32.@) */ -UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) +UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc, ULONG tolerance ) { UINT_PTR ret; WNDPROC winproc = 0; @@ -4475,6 +4475,15 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) } +/****************************************************************** + * SetTimer (USER32.@) + */ +UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) +{ + return SetCoalescableTimer( hwnd, id, timeout, proc, TIMERV_DEFAULT_COALESCING ); +} + + /*********************************************************************** * SetSystemTimer (USER32.@) */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8ab6e15..e39f8a1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1743,6 +1743,7 @@ static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static BOOL (WINAPI *pUpdateLayeredWindow)(HWND,HDC,POINT*,SIZE*,HDC,POINT*,COLORREF,BLENDFUNCTION*,DWORD); static UINT_PTR (WINAPI *pSetSystemTimer)(HWND, UINT_PTR, UINT, TIMERPROC); static UINT_PTR (WINAPI *pKillSystemTimer)(HWND, UINT_PTR); +static UINT_PTR (WINAPI *pSetCoalescableTimer)(HWND, UINT_PTR, UINT, TIMERPROC, ULONG); /* kernel32 functions */ static BOOL (WINAPI *pGetCPInfoExA)(UINT, DWORD, LPCPINFOEXA); @@ -1769,6 +1770,7 @@ static void init_procs(void) GET_PROC(user32, UpdateLayeredWindow) GET_PROC(user32, SetSystemTimer) GET_PROC(user32, KillSystemTimer) + GET_PROC(user32, SetCoalescableTimer) GET_PROC(kernel32, GetCPInfoExA) @@ -8995,6 +8997,20 @@ static void test_timers_no_wnd(void) KillTimer(NULL, id); /* Note: SetSystemTimer doesn't support a NULL window, see test_timers */ + if (pSetCoalescableTimer) + { + count = 0; + id = pSetCoalescableTimer(NULL, 0, 0, callback_count, 0); + ok(id != 0, "SetCoalescableTimer failed with %u.\n", GetLastError()); + start = GetTickCount(); + while (GetTickCount()-start < 100 && GetMessageA(&msg, NULL, 0, 0)) + DispatchMessageA(&msg); + ok(count > 1, "expected count > 1, got %d.\n", count); + KillTimer(NULL, id); + } + else + win_skip("SetCoalescableTimer not available.\n"); + /* Check what happens when we're running out of timers */ for (i=0; i<sizeof(ids)/sizeof(ids[0]); i++) { diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index c479879..aa10a80 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -624,6 +624,7 @@ @ stdcall SetClassWord(long long long) @ stdcall SetClipboardData(long long) @ stdcall SetClipboardViewer(long) +@ stdcall SetCoalescableTimer(long long long ptr long) # @ stub SetConsoleReserveKeys @ stdcall SetCursor(long) @ stub SetCursorContents diff --git a/include/winuser.h b/include/winuser.h index 9c4586f..0c527fb 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2560,6 +2560,12 @@ typedef struct tagMINIMIZEDMETRICS { #define USER_TIMER_MINIMUM 0x0000000A #define USER_TIMER_MAXIMUM 0x7FFFFFFF +/* SetCoalescableTimer() tolerances */ +#define TIMERV_DEFAULT_COALESCING 0 +#define TIMERV_NO_COALESCING 0xFFFFFFFF +#define TIMERV_COALESCING_MIN 1 +#define TIMERV_COALESCING_MAX 0x7FFFFFF5 + /* AnimateWindow() flags */ #define AW_SLIDE 0x00040000 #define AW_ACTIVATE 0x00020000 @@ -3943,6 +3949,7 @@ WINUSERAPI ULONG_PTR WINAPI SetClassLongPtrW(HWND,INT,LONG_PTR); WINUSERAPI WORD WINAPI SetClassWord(HWND,INT,WORD); WINUSERAPI HANDLE WINAPI SetClipboardData(UINT,HANDLE); WINUSERAPI HWND WINAPI SetClipboardViewer(HWND); +WINUSERAPI UINT_PTR WINAPI SetCoalescableTimer(HWND,UINT_PTR,UINT,TIMERPROC,ULONG); WINUSERAPI HCURSOR WINAPI SetCursor(HCURSOR); WINUSERAPI BOOL WINAPI SetCursorPos(INT,INT); WINUSERAPI VOID WINAPI SetDebugErrorLevel(DWORD);

1 0

Piotr Caban : gdi32/enhmfdrv: Add enhanced metafile bounds tests.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: d307bba0f4e6d92eeab7d930b204d1e8194d9058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d307bba0f4e6d92eeab7d930b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:56 2016 +0200 gdi32/enhmfdrv: Add enhanced metafile bounds tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c61f870..b71249f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1856,6 +1856,14 @@ static int compare_emf_bits(const HENHMETAFILE mf, const unsigned char *bits, broken(emh1->nSize - diff_nt4 == emh2->nSize) || broken(emh1->nSize - diff_9x == emh2->nSize), "expected nSize %u, got %u\n", emh1->nSize, emh2->nSize); + ok(emh1->rclBounds.left == emh2->rclBounds.left, "%s: expected rclBounds.left = %d, got %d\n", + desc, emh1->rclBounds.left, emh2->rclBounds.left); + ok(emh1->rclBounds.top == emh2->rclBounds.top, "%s: expected rclBounds.top = %d, got %d\n", + desc, emh1->rclBounds.top, emh2->rclBounds.top); + ok(emh1->rclBounds.right == emh2->rclBounds.right, "%s: expected rclBounds.right = %d, got %d\n", + desc, emh1->rclBounds.right, emh2->rclBounds.right); + ok(emh1->rclBounds.bottom == emh2->rclBounds.bottom, "%s: expected rclBounds.bottom = %d, got %d\n", + desc, emh1->rclBounds.bottom, emh2->rclBounds.bottom); ok(emh1->dSignature == emh2->dSignature, "expected dSignature %u, got %u\n", emh1->dSignature, emh2->dSignature); ok(emh1->nBytes == emh2->nBytes || broken(emh1->nBytes - diff_nt4 == emh2->nBytes) ||

1 0

Michael Stefaniuc : comctl32: Use SetRect() instead of open coding it.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 903ea191222efcaedf0334242a925b392b7b9487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903ea191222efcaedf0334242… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 29 15:58:29 2016 +0200 comctl32: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/animate.c | 5 +---- dlls/comctl32/comboex.c | 7 ++----- dlls/comctl32/datetime.c | 5 +---- dlls/comctl32/listview.c | 22 +++++++--------------- dlls/comctl32/progress.c | 32 ++++++-------------------------- dlls/comctl32/propsheet.c | 23 ++++------------------- dlls/comctl32/syslink.c | 5 +---- dlls/comctl32/tab.c | 3 +-- dlls/comctl32/toolbar.c | 4 +--- dlls/comctl32/trackbar.c | 12 ++++-------- 10 files changed, 28 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=903ea191222efcaedf033…

1 0

Alex Henrie : quartz: Print This pointer before iface pointer in traces.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 2581fc7c21f64bd2742256ded9b07ac05cd4cb79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2581fc7c21f64bd2742256ded… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Apr 27 23:12:56 2016 -0600 quartz: Print This pointer before iface pointer in traces. This matches what is done in AMFilterData_ParseFilterData and AMFilterData_CreateFilterData. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtermapper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index a462fbc..6564155 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1159,7 +1159,8 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( HRESULT hr; TRACE("(%p/%p)->(%p, %x, %s, %s, %s, %s, %s, %s, %s) stub!\n", - iface,This, + This, + iface, ppEnum, dwMerit, bInputNeeded ? "true" : "false",

1 0

Alexandre Julliard : kernel32: Properly check the NtQueryDirectoryFile return status.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 02f80187f0ca19deb13f6615d1acd2245d69eef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f80187f0ca19deb13f6615d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 29 23:19:16 2016 +0900 kernel32: Properly check the NtQueryDirectoryFile return status. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index bd9e689..56bdb52 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2077,7 +2077,6 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, } else { - IO_STATUS_BLOCK io; BOOL has_wildcard = strpbrkW( info->mask.Buffer, wildcardsW ) != NULL; info->data_size = has_wildcard ? 8192 : max_entry_size * 2; @@ -2091,12 +2090,12 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, return INVALID_HANDLE_VALUE; } - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); - if (io.u.Status) + status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, TRUE ); + if (status) { FindClose( info ); - SetLastError( RtlNtStatusToDosError( io.u.Status ) ); + SetLastError( RtlNtStatusToDosError( status ) ); return INVALID_HANDLE_VALUE; } @@ -2148,6 +2147,7 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) FIND_FIRST_INFO *info; FILE_BOTH_DIR_INFORMATION *dir_info; BOOL ret = FALSE; + NTSTATUS status; TRACE("%p %p\n", handle, data); @@ -2173,15 +2173,15 @@ BOOL WINAPI FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *data ) IO_STATUS_BLOCK io; if (info->data_size) - NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, - FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); + status = NtQueryDirectoryFile( info->handle, 0, NULL, NULL, &io, info->data, info->data_size, + FileBothDirectoryInformation, FALSE, &info->mask, FALSE ); else - io.u.Status = STATUS_NO_MORE_FILES; + status = STATUS_NO_MORE_FILES; - if (io.u.Status) + if (status) { - SetLastError( RtlNtStatusToDosError( io.u.Status ) ); - if (io.u.Status == STATUS_NO_MORE_FILES) + SetLastError( RtlNtStatusToDosError( status ) ); + if (status == STATUS_NO_MORE_FILES) { CloseHandle( info->handle ); HeapFree( GetProcessHeap(), 0, info->data );

1 0

Piotr Caban : gdi32/enhmfdrv: Add ExtTextOut tests with unmatched BeginPath/EndPath calls.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 3a12eb2083cced856f99fd93ab9dc5f3b0f2d5cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a12eb2083cced856f99fd93a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:20 2016 +0200 gdi32/enhmfdrv: Add ExtTextOut tests with unmatched BeginPath/EndPath calls. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index ebe7e02..c61f870 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -240,6 +240,16 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); + /* 4. test with unmatched BeginPath/EndPath calls */ + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = BeginPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = EndPath(hdcMetafile); + ok( ret, "BeginPath error %d\n", GetLastError()); + ret = ExtTextOutA(hdcMetafile, 0, 60, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + hFont = SelectObject(hdcMetafile, hFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %d\n", GetLastError());

1 0

Jens Reyer : msiexec: Fix a typo in the manpage.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 2ba799037f217c8ce91b217fa01240e846e45fd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ba799037f217c8ce91b217fa… Author: Jens Reyer <jre.winesim(a)gmail.com> Date: Fri Apr 29 03:03:14 2016 +0200 msiexec: Fix a typo in the manpage. Signed-off-by: Jens Reyer <jre.winesim(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/msiexec/msiexec.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/msiexec/msiexec.man.in b/programs/msiexec/msiexec.man.in index e7c3798..f24c226 100644 --- a/programs/msiexec/msiexec.man.in +++ b/programs/msiexec/msiexec.man.in @@ -76,7 +76,7 @@ Log all error messages. .IP "\fBa\fR" Log start of actions. .IP "\fBr\fR" -Log action specifc records. +Log action specific records. .IP "\fBu\fR" Log user requests. .IP "\fBc\fR"

1 0

Nikolay Sivov : mshtml: IBindStatusCallback::OnStopBinding() last argument is string pointer.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 508830c3ac0a7dada504839feb750992b3e4d2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=508830c3ac0a7dada504839fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 21:54:52 2016 +0300 mshtml: IBindStatusCallback::OnStopBinding() last argument is string pointer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 1854a70..4b86c40 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1862,8 +1862,7 @@ HRESULT channelbsc_load_stream(HTMLInnerWindow *pending_window, IMoniker *mon, I if(SUCCEEDED(hres)) hres = async_stop_request(bscallback); if(FAILED(hres)) - IBindStatusCallback_OnStopBinding(&bscallback->bsc.IBindStatusCallback_iface, hres, - ERROR_SUCCESS); + IBindStatusCallback_OnStopBinding(&bscallback->bsc.IBindStatusCallback_iface, hres, NULL); return hres; }

1 0

Piotr Caban : gdi32/enhmfdrv: Always set ExtTextOut bounding rect if we' re not inside path bracket.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: 269b2519a7ac17a6f7a832cc39c2b3a8c965c773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269b2519a7ac17a6f7a832cc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 28 18:47:14 2016 +0200 gdi32/enhmfdrv: Always set ExtTextOut bounding rect if we're not inside path bracket. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/dc.c | 6 ++++++ dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 1 + dlls/gdi32/enhmfdrv/graphics.c | 4 +++- dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/tests/metafile.c | 11 +++++++++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index cbf3f5c..8525067 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -420,8 +420,11 @@ BOOL EMFDRV_AbortPath( PHYSDEV dev ) BOOL EMFDRV_BeginPath( PHYSDEV dev ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRBEGINPATH emr; + physDev->path = TRUE; + emr.emr.iType = EMR_BEGINPATH; emr.emr.nSize = sizeof(emr); @@ -440,8 +443,11 @@ BOOL EMFDRV_CloseFigure( PHYSDEV dev ) BOOL EMFDRV_EndPath( PHYSDEV dev ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMRENDPATH emr; + physDev->path = FALSE; + emr.emr.iType = EMR_ENDPATH; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 721c82f..8aa1b2d 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -42,6 +42,7 @@ typedef struct HDC ref_dc; /* Reference device */ HDC screen_dc; /* Screen DC if no reference device specified */ INT restoring; /* RestoreDC counter */ + BOOL path; } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index e5553e0..38a71b6 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -746,6 +746,7 @@ BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprect, LPCWSTR str, UINT count, const INT *lpDx ) { + EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; EMREXTTEXTOUTW *pemr; DWORD nSize; BOOL ret; @@ -827,13 +828,14 @@ BOOL EMFDRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags, const RECT *lprec } } - if (!lprect) + if (physDev->path) { pemr->rclBounds.left = pemr->rclBounds.top = 0; pemr->rclBounds.right = pemr->rclBounds.bottom = -1; goto no_bounds; } + /* FIXME: handle font escapement */ switch (textAlign & (TA_LEFT | TA_RIGHT | TA_CENTER)) { case TA_CENTER: { pemr->rclBounds.left = x - (textWidth / 2) - 1; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index e0cbcae..f618e85 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -352,6 +352,7 @@ HDC WINAPI CreateEnhMetaFileW( physDev->dc_pen = 0; physDev->screen_dc = 0; physDev->restoring = 0; + physDev->path = FALSE; if (hdc) /* if no ref, use current display */ physDev->ref_dc = hdc; else diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index c77112d..ebe7e02 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -148,6 +148,13 @@ static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(!memcmp(&orig_lf, &device_lf, FIELD_OFFSET(LOGFONTA, lfOutPrecision)), "fonts don't match\n"); ok(!lstrcmpA(orig_lf.lfFaceName, device_lf.lfFaceName), "font names don't match\n"); + ok(!emr_ExtTextOutW->rclBounds.left, "emr_ExtTextOutW->rclBounds.left = %d\n", + emr_ExtTextOutW->rclBounds.left); + ok(emr_ExtTextOutW->rclBounds.right != -1, "emr_ExtTextOutW->rclBounds.right = %d\n", + emr_ExtTextOutW->rclBounds.right); + ok(emr_ExtTextOutW->rclBounds.bottom != -1, "emr_ExtTextOutW->rclBounds.bottom = %d\n", + emr_ExtTextOutW->rclBounds.bottom); + for(i = 0; i < emr_ExtTextOutW->emrtext.nChars; i++) { ok(orig_dx[i] == dx[i], "pass %d: dx[%d] (%d) didn't match %d\n", @@ -229,6 +236,10 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 20, 0, &rc, text, lstrlenA(text), dx); ok( ret, "ExtTextOutA error %d\n", GetLastError()); + /* 3. pass NULL lprc */ + ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); + ok( ret, "ExtTextOutA error %d\n", GetLastError()); + hFont = SelectObject(hdcMetafile, hFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %d\n", GetLastError());

1 0

Nikolay Sivov : fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case.
by Alexandre Julliard April 29, 2016

April 29, 2016

Module: wine Branch: master Commit: f99785160009df9d043ec691699216d9c5be517a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f99785160009df9d043ec6916… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 28 20:44:22 2016 +0300 fontsub: Improve CreateFontPackage() stub for TTFCFP_SUBSET case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fontsub/main.c | 13 ++++++++++++- include/fontsub.h | 26 ++++++++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index b78bd58..a0a6032 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -50,5 +50,16 @@ ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, u written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, reallocproc, freeproc, reserved); - return ERR_GENERIC; + if (format != TTFCFP_SUBSET) + return ERR_GENERIC; + + *dest = allocproc(src_len); + if (!*dest) + return ERR_MEM; + + memcpy(*dest, src, src_len); + *dest_len = src_len; + *written = src_len; + + return NO_ERROR; } diff --git a/include/fontsub.h b/include/fontsub.h index 6fc7793..aa83f03 100644 --- a/include/fontsub.h +++ b/include/fontsub.h @@ -27,14 +27,36 @@ typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); typedef void (__cdecl *CFP_FREEPROC)(void *); +#define TTFCFP_SUBSET 0 +#define TTFCFP_SUBSET1 1 +#define TTFCFP_DELTA 2 + +#define TTFCFP_UNICODE_PLATFORMID 0 +#define TTFCFP_APPLE_PLATFORMID 1 +#define TTFCFP_ISO_PLATFORMID 2 +#define TTFCFP_MS_PLATFORMID 3 + +#define TTFCFP_STD_MAC_CHAR_SET 0 +#define TTFCFP_SYMBOL_CHAR_SET 0 +#define TTFCFP_UNICODE_CHAR_SET 1 +#define TTFCFP_DONT_CARE 0xffff + +#define TTFCFP_LANG_KEEP_ALL 0 + +#define TTFCFP_FLAGS_SUBSET 0x0001 +#define TTFCFP_FLAGS_COMPRESS 0x0002 +#define TTFCFP_FLAGS_TTC 0x0004 +#define TTFCFP_FLAGS_GLYPHLIST 0x0008 + +#define ERR_GENERIC 1000 +#define ERR_MEM 1005 + ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); -#define ERR_GENERIC 1000 - #ifdef __cplusplus } #endif

1 0