November 2015 - Wine-Commits

Austin English : kernel32: Add AllocateUserPhysicalPages stub.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Hugh McMaster : kernel32: Implement GetNumberOfConsoleFonts.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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 : wineconsole: Pass font size information to wineserver.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Dmitry Timoshkov : ole32/tests: Add the tests to show that IEnumSTATSTG:: Next should zero out returned stats when it reaches end of enumeration.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 263b06ef8ddcfe64061928459083da41c9111f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=263b06ef8ddcfe64061928459… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 11:34:51 2015 +0800 ole32/tests: Add the tests to show that IEnumSTATSTG::Next should zero out returned stats when it reaches end of enumeration. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/storage32.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index edd0b3f..afe9332 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1224,6 +1224,7 @@ static void test_streamenum(void) static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; static const WCHAR stmname2[] = { 'A','B','C','D','E','F','G','H','I',0 }; static const WCHAR stmname3[] = { 'A','B','C','D','E','F','G','H','I','J',0 }; + static const STATSTG stat_null; STATSTG stat; IEnumSTATSTG *ee = NULL; ULONG count; @@ -1269,10 +1270,12 @@ static void test_streamenum(void) r = IStorage_DestroyElement(stg, stmname); ok(r==S_OK, "IStorage->DestroyElement failed\n"); + memset(&stat, 0xad, sizeof(stat)); count = 0xf00; r = IEnumSTATSTG_Next(ee, 1, &stat, &count); ok(r==S_FALSE, "IEnumSTATSTG->Next failed\n"); ok(count == 0, "count wrong\n"); + ok(memcmp(&stat, &stat_null, sizeof(stat)) == 0, "stat is not zeroed\n"); /* reset and try again */ r = IEnumSTATSTG_Reset(ee); @@ -2418,6 +2421,7 @@ static void test_fmtusertypestg(void) static const WCHAR fileW[] = {'f','m','t','t','e','s','t',0}; static WCHAR userTypeW[] = {'S','t','g','U','s','r','T','y','p','e',0}; static const WCHAR strmNameW[] = {1,'C','o','m','p','O','b','j',0}; + static const STATSTG statstg_null; hr = StgCreateDocfile( fileW, STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, &stg); ok(hr == S_OK, "should succeed, res=%x\n", hr); @@ -2436,6 +2440,7 @@ static void test_fmtusertypestg(void) BOOL found = FALSE; STATSTG statstg; DWORD got; + memset(&statstg, 0xad, sizeof(statstg)); while ((hr = IEnumSTATSTG_Next(stat, 1, &statstg, &got)) == S_OK && got == 1) { if (strcmp_ww(statstg.pwcsName, strmNameW) == 0) @@ -2444,6 +2449,7 @@ static void test_fmtusertypestg(void) ok(0, "found unexpected stream or storage\n"); CoTaskMemFree(statstg.pwcsName); } + ok(memcmp(&statstg, &statstg_null, sizeof(statstg)) == 0, "statstg is not zeroed\n"); ok(found == TRUE, "expected storage to contain stream \\0001CompObj\n"); IEnumSTATSTG_Release(stat); } @@ -2460,6 +2466,7 @@ static void test_fmtusertypestg(void) BOOL found = FALSE; STATSTG statstg; DWORD got; + memset(&statstg, 0xad, sizeof(statstg)); while ((hr = IEnumSTATSTG_Next(stat, 1, &statstg, &got)) == S_OK && got == 1) { if (strcmp_ww(statstg.pwcsName, strmNameW) == 0) @@ -2468,6 +2475,7 @@ static void test_fmtusertypestg(void) ok(0, "found unexpected stream or storage\n"); CoTaskMemFree(statstg.pwcsName); } + ok(memcmp(&statstg, &statstg_null, sizeof(statstg)) == 0, "statstg is not zeroed\n"); ok(found == TRUE, "expected storage to contain stream \\0001CompObj\n"); IEnumSTATSTG_Release(stat); }

1 0

Dmitry Timoshkov : ole32: Handle failure of reading directory entry in IEnumSTATSTG::Next.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 7bc1005f56da97df89dfbf3262175a7a92eeb446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bc1005f56da97df89dfbf326… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 2 11:34:31 2015 +0800 ole32: Handle failure of reading directory entry in IEnumSTATSTG::Next. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/storage32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index bfef4a2..4d775b4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1036,9 +1036,10 @@ static HRESULT WINAPI IEnumSTATSTGImpl_Next( /* * Read the entry from the storage. */ - StorageBaseImpl_ReadDirEntry(This->parentStorage, + hr = StorageBaseImpl_ReadDirEntry(This->parentStorage, currentSearchNode, &currentEntry); + if (FAILED(hr)) break; /* * Copy the information to the return buffer.

1 0

Martin Storsjo : ucrtbase: Simplify the snprintf/swprintf tests.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 4b47da3ad7f94b01af53e0b0fa49c86a22967336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b47da3ad7f94b01af53e0b0f… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Nov 2 12:08:36 2015 +0200 ucrtbase: Simplify the snprintf/swprintf tests. Avoid repeating the test strings, calculate the expected return value with code. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/printf.c | 60 +++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 4393300..96f22c1 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -82,27 +82,15 @@ static int __cdecl vsprintf_wrapper(unsigned __int64 options, char *str, static void test_snprintf (void) { - struct snprintf_test { - const char *format; - int expected; - }; - /* Legacy behaviour, not C99 compliant. */ - const struct snprintf_test tests_legacy[] = {{"short", 5}, - {"justfit", 7}, - {"justfits", 8}, - {"muchlonger", -1}}; - /* New C99 compliant behaviour. */ - const struct snprintf_test tests_standard[] = {{"short", 5}, - {"justfit", 7}, - {"justfits", 8}, - {"muchlonger", 10}}; + const char *tests[] = {"short", "justfit", "justfits", "muchlonger"}; char buffer[8]; const int bufsiz = sizeof buffer; unsigned int i; - for (i = 0; i < sizeof tests_legacy / sizeof tests_legacy[0]; i++) { - const char *fmt = tests_legacy[i].format; - const int expect = tests_legacy[i].expected; + /* Legacy _snprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) > bufsiz ? -1 : strlen(fmt); const int n = vsprintf_wrapper (1, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); @@ -112,9 +100,10 @@ static void test_snprintf (void) "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); } - for (i = 0; i < sizeof tests_standard / sizeof tests_standard[0]; i++) { - const char *fmt = tests_standard[i].format; - const int expect = tests_standard[i].expected; + /* C99 snprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt); const int n = vsprintf_wrapper (2, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n; @@ -137,34 +126,24 @@ static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str, __ms_va_end(valist); return ret; } + static void test_swprintf (void) { - struct swprintf_test { - const wchar_t *format; - int expected; - }; const wchar_t str_short[] = {'s','h','o','r','t',0}; const wchar_t str_justfit[] = {'j','u','s','t','f','i','t',0}; const wchar_t str_justfits[] = {'j','u','s','t','f','i','t','s',0}; const wchar_t str_muchlonger[] = {'m','u','c','h','l','o','n','g','e','r',0}; - /* Legacy behaviour, not C99 compliant. */ - const struct swprintf_test tests_legacy[] = {{str_short, 5}, - {str_justfit, 7}, - {str_justfits, 8}, - {str_muchlonger, -1}}; - /* New C99 compliant behaviour. */ - const struct swprintf_test tests_standard[] = {{str_short, 5}, - {str_justfit, 7}, - {str_justfits, 8}, - {str_muchlonger, 10}}; + const wchar_t *tests[] = {str_short, str_justfit, str_justfits, str_muchlonger}; + wchar_t buffer[8]; char narrow[8], narrow_fmt[16]; const int bufsiz = sizeof buffer / sizeof buffer[0]; unsigned int i; - for (i = 0; i < sizeof tests_legacy / sizeof tests_legacy[0]; i++) { - const wchar_t *fmt = tests_legacy[i].format; - const int expect = tests_legacy[i].expected; + /* Legacy _snprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const wchar_t *fmt = tests[i]; + const int expect = wcslen(fmt) > bufsiz ? -1 : wcslen(fmt); const int n = vswprintf_wrapper (1, buffer, bufsiz, fmt); const int valid = n < 0 ? bufsiz : (n == bufsiz ? n : n+1); @@ -176,9 +155,10 @@ static void test_swprintf (void) "\"%s\": rendered \"%.*s\"\n", narrow_fmt, valid, narrow); } - for (i = 0; i < sizeof tests_standard / sizeof tests_standard[0]; i++) { - const wchar_t *fmt = tests_standard[i].format; - const int expect = tests_standard[i].expected; + /* C99 snprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const wchar_t *fmt = tests[i]; + const int expect = wcslen(fmt); const int n = vswprintf_wrapper (2, buffer, bufsiz, fmt); const int valid = n >= bufsiz ? bufsiz - 1 : n < 0 ? 0 : n;

1 0

Stefan Dösinger : comctl32: Re-enable the parent before destroying the dialog.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

Module: wine Branch: master Commit: 4e2d25c7cd22ae4c7ea1be9126c1f7183ebcd722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e2d25c7cd22ae4c7ea1be912… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 30 19:33:11 2015 +0100 comctl32: Re-enable the parent before destroying the dialog. Prevent 1602 AD from minimizing when the multiplayer dialog is closed. When DestroyWindow is called, user32 tries to find a window to activate, finds the main game window disabled and decides to go to the desktop. Wined3d will help this process by minimizing the game out of the way. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/propsheet.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index ce7001c..ed5f7d4 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -2706,6 +2706,7 @@ static INT do_loop(const PropSheetInfo *psInfo) MSG msg; INT ret = -1; HWND hwnd = psInfo->hwnd; + HWND parent = psInfo->ppshheader.hwndParent; while(IsWindow(hwnd) && !psInfo->ended && (ret = GetMessageW(&msg, NULL, 0, 0))) { @@ -2728,6 +2729,9 @@ static INT do_loop(const PropSheetInfo *psInfo) if(ret != -1) ret = psInfo->result; + if(parent) + EnableWindow(parent, TRUE); + DestroyWindow(hwnd); return ret; } @@ -2754,10 +2758,7 @@ static INT_PTR PROPSHEET_PropertySheet(PropSheetInfo* psInfo, BOOL unicode) } bRet = PROPSHEET_CreateDialog(psInfo); if(!psInfo->isModeless) - { bRet = do_loop(psInfo); - if (parent) EnableWindow(parent, TRUE); - } return bRet; }

1 0

Jacek Caban : ole32: Make CoInitializeEx hot patchable.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Nikolay Sivov : dwrite: Added support for transform in glyph run analysis.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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

Nikolay Sivov : dwrite: Store transform analysis was created with.
by Alexandre Julliard Nov. 2, 2015

Nov. 2, 2015

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