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

Michael Stefaniuc : d3drm/tests: Test the correct return code.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 8abed244a23ab46dc71a1aa358727ba87e36f374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abed244a23ab46dc71a1aa35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 30 10:19:14 2015 +0200 d3drm/tests: Test the correct return code. --- dlls/d3drm/tests/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 515aace..5fbd281 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -826,7 +826,7 @@ static void test_Face(void) ok(count == 4, "count = %u\n", count); hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); - IDirect3DRMFace_GetVertices(face, &count, v2, n2); + hr = IDirect3DRMFace_GetVertices(face, &count, v2, n2); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n",

1 0

Nikolay Sivov : dwrite: Return CreateStreamFromKey() failure code from Analyze().
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 9ec6fd85c41f148456dae7ca74758157d4f426a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec6fd85c41f148456dae7ca7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 30 11:57:28 2015 +0300 dwrite: Return CreateStreamFromKey() failure code from Analyze(). --- dlls/dwrite/font.c | 6 ++++-- dlls/dwrite/tests/font.c | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 59eda80..fc067a5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1715,10 +1715,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; + /* failed font files are skipped */ hr = IDWriteFontFile_Analyze(file, &supported, &file_type, &face_type, &face_count); if (FAILED(hr) || !supported || face_count == 0) { - TRACE("unsupported font (0x%08x, %d, %u)\n", hr, supported, face_count); + TRACE("unsupported font (%p, 0x%08x, %d, %u)\n", file, hr, supported, face_count); IDWriteFontFile_Release(file); + hr = S_OK; continue; } @@ -2080,7 +2082,7 @@ static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSup hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); if (FAILED(hr)) - return S_OK; + return hr; hr = opentype_analyze_font(stream, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9762d49..3afcd0c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1814,15 +1814,14 @@ static void test_CreateCustomFontFileReference(void) face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE; support = TRUE; count = 1; - IDWriteFontFile_Analyze(file, &support, &file_type, &face_type, &count); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontFile_Analyze(file, &support, &file_type, &face_type, &count); + ok(hr == 0x8faecafe, "got 0x%08x\n", hr); ok(support == FALSE, "got %i\n", support); ok(file_type == DWRITE_FONT_FILE_TYPE_UNKNOWN, "got %i\n", file_type); ok(face_type == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face_type); ok(count == 0, "got %i\n", count); hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_CFF, 1, &file, 0, 0, &face); -todo_wine ok(hr == 0x8faecafe, "got 0x%08x\n", hr); IDWriteFontFile_Release(file);

1 0

Austin English : kernel32: Add a stub for QueryThreadCycleTime.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 88362a077096bab950ff2cd520abbe93b5d376ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=88362a077096bab950ff2cd52… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 30 04:53:33 2015 -0500 kernel32: Add a stub for QueryThreadCycleTime. --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ include/winbase.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1179af2..d94c307 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1167,7 +1167,7 @@ @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode # @ stub QueryProcessCycleTime -# @ stub QueryThreadCycleTime +@ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation # @ stub -arch=x86_64 QueryUmsThreadInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 2f7142b..8214686 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1105,6 +1105,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(PDYNAMIC_TIME_ZONE_INFORMATION info) } /*********************************************************************** + * QueryThreadCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p,): stub!\n", thread, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryUnbiasedInterruptTime (KERNEL32.@) */ BOOL WINAPI QueryUnbiasedInterruptTime(ULONGLONG *time) diff --git a/include/winbase.h b/include/winbase.h index 58ed07c..82220c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2294,6 +2294,7 @@ WINBASEAPI BOOL WINAPI QueryInformationJobObject(HANDLE,JOBOBJECTINFOCLAS WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); +WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR); WINBASEAPI BOOL WINAPI QueueUserWorkItem(LPTHREAD_START_ROUTINE,PVOID,ULONG); WINBASEAPI void WINAPI RaiseException(DWORD,DWORD,DWORD,const ULONG_PTR *);

1 0

Austin English : include: Add initial mfapi.h.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 47ef8ebcc8b4f98ce1f2c2aca9b73cbc4130df1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ef8ebcc8b4f98ce1f2c2aca… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Mar 30 00:52:47 2015 -0500 include: Add initial mfapi.h. --- dlls/mfplat/main.c | 1 + include/Makefile.in | 1 + include/mfapi.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 5608644..3376a2c 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -22,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "mfapi.h" #include "mferror.h" #include "wine/debug.h" diff --git a/include/Makefile.in b/include/Makefile.in index 02d5d88..e114f9f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -400,6 +400,7 @@ SRCDIR_INCLUDES = \ mciavi.h \ mcx.h \ mediaerr.h \ + mfapi.h \ mferror.h \ midles.h \ minmax.h \ diff --git a/include/mfapi.h b/include/mfapi.h new file mode 100644 index 0000000..929a36d --- /dev/null +++ b/include/mfapi.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015 Austin English + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_MFAPI_H +#define __WINE_MFAPI_H + +#define MFSTARTUP_NOSOCKET 0x1 +#define MFSTARTUP_LITE (MFSTARTUP_NOSOCKET) +#define MFSTARTUP_FULL 0 + +typedef struct _MFT_REGISTER_TYPE_INFO { + GUID major_type; + GUID sub_type; +} MFT_REGISTER_TYPE_INFO; + +typedef unsigned __int64 MFWORKITEM_KEY; + +HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); +HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); +HRESULT WINAPI MFLockPlatform(void); +HRESULT WINAPI MFShutdown(void); +HRESULT WINAPI MFStartup(ULONG version, DWORD flags); +HRESULT WINAPI MFUnlockPlatform(void); + +#endif /* __WINE_MFAPI_H */

1 0

Alexandre Julliard : user32: Remove left-over freeing of the edit text with ES_PASSWORD.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 766768f033fe03ae0d5b63ab04f12203d6c26c03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=766768f033fe03ae0d5b63ab0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:07:37 2015 +0900 user32: Remove left-over freeing of the edit text with ES_PASSWORD. --- dlls/user32/edit.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 4b29f03..67adefb 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2194,12 +2194,9 @@ static INT EDIT_PaintText(EDITSTATE *es, HDC dc, INT x, INT y, INT line, INT col ret = (INT)LOWORD(TabbedTextOutW(dc, x, y, es->text + li + col, count, es->tabs_count, es->tabs, es->format_rect.left - es->x_offset)); } else { - LPWSTR text = es->text; - TextOutW(dc, x, y, text + li + col, count); - GetTextExtentPoint32W(dc, text + li + col, count, &size); + TextOutW(dc, x, y, es->text + li + col, count); + GetTextExtentPoint32W(dc, es->text + li + col, count, &size); ret = size.cx; - if (es->style & ES_PASSWORD) - HeapFree(GetProcessHeap(), 0, text); } if (rev) { if (es->composition_len == 0)

1 0

Alexandre Julliard : comctl32: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 9f1f5d885c233d82dfcbccbc38981fa24a680429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f1f5d885c233d82dfcbccbc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:47:44 2015 +0900 comctl32: Print full flag values in traces. --- dlls/comctl32/rebar.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index becfe20..99069a9 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -1396,7 +1396,7 @@ REBAR_Layout(REBAR_INFO *infoPtr) adjcx = get_rect_cx(infoPtr, &rcAdj); if (infoPtr->uNumBands == 0) { - TRACE("No bands - setting size to (0,%d), vert: %x\n", adjcx, infoPtr->dwStyle & CCS_VERT); + TRACE("No bands - setting size to (0,%d), style: %x\n", adjcx, infoPtr->dwStyle); infoPtr->calcSize.cx = adjcx; /* the calcSize.cy won't change for a 0 band rebar */ infoPtr->uNumRows = 0; diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index da21924..cdfe7dd 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1917,7 +1917,7 @@ static void test_TB_GET_SET_EXTENDEDSTYLE(void) ok(style == TBSTYLE_EX_VERTICAL, "got style 0x%08x, expected 0x%08x\n", style, TBSTYLE_EX_VERTICAL); style = SendMessageA(hwnd, TB_GETSTYLE, 0, 0); todo_wine - ok(style == CCS_VERT, "got style 0x%08x, expected 0x%08x\n", style, CCS_VERT); + ok(style == CCS_VERT, "got style 0x%08x, expected CCS_VERT\n", style); DestroyWindow(hwnd); }

1 0

Alexandre Julliard : msacm32: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 9b6c203d8fae887a08efcf2db9a23c74539a420d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6c203d8fae887a08efcf2db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:47:54 2015 +0900 msacm32: Print full flag values in traces. --- dlls/msacm32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index 3f38961..e0c5fdd 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -168,7 +168,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd & ACM_DRIVERADDF_TYPEMASK); + ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; }

1 0

Alexandre Julliard : riched20/tests: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 488e3d70a6b026601cdb66c4e7f8bc584efb820a URL: http://source.winehq.org/git/wine.git/?a=commit;h=488e3d70a6b026601cdb66c4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:08 2015 +0900 riched20/tests: Print full flag values in traces. --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index b15f16f..151fcba 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7615,12 +7615,12 @@ static void test_EM_SETREADONLY(void) res = SendMessageA(richedit, EM_SETREADONLY, TRUE, 0); ok(res == 1, "EM_SETREADONLY\n"); dwStyle = GetWindowLongA(richedit, GWL_STYLE); - ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + ok(dwStyle & ES_READONLY, "got wrong value: 0x%x\n", dwStyle); res = SendMessageA(richedit, EM_SETREADONLY, FALSE, 0); ok(res == 1, "EM_SETREADONLY\n"); dwStyle = GetWindowLongA(richedit, GWL_STYLE); - ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle & ES_READONLY); + ok(!(dwStyle & ES_READONLY), "got wrong value: 0x%x\n", dwStyle); DestroyWindow(richedit); }

1 0

Alexandre Julliard : user32/tests: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 13700585b1267ec94cb907f2e592635bba4d961f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13700585b1267ec94cb907f2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:20 2015 +0900 user32/tests: Print full flag values in traces. --- dlls/user32/tests/win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d71e92a..6869a20 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3797,7 +3797,7 @@ static LRESULT WINAPI StyleCheckProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM ok((lpss->styleOld & ~WS_EX_WINDOWEDGE) == (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE), "Ex style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", - (lpss->styleOld & ~WS_EX_WINDOWEDGE), (lpcs->dwExStyle & ~WS_EX_WINDOWEDGE)); + lpss->styleOld, lpcs->dwExStyle); ok(lpss->styleNew == lpcs->style, "Style (0x%08x) should match what the caller passed to CreateWindowEx (0x%08x)\n", @@ -3985,14 +3985,14 @@ static void check_dialog_style(DWORD style_in, DWORD ex_style_in, DWORD style_ou style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out | DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); ok(ex_style == ex_style_out, "expected ex_style %#x, got %#x\n", ex_style_out, ex_style); /* try setting the styles explicitly */ SetWindowLongA(hwnd, GWL_EXSTYLE, ex_style_in); style = GetWindowLongA(hwnd, GWL_STYLE); ex_style = GetWindowLongA(hwnd, GWL_EXSTYLE); - ok(style == (style_out | DS_3DLOOK), "expected style %#x, got %#x\n", style_out|DS_3DLOOK, style); + ok(style == (style_out | DS_3DLOOK), "got %#x\n", style); /* WS_EX_WINDOWEDGE can't always be changed */ if (ex_style_in & WS_EX_DLGMODALFRAME) ex_style_out = ex_style_in | WS_EX_WINDOWEDGE;

1 0

Alexandre Julliard : winmm: Print full flag values in traces.
by Alexandre Julliard 30 Mar '15

30 Mar '15

Module: wine Branch: master Commit: 6c3aac3e4af280746e45b8269ded2dce2ac5f80e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3aac3e4af280746e45b8269… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 30 19:48:31 2015 +0900 winmm: Print full flag values in traces. --- dlls/winmm/mci.c | 2 +- dlls/winmm/waveform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index a77514c..b3c1882 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1731,7 +1731,7 @@ static DWORD MCI_Open(DWORD dwParam, LPMCI_OPEN_PARMSW lpParms) MCI_OPEN_ALIAS|MCI_OPEN_TYPE|MCI_OPEN_TYPE_ID| \ MCI_NOTIFY|MCI_WAIT) if ((dwParam & ~WINE_MCIDRIVER_SUPP) != 0) - FIXME("Unsupported yet dwFlags=%08X\n", dwParam & ~WINE_MCIDRIVER_SUPP); + FIXME("Unsupported yet dwFlags=%08X\n", dwParam); #undef WINE_MCIDRIVER_SUPP strDevTyp[0] = 0; diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index ba74e02..c010c39 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -4314,7 +4314,7 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo return MIXERR_INVALLINE; } - TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo & MIXER_GETLINEINFOF_QUERYMASK); + TRACE("Returning INVALFLAG on these flags: %x\n", fdwInfo); return MMSYSERR_INVALFLAG; }

1 0