December 2011 - Wine-commits

Alexandre Julliard : gdi32: Make sure DCs are fully zero-initialized.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 1f15ffa1e6ea9b330e555e39e9363fffea2c4d51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f15ffa1e6ea9b330e555e39e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 11:54:57 2011 +0100 gdi32: Make sure DCs are fully zero-initialized. --- dlls/gdi32/dc.c | 44 ++------------------------------------------ 1 files changed, 2 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 77897e9..2519a28 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -75,43 +75,21 @@ DC *alloc_dc_ptr( WORD magic ) { DC *dc; - if (!(dc = HeapAlloc( GetProcessHeap(), 0, sizeof(*dc) ))) return NULL; + if (!(dc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*dc) ))) return NULL; dc->nulldrv.funcs = &null_driver; - dc->nulldrv.next = NULL; - dc->dibdrv = NULL; dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; - dc->dirty = 0; - dc->saveLevel = 0; - dc->saved_dc = 0; - dc->dwHookData = 0; - dc->hookProc = NULL; - dc->wndOrgX = 0; - dc->wndOrgY = 0; dc->wndExtX = 1; dc->wndExtY = 1; - dc->vportOrgX = 0; - dc->vportOrgY = 0; dc->vportExtX = 1; dc->vportExtY = 1; dc->miterLimit = 10.0f; /* 10.0 is the default, from MSDN */ - dc->flags = 0; - dc->layout = 0; - dc->hClipRgn = 0; - dc->hMetaRgn = 0; - dc->hMetaClipRgn = 0; - dc->hVisRgn = 0; - dc->region = 0; dc->hPen = GDI_inc_ref_count( GetStockObject( BLACK_PEN )); dc->hBrush = GDI_inc_ref_count( GetStockObject( WHITE_BRUSH )); dc->hFont = GDI_inc_ref_count( GetStockObject( SYSTEM_FONT )); - dc->hBitmap = 0; - dc->hDevice = 0; dc->hPalette = GetStockObject( DEFAULT_PALETTE ); - dc->gdiFont = 0; - dc->path = NULL; dc->font_code_page = CP_ACP; dc->ROPmode = R2_COPYPEN; dc->polyFillMode = ALTERNATE; @@ -122,18 +100,9 @@ DC *alloc_dc_ptr( WORD magic ) dc->dcBrushColor = RGB( 255, 255, 255 ); dc->dcPenColor = RGB( 0, 0, 0 ); dc->textColor = RGB( 0, 0, 0 ); - dc->brushOrgX = 0; - dc->brushOrgY = 0; - dc->mapperFlags = 0; dc->textAlign = TA_LEFT | TA_TOP | TA_NOUPDATECP; - dc->charExtra = 0; - dc->breakExtra = 0; - dc->breakRem = 0; dc->MapMode = MM_TEXT; dc->GraphicsMode = GM_COMPATIBLE; - dc->pAbortProc = NULL; - dc->CursPosX = 0; - dc->CursPosY = 0; dc->ArcDirection = AD_COUNTERCLOCKWISE; dc->xformWorld2Wnd.eM11 = 1.0f; dc->xformWorld2Wnd.eM12 = 0.0f; @@ -144,10 +113,6 @@ DC *alloc_dc_ptr( WORD magic ) dc->xformWorld2Vport = dc->xformWorld2Wnd; dc->xformVport2World = dc->xformWorld2Wnd; dc->vport2WorldValid = TRUE; - dc->BoundsRect.left = 0; - dc->BoundsRect.top = 0; - dc->BoundsRect.right = 0; - dc->BoundsRect.bottom = 0; if (!(dc->hSelf = alloc_gdi_handle( &dc->header, magic, &dc_funcs ))) { @@ -371,7 +336,7 @@ INT nulldrv_SaveDC( PHYSDEV dev ) { DC *newdc, *dc = get_nulldrv_dc( dev ); - if (!(newdc = HeapAlloc( GetProcessHeap(), 0, sizeof(*newdc )))) return 0; + if (!(newdc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*newdc )))) return 0; newdc->flags = dc->flags; newdc->layout = dc->layout; newdc->hPen = dc->hPen; @@ -420,11 +385,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ - newdc->region = 0; - newdc->hVisRgn = 0; - newdc->hClipRgn = 0; - newdc->hMetaRgn = 0; - newdc->hMetaClipRgn = 0; if (dc->hClipRgn) { newdc->hClipRgn = CreateRectRgn( 0, 0, 0, 0 );

1 0

Alexandre Julliard : gdi32: Only create the DC visible region when necessary.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: ddfe35867d2f6b98465e0e84bcf01fbeaa3b9142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddfe35867d2f6b98465e0e84b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 16:50:57 2011 +0100 gdi32: Only create the DC visible region when necessary. Most DCs can simply use the visible rectangle instead. --- dlls/gdi32/bitmap.c | 1 - dlls/gdi32/clipping.c | 58 +++++++++++++++++++++++++++++++++--------------- dlls/gdi32/dc.c | 25 ++++++-------------- 3 files changed, 48 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 45c3011..4f0b173 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -639,7 +639,6 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = bitmap->bitmap.bmWidth; dc->vis_rect.bottom = bitmap->bitmap.bmHeight; - SetRectRgn( dc->hVisRgn, 0, 0, bitmap->bitmap.bmWidth, bitmap->bitmap.bmHeight); GDI_ReleaseObj( handle ); DC_InitDC( dc ); GDI_dec_ref_count( ret ); diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 7f69950..41590bd 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -29,6 +29,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); +/* return the DC visible rectangle if not empty */ +static inline BOOL get_dc_visrect( DC *dc, RECT *rect ) +{ + rect->left = 0; + rect->top = 0; + rect->right = dc->vis_rect.right - dc->vis_rect.left; + rect->bottom = dc->vis_rect.bottom - dc->vis_rect.top; + return !is_rect_empty( rect ); +} + /*********************************************************************** * get_clip_rect * @@ -77,6 +87,7 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) void CLIPPING_UpdateGCRegion( DC * dc ) { HRGN clip_rgn; + RECT visrect; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceClipping ); /* update the intersection of meta and clip regions */ @@ -91,11 +102,17 @@ void CLIPPING_UpdateGCRegion( DC * dc ) dc->hMetaClipRgn = 0; } clip_rgn = get_clip_region( dc ); - if (clip_rgn || dc->hVisRgn) + if (dc->hVisRgn) { if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( dc->region, dc->hVisRgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); } + else if (get_dc_visrect( dc, &visrect )) + { + if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); + SetRectRgn( dc->region, visrect.left, visrect.top, visrect.right, visrect.bottom ); + if (clip_rgn) CombineRgn( dc->region, dc->region, clip_rgn, RGN_AND ); + } else { if (dc->region) DeleteObject( dc->region ); @@ -272,7 +289,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) /* map region to DC coordinates */ OffsetRgn( hrgn, -vis_rect->left, -vis_rect->top ); - DeleteObject( dc->hVisRgn ); + if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); dc->dirty = 0; dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; @@ -476,7 +493,8 @@ INT WINAPI GetMetaRgn( HDC hdc, HRGN hRgn ) */ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) { - HRGN rgn; + INT ret = 1; + RECT visrect; DC *dc = get_dc_ptr( hDC ); if (!dc) return -1; @@ -484,33 +502,37 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) switch (iCode) { case 1: - rgn = dc->hClipRgn; + if (dc->hClipRgn) CombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); + else ret = 0; break; case 2: - rgn = dc->hMetaRgn; + if (dc->hMetaRgn) CombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); + else ret = 0; break; case 3: - rgn = dc->hMetaClipRgn; - if(!rgn) rgn = dc->hClipRgn; - if(!rgn) rgn = dc->hMetaRgn; + if (dc->hMetaClipRgn) CombineRgn( hRgn, dc->hMetaClipRgn, 0, RGN_COPY ); + else if (dc->hClipRgn) CombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); + else if (dc->hMetaRgn) CombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); + else ret = 0; break; case SYSRGN: /* == 4 */ update_dc( dc ); - rgn = dc->hVisRgn; + if (dc->hVisRgn) + CombineRgn( hRgn, dc->hVisRgn, 0, RGN_COPY ); + else if (get_dc_visrect( dc, &visrect )) + SetRectRgn( hRgn, visrect.left, visrect.top, visrect.right, visrect.bottom ); + else + ret = 0; + /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ + if (ret && !(GetVersion() & 0x80000000)) OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); break; default: WARN("Unknown code %d\n", iCode); - release_dc_ptr( dc ); - return -1; + ret = -1; + break; } - if (rgn) CombineRgn( hRgn, rgn, 0, RGN_COPY ); release_dc_ptr( dc ); - - /* On Windows NT/2000, the SYSRGN returned is in screen coordinates */ - if (iCode == SYSRGN && !(GetVersion() & 0x80000000)) - OffsetRgn( hRgn, dc->vis_rect.left, dc->vis_rect.top ); - - return (rgn != 0); + return ret; } diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 2519a28..4e819d6 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -585,11 +585,10 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, ERR( "no driver found for %s\n", debugstr_w(buf) ); return 0; } - if (!(dc = alloc_dc_ptr( OBJ_DC ))) goto error; + if (!(dc = alloc_dc_ptr( OBJ_DC ))) return 0; hdc = dc->hSelf; dc->hBitmap = GDI_inc_ref_count( GetStockObject( DEFAULT_BITMAP )); - if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; TRACE("(driver=%s, device=%s, output=%s): returning %p\n", debugstr_w(driver), debugstr_w(device), debugstr_w(output), dc->hSelf ); @@ -599,7 +598,8 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, if (!funcs->pCreateDC( &dc->physDev, buf, device, output, initData )) { WARN("creation aborted by device\n" ); - goto error; + free_dc_ptr( dc ); + return 0; } } @@ -607,15 +607,10 @@ HDC WINAPI CreateDCW( LPCWSTR driver, LPCWSTR device, LPCWSTR output, dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); - SetRectRgn(dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, dc->vis_rect.right, dc->vis_rect.bottom); DC_InitDC( dc ); release_dc_ptr( dc ); return hdc; - -error: - if (dc) free_dc_ptr( dc ); - return 0; } @@ -698,7 +693,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); } - if (!(dc = alloc_dc_ptr( OBJ_MEMDC ))) goto error; + if (!(dc = alloc_dc_ptr( OBJ_MEMDC ))) return 0; TRACE("(%p): returning %p\n", hdc, dc->hSelf ); @@ -707,22 +702,18 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) dc->vis_rect.top = 0; dc->vis_rect.right = 1; dc->vis_rect.bottom = 1; - if (!(dc->hVisRgn = CreateRectRgn( 0, 0, 1, 1 ))) goto error; /* default bitmap is 1x1 */ ret = dc->hSelf; if (!funcs->pCreateCompatibleDC( physDev, &dc->physDev )) { WARN("creation aborted by device\n"); - goto error; + free_dc_ptr( dc ); + return 0; } DC_InitDC( dc ); release_dc_ptr( dc ); return ret; - -error: - if (dc) free_dc_ptr( dc ); - return 0; } @@ -790,8 +781,8 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) dc->vis_rect.top = 0; dc->vis_rect.right = GetDeviceCaps( hdc, DESKTOPHORZRES ); dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); - SetRectRgn( dc->hVisRgn, dc->vis_rect.left, dc->vis_rect.top, - dc->vis_rect.right, dc->vis_rect.bottom ); + if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); + dc->hVisRgn = 0; CLIPPING_UpdateGCRegion( dc ); } release_dc_ptr( dc );

1 0

Alexandre Julliard : gdi32: Only store a total visible region when it' s a combination of other regions.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: fb37752f531315bce0e923d0615d224c6944ba93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb37752f531315bce0e923d06… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 17:05:07 2011 +0100 gdi32: Only store a total visible region when it's a combination of other regions. --- dlls/gdi32/clipping.c | 50 +++++++++++++++++++++++---------------------- dlls/gdi32/gdi_private.h | 4 ++- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 41590bd..0f41a2e 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -71,12 +71,11 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) { RECT clip; - if (!GetRgnBox( get_dc_region(dc), &clip )) - { - *dst = *src; - return !is_rect_empty( dst ); - } - return intersect_rect( dst, src, &clip ); + if (get_dc_visrect( dc, &clip )) intersect_rect( dst, src, &clip ); + else *dst = *src; + + if (GetRgnBox( get_dc_region(dc), &clip )) intersect_rect( dst, dst, &clip ); + return !is_rect_empty( dst ); } /*********************************************************************** @@ -87,7 +86,6 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) void CLIPPING_UpdateGCRegion( DC * dc ) { HRGN clip_rgn; - RECT visrect; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceClipping ); /* update the intersection of meta and clip regions */ @@ -102,23 +100,17 @@ void CLIPPING_UpdateGCRegion( DC * dc ) dc->hMetaClipRgn = 0; } clip_rgn = get_clip_region( dc ); - if (dc->hVisRgn) + if (clip_rgn && dc->hVisRgn) { if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( dc->region, dc->hVisRgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); } - else if (get_dc_visrect( dc, &visrect )) - { - if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); - SetRectRgn( dc->region, visrect.left, visrect.top, visrect.right, visrect.bottom ); - if (clip_rgn) CombineRgn( dc->region, dc->region, clip_rgn, RGN_AND ); - } else { if (dc->region) DeleteObject( dc->region ); dc->region = 0; } - physdev->funcs->pSetDeviceClipping( physdev, dc->region ); + physdev->funcs->pSetDeviceClipping( physdev, get_dc_region( dc )); } /*********************************************************************** @@ -132,11 +124,8 @@ static inline void create_default_clip_region( DC * dc ) if (dc->header.type == OBJ_MEMDC) { - BITMAP bitmap; - - GetObjectW( dc->hBitmap, sizeof(bitmap), &bitmap ); - width = bitmap.bmWidth; - height = bitmap.bmHeight; + width = dc->vis_rect.right - dc->vis_rect.left; + height = dc->vis_rect.bottom - dc->vis_rect.top; } else { @@ -369,6 +358,7 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) { POINT pt; + RECT visrect; BOOL ret; DC *dc = get_dc_ptr( hdc ); @@ -379,7 +369,10 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) pt.y = y; LPtoDP( hdc, &pt, 1 ); update_dc( dc ); - ret = PtInRegion( get_dc_region(dc), pt.x, pt.y ); + ret = (get_dc_visrect( dc, &visrect ) && + pt.x >= visrect.left && pt.x < visrect.right && + pt.y >= visrect.top && pt.y < visrect.bottom); + if (ret && get_dc_region( dc )) ret = PtInRegion( get_dc_region( dc ), pt.x, pt.y ); release_dc_ptr( dc ); return ret; } @@ -390,7 +383,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y ) */ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) { - RECT tmpRect; + RECT tmpRect, visrect; BOOL ret; DC *dc = get_dc_ptr( hdc ); if (!dc) return FALSE; @@ -400,7 +393,8 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) LPtoDP( hdc, (POINT *)&tmpRect, 2 ); update_dc( dc ); - ret = RectInRegion( get_dc_region(dc), &tmpRect ); + ret = (get_dc_visrect( dc, &visrect ) && intersect_rect( &visrect, &visrect, &tmpRect )); + if (ret && get_dc_region( dc )) ret = RectInRegion( get_dc_region( dc ), &tmpRect ); release_dc_ptr( dc ); return ret; } @@ -411,12 +405,20 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect ) */ INT WINAPI GetClipBox( HDC hdc, LPRECT rect ) { + RECT visrect; INT ret; DC *dc = get_dc_ptr( hdc ); if (!dc) return ERROR; update_dc( dc ); - ret = GetRgnBox( get_dc_region(dc), rect ); + if (get_dc_region( dc )) + { + ret = GetRgnBox( get_dc_region( dc ), rect ); + if (get_dc_visrect( dc, &visrect ) && !intersect_rect( rect, rect, &visrect )) + ret = NULLREGION; + } + else ret = get_dc_visrect( dc, rect ) ? SIMPLEREGION : NULLREGION; + if (dc->layout & LAYOUT_RTL) { int tmp = rect->left; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index f499de0..551a1f0 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -227,7 +227,9 @@ static inline HRGN get_clip_region( DC * dc ) /* Return the total DC region (if any) */ static inline HRGN get_dc_region( DC *dc ) { - return dc->region; + if (dc->region) return dc->region; + if (dc->hVisRgn) return dc->hVisRgn; + return get_clip_region( dc ); } /* dc.c */

1 0

Alexandre Julliard : gdi32: Don't store the metaclip region, recompute it as needed.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: b9f09abdcc7965a17cdfb258de773819ea500144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f09abdcc7965a17cdfb258d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 17:49:47 2011 +0100 gdi32: Don't store the metaclip region, recompute it as needed. --- dlls/gdi32/clipping.c | 53 ++++++++++++++++++++------------------------- dlls/gdi32/dc.c | 3 -- dlls/gdi32/gdi_private.h | 12 +-------- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 0f41a2e..ca31580 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -85,27 +85,21 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) */ void CLIPPING_UpdateGCRegion( DC * dc ) { - HRGN clip_rgn; PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceClipping ); + HRGN regions[3]; + int count = 0; - /* update the intersection of meta and clip regions */ - if (dc->hMetaRgn && dc->hClipRgn) - { - if (!dc->hMetaClipRgn) dc->hMetaClipRgn = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( dc->hMetaClipRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); - } - else /* only one is set, no need for an intersection */ - { - if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); - dc->hMetaClipRgn = 0; - } - clip_rgn = get_clip_region( dc ); - if (clip_rgn && dc->hVisRgn) + if (dc->hVisRgn) regions[count++] = dc->hVisRgn; + if (dc->hClipRgn) regions[count++] = dc->hClipRgn; + if (dc->hMetaRgn) regions[count++] = dc->hMetaRgn; + + if (count > 1) { if (!dc->region) dc->region = CreateRectRgn( 0, 0, 0, 0 ); - CombineRgn( dc->region, dc->hVisRgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + CombineRgn( dc->region, regions[0], regions[1], RGN_AND ); + if (count > 2) CombineRgn( dc->region, dc->region, regions[2], RGN_AND ); } - else + else /* only one region, we don't need the total region */ { if (dc->region) DeleteObject( dc->region ); dc->region = 0; @@ -512,7 +506,7 @@ INT WINAPI GetRandomRgn(HDC hDC, HRGN hRgn, INT iCode) else ret = 0; break; case 3: - if (dc->hMetaClipRgn) CombineRgn( hRgn, dc->hMetaClipRgn, 0, RGN_COPY ); + if (dc->hClipRgn && dc->hMetaRgn) CombineRgn( hRgn, dc->hClipRgn, dc->hMetaRgn, RGN_AND ); else if (dc->hClipRgn) CombineRgn( hRgn, dc->hClipRgn, 0, RGN_COPY ); else if (dc->hMetaRgn) CombineRgn( hRgn, dc->hMetaRgn, 0, RGN_COPY ); else ret = 0; @@ -549,19 +543,20 @@ INT WINAPI SetMetaRgn( HDC hdc ) if (!dc) return ERROR; - if (dc->hMetaClipRgn) - { - /* the intersection becomes the new meta region */ - DeleteObject( dc->hMetaRgn ); - DeleteObject( dc->hClipRgn ); - dc->hMetaRgn = dc->hMetaClipRgn; - dc->hClipRgn = 0; - dc->hMetaClipRgn = 0; - } - else if (dc->hClipRgn) + if (dc->hClipRgn) { - dc->hMetaRgn = dc->hClipRgn; - dc->hClipRgn = 0; + if (dc->hMetaRgn) + { + /* the intersection becomes the new meta region */ + CombineRgn( dc->hMetaRgn, dc->hMetaRgn, dc->hClipRgn, RGN_AND ); + DeleteObject( dc->hClipRgn ); + dc->hClipRgn = 0; + } + else + { + dc->hMetaRgn = dc->hClipRgn; + dc->hClipRgn = 0; + } } /* else nothing to do */ diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 4e819d6..986ee0a 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -138,7 +138,6 @@ static void free_dc_state( DC *dc ) { if (dc->hClipRgn) DeleteObject( dc->hClipRgn ); if (dc->hMetaRgn) DeleteObject( dc->hMetaRgn ); - if (dc->hMetaClipRgn) DeleteObject( dc->hMetaClipRgn ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); if (dc->region) DeleteObject( dc->region ); if (dc->path) free_gdi_path( dc->path ); @@ -396,8 +395,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) CombineRgn( newdc->hMetaRgn, dc->hMetaRgn, 0, RGN_COPY ); } - /* don't bother recomputing hMetaClipRgn, we'll do that in SetDCState */ - if (!PATH_SavePath( newdc, dc )) { release_dc_ptr( dc ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 551a1f0..604e87d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -106,7 +106,6 @@ typedef struct tagDC DWORD layout; HRGN hClipRgn; /* Clip region */ HRGN hMetaRgn; /* Meta region */ - HRGN hMetaClipRgn; /* Intersection of meta and clip regions */ HRGN hVisRgn; /* Visible region */ HRGN region; /* Total DC region (intersection of clip and visible) */ HPEN hPen; @@ -216,20 +215,13 @@ extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; -/* Return the total clip region (if any) */ -static inline HRGN get_clip_region( DC * dc ) -{ - if (dc->hMetaClipRgn) return dc->hMetaClipRgn; - if (dc->hMetaRgn) return dc->hMetaRgn; - return dc->hClipRgn; -} - /* Return the total DC region (if any) */ static inline HRGN get_dc_region( DC *dc ) { if (dc->region) return dc->region; if (dc->hVisRgn) return dc->hVisRgn; - return get_clip_region( dc ); + if (dc->hClipRgn) return dc->hClipRgn; + return dc->hMetaRgn; } /* dc.c */

1 0

Alexandre Julliard : gdi32: Rename the CLIPPING_UpdateGCRegion function.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 5b17ba887b50919fa202ba70d4f4df6d2d8288e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b17ba887b50919fa202ba70d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 7 17:09:11 2011 +0100 gdi32: Rename the CLIPPING_UpdateGCRegion function. We haven't used a GC here for a long time now. --- dlls/gdi32/clipping.c | 18 +++++++++--------- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/gdi_private.h | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index ca31580..bb50bec 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -79,11 +79,11 @@ BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) } /*********************************************************************** - * CLIPPING_UpdateGCRegion + * update_dc_clipping * - * Update the GC clip region when the ClipRgn or VisRgn have changed. + * Update the DC and device clip regions when the ClipRgn or VisRgn have changed. */ -void CLIPPING_UpdateGCRegion( DC * dc ) +void update_dc_clipping( DC * dc ) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetDeviceClipping ); HRGN regions[3]; @@ -171,7 +171,7 @@ INT nulldrv_ExtSelectClipRgn( PHYSDEV dev, HRGN rgn, INT mode ) if (mirrored) DeleteObject( mirrored ); } - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); return ret; } @@ -186,7 +186,7 @@ INT nulldrv_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bott if (!dc->hClipRgn) create_default_clip_region( dc ); ret = CombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_DIFF ); DeleteObject( rgn ); - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); + if (ret != ERROR) update_dc_clipping( dc ); return ret; } @@ -208,7 +208,7 @@ INT nulldrv_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bo ret = CombineRgn( dc->hClipRgn, dc->hClipRgn, rgn, RGN_AND ); DeleteObject( rgn ); } - if (ret != ERROR) CLIPPING_UpdateGCRegion( dc ); + if (ret != ERROR) update_dc_clipping( dc ); return ret; } @@ -223,7 +223,7 @@ INT nulldrv_OffsetClipRgn( PHYSDEV dev, INT x, INT y ) y = MulDiv( y, dc->vportExtY, dc->wndExtY ); if (dc->layout & LAYOUT_RTL) x = -x; ret = OffsetRgn( dc->hClipRgn, x, y ); - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); } return ret; } @@ -277,7 +277,7 @@ void CDECL __wine_set_visible_region( HDC hdc, HRGN hrgn, const RECT *vis_rect ) dc->vis_rect = *vis_rect; dc->hVisRgn = hrgn; DC_UpdateXforms( dc ); - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); release_dc_ptr( dc ); } @@ -560,7 +560,7 @@ INT WINAPI SetMetaRgn( HDC hdc ) } /* else nothing to do */ - /* Note: no need to call CLIPPING_UpdateGCRegion, the overall clip region hasn't changed */ + /* Note: no need to call update_dc_clipping, the overall clip region hasn't changed */ ret = GetRgnBox( dc->hMetaRgn, &dummy ); release_dc_ptr( dc ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 986ee0a..b1065de 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -242,7 +242,7 @@ void DC_InitDC( DC* dc ) SelectObject( dc->hSelf, dc->hPen ); SelectObject( dc->hSelf, dc->hBrush ); SelectObject( dc->hSelf, dc->hFont ); - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); SetVirtualResolution( dc->hSelf, 0, 0, 0, 0 ); } @@ -490,7 +490,7 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->hMetaRgn = 0; } DC_UpdateXforms( dc ); - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); SelectObject( dev->hdc, dcs->hBitmap ); SelectObject( dev->hdc, dcs->hBrush ); @@ -780,7 +780,7 @@ HDC WINAPI ResetDCW( HDC hdc, const DEVMODEW *devmode ) dc->vis_rect.bottom = GetDeviceCaps( hdc, DESKTOPVERTRES ); if (dc->hVisRgn) DeleteObject( dc->hVisRgn ); dc->hVisRgn = 0; - CLIPPING_UpdateGCRegion( dc ); + update_dc_clipping( dc ); } release_dc_ptr( dc ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 604e87d..56fc96d 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -213,7 +213,7 @@ extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, /* clipping.c */ extern BOOL clip_visrect( DC *dc, RECT *dst, const RECT *src ) DECLSPEC_HIDDEN; -extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; +extern void update_dc_clipping( DC * dc ) DECLSPEC_HIDDEN; /* Return the total DC region (if any) */ static inline HRGN get_dc_region( DC *dc )

1 0

Henri Verbeet : wined3d: Unbind stateblock resources in wined3d_device_uninit_3d().
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 3f455832a338cde9190af9d2c0228aeca09a44d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f455832a338cde9190af9d2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:44 2011 +0100 wined3d: Unbind stateblock resources in wined3d_device_uninit_3d(). --- dlls/wined3d/device.c | 14 ++---- dlls/wined3d/stateblock.c | 89 +++++++++++++++++++++++---------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 57 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 068fb7f..8bdec45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1427,6 +1427,8 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) if (device->logo_surface) wined3d_surface_decref(device->logo_surface); + stateblock_unbind_resources(device->stateBlock); + /* Unload resources */ LIST_FOR_EACH_ENTRY_SAFE(resource, cursor, &device->resources, struct wined3d_resource, resource_list_entry) { @@ -5412,20 +5414,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_display_mode mode; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; - unsigned int i; HRESULT hr; TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); - wined3d_device_set_index_buffer(device, NULL, WINED3DFMT_UNKNOWN); - for (i = 0; i < MAX_STREAMS; ++i) - { - wined3d_device_set_stream_source(device, i, NULL, 0, 0); - } - for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) - { - wined3d_device_set_texture(device, i, NULL); - } + stateblock_unbind_resources(device->stateBlock); + if (device->onscreen_depth_stencil) { wined3d_surface_decref(device->onscreen_depth_stencil); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index cf83e94..401aa69 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -466,54 +466,69 @@ ULONG CDECL wined3d_stateblock_incref(struct wined3d_stateblock *stateblock) return refcount; } -ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) +void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) { - ULONG refcount = InterlockedDecrement(&stateblock->ref); - - TRACE("%p decreasing refcount to %u\n", stateblock, refcount); + struct wined3d_state *state = &stateblock->state; + struct wined3d_vertex_declaration *decl; + struct wined3d_texture *texture; + struct wined3d_buffer *buffer; + struct wined3d_shader *shader; + unsigned int i; - if (!refcount) + if ((decl = state->vertex_declaration)) { - struct wined3d_buffer *buffer; - int counter; - - if (stateblock->state.vertex_declaration) - wined3d_vertex_declaration_decref(stateblock->state.vertex_declaration); - - for (counter = 0; counter < MAX_COMBINED_SAMPLERS; counter++) - { - struct wined3d_texture *texture = stateblock->state.textures[counter]; - if (texture) - { - stateblock->state.textures[counter] = NULL; - wined3d_texture_decref(texture); - } - } + state->vertex_declaration = NULL; + wined3d_vertex_declaration_decref(decl); + } - for (counter = 0; counter < MAX_STREAMS; ++counter) + for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) + { + if ((texture = state->textures[i])) { - buffer = stateblock->state.streams[counter].buffer; - if (buffer) - { - stateblock->state.streams[counter].buffer = NULL; - if (wined3d_buffer_decref(buffer)) - { - WARN("Buffer %p still referenced by stateblock, stream %u.\n", buffer, counter); - } - } + state->textures[i] = NULL; + wined3d_texture_decref(texture); } + } - buffer = stateblock->state.index_buffer; - if (buffer) + for (i = 0; i < MAX_STREAMS; ++i) + { + if ((buffer = state->streams[i].buffer)) { - stateblock->state.index_buffer = NULL; + state->streams[i].buffer = NULL; wined3d_buffer_decref(buffer); } + } - if (stateblock->state.vertex_shader) - wined3d_shader_decref(stateblock->state.vertex_shader); - if (stateblock->state.pixel_shader) - wined3d_shader_decref(stateblock->state.pixel_shader); + if ((buffer = state->index_buffer)) + { + state->index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + + if ((shader = state->vertex_shader)) + { + state->vertex_shader = NULL; + wined3d_shader_decref(shader); + } + + if ((shader = state->pixel_shader)) + { + state->pixel_shader = NULL; + wined3d_shader_decref(shader); + } +} + +ULONG CDECL wined3d_stateblock_decref(struct wined3d_stateblock *stateblock) +{ + ULONG refcount = InterlockedDecrement(&stateblock->ref); + + TRACE("%p decreasing refcount to %u\n", stateblock, refcount); + + if (!refcount) + { + int counter; + + stateblock_unbind_resources(stateblock); for (counter = 0; counter < LIGHTMAP_SIZE; ++counter) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31ea597..fece53a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2331,6 +2331,7 @@ struct wined3d_stateblock void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; void stateblock_init_default_state(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; +void stateblock_unbind_resources(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d

1 0

Henri Verbeet : ddraw: Destroy the swapchain in the DllMain() cleanup handler.
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: ecb2859d3c3beedb0af7de26e4f21d664513cca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecb2859d3c3beedb0af7de26e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:45 2011 +0100 ddraw: Destroy the swapchain in the DllMain() cleanup handler. This is mostly to make sure there aren't any resources still being referenced by wined3d. --- dlls/ddraw/main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index caf9f9b..c9d5139 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -945,6 +945,9 @@ DllMain(HINSTANCE hInstDLL, IDirectDraw4_AddRef(&ddraw->IDirectDraw4_iface); IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); + if (ddraw->wined3d_swapchain) + ddraw_destroy_swapchain(ddraw); + /* Does a D3D device exist? Destroy it * TODO: Destroy all Vertex buffers, Lights, Materials * and execute buffers too

1 0

Henri Verbeet : ddraw: Just read the actual reference counts in DestroyCallback().
by Alexandre Julliard 07 Dec '11

07 Dec '11

Module: wine Branch: master Commit: 05acde9cd1bef1aab3b8e6baac6c5b5f51a0f8ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=05acde9cd1bef1aab3b8e6baa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 6 22:57:46 2011 +0100 ddraw: Just read the actual reference counts in DestroyCallback(). --- dlls/ddraw/main.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index c9d5139..9d5bb53 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -764,16 +764,12 @@ DestroyCallback(IDirectDrawSurface7 *surf, ULONG ref7, ref4, ref3, ref2, ref1, gamma_count, iface_count; ref7 = IDirectDrawSurface7_Release(surf); /* For the EnumSurfaces */ - IDirectDrawSurface4_AddRef(&Impl->IDirectDrawSurface4_iface); - ref4 = IDirectDrawSurface4_Release(&Impl->IDirectDrawSurface4_iface); - IDirectDrawSurface3_AddRef(&Impl->IDirectDrawSurface3_iface); - ref3 = IDirectDrawSurface3_Release(&Impl->IDirectDrawSurface3_iface); - IDirectDrawSurface2_AddRef(&Impl->IDirectDrawSurface2_iface); - ref2 = IDirectDrawSurface2_Release(&Impl->IDirectDrawSurface2_iface); - IDirectDrawSurface_AddRef(&Impl->IDirectDrawSurface_iface); - ref1 = IDirectDrawSurface_Release(&Impl->IDirectDrawSurface_iface); - IDirectDrawGammaControl_AddRef(&Impl->IDirectDrawGammaControl_iface); - gamma_count = IDirectDrawGammaControl_Release(&Impl->IDirectDrawGammaControl_iface); + ref4 = Impl->ref4; + ref3 = Impl->ref3; + ref2 = Impl->ref2; + ref1 = Impl->ref1; + gamma_count = Impl->gamma_count; + WARN("Surface %p has an reference counts of 7: %u 4: %u 3: %u 2: %u 1: %u gamma: %u\n", Impl, ref7, ref4, ref3, ref2, ref1, gamma_count);

1 0

Alexandre Julliard : comdlg32: Convert dialogs to po files.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 1fa1ab54376bace57f78d27ac13b7229caa56a2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fa1ab54376bace57f78d27ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 22:12:34 2011 +0100 comdlg32: Convert dialogs to po files. --- dlls/comdlg32/Makefile.in | 36 +--- dlls/comdlg32/cdlg_Bg.rc | 354 ------------------------- dlls/comdlg32/cdlg_Ca.rc | 369 --------------------------- dlls/comdlg32/cdlg_Cs.rc | 356 -------------------------- dlls/comdlg32/cdlg_Da.rc | 357 -------------------------- dlls/comdlg32/cdlg_De.rc | 353 ------------------------- dlls/comdlg32/cdlg_El.rc | 353 ------------------------- dlls/comdlg32/cdlg_En.rc | 442 -------------------------------- dlls/comdlg32/cdlg_Eo.rc | 351 ------------------------- dlls/comdlg32/cdlg_Es.rc | 354 ------------------------- dlls/comdlg32/cdlg_Fi.rc | 353 ------------------------- dlls/comdlg32/cdlg_Fr.rc | 361 -------------------------- dlls/comdlg32/cdlg_He.rc | 369 --------------------------- dlls/comdlg32/cdlg_Hu.rc | 351 ------------------------- dlls/comdlg32/cdlg_It.rc | 377 --------------------------- dlls/comdlg32/cdlg_Ja.rc | 374 --------------------------- dlls/comdlg32/cdlg_Ko.rc | 375 --------------------------- dlls/comdlg32/cdlg_Lt.rc | 374 --------------------------- dlls/comdlg32/cdlg_Nl.rc | 354 ------------------------- dlls/comdlg32/cdlg_No.rc | 353 ------------------------- dlls/comdlg32/cdlg_Pl.rc | 355 -------------------------- dlls/comdlg32/cdlg_Pt.rc | 616 -------------------------------------------- dlls/comdlg32/cdlg_Ro.rc | 356 -------------------------- dlls/comdlg32/cdlg_Ru.rc | 356 -------------------------- dlls/comdlg32/cdlg_Si.rc | 355 -------------------------- dlls/comdlg32/cdlg_Sk.rc | 356 -------------------------- dlls/comdlg32/cdlg_Sr.rc | 357 -------------------------- dlls/comdlg32/cdlg_Sv.rc | 347 ------------------------- dlls/comdlg32/cdlg_Th.rc | 353 ------------------------- dlls/comdlg32/cdlg_Tr.rc | 354 ------------------------- dlls/comdlg32/cdlg_Uk.rc | 357 -------------------------- dlls/comdlg32/cdlg_Wa.rc | 228 ----------------- dlls/comdlg32/cdlg_Zh.rc | 535 -------------------------------------- dlls/comdlg32/comdlg32.rc | 348 +++++++++++++++++++++++++ po/ar.po | 578 ++++++++++++++++++++++++++++++++++-------- po/bg.po | 556 ++++++++++++++++++++++++++++++++-------- po/ca.po | 547 ++++++++++++++++++++++++++++++++-------- po/cs.po | 560 ++++++++++++++++++++++++++++++++--------- po/da.po | 559 ++++++++++++++++++++++++++++++++-------- po/de.po | 549 ++++++++++++++++++++++++++++++++-------- po/el.po | 551 ++++++++++++++++++++++++++++++++-------- po/en.po | 549 ++++++++++++++++++++++++++++++++-------- po/en_US.po | 547 ++++++++++++++++++++++++++++++++-------- po/eo.po | 569 ++++++++++++++++++++++++++++++++--------- po/es.po | 559 ++++++++++++++++++++++++++++++++-------- po/fa.po | 578 ++++++++++++++++++++++++++++++++++-------- po/fi.po | 565 ++++++++++++++++++++++++++++++++--------- po/fr.po | 549 ++++++++++++++++++++++++++++++++-------- po/he.po | 552 ++++++++++++++++++++++++++++++++-------- po/hi.po | 553 ++++++++++++++++++++++++++++++++-------- po/hu.po | 555 ++++++++++++++++++++++++++++++++-------- po/it.po | 547 ++++++++++++++++++++++++++++++++-------- po/ja.po | 547 ++++++++++++++++++++++++++++++++-------- po/ko.po | 547 ++++++++++++++++++++++++++++++++-------- po/lt.po | 547 ++++++++++++++++++++++++++++++++-------- po/ml.po | 553 ++++++++++++++++++++++++++++++++-------- po/nb_NO.po | 554 ++++++++++++++++++++++++++++++++-------- po/nl.po | 549 ++++++++++++++++++++++++++++++++-------- po/or.po | 553 ++++++++++++++++++++++++++++++++-------- po/pa.po | 553 ++++++++++++++++++++++++++++++++-------- po/pl.po | 549 ++++++++++++++++++++++++++++++++-------- po/pt_BR.po | 554 ++++++++++++++++++++++++++++++++-------- po/pt_PT.po | 554 ++++++++++++++++++++++++++++++++-------- po/rm.po | 575 ++++++++++++++++++++++++++++++++++-------- po/ro.po | 564 ++++++++++++++++++++++++++++++++--------- po/ru.po | 549 ++++++++++++++++++++++++++++++++-------- po/sk.po | 558 ++++++++++++++++++++++++++++++++-------- po/sl.po | 549 ++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 559 ++++++++++++++++++++++++++++++++-------- po/sr_RS(a)latin.po | 623 +++++++++++++++++++++++++++++++++++++-------- po/sv.po | 549 ++++++++++++++++++++++++++++++++-------- po/te.po | 553 ++++++++++++++++++++++++++++++++-------- po/th.po | 553 ++++++++++++++++++++++++++++++++-------- po/tr.po | 554 ++++++++++++++++++++++++++++++++-------- po/uk.po | 549 ++++++++++++++++++++++++++++++++-------- po/wa.po | 567 +++++++++++++++++++++++++++++++++-------- po/wine.pot | 547 ++++++++++++++++++++++++++++++++-------- po/zh_CN.po | 550 ++++++++++++++++++++++++++++++++-------- po/zh_TW.po | 575 ++++++++++++++++++++++++++++++++++-------- 79 files changed, 20566 insertions(+), 16730 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1fa1ab54376bace57f78d…

1 0

Alexandre Julliard : cryptui: Convert dialogs to po files.
by Alexandre Julliard 06 Dec '11

06 Dec '11

Module: wine Branch: master Commit: 0833639ff074ce4f40b667ffa66c44831a915206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0833639ff074ce4f40b667ffa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 6 20:33:47 2011 +0100 cryptui: Convert dialogs to po files. --- dlls/cryptui/Makefile.in | 19 +-- dlls/cryptui/cryptui.rc | 271 +++++++++++++++++++ dlls/cryptui/cryptui_De.rc | 315 ---------------------- dlls/cryptui/cryptui_En.rc | 313 ---------------------- dlls/cryptui/cryptui_Fr.rc | 316 ---------------------- dlls/cryptui/cryptui_It.rc | 316 ---------------------- dlls/cryptui/cryptui_Ja.rc | 316 ---------------------- dlls/cryptui/cryptui_Ko.rc | 299 --------------------- dlls/cryptui/cryptui_Lt.rc | 316 ---------------------- dlls/cryptui/cryptui_Nl.rc | 315 ---------------------- dlls/cryptui/cryptui_No.rc | 315 ---------------------- dlls/cryptui/cryptui_Pl.rc | 313 ---------------------- dlls/cryptui/cryptui_Pt.rc | 625 -------------------------------------------- dlls/cryptui/cryptui_Ro.rc | 317 ---------------------- dlls/cryptui/cryptui_Ru.rc | 316 ---------------------- dlls/cryptui/cryptui_Sv.rc | 315 ---------------------- dlls/cryptui/cryptui_Uk.rc | 317 ---------------------- po/ar.po | 425 +++++++++++++++++++++++++----- po/bg.po | 428 +++++++++++++++++++++++++----- po/ca.po | 447 ++++++++++++++++++++++++++----- po/cs.po | 441 ++++++++++++++++++++++++++------ po/da.po | 436 ++++++++++++++++++++++++++----- po/de.po | 426 +++++++++++++++++++++++++----- po/el.po | 416 ++++++++++++++++++++++++----- po/en.po | 407 ++++++++++++++++++++++++----- po/en_US.po | 433 ++++++++++++++++++++++++++----- po/eo.po | 451 ++++++++++++++++++++++++++------ po/es.po | 434 ++++++++++++++++++++++++++----- po/fa.po | 425 +++++++++++++++++++++++++----- po/fi.po | 433 +++++++++++++++++++++++++----- po/fr.po | 435 ++++++++++++++++++++++++++----- po/he.po | 441 ++++++++++++++++++++++++++----- po/hi.po | 420 +++++++++++++++++++++++++----- po/hu.po | 472 +++++++++++++++++++++++++++------ po/it.po | 431 +++++++++++++++++++++++++----- po/ja.po | 422 +++++++++++++++++++++++++----- po/ko.po | 421 +++++++++++++++++++++++++----- po/lt.po | 428 +++++++++++++++++++++++++----- po/ml.po | 420 +++++++++++++++++++++++++----- po/nb_NO.po | 429 +++++++++++++++++++++++++----- po/nl.po | 426 +++++++++++++++++++++++++----- po/or.po | 420 +++++++++++++++++++++++++----- po/pa.po | 420 +++++++++++++++++++++++++----- po/pl.po | 430 +++++++++++++++++++++++++----- po/pt_BR.po | 432 +++++++++++++++++++++++++------ po/pt_PT.po | 434 +++++++++++++++++++++++++------ po/rm.po | 419 +++++++++++++++++++++++++----- po/ro.po | 431 +++++++++++++++++++++++++----- po/ru.po | 427 +++++++++++++++++++++++++----- po/sk.po | 427 +++++++++++++++++++++++++----- po/sl.po | 451 +++++++++++++++++++++++++++----- po/sr_RS(a)cyrillic.po | 441 ++++++++++++++++++++++++++------ po/sr_RS(a)latin.po | 430 +++++++++++++++++++++++++----- po/sv.po | 425 +++++++++++++++++++++++++----- po/te.po | 420 +++++++++++++++++++++++++----- po/th.po | 436 +++++++++++++++++++++++++------ po/tr.po | 432 +++++++++++++++++++++++++----- po/uk.po | 429 +++++++++++++++++++++++++----- po/wa.po | 436 +++++++++++++++++++++++++------ po/wine.pot | 407 ++++++++++++++++++++++++----- po/zh_CN.po | 437 +++++++++++++++++++++++++------ po/zh_TW.po | 427 +++++++++++++++++++++++++----- 62 files changed, 16450 insertions(+), 8222 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0833639ff074ce4f40b66…

1 0