November 2015 - Wine-commits

Hugh McMaster : wineconsole: Pass font size information to wineserver.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 313e064a44e4ce425ae5c5ea00dccd13ea890e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=313e064a44e4ce425ae5c5ea0… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:19 2015 +1100 wineconsole: Pass font size information to wineserver. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index eb07f6b..7a89eeb 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -425,6 +425,15 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.cell_height != cfg->cell_height || data->curcfg.font_weight != cfg->font_weight) { data->fnSetFont(data, cfg->face_name, cfg->cell_height, cfg->font_weight); + SERVER_START_REQ(set_console_output_info) + { + req->handle = wine_server_obj_handle( data->hConOut ); + req->mask = SET_CONSOLE_OUTPUT_INFO_FONT; + req->font_width = cfg->cell_width; + req->font_height = cfg->cell_height; + wine_server_call( req ); + } + SERVER_END_REQ; } if (data->curcfg.def_attr != cfg->def_attr) {

1 0

Hugh McMaster : kernel32: Implement GetNumberOfConsoleFonts.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: f0ee54a776839512e827ca06ef221e9a12bb8f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ee54a776839512e827ca06e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:20 2015 +1100 kernel32: Implement GetNumberOfConsoleFonts. We only ever have one entry in the console font table. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 5 +++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index c32dc49..67627cc 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3234,6 +3234,11 @@ BOOL WINAPI SetConsoleIcon(HICON icon) return FALSE; } +DWORD WINAPI GetNumberOfConsoleFonts(void) +{ + return 1; +} + BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo) { BOOL ret; diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index d7eab83..9b2a131 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -753,7 +753,7 @@ @ stdcall GetNumberFormatA(long long str ptr ptr long) # @ stub GetNumberFormatEx @ stdcall GetNumberFormatW(long long wstr ptr ptr long) -@ stub GetNumberOfConsoleFonts +@ stdcall GetNumberOfConsoleFonts() @ stdcall GetNumberOfConsoleInputEvents(long ptr) @ stdcall GetNumberOfConsoleMouseButtons(ptr) @ stdcall GetOEMCP()

1 0

Hugh McMaster : kernel32: Implement GetConsoleFontSize.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 4925f75869f577849d5f35d5b654c7680f8932cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4925f75869f577849d5f35d5b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:21 2015 +1100 kernel32: Implement GetConsoleFontSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 67627cc..d4c4a05 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3265,32 +3265,47 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON return ret; } +static COORD get_console_font_size(HANDLE hConsole, DWORD index) +{ + COORD c = {0,0}; + + if (index >= GetNumberOfConsoleFonts()) + { + SetLastError(ERROR_INVALID_PARAMETER); + return c; + } + + SERVER_START_REQ(get_console_output_info) + { + req->handle = console_handle_unmap(hConsole); + if (!wine_server_call_err(req)) + { + c.X = reply->font_width; + c.Y = reply->font_height; + } + } + SERVER_END_REQ; + return c; +} + #ifdef __i386__ #undef GetConsoleFontSize -DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { union { COORD c; DWORD w; } x; - FIXME(": (%p, %d) stub!\n", hConsole, font); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - - x.c.X = 0; - x.c.Y = 0; + x.c = get_console_font_size(hConsole, index); return x.w; } #endif /* defined(__i386__) */ #ifndef __i386__ -COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD index) { - COORD c; - c.X = 80; - c.Y = 24; - FIXME(": (%p, %d) stub!\n", hConsole, font); - return c; + return get_console_font_size(hConsole, index); } -#endif /* defined(__i386__) */ +#endif /* !defined(__i386__) */

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleFontSize.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 77a75d74a27bffc2e9f90838a260721002fb76cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=77a75d74a27bffc2e9f90838a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Oct 29 23:17:22 2015 +1100 kernel32/tests: Add tests for GetConsoleFontSize. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 454f963..240d9d8 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2627,6 +2627,60 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) "got %d, expected %d\n", cfi.dwFontSize.Y, height); } +static void test_GetConsoleFontSize(HANDLE std_output) +{ + COORD c; + DWORD index = 0; + CONSOLE_FONT_INFO cfi; + RECT r; + CONSOLE_SCREEN_BUFFER_INFO csbi; + LONG font_width, font_height; + HMODULE hmod; + DWORD (WINAPI *pGetNumberOfConsoleFonts)(void); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(NULL, index); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(GetStdHandle(STD_INPUT_HANDLE), index); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + + GetCurrentConsoleFont(std_output, FALSE, &cfi); + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(std_output, cfi.nFont); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + GetClientRect(GetConsoleWindow(), &r); + GetConsoleScreenBufferInfo(std_output, &csbi); + font_width = (r.right - r.left + 1) / csbi.srWindow.Right; + font_height = (r.bottom - r.top + 1) / csbi.srWindow.Bottom; + ok(c.X == font_width, "got %d, expected %d\n", c.X, font_width); + ok(c.Y == font_height, "got %d, expected %d\n", c.Y, font_height); + + hmod = GetModuleHandleA("kernel32.dll"); + pGetNumberOfConsoleFonts = (void *)GetProcAddress(hmod, "GetNumberOfConsoleFonts"); + if (!pGetNumberOfConsoleFonts) + { + win_skip("GetNumberOfConsoleFonts is not available\n"); + return; + } + index = pGetNumberOfConsoleFonts(); + + memset(&c, 10, sizeof(COORD)); + SetLastError(0xdeadbeef); + c = GetConsoleFontSize(std_output, index); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); +} + START_TEST(console) { static const char font_name[] = "Lucida Console"; @@ -2760,4 +2814,5 @@ START_TEST(console) test_ReadConsoleOutputCharacterW(hConOut); test_ReadConsoleOutputAttribute(hConOut); test_GetCurrentConsoleFont(hConOut); + test_GetConsoleFontSize(hConOut); }

1 0

Austin English : kernel32: Add AllocateUserPhysicalPages stub.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 4bfe66e7029777d8fca209bc7637f613eb671b66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bfe66e7029777d8fca209bc7… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Oct 27 00:00:40 2015 -0500 kernel32: Add AllocateUserPhysicalPages stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/heap.c | 7 +++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 0286d82..0c05de6 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1483,3 +1483,10 @@ BOOL WINAPI SetSystemFileCacheSize(SIZE_T mincache, SIZE_T maxcache, DWORD flags SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI AllocateUserPhysicalPages(HANDLE process, ULONG_PTR *pages, ULONG_PTR *userarray) +{ + FIXME("stub: %p %p %p\n",process, pages, userarray); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 9b2a131..89292c9 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -154,7 +154,7 @@ @ stdcall AllocConsole() @ stub -i386 AllocLSCallback @ stdcall -i386 -private AllocSLCallback(ptr ptr) krnl386.exe16.AllocSLCallback -@ stub AllocateUserPhysicalPages +@ stdcall AllocateUserPhysicalPages(ptr ptr ptr) @ stdcall ApplicationRecoveryFinished(long) @ stdcall ApplicationRecoveryInProgress(ptr) @ stdcall AreFileApisANSI()

1 0

Nikolay Sivov : dwrite: Store transform analysis was created with.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 6cc62d09bb986a68556e279953b129bc60798b31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cc62d09bb986a68556e27995… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 16:38:41 2015 +0300 dwrite: Store transform analysis was created with. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 97ea039..ecd22de 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -152,9 +152,10 @@ struct dwrite_fonttable { BOOL exists; }; -enum runanalysis_readystate { - RUNANALYSIS_BOUNDS = 1 << 0, - RUNANALYSIS_BITMAP = 1 << 1, +enum runanalysis_flags { + RUNANALYSIS_BOUNDS_READY = 1 << 0, + RUNANALYSIS_BITMAP_READY = 1 << 1, + RUNANALYSIS_USE_TRANSFORM = 1 << 2 }; struct dwrite_glyphrunanalysis { @@ -163,6 +164,7 @@ struct dwrite_glyphrunanalysis { DWRITE_RENDERING_MODE rendering_mode; DWRITE_GLYPH_RUN run; + DWRITE_MATRIX m; FLOAT ppdip; FLOAT originX; FLOAT originY; @@ -170,7 +172,7 @@ struct dwrite_glyphrunanalysis { FLOAT *advances; DWRITE_GLYPH_OFFSET *offsets; - UINT8 ready; + UINT8 flags; RECT bounds; BYTE *bitmap; }; @@ -4058,7 +4060,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a HRESULT hr; UINT32 i; - if (analysis->ready & RUNANALYSIS_BOUNDS) { + if (analysis->flags & RUNANALYSIS_BOUNDS_READY) { *bounds = analysis->bounds; return; } @@ -4107,7 +4109,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a /* translate to given run origin */ OffsetRect(&analysis->bounds, analysis->originX, analysis->originY); - analysis->ready |= RUNANALYSIS_BOUNDS; + analysis->flags |= RUNANALYSIS_BOUNDS_READY; *bounds = analysis->bounds; } @@ -4255,7 +4257,7 @@ static void glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis, DW IDWriteFontFace2_Release(fontface2); - analysis->ready |= RUNANALYSIS_BITMAP; + analysis->flags |= RUNANALYSIS_BITMAP_READY; /* we don't need this anymore */ heap_free(analysis->glyphs); @@ -4320,7 +4322,7 @@ static HRESULT WINAPI glyphrunanalysis_CreateAlphaTexture(IDWriteGlyphRunAnalysi BYTE *src, *dst; int y; - if (!(This->ready & RUNANALYSIS_BITMAP)) + if (!(This->flags & RUNANALYSIS_BITMAP_READY)) glyphrunanalysis_render(This, type); src = get_pixel_ptr(This->bitmap, type, &runbounds, &This->bounds); @@ -4401,7 +4403,7 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA analysis->IDWriteGlyphRunAnalysis_iface.lpVtbl = &glyphrunanalysisvtbl; analysis->ref = 1; analysis->rendering_mode = rendering_mode; - analysis->ready = 0; + analysis->flags = 0; analysis->bitmap = NULL; analysis->ppdip = ppdip; analysis->originX = originX * ppdip; @@ -4425,6 +4427,14 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA return E_OUTOFMEMORY; } + /* check if transform is usable */ + if (transform && memcmp(transform, &identity, sizeof(*transform))) { + analysis->m = *transform; + analysis->flags |= RUNANALYSIS_USE_TRANSFORM; + } + else + memset(&analysis->m, 0, sizeof(analysis->m)); + analysis->run.glyphIndices = analysis->glyphs; analysis->run.glyphAdvances = analysis->advances; analysis->run.glyphOffsets = analysis->offsets;

1 0

Nikolay Sivov : dwrite: Store origin, advances and offsets as vectors for run analysis.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 5da26de7c3394e0df0d8459c73d944987de1be7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da26de7c3394e0df0d8459c7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 16:38:42 2015 +0300 dwrite: Store origin, advances and offsets as vectors for run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 169 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 114 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5da26de7c3394e0df0d84…

1 0

Nikolay Sivov : dwrite: Added support for transform in glyph run analysis.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 170e31a8b22a5d0348f0b3dc02e0e6d01eaee62b URL: http://source.winehq.org/git/wine.git/?a=commit;h=170e31a8b22a5d0348f0b3dc0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 2 16:38:43 2015 +0300 dwrite: Added support for transform in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 28 +++++++++++++++ dlls/dwrite/freetype.c | 83 ++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/font.c | 27 ++++++++++++++ 4 files changed, 133 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=170e31a8b22a5d0348f0b…

1 0

Jacek Caban : ole32: Make CoInitializeEx hot patchable.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: e4bc220802d35edc94d292077af9585a4929d342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4bc220802d35edc94d292077… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 2 15:02:33 2015 +0100 ole32: Make CoInitializeEx hot patchable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b3c49d3..ffa5dae 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1873,7 +1873,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) * SEE ALSO * CoUninitialize */ -HRESULT WINAPI CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) +HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { struct oletls *info = COM_CurrentInfo(); HRESULT hr = S_OK;

1 0

Maarten Lankhorst : winepulse: Add initial stub for pulseaudio support.
by Alexandre Julliard 02 Nov '15

02 Nov '15

Module: wine Branch: master Commit: 3fe0c08992db43155677f02ec0cca423b9278f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe0c08992db43155677f02ec… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Oct 29 12:04:11 2015 -0500 winepulse: Add initial stub for pulseaudio support. Includes API compatibility patch by Juergen Tretthahn <orson(a)orson.at>. Synchronous static data initialization by Andrew Eikum <aeikum(a)codeweavers.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 112 +++++++++++++- configure.ac | 19 ++- dlls/mmdevapi/main.c | 2 +- dlls/winepulse.drv/Makefile.in | 7 + dlls/winepulse.drv/mmdevdrv.c | 282 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/winepulse.drv.spec | 5 + include/config.h.in | 3 + 7 files changed, 425 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3fe0c08992db43155677f…

1 0