wine-commits January 2008

wine-commits@winehq.org

3 participants
699 discussions

James Hawkins : msi: Add more MsiFormatRecord tests.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 1868abda89a3fab2f69238f38df2b47b9c02373c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1868abda89a3fab2f69238f38… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Jan 21 02:03:34 2008 -0600 msi: Add more MsiFormatRecord tests. --- dlls/msi/tests/format.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index acaa2db..2c9861e 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -1646,6 +1646,42 @@ static void test_formatrecord(void) ok( sz == 8, "size wrong(%i)\n",sz); ok( 0 == strcmp(buffer,"100 -100"), "wrong output (%s)\n",buffer); + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [twoprop]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 33, "Expected 33, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[noprop] [twoprop]} {abcdef}"), + "Expected \"one {[noprop] [twoprop]} {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 29, "Expected 29, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[noprop] [one]} {abcdef}"), + "Expected \"one {[noprop] [one]} {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(0, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 20, "Expected 20, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {[one]} {abcdef}"), + "Expected \"one {[one]} {abcdef}\", got \"%s\"\n", buffer); + } + MsiCloseHandle( hrec ); } @@ -2003,6 +2039,42 @@ static void test_formatrecord_package(void) ok( 0 == strcmp(buffer,""), "wrong output (%s)\n",buffer); } + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [twoprop]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 13, "Expected 13, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {abcdef}"), + "Expected \"one {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[noprop] [one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 13, "Expected 13, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one {abcdef}"), + "Expected \"one {abcdef}\", got \"%s\"\n", buffer); + } + + sz = sizeof(buffer); + MsiRecordSetString(hrec, 0, "[1] {[one]} {abcdef}"); + MsiRecordSetString(hrec, 1, "one"); + r = MsiFormatRecord(package, hrec, buffer, &sz); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(sz == 20, "Expected 20, got %d\n",sz); + todo_wine + { + ok(!lstrcmpA(buffer, "one mercury {abcdef}"), + "Expected \"one mercury {abcdef}\", got \"%s\"\n", buffer); + } + MsiCloseHandle(hrec); r = MsiCloseHandle(package);

1 0

Alexander Nicolaysen Sørnes : riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 9f41a53c2aa89655054888a69dfc72de993fc1f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f41a53c2aa89655054888a69… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jan 20 17:50:52 2008 +0100 riched20: Don't clear CFM_UNDERLINE flag when applying styles where it is set. --- dlls/riched20/style.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 06d76cf..8d67de3 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -218,7 +218,6 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) if (style->dwMask & CFM_UNDERLINE) { s->fmt.dwMask |= CFM_UNDERLINETYPE; - s->fmt.dwMask &= ~CFM_UNDERLINE; s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; }

1 0

Marcus Meissner : msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc().
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 943ac9795bfa2128d1b83294a646ef0a04e4a3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=943ac9795bfa2128d1b83294a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 21:11:19 2008 +0100 msi: Replaced msi_free() by LocalAlloc() since ConvertSidToStringSidW uses LocalAlloc(). Spotted by Christoph von Wittich <Christoph(a)ApiViewer.de>. --- dlls/msi/registry.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index bf06d9d..ac89186 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -662,7 +662,7 @@ UINT MSIREG_OpenUserDataFeaturesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -739,7 +739,7 @@ UINT MSIREG_OpenUserDataComponentKey(LPCWSTR szComponent, HKEY *key, BOOL create else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -764,7 +764,7 @@ UINT MSIREG_DeleteUserDataComponentKey(LPCWSTR szComponent) sprintfW(keypath, szUserDataComp_fmt, usersid, comp); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -794,7 +794,7 @@ UINT MSIREG_OpenUserDataProductKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -824,7 +824,7 @@ UINT MSIREG_OpenInstallPropertiesKey(LPCWSTR szProduct, HKEY *key, BOOL create) else rc = RegOpenKeyW(HKEY_LOCAL_MACHINE, keypath, key); - msi_free(usersid); + LocalFree(usersid); return rc; } @@ -849,7 +849,7 @@ UINT MSIREG_DeleteUserDataProductKey(LPCWSTR szProduct) sprintfW(keypath, szUserDataProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); return RegDeleteTreeW(HKEY_LOCAL_MACHINE, keypath); } @@ -1039,7 +1039,7 @@ UINT MSIREG_OpenLocalManagedProductKey(LPCWSTR szProductCode, HKEY *key, BOOL cr } sprintfW(keypath, szInstaller_LocalManagedProd_fmt, usersid, squished_pc); - msi_free(usersid); + LocalFree(usersid); if (create) return RegCreateKeyW(HKEY_LOCAL_MACHINE, keypath, key);

1 0

Marcus Meissner : gdi32: Fix possible NULL ptr in TRACE.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: a63664f1ecc54db63fb19eafdcfe390583490485 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63664f1ecc54db63fb19eafd… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Jan 20 20:59:16 2008 +0100 gdi32: Fix possible NULL ptr in TRACE. --- dlls/gdi32/font.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 2789df5..5cec471 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -848,8 +848,9 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, if (!dc) return 0; - TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), - plf->lfCharSet); + if (plf) + TRACE("lfFaceName = %s lfCharset = %d\n", debugstr_w(plf->lfFaceName), + plf->lfCharSet); fe32.lpLogFontParam = plf; fe32.lpEnumFunc = efproc; fe32.lpData = lParam;

1 0

Hans Leidekker : msvcr71: Add an implementation that forwards to msvcrt.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 67815c6b9e663a18f624b73271e35331a7b35833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67815c6b9e663a18f624b7327… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:01 2008 +0100 msvcr71: Add an implementation that forwards to msvcrt. --- .gitignore | 1 + Makefile.in | 2 + configure | 3 + configure.ac | 1 + dlls/Makefile.in | 5 + dlls/msvcr71/Makefile.in | 14 + dlls/msvcr71/msvcr71.c | 42 +++ dlls/msvcr71/msvcr71.spec | 837 +++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 905 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67815c6b9e663a18f624b…

1 0

Hans Leidekker : msvcrt: _ftol returns a 64-bit value.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: b284dfd7abad56228ae66173df4fb9ad1eca7263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284dfd7abad56228ae66173d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:44 2008 +0100 msvcrt: _ftol returns a 64-bit value. --- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index c09fda9..339cb1c 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -596,7 +596,7 @@ @ cdecl _fsopen(str str long) msvcrt._fsopen @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index d44a767..e46b157 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -653,7 +653,7 @@ @ cdecl _fstat(long ptr) msvcrt._fstat @ cdecl _fstati64(long ptr) msvcrt._fstati64 @ cdecl _ftime(ptr) msvcrt._ftime -@ cdecl _ftol() msvcrt._ftol +@ cdecl -ret64 _ftol() msvcrt._ftol @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime(long ptr) msvcrt._futime @ cdecl _gcvt( double long str) msvcrt._gcvt

1 0

Hans Leidekker : msvcrt: Fix _execv spec entries for the forwarding variants too.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 93661611e524bf354157a8cb6ec256a7ae405b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=93661611e524bf354157a8cb6… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Sun Jan 20 19:34:29 2008 +0100 msvcrt: Fix _execv spec entries for the forwarding variants too. --- dlls/msvcrt20/msvcrt20.spec | 8 ++++---- dlls/msvcrt40/msvcrt40.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 8282130..c09fda9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -566,10 +566,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index 4657ccf..d44a767 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -619,10 +619,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _fcloseall() msvcrt._fcloseall diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 9e94364..ec1a4b7 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -235,10 +235,10 @@ @ varargs _execle(str str) msvcrt._execle @ varargs _execlp(str str) msvcrt._execlp @ varargs _execlpe(str str) msvcrt._execlpe -@ cdecl _execv(str str) msvcrt._execv -@ cdecl _execve(str str str) msvcrt._execve -@ cdecl _execvp(str str) msvcrt._execvp -@ cdecl _execvpe(str str str) msvcrt._execvpe +@ cdecl _execv(str ptr) msvcrt._execv +@ cdecl _execve(str ptr ptr) msvcrt._execve +@ cdecl _execvp(str ptr) msvcrt._execvp +@ cdecl _execvpe(str ptr ptr) msvcrt._execvpe @ cdecl _exit(long) msvcrt._exit @ cdecl _expand(ptr long) msvcrt._expand @ cdecl _expand_dbg(ptr long) msvcrt._expand

1 0

Christoph von Wittich : msi: Fix process token leak.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 007833f1302dff64dcdf1c58332b2f086eef5dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007833f1302dff64dcdf1c583… Author: Christoph von Wittich <Christoph(a)ApiViewer.de> Date: Sun Jan 20 17:58:40 2008 +0100 msi: Fix process token leak. --- dlls/msi/registry.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 12d2c9a..bf06d9d 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -478,13 +478,17 @@ static UINT get_user_sid(LPWSTR *usersid) return ERROR_FUNCTION_FAILED; size = sizeof(buf); - if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) + if (!GetTokenInformation(token, TokenUser, (void *)buf, size, &size)) { + CloseHandle(token); return ERROR_FUNCTION_FAILED; + } user = (PTOKEN_USER)buf; - if (!ConvertSidToStringSidW(user->User.Sid, usersid)) + if (!ConvertSidToStringSidW(user->User.Sid, usersid)) { + CloseHandle(token); return ERROR_FUNCTION_FAILED; - + } + CloseHandle(token); return ERROR_SUCCESS; }

1 0

Dmitry Timoshkov : gdi32: Actually perform the fractional scaling test, make it pass under Wine.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 0acfe68864db9caa8d018c44f08040def7b09532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0acfe68864db9caa8d018c44f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Jan 20 21:21:45 2008 +0800 gdi32: Actually perform the fractional scaling test, make it pass under Wine. --- dlls/gdi32/freetype.c | 67 +++++++++++++++++++++++++--------------------- dlls/gdi32/tests/font.c | 27 +++++++++++++----- 2 files changed, 55 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3e21a45..4b54699 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -324,7 +324,7 @@ struct tagGdiFont { struct list hfontlist; FONT_DESC font_desc; LONG aveWidth, ppem; - float scale_x, scale_y; + float scale_y; SHORT yMax; SHORT yMin; OUTLINETEXTMETRICW *potm; @@ -2471,6 +2471,7 @@ static FT_Face OpenFontFace(GdiFont *font, Face *face, LONG width, LONG height) if((err = pFT_Set_Pixel_Sizes(ft_face, 0, font->ppem)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", 0, font->ppem, err); } else { + font->ppem = height; if((err = pFT_Set_Pixel_Sizes(ft_face, width, height)) != 0) WARN("FT_Set_Pixel_Sizes %d, %d rets %x\n", width, height, err); } @@ -3157,18 +3158,29 @@ found: TRACE("Chosen: %s %s (%s/%p:%ld)\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName), face->file, face->font_data_ptr, face->face_index); - ret->scale_x = 0.0; - ret->scale_y = 0.0; - ret->aveWidth = abs(lf.lfWidth); if(!face->scalable) { - ret->ppem = face->size.height; - if (height != 0) ret->ppem += diff; + /* Windows uses integer scaling factors for bitmap fonts */ + INT scale, scaled_height; + + if (height != 0) height = diff; + else height = 0; + height += face->size.height; + + scale = (height + face->size.height - 1) / face->size.height; + scaled_height = scale * face->size.height; + /* XP allows not more than 10% deviation */ + if (scale > 1 && scaled_height - height > scaled_height / 10) scale--; + ret->scale_y = scale; width = face->size.x_ppem >> 6; height = face->size.y_ppem >> 6; } + else + ret->scale_y = 1.0; + TRACE("font scale y: %f\n", ret->scale_y); + ret->ft_face = OpenFontFace(ret, face, width, height); if (!ret->ft_face) @@ -3312,6 +3324,7 @@ static void GetEnumStructs(Face *face, LPENUMLOGFONTEXW pelf, height = face->size.y_ppem >> 6; width = face->size.x_ppem >> 6; } + font->scale_y = 1.0; if (!(font->ft_face = OpenFontFace(font, face, width, height))) { @@ -3620,7 +3633,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0, adv, lsb, bbx; FT_Angle angle = 0; FT_Int load_flags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; - float widthRatio = 1.0, heightRatio = 1.0; + float widthRatio = 1.0; FT_Matrix transMat = identityMat; BOOL needsTransform = FALSE; @@ -3661,11 +3674,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, } /* Scaling factor */ - if (font->scale_x != 0.0) + if (font->aveWidth && font->potm) { - widthRatio = font->scale_x; - heightRatio = font->scale_y; + widthRatio = (float)font->aveWidth * font->font_desc.matrix.eM11; + widthRatio /= (float)font->potm->otmTextMetrics.tmAveCharWidth; } + else + widthRatio = font->scale_y; left = (INT)(ft_face->glyph->metrics.horiBearingX * widthRatio) & -64; right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) * widthRatio + 63) & -64; @@ -3680,7 +3695,7 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, scaleMat.xx = FT_FixedFromFloat(widthRatio); scaleMat.xy = 0; scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(heightRatio); + scaleMat.yy = FT_FixedFromFloat(font->scale_y); pFT_Matrix_Multiply(&scaleMat, &transMat); needsTransform = TRUE; @@ -4161,34 +4176,24 @@ static BOOL get_bitmap_text_metrics(GdiFont *font) static void scale_font_metrics(GdiFont *font, LPTEXTMETRICW ptm) { - if (font->scale_x == 0.0) - { - if (FT_IS_SCALABLE(font->ft_face) || !font->ppem) - font->scale_y = 1.0; - else - { - font->scale_y = (float)font->ppem * font->font_desc.matrix.eM22; - font->scale_y /= (float)font->potm->otmTextMetrics.tmHeight; - } - - if (font->aveWidth) - { - font->scale_x = (float)font->aveWidth * font->font_desc.matrix.eM11; - font->scale_x /= (float)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - font->scale_x = font->scale_y; + float scale_x; - TRACE("font scale x: %f y: %f\n", font->scale_x, font->scale_y); + if (font->aveWidth) + { + scale_x = (float)font->aveWidth * font->font_desc.matrix.eM11; + scale_x /= (float)font->potm->otmTextMetrics.tmAveCharWidth; } + else + scale_x = font->scale_y; + ptm->tmHeight = (float)ptm->tmHeight * font->scale_y; ptm->tmAscent = (float)ptm->tmAscent * font->scale_y; ptm->tmDescent = (float)ptm->tmDescent * font->scale_y; ptm->tmInternalLeading = (float)ptm->tmInternalLeading * font->scale_y; ptm->tmExternalLeading = (float)ptm->tmExternalLeading * font->scale_y; - ptm->tmAveCharWidth = (float)ptm->tmAveCharWidth * font->scale_x; - ptm->tmMaxCharWidth = (float)ptm->tmMaxCharWidth * font->scale_x; + ptm->tmAveCharWidth = (float)ptm->tmAveCharWidth * scale_x; + ptm->tmMaxCharWidth = (float)ptm->tmMaxCharWidth * scale_x; } /************************************************************* diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ee577c6..08725de 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -156,7 +156,7 @@ static INT CALLBACK font_enum_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DW return 1; /* continue enumeration */ } -static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, +static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const char *test_str, INT test_str_len, const TEXTMETRICA *tm_orig, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) @@ -165,7 +165,7 @@ static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, LOGFONTA lf; TEXTMETRICA tm; SIZE size; - INT width_of_A; + INT width_of_A, cx, cy; if (!hfont) return; @@ -176,13 +176,17 @@ static void test_font_metrics(HDC hdc, HFONT hfont, const char *test_str, GetTextMetricsA(hdc, &tm); + cx = tm.tmAveCharWidth / tm_orig->tmAveCharWidth; + cy = tm.tmHeight / tm_orig->tmHeight; + ok(cx == scale_x && cy == scale_y, "expected scale_x %d, scale_y %d, got cx %d, cy %d\n", + scale_x, scale_y, cx, cy); ok(tm.tmHeight == tm_orig->tmHeight * scale_y, "%d != %d\n", tm.tmHeight, tm_orig->tmHeight * scale_y); ok(tm.tmAscent == tm_orig->tmAscent * scale_y, "%d != %d\n", tm.tmAscent, tm_orig->tmAscent * scale_y); ok(tm.tmDescent == tm_orig->tmDescent * scale_y, "%d != %d\n", tm.tmDescent, tm_orig->tmDescent * scale_y); ok(tm.tmAveCharWidth == tm_orig->tmAveCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmAveCharWidth * scale_x); ok(tm.tmMaxCharWidth == tm_orig->tmMaxCharWidth * scale_x, "%d != %d\n", tm.tmAveCharWidth, tm_orig->tmMaxCharWidth * scale_x); - ok(lf.lfHeight == tm.tmHeight, "lf %d != tm %d\n", lf.lfHeight, tm.tmHeight); + ok(lf.lfHeight == lfHeight, "lf %d != %d\n", lf.lfHeight, lfHeight); if (lf.lfWidth) ok(lf.lfWidth == tm.tmAveCharWidth, "lf %d != tm %d\n", lf.lfWidth, tm.tmAveCharWidth); @@ -207,7 +211,7 @@ static void test_bitmap_font(void) HFONT hfont, old_hfont; TEXTMETRICA tm_orig; SIZE size_orig; - INT ret, i, width_orig, height_orig; + INT ret, i, width_orig, height_orig, scale; hdc = GetDC(0); @@ -233,10 +237,17 @@ static void test_bitmap_font(void) DeleteObject(hfont); /* test fractional scaling */ - for (i = 1; i < height_orig; i++) + for (i = 1; i <= height_orig * 3; i++) { + INT nearest_height; + + bitmap_lf.lfHeight = i; hfont = create_font("fractional", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + scale = (i + height_orig - 1) / height_orig; + nearest_height = scale * height_orig; + /* XP allows not more than 10% deviation */ + if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); DeleteObject(hfont); } @@ -244,14 +255,14 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); - test_font_metrics(hdc, hfont, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); DeleteObject(hfont); ReleaseDC(0, hdc);

1 0

Rob Shearman : widl: Write out code for initialising out-only client context handles.
by Alexandre Julliard 21 Jan '08

21 Jan '08

Module: wine Branch: master Commit: 5af6012fbadf5948dfef4502e91fc3e91c476089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5af6012fbadf5948dfef4502e… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sun Jan 20 10:56:15 2008 +0000 widl: Write out code for initialising out-only client context handles. --- tools/widl/typegen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4fdc84f..0e8a096 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2724,6 +2724,8 @@ static void write_remoting_arg(FILE *file, int indent, const func_t *func, { if (pass == PASS_OUT) { + if (!in_attr) + print_file(file, indent, "*%s = 0;\n", var->name); print_file(file, indent, "NdrClientContextUnmarshall(\n"); print_file(file, indent + 1, "&_StubMsg,\n"); print_file(file, indent + 1, "(NDR_CCONTEXT *)%s,\n", var->name);

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
70
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2008