September 2011 - Wine-commits

André Hentschel : ntdll: Fix a comment.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 322c2f45f87f20f6ab84f933841c9f00de73f11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=322c2f45f87f20f6ab84f9338… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 22:31:39 2011 +0200 ntdll: Fix a comment. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index dda1f37..6699de1 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1460,7 +1460,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** - * virtual_create_system_view + * virtual_create_builtin_view */ NTSTATUS virtual_create_builtin_view( void *module ) {

1 0

Gerald Pfeifer : comctl32: Remove dead code from MONTHCAL_HitTest.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: a17463b1e4b3498fb8ba9dc7a69a61b35776d152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a17463b1e4b3498fb8ba9dc7a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Thu Sep 8 00:23:15 2011 +0200 comctl32: Remove dead code from MONTHCAL_HitTest. --- dlls/comctl32/monthcal.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index c0c8810..ae9bdcd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1665,13 +1665,9 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) MCHITTESTINFO htinfo; SYSTEMTIME ht_month; INT day, calIdx; - UINT x, y; if(!lpht || lpht->cbSize < MCHITTESTINFO_V1_SIZE) return -1; - x = lpht->pt.x; - y = lpht->pt.y; - htinfo.st = st_null; /* we should preserve passed fields if hit area doesn't need them */

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 1c404ef443cf8e61a385a481abf97bb78045f061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c404ef443cf8e61a385a481a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Sep 7 23:46:08 2011 +0200 po: Update German translation. --- po/de.po | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index 12bd5a7..a691c8a 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-09-06 08:07+0200\n" +"PO-Revision-Date: 2011-09-07 23:43+0200\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2017,14 +2017,12 @@ msgid "Default MidiOut Device" msgstr "Standard MidiOut - Gerät" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Aktivierung" +msgstr "Aktion" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "&Objekt" +msgstr "Objekt" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -10552,7 +10550,6 @@ msgstr "" "Laufwerk C neu zu erstellen!" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "Buchst." @@ -10795,7 +10792,6 @@ msgstr "" "Optionen:\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" @@ -10805,16 +10801,14 @@ msgstr "" " --backend={user|curses} Auswahl von ‚user‘ erstellt ein neues Fenster,\n" " ‚curses‘ versucht das aktuelle Terminal als " "Wine-\n" -" Konsole einzurichten\n" +" Konsole einzurichten.\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr "" -" <Befehl> Das in der Konsole zu startende Wine-Programm\n" +" <Befehl> Das in der Konsole zu startende Wine-Programm.\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -10825,7 +10819,7 @@ msgstr "" "\n" "Bespiel:\n" " wineconsole cmd\n" -"Startet die Wine-Befehlszeile in einer Wine-Konsole\n" +"Startet die Wine-Befehlszeile in einer Wine-Konsole.\n" "\n" #: winedbg.rc:35

1 0

Francois Gouget : po: Remove English strings from the Ukrainian translation .
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 5d9c30464fd940deb78f78de0dab85dc3716ea7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d9c30464fd940deb78f78de0… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 8 00:13:35 2011 +0200 po: Remove English strings from the Ukrainian translation. --- po/uk.po | 796 +++++++++++++++++++++++++++++++------------------------------- 1 files changed, 397 insertions(+), 399 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d9c30464fd940deb78f7…

1 0

Francois Gouget : po: Remove English strings from the Chinese (PRC) translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: 66941383e7bf1b734e1479be9c4d33a1d560a739 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66941383e7bf1b734e1479be9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:17:55 2011 +0200 po: Remove English strings from the Chinese (PRC) translation. --- po/zh_CN.po | 48 ++---------------------------------------------- 1 files changed, 2 insertions(+), 46 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 7a17d0a..977a290 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5600,7 +5600,6 @@ msgid "insert disk %s" msgstr "插入软盘 %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5632,35 +5631,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6957,19 +6927,6 @@ msgid "" "along with Wine; if not, write to the Free Software Foundation, Inc., 51 " "Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." msgstr "" -"Wine is free software; you can redistribute it and/or modify it under the " -"terms of the GNU Lesser General Public License as published by the Free " -"Software Foundation; either version 2.1 of the License, or (at your option) " -"any later version.\n" -"\n" -"Wine is distributed in the hope that it will be useful, but WITHOUT ANY " -"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " -"FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for " -"more details.\n" -"\n" -"You should have received a copy of the GNU Lesser General Public License " -"along with Wine; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." #: shell32.rc:265 msgid "Wine License" @@ -6977,7 +6934,7 @@ msgstr "Wine 使用许可" #: shell32.rc:155 msgid "Trash" -msgstr "Trash" +msgstr "" #: shlwapi.rc:27 msgid "%ld bytes" @@ -7767,9 +7724,8 @@ msgid "Timeout" msgstr "" #: wldap32.rc:113 -#, fuzzy msgid "Auth Unknown" -msgstr "Context Unknown" +msgstr "" #: wldap32.rc:114 msgid "Filter Error"

1 0

Francois Gouget : po: Remove English strings from the Walloon translation.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: cf518dc6d150284860b93db778da2bb7eb67bff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf518dc6d150284860b93db77… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Sep 8 00:20:08 2011 +0200 po: Remove English strings from the Walloon translation. --- po/wa.po | 191 ++++++++++++++++++++----------------------------------------- 1 files changed, 63 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf518dc6d150284860b93…

1 0

Alexandre Julliard : winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap .
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: d7ed2457b0c5a873f4ee2273b168e4b163839d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7ed2457b0c5a873f4ee2273b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 22:54:49 2011 +0200 winex11: Make sure the bitmap of the brush pattern is owned by x11drv before getting its pixmap. --- dlls/winex11.drv/brush.c | 43 +++++++++++++++++++++++++++++-------------- 1 files changed, 29 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/brush.c b/dlls/winex11.drv/brush.c index 6909d52..e16380a 100644 --- a/dlls/winex11.drv/brush.c +++ b/dlls/winex11.drv/brush.c @@ -252,14 +252,40 @@ static BOOL BRUSH_SelectPatternBrush( X11DRV_PDEVICE *physDev, HBITMAP hbitmap ) /*********************************************************************** + * BRUSH_SelectDIBPatternBrush + */ +static BOOL BRUSH_SelectDIBPatternBrush( X11DRV_PDEVICE *physDev, HGLOBAL mem ) +{ + BOOL ret; + HDC memdc; + BITMAPINFO *info = GlobalLock( mem ); + HBITMAP bitmap = CreateDIBitmap( physDev->dev.hdc, &info->bmiHeader, CBM_INIT, + (LPBYTE)info + bitmap_info_size( info, DIB_RGB_COLORS ), + info, DIB_RGB_COLORS ); + + /* make sure it's owned by x11drv */ + memdc = CreateCompatibleDC( physDev->dev.hdc ); + SelectObject( memdc, bitmap ); + DeleteDC( memdc ); + + if ((ret = BRUSH_SelectPatternBrush( physDev, bitmap ))) + { + X_PHYSBITMAP *physBitmap = X11DRV_get_phys_bitmap( bitmap ); + physBitmap->pixmap = 0; /* so it doesn't get freed */ + } + DeleteObject( bitmap ); + GlobalUnlock( mem ); + return ret; +} + + +/*********************************************************************** * SelectBrush (X11DRV.@) */ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) { X11DRV_PDEVICE *physDev = get_x11drv_dev( dev ); LOGBRUSH logbrush; - HBITMAP hBitmap; - BITMAPINFO * bmpInfo; if (!GetObjectA( hbrush, sizeof(logbrush), &logbrush )) return 0; @@ -304,18 +330,7 @@ HBRUSH X11DRV_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) case BS_DIBPATTERN: TRACE("BS_DIBPATTERN\n"); - if ((bmpInfo = GlobalLock( (HGLOBAL)logbrush.lbHatch ))) - { - int size = bitmap_info_size( bmpInfo, logbrush.lbColor ); - hBitmap = CreateDIBitmap( dev->hdc, &bmpInfo->bmiHeader, - CBM_INIT, ((char *)bmpInfo) + size, - bmpInfo, - (WORD)logbrush.lbColor ); - BRUSH_SelectPatternBrush( physDev, hBitmap ); - DeleteObject( hBitmap ); - GlobalUnlock( (HGLOBAL)logbrush.lbHatch ); - } - + if (!BRUSH_SelectDIBPatternBrush( physDev, (HGLOBAL)logbrush.lbHatch )) return 0; break; } return hbrush;

1 0

Alexandre Julliard : winex11: Make sure the bitmap created from a packed DIB is owned by x11drv before getting its pixmap .
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: da0327917c36a428b6c5e593f156f64b9c25c0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da0327917c36a428b6c5e593f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 22:55:12 2011 +0200 winex11: Make sure the bitmap created from a packed DIB is owned by x11drv before getting its pixmap. --- dlls/winex11.drv/dib.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index b466e69..62aea3c 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -4323,10 +4323,11 @@ HGLOBAL X11DRV_DIB_CreateDIBFromPixmap(Pixmap pixmap, HDC hdc) */ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) { - Pixmap pixmap; + Pixmap pixmap = 0; X_PHYSBITMAP *physBitmap; HBITMAP hBmp; LPBITMAPINFO pbmi; + HDC memdc; /* Create a DDB from the DIB */ @@ -4336,10 +4337,17 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc ) pbmi, DIB_RGB_COLORS); GlobalUnlock(hPackedDIB); + /* make sure it's owned by x11drv */ + memdc = CreateCompatibleDC( hdc ); + SelectObject( memdc, hBmp ); + DeleteDC( memdc ); + /* clear the physBitmap so that we can steal its pixmap */ - physBitmap = X11DRV_get_phys_bitmap( hBmp ); - pixmap = physBitmap->pixmap; - physBitmap->pixmap = 0; + if ((physBitmap = X11DRV_get_phys_bitmap( hBmp ))) + { + pixmap = physBitmap->pixmap; + physBitmap->pixmap = 0; + } /* Delete the DDB we created earlier now that we have stolen its pixmap */ DeleteObject(hBmp);

1 0

Alexandre Julliard : gdi32: Allocate the DIB driver on first use, and free it only upon DC destruction.
by Alexandre Julliard 08 Sep '11

08 Sep '11

Module: wine Branch: master Commit: d12d98511cc6257b0d8aa6e3af3e804b0a098a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12d98511cc6257b0d8aa6e3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 7 23:47:31 2011 +0200 gdi32: Allocate the DIB driver on first use, and free it only upon DC destruction. --- dlls/gdi32/bitmap.c | 17 ++++++++++++----- dlls/gdi32/brush.c | 2 +- dlls/gdi32/dc.c | 5 +++-- dlls/gdi32/dibdrv/dc.c | 32 ++++++++++++++++++++++++-------- dlls/gdi32/dibdrv/dibdrv.h | 5 ----- dlls/gdi32/gdi_private.h | 10 +++++----- 6 files changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 95a45ff..9c77016 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -702,13 +702,18 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) } old_physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); - if(old_physdev == &dc->dibdrv.dev) + if(old_physdev == dc->dibdrv) old_physdev = pop_dc_driver( &dc->physDev ); if(bitmap->dib) { - physdev = &dc->dibdrv.dev; - push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + physdev = dc->dibdrv; + if (physdev) push_dc_driver( &dc->physDev, physdev, physdev->funcs ); + else + { + if (!dib_driver.pCreateDC( &dc->physDev, NULL, NULL, NULL, NULL )) goto done; + dc->dibdrv = physdev = dc->physDev; + } } else physdev = GET_DC_PHYSDEV( dc, pSelectBitmap ); @@ -742,8 +747,10 @@ static HGDIOBJ BITMAP_SelectObject( HGDIOBJ handle, HDC hdc ) done: if(!ret) { - if(physdev == &dc->dibdrv.dev) pop_dc_driver( &dc->physDev ); - if(old_physdev == &dc->dibdrv.dev) push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); + if (physdev && physdev == dc->dibdrv) + pop_dc_driver( &dc->physDev ); + if (old_physdev && old_physdev == dc->dibdrv) + push_dc_driver( &dc->physDev, old_physdev, old_physdev->funcs ); } release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 28d326f..ca95f20 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -392,7 +392,7 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) PHYSDEV pattern_dev = physdev; /* FIXME: This will go away once the dib driver implements pattern brushes */ - if(pattern_dev == &dc->dibdrv.dev) + if(pattern_dev == dc->dibdrv) pattern_dev = GET_NEXT_PHYSDEV( physdev, pSelectBrush ); BITMAP_SetOwnerDC( (HBITMAP)brush->logbrush.lbHatch, pattern_dev ); diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 5ba4e59..65cc3f7 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -79,8 +79,7 @@ DC *alloc_dc_ptr( WORD magic ) dc->nulldrv.funcs = &null_driver; dc->nulldrv.next = NULL; - dc->dibdrv.dev.funcs = &dib_driver; - dc->dibdrv.dev.next = NULL; + dc->dibdrv = NULL; dc->physDev = &dc->nulldrv; dc->thread = GetCurrentThreadId(); dc->refcount = 1; @@ -185,7 +184,9 @@ void free_dc_ptr( DC *dc ) { PHYSDEV physdev = pop_dc_driver( &dc->physDev ); physdev->funcs->pDeleteDC( physdev ); + if (physdev == dc->dibdrv) dc->dibdrv = NULL; } + if (dc->dibdrv) dc->dibdrv->funcs->pDeleteDC( dc->dibdrv ); free_gdi_handle( dc->hSelf ); free_dc_state( dc ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f6ab1e2..8ab7a06 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -349,6 +349,26 @@ void restore_clipping_region( dibdrv_physdev *pdev, HRGN rgn ) pdev->clip = rgn; } +/********************************************************************** + * dibdrv_CreateDC + */ +static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW *data ) +{ + dibdrv_physdev *pdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pdev) ); + + if (!pdev) return FALSE; + if (!(pdev->clip = CreateRectRgn(0, 0, 0, 0))) + { + HeapFree( GetProcessHeap(), 0, pdev ); + return FALSE; + } + clear_dib_info(&pdev->dib); + clear_dib_info(&pdev->brush_dib); + push_dc_driver( dev, &pdev->dev, &dib_driver ); + return TRUE; +} + /*********************************************************************** * dibdrv_DeleteDC */ @@ -359,7 +379,8 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev ) DeleteObject(pdev->clip); free_pattern_brush(pdev); free_dib_info(&pdev->dib); - return 0; + HeapFree( GetProcessHeap(), 0, pdev ); + return TRUE; } /*********************************************************************** @@ -375,13 +396,8 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); - pdev->clip = CreateRectRgn(0, 0, 0, 0); + free_dib_info(&pdev->dib); pdev->defer = 0; - - clear_dib_info(&pdev->dib); - clear_dib_info(&pdev->brush_dib); - pdev->brush_and_bits = pdev->brush_xor_bits = NULL; - if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table)) pdev->defer |= DEFER_FORMAT; @@ -494,7 +510,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pCloseFigure */ NULL, /* pCreateBitmap */ NULL, /* pCreateCompatibleDC */ - NULL, /* pCreateDC */ + dibdrv_CreateDC, /* pCreateDC */ NULL, /* pCreateDIBSection */ NULL, /* pDeleteBitmap */ dibdrv_DeleteDC, /* pDeleteDC */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 23a59ee..c1f7e8b 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -40,11 +40,6 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } -static inline DC *get_dibdrv_dc( PHYSDEV dev ) -{ - return CONTAINING_RECORD( dev, DC, dibdrv ); -} - typedef struct primitive_funcs { void (* solid_rects)(const dib_info *dib, int num, const RECT *rc, DWORD and, DWORD xor); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index e9c992a..7fe633c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -186,11 +186,11 @@ typedef struct tagDC GDIOBJHDR header; HDC hSelf; /* Handle to this DC */ struct gdi_physdev nulldrv; /* physdev for the null driver */ - struct dibdrv_physdev dibdrv; /* physdev for the dib driver */ - PHYSDEV physDev; /* Physical device (driver-specific) */ - DWORD thread; /* thread owning the DC */ - LONG refcount; /* thread refcount */ - LONG dirty; /* dirty flag */ + PHYSDEV dibdrv; /* physdev for the dib driver */ + PHYSDEV physDev; /* current top of the physdev stack */ + DWORD thread; /* thread owning the DC */ + LONG refcount; /* thread refcount */ + LONG dirty; /* dirty flag */ INT saveLevel; struct tagDC *saved_dc; DWORD_PTR dwHookData;

1 0

Francois Gouget : xcopy: Add full stops at the end of sentences in the usage message.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: ca3b1046ca84fc5242e84ec8a1c8d8d7a7449257 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3b1046ca84fc5242e84ec8a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 7 12:53:13 2011 +0200 xcopy: Add full stops at the end of sentences in the usage message. --- po/ar.po | 42 ++++++++++++------------ po/bg.po | 42 ++++++++++++------------ po/ca.po | 42 ++++++++++++------------ po/cs.po | 42 ++++++++++++------------ po/da.po | 43 ++++++++++++------------ po/de.po | 43 ++++++++++++------------ po/el.po | 42 ++++++++++++------------ po/en.po | 84 +++++++++++++++++++++++----------------------- po/en_US.po | 84 +++++++++++++++++++++++----------------------- po/eo.po | 42 ++++++++++++------------ po/es.po | 42 ++++++++++++------------ po/fa.po | 42 ++++++++++++------------ po/fi.po | 42 ++++++++++++------------ po/fr.po | 43 ++++++++++++------------ po/he.po | 43 ++++++++++++------------ po/hi.po | 42 ++++++++++++------------ po/hu.po | 42 ++++++++++++------------ po/it.po | 43 ++++++++++++------------ po/ja.po | 43 ++++++++++++------------ po/ko.po | 43 ++++++++++++------------ po/lt.po | 43 ++++++++++++------------ po/ml.po | 42 ++++++++++++------------ po/nb_NO.po | 43 ++++++++++++------------ po/nl.po | 43 ++++++++++++------------ po/or.po | 42 ++++++++++++------------ po/pa.po | 42 ++++++++++++------------ po/pl.po | 43 ++++++++++++------------ po/pt_BR.po | 43 ++++++++++++------------ po/pt_PT.po | 43 ++++++++++++------------ po/rm.po | 42 ++++++++++++------------ po/ro.po | 43 ++++++++++++------------ po/ru.po | 43 ++++++++++++------------ po/sk.po | 42 ++++++++++++------------ po/sl.po | 43 ++++++++++++------------ po/sr_RS(a)cyrillic.po | 43 ++++++++++++------------ po/sr_RS(a)latin.po | 43 ++++++++++++------------ po/sv.po | 43 ++++++++++++------------ po/te.po | 42 ++++++++++++------------ po/th.po | 42 ++++++++++++------------ po/tr.po | 42 ++++++++++++------------ po/uk.po | 43 ++++++++++++------------ po/wa.po | 42 ++++++++++++------------ po/wine.pot | 42 ++++++++++++------------ po/zh_CN.po | 42 ++++++++++++------------ po/zh_TW.po | 42 ++++++++++++------------ programs/xcopy/xcopy.rc | 42 ++++++++++++------------ 46 files changed, 1028 insertions(+), 1008 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ca3b1046ca84fc5242e84…

1 0