wine-commits April 2013

wine-commits@winehq.org

2 participants
579 discussions

André Hentschel : ntdll: Hint that call_entry_point is ARM assembler.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: b6fdba7873b462a6d433b71a12f2aa237419b95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6fdba7873b462a6d433b71a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Apr 4 22:11:03 2013 +0200 ntdll: Hint that call_entry_point is ARM assembler. --- dlls/ntdll/relay.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index 81e1593..c8a066a2 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -357,6 +357,7 @@ __ASM_GLOBAL_FUNC( call_entry_point, "ret" ) #elif defined(__arm__) __ASM_GLOBAL_FUNC( call_entry_point, + ".arm\n\t" "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" "mov r5, SP\n\t"

1 0

Ken Thomases : winemac: Clip surface drawn region to new visible rect on window resize.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: c2bbdc4b868ad4f23e85871990f3edc6226d31ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2bbdc4b868ad4f23e8587199… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:13 2013 -0500 winemac: Clip surface drawn region to new visible rect on window resize. This prevents stale drawing from being revealed if the window later grows. --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/surface.c | 32 ++++++++++++++++++++++++++++++++ dlls/winemac.drv/window.c | 1 + 3 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 881ce87..97ff08b 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -141,6 +141,7 @@ extern struct window_surface *create_surface(macdrv_window window, const RECT *r struct window_surface *old_surface, BOOL use_alpha) DECLSPEC_HIDDEN; extern void set_window_surface(macdrv_window window, struct window_surface *window_surface) DECLSPEC_HIDDEN; extern void set_surface_use_alpha(struct window_surface *window_surface, BOOL use_alpha) DECLSPEC_HIDDEN; +extern void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) DECLSPEC_HIDDEN; extern void macdrv_handle_event(const macdrv_event *event) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index a27ff24..a79ec47 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -410,3 +410,35 @@ CGImageRef create_surface_image(void *window_surface, CGRect *rect, int copy_dat return cgimage; } + +/*********************************************************************** + * surface_clip_to_visible_rect + * + * Intersect the accumulated drawn region with a new visible rect, + * effectively discarding stale drawing in the surface slack area. + */ +void surface_clip_to_visible_rect(struct window_surface *window_surface, const RECT *visible_rect) +{ + struct macdrv_window_surface *surface = get_mac_surface(window_surface); + + window_surface->funcs->lock(window_surface); + + if (surface->drawn) + { + RECT rect; + HRGN region; + + rect = *visible_rect; + OffsetRect(&rect, -rect.left, -rect.top); + + if ((region = CreateRectRgnIndirect(&rect))) + { + CombineRgn(surface->drawn, surface->drawn, region, RGN_AND); + DeleteObject(region); + + update_blit_data(surface); + } + } + + window_surface->funcs->unlock(window_surface); +} diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 0ff54d4..987aa34 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -1284,6 +1284,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags if (!memcmp(&data->surface->rect, &surface_rect, sizeof(surface_rect))) { /* existing surface is good enough */ + surface_clip_to_visible_rect(data->surface, visible_rect); window_surface_add_ref(data->surface); *surface = data->surface; goto done;

1 0

Ken Thomases : winemac: Initialize window surface to Mac-standard window background color instead of black .
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: f37153ac7d43d1ebb157c193b7ca2c61084b8923 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f37153ac7d43d1ebb157c193b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:08 2013 -0500 winemac: Initialize window surface to Mac-standard window background color instead of black. --- dlls/winemac.drv/cocoa_window.m | 42 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/surface.c | 5 +++- 3 files changed, 47 insertions(+), 1 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 9911195..6a85d74 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1796,3 +1796,45 @@ void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) [pool release]; } + +/*********************************************************************** + * macdrv_window_background_color + * + * Returns the standard Mac window background color as a 32-bit value of + * the form 0x00rrggbb. + */ +uint32_t macdrv_window_background_color(void) +{ + static uint32_t result; + static dispatch_once_t once; + + // Annoyingly, [NSColor windowBackgroundColor] refuses to convert to other + // color spaces (RGB or grayscale). So, the only way to get RGB values out + // of it is to draw with it. + dispatch_once(&once, ^{ + OnMainThread(^{ + unsigned char rgbx[4]; + unsigned char *planes = rgbx; + NSBitmapImageRep *bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:&planes + pixelsWide:1 + pixelsHigh:1 + bitsPerSample:8 + samplesPerPixel:3 + hasAlpha:NO + isPlanar:NO + colorSpaceName:NSCalibratedRGBColorSpace + bitmapFormat:0 + bytesPerRow:4 + bitsPerPixel:32]; + [NSGraphicsContext saveGraphicsState]; + [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithBitmapImageRep:bitmap]]; + [[NSColor windowBackgroundColor] set]; + NSRectFill(NSMakeRect(0, 0, 1, 1)); + [NSGraphicsContext restoreGraphicsState]; + [bitmap release]; + result = rgbx[0] << 16 | rgbx[1] << 8 | rgbx[2]; + }); + }); + + return result; +} diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 46d13a9..c4819c3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -347,6 +347,7 @@ extern void macdrv_dispose_view(macdrv_view v) DECLSPEC_HIDDEN; extern void macdrv_set_view_window_and_frame(macdrv_view v, macdrv_window w, CGRect rect) DECLSPEC_HIDDEN; extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c) DECLSPEC_HIDDEN; +extern uint32_t macdrv_window_background_color(void) DECLSPEC_HIDDEN; /* keyboard */ diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 564d004..a27ff24 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -236,6 +236,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, DWORD *colors; pthread_mutexattr_t attr; int err; + DWORD window_background; surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, FIELD_OFFSET(struct macdrv_window_surface, info.bmiColors[3])); @@ -286,8 +287,10 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, } update_blit_data(surface); surface->use_alpha = use_alpha; - surface->bits = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, surface->info.bmiHeader.biSizeImage); + surface->bits = HeapAlloc(GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage); if (!surface->bits) goto failed; + window_background = macdrv_window_background_color(); + memset_pattern4(surface->bits, &window_background, surface->info.bmiHeader.biSizeImage); TRACE("created %p for %p %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), surface->bits, surface->bits + surface->info.bmiHeader.biSizeImage);

1 0

Ken Thomases : winemac: Tell Cocoa to preserve our window content during live resizing.
by Alexandre Julliard 05 Apr '13

05 Apr '13

Module: wine Branch: master Commit: 26a74c664d6d4d16224f1ecc7461fd02e09645d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26a74c664d6d4d16224f1ecc7… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 4 14:26:01 2013 -0500 winemac: Tell Cocoa to preserve our window content during live resizing. --- dlls/winemac.drv/cocoa_window.m | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 43be348..9911195 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -277,6 +277,18 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers) return YES; } + - (BOOL) preservesContentDuringLiveResize + { + // Returning YES from this tells Cocoa to keep our view's content during + // a Cocoa-driven resize. In theory, we're also supposed to override + // -setFrameSize: to mark exposed sections as needing redisplay, but + // user32 will take care of that in a roundabout way. This way, we don't + // redraw until the window surface is flushed. + // + // This doesn't do anything when we resize the window ourselves. + return YES; + } + @end

1 0

Akihiro Sagawa : gdi32/tests: Fix tests for fixed-pitch full-width character advance. It' s double of tmAveCharWidth.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: f50e6495785f367d0203201c709ded732c1ca1d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50e6495785f367d0203201c7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:18 2013 +0900 gdi32/tests: Fix tests for fixed-pitch full-width character advance. It's double of tmAveCharWidth. For instance, 19 ppem "VL Gothic" on Windows, the advance value is 10 for half-width characters, but 18 for full-width characters. In this case, tmAveCharWidth is 9. Thus using tmAveCharWidth is reasonable. --- dlls/gdi32/tests/font.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index aa94dea..e5e7ff9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3757,6 +3757,7 @@ static void test_GetGlyphOutline(void) for (i = 0; i < sizeof c / sizeof c[0]; ++i) { static const MAT2 rotate_mat = {{0, 0}, {0, -1}, {0, 1}, {0, 0}}; + TEXTMETRIC tm; lf.lfFaceName[0] = '\0'; lf.lfCharSet = c[i].cs; @@ -3803,15 +3804,15 @@ static void test_GetGlyphOutline(void) ret = GetObject(hfont, sizeof lf, &lf); ok(ret > 0, "GetObject error %u\n", GetLastError()); - ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); - trace("Tests with height=%d,half=%d,full=%d,face=%s,charset=%d\n", - -lf.lfHeight, gm.gmCellIncX, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); - ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + trace("Tests with height=%d,avg=%d,full=%d,face=%s,charset=%d\n", + -lf.lfHeight, tm.tmAveCharWidth, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + ok(gm2.gmCellIncX == tm.tmAveCharWidth * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), "expected %d, got %d (%s:%d)\n", - gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + tm.tmAveCharWidth * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &rotate_mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); @@ -3823,13 +3824,13 @@ static void test_GetGlyphOutline(void) hfont = CreateFontIndirect(&lf); ok(hfont != NULL, "CreateFontIndirect error %u\n", GetLastError()); DeleteObject(SelectObject(hdc, hfont)); - ret = GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); - ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); ret = GetGlyphOutlineA(hdc, c[i].a, GGO_METRICS, &gm2, 0, NULL, &mat); ok(ret != GDI_ERROR, "GetGlyphOutlineA error %u\n", GetLastError()); - ok(gm2.gmCellIncX == gm.gmCellIncX * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), + ok(gm2.gmCellIncX == tm.tmAveCharWidth * 2 || broken(gm2.gmCellIncX == -lf.lfHeight), "expected %d, got %d (%s:%d)\n", - gm.gmCellIncX * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); + tm.tmAveCharWidth * 2, gm2.gmCellIncX, lf.lfFaceName, lf.lfCharSet); lf.lfItalic = FALSE; lf.lfEscapement = lf.lfOrientation = 2700;

1 0

Akihiro Sagawa : gdi32: Improve fixed-pitch advance calculation as well as outline text metrics.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: e5f1508031eefb4f71f5fc6a3acaf71308003b3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f1508031eefb4f71f5fc6a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:16 2013 +0900 gdi32: Improve fixed-pitch advance calculation as well as outline text metrics. --- dlls/gdi32/freetype.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7bc4366..96c94e4 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5881,7 +5881,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, BOOL needsTransform = FALSE; BOOL tategaki = (font->GSUB_Table != NULL); UINT original_index; - FT_Fixed avgAdvance = 0; + LONG avgAdvance = 0; + FT_Fixed em_scale; TRACE("%p, %04x, %08x, %p, %08x, %p, %p\n", font, glyph, format, lpgm, buflen, buf, lpmat); @@ -6022,9 +6023,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && !(tm.tmPitchAndFamily & TMPF_FIXED_PITCH)) { - avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, - incoming_font->ft_face->size->metrics.x_scale); - if (avgAdvance && (ft_face->glyph->metrics.horiAdvance+63) >> 6 == (avgAdvance*2+63) >> 6) + em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); + avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); + if (avgAdvance && + (ft_face->glyph->metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) TRACE("Fixed-pitch full-width character detected\n"); else avgAdvance = 0; /* cancel this feature */ @@ -6037,7 +6039,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance) adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; else - adv = (INT)((avgAdvance + 32) >> 6) * 2; + adv = (INT)avgAdvance * 2; top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; bottom = (ft_face->glyph->metrics.horiBearingY - @@ -6082,10 +6084,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) lpgm->gmCellIncX = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); - lpgm->gmCellIncX = ((vec.x+32) >> 6) * 2; + lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } vec.x = ft_face->glyph->metrics.horiAdvance; @@ -6094,10 +6096,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!avgAdvance || vec.y) adv = (vec.x+63) >> 6; else { - vec.x = avgAdvance; + vec.x = incoming_font->ntmAvgWidth; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); - adv = ((vec.x+32) >> 6) * 2; + adv = pFT_MulFix(vec.x, em_scale) * 2; } }

1 0

Akihiro Sagawa : gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 3a9689106145c8585e917ae6f4f22226d87872ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a9689106145c8585e917ae6f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:14 2013 +0900 gdi32: Improve outline text metrics calculation, especially if unitsPerEm is not power of 2. --- dlls/gdi32/freetype.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 83e7ad8..7bc4366 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6775,7 +6775,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) TT_OS2 *pOS2; TT_HoriHeader *pHori; TT_Postscript *pPost; - FT_Fixed x_scale, y_scale; + FT_Fixed em_scale; WCHAR *family_nameW, *style_nameW, *face_nameW, *full_nameW; char *cp; INT ascent, descent; @@ -6837,8 +6837,7 @@ static BOOL get_outline_text_metrics(GdiFont *font) needed += lenfull; - x_scale = ft_face->size->metrics.x_scale; - y_scale = ft_face->size->metrics.y_scale; + em_scale = (FT_Fixed)MulDiv(font->ppem, 1 << 16, ft_face->units_per_EM); pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); if(!pOS2) { @@ -6878,8 +6877,8 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; -#define SCALE_X(x) ((pFT_MulFix(x, x_scale) + 32) >> 6) -#define SCALE_Y(y) ((pFT_MulFix(y, y_scale) + 32) >> 6) +#define SCALE_X(x) (pFT_MulFix(x, em_scale)) +#define SCALE_Y(y) (pFT_MulFix(y, em_scale)) if(font->yMax) { TM.tmAscent = font->yMax;

1 0

Akihiro Sagawa : gdi32: Introduce macros to calculate outline text metrics.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 786b931e4560b9149428724d34bc8a533d99092c URL: http://source.winehq.org/git/wine.git/?a=commit;h=786b931e4560b9149428724d3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Mar 14 20:08:12 2013 +0900 gdi32: Introduce macros to calculate outline text metrics. --- dlls/gdi32/freetype.c | 64 ++++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a452fa0..83e7ad8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6878,15 +6878,17 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->ntmCellHeight = ascent + descent; font->ntmAvgWidth = pOS2->xAvgCharWidth; +#define SCALE_X(x) ((pFT_MulFix(x, x_scale) + 32) >> 6) +#define SCALE_Y(y) ((pFT_MulFix(y, y_scale) + 32) >> 6) + if(font->yMax) { TM.tmAscent = font->yMax; TM.tmDescent = -font->yMin; TM.tmInternalLeading = (TM.tmAscent + TM.tmDescent) - ft_face->size->metrics.y_ppem; } else { - TM.tmAscent = (pFT_MulFix(ascent, y_scale) + 32) >> 6; - TM.tmDescent = (pFT_MulFix(descent, y_scale) + 32) >> 6; - TM.tmInternalLeading = (pFT_MulFix(ascent + descent - - ft_face->units_per_EM, y_scale) + 32) >> 6; + TM.tmAscent = SCALE_Y(ascent); + TM.tmDescent = SCALE_Y(descent); + TM.tmInternalLeading = SCALE_Y(ascent + descent - ft_face->units_per_EM); } TM.tmHeight = TM.tmAscent + TM.tmDescent; @@ -6894,15 +6896,15 @@ static BOOL get_outline_text_metrics(GdiFont *font) /* MSDN says: el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender))) */ - TM.tmExternalLeading = max(0, (pFT_MulFix(pHori->Line_Gap - - ((ascent + descent) - - (pHori->Ascender - pHori->Descender)), y_scale) + 32) >> 6); + TM.tmExternalLeading = max(0, SCALE_Y(pHori->Line_Gap - + ((ascent + descent) - + (pHori->Ascender - pHori->Descender)))); - TM.tmAveCharWidth = (pFT_MulFix(pOS2->xAvgCharWidth, x_scale) + 32) >> 6; + TM.tmAveCharWidth = SCALE_X(pOS2->xAvgCharWidth); if (TM.tmAveCharWidth == 0) { TM.tmAveCharWidth = 1; } - TM.tmMaxCharWidth = (pFT_MulFix(ft_face->bbox.xMax - ft_face->bbox.xMin, x_scale) + 32) >> 6; + TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin); TM.tmWeight = FW_REGULAR; if (font->fake_bold) TM.tmWeight = FW_BOLD; @@ -7036,36 +7038,38 @@ static BOOL get_outline_text_metrics(GdiFont *font) font->potm->otmsCharSlopeRun = pHori->caret_Slope_Run; font->potm->otmItalicAngle = 0; /* POST table */ font->potm->otmEMSquare = ft_face->units_per_EM; - font->potm->otmAscent = (pFT_MulFix(pOS2->sTypoAscender, y_scale) + 32) >> 6; - font->potm->otmDescent = (pFT_MulFix(pOS2->sTypoDescender, y_scale) + 32) >> 6; - font->potm->otmLineGap = (pFT_MulFix(pOS2->sTypoLineGap, y_scale) + 32) >> 6; - font->potm->otmsCapEmHeight = (pFT_MulFix(pOS2->sCapHeight, y_scale) + 32) >> 6; - font->potm->otmsXHeight = (pFT_MulFix(pOS2->sxHeight, y_scale) + 32) >> 6; - font->potm->otmrcFontBox.left = (pFT_MulFix(ft_face->bbox.xMin, x_scale) + 32) >> 6; - font->potm->otmrcFontBox.right = (pFT_MulFix(ft_face->bbox.xMax, x_scale) + 32) >> 6; - font->potm->otmrcFontBox.top = (pFT_MulFix(ft_face->bbox.yMax, y_scale) + 32) >> 6; - font->potm->otmrcFontBox.bottom = (pFT_MulFix(ft_face->bbox.yMin, y_scale) + 32) >> 6; + font->potm->otmAscent = SCALE_Y(pOS2->sTypoAscender); + font->potm->otmDescent = SCALE_Y(pOS2->sTypoDescender); + font->potm->otmLineGap = SCALE_Y(pOS2->sTypoLineGap); + font->potm->otmsCapEmHeight = SCALE_Y(pOS2->sCapHeight); + font->potm->otmsXHeight = SCALE_Y(pOS2->sxHeight); + font->potm->otmrcFontBox.left = SCALE_X(ft_face->bbox.xMin); + font->potm->otmrcFontBox.right = SCALE_X(ft_face->bbox.xMax); + font->potm->otmrcFontBox.top = SCALE_Y(ft_face->bbox.yMax); + font->potm->otmrcFontBox.bottom = SCALE_Y(ft_face->bbox.yMin); font->potm->otmMacAscent = TM.tmAscent; font->potm->otmMacDescent = -TM.tmDescent; font->potm->otmMacLineGap = font->potm->otmLineGap; font->potm->otmusMinimumPPEM = 0; /* TT Header */ - font->potm->otmptSubscriptSize.x = (pFT_MulFix(pOS2->ySubscriptXSize, x_scale) + 32) >> 6; - font->potm->otmptSubscriptSize.y = (pFT_MulFix(pOS2->ySubscriptYSize, y_scale) + 32) >> 6; - font->potm->otmptSubscriptOffset.x = (pFT_MulFix(pOS2->ySubscriptXOffset, x_scale) + 32) >> 6; - font->potm->otmptSubscriptOffset.y = (pFT_MulFix(pOS2->ySubscriptYOffset, y_scale) + 32) >> 6; - font->potm->otmptSuperscriptSize.x = (pFT_MulFix(pOS2->ySuperscriptXSize, x_scale) + 32) >> 6; - font->potm->otmptSuperscriptSize.y = (pFT_MulFix(pOS2->ySuperscriptYSize, y_scale) + 32) >> 6; - font->potm->otmptSuperscriptOffset.x = (pFT_MulFix(pOS2->ySuperscriptXOffset, x_scale) + 32) >> 6; - font->potm->otmptSuperscriptOffset.y = (pFT_MulFix(pOS2->ySuperscriptYOffset, y_scale) + 32) >> 6; - font->potm->otmsStrikeoutSize = (pFT_MulFix(pOS2->yStrikeoutSize, y_scale) + 32) >> 6; - font->potm->otmsStrikeoutPosition = (pFT_MulFix(pOS2->yStrikeoutPosition, y_scale) + 32) >> 6; + font->potm->otmptSubscriptSize.x = SCALE_X(pOS2->ySubscriptXSize); + font->potm->otmptSubscriptSize.y = SCALE_Y(pOS2->ySubscriptYSize); + font->potm->otmptSubscriptOffset.x = SCALE_X(pOS2->ySubscriptXOffset); + font->potm->otmptSubscriptOffset.y = SCALE_Y(pOS2->ySubscriptYOffset); + font->potm->otmptSuperscriptSize.x = SCALE_X(pOS2->ySuperscriptXSize); + font->potm->otmptSuperscriptSize.y = SCALE_Y(pOS2->ySuperscriptYSize); + font->potm->otmptSuperscriptOffset.x = SCALE_X(pOS2->ySuperscriptXOffset); + font->potm->otmptSuperscriptOffset.y = SCALE_Y(pOS2->ySuperscriptYOffset); + font->potm->otmsStrikeoutSize = SCALE_Y(pOS2->yStrikeoutSize); + font->potm->otmsStrikeoutPosition = SCALE_Y(pOS2->yStrikeoutPosition); if(!pPost) { font->potm->otmsUnderscoreSize = 0; font->potm->otmsUnderscorePosition = 0; } else { - font->potm->otmsUnderscoreSize = (pFT_MulFix(pPost->underlineThickness, y_scale) + 32) >> 6; - font->potm->otmsUnderscorePosition = (pFT_MulFix(pPost->underlinePosition, y_scale) + 32) >> 6; + font->potm->otmsUnderscoreSize = SCALE_Y(pPost->underlineThickness); + font->potm->otmsUnderscorePosition = SCALE_Y(pPost->underlinePosition); } +#undef SCALE_X +#undef SCALE_Y #undef TM /* otmp* members should clearly have type ptrdiff_t, but M$ knows best */

1 0

Jacek Caban : mshtml: Pass IUri to create_doc_uri.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: afa527c1aed7ca4329bec94be230f23708f6b4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afa527c1aed7ca4329bec94be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 16:15:33 2013 +0200 mshtml: Pass IUri to create_doc_uri. --- dlls/mshtml/binding.h | 4 ++-- dlls/mshtml/navigate.c | 6 ++++-- dlls/mshtml/nsio.c | 9 +-------- dlls/mshtml/persist.c | 23 ++++++++++++++++++----- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index 4e86b76..63ac1ae 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -108,9 +108,9 @@ HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_ nsresult on_start_uri_open(NSContainer*,nsIURI*,cpp_bool*) DECLSPEC_HIDDEN; HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; -HRESULT create_doc_uri(HTMLOuterWindow*,const WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; +HRESULT create_doc_uri(HTMLOuterWindow*,IUri*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLOuterWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; -HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; +HRESULT set_moniker(HTMLDocument*,IMoniker*,IUri*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void prepare_for_binding(HTMLDocument*,IMoniker*,DWORD) DECLSPEC_HIDDEN; HRESULT super_navigate(HTMLOuterWindow*,IUri*,DWORD,const WCHAR*,BYTE*,DWORD) DECLSPEC_HIDDEN; HRESULT load_uri(HTMLOuterWindow*,IUri*,DWORD) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 012d7ac..d99d0aa 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1954,7 +1954,7 @@ static void navigate_proc(task_t *_task) navigate_task_t *task = (navigate_task_t*)_task; HRESULT hres; - hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); + hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, task->uri, NULL, task->bscallback, TRUE); if(SUCCEEDED(hres)) { set_current_mon(task->window, task->bscallback->bsc.mon, task->flags); set_current_uri(task->window, task->uri); @@ -2266,6 +2266,8 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis nsWineURI *nsuri; HRESULT hres; + TRACE("%s\n", debugstr_w(display_uri)); + if(window->doc_obj && window->doc_obj->is_webbrowser && window == window->doc_obj->basedoc.window) { if(!(flags & BINDING_REFRESH)) { BOOL cancel = FALSE; @@ -2294,7 +2296,7 @@ static HRESULT navigate_uri(HTMLOuterWindow *window, IUri *uri, const WCHAR *dis } } - hres = create_doc_uri(window, display_uri, &nsuri); + hres = create_doc_uri(window, uri, &nsuri); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index d313676..c631cbb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2917,19 +2917,12 @@ static nsresult create_nsuri(IUri *iuri, HTMLOuterWindow *window, NSContainer *c return NS_OK; } -HRESULT create_doc_uri(HTMLOuterWindow *window, const WCHAR *url, nsWineURI **ret) +HRESULT create_doc_uri(HTMLOuterWindow *window, IUri *iuri, nsWineURI **ret) { nsWineURI *uri; - IUri *iuri; nsresult nsres; - HRESULT hres; - - hres = create_uri(url, 0, &iuri); - if(FAILED(hres)) - return hres; nsres = create_nsuri(iuri, window, window->doc_obj->nscontainer, NULL, &uri); - IUri_Release(iuri); if(NS_FAILED(nsres)) return E_FAIL; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index ca1a0bb..b2eefd3 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -349,12 +349,13 @@ void prepare_for_binding(HTMLDocument *This, IMoniker *mon, DWORD flags) } } -HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IUri *nav_uri, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) { download_proc_task_t *download_task; nsChannelBSC *bscallback; nsWineURI *nsuri; LPOLESTR url; + IUri *uri; HRESULT hres; hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); @@ -363,11 +364,23 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel return hres; } + if(nav_uri) { + uri = nav_uri; + }else { + hres = create_uri(url, 0, &uri); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; + } + } + TRACE("got url: %s\n", debugstr_w(url)); set_ready_state(This->window, READYSTATE_LOADING); - hres = create_doc_uri(This->window, url, &nsuri); + hres = create_doc_uri(This->window, uri, &nsuri); + if(!nav_uri) + IUri_Release(uri); if(SUCCEEDED(hres)) { if(async_bsc) bscallback = async_bsc; @@ -549,7 +562,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva prepare_for_binding(This, pimkName, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This, pimkName, pibc, NULL, TRUE); + hres = set_moniker(This, pimkName, NULL, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -818,7 +831,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, TRUE); + hres = set_moniker(This, mon, NULL, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) return hres; @@ -875,7 +888,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) } prepare_for_binding(This, mon, FALSE); - hres = set_moniker(This, mon, NULL, NULL, FALSE); + hres = set_moniker(This, mon, NULL, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Fixed load flags usage.
by Alexandre Julliard 04 Apr '13

04 Apr '13

Module: wine Branch: master Commit: 0e53cfb3363960c507f6ce014833e96b47bcb9c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e53cfb3363960c507f6ce014… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 4 16:15:16 2013 +0200 mshtml: Fixed load flags usage. --- dlls/mshtml/nsiface.idl | 33 +++++++++++++++++++++++++++++---- dlls/mshtml/persist.c | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 76f8ed0..368a154 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -545,6 +545,16 @@ interface nsILoadGroup : nsIRequest ] interface nsIChannel : nsIRequest { + const UINT LOAD_DOCUMENT_URI = 1 << 16; + const UINT LOAD_RETARGETED_DOCUMENT_URI = 1 << 17; + const UINT LOAD_REPLACE = 1 << 18; + const UINT LOAD_INITIAL_DOCUMENT_URI = 1 << 19; + const UINT LOAD_TARGETED = 1 << 20; + const UINT LOAD_CALL_CONTENT_SNIFFERS = 1 << 21; + const UINT LOAD_CLASSIFY_URI = 1 << 22; + const UINT LOAD_TREAT_APPLICATION_OCTET_STREAM_AS_UNKNOWN = 1 << 23; + const UINT LOAD_EXPLICIT_CREDENTIALS = 1 << 24; + nsresult GetOriginalURI(nsIURI **aOriginalURI); nsresult SetOriginalURI(nsIURI *aOriginalURI); nsresult GetURI(nsIURI **aURI); @@ -2299,10 +2309,6 @@ interface nsIBaseWindow : nsISupports nsresult SetTitle(const PRUnichar *aTitle); } -cpp_quote("#define LOAD_FLAGS_NONE 0x00000000") -cpp_quote("#define LOAD_REPLACE 0x00040000") -cpp_quote("#define LOAD_INITIAL_DOCUMENT_URI 0x00080000") - [ object, uuid(f5d9e7b0-d930-11d3-b057-00a024ffc08c), @@ -2310,6 +2316,25 @@ cpp_quote("#define LOAD_INITIAL_DOCUMENT_URI 0x00080000") ] interface nsIWebNavigation : nsISupports { + const UINT LOAD_FLAGS_MASK = 0xffff; + const UINT LOAD_FLAGS_NONE = 0; + const UINT LOAD_FLAGS_IS_REFRESH = 0x0010; + const UINT LOAD_FLAGS_IS_LINK = 0x0020; + const UINT LOAD_FLAGS_BYPASS_HISTORY = 0x0040; + const UINT LOAD_FLAGS_REPLACE_HISTORY = 0x0080; + const UINT LOAD_FLAGS_BYPASS_CACHE = 0x0100; + const UINT LOAD_FLAGS_BYPASS_PROXY = 0x0200; + const UINT LOAD_FLAGS_CHARSET_CHANGE = 0x0400; + const UINT LOAD_FLAGS_STOP_CONTENT = 0x0800; + const UINT LOAD_FLAGS_FROM_EXTERNAL = 0x1000; + const UINT LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP = 0x2000; + const UINT LOAD_FLAGS_FIRST_LOAD = 0x4000; + const UINT LOAD_FLAGS_ALLOW_POPUPS = 0x8000; + const UINT LOAD_FLAGS_BYPASS_CLASSIFIER = 0x10000; + const UINT LOAD_FLAGS_FORCE_ALLOW_COOKIES = 0x20000; + const UINT LOAD_FLAGS_DISALLOW_INHERIT_OWNER = 0x40000; + const UINT LOAD_FLAGS_URI_IS_UTF8 = 0x80000; + nsresult GetCanGoBack(bool *aCanGoBack); nsresult GetCanGoForward(bool *aCanGoForward); nsresult GoBack(); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index a0bb208..ca1a0bb 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -379,7 +379,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel remove_target_tasks(This->task_magic); abort_window_bindings(This->window->base.inner_window); - hres = load_nsuri(This->window, nsuri, bscallback, 0/*LOAD_INITIAL_DOCUMENT_URI*/); + hres = load_nsuri(This->window, nsuri, bscallback, LOAD_FLAGS_BYPASS_CACHE); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) hres = create_pending_window(This->window, bscallback);

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
58
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 April 2013